Revert "Update use of md5 and xxhash64 in more places [run-systemtest]"

2 files changed, 19 insertions, 21 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/ConfigResponseFactory.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/ConfigResponseFactory.java
index 0afab85df12..8c1cdeb753a 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/ConfigResponseFactory.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/ConfigResponseFactory.java
@@ -50,23 +50,22 @@ public interface ConfigResponseFactory {
     default PayloadChecksums generatePayloadChecksums(AbstractUtf8Array rawPayload, PayloadChecksums requestsPayloadChecksums) {
         PayloadChecksum requestChecksumMd5 = requestsPayloadChecksums.getForType(MD5);
         PayloadChecksum requestChecksumXxhash64 = requestsPayloadChecksums.getForType(XXHASH64);
-        PayloadChecksum xxhash64 = new PayloadChecksum(ConfigUtils.getXxhash64(rawPayload), XXHASH64);
 
-        if (requestChecksumMd5 == null)
-            return PayloadChecksums.from(xxhash64);
-
-        // Return xxhash64 checksum, even if none in request
-        if (requestChecksumXxhash64 == null)
-            return PayloadChecksums.from(new PayloadChecksum(ConfigUtils.getMd5(rawPayload), MD5), xxhash64);
-
-        // Response always contains xxhash64 checksum, md5 checksum is included
-        // when both are present, both are absent or only md5 is present in request
-        PayloadChecksum md5 = null;
-        if (( ! requestChecksumMd5.isEmpty() && ! requestChecksumXxhash64.isEmpty())
-                || (requestChecksumMd5.isEmpty() && requestChecksumXxhash64.isEmpty())) {
+        PayloadChecksum md5 = PayloadChecksum.empty(MD5);
+        PayloadChecksum xxhash64 = PayloadChecksum.empty(XXHASH64);
+        // Response contains same checksum type as in request, except when both are empty,
+        // then use both checksum types in response
+        if (requestChecksumMd5.isEmpty() && requestChecksumXxhash64.isEmpty()
+                || ( ! requestChecksumMd5.isEmpty() && ! requestChecksumXxhash64.isEmpty())) {
+            md5 = new PayloadChecksum(ConfigUtils.getMd5(rawPayload), MD5);
+            xxhash64 = new PayloadChecksum(ConfigUtils.getXxhash64(rawPayload), XXHASH64);
+        } else if ( ! requestChecksumMd5.isEmpty()) {
             md5 = new PayloadChecksum(ConfigUtils.getMd5(rawPayload), MD5);
-        } else if (! requestChecksumMd5.isEmpty() && requestChecksumXxhash64.isEmpty()) {
+        } else if (requestChecksumMd5.isEmpty() && !requestChecksumXxhash64.isEmpty()) {
+            xxhash64 = new PayloadChecksum(ConfigUtils.getXxhash64(rawPayload), XXHASH64);
+        } else {
             md5 = new PayloadChecksum(ConfigUtils.getMd5(rawPayload), MD5);
+            xxhash64 = new PayloadChecksum(ConfigUtils.getXxhash64(rawPayload), XXHASH64);
         }
 
         return PayloadChecksums.from(md5, xxhash64);
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/ConfigResponseFactoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/ConfigResponseFactoryTest.java
index 47094abb910..b164c3e5cd5 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/ConfigResponseFactoryTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/ConfigResponseFactoryTest.java
@@ -12,7 +12,6 @@ import org.junit.Test;
 import static com.yahoo.vespa.config.PayloadChecksum.Type.MD5;
 import static com.yahoo.vespa.config.PayloadChecksum.Type.XXHASH64;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
 
 /**
  * @author Ulf Lilleengen
@@ -40,30 +39,30 @@ public class ConfigResponseFactoryTest {
 
     @Test
     public void testLZ4CompressedFactory() {
-        // md5 and xxhash64 checksums in request, both md5 and xxhash64 checksums should be in response
+        // Both checksums in request
         {
             ConfigResponse response = createResponse(payloadChecksums);
             assertEquals(payloadChecksums, response.getPayloadChecksums());
         }
 
-        // Empty md5 and xxhash64 checksums in request, both md5 and xxhash64 checksum should be in response
+        // No checksums in request (empty checksums), both checksums should be in response
         {
             ConfigResponse response = createResponse(payloadChecksumsEmpty);
             assertEquals(payloadChecksums.getForType(MD5), response.getPayloadChecksums().getForType(MD5));
             assertEquals(payloadChecksums.getForType(XXHASH64), response.getPayloadChecksums().getForType(XXHASH64));
         }
 
-        // md5 checksum and no xxhash64 checksum in request, md5 and xxhash6 checksum in response
+        // Only md5 checksums in request
         {
             ConfigResponse response = createResponse(payloadChecksumsOnlyMd5);
             assertEquals(payloadChecksumsOnlyMd5.getForType(MD5), response.getPayloadChecksums().getForType(MD5));
-            assertEquals(payloadChecksums.getForType(XXHASH64), response.getPayloadChecksums().getForType(XXHASH64));
+            assertEquals(payloadChecksumsOnlyMd5.getForType(XXHASH64), response.getPayloadChecksums().getForType(XXHASH64));
         }
 
-        // Only xxhash64 checksum in request, only xxhash64 checksums in response
+        // Only xxhash64 checksums in request
         {
             ConfigResponse response = createResponse(payloadChecksumsOnlyXxhash64);
-            assertNull(response.getPayloadChecksums().getForType(MD5));
+            assertEquals(payloadChecksumsOnlyXxhash64.getForType(MD5), response.getPayloadChecksums().getForType(MD5));
             assertEquals(payloadChecksumsOnlyXxhash64.getForType(XXHASH64), response.getPayloadChecksums().getForType(XXHASH64));
         }
     }