Provide a setter/getter to set the deflater level

Author: marci4

src/main/java/org/java_websocket/extensions/permessage_deflate/PerMessageDeflateExtension.java

@@ -53,23 +53,28 @@ public class PerMessageDeflateExtension extends CompressionExtension {
   // For WebSocketClients, this variable holds the extension parameters that client himself has requested.
   private Map<String, String> requestedParameters = new LinkedHashMap<>();
 
-  private Inflater inflater = new Inflater(true);
-  private Deflater deflater = new Deflater(Deflater.DEFAULT_COMPRESSION, true);
-
-  public Inflater getInflater() {
-    return inflater;
-  }
+  private int deflaterLevel = Deflater.DEFAULT_COMPRESSION;
 
-  public void setInflater(Inflater inflater) {
-    this.inflater = inflater;
-  }
+  private Inflater inflater = new Inflater(true);
+  private Deflater deflater = new Deflater(this.deflaterLevel, true);
 
-  public Deflater getDeflater() {
-    return deflater;
+  /**
+   * Get the compression level used for the compressor.
+   * @return the compression level (0-9)
+   */
+  public int getDeflaterLevel() {
+    return this.deflaterLevel;
   }
 
-  public void setDeflater(Deflater deflater) {
-    this.deflater = deflater;
+  /**
+   * Set the compression level used for the compressor.
+   * @param level the compression level (0-9)
+   */
+  public void setDeflaterLevel(int level) {
+    this.deflater.setLevel(level);
+    this.deflaterLevel = level;
+    //If the compression level is changed, the next invocation of deflate will compress the input available so far with the old level (and may be flushed); the new level will take effect only after that invocation.
+    this.deflater.deflate(new byte[0]);
   }
 
   /**
@@ -333,6 +338,7 @@ public IExtension copyInstance() {
     clone.setThreshold(this.getThreshold());
     clone.setClientNoContextTakeover(this.isClientNoContextTakeover());
     clone.setServerNoContextTakeover(this.isServerNoContextTakeover());
+    clone.setDeflaterLevel(this.getDeflaterLevel());
     return clone;
   }
 

src/test/java/org/java_websocket/extensions/PerMessageDeflateExtensionTest.java

@@ -197,64 +197,49 @@ public void testCopyInstance() {
     assertEquals(deflateExtension.getThreshold(), newDeflateExtension.getThreshold());
     assertEquals(deflateExtension.isClientNoContextTakeover(), newDeflateExtension.isClientNoContextTakeover());
     assertEquals(deflateExtension.isServerNoContextTakeover(), newDeflateExtension.isServerNoContextTakeover());
-    // Adjust this to the factory
-    //assertEquals(deflateExtension.getDeflater(), newDeflateExtension.getDeflater());
-    //assertEquals(deflateExtension.getInflater(), newDeflateExtension.getInflater());
+    assertEquals(deflateExtension.getDeflaterLevel(), newDeflateExtension.getDeflaterLevel());
+
 
     deflateExtension = new PerMessageDeflateExtension();
     deflateExtension.setThreshold(512);
     deflateExtension.setServerNoContextTakeover(false);
     deflateExtension.setClientNoContextTakeover(true);
+    deflateExtension.setDeflaterLevel(Deflater.BEST_COMPRESSION);
     newDeflateExtension = (PerMessageDeflateExtension)deflateExtension.copyInstance();
 
     assertEquals(deflateExtension.getThreshold(), newDeflateExtension.getThreshold());
     assertEquals(deflateExtension.isClientNoContextTakeover(), newDeflateExtension.isClientNoContextTakeover());
     assertEquals(deflateExtension.isServerNoContextTakeover(), newDeflateExtension.isServerNoContextTakeover());
+    assertEquals(deflateExtension.getDeflaterLevel(), newDeflateExtension.getDeflaterLevel());
 
 
     deflateExtension = new PerMessageDeflateExtension();
     deflateExtension.setThreshold(64);
     deflateExtension.setServerNoContextTakeover(true);
     deflateExtension.setClientNoContextTakeover(false);
+    deflateExtension.setDeflaterLevel(Deflater.NO_COMPRESSION);
     newDeflateExtension = (PerMessageDeflateExtension)deflateExtension.copyInstance();
 
     assertEquals(deflateExtension.getThreshold(), newDeflateExtension.getThreshold());
     assertEquals(deflateExtension.isClientNoContextTakeover(), newDeflateExtension.isClientNoContextTakeover());
     assertEquals(deflateExtension.isServerNoContextTakeover(), newDeflateExtension.isServerNoContextTakeover());
+    assertEquals(deflateExtension.getDeflaterLevel(), newDeflateExtension.getDeflaterLevel());
   }
 
   @Test
-  public void testGetInflater() {
-    PerMessageDeflateExtension deflateExtension = new PerMessageDeflateExtension();
-    assertEquals(deflateExtension.getInflater().getRemaining(), new Inflater(true).getRemaining());
-  }
-
-  @Test
-  public void testSetInflater() {
-    PerMessageDeflateExtension deflateExtension = new PerMessageDeflateExtension();
-    deflateExtension.setInflater(new Inflater(false));
-    assertEquals(deflateExtension.getInflater().getRemaining(), new Inflater(false).getRemaining());
-  }
-
-  @Test
-  public void testGetDeflater() {
+  public void testDeflaterLevel() {
     PerMessageDeflateExtension deflateExtension = new PerMessageDeflateExtension();
-    assertEquals(deflateExtension.getDeflater().finished(),
-        new Deflater(Deflater.DEFAULT_COMPRESSION, true).finished());
+    assertEquals(Deflater.DEFAULT_COMPRESSION, deflateExtension.getDeflaterLevel());
+    deflateExtension.setDeflaterLevel(Deflater.BEST_SPEED);
+    assertEquals(Deflater.BEST_SPEED, deflateExtension.getDeflaterLevel());
   }
 
-  @Test
-  public void testSetDeflater() {
-    PerMessageDeflateExtension deflateExtension = new PerMessageDeflateExtension();
-    deflateExtension.setDeflater(new Deflater(Deflater.DEFAULT_COMPRESSION, false));
-    assertEquals(deflateExtension.getDeflater().finished(),
-        new Deflater(Deflater.DEFAULT_COMPRESSION, false).finished());
-  }
   @Test
   public void testDefaults() {
     PerMessageDeflateExtension deflateExtension = new PerMessageDeflateExtension();
     assertFalse(deflateExtension.isClientNoContextTakeover());
     assertTrue(deflateExtension.isServerNoContextTakeover());
     assertEquals(1024, deflateExtension.getThreshold());
+    assertEquals(Deflater.DEFAULT_COMPRESSION, deflateExtension.getDeflaterLevel());
   }
 }