Fix usage of deprecated API

eclipse-hono · Aug 8, 2023 · af1ed37 · af1ed37
1 parent 90242e6
commit af1ed37
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/...-base/src/main/java/org/eclipse/hono/adapter/http/impl/VertxBasedHttpProtocolAdapter.java b/...-base/src/main/java/org/eclipse/hono/adapter/http/impl/VertxBasedHttpProtocolAdapter.java
@@ -151,7 +151,7 @@ private void addTelemetryApiRoutes(final Router router, final Handler<RoutingCon
 
         // support CORS headers for PUTing telemetry
         router.routeWithRegex("\\/telemetry\\/.+")
-                .handler(CorsHandler.create(getConfig().getCorsAllowedOrigin())
+                .handler(CorsHandler.create().addOrigin(getConfig().getCorsAllowedOrigin())
                         .allowedMethod(HttpMethod.PUT)
                         .allowedHeader(Constants.HEADER_QOS_LEVEL)
                         .allowedHeader(Constants.HEADER_TIME_TILL_DISCONNECT)
@@ -165,7 +165,7 @@ private void addTelemetryApiRoutes(final Router router, final Handler<RoutingCon
 
             // support CORS headers for POSTing telemetry
             router.route(ROUTE_TELEMETRY_ENDPOINT)
-                    .handler(CorsHandler.create(getConfig().getCorsAllowedOrigin())
+                    .handler(CorsHandler.create().addOrigin(getConfig().getCorsAllowedOrigin())
                             .allowedMethod(HttpMethod.POST)
                             .allowedHeader(Constants.HEADER_QOS_LEVEL)
                             .allowedHeader(Constants.HEADER_TIME_TILL_DISCONNECT)
@@ -205,7 +205,7 @@ private void addEventApiRoutes(final Router router, final Handler<RoutingContext
 
         // support CORS headers for PUTing events
         router.routeWithRegex("\\/event\\/.+")
-                .handler(CorsHandler.create(getConfig().getCorsAllowedOrigin())
+                .handler(CorsHandler.create().addOrigin(getConfig().getCorsAllowedOrigin())
                         .allowedMethod(HttpMethod.PUT)
                         .allowedHeader(Constants.HEADER_TIME_TILL_DISCONNECT)
                         .allowedHeader(HttpHeaders.AUTHORIZATION.toString())
@@ -218,7 +218,7 @@ private void addEventApiRoutes(final Router router, final Handler<RoutingContext
 
             // support CORS headers for POSTing events
             router.route(ROUTE_EVENT_ENDPOINT)
-                    .handler(CorsHandler.create(getConfig().getCorsAllowedOrigin())
+                    .handler(CorsHandler.create().addOrigin(getConfig().getCorsAllowedOrigin())
                             .allowedMethod(HttpMethod.POST)
                             .allowedHeader(Constants.HEADER_TIME_TILL_DISCONNECT)
                             .allowedHeader(HttpHeaders.AUTHORIZATION.toString())
@@ -258,7 +258,7 @@ private void addCommandResponseRoutes(final Router router, final Handler<Routing
                 PARAM_DEVICE_ID, PARAM_COMMAND_REQUEST_ID);
 
         // support CORS headers for PUTing command response messages
-        final var corsHandler = CorsHandler.create(getConfig().getCorsAllowedOrigin())
+        final var corsHandler = CorsHandler.create().addOrigin(getConfig().getCorsAllowedOrigin())
                 .allowedMethod(HttpMethod.PUT)
                 .allowedHeader(Constants.HEADER_COMMAND_RESPONSE_STATUS)
                 .allowedHeader(HttpHeaders.AUTHORIZATION.toString())

diff --git a/adapters/mqtt-base/src/test/java/org/eclipse/hono/adapter/mqtt/X509AuthHandlerTest.java b/adapters/mqtt-base/src/test/java/org/eclipse/hono/adapter/mqtt/X509AuthHandlerTest.java
@@ -157,6 +157,7 @@ public void testHandleFailsWithStatusCodeFromAuthProvider(final VertxTestContext
             }));
     }
 
+    @SuppressWarnings("deprecation")
     private static X509Certificate getClientCertificate(final String subject, final String issuer) {
 
         final X509Certificate cert = mock(X509Certificate.class);

diff --git a/...ters/sigfox/src/main/java/org/eclipse/hono/adapter/sigfox/impl/SigfoxProtocolAdapter.java b/...ters/sigfox/src/main/java/org/eclipse/hono/adapter/sigfox/impl/SigfoxProtocolAdapter.java
@@ -132,7 +132,7 @@ protected void addRoutes(final Router router) {
     }
 
     private Handler<RoutingContext> dataCorsHandler() {
-        return CorsHandler.create(getConfig().getCorsAllowedOrigin())
+        return CorsHandler.create().addOrigin(getConfig().getCorsAllowedOrigin())
                 .allowedMethod(HttpMethod.GET)
                 .allowedHeader(Constants.HEADER_TIME_TILL_DISCONNECT)
                 .allowedHeader(HttpHeaders.AUTHORIZATION.toString())