Client tcp/ssl option renaming

src/main/asciidoc/net.adoc

@@ -490,7 +490,7 @@ extension can also be loaded in a similar fashion than JKS trust stores:
 NetServerOptions options = new NetServerOptions().
     setSsl(true).
     setClientAuthRequired(true).
-    setPfxCaOptions(
+    setPfxTrustOptions(
         new PfxOptions().
             setPath("/path/to/your/truststore.pfx").
             setPassword("password-of-your-truststore")
@@ -506,7 +506,7 @@ Buffer myTrustStoreAsABuffer = vertx.fileSystem().readFileBlocking("/path/to/you
 NetServerOptions options = new NetServerOptions().
     setSsl(true).
     setClientAuthRequired(true).
-    setPfxCaOptions(
+    setPfxTrustOptions(
         new PfxOptions().
             setValue(myTrustStoreAsABuffer).
             setPassword("password-of-your-truststore")
@@ -521,8 +521,8 @@ Another way of providing server certificate authority using a list `.pem` files.
 NetServerOptions options = new NetServerOptions().
     setSsl(true).
     setClientAuthRequired(true).
-    setPemCaOptions(
-        new PemCaOptions().
+    setPemTrustOptions(
+        new PemTrustOptions().
             addCertPath("/path/to/your/server-ca.pem")
     );
 NetServer server = vertx.createNetServer(options);
@@ -536,8 +536,8 @@ Buffer myCaAsABuffer = vertx.fileSystem().readFileBlocking("/path/to/your/server
 NetServerOptions options = new NetServerOptions().
     setSsl(true).
     setClientAuthRequired(true).
-    setPemCaOptions(
-        new PemCaOptions().
+    setPemTrustOptions(
+        new PemTrustOptions().
             addCertValue(myCaAsABuffer)
     );
 NetServer server = vertx.createNetServer(options);

src/main/java/examples/NetExamples.java

@@ -279,7 +279,7 @@ public void example25(Vertx vertx) {
     NetServerOptions options = new NetServerOptions().
         setSsl(true).
         setClientAuthRequired(true).
-        setPfxCaOptions(
+        setPfxTrustOptions(
             new PfxOptions().
                 setPath("/path/to/your/truststore.pfx").
                 setPassword("password-of-your-truststore")
@@ -292,7 +292,7 @@ public void example26(Vertx vertx) {
     NetServerOptions options = new NetServerOptions().
         setSsl(true).
         setClientAuthRequired(true).
-        setPfxCaOptions(
+        setPfxTrustOptions(
             new PfxOptions().
                 setValue(myTrustStoreAsABuffer).
                 setPassword("password-of-your-truststore")
@@ -304,8 +304,8 @@ public void example27(Vertx vertx) {
     NetServerOptions options = new NetServerOptions().
         setSsl(true).
         setClientAuthRequired(true).
-        setPemCaOptions(
-            new PemCaOptions().
+        setPemTrustOptions(
+            new PemTrustOptions().
                 addCertPath("/path/to/your/server-ca.pem")
         );
     NetServer server = vertx.createNetServer(options);
@@ -316,8 +316,8 @@ public void example28(Vertx vertx) {
     NetServerOptions options = new NetServerOptions().
         setSsl(true).
         setClientAuthRequired(true).
-        setPemCaOptions(
-            new PemCaOptions().
+        setPemTrustOptions(
+            new PemTrustOptions().
                 addCertValue(myCaAsABuffer)
         );
     NetServer server = vertx.createNetServer(options);

src/main/java/io/vertx/core/http/HttpClientOptions.java

@@ -20,11 +20,9 @@
 import io.vertx.core.json.JsonObject;
 import io.vertx.core.net.ClientOptionsBase;
 import io.vertx.core.net.JksOptions;
-import io.vertx.core.net.PemCaOptions;
+import io.vertx.core.net.PemTrustOptions;
 import io.vertx.core.net.PemKeyCertOptions;
 import io.vertx.core.net.PfxOptions;
-import io.vertx.core.net.CaOptions;
-import io.vertx.core.net.TCPSSLOptions;
 
 /**
  * Options describing how an {@link HttpClient} will make connections.
@@ -215,13 +213,13 @@ public HttpClientOptions setTrustStoreOptions(JksOptions options) {
   }
 
   @Override
-  public HttpClientOptions setPfxCaOptions(PfxOptions options) {
-    return (HttpClientOptions) super.setPfxCaOptions(options);
+  public HttpClientOptions setPfxTrustOptions(PfxOptions options) {
+    return (HttpClientOptions) super.setPfxTrustOptions(options);
   }
 
   @Override
-  public HttpClientOptions setPemCaOptions(PemCaOptions options) {
-    return (HttpClientOptions) super.setPemCaOptions(options);
+  public HttpClientOptions setPemTrustOptions(PemTrustOptions options) {
+    return (HttpClientOptions) super.setPemTrustOptions(options);
   }
 
   @Override

src/main/java/io/vertx/core/http/HttpServerOptions.java

@@ -19,11 +19,10 @@
 import io.vertx.codegen.annotations.DataObject;
 import io.vertx.core.json.JsonObject;
 import io.vertx.core.net.JksOptions;
-import io.vertx.core.net.PemCaOptions;
+import io.vertx.core.net.PemTrustOptions;
 import io.vertx.core.net.PemKeyCertOptions;
 import io.vertx.core.net.NetServerOptions;
 import io.vertx.core.net.PfxOptions;
-import io.vertx.core.net.CaOptions;
 
 /**
  * Represents options used by an {@link io.vertx.core.http.HttpServer} instance
@@ -170,13 +169,13 @@ public HttpServerOptions setTrustStoreOptions(JksOptions options) {
   }
 
   @Override
-  public HttpServerOptions setPemCaOptions(PemCaOptions options) {
-    return (HttpServerOptions) super.setPemCaOptions(options);
+  public HttpServerOptions setPemTrustOptions(PemTrustOptions options) {
+    return (HttpServerOptions) super.setPemTrustOptions(options);
   }
 
   @Override
-  public HttpServerOptions setPfxCaOptions(PfxOptions options) {
-    return (HttpServerOptions) super.setPfxCaOptions(options);
+  public HttpServerOptions setPfxTrustOptions(PfxOptions options) {
+    return (HttpServerOptions) super.setPfxTrustOptions(options);
   }
 
   @Override

src/main/java/io/vertx/core/http/impl/HttpClientImpl.java

@@ -91,7 +91,7 @@ public class HttpClientImpl implements HttpClient {
   public HttpClientImpl(VertxInternal vertx, HttpClientOptions options) {
     this.vertx = vertx;
     this.options = new HttpClientOptions(options);
-    this.sslHelper = new SSLHelper(options, KeyStoreHelper.create(vertx, options.getKeyCertOptions()), KeyStoreHelper.create(vertx, options.getCaOptions()));
+    this.sslHelper = new SSLHelper(options, KeyStoreHelper.create(vertx, options.getKeyCertOptions()), KeyStoreHelper.create(vertx, options.getTrustOptions()));
     this.creatingContext = vertx.getContext();
     closeHook = completionHandler -> {
       HttpClientImpl.this.close();

src/main/java/io/vertx/core/http/impl/HttpServerImpl.java

@@ -131,7 +131,7 @@ public HttpServerImpl(VertxInternal vertx, HttpServerOptions options) {
       }
       creatingContext.addCloseHook(this);
     }
-    this.sslHelper = new SSLHelper(options, KeyStoreHelper.create(vertx, options.getKeyCertOptions()), KeyStoreHelper.create(vertx, options.getCaOptions()));
+    this.sslHelper = new SSLHelper(options, KeyStoreHelper.create(vertx, options.getKeyCertOptions()), KeyStoreHelper.create(vertx, options.getTrustOptions()));
     this.subProtocols = options.getWebsocketSubProtocols();
     this.metrics = vertx.metricsSPI().createMetrics(this, options);
   }

src/main/java/io/vertx/core/net/JksOptions.java

@@ -45,7 +45,7 @@
  * @author <a href="http://tfox.org">Tim Fox</a>
  */
 @DataObject
-public class JksOptions implements KeyCertOptions, CaOptions, Cloneable {
+public class JksOptions implements KeyCertOptions, TrustOptions, Cloneable {
 
   private String password;
   private String path;

src/main/java/io/vertx/core/net/NetClientOptions.java

@@ -154,13 +154,13 @@ public NetClientOptions setTrustStoreOptions(JksOptions options) {
   }
 
   @Override
-  public NetClientOptions setPemCaOptions(PemCaOptions options) {
-    return (NetClientOptions) super.setPemCaOptions(options);
+  public NetClientOptions setPemTrustOptions(PemTrustOptions options) {
+    return (NetClientOptions) super.setPemTrustOptions(options);
   }
 
   @Override
-  public NetClientOptions setPfxCaOptions(PfxOptions options) {
-    return (NetClientOptions) super.setPfxCaOptions(options);
+  public NetClientOptions setPfxTrustOptions(PfxOptions options) {
+    return (NetClientOptions) super.setPfxTrustOptions(options);
   }
 
   @Override

src/main/java/io/vertx/core/net/NetServerOptions.java

@@ -174,13 +174,13 @@ public NetServerOptions setTrustStoreOptions(JksOptions options) {
   }
 
   @Override
-  public NetServerOptions setPfxCaOptions(PfxOptions options) {
-    return (NetServerOptions) super.setPfxCaOptions(options);
+  public NetServerOptions setPfxTrustOptions(PfxOptions options) {
+    return (NetServerOptions) super.setPfxTrustOptions(options);
   }
 
   @Override
-  public NetServerOptions setPemCaOptions(PemCaOptions options) {
-    return (NetServerOptions) super.setPemCaOptions(options);
+  public NetServerOptions setPemTrustOptions(PemTrustOptions options) {
+    return (NetServerOptions) super.setPemTrustOptions(options);
   }
 
   @Override

src/main/java/io/vertx/core/net/PemCaOptions.java → src/main/java/io/vertx/core/net/PemTrustOptions.java

@@ -29,7 +29,7 @@
 
 /**
  * Certificate Authority options configuring certificates based on
- * <i>Privacy-enhanced Electronic Email</i> (PEM) files. The store is configured with a list of
+ * <i>Privacy-enhanced Electronic Email</i> (PEM) files. The options is configured with a list of
  * validating certificates.
  * <p>
  * Validating certificates must contain X.509 certificates wrapped in a PEM block:<p>
@@ -46,7 +46,7 @@
  * <p>
  * <pre>
  * HttpServerOptions options = new HttpServerOptions();
- * options.setPemCaOptions(new PemCaOptions().addCertPath("/cert.pem"));
+ * options.setPemTrustOptions(new PemTrustOptions().addCertPath("/cert.pem"));
  * </pre>
  *
  * Or directly provided as a buffer:
@@ -55,22 +55,22 @@
  * <pre>
  * Buffer cert = vertx.fileSystem().readFileSync("/cert.pem");
  * HttpServerOptions options = new HttpServerOptions();
- * options.setPemCaOptions(new PemCaOptions().addCertValue(cert));
+ * options.setPemTrustOptions(new PemTrustOptions().addCertValue(cert));
  * </pre>
  *
  * @author <a href="mailto:julien@julienviet.com">Julien Viet</a>
  * @author <a href="http://tfox.org">Tim Fox</a>
  */
 @DataObject
-public class PemCaOptions implements CaOptions, Cloneable {
+public class PemTrustOptions implements TrustOptions, Cloneable {
 
   private ArrayList<String> certPaths;
   private ArrayList<Buffer> certValues;
 
   /**
    * Default constructor
    */
-  public PemCaOptions() {
+  public PemTrustOptions() {
     super();
     this.certPaths = new ArrayList<>();
     this.certValues = new ArrayList<>();
@@ -81,7 +81,7 @@ public PemCaOptions() {
    *
    * @param other  the options to copy
    */
-  public PemCaOptions(PemCaOptions other) {
+  public PemTrustOptions(PemTrustOptions other) {
     super();
     this.certPaths = new ArrayList<>(other.getCertPaths());
     this.certValues = new ArrayList<>(other.getCertValues());
@@ -92,7 +92,7 @@ public PemCaOptions(PemCaOptions other) {
    *
    * @param json  the JSON
    */
-  public PemCaOptions(JsonObject json) {
+  public PemTrustOptions(JsonObject json) {
     super();
     this.certPaths = new ArrayList<>();
     this.certValues = new ArrayList<>();
@@ -118,7 +118,7 @@ public List<String> getCertPaths() {
    * @return a reference to this, so the API can be used fluently
    * @throws NullPointerException
    */
-  public PemCaOptions addCertPath(String certPath) throws NullPointerException {
+  public PemTrustOptions addCertPath(String certPath) throws NullPointerException {
     Objects.requireNonNull(certPath, "No null certificate accepted");
     Arguments.require(!certPath.isEmpty(), "No empty certificate path accepted");
     certPaths.add(certPath);
@@ -140,15 +140,15 @@ public List<Buffer> getCertValues() {
    * @return a reference to this, so the API can be used fluently
    * @throws NullPointerException
    */
-  public PemCaOptions addCertValue(Buffer certValue) throws NullPointerException {
+  public PemTrustOptions addCertValue(Buffer certValue) throws NullPointerException {
     Objects.requireNonNull(certValue, "No null certificate accepted");
     certValues.add(certValue);
     return this;
   }
 
   @Override
-  public PemCaOptions clone() {
-    return new PemCaOptions(this);
+  public PemTrustOptions clone() {
+    return new PemTrustOptions(this);
   }
 
 }

src/main/java/io/vertx/core/net/PfxOptions.java

@@ -45,7 +45,7 @@
  * @author <a href="http://tfox.org">Tim Fox</a>
  */
 @DataObject
-public class PfxOptions implements KeyCertOptions, CaOptions, Cloneable {
+public class PfxOptions implements KeyCertOptions, TrustOptions, Cloneable {
 
   private String password;
   private String path;