HttpClientOptions fixes

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

@@ -1091,68 +1091,69 @@ public HttpClientOptions setLogActivity(boolean logEnabled) {
   }
 
   /**
-   * Set option to offer Deflate Frame websocket compression
-   * @param tryDeflateFrame
-   * @return  a reference to this, so the API can be used fluently
+   * Set option to offer per frame WebSocket compression.
+   *
+   * @param tryUsePerFrameWebsocketCompression the per frame compression WebSocket compression
+   * @return a reference to this, so the API can be used fluently
    */
- public HttpClientOptions setTryUsePerFrameWebsocketCompression (boolean tryUsePerFrameWebsocketCompression )
+ public HttpClientOptions setTryUsePerFrameWebsocketCompression (boolean tryUsePerFrameWebsocketCompression)
  {
 	 this.websocketTryUseDeflateFrame = tryUsePerFrameWebsocketCompression;
 	 return this;
  }
 
  /**
-  *
-  * @return Whether Deflate Frame websocket compression will be offered
+  * @return Whether Deflate Frame WebSocket compression will be offered
   */
  public boolean tryWebsocketDeflateFrameCompression()
  {
 	 return this.websocketTryUseDeflateFrame;
  }
 
 /**
- * Set option to offer Permessage Deflate websocket compression
- * @param tryPermessageDeflate
+ * Set option to offer per message WebSocket compression.
+ *
+ * @param tryUsePerMessageWebsocketCompression the per message WebSocket compression
  * @return  a reference to this, so the API can be used fluently
  */
- public HttpClientOptions setTryUsePerMessageWebsocketCompression (boolean tryUsePerMessageWebsocketCompression )
+ public HttpClientOptions setTryUsePerMessageWebsocketCompression (boolean tryUsePerMessageWebsocketCompression)
  {
 	 this.websocketTryUsePermessageDeflate = tryUsePerMessageWebsocketCompression;
 	 return this;
  }
 
  /**
-  *
-  * @return whether Permessage Deflate websocket compression will be offered
+  * @return whether per message WebSocket compression will be offered
   */
  public boolean tryUsePerMessageWebsocketCompression ()
  {
 	 return this.websocketTryUsePermessageDeflate;
  }
 
  /**
-  * Set websocket compression level
-  * @param compressionLevel
+  * Set WebSocket compression level
+  *
+  * @param compressionLevel the WebSocket compression level
   * @return a reference to this, so the API can be used fluently
   */
- public HttpClientOptions setWebsocketCompressionLevel (int websocketCompressionLevel)
+ public HttpClientOptions setWebsocketCompressionLevel (int compressionLevel)
  {
-	 this.websocketCompressionLevel = websocketCompressionLevel;
+	 this.websocketCompressionLevel = compressionLevel;
 	 return this;
  }
 
  /**
-  *
-  * @return websocket compression level
+  * @return the WebSocket compression level
   */
- public int websocketCompressionLevel()
+ public int getWebsocketCompressionLevel()
  {
 	 return this.websocketCompressionLevel;
  }
 
  /**
-  * Set the websocket compression allow client no context option
-  * @param allowClientNoContext
+  * Set the WebSocket compression allow client no context option.
+  *
+  * @param allowClientNoContext the no context option value
   * @return a reference to this, so the API can be used fluently
   */
  public HttpClientOptions setWebsocketCompressionAllowClientNoContext(boolean allowClientNoContext)
@@ -1162,7 +1163,6 @@ public HttpClientOptions setWebsocketCompressionAllowClientNoContext(boolean all
  }
 
  /**
-  *
   * @return the current websocket compression client no context setting
   */
  public boolean getWebsocketCompressionAllowClientNoContext()
@@ -1171,8 +1171,9 @@ public boolean getWebsocketCompressionAllowClientNoContext()
  }
 
  /**
-  * Set the websocket compression server no context option
-  * @param requestServerNoContext
+  * Set the WebSocket compression server no context option
+  *
+  * @param requestServerNoContext the server no context option value
   * @return a reference to this, so the API can be used fluently
   */
  public HttpClientOptions setWebsocketCompressionRequestServerNoContext(boolean requestServerNoContext)
@@ -1182,7 +1183,6 @@ public HttpClientOptions setWebsocketCompressionRequestServerNoContext(boolean r
  }
 
  /**
-  *
   * @return current setting of the websocket compression server no context option
   */
  public boolean getWebsocketCompressionRequestServerNoContext()
@@ -1197,6 +1197,7 @@ public boolean getWebsocketCompressionRequestServerNoContext()
 
   /**
    * set to {@code initialBufferSizeHttpDecoder} the initial buffer of the HttpDecoder.
+   * 
    * @param decoderInitialBufferSize the initial buffer size
    * @return a reference to this, so the API can be used fluently
    */

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

@@ -712,12 +712,12 @@ synchronized void toWebSocket(String requestURI, MultiMap headers, WebsocketVers
   ArrayList<WebSocketClientExtensionHandshaker> initializeWebsocketExtensionHandshakers (HttpClientOptions options) {
     ArrayList<WebSocketClientExtensionHandshaker> extensionHandshakers = new ArrayList<WebSocketClientExtensionHandshaker>();
     if (options.tryWebsocketDeflateFrameCompression()) {
-      extensionHandshakers.add(new DeflateFrameClientExtensionHandshaker(options.websocketCompressionLevel(),
+      extensionHandshakers.add(new DeflateFrameClientExtensionHandshaker(options.getWebsocketCompressionLevel(),
         false));
     }
 
     if (options.tryUsePerMessageWebsocketCompression ()) {
-      extensionHandshakers.add(new PerMessageDeflateClientExtensionHandshaker(options.websocketCompressionLevel(),
+      extensionHandshakers.add(new PerMessageDeflateClientExtensionHandshaker(options.getWebsocketCompressionLevel(),
         ZlibCodecFactory.isSupportingWindowSizeAndMemLevel(), PerMessageDeflateServerExtensionHandshaker.MAX_WINDOW_SIZE,
         options.getWebsocketCompressionAllowClientNoContext(), options.getWebsocketCompressionRequestServerNoContext()));
     }