The TCPSSLOptions data object class has setters overload for keyCertO…

…ptions and trustOptions with different sub interfaces of the base interfaces, e.g. setPfxTrustOptions(PfxTrustOptions) for setTrustOptions(TrustOptions). This was initially done to let the JSON generated converter work since KeyCertOptions and TrustOptions are used through their implementations. This deprecates those un-necessary. The corresponding methods are removed in Vert.x 5
eclipse-vertx · Nov 17, 2023 · 35fcd1d · 35fcd1d
1 parent a38b0ba
commit 35fcd1d
Show file tree

Hide file tree

Showing 8 changed files with 105 additions and 4 deletions.
diff --git a/src/main/java/io/vertx/core/eventbus/EventBusOptions.java b/src/main/java/io/vertx/core/eventbus/EventBusOptions.java
@@ -361,35 +361,41 @@ public EventBusOptions setIdleTimeoutUnit(TimeUnit idleTimeoutUnit) {
 
   @Override
   @GenIgnore
+  @Deprecated
   public EventBusOptions setKeyCertOptions(KeyCertOptions options) {
     super.setKeyCertOptions(options);
     return this;
   }
 
+  @Deprecated
   @Override
   public EventBusOptions setKeyStoreOptions(JksOptions options) {
     super.setKeyStoreOptions(options);
     return this;
   }
 
+  @Deprecated
   @Override
   public EventBusOptions setPemKeyCertOptions(PemKeyCertOptions options) {
     super.setPemKeyCertOptions(options);
     return this;
   }
 
+  @Deprecated
   @Override
   public EventBusOptions setPemTrustOptions(PemTrustOptions options) {
     super.setPemTrustOptions(options);
     return this;
   }
 
+  @Deprecated
   @Override
   public EventBusOptions setPfxKeyCertOptions(PfxOptions options) {
     super.setPfxKeyCertOptions(options);
     return this;
   }
 
+  @Deprecated
   @Override
   public EventBusOptions setPfxTrustOptions(PfxOptions options) {
     super.setPfxTrustOptions(options);
@@ -426,6 +432,7 @@ public EventBusOptions setTrustOptions(TrustOptions options) {
     return this;
   }
 
+  @Deprecated
   @Override
   public EventBusOptions setTrustStoreOptions(JksOptions options) {
     super.setTrustStoreOptions(options);
@@ -472,11 +479,13 @@ public EventBusOptions setSslEngineOptions(SSLEngineOptions sslEngineOptions) {
     return (EventBusOptions) super.setSslEngineOptions(sslEngineOptions);
   }
 
+  @Deprecated
   @Override
   public EventBusOptions setJdkSslEngineOptions(JdkSSLEngineOptions sslEngineOptions) {
     return (EventBusOptions) super.setJdkSslEngineOptions(sslEngineOptions);
   }
 
+  @Deprecated
   @Override
   public EventBusOptions setOpenSslEngineOptions(OpenSSLEngineOptions sslEngineOptions) {
     return (EventBusOptions) super.setOpenSslEngineOptions(sslEngineOptions);

diff --git a/src/main/java/io/vertx/core/http/HttpClientOptions.java b/src/main/java/io/vertx/core/http/HttpClientOptions.java
@@ -482,18 +482,21 @@ public HttpClientOptions setSsl(boolean ssl) {
     return this;
   }
 
+  @Deprecated
   @Override
   public HttpClientOptions setKeyCertOptions(KeyCertOptions options) {
     super.setKeyCertOptions(options);
     return this;
   }
 
+  @Deprecated
   @Override
   public HttpClientOptions setKeyStoreOptions(JksOptions options) {
     super.setKeyStoreOptions(options);
     return this;
   }
 
+  @Deprecated
   @Override
   public HttpClientOptions setPfxKeyCertOptions(PfxOptions options) {
     return (HttpClientOptions) super.setPfxKeyCertOptions(options);
@@ -505,22 +508,26 @@ public HttpClientOptions setTrustOptions(TrustOptions options) {
     return this;
   }
 
+  @Deprecated
   @Override
   public HttpClientOptions setPemKeyCertOptions(PemKeyCertOptions options) {
     return (HttpClientOptions) super.setPemKeyCertOptions(options);
   }
 
+  @Deprecated
   @Override
   public HttpClientOptions setTrustStoreOptions(JksOptions options) {
     super.setTrustStoreOptions(options);
     return this;
   }
 
+  @Deprecated
   @Override
   public HttpClientOptions setPfxTrustOptions(PfxOptions options) {
     return (HttpClientOptions) super.setPfxTrustOptions(options);
   }
 
+  @Deprecated
   @Override
   public HttpClientOptions setPemTrustOptions(PemTrustOptions options) {
     return (HttpClientOptions) super.setPemTrustOptions(options);
@@ -1121,11 +1128,13 @@ public HttpClientOptions setSslEngineOptions(SSLEngineOptions sslEngineOptions)
     return (HttpClientOptions) super.setSslEngineOptions(sslEngineOptions);
   }
 
+  @Deprecated
   @Override
   public HttpClientOptions setJdkSslEngineOptions(JdkSSLEngineOptions sslEngineOptions) {
     return (HttpClientOptions) super.setSslEngineOptions(sslEngineOptions);
   }
 
+  @Deprecated
   @Override
   public HttpClientOptions setOpenSslEngineOptions(OpenSSLEngineOptions sslEngineOptions) {
     return (HttpClientOptions) super.setSslEngineOptions(sslEngineOptions);

diff --git a/src/main/java/io/vertx/core/http/HttpServerOptions.java b/src/main/java/io/vertx/core/http/HttpServerOptions.java
@@ -395,23 +395,27 @@ public HttpServerOptions setUseAlpn(boolean useAlpn) {
     return this;
   }
 
+  @Deprecated
   @Override
   public HttpServerOptions setKeyCertOptions(KeyCertOptions options) {
     super.setKeyCertOptions(options);
     return this;
   }
 
+  @Deprecated
   @Override
   public HttpServerOptions setKeyStoreOptions(JksOptions options) {
     super.setKeyStoreOptions(options);
     return this;
   }
 
+  @Deprecated
   @Override
   public HttpServerOptions setPfxKeyCertOptions(PfxOptions options) {
     return (HttpServerOptions) super.setPfxKeyCertOptions(options);
   }
 
+  @Deprecated
   @Override
   public HttpServerOptions setPemKeyCertOptions(PemKeyCertOptions options) {
     return (HttpServerOptions) super.setPemKeyCertOptions(options);
@@ -423,17 +427,20 @@ public HttpServerOptions setTrustOptions(TrustOptions options) {
     return this;
   }
 
+  @Deprecated
   @Override
   public HttpServerOptions setTrustStoreOptions(JksOptions options) {
     super.setTrustStoreOptions(options);
     return this;
   }
 
+  @Deprecated
   @Override
   public HttpServerOptions setPemTrustOptions(PemTrustOptions options) {
     return (HttpServerOptions) super.setPemTrustOptions(options);
   }
 
+  @Deprecated
   @Override
   public HttpServerOptions setPfxTrustOptions(PfxOptions options) {
     return (HttpServerOptions) super.setPfxTrustOptions(options);
@@ -516,11 +523,13 @@ public HttpServerOptions setSslEngineOptions(SSLEngineOptions sslEngineOptions)
     return this;
   }
 
+  @Deprecated
   @Override
   public HttpServerOptions setJdkSslEngineOptions(JdkSSLEngineOptions sslEngineOptions) {
     return (HttpServerOptions) super.setSslEngineOptions(sslEngineOptions);
   }
 
+  @Deprecated
   @Override
   public HttpServerOptions setOpenSslEngineOptions(OpenSSLEngineOptions sslEngineOptions) {
     return (HttpServerOptions) super.setSslEngineOptions(sslEngineOptions);

diff --git a/src/main/java/io/vertx/core/http/WebSocketClientOptions.java b/src/main/java/io/vertx/core/http/WebSocketClientOptions.java
@@ -497,21 +497,25 @@ public WebSocketClientOptions setSsl(boolean ssl) {
     return (WebSocketClientOptions)super.setSsl(ssl);
   }
 
+  @Deprecated
   @Override
   public WebSocketClientOptions setKeyCertOptions(KeyCertOptions options) {
     return (WebSocketClientOptions)super.setKeyCertOptions(options);
   }
 
+  @Deprecated
   @Override
   public WebSocketClientOptions setKeyStoreOptions(JksOptions options) {
     return (WebSocketClientOptions)super.setKeyStoreOptions(options);
   }
 
+  @Deprecated
   @Override
   public WebSocketClientOptions setPfxKeyCertOptions(PfxOptions options) {
     return (WebSocketClientOptions)super.setPfxKeyCertOptions(options);
   }
 
+  @Deprecated
   @Override
   public WebSocketClientOptions setPemKeyCertOptions(PemKeyCertOptions options) {
     return (WebSocketClientOptions)super.setPemKeyCertOptions(options);
@@ -522,16 +526,19 @@ public WebSocketClientOptions setTrustOptions(TrustOptions options) {
     return (WebSocketClientOptions)super.setTrustOptions(options);
   }
 
+  @Deprecated
   @Override
   public WebSocketClientOptions setTrustStoreOptions(JksOptions options) {
     return (WebSocketClientOptions)super.setTrustStoreOptions(options);
   }
 
+  @Deprecated
   @Override
   public WebSocketClientOptions setPfxTrustOptions(PfxOptions options) {
     return (WebSocketClientOptions)super.setPfxTrustOptions(options);
   }
 
+  @Deprecated
   @Override
   public WebSocketClientOptions setPemTrustOptions(PemTrustOptions options) {
     return (WebSocketClientOptions)super.setPemTrustOptions(options);
@@ -547,11 +554,13 @@ public WebSocketClientOptions setSslEngineOptions(SSLEngineOptions sslEngineOpti
     return (WebSocketClientOptions)super.setSslEngineOptions(sslEngineOptions);
   }
 
+  @Deprecated
   @Override
   public WebSocketClientOptions setJdkSslEngineOptions(JdkSSLEngineOptions sslEngineOptions) {
     return (WebSocketClientOptions)super.setJdkSslEngineOptions(sslEngineOptions);
   }
 
+  @Deprecated
   @Override
   public WebSocketClientOptions setOpenSslEngineOptions(OpenSSLEngineOptions sslEngineOptions) {
     return (WebSocketClientOptions)super.setOpenSslEngineOptions(sslEngineOptions);

diff --git a/src/main/java/io/vertx/core/net/ClientOptionsBase.java b/src/main/java/io/vertx/core/net/ClientOptionsBase.java
@@ -287,21 +287,25 @@ public ClientOptionsBase setSsl(boolean ssl) {
     return (ClientOptionsBase) super.setSsl(ssl);
   }
 
+  @Deprecated
   @Override
   public ClientOptionsBase setKeyCertOptions(KeyCertOptions options) {
     return (ClientOptionsBase) super.setKeyCertOptions(options);
   }
 
+  @Deprecated
   @Override
   public ClientOptionsBase setKeyStoreOptions(JksOptions options) {
     return (ClientOptionsBase) super.setKeyStoreOptions(options);
   }
 
+  @Deprecated
   @Override
   public ClientOptionsBase setPfxKeyCertOptions(PfxOptions options) {
     return (ClientOptionsBase) super.setPfxKeyCertOptions(options);
   }
 
+  @Deprecated
   @Override
   public ClientOptionsBase setPemKeyCertOptions(PemKeyCertOptions options) {
     return (ClientOptionsBase) super.setPemKeyCertOptions(options);
@@ -312,16 +316,19 @@ public ClientOptionsBase setTrustOptions(TrustOptions options) {
     return (ClientOptionsBase) super.setTrustOptions(options);
   }
 
+  @Deprecated
   @Override
   public ClientOptionsBase setTrustStoreOptions(JksOptions options) {
     return (ClientOptionsBase) super.setTrustStoreOptions(options);
   }
 
+  @Deprecated
   @Override
   public ClientOptionsBase setPfxTrustOptions(PfxOptions options) {
     return (ClientOptionsBase) super.setPfxTrustOptions(options);
   }
 
+  @Deprecated
   @Override
   public ClientOptionsBase setPemTrustOptions(PemTrustOptions options) {
     return (ClientOptionsBase) super.setPemTrustOptions(options);
@@ -337,11 +344,13 @@ public ClientOptionsBase setSslEngineOptions(SSLEngineOptions sslEngineOptions)
     return (ClientOptionsBase) super.setSslEngineOptions(sslEngineOptions);
   }
 
+  @Deprecated
   @Override
   public ClientOptionsBase setJdkSslEngineOptions(JdkSSLEngineOptions sslEngineOptions) {
     return (ClientOptionsBase) super.setJdkSslEngineOptions(sslEngineOptions);
   }
 
+  @Deprecated
   @Override
   public ClientOptionsBase setOpenSslEngineOptions(OpenSSLEngineOptions sslEngineOptions) {
     return (ClientOptionsBase) super.setOpenSslEngineOptions(sslEngineOptions);

diff --git a/src/main/java/io/vertx/core/net/NetClientOptions.java b/src/main/java/io/vertx/core/net/NetClientOptions.java
@@ -183,23 +183,27 @@ public NetClientOptions setSsl(boolean ssl) {
     return this;
   }
 
+  @Deprecated
   @Override
   public NetClientOptions setKeyCertOptions(KeyCertOptions options) {
     super.setKeyCertOptions(options);
     return this;
   }
 
+  @Deprecated
   @Override
   public NetClientOptions setKeyStoreOptions(JksOptions options) {
     super.setKeyStoreOptions(options);
     return this;
   }
 
+  @Deprecated
   @Override
   public NetClientOptions setPfxKeyCertOptions(PfxOptions options) {
     return (NetClientOptions) super.setPfxKeyCertOptions(options);
   }
 
+  @Deprecated
   @Override
   public NetClientOptions setPemKeyCertOptions(PemKeyCertOptions options) {
     return (NetClientOptions) super.setPemKeyCertOptions(options);
@@ -211,17 +215,20 @@ public NetClientOptions setTrustOptions(TrustOptions options) {
     return this;
   }
 
+  @Deprecated
   @Override
   public NetClientOptions setTrustStoreOptions(JksOptions options) {
     super.setTrustStoreOptions(options);
     return this;
   }
 
+  @Deprecated
   @Override
   public NetClientOptions setPemTrustOptions(PemTrustOptions options) {
     return (NetClientOptions) super.setPemTrustOptions(options);
   }
 
+  @Deprecated
   @Override
   public NetClientOptions setPfxTrustOptions(PfxOptions options) {
     return (NetClientOptions) super.setPfxTrustOptions(options);
@@ -260,6 +267,7 @@ public NetClientOptions setSslEngineOptions(SSLEngineOptions sslEngineOptions) {
     return (NetClientOptions) super.setSslEngineOptions(sslEngineOptions);
   }
 
+  @Deprecated
   @Override
   public NetClientOptions setJdkSslEngineOptions(JdkSSLEngineOptions sslEngineOptions) {
     return (NetClientOptions) super.setJdkSslEngineOptions(sslEngineOptions);
@@ -280,6 +288,7 @@ public NetClientOptions setTcpQuickAck(boolean tcpQuickAck) {
     return (NetClientOptions) super.setTcpQuickAck(tcpQuickAck);
   }
 
+  @Deprecated
   @Override
   public ClientOptionsBase setOpenSslEngineOptions(OpenSSLEngineOptions sslEngineOptions) {
     return super.setOpenSslEngineOptions(sslEngineOptions);