Remove long deprecated options from CertificateConfig

These options where deprecated more than 2 years ago in 272119d
quarkusio · Jul 5, 2023 · 4f48afc · 4f48afc
1 parent 86d5083
commit 4f48afc
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 34 deletions.
diff --git a/...ons/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/CertificateConfig.java b/...ons/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/CertificateConfig.java
@@ -40,31 +40,13 @@ public class CertificateConfig {
     @ConvertWith(TrimmedStringConverter.class)
     public Optional<String> 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<Path> file;
-
     /**
      * The list of path to server certificates using the PEM format.
      * Specifying multiple files require SNI to be enabled.
      */
     @ConfigItem
     public Optional<List<Path>> files;
 
-    /**
-     * The file path to the corresponding certificate private key file in PEM format.
-     *
-     * @deprecated Use {@link #keyFiles} instead.
-     */
-    @ConfigItem
-    @Deprecated
-    public Optional<Path> 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/...p/runtime/src/main/java/io/quarkus/vertx/http/runtime/options/HttpServerOptionsUtils.java b/...p/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<Path> certFile = sslConfig.certificate.file;
-        final Optional<Path> keyFile = sslConfig.certificate.keyFile;
         final List<Path> keys = new ArrayList<>();
         final List<Path> 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<String, String> credentials = Map.of();
@@ -145,8 +137,6 @@ public static HttpServerOptions createSslOptionsForManagementInterface(Managemen
 
         ServerSslConfig sslConfig = httpConfiguration.ssl;
 
-        final Optional<Path> certFile = sslConfig.certificate.file;
-        final Optional<Path> keyFile = sslConfig.certificate.keyFile;
         final List<Path> keys = new ArrayList<>();
         final List<Path> 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<String, String> credentials = Map.of();