From 2794c39505bee60728e584943486060ac9e9a44d Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Wed, 5 Jul 2023 11:21:07 +0300 Subject: [PATCH 1/2] Remove long deprecated options from CertificateConfig These options where deprecated more than 2 years ago in 272119dcbec1b7a0fbff96c08729b86223bce258 --- .../vertx/http/runtime/CertificateConfig.java | 18 ------------------ .../options/HttpServerOptionsUtils.java | 16 ---------------- 2 files changed, 34 deletions(-) diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/CertificateConfig.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/CertificateConfig.java index ede0b22e7e484..1d8fa0a4f5936 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/CertificateConfig.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/CertificateConfig.java @@ -40,15 +40,6 @@ public class CertificateConfig { @ConvertWith(TrimmedStringConverter.class) public Optional credentialsProviderName = Optional.empty(); - /** - * The file path to a server certificate or certificate chain in PEM format. - * - * @deprecated Use {@link #files} instead. - */ - @ConfigItem - @Deprecated - public Optional file; - /** * The list of path to server certificates using the PEM format. * Specifying multiple files require SNI to be enabled. @@ -56,15 +47,6 @@ public class CertificateConfig { @ConfigItem public Optional> files; - /** - * The file path to the corresponding certificate private key file in PEM format. - * - * @deprecated Use {@link #keyFiles} instead. - */ - @ConfigItem - @Deprecated - public Optional keyFile; - /** * The list of path to server certificates private key file using the PEM format. * Specifying multiple files require SNI to be enabled. diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/options/HttpServerOptionsUtils.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/options/HttpServerOptionsUtils.java index ad284f75f93a9..40da5213448a2 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/options/HttpServerOptionsUtils.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/options/HttpServerOptionsUtils.java @@ -44,8 +44,6 @@ public static HttpServerOptions createSslOptions(HttpBuildTimeConfig buildTimeCo ServerSslConfig sslConfig = httpConfiguration.ssl; - final Optional certFile = sslConfig.certificate.file; - final Optional keyFile = sslConfig.certificate.keyFile; final List keys = new ArrayList<>(); final List certificates = new ArrayList<>(); if (sslConfig.certificate.keyFiles.isPresent()) { @@ -54,12 +52,6 @@ public static HttpServerOptions createSslOptions(HttpBuildTimeConfig buildTimeCo if (sslConfig.certificate.files.isPresent()) { certificates.addAll(sslConfig.certificate.files.get()); } - if (keyFile.isPresent()) { - keys.add(keyFile.get()); - } - if (certFile.isPresent()) { - certificates.add(certFile.get()); - } // credentials provider Map credentials = Map.of(); @@ -145,8 +137,6 @@ public static HttpServerOptions createSslOptionsForManagementInterface(Managemen ServerSslConfig sslConfig = httpConfiguration.ssl; - final Optional certFile = sslConfig.certificate.file; - final Optional keyFile = sslConfig.certificate.keyFile; final List keys = new ArrayList<>(); final List certificates = new ArrayList<>(); if (sslConfig.certificate.keyFiles.isPresent()) { @@ -155,12 +145,6 @@ public static HttpServerOptions createSslOptionsForManagementInterface(Managemen if (sslConfig.certificate.files.isPresent()) { certificates.addAll(sslConfig.certificate.files.get()); } - if (keyFile.isPresent()) { - keys.add(keyFile.get()); - } - if (certFile.isPresent()) { - certificates.add(certFile.get()); - } // credentials provider Map credentials = Map.of(); From d55e53392eefd2c4a2eeff7c462ccc9ec20309f5 Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Wed, 2 Aug 2023 18:08:34 +0200 Subject: [PATCH 2/2] Fixed tests and got rid of quarkus-resteasy-mutiny --- integration-tests/grpc-mutual-auth/pom.xml | 21 ++----------------- .../src/main/resources/application.properties | 4 ++-- integration-tests/grpc-tls/pom.xml | 21 ++----------------- .../src/main/resources/application.properties | 4 ++-- 4 files changed, 8 insertions(+), 42 deletions(-) diff --git a/integration-tests/grpc-mutual-auth/pom.xml b/integration-tests/grpc-mutual-auth/pom.xml index bea724d90271d..e0a8f4577a7b5 100644 --- a/integration-tests/grpc-mutual-auth/pom.xml +++ b/integration-tests/grpc-mutual-auth/pom.xml @@ -16,11 +16,7 @@ io.quarkus - quarkus-resteasy - - - io.quarkus - quarkus-resteasy-mutiny + quarkus-resteasy-reactive io.quarkus @@ -78,20 +74,7 @@ io.quarkus - quarkus-resteasy-deployment - ${project.version} - pom - test - - - * - * - - - - - io.quarkus - quarkus-resteasy-mutiny-deployment + quarkus-resteasy-reactive-deployment ${project.version} pom test diff --git a/integration-tests/grpc-mutual-auth/src/main/resources/application.properties b/integration-tests/grpc-mutual-auth/src/main/resources/application.properties index 86259c5cf33cb..8c606e7e195ba 100644 --- a/integration-tests/grpc-mutual-auth/src/main/resources/application.properties +++ b/integration-tests/grpc-mutual-auth/src/main/resources/application.properties @@ -21,8 +21,8 @@ quarkus.grpc.server.ssl.trust-store-password=123456 quarkus.grpc.server.ssl.client-auth=REQUIRED %vertx.quarkus.http.insecure-requests=disabled -%vertx.quarkus.http.ssl.certificate.file=tls/server.pem -%vertx.quarkus.http.ssl.certificate.key-file=tls/server.key +%vertx.quarkus.http.ssl.certificate.files=tls/server.pem +%vertx.quarkus.http.ssl.certificate.key-files=tls/server.key %vertx.quarkus.http.ssl.certificate.trust-store-file=tls/ca.jks %vertx.quarkus.http.ssl.certificate.trust-store-password=123456 %vertx.quarkus.http.ssl.client-auth=required diff --git a/integration-tests/grpc-tls/pom.xml b/integration-tests/grpc-tls/pom.xml index 617b39cb540c7..c7749e2cce27c 100644 --- a/integration-tests/grpc-tls/pom.xml +++ b/integration-tests/grpc-tls/pom.xml @@ -16,11 +16,7 @@ io.quarkus - quarkus-resteasy - - - io.quarkus - quarkus-resteasy-mutiny + quarkus-resteasy-reactive io.quarkus @@ -69,20 +65,7 @@ io.quarkus - quarkus-resteasy-deployment - ${project.version} - pom - test - - - * - * - - - - - io.quarkus - quarkus-resteasy-mutiny-deployment + quarkus-resteasy-reactive-deployment ${project.version} pom test diff --git a/integration-tests/grpc-tls/src/main/resources/application.properties b/integration-tests/grpc-tls/src/main/resources/application.properties index b1e89cf8399d0..736059e3318a6 100644 --- a/integration-tests/grpc-tls/src/main/resources/application.properties +++ b/integration-tests/grpc-tls/src/main/resources/application.properties @@ -5,8 +5,8 @@ quarkus.grpc.clients.hello.ssl.trust-store=tls/ca.pem quarkus.grpc.server.ssl.certificate=tls/server.pem quarkus.grpc.server.ssl.key=tls/server.key -%vertx.quarkus.http.ssl.certificate.file=tls/server.pem -%vertx.quarkus.http.ssl.certificate.key-file=tls/server.key +%vertx.quarkus.http.ssl.certificate.files=tls/server.pem +%vertx.quarkus.http.ssl.certificate.key-files=tls/server.key quarkus.grpc.server.port=9001