Merge pull request #33 from RADAR-base/release-0.2.1

Release 0.2.1
RADAR-base · Dec 15, 2021 · f7bf187 · f7bf187
2 parents ddcd2cf + f53eda5
commit f7bf187
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 14 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -15,7 +15,7 @@ description = "RADAR Push API Gateway to handle secured data flow to backend."
 
 allprojects {
     group = "org.radarbase"
-    version = "0.2.0"
+    version = "0.2.1"
 
     repositories {
         mavenCentral()

diff --git a/gradle.properties b/gradle.properties
@@ -3,13 +3,13 @@ dockerComposeStopContainers=true
 
 kotlinVersion=1.5.20
 okhttp3Version=4.9.1
-radarJerseyVersion=0.6.2
+radarJerseyVersion=0.8.0.1
 radarCommonsVersion=0.13.2
 radarSchemasVersion=0.6.0
 radarOauthClientVersion=0.7.1
 jacksonVersion=2.12.3
 slf4jVersion=1.7.31
-log4j2Version=2.14.1
+log4j2Version=2.15.0
 kafkaVersion=2.8.0
 confluentVersion=6.2.0
 junitVersion=5.7.2

diff --git a/src/main/kotlin/org/radarbase/gateway/Config.kt b/src/main/kotlin/org/radarbase/gateway/Config.kt
@@ -4,7 +4,7 @@ import io.confluent.kafka.serializers.AbstractKafkaSchemaSerDeConfig.MAX_SCHEMAS
 import io.confluent.kafka.serializers.AbstractKafkaSchemaSerDeConfig.SCHEMA_REGISTRY_URL_CONFIG
 import org.apache.kafka.clients.CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG
 import org.radarbase.gateway.inject.PushIntegrationEnhancerFactory
-import org.radarbase.jersey.config.EnhancerFactory
+import org.radarbase.jersey.enhancer.EnhancerFactory
 import org.radarbase.push.integration.garmin.user.GarminUserRepository
 import java.net.URI
 import java.time.Instant

diff --git a/src/main/kotlin/org/radarbase/gateway/inject/GatewayResourceEnhancer.kt b/src/main/kotlin/org/radarbase/gateway/inject/GatewayResourceEnhancer.kt
@@ -8,7 +8,8 @@ import org.glassfish.jersey.server.filter.EncodingFilter
 import org.radarbase.gateway.Config
 import org.radarbase.gateway.kafka.*
 import org.radarbase.jersey.config.ConfigLoader
-import org.radarbase.jersey.config.JerseyResourceEnhancer
+import org.radarbase.jersey.filter.Filters
+import org.radarbase.jersey.enhancer.JerseyResourceEnhancer
 import org.radarbase.jersey.service.HealthService
 import org.radarbase.producer.rest.SchemaRetriever
 
@@ -18,7 +19,7 @@ class GatewayResourceEnhancer(private val config: Config): JerseyResourceEnhance
             EncodingFilter::class.java,
             GZipEncoder::class.java,
             DeflateEncoder::class.java,
-            ConfigLoader.Filters.logResponse)
+            Filters.logResponse)
 
     override fun AbstractBinder.enhance() {
         bind(config)

diff --git a/src/main/kotlin/org/radarbase/gateway/inject/PushIntegrationEnhancerFactory.kt b/src/main/kotlin/org/radarbase/gateway/inject/PushIntegrationEnhancerFactory.kt
@@ -3,8 +3,9 @@ package org.radarbase.gateway.inject
 import okhttp3.internal.toImmutableList
 import org.radarbase.gateway.Config
 import org.radarbase.jersey.config.ConfigLoader
-import org.radarbase.jersey.config.EnhancerFactory
-import org.radarbase.jersey.config.JerseyResourceEnhancer
+import org.radarbase.jersey.enhancer.Enhancers
+import org.radarbase.jersey.enhancer.EnhancerFactory
+import org.radarbase.jersey.enhancer.JerseyResourceEnhancer
 import org.radarbase.push.integration.GarminPushIntegrationResourceEnhancer
 import org.radarbase.push.integration.common.inject.PushIntegrationResourceEnhancer
 
@@ -14,9 +15,8 @@ class PushIntegrationEnhancerFactory(private val config: Config) : EnhancerFacto
 
         val enhancersList = mutableListOf(
             GatewayResourceEnhancer(config),
-            ConfigLoader.Enhancers.health,
-            ConfigLoader.Enhancers.httpException,
-            ConfigLoader.Enhancers.generalException,
+            Enhancers.health,
+            Enhancers.exception,
             RadarResourceEnhancer(),
             PushIntegrationResourceEnhancer()
         )

diff --git a/src/main/kotlin/org/radarbase/gateway/inject/RadarResourceEnhancer.kt b/src/main/kotlin/org/radarbase/gateway/inject/RadarResourceEnhancer.kt
@@ -12,7 +12,7 @@ import org.glassfish.jersey.internal.inject.AbstractBinder
 import org.glassfish.jersey.server.ResourceConfig
 import org.radarbase.jersey.auth.filter.AuthenticationFilter
 import org.radarbase.jersey.auth.filter.AuthorizationFeature
-import org.radarbase.jersey.config.JerseyResourceEnhancer
+import org.radarbase.jersey.enhancer.JerseyResourceEnhancer
 import java.util.concurrent.TimeUnit
 
 class RadarResourceEnhancer: JerseyResourceEnhancer {

diff --git a/src/main/kotlin/org/radarbase/push/integration/GarminPushIntegrationResourceEnhancer.kt b/src/main/kotlin/org/radarbase/push/integration/GarminPushIntegrationResourceEnhancer.kt
@@ -8,7 +8,7 @@ import org.glassfish.jersey.process.internal.RequestScoped
 import org.glassfish.jersey.server.ResourceConfig
 import org.radarbase.gateway.Config
 import org.radarbase.jersey.auth.AuthValidator
-import org.radarbase.jersey.config.JerseyResourceEnhancer
+import org.radarbase.jersey.enhancer.JerseyResourceEnhancer
 import org.radarbase.push.integration.common.auth.DelegatedAuthValidator.Companion.GARMIN_QUALIFIER
 import org.radarbase.push.integration.common.user.User
 import org.radarbase.push.integration.garmin.auth.GarminAuthValidator

diff --git a/...in/kotlin/org/radarbase/push/integration/common/inject/PushIntegrationResourceEnhancer.kt b/...in/kotlin/org/radarbase/push/integration/common/inject/PushIntegrationResourceEnhancer.kt
@@ -3,7 +3,7 @@ package org.radarbase.push.integration.common.inject
 import jakarta.inject.Singleton
 import org.glassfish.jersey.internal.inject.AbstractBinder
 import org.radarbase.jersey.auth.AuthValidator
-import org.radarbase.jersey.config.JerseyResourceEnhancer
+import org.radarbase.jersey.enhancer.JerseyResourceEnhancer
 import org.radarbase.push.integration.common.auth.DelegatedAuthValidator
 
 class PushIntegrationResourceEnhancer : JerseyResourceEnhancer {