Minor rename getSni -> isSni option

eclipse-vertx · Apr 24, 2017 · 06c4d2e · 06c4d2e
1 parent 691f31e
commit 06c4d2e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/src/main/generated/io/vertx/core/net/NetServerOptionsConverter.java b/src/main/generated/io/vertx/core/net/NetServerOptionsConverter.java
@@ -57,6 +57,6 @@ public static void toJson(NetServerOptions obj, JsonObject json) {
       json.put("host", obj.getHost());
     }
     json.put("port", obj.getPort());
-    json.put("sni", obj.getSni());
+    json.put("sni", obj.isSni());
   }
 }
diff --git a/src/main/java/io/vertx/core/http/impl/HttpServerImpl.java b/src/main/java/io/vertx/core/http/impl/HttpServerImpl.java
@@ -265,7 +265,7 @@ protected void initChannel(Channel ch) throws Exception {
               }
               ChannelPipeline pipeline = ch.pipeline();
               if (sslHelper.isSSL()) {
-                if (options.getSni()) {
+                if (options.isSni()) {
                   VertxSniHandler sniHandler = new VertxSniHandler(sslHelper, vertx);
                   pipeline.addLast(sniHandler);
                   postSSLConfig(pipeline);

diff --git a/src/main/java/io/vertx/core/net/NetServerOptions.java b/src/main/java/io/vertx/core/net/NetServerOptions.java
@@ -81,7 +81,7 @@ public NetServerOptions(NetServerOptions other) {
     this.host = other.getHost();
     this.acceptBacklog = other.getAcceptBacklog();
     this.clientAuth = other.getClientAuth();
-    this.sni = other.getSni();
+    this.sni = other.isSni();
   }
 
   /**
@@ -359,7 +359,7 @@ public NetServerOptions setLogActivity(boolean logEnabled) {
    *
    * @return true if the server supports Server Name Indication
    */
-  public boolean getSni() {
+  public boolean isSni() {
     return sni;
   }
 

diff --git a/src/main/java/io/vertx/core/net/impl/NetServerBase.java b/src/main/java/io/vertx/core/net/impl/NetServerBase.java
@@ -327,7 +327,7 @@ public void channelActive(ChannelHandlerContext ctx) throws Exception {
 
       if (sslHelper.isSSL()) {
         io.netty.util.concurrent.Future<Channel> handshakeFuture;
-        if (options.getSni()) {
+        if (options.isSni()) {
           VertxSniHandler sniHandler = new VertxSniHandler(sslHelper, vertx);
           handshakeFuture = sniHandler.handshakeFuture();
           ch.pipeline().addFirst("ssl", sniHandler);

diff --git a/src/main/java/io/vertx/core/net/impl/SSLHelper.java b/src/main/java/io/vertx/core/net/impl/SSLHelper.java
@@ -179,7 +179,7 @@ public SSLHelper(HttpServerOptions options, KeyCertOptions keyCertOptions, Trust
     this.useAlpn = options.isUseAlpn();
     this.enabledProtocols = options.getEnabledSecureTransportProtocols();
     this.openSslSessionCacheEnabled = (sslEngineOptions instanceof OpenSSLEngineOptions) && ((OpenSSLEngineOptions) sslEngineOptions).isSessionCacheEnabled();
-    this.sni = options.getSni();
+    this.sni = options.isSni();
   }
 
   public SSLHelper(NetClientOptions options, KeyCertOptions keyCertOptions, TrustOptions trustOptions) {
@@ -213,7 +213,7 @@ public SSLHelper(NetServerOptions options, KeyCertOptions keyCertOptions, TrustO
     this.useAlpn = false;
     this.enabledProtocols = options.getEnabledSecureTransportProtocols();
     this.openSslSessionCacheEnabled = (options.getSslEngineOptions() instanceof OpenSSLEngineOptions) && ((OpenSSLEngineOptions) options.getSslEngineOptions()).isSessionCacheEnabled();
-    this.sni = options.getSni();
+    this.sni = options.isSni();
   }
 
   public boolean isSSL() {