Use gzip by default for payloads > 512b

2 files changed, 4 insertions, 4 deletions

diff --git a/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/ApacheCluster.java b/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/ApacheCluster.java
index b2672b4ebf3..639aebf7c46 100644
--- a/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/ApacheCluster.java
+++ b/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/ApacheCluster.java
@@ -49,7 +49,7 @@ class ApacheCluster implements Cluster {
                                                                    new BasicHeader("Vespa-Client-Version", Vespa.VERSION));
     private final Header gzipEncodingHeader = new BasicHeader(HttpHeaders.CONTENT_ENCODING, "gzip");
     private final RequestConfig requestConfig;
-    private final boolean gzip;
+    private final Compression compression;
     private int someNumber = 0;
 
     private final ExecutorService dispatchExecutor = Executors.newFixedThreadPool(8, t -> new Thread(t, "request-dispatch-thread"));
@@ -60,7 +60,7 @@ class ApacheCluster implements Cluster {
             for (URI endpoint : builder.endpoints)
                 endpoints.add(new Endpoint(createHttpClient(builder), endpoint));
         this.requestConfig = createRequestConfig(builder);
-        this.gzip = builder.compression == Compression.gzip;
+        this.compression = builder.compression;
     }
 
     @Override
@@ -89,7 +89,7 @@ class ApacheCluster implements Cluster {
                 wrapped.headers().forEach((name, value) -> request.setHeader(name, value.get()));
                 if (wrapped.body() != null) {
                     byte[] body = wrapped.body();
-                    if (gzip) {
+                    if (compression == Compression.gzip || compression == null && body.length > 512) {
                         request.setHeader(gzipEncodingHeader);
                         body = gzipped(body);
                     }
diff --git a/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/FeedClientBuilderImpl.java b/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/FeedClientBuilderImpl.java
index 6886dc3d2b9..b364ba953eb 100644
--- a/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/FeedClientBuilderImpl.java
+++ b/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/FeedClientBuilderImpl.java
@@ -51,7 +51,7 @@ public class FeedClientBuilderImpl implements FeedClientBuilder {
     boolean benchmark = true;
     boolean dryrun = false;
     boolean speedTest = false;
-    Compression compression = none;
+    Compression compression = null;
     URI proxy;