diff --git a/adapter-base/src/main/java/org/eclipse/hono/adapter/AbstractProtocolAdapterApplication.java b/adapter-base/src/main/java/org/eclipse/hono/adapter/AbstractProtocolAdapterApplication.java index fd4f6b83fb..9daec796a3 100644 --- a/adapter-base/src/main/java/org/eclipse/hono/adapter/AbstractProtocolAdapterApplication.java +++ b/adapter-base/src/main/java/org/eclipse/hono/adapter/AbstractProtocolAdapterApplication.java @@ -19,8 +19,6 @@ import java.util.Optional; import java.util.concurrent.Executors; -import javax.inject.Inject; - import org.eclipse.hono.adapter.monitoring.ConnectionEventProducer; import org.eclipse.hono.adapter.monitoring.ConnectionEventProducerConfig; import org.eclipse.hono.adapter.monitoring.ConnectionEventProducerOptions; @@ -104,6 +102,7 @@ import io.vertx.core.buffer.Buffer; import io.vertx.ext.web.client.WebClient; import io.vertx.ext.web.client.WebClientOptions; +import jakarta.inject.Inject; /** * A Quarkus main application base class for Hono protocol adapters. diff --git a/adapters/amqp/pom.xml b/adapters/amqp/pom.xml index 2041de2e20..0556bace44 100644 --- a/adapters/amqp/pom.xml +++ b/adapters/amqp/pom.xml @@ -31,6 +31,10 @@ org.eclipse.hono hono-client-notification + + jakarta.inject + jakarta.inject-api + diff --git a/adapters/amqp/src/main/java/org/eclipse/hono/adapter/amqp/app/Application.java b/adapters/amqp/src/main/java/org/eclipse/hono/adapter/amqp/app/Application.java index ed88b503a2..8dc081e90f 100644 --- a/adapters/amqp/src/main/java/org/eclipse/hono/adapter/amqp/app/Application.java +++ b/adapters/amqp/src/main/java/org/eclipse/hono/adapter/amqp/app/Application.java @@ -12,14 +12,14 @@ */ package org.eclipse.hono.adapter.amqp.app; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.eclipse.hono.adapter.AbstractProtocolAdapterApplication; import org.eclipse.hono.adapter.amqp.AmqpAdapterMetrics; import org.eclipse.hono.adapter.amqp.AmqpAdapterProperties; import org.eclipse.hono.adapter.amqp.VertxBasedAmqpProtocolAdapter; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + /** * The Hono AMQP adapter main application class. */ diff --git a/adapters/amqp/src/main/java/org/eclipse/hono/adapter/amqp/app/MetricsFactory.java b/adapters/amqp/src/main/java/org/eclipse/hono/adapter/amqp/app/MetricsFactory.java index 24deed6c10..7fc78e3557 100644 --- a/adapters/amqp/src/main/java/org/eclipse/hono/adapter/amqp/app/MetricsFactory.java +++ b/adapters/amqp/src/main/java/org/eclipse/hono/adapter/amqp/app/MetricsFactory.java @@ -12,10 +12,6 @@ */ package org.eclipse.hono.adapter.amqp.app; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; - import org.eclipse.hono.adapter.amqp.AmqpAdapterOptions; import org.eclipse.hono.adapter.amqp.AmqpAdapterProperties; import org.eclipse.hono.adapter.amqp.MicrometerBasedAmqpAdapterMetrics; @@ -25,6 +21,9 @@ import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.config.MeterFilter; import io.vertx.core.Vertx; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; /** * A factory class that creates protocol adapter specific metrics. diff --git a/adapters/coap/pom.xml b/adapters/coap/pom.xml index 7e0cdfdc7e..429409c87d 100644 --- a/adapters/coap/pom.xml +++ b/adapters/coap/pom.xml @@ -43,6 +43,10 @@ io.vertx vertx-core + + jakarta.inject + jakarta.inject-api + diff --git a/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/app/Application.java b/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/app/Application.java index b2812ab928..d3471faa54 100644 --- a/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/app/Application.java +++ b/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/app/Application.java @@ -14,9 +14,6 @@ import java.util.Set; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.eclipse.hono.adapter.AbstractProtocolAdapterApplication; import org.eclipse.hono.adapter.coap.CoapAdapterMetrics; import org.eclipse.hono.adapter.coap.CoapAdapterProperties; @@ -31,6 +28,9 @@ import org.eclipse.hono.util.EventConstants; import org.eclipse.hono.util.TelemetryConstants; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + /** * The Hono CoAP adapter main application class. */ diff --git a/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/app/MetricsFactory.java b/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/app/MetricsFactory.java index 0402102dcd..ab36a5b435 100644 --- a/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/app/MetricsFactory.java +++ b/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/app/MetricsFactory.java @@ -12,10 +12,6 @@ */ package org.eclipse.hono.adapter.coap.app; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; - import org.eclipse.hono.adapter.coap.CoapAdapterOptions; import org.eclipse.hono.adapter.coap.CoapAdapterProperties; import org.eclipse.hono.adapter.coap.MicrometerBasedCoapAdapterMetrics; @@ -25,6 +21,9 @@ import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.config.MeterFilter; import io.vertx.core.Vertx; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; /** * A factory class that creates protocol adapter specific metrics. diff --git a/adapters/http/pom.xml b/adapters/http/pom.xml index f3ea7a8656..8a129dd98a 100644 --- a/adapters/http/pom.xml +++ b/adapters/http/pom.xml @@ -33,6 +33,10 @@ ${project.version} compile + + jakarta.inject + jakarta.inject-api + diff --git a/adapters/http/src/main/java/org/eclipse/hono/adapter/http/app/Application.java b/adapters/http/src/main/java/org/eclipse/hono/adapter/http/app/Application.java index 7ead8deb2a..e40bf31b30 100644 --- a/adapters/http/src/main/java/org/eclipse/hono/adapter/http/app/Application.java +++ b/adapters/http/src/main/java/org/eclipse/hono/adapter/http/app/Application.java @@ -12,14 +12,14 @@ */ package org.eclipse.hono.adapter.http.app; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.eclipse.hono.adapter.AbstractProtocolAdapterApplication; import org.eclipse.hono.adapter.http.HttpAdapterMetrics; import org.eclipse.hono.adapter.http.HttpProtocolAdapterProperties; import org.eclipse.hono.adapter.http.impl.VertxBasedHttpProtocolAdapter; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + /** * The Hono HTTP adapter main application class. */ diff --git a/adapters/http/src/main/java/org/eclipse/hono/adapter/http/app/MetricsFactory.java b/adapters/http/src/main/java/org/eclipse/hono/adapter/http/app/MetricsFactory.java index 84906946a6..8cf2db82f8 100644 --- a/adapters/http/src/main/java/org/eclipse/hono/adapter/http/app/MetricsFactory.java +++ b/adapters/http/src/main/java/org/eclipse/hono/adapter/http/app/MetricsFactory.java @@ -12,10 +12,6 @@ */ package org.eclipse.hono.adapter.http.app; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; - import org.eclipse.hono.adapter.http.HttpProtocolAdapterOptions; import org.eclipse.hono.adapter.http.HttpProtocolAdapterProperties; import org.eclipse.hono.adapter.http.MicrometerBasedHttpAdapterMetrics; @@ -25,6 +21,9 @@ import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.config.MeterFilter; import io.vertx.core.Vertx; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; /** * A factory class that creates protocol adapter specific metrics. diff --git a/adapters/lora/pom.xml b/adapters/lora/pom.xml index c70b9dae13..df1886211e 100644 --- a/adapters/lora/pom.xml +++ b/adapters/lora/pom.xml @@ -52,6 +52,10 @@ jakarta.enterprise jakarta.enterprise.cdi-api + + jakarta.inject + jakarta.inject-api + diff --git a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/app/Application.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/app/Application.java index ce4a4d9ba9..7c8d7f28dd 100644 --- a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/app/Application.java +++ b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/app/Application.java @@ -15,10 +15,6 @@ import java.util.ArrayList; import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import org.eclipse.hono.adapter.AbstractProtocolAdapterApplication; import org.eclipse.hono.adapter.http.HttpAdapterMetrics; import org.eclipse.hono.adapter.http.HttpProtocolAdapterProperties; @@ -27,6 +23,9 @@ import org.eclipse.hono.adapter.lora.providers.LoraProvider; import io.vertx.ext.web.client.WebClient; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; /** * The Hono Lora adapter main application class. diff --git a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/app/LoraCommandSubscriptionsFactory.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/app/LoraCommandSubscriptionsFactory.java index d4174ba90d..94ea7adaa7 100644 --- a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/app/LoraCommandSubscriptionsFactory.java +++ b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/app/LoraCommandSubscriptionsFactory.java @@ -13,14 +13,13 @@ package org.eclipse.hono.adapter.lora.app; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; - import org.eclipse.hono.adapter.lora.LoraCommandSubscriptions; import io.opentracing.Tracer; import io.vertx.core.Vertx; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; /** * A factory class that creates Lora adapter command subscriptions class. It'll always be a {@link Singleton}. diff --git a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/app/MetricsFactory.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/app/MetricsFactory.java index 315c8d6078..3044801c4f 100644 --- a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/app/MetricsFactory.java +++ b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/app/MetricsFactory.java @@ -12,10 +12,6 @@ */ package org.eclipse.hono.adapter.lora.app; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; - import org.eclipse.hono.adapter.http.HttpProtocolAdapterOptions; import org.eclipse.hono.adapter.http.HttpProtocolAdapterProperties; import org.eclipse.hono.adapter.http.MicrometerBasedHttpAdapterMetrics; @@ -26,6 +22,9 @@ import io.micrometer.core.instrument.config.MeterFilter; import io.smallrye.config.ConfigMapping; import io.vertx.core.Vertx; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; /** * A factory class that creates protocol adapter specific metrics. diff --git a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ActilityEnterpriseProvider.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ActilityEnterpriseProvider.java index 4d8ab846f8..bb3a787c1e 100644 --- a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ActilityEnterpriseProvider.java +++ b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ActilityEnterpriseProvider.java @@ -16,13 +16,12 @@ import java.util.Optional; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; - import org.eclipse.hono.adapter.lora.GatewayInfo; import org.eclipse.hono.adapter.lora.LoraMetaData; import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; +import jakarta.enterprise.context.ApplicationScoped; /** * A LoRaWAN provider with API for Actility Enterprise. diff --git a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ActilityWirelessProvider.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ActilityWirelessProvider.java index 7b5cca5b31..e04db436bd 100644 --- a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ActilityWirelessProvider.java +++ b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ActilityWirelessProvider.java @@ -16,13 +16,12 @@ import java.util.Optional; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; - import org.eclipse.hono.adapter.lora.GatewayInfo; import org.eclipse.hono.adapter.lora.LoraMetaData; import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; +import jakarta.enterprise.context.ApplicationScoped; /** * A LoRaWAN provider with API for Actility Wireless. diff --git a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ChirpStackProvider.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ChirpStackProvider.java index 4270f91c29..401a7bcc21 100644 --- a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ChirpStackProvider.java +++ b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ChirpStackProvider.java @@ -18,8 +18,6 @@ import java.util.Objects; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; - import org.eclipse.hono.adapter.lora.GatewayInfo; import org.eclipse.hono.adapter.lora.LoraMessageType; import org.eclipse.hono.adapter.lora.LoraMetaData; @@ -29,6 +27,7 @@ import io.vertx.core.http.HttpHeaders; import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; +import jakarta.enterprise.context.ApplicationScoped; /** * A LoRaWAN provider with API for ChirpStack. diff --git a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ChirpStackV4Provider.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ChirpStackV4Provider.java index 709e3d8842..b0bb84bcd9 100644 --- a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ChirpStackV4Provider.java +++ b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ChirpStackV4Provider.java @@ -20,8 +20,6 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; - import org.eclipse.hono.adapter.lora.GatewayInfo; import org.eclipse.hono.adapter.lora.LoraMessageType; import org.eclipse.hono.adapter.lora.LoraMetaData; @@ -31,6 +29,7 @@ import io.vertx.core.http.HttpHeaders; import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; +import jakarta.enterprise.context.ApplicationScoped; /** * A LoRaWAN provider with API for ChirpStack v4. diff --git a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/EverynetProvider.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/EverynetProvider.java index d06107cb5a..d904dcc03e 100644 --- a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/EverynetProvider.java +++ b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/EverynetProvider.java @@ -18,8 +18,6 @@ import java.util.Optional; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; - import org.eclipse.hono.adapter.lora.GatewayInfo; import org.eclipse.hono.adapter.lora.LoraMessageType; import org.eclipse.hono.adapter.lora.LoraMetaData; @@ -28,6 +26,7 @@ import io.vertx.core.buffer.Buffer; import io.vertx.core.http.HttpMethod; import io.vertx.core.json.JsonObject; +import jakarta.enterprise.context.ApplicationScoped; /** * A LoRaWAN provider with API for Everynet. diff --git a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/FireflyProvider.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/FireflyProvider.java index 8581fd4c6c..e2610c425f 100644 --- a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/FireflyProvider.java +++ b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/FireflyProvider.java @@ -16,8 +16,6 @@ import java.util.Objects; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; - import org.eclipse.hono.adapter.lora.GatewayInfo; import org.eclipse.hono.adapter.lora.LoraMessageType; import org.eclipse.hono.adapter.lora.LoraMetaData; @@ -27,6 +25,7 @@ import io.vertx.core.buffer.Buffer; import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; +import jakarta.enterprise.context.ApplicationScoped; /** * A LoRaWAN provider with API for Firefly. diff --git a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/KerlinkProvider.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/KerlinkProvider.java index c26b355790..6481fa1ee2 100644 --- a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/KerlinkProvider.java +++ b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/KerlinkProvider.java @@ -18,8 +18,6 @@ import java.util.Optional; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; - import org.eclipse.hono.adapter.lora.GatewayInfo; import org.eclipse.hono.adapter.lora.LoraMessageType; import org.eclipse.hono.adapter.lora.LoraMetaData; @@ -29,6 +27,7 @@ import io.vertx.core.buffer.Buffer; import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; +import jakarta.enterprise.context.ApplicationScoped; /** * A LoRaWAN provider with API for Kerlink. diff --git a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/KerlinkProviderCustomContentType.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/KerlinkProviderCustomContentType.java index 84e4898eee..a843047237 100644 --- a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/KerlinkProviderCustomContentType.java +++ b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/KerlinkProviderCustomContentType.java @@ -17,12 +17,11 @@ import java.util.Objects; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; - import org.eclipse.hono.adapter.lora.LoraMessageType; import io.vertx.core.buffer.Buffer; import io.vertx.core.json.JsonObject; +import jakarta.enterprise.context.ApplicationScoped; /** * A LoRaWAN provider with API for Kerlink. diff --git a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/LiveObjectsProvider.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/LiveObjectsProvider.java index 524ab51523..4d28f091d6 100644 --- a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/LiveObjectsProvider.java +++ b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/LiveObjectsProvider.java @@ -18,8 +18,6 @@ import java.util.Optional; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; - import org.eclipse.hono.adapter.lora.LoraMessageType; import org.eclipse.hono.adapter.lora.LoraMetaData; import org.eclipse.hono.util.MessageHelper; @@ -29,6 +27,7 @@ import io.vertx.core.buffer.Buffer; import io.vertx.core.http.HttpHeaders; import io.vertx.core.json.JsonObject; +import jakarta.enterprise.context.ApplicationScoped; /** * A LoRaWAN provider with API for LiveObjectsProvider. diff --git a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/LoriotProvider.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/LoriotProvider.java index de220bdab4..5032dabc60 100644 --- a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/LoriotProvider.java +++ b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/LoriotProvider.java @@ -20,8 +20,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.enterprise.context.ApplicationScoped; - import org.eclipse.hono.adapter.lora.GatewayInfo; import org.eclipse.hono.adapter.lora.LoraMessageType; import org.eclipse.hono.adapter.lora.LoraMetaData; @@ -35,6 +33,7 @@ import io.vertx.core.http.HttpHeaders; import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; +import jakarta.enterprise.context.ApplicationScoped; /** * A LoRaWAN provider with API for Loriot. diff --git a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/MultiTechProvider.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/MultiTechProvider.java index aac4b2468b..d54ef5a9cc 100644 --- a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/MultiTechProvider.java +++ b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/MultiTechProvider.java @@ -18,8 +18,6 @@ import java.util.Objects; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; - import org.eclipse.hono.adapter.lora.GatewayInfo; import org.eclipse.hono.adapter.lora.LoraMessageType; import org.eclipse.hono.adapter.lora.LoraMetaData; @@ -28,6 +26,7 @@ import io.vertx.core.buffer.Buffer; import io.vertx.core.http.HttpHeaders; import io.vertx.core.json.JsonObject; +import jakarta.enterprise.context.ApplicationScoped; /** * A LoRaWAN provider with API for MultiTechProvider. diff --git a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ObjeniousProvider.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ObjeniousProvider.java index 234d5ac4fe..9e0dad8da9 100644 --- a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ObjeniousProvider.java +++ b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ObjeniousProvider.java @@ -17,8 +17,6 @@ import java.util.Optional; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; - import org.eclipse.hono.adapter.lora.GatewayInfo; import org.eclipse.hono.adapter.lora.LoraMessageType; import org.eclipse.hono.adapter.lora.LoraMetaData; @@ -27,6 +25,7 @@ import io.vertx.core.buffer.Buffer; import io.vertx.core.json.JsonObject; +import jakarta.enterprise.context.ApplicationScoped; /** * A LoRaWAN provider with API for Objenious. diff --git a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/OrbiwiseProvider.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/OrbiwiseProvider.java index e8b81c9516..57f4e3462b 100644 --- a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/OrbiwiseProvider.java +++ b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/OrbiwiseProvider.java @@ -17,8 +17,6 @@ import java.util.Objects; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; - import org.eclipse.hono.adapter.lora.GatewayInfo; import org.eclipse.hono.adapter.lora.LoraMessageType; import org.eclipse.hono.adapter.lora.LoraMetaData; @@ -28,6 +26,7 @@ import io.vertx.core.buffer.Buffer; import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; +import jakarta.enterprise.context.ApplicationScoped; /** * A LoRaWAN provider with API for Orbiwise. diff --git a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ProximusProvider.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ProximusProvider.java index a148532773..3807dd6ed9 100644 --- a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ProximusProvider.java +++ b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ProximusProvider.java @@ -17,8 +17,6 @@ import java.util.Optional; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; - import org.eclipse.hono.adapter.lora.GatewayInfo; import org.eclipse.hono.adapter.lora.LoraMessageType; import org.eclipse.hono.adapter.lora.LoraMetaData; @@ -27,6 +25,7 @@ import io.vertx.core.buffer.Buffer; import io.vertx.core.json.JsonObject; +import jakarta.enterprise.context.ApplicationScoped; /** * A LoRaWAN provider with API for Proximus. diff --git a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/TheThingsStackProvider.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/TheThingsStackProvider.java index 273dadce60..4e82fe8122 100644 --- a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/TheThingsStackProvider.java +++ b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/TheThingsStackProvider.java @@ -18,8 +18,6 @@ import java.util.Optional; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; - import org.eclipse.hono.adapter.lora.GatewayInfo; import org.eclipse.hono.adapter.lora.LoraMessageType; import org.eclipse.hono.adapter.lora.LoraMetaData; @@ -29,6 +27,7 @@ import io.vertx.core.buffer.Buffer; import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; +import jakarta.enterprise.context.ApplicationScoped; /** * A LoRaWAN provider with API for The Thing Stack. diff --git a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ThingsNetworkProvider.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ThingsNetworkProvider.java index 2007efb841..855033547c 100644 --- a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ThingsNetworkProvider.java +++ b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ThingsNetworkProvider.java @@ -20,8 +20,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.enterprise.context.ApplicationScoped; - import org.eclipse.hono.adapter.lora.GatewayInfo; import org.eclipse.hono.adapter.lora.LoraMessageType; import org.eclipse.hono.adapter.lora.LoraMetaData; @@ -31,6 +29,7 @@ import io.vertx.core.buffer.Buffer; import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; +import jakarta.enterprise.context.ApplicationScoped; /** * A LoRaWAN provider with API for Things Network. diff --git a/adapters/mqtt/src/main/java/org/eclipse/hono/adapter/mqtt/app/Application.java b/adapters/mqtt/src/main/java/org/eclipse/hono/adapter/mqtt/app/Application.java index fb93074e2c..9bc6da816d 100644 --- a/adapters/mqtt/src/main/java/org/eclipse/hono/adapter/mqtt/app/Application.java +++ b/adapters/mqtt/src/main/java/org/eclipse/hono/adapter/mqtt/app/Application.java @@ -12,9 +12,6 @@ */ package org.eclipse.hono.adapter.mqtt.app; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.eclipse.hono.adapter.AbstractProtocolAdapterApplication; import org.eclipse.hono.adapter.mqtt.MessageMapping; import org.eclipse.hono.adapter.mqtt.MqttAdapterMetrics; @@ -24,6 +21,8 @@ import org.eclipse.hono.adapter.mqtt.impl.VertxBasedMqttProtocolAdapter; import io.vertx.ext.web.client.WebClient; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; /** * The Hono MQTT adapter main application class. diff --git a/adapters/mqtt/src/main/java/org/eclipse/hono/adapter/mqtt/app/MetricsFactory.java b/adapters/mqtt/src/main/java/org/eclipse/hono/adapter/mqtt/app/MetricsFactory.java index 3512e7f876..7dca1e5ca2 100644 --- a/adapters/mqtt/src/main/java/org/eclipse/hono/adapter/mqtt/app/MetricsFactory.java +++ b/adapters/mqtt/src/main/java/org/eclipse/hono/adapter/mqtt/app/MetricsFactory.java @@ -12,10 +12,6 @@ */ package org.eclipse.hono.adapter.mqtt.app; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; - import org.eclipse.hono.adapter.mqtt.MicrometerBasedMqttAdapterMetrics; import org.eclipse.hono.adapter.mqtt.MqttProtocolAdapterOptions; import org.eclipse.hono.adapter.mqtt.MqttProtocolAdapterProperties; @@ -25,6 +21,9 @@ import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.config.MeterFilter; import io.vertx.core.Vertx; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; /** * A factory class that creates protocol adapter specific metrics. diff --git a/adapters/sigfox/src/main/java/org/eclipse/hono/adapter/sigfox/app/Application.java b/adapters/sigfox/src/main/java/org/eclipse/hono/adapter/sigfox/app/Application.java index fe90b6a183..109fc123e1 100644 --- a/adapters/sigfox/src/main/java/org/eclipse/hono/adapter/sigfox/app/Application.java +++ b/adapters/sigfox/src/main/java/org/eclipse/hono/adapter/sigfox/app/Application.java @@ -12,14 +12,14 @@ */ package org.eclipse.hono.adapter.sigfox.app; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.eclipse.hono.adapter.AbstractProtocolAdapterApplication; import org.eclipse.hono.adapter.http.HttpAdapterMetrics; import org.eclipse.hono.adapter.sigfox.impl.SigfoxProtocolAdapter; import org.eclipse.hono.adapter.sigfox.impl.SigfoxProtocolAdapterProperties; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + /** * The Hono Sigfox adapter main application class. */ diff --git a/adapters/sigfox/src/main/java/org/eclipse/hono/adapter/sigfox/app/MetricsFactory.java b/adapters/sigfox/src/main/java/org/eclipse/hono/adapter/sigfox/app/MetricsFactory.java index a3902e31bc..d69e63a4ed 100644 --- a/adapters/sigfox/src/main/java/org/eclipse/hono/adapter/sigfox/app/MetricsFactory.java +++ b/adapters/sigfox/src/main/java/org/eclipse/hono/adapter/sigfox/app/MetricsFactory.java @@ -12,10 +12,6 @@ */ package org.eclipse.hono.adapter.sigfox.app; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; - import org.eclipse.hono.adapter.http.MicrometerBasedHttpAdapterMetrics; import org.eclipse.hono.adapter.sigfox.impl.SigfoxProtocolAdapterOptions; import org.eclipse.hono.adapter.sigfox.impl.SigfoxProtocolAdapterProperties; @@ -25,6 +21,9 @@ import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.config.MeterFilter; import io.vertx.core.Vertx; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; /** * A factory class that creates protocol adapter specific metrics. diff --git a/bom/pom.xml b/bom/pom.xml index abf27d3e75..b21e47b353 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -30,14 +30,17 @@ quay.io/artemiscloud/activemq-artemis-broker:1.0.6 3.24.2 - 1.71 + 1.76 3.9.0 1.0.2 quay.io/interconnectedcloud/qdrouterd:1.17.1 32.0.1-jre + 14.0.17.Final quay.io/infinispan/server-native:13.0.12.Final docker.io/jaegertracing/all-in-one:1.45 - 2.1.6 + 2.0.1.MR + 3.1.0 + 1.3 + + org.infinispan + infinispan-core + ${infinispan.version} + + + org.infinispan + infinispan-client-hotrod + ${infinispan.version} + + + io.netty + netty-transport-native-epoll + + + + io.jsonwebtoken @@ -704,10 +722,20 @@ quarkus.vertx.max-event-loop-execute-time=${max.event-loop.execute-time:20000} cryptvault ${cryptvault.version} + + jakarta.inject + jakarta.inject-api + ${jakarta.inject-api.version} + jakarta.ws.rs jakarta.ws.rs-api - ${jakarta.jaxrs-api.version} + ${jakarta.ws.rs-api.version} + + + javax.transaction + javax.transaction-api + ${javax.transaction-api.version} @@ -743,7 +771,7 @@ quarkus.vertx.max-event-loop-execute-time=${max.event-loop.execute-time:20000} org.bouncycastle - bcpkix-jdk18on + bcpkix-jdk15to18 ${bouncycastle.version} test diff --git a/cli/src/main/java/org/eclipse/hono/cli/CustomConfiguration.java b/cli/src/main/java/org/eclipse/hono/cli/CustomConfiguration.java index 8e5b5d6a8a..3b444e3bcc 100644 --- a/cli/src/main/java/org/eclipse/hono/cli/CustomConfiguration.java +++ b/cli/src/main/java/org/eclipse/hono/cli/CustomConfiguration.java @@ -14,13 +14,12 @@ package org.eclipse.hono.cli; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; - import org.eclipse.hono.cli.util.CommandUtils; import org.eclipse.hono.client.ServiceInvocationException; import io.quarkus.picocli.runtime.PicocliCommandLineFactory; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; import picocli.CommandLine; /** diff --git a/cli/src/main/java/org/eclipse/hono/cli/adapter/amqp/AmqpAdapter.java b/cli/src/main/java/org/eclipse/hono/cli/adapter/amqp/AmqpAdapter.java index 4caf222e43..29e71ab354 100644 --- a/cli/src/main/java/org/eclipse/hono/cli/adapter/amqp/AmqpAdapter.java +++ b/cli/src/main/java/org/eclipse/hono/cli/adapter/amqp/AmqpAdapter.java @@ -26,10 +26,6 @@ import java.util.function.Consumer; import java.util.function.Supplier; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.apache.qpid.proton.message.Message; import org.eclipse.hono.cli.util.ClientCertInfo; import org.eclipse.hono.cli.util.CommandUtils; @@ -66,6 +62,9 @@ import io.vertx.core.Promise; import io.vertx.core.Vertx; import io.vertx.core.buffer.Buffer; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import picocli.CommandLine; import picocli.CommandLine.Model.CommandSpec; import picocli.CommandLine.ParameterException; diff --git a/cli/src/main/java/org/eclipse/hono/cli/app/CommandAndControl.java b/cli/src/main/java/org/eclipse/hono/cli/app/CommandAndControl.java index e9d8d4f480..dfb876ceb4 100644 --- a/cli/src/main/java/org/eclipse/hono/cli/app/CommandAndControl.java +++ b/cli/src/main/java/org/eclipse/hono/cli/app/CommandAndControl.java @@ -25,8 +25,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Supplier; -import javax.inject.Singleton; - import org.eclipse.hono.application.client.DownstreamMessage; import org.eclipse.hono.cli.util.CommandUtils; import org.eclipse.hono.cli.util.IntegerVariableConverter; @@ -50,6 +48,7 @@ import org.jline.terminal.TerminalBuilder; import io.vertx.core.buffer.Buffer; +import jakarta.inject.Singleton; import picocli.CommandLine; import picocli.CommandLine.ExitCode; import picocli.shell.jline3.PicocliCommands; diff --git a/cli/src/main/java/org/eclipse/hono/cli/app/NorthBoundApis.java b/cli/src/main/java/org/eclipse/hono/cli/app/NorthBoundApis.java index dd6759ad9d..8c9776eae6 100644 --- a/cli/src/main/java/org/eclipse/hono/cli/app/NorthBoundApis.java +++ b/cli/src/main/java/org/eclipse/hono/cli/app/NorthBoundApis.java @@ -17,10 +17,6 @@ import java.util.HashMap; import java.util.Optional; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.common.config.SaslConfigs; import org.apache.kafka.common.config.SslConfigs; @@ -48,6 +44,9 @@ import io.vertx.core.Future; import io.vertx.core.Promise; import io.vertx.core.Vertx; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import picocli.CommandLine; import picocli.CommandLine.Model.CommandSpec; import picocli.CommandLine.ParameterException; diff --git a/cli/src/main/java/org/eclipse/hono/cli/app/TelemetryAndEvent.java b/cli/src/main/java/org/eclipse/hono/cli/app/TelemetryAndEvent.java index 4b5c6bf7a9..d72d5d7ea9 100644 --- a/cli/src/main/java/org/eclipse/hono/cli/app/TelemetryAndEvent.java +++ b/cli/src/main/java/org/eclipse/hono/cli/app/TelemetryAndEvent.java @@ -22,9 +22,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.CompletionException; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.eclipse.hono.application.client.ApplicationClient; import org.eclipse.hono.application.client.DownstreamMessage; import org.eclipse.hono.application.client.MessageContext; @@ -38,6 +35,8 @@ import io.vertx.core.Handler; import io.vertx.core.Vertx; import io.vertx.core.buffer.Buffer; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import picocli.CommandLine; import picocli.CommandLine.ScopeType; diff --git a/cli/src/main/java/org/eclipse/hono/cli/util/ConnectionOptions.java b/cli/src/main/java/org/eclipse/hono/cli/util/ConnectionOptions.java index 962a3bb6f6..5126f20546 100644 --- a/cli/src/main/java/org/eclipse/hono/cli/util/ConnectionOptions.java +++ b/cli/src/main/java/org/eclipse/hono/cli/util/ConnectionOptions.java @@ -16,8 +16,7 @@ import java.util.Optional; -import javax.inject.Singleton; - +import jakarta.inject.Singleton; import picocli.CommandLine; /** diff --git a/client-device-connection-infinispan/pom.xml b/client-device-connection-infinispan/pom.xml index 153c95c002..57cdcdb4b8 100644 --- a/client-device-connection-infinispan/pom.xml +++ b/client-device-connection-infinispan/pom.xml @@ -136,6 +136,15 @@ core-test-utils test + + org.bouncycastle + bcpkix-jdk15to18 + test + + + javax.transaction + javax.transaction-api + diff --git a/clients/kafka-common/src/main/java/org/eclipse/hono/client/kafka/metrics/KafkaClientMetricsSupportProducer.java b/clients/kafka-common/src/main/java/org/eclipse/hono/client/kafka/metrics/KafkaClientMetricsSupportProducer.java index a6597978c0..a4b7d47841 100644 --- a/clients/kafka-common/src/main/java/org/eclipse/hono/client/kafka/metrics/KafkaClientMetricsSupportProducer.java +++ b/clients/kafka-common/src/main/java/org/eclipse/hono/client/kafka/metrics/KafkaClientMetricsSupportProducer.java @@ -15,9 +15,9 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; /** * A producer of an implementation to provide support for registering Kafka clients from which metrics are fetched. diff --git a/examples/protocol-gateway-example/src/main/java/org/eclipse/hono/example/protocolgateway/ConfigurationProducer.java b/examples/protocol-gateway-example/src/main/java/org/eclipse/hono/example/protocolgateway/ConfigurationProducer.java index 0807779908..14bbeb0c9f 100644 --- a/examples/protocol-gateway-example/src/main/java/org/eclipse/hono/example/protocolgateway/ConfigurationProducer.java +++ b/examples/protocol-gateway-example/src/main/java/org/eclipse/hono/example/protocolgateway/ConfigurationProducer.java @@ -14,13 +14,6 @@ package org.eclipse.hono.example.protocolgateway; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; - import org.eclipse.hono.client.amqp.config.ClientConfigProperties; import org.eclipse.hono.client.amqp.config.ClientOptions; import org.eclipse.hono.client.amqp.connection.HonoConnection; @@ -30,6 +23,12 @@ import io.smallrye.config.ConfigMapping; import io.vertx.core.Vertx; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Singleton; /** * Example TCP server to send event and telemetry messages to Hono AMQP adapter and receive commands. diff --git a/examples/protocol-gateway-example/src/main/java/org/eclipse/hono/example/protocolgateway/TcpServer.java b/examples/protocol-gateway-example/src/main/java/org/eclipse/hono/example/protocolgateway/TcpServer.java index 3325beddf4..5f48885dee 100644 --- a/examples/protocol-gateway-example/src/main/java/org/eclipse/hono/example/protocolgateway/TcpServer.java +++ b/examples/protocol-gateway-example/src/main/java/org/eclipse/hono/example/protocolgateway/TcpServer.java @@ -15,9 +15,6 @@ import java.util.Optional; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; - import org.eclipse.hono.config.ServerConfig; import org.eclipse.hono.config.ServerOptions; import org.slf4j.Logger; @@ -30,6 +27,8 @@ import io.vertx.core.Vertx; import io.vertx.core.net.NetServer; import io.vertx.core.net.NetSocket; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; /** * The TCP server that devices connect to. diff --git a/examples/protocol-gateway-example/src/main/java/org/eclipse/hono/example/protocolgateway/controller/ProtocolGateway.java b/examples/protocol-gateway-example/src/main/java/org/eclipse/hono/example/protocolgateway/controller/ProtocolGateway.java index e640f69009..ca314dd681 100644 --- a/examples/protocol-gateway-example/src/main/java/org/eclipse/hono/example/protocolgateway/controller/ProtocolGateway.java +++ b/examples/protocol-gateway-example/src/main/java/org/eclipse/hono/example/protocolgateway/controller/ProtocolGateway.java @@ -22,10 +22,6 @@ import java.util.Optional; import java.util.function.Consumer; -import javax.enterprise.context.Dependent; -import javax.enterprise.event.Observes; -import javax.inject.Inject; - import org.apache.qpid.proton.message.Message; import org.eclipse.hono.client.amqp.connection.AmqpUtils; import org.eclipse.hono.client.command.CommandConsumer; @@ -47,6 +43,9 @@ import io.vertx.core.net.NetSocket; import io.vertx.core.parsetools.RecordParser; import io.vertx.proton.ProtonDelivery; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; /** * Example protocol gateway service to send messages to Hono's AMQP adapter. diff --git a/service-base/src/main/java/org/eclipse/hono/service/AbstractServiceApplication.java b/service-base/src/main/java/org/eclipse/hono/service/AbstractServiceApplication.java index c3e63216da..2d3db76caa 100644 --- a/service-base/src/main/java/org/eclipse/hono/service/AbstractServiceApplication.java +++ b/service-base/src/main/java/org/eclipse/hono/service/AbstractServiceApplication.java @@ -20,9 +20,6 @@ import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; -import javax.enterprise.event.Observes; -import javax.inject.Inject; - import org.eclipse.microprofile.health.Readiness; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,6 +33,8 @@ import io.vertx.core.impl.VertxInternal; import io.vertx.core.impl.cpu.CpuCoreSensor; import io.vertx.core.json.impl.JsonUtil; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; /** * A base class for implementing Quarkus based services. diff --git a/service-base/src/main/java/org/eclipse/hono/service/ApplicationPropertiesProducer.java b/service-base/src/main/java/org/eclipse/hono/service/ApplicationPropertiesProducer.java index 1fd207eb8e..7967a6ad90 100644 --- a/service-base/src/main/java/org/eclipse/hono/service/ApplicationPropertiesProducer.java +++ b/service-base/src/main/java/org/eclipse/hono/service/ApplicationPropertiesProducer.java @@ -14,9 +14,9 @@ package org.eclipse.hono.service; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; /** * A producer of {@link ApplicationConfigProperties}. diff --git a/service-base/src/main/java/org/eclipse/hono/service/DeploymentHealthCheck.java b/service-base/src/main/java/org/eclipse/hono/service/DeploymentHealthCheck.java index 5003db42b3..efce4a873a 100644 --- a/service-base/src/main/java/org/eclipse/hono/service/DeploymentHealthCheck.java +++ b/service-base/src/main/java/org/eclipse/hono/service/DeploymentHealthCheck.java @@ -20,15 +20,13 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicReference; -import javax.enterprise.context.ApplicationScoped; - import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; import org.eclipse.microprofile.health.Readiness; import io.vertx.core.AsyncResult; import io.vertx.core.Handler; - +import jakarta.enterprise.context.ApplicationScoped; /** * A health check that tracks the deployment of Verticles. diff --git a/service-base/src/main/java/org/eclipse/hono/service/SmallRyeHealthCheckServer.java b/service-base/src/main/java/org/eclipse/hono/service/SmallRyeHealthCheckServer.java index 908571395c..00ae079f1d 100644 --- a/service-base/src/main/java/org/eclipse/hono/service/SmallRyeHealthCheckServer.java +++ b/service-base/src/main/java/org/eclipse/hono/service/SmallRyeHealthCheckServer.java @@ -18,8 +18,6 @@ import java.util.Optional; import java.util.function.Function; -import javax.enterprise.context.ApplicationScoped; - import org.eclipse.microprofile.health.HealthCheckResponse; import org.eclipse.microprofile.health.Liveness; import org.eclipse.microprofile.health.Readiness; @@ -35,7 +33,7 @@ import io.vertx.ext.healthchecks.HealthCheckHandler; import io.vertx.ext.healthchecks.Status; import io.vertx.ext.web.RoutingContext; - +import jakarta.enterprise.context.ApplicationScoped; /** * A SmallRye Health based {@link HealthCheckServer} that adapts Vert.x Health Checks to MicroProfile Health checks. diff --git a/service-base/src/main/java/org/eclipse/hono/service/auth/delegating/quarkus/DelegatingAuthenticationServiceProducer.java b/service-base/src/main/java/org/eclipse/hono/service/auth/delegating/quarkus/DelegatingAuthenticationServiceProducer.java index d31809625e..826addb82e 100644 --- a/service-base/src/main/java/org/eclipse/hono/service/auth/delegating/quarkus/DelegatingAuthenticationServiceProducer.java +++ b/service-base/src/main/java/org/eclipse/hono/service/auth/delegating/quarkus/DelegatingAuthenticationServiceProducer.java @@ -14,10 +14,6 @@ package org.eclipse.hono.service.auth.delegating.quarkus; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; - import org.eclipse.hono.client.amqp.connection.ConnectionFactory; import org.eclipse.hono.service.auth.AuthenticationService; import org.eclipse.hono.service.auth.HonoSaslAuthenticatorFactory; @@ -35,6 +31,9 @@ import io.smallrye.health.api.HealthRegistry; import io.vertx.core.Vertx; import io.vertx.proton.sasl.ProtonSaslAuthenticatorFactory; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; /** * A producer of an application scoped {@link AuthenticationService} which delegates diff --git a/service-base/src/main/java/org/eclipse/hono/service/metric/MicrometerBasedMetrics.java b/service-base/src/main/java/org/eclipse/hono/service/metric/MicrometerBasedMetrics.java index 33c0b264bd..8f86196295 100644 --- a/service-base/src/main/java/org/eclipse/hono/service/metric/MicrometerBasedMetrics.java +++ b/service-base/src/main/java/org/eclipse/hono/service/metric/MicrometerBasedMetrics.java @@ -294,7 +294,7 @@ public final void reportTelemetry( // record payload size DistributionSummary.builder(METER_TELEMETRY_PAYLOAD) .baseUnit("bytes") - .minimumExpectedValue(0.0) + .minimumExpectedValue(0.01) .tags(tags) .register(this.registry) .record(ServiceBaseUtils.calculatePayloadSize(payloadSize, tenantObject)); @@ -329,7 +329,7 @@ public void reportCommand( // record payload size DistributionSummary.builder(METER_COMMAND_PAYLOAD) .baseUnit("bytes") - .minimumExpectedValue(0.0) + .minimumExpectedValue(0.01) .tags(tags) .register(this.registry) .record((double) ServiceBaseUtils.calculatePayloadSize(payloadSize, tenantObject)); diff --git a/service-base/src/main/java/org/eclipse/hono/service/tracing/SamplerProducer.java b/service-base/src/main/java/org/eclipse/hono/service/tracing/SamplerProducer.java index 5a4f8a17f7..011a09a582 100644 --- a/service-base/src/main/java/org/eclipse/hono/service/tracing/SamplerProducer.java +++ b/service-base/src/main/java/org/eclipse/hono/service/tracing/SamplerProducer.java @@ -19,11 +19,6 @@ import java.util.Map; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.eclipse.hono.util.AuthenticationConstants; import org.eclipse.hono.util.Constants; import org.eclipse.microprofile.config.inject.ConfigProperty; @@ -37,7 +32,12 @@ import io.opentelemetry.sdk.trace.samplers.Sampler; import io.opentelemetry.semconv.resource.attributes.ResourceAttributes; import io.quarkus.arc.properties.IfBuildProperty; -import io.quarkus.opentelemetry.runtime.config.TracerRuntimeConfig; +import io.quarkus.opentelemetry.runtime.config.runtime.OTelRuntimeConfig; +import io.quarkus.opentelemetry.runtime.config.runtime.TracesRuntimeConfig; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; /** * A producer for a custom OpenTelemetry Sampler. @@ -175,7 +175,7 @@ public Boolean getBoolean(final String name) { */ @Singleton @Produces - @IfBuildProperty(name = "quarkus.opentelemetry.enabled", stringValue = "true") + @IfBuildProperty(name = "quarkus.otel.enabled", stringValue = "true") Resource resource() { final var attributes = Attributes.of( @@ -195,18 +195,12 @@ Resource resource() { */ @Singleton @Produces - @IfBuildProperty(name = "quarkus.opentelemetry.enabled", stringValue = "true") - Sampler sampler(final TracerRuntimeConfig tracerRuntimeConfig) { - final var samplerConfig = tracerRuntimeConfig.sampler; - if (samplerConfig.parentBased) { - LOG.warn(""" - 'quarkus.opentelemetry.tracer.sampler.parent-based' set to 'true' - \ - custom Hono Sampler will not be applied to child spans"""); - } - final String samplerName = Optional.ofNullable(otelConfig.getString(PROPERTY_OTEL_TRACES_SAMPLER)) - .orElse(samplerConfig.samplerName); + @IfBuildProperty(name = "quarkus.otel.enabled", stringValue = "true") + Sampler sampler(final OTelRuntimeConfig otelRuntimeConfig) { + final String samplerName = Optional.of(otelConfig.getString(PROPERTY_OTEL_TRACES_SAMPLER)) + .get(); - Sampler sampler = getBaseSampler(samplerName, samplerConfig); + Sampler sampler = getBaseSampler(samplerName, otelRuntimeConfig.traces()); sampler = Sampler.parentBased(sampler); if (LOG.isInfoEnabled()) { LOG.info("using OpenTelemetry Sampler [{}]", sampler.toString()); @@ -220,7 +214,7 @@ Sampler sampler(final TracerRuntimeConfig tracerRuntimeConfig) { return new DropBySpanNamePrefixSampler(sampler, prefixesOfSpansToDrop); } - private Sampler getBaseSampler(final String samplerName, final TracerRuntimeConfig.SamplerConfig samplerConfig) { + private Sampler getBaseSampler(final String samplerName, final TracesRuntimeConfig tracesRuntimeConfig) { switch (samplerName) { // see https://opentelemetry.io/docs/reference/specification/sdk-environment-variables/ case "jaeger_remote", "parentbased_jaeger_remote": @@ -230,7 +224,7 @@ private Sampler getBaseSampler(final String samplerName, final TracerRuntimeConf case "always_off", "parentbased_always_off", "off": return Sampler.alwaysOff(); case "traceidratio", "parentbased_traceidratio", "ratio": - return traceIdRatioBasedSampler(samplerConfig); + return traceIdRatioBasedSampler(tracesRuntimeConfig); // also support rate-limiting sampler directly, i.e. without using Jaeger remote sampler case "rate_limiting", "parentbased_rate_limiting", "rate-limiting": return rateLimitingSampler(); @@ -244,7 +238,7 @@ private Sampler jaegerRemoteSampler() { return new JaegerRemoteSamplerProvider().createSampler(otelConfig); } - private Sampler traceIdRatioBasedSampler(final TracerRuntimeConfig.SamplerConfig samplerConfig) { + private Sampler traceIdRatioBasedSampler(final TracesRuntimeConfig tracesRuntimeConfig) { final Optional samplerArg = Optional.ofNullable(otelConfig.getString(PROPERTY_OTEL_TRACES_SAMPLER_ARG)) .map(s -> { try { @@ -254,7 +248,7 @@ private Sampler traceIdRatioBasedSampler(final TracerRuntimeConfig.SamplerConfig return 1.0d; } }) - .or(() -> samplerConfig.ratio); + .or(() -> tracesRuntimeConfig.samplerArg()); return Sampler.traceIdRatioBased(samplerArg.orElse(1.0d)); } diff --git a/service-base/src/main/java/org/eclipse/hono/service/tracing/TracerProducer.java b/service-base/src/main/java/org/eclipse/hono/service/tracing/TracerProducer.java index e957f2250a..9ab06cb32d 100644 --- a/service-base/src/main/java/org/eclipse/hono/service/tracing/TracerProducer.java +++ b/service-base/src/main/java/org/eclipse/hono/service/tracing/TracerProducer.java @@ -12,13 +12,12 @@ */ package org.eclipse.hono.service.tracing; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; - import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.opentracingshim.OpenTracingShim; import io.opentracing.Tracer; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; /** * A producer for an OpenTracing Tracer. diff --git a/services/auth-base/src/main/java/org/eclipse/hono/authentication/JwkResource.java b/services/auth-base/src/main/java/org/eclipse/hono/authentication/JwkResource.java index 58fcba3938..7f93fc86cf 100644 --- a/services/auth-base/src/main/java/org/eclipse/hono/authentication/JwkResource.java +++ b/services/auth-base/src/main/java/org/eclipse/hono/authentication/JwkResource.java @@ -16,16 +16,15 @@ import java.util.Objects; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; - import org.eclipse.hono.service.auth.AuthTokenFactory; import org.eclipse.hono.service.auth.delegating.AuthenticationServerClientOptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import io.vertx.core.buffer.Buffer; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; /** * A resource for retrieving a JSON Web Key set that contains the (public) key that clients diff --git a/services/auth/pom.xml b/services/auth/pom.xml index 9a921977d8..d6f5718442 100644 --- a/services/auth/pom.xml +++ b/services/auth/pom.xml @@ -48,6 +48,10 @@ org.eclipse.hono hono-client-amqp-connection + + jakarta.ws.rs + jakarta.ws.rs-api + diff --git a/services/auth/src/main/java/org/eclipse/hono/authentication/app/Application.java b/services/auth/src/main/java/org/eclipse/hono/authentication/app/Application.java index a463a3aecb..d867edc56b 100644 --- a/services/auth/src/main/java/org/eclipse/hono/authentication/app/Application.java +++ b/services/auth/src/main/java/org/eclipse/hono/authentication/app/Application.java @@ -15,9 +15,6 @@ import java.util.HashMap; import java.util.Map; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.eclipse.hono.authentication.AuthenticationEndpoint; import org.eclipse.hono.authentication.AuthenticationServerMetrics; import org.eclipse.hono.authentication.MicrometerBasedAuthenticationServerMetrics; @@ -39,6 +36,8 @@ import io.vertx.core.DeploymentOptions; import io.vertx.core.Future; import io.vertx.proton.sasl.ProtonSaslAuthenticatorFactory; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; /** * The Quarkus based Authentication server main application class. diff --git a/services/auth/src/main/java/org/eclipse/hono/authentication/app/MeterFilterProducer.java b/services/auth/src/main/java/org/eclipse/hono/authentication/app/MeterFilterProducer.java index bde09c5511..19affd6145 100644 --- a/services/auth/src/main/java/org/eclipse/hono/authentication/app/MeterFilterProducer.java +++ b/services/auth/src/main/java/org/eclipse/hono/authentication/app/MeterFilterProducer.java @@ -14,14 +14,13 @@ package org.eclipse.hono.authentication.app; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; - import org.eclipse.hono.service.metric.MetricsTags; import org.eclipse.hono.util.Constants; import io.micrometer.core.instrument.config.MeterFilter; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; /** * A factory for {@code MeterFilter}s. diff --git a/services/auth/src/main/java/org/eclipse/hono/authentication/app/PropertiesProducer.java b/services/auth/src/main/java/org/eclipse/hono/authentication/app/PropertiesProducer.java index 3fdae0baa1..fd810e1606 100644 --- a/services/auth/src/main/java/org/eclipse/hono/authentication/app/PropertiesProducer.java +++ b/services/auth/src/main/java/org/eclipse/hono/authentication/app/PropertiesProducer.java @@ -14,10 +14,6 @@ package org.eclipse.hono.authentication.app; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; - import org.eclipse.hono.authentication.file.FileBasedAuthenticationServiceConfigProperties; import org.eclipse.hono.authentication.file.FileBasedAuthenticationServiceOptions; import org.eclipse.hono.config.ServiceConfigProperties; @@ -27,6 +23,9 @@ import io.smallrye.config.ConfigMapping; import io.vertx.core.Vertx; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; /** * A producer for the Authentication Server's JWK resource. diff --git a/services/base-jdbc/src/test/java/org/eclipse/hono/service/base/jdbc/store/StatementTest.java b/services/base-jdbc/src/test/java/org/eclipse/hono/service/base/jdbc/store/StatementTest.java index 46a4c0a594..71412fe551 100644 --- a/services/base-jdbc/src/test/java/org/eclipse/hono/service/base/jdbc/store/StatementTest.java +++ b/services/base-jdbc/src/test/java/org/eclipse/hono/service/base/jdbc/store/StatementTest.java @@ -27,7 +27,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import org.yaml.snakeyaml.constructor.ConstructorException; +import org.yaml.snakeyaml.composer.ComposerException; /** * Testing {@link Statement}. @@ -132,7 +132,7 @@ private void assertNoMarkerFile(final Path markerFile, final String yaml) { assertFalse(Files.isRegularFile(markerFile), "Marker file must not exist"); assertNotNull(expected); - assertThat(expected).isInstanceOf(ConstructorException.class); + assertThat(expected).isInstanceOf(ComposerException.class); } } diff --git a/services/command-router/src/main/java/org/eclipse/hono/commandrouter/app/Application.java b/services/command-router/src/main/java/org/eclipse/hono/commandrouter/app/Application.java index a8dde95c7c..91aca11efe 100644 --- a/services/command-router/src/main/java/org/eclipse/hono/commandrouter/app/Application.java +++ b/services/command-router/src/main/java/org/eclipse/hono/commandrouter/app/Application.java @@ -16,9 +16,6 @@ import java.util.Map; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.eclipse.hono.client.amqp.config.ClientConfigProperties; import org.eclipse.hono.client.amqp.config.ClientOptions; import org.eclipse.hono.client.amqp.config.RequestResponseClientConfigProperties; @@ -90,6 +87,8 @@ import io.vertx.core.buffer.Buffer; import io.vertx.ext.healthchecks.HealthCheckHandler; import io.vertx.proton.sasl.ProtonSaslAuthenticatorFactory; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; /** * The Quarkus based Command Router main application class. diff --git a/services/command-router/src/main/java/org/eclipse/hono/commandrouter/app/DeviceConnectionInfoProducer.java b/services/command-router/src/main/java/org/eclipse/hono/commandrouter/app/DeviceConnectionInfoProducer.java index 474264c78f..07b1482bbb 100644 --- a/services/command-router/src/main/java/org/eclipse/hono/commandrouter/app/DeviceConnectionInfoProducer.java +++ b/services/command-router/src/main/java/org/eclipse/hono/commandrouter/app/DeviceConnectionInfoProducer.java @@ -19,10 +19,6 @@ import java.nio.file.Path; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; - import org.eclipse.hono.commandrouter.AdapterInstanceStatusService; import org.eclipse.hono.commandrouter.CommandRouterServiceOptions; import org.eclipse.hono.commandrouter.impl.KubernetesBasedAdapterInstanceStatusService; @@ -48,6 +44,9 @@ import io.opentracing.Tracer; import io.smallrye.config.ConfigMapping; import io.vertx.core.Vertx; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; /** * A producer of an application scoped {@link DeviceConnectionInfo} instance. diff --git a/services/command-router/src/main/java/org/eclipse/hono/commandrouter/app/MetricsFactory.java b/services/command-router/src/main/java/org/eclipse/hono/commandrouter/app/MetricsFactory.java index 6e6e0178be..837ccd6fbc 100644 --- a/services/command-router/src/main/java/org/eclipse/hono/commandrouter/app/MetricsFactory.java +++ b/services/command-router/src/main/java/org/eclipse/hono/commandrouter/app/MetricsFactory.java @@ -12,10 +12,6 @@ */ package org.eclipse.hono.commandrouter.app; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; - import org.eclipse.hono.commandrouter.MicrometerBasedCommandRouterMetrics; import org.eclipse.hono.service.metric.MetricsTags; import org.eclipse.hono.util.Constants; @@ -23,6 +19,9 @@ import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.config.MeterFilter; import io.vertx.core.Vertx; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; /** * A factory class that creates Command Router specific metrics. diff --git a/services/device-registry-base/src/main/java/org/eclipse/hono/deviceregistry/app/AbstractAmqpServerFactory.java b/services/device-registry-base/src/main/java/org/eclipse/hono/deviceregistry/app/AbstractAmqpServerFactory.java index da2d6a9a9e..c5bd8377f9 100644 --- a/services/device-registry-base/src/main/java/org/eclipse/hono/deviceregistry/app/AbstractAmqpServerFactory.java +++ b/services/device-registry-base/src/main/java/org/eclipse/hono/deviceregistry/app/AbstractAmqpServerFactory.java @@ -13,10 +13,6 @@ package org.eclipse.hono.deviceregistry.app; - -import javax.inject.Inject; -import javax.inject.Named; - import org.eclipse.hono.client.amqp.config.ClientConfigProperties; import org.eclipse.hono.client.amqp.connection.HonoConnection; import org.eclipse.hono.client.amqp.connection.SendMessageSampler; @@ -58,6 +54,8 @@ import io.vertx.core.Vertx; import io.vertx.core.buffer.Buffer; import io.vertx.proton.sasl.ProtonSaslAuthenticatorFactory; +import jakarta.inject.Inject; +import jakarta.inject.Named; /** * A factory base class for creating AMQP 1.0 based endpoints of Hono's south bound APIs. diff --git a/services/device-registry-base/src/main/java/org/eclipse/hono/deviceregistry/app/AbstractDeviceRegistryApplication.java b/services/device-registry-base/src/main/java/org/eclipse/hono/deviceregistry/app/AbstractDeviceRegistryApplication.java index 0606423425..4175340210 100644 --- a/services/device-registry-base/src/main/java/org/eclipse/hono/deviceregistry/app/AbstractDeviceRegistryApplication.java +++ b/services/device-registry-base/src/main/java/org/eclipse/hono/deviceregistry/app/AbstractDeviceRegistryApplication.java @@ -16,8 +16,6 @@ import java.util.HashMap; import java.util.Map; -import javax.inject.Inject; - import org.eclipse.hono.notification.NotificationSender; import org.eclipse.hono.service.AbstractServiceApplication; import org.eclipse.hono.service.auth.AuthenticationService; @@ -29,6 +27,7 @@ import io.vertx.core.DeploymentOptions; import io.vertx.core.Future; import io.vertx.core.Verticle; +import jakarta.inject.Inject; /** * A base class for the device registry main application class. diff --git a/services/device-registry-base/src/main/java/org/eclipse/hono/deviceregistry/app/AbstractHttpServerFactory.java b/services/device-registry-base/src/main/java/org/eclipse/hono/deviceregistry/app/AbstractHttpServerFactory.java index 64fdad49c3..8cd7dbf69a 100644 --- a/services/device-registry-base/src/main/java/org/eclipse/hono/deviceregistry/app/AbstractHttpServerFactory.java +++ b/services/device-registry-base/src/main/java/org/eclipse/hono/deviceregistry/app/AbstractHttpServerFactory.java @@ -13,8 +13,6 @@ package org.eclipse.hono.deviceregistry.app; -import javax.inject.Inject; - import org.eclipse.hono.deviceregistry.server.DeviceRegistryHttpServer; import org.eclipse.hono.service.HealthCheckServer; import org.eclipse.hono.service.http.HttpEndpoint; @@ -28,6 +26,7 @@ import io.opentracing.Tracer; import io.vertx.core.Vertx; +import jakarta.inject.Inject; /** * A factory base class for creating Device Registry Management API endpoints. diff --git a/services/device-registry-base/src/main/java/org/eclipse/hono/deviceregistry/app/CommonConfigPropertiesProducer.java b/services/device-registry-base/src/main/java/org/eclipse/hono/deviceregistry/app/CommonConfigPropertiesProducer.java index ee3acc9576..1aa7802fa9 100644 --- a/services/device-registry-base/src/main/java/org/eclipse/hono/deviceregistry/app/CommonConfigPropertiesProducer.java +++ b/services/device-registry-base/src/main/java/org/eclipse/hono/deviceregistry/app/CommonConfigPropertiesProducer.java @@ -13,11 +13,6 @@ package org.eclipse.hono.deviceregistry.app; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Named; -import javax.inject.Singleton; - import org.eclipse.hono.client.amqp.config.ClientConfigProperties; import org.eclipse.hono.client.amqp.config.ClientOptions; import org.eclipse.hono.client.kafka.CommonKafkaClientOptions; @@ -30,6 +25,10 @@ import org.eclipse.hono.deviceregistry.service.device.AutoProvisionerConfigProperties; import io.smallrye.config.ConfigMapping; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Named; +import jakarta.inject.Singleton; /** * A producer of registry service configuration properties commonly used in registry implementations. diff --git a/services/device-registry-base/src/main/java/org/eclipse/hono/deviceregistry/app/MeterFilterProducer.java b/services/device-registry-base/src/main/java/org/eclipse/hono/deviceregistry/app/MeterFilterProducer.java index fd4d8a8b2d..af15a6918a 100644 --- a/services/device-registry-base/src/main/java/org/eclipse/hono/deviceregistry/app/MeterFilterProducer.java +++ b/services/device-registry-base/src/main/java/org/eclipse/hono/deviceregistry/app/MeterFilterProducer.java @@ -14,14 +14,13 @@ package org.eclipse.hono.deviceregistry.app; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; - import org.eclipse.hono.service.metric.MetricsTags; import org.eclipse.hono.util.Constants; import io.micrometer.core.instrument.config.MeterFilter; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; /** * A factory for {@code MeterFilter}s. diff --git a/services/device-registry-base/src/main/java/org/eclipse/hono/deviceregistry/app/NotificationSenderProducer.java b/services/device-registry-base/src/main/java/org/eclipse/hono/deviceregistry/app/NotificationSenderProducer.java index a46cc971f2..843384aa7b 100644 --- a/services/device-registry-base/src/main/java/org/eclipse/hono/deviceregistry/app/NotificationSenderProducer.java +++ b/services/device-registry-base/src/main/java/org/eclipse/hono/deviceregistry/app/NotificationSenderProducer.java @@ -15,12 +15,6 @@ import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; - import org.eclipse.hono.client.amqp.config.ClientConfigProperties; import org.eclipse.hono.client.amqp.connection.HonoConnection; import org.eclipse.hono.client.kafka.metrics.KafkaClientMetricsSupport; @@ -47,6 +41,11 @@ import io.opentracing.Tracer; import io.vertx.core.Vertx; import io.vertx.core.json.JsonObject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Singleton; /** * Creates a client for publishing notifications using the configured messaging infrastructure. diff --git a/services/device-registry-base/src/main/java/org/eclipse/hono/deviceregistry/metrics/DeviceRegistryMetricsAdapter.java b/services/device-registry-base/src/main/java/org/eclipse/hono/deviceregistry/metrics/DeviceRegistryMetricsAdapter.java index fbf321db30..048bdedcee 100644 --- a/services/device-registry-base/src/main/java/org/eclipse/hono/deviceregistry/metrics/DeviceRegistryMetricsAdapter.java +++ b/services/device-registry-base/src/main/java/org/eclipse/hono/deviceregistry/metrics/DeviceRegistryMetricsAdapter.java @@ -16,9 +16,6 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.event.Observes; -import javax.inject.Inject; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -26,6 +23,8 @@ import io.micrometer.core.instrument.MeterRegistry; import io.quarkus.runtime.StartupEvent; import io.vertx.core.Future; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; /** * A base class for implementing device registry metrics. diff --git a/services/device-registry-jdbc/src/main/java/org/eclipse/hono/deviceregistry/jdbc/app/AmqpServerFactory.java b/services/device-registry-jdbc/src/main/java/org/eclipse/hono/deviceregistry/jdbc/app/AmqpServerFactory.java index a04d43f14a..44e9a7030b 100644 --- a/services/device-registry-jdbc/src/main/java/org/eclipse/hono/deviceregistry/jdbc/app/AmqpServerFactory.java +++ b/services/device-registry-jdbc/src/main/java/org/eclipse/hono/deviceregistry/jdbc/app/AmqpServerFactory.java @@ -14,9 +14,6 @@ package org.eclipse.hono.deviceregistry.jdbc.app; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.eclipse.hono.deviceregistry.app.AbstractAmqpServerFactory; import org.eclipse.hono.deviceregistry.jdbc.config.DeviceServiceOptions; import org.eclipse.hono.deviceregistry.jdbc.config.SchemaCreator; @@ -28,6 +25,9 @@ import org.eclipse.hono.service.base.jdbc.store.tenant.AdapterStore; import org.eclipse.hono.service.tenant.TenantService; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + /** * A factory for creating AMQP 1.0 based endpoints of Hono's south bound APIs. * diff --git a/services/device-registry-jdbc/src/main/java/org/eclipse/hono/deviceregistry/jdbc/app/Application.java b/services/device-registry-jdbc/src/main/java/org/eclipse/hono/deviceregistry/jdbc/app/Application.java index fe293590ef..3380c921c6 100644 --- a/services/device-registry-jdbc/src/main/java/org/eclipse/hono/deviceregistry/jdbc/app/Application.java +++ b/services/device-registry-jdbc/src/main/java/org/eclipse/hono/deviceregistry/jdbc/app/Application.java @@ -12,10 +12,10 @@ */ package org.eclipse.hono.deviceregistry.jdbc.app; -import javax.enterprise.context.ApplicationScoped; - import org.eclipse.hono.deviceregistry.app.AbstractDeviceRegistryApplication; +import jakarta.enterprise.context.ApplicationScoped; + /** * The Quarkus based JDBC registry main application class. */ diff --git a/services/device-registry-jdbc/src/main/java/org/eclipse/hono/deviceregistry/jdbc/app/ConfigPropertiesProducer.java b/services/device-registry-jdbc/src/main/java/org/eclipse/hono/deviceregistry/jdbc/app/ConfigPropertiesProducer.java index f5b202f86d..ab235f4bbe 100644 --- a/services/device-registry-jdbc/src/main/java/org/eclipse/hono/deviceregistry/jdbc/app/ConfigPropertiesProducer.java +++ b/services/device-registry-jdbc/src/main/java/org/eclipse/hono/deviceregistry/jdbc/app/ConfigPropertiesProducer.java @@ -14,15 +14,15 @@ package org.eclipse.hono.deviceregistry.jdbc.app; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; - import org.eclipse.hono.service.base.jdbc.config.JdbcDeviceStoreOptions; import org.eclipse.hono.service.base.jdbc.config.JdbcDeviceStoreProperties; import org.eclipse.hono.service.base.jdbc.config.JdbcTenantStoreOptions; import org.eclipse.hono.service.base.jdbc.config.JdbcTenantStoreProperties; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; + /** * A producer of registry service configuration properties. * diff --git a/services/device-registry-jdbc/src/main/java/org/eclipse/hono/deviceregistry/jdbc/app/HttpServerFactory.java b/services/device-registry-jdbc/src/main/java/org/eclipse/hono/deviceregistry/jdbc/app/HttpServerFactory.java index de0b7a3d4a..31418ba59f 100644 --- a/services/device-registry-jdbc/src/main/java/org/eclipse/hono/deviceregistry/jdbc/app/HttpServerFactory.java +++ b/services/device-registry-jdbc/src/main/java/org/eclipse/hono/deviceregistry/jdbc/app/HttpServerFactory.java @@ -13,14 +13,13 @@ package org.eclipse.hono.deviceregistry.jdbc.app; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.eclipse.hono.deviceregistry.app.AbstractHttpServerFactory; import org.eclipse.hono.service.http.HttpServiceConfigOptions; import org.eclipse.hono.service.http.HttpServiceConfigProperties; import io.smallrye.config.ConfigMapping; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; /** * A factory for creating Device Registry Management API endpoints. diff --git a/services/device-registry-jdbc/src/main/java/org/eclipse/hono/deviceregistry/jdbc/app/JdbcBasedDeviceRegistryMetrics.java b/services/device-registry-jdbc/src/main/java/org/eclipse/hono/deviceregistry/jdbc/app/JdbcBasedDeviceRegistryMetrics.java index 87c9ffb8b2..8521fbfc78 100644 --- a/services/device-registry-jdbc/src/main/java/org/eclipse/hono/deviceregistry/jdbc/app/JdbcBasedDeviceRegistryMetrics.java +++ b/services/device-registry-jdbc/src/main/java/org/eclipse/hono/deviceregistry/jdbc/app/JdbcBasedDeviceRegistryMetrics.java @@ -13,13 +13,12 @@ package org.eclipse.hono.deviceregistry.jdbc.app; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.eclipse.hono.deviceregistry.metrics.DeviceRegistryMetricsAdapter; import org.eclipse.hono.service.base.jdbc.store.tenant.ManagementStore; import io.vertx.core.Future; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; /** * Metrics reported by the registry. diff --git a/services/device-registry-jdbc/src/main/java/org/eclipse/hono/deviceregistry/jdbc/app/ManagementServicesProducer.java b/services/device-registry-jdbc/src/main/java/org/eclipse/hono/deviceregistry/jdbc/app/ManagementServicesProducer.java index 2281d172c9..df49efbcaf 100644 --- a/services/device-registry-jdbc/src/main/java/org/eclipse/hono/deviceregistry/jdbc/app/ManagementServicesProducer.java +++ b/services/device-registry-jdbc/src/main/java/org/eclipse/hono/deviceregistry/jdbc/app/ManagementServicesProducer.java @@ -14,11 +14,6 @@ package org.eclipse.hono.deviceregistry.jdbc.app; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.eclipse.hono.deviceregistry.jdbc.config.DeviceServiceOptions; import org.eclipse.hono.deviceregistry.jdbc.impl.CredentialsManagementServiceImpl; import org.eclipse.hono.deviceregistry.jdbc.impl.DeviceManagementServiceImpl; @@ -34,6 +29,10 @@ import org.eclipse.hono.service.management.tenant.TenantManagementService; import io.vertx.core.Vertx; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; /** * A producer of the service instances implementing Hono's Device Registry Management API. diff --git a/services/device-registry-jdbc/src/main/java/org/eclipse/hono/deviceregistry/jdbc/app/StoreProducer.java b/services/device-registry-jdbc/src/main/java/org/eclipse/hono/deviceregistry/jdbc/app/StoreProducer.java index a75e9081ca..1c2a764b42 100644 --- a/services/device-registry-jdbc/src/main/java/org/eclipse/hono/deviceregistry/jdbc/app/StoreProducer.java +++ b/services/device-registry-jdbc/src/main/java/org/eclipse/hono/deviceregistry/jdbc/app/StoreProducer.java @@ -16,11 +16,6 @@ import java.io.IOException; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.eclipse.hono.deviceregistry.jdbc.config.SchemaCreator; import org.eclipse.hono.deviceregistry.jdbc.impl.ClasspathSchemaCreator; import org.eclipse.hono.service.HealthCheckServer; @@ -35,6 +30,10 @@ import io.opentracing.Tracer; import io.vertx.core.Vertx; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; /** * A producer of data store objects for registry data. diff --git a/services/device-registry-mongodb/src/main/java/org/eclipse/hono/deviceregistry/mongodb/app/AmqpServerFactory.java b/services/device-registry-mongodb/src/main/java/org/eclipse/hono/deviceregistry/mongodb/app/AmqpServerFactory.java index 7c13c0bd8f..986156f392 100644 --- a/services/device-registry-mongodb/src/main/java/org/eclipse/hono/deviceregistry/mongodb/app/AmqpServerFactory.java +++ b/services/device-registry-mongodb/src/main/java/org/eclipse/hono/deviceregistry/mongodb/app/AmqpServerFactory.java @@ -14,9 +14,6 @@ package org.eclipse.hono.deviceregistry.mongodb.app; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.eclipse.hono.deviceregistry.app.AbstractAmqpServerFactory; import org.eclipse.hono.deviceregistry.mongodb.config.MongoDbBasedCredentialsConfigProperties; import org.eclipse.hono.deviceregistry.mongodb.config.MongoDbBasedTenantsConfigProperties; @@ -30,6 +27,9 @@ import org.eclipse.hono.deviceregistry.service.device.AbstractRegistrationService; import org.eclipse.hono.service.tenant.TenantService; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + /** * A factory for creating AMQP 1.0 based endpoints of Hono's south bound APIs. * diff --git a/services/device-registry-mongodb/src/main/java/org/eclipse/hono/deviceregistry/mongodb/app/Application.java b/services/device-registry-mongodb/src/main/java/org/eclipse/hono/deviceregistry/mongodb/app/Application.java index b7d40c625c..4e175770db 100644 --- a/services/device-registry-mongodb/src/main/java/org/eclipse/hono/deviceregistry/mongodb/app/Application.java +++ b/services/device-registry-mongodb/src/main/java/org/eclipse/hono/deviceregistry/mongodb/app/Application.java @@ -12,10 +12,10 @@ */ package org.eclipse.hono.deviceregistry.mongodb.app; -import javax.enterprise.context.ApplicationScoped; - import org.eclipse.hono.deviceregistry.app.AbstractDeviceRegistryApplication; +import jakarta.enterprise.context.ApplicationScoped; + /** * The Quarkus based Mongo DB registry main application class. */ diff --git a/services/device-registry-mongodb/src/main/java/org/eclipse/hono/deviceregistry/mongodb/app/ConfigPropertiesProducer.java b/services/device-registry-mongodb/src/main/java/org/eclipse/hono/deviceregistry/mongodb/app/ConfigPropertiesProducer.java index e4bcc28242..fc057d836b 100644 --- a/services/device-registry-mongodb/src/main/java/org/eclipse/hono/deviceregistry/mongodb/app/ConfigPropertiesProducer.java +++ b/services/device-registry-mongodb/src/main/java/org/eclipse/hono/deviceregistry/mongodb/app/ConfigPropertiesProducer.java @@ -13,10 +13,6 @@ package org.eclipse.hono.deviceregistry.mongodb.app; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; - import org.eclipse.hono.deviceregistry.mongodb.config.MongoDbBasedCredentialsConfigOptions; import org.eclipse.hono.deviceregistry.mongodb.config.MongoDbBasedCredentialsConfigProperties; import org.eclipse.hono.deviceregistry.mongodb.config.MongoDbBasedRegistrationConfigOptions; @@ -24,6 +20,10 @@ import org.eclipse.hono.deviceregistry.mongodb.config.MongoDbBasedTenantsConfigOptions; import org.eclipse.hono.deviceregistry.mongodb.config.MongoDbBasedTenantsConfigProperties; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; + /** * A producer of registry service configuration properties. * diff --git a/services/device-registry-mongodb/src/main/java/org/eclipse/hono/deviceregistry/mongodb/app/DaoProducer.java b/services/device-registry-mongodb/src/main/java/org/eclipse/hono/deviceregistry/mongodb/app/DaoProducer.java index eafd4eb13d..e2fd37d98e 100644 --- a/services/device-registry-mongodb/src/main/java/org/eclipse/hono/deviceregistry/mongodb/app/DaoProducer.java +++ b/services/device-registry-mongodb/src/main/java/org/eclipse/hono/deviceregistry/mongodb/app/DaoProducer.java @@ -18,11 +18,6 @@ import java.util.Base64; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.eclipse.hono.deviceregistry.mongodb.config.MongoDbBasedCredentialsConfigOptions; import org.eclipse.hono.deviceregistry.mongodb.config.MongoDbBasedRegistrationConfigOptions; import org.eclipse.hono.deviceregistry.mongodb.config.MongoDbBasedTenantsConfigOptions; @@ -37,6 +32,7 @@ import org.eclipse.hono.deviceregistry.util.CryptVaultBasedFieldLevelEncryption; import org.eclipse.hono.deviceregistry.util.FieldLevelEncryption; import org.eclipse.hono.service.HealthCheckServer; +import org.yaml.snakeyaml.LoaderOptions; import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.constructor.Constructor; @@ -48,6 +44,10 @@ import io.opentracing.Tracer; import io.vertx.core.Vertx; import io.vertx.ext.mongo.MongoClient; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; /** * A producer of Data Access Objects for registry data. @@ -154,7 +154,7 @@ public CredentialsDao credentialsDao( """) private FieldLevelEncryption fieldLevelEncryption(final String path) { try (FileInputStream in = new FileInputStream(path)) { - final Yaml yaml = new Yaml(new Constructor(CryptVaultConfigurationProperties.class)); + final Yaml yaml = new Yaml(new Constructor(CryptVaultConfigurationProperties.class, new LoaderOptions())); final CryptVaultConfigurationProperties config = yaml.load(in); final CryptVault cryptVault = new CryptVault(); for (CryptVaultAutoConfiguration.Key key : config.getKeys()) { diff --git a/services/device-registry-mongodb/src/main/java/org/eclipse/hono/deviceregistry/mongodb/app/HttpServerFactory.java b/services/device-registry-mongodb/src/main/java/org/eclipse/hono/deviceregistry/mongodb/app/HttpServerFactory.java index 09981d45aa..c7aef4f369 100644 --- a/services/device-registry-mongodb/src/main/java/org/eclipse/hono/deviceregistry/mongodb/app/HttpServerFactory.java +++ b/services/device-registry-mongodb/src/main/java/org/eclipse/hono/deviceregistry/mongodb/app/HttpServerFactory.java @@ -16,9 +16,6 @@ import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.eclipse.hono.deviceregistry.app.AbstractHttpServerFactory; import org.eclipse.hono.deviceregistry.mongodb.config.MongoDbBasedHttpServiceConfigOptions; import org.eclipse.hono.deviceregistry.mongodb.config.MongoDbBasedHttpServiceConfigProperties; @@ -32,6 +29,8 @@ import io.vertx.ext.auth.mongo.impl.MongoAuthenticationImpl; import io.vertx.ext.mongo.MongoClient; import io.vertx.ext.web.handler.BasicAuthHandler; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; /** * A factory for creating Device Registry Management API endpoints. diff --git a/services/device-registry-mongodb/src/main/java/org/eclipse/hono/deviceregistry/mongodb/app/ManagementServicesProducer.java b/services/device-registry-mongodb/src/main/java/org/eclipse/hono/deviceregistry/mongodb/app/ManagementServicesProducer.java index 5df6ffd3db..fb94ce405d 100644 --- a/services/device-registry-mongodb/src/main/java/org/eclipse/hono/deviceregistry/mongodb/app/ManagementServicesProducer.java +++ b/services/device-registry-mongodb/src/main/java/org/eclipse/hono/deviceregistry/mongodb/app/ManagementServicesProducer.java @@ -14,11 +14,6 @@ package org.eclipse.hono.deviceregistry.mongodb.app; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.eclipse.hono.deviceregistry.mongodb.config.MongoDbBasedCredentialsConfigProperties; import org.eclipse.hono.deviceregistry.mongodb.config.MongoDbBasedRegistrationConfigProperties; import org.eclipse.hono.deviceregistry.mongodb.config.MongoDbBasedTenantsConfigProperties; @@ -36,6 +31,10 @@ import org.eclipse.hono.service.management.tenant.TenantManagementService; import io.vertx.core.Vertx; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; /** * A producer of the service instances implementing Hono's Device Registry Management API. diff --git a/services/device-registry-mongodb/src/main/java/org/eclipse/hono/deviceregistry/mongodb/app/MongoDbBasedDeviceRegistryMetrics.java b/services/device-registry-mongodb/src/main/java/org/eclipse/hono/deviceregistry/mongodb/app/MongoDbBasedDeviceRegistryMetrics.java index 2d6a2b6a04..5b4e1c547b 100644 --- a/services/device-registry-mongodb/src/main/java/org/eclipse/hono/deviceregistry/mongodb/app/MongoDbBasedDeviceRegistryMetrics.java +++ b/services/device-registry-mongodb/src/main/java/org/eclipse/hono/deviceregistry/mongodb/app/MongoDbBasedDeviceRegistryMetrics.java @@ -13,14 +13,13 @@ package org.eclipse.hono.deviceregistry.mongodb.app; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.eclipse.hono.deviceregistry.metrics.DeviceRegistryMetricsAdapter; import org.eclipse.hono.deviceregistry.mongodb.model.TenantDao; import io.vertx.core.Future; import io.vertx.core.json.JsonObject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; /** * Metrics reported by the registry.