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

4 files changed, 8 insertions, 33 deletions

diff --git a/config/src/main/java/com/yahoo/vespa/config/PayloadChecksums.java b/config/src/main/java/com/yahoo/vespa/config/PayloadChecksums.java
index be935043dc0..d30e5b055bc 100644
--- a/config/src/main/java/com/yahoo/vespa/config/PayloadChecksums.java
+++ b/config/src/main/java/com/yahoo/vespa/config/PayloadChecksums.java
@@ -24,20 +24,14 @@ public class PayloadChecksums {
     private final Map<PayloadChecksum.Type, PayloadChecksum> checksums = new LinkedHashMap<>();
 
     private PayloadChecksums() {
-        this(false);
+        Arrays.stream(PayloadChecksum.Type.values()).forEach(type -> checksums.put(type, PayloadChecksum.empty(type)));
     }
 
-    private PayloadChecksums(boolean addEmptyChecksumForAllTypes) {
-        if (addEmptyChecksumForAllTypes)
-            Arrays.stream(PayloadChecksum.Type.values())
-                  .forEach(type -> checksums.put(type, PayloadChecksum.empty(type)));
-    }
-
-    public static PayloadChecksums empty() { return new PayloadChecksums(true); }
+    public static PayloadChecksums empty() { return new PayloadChecksums(); }
 
     public static PayloadChecksums from(PayloadChecksum... checksums) {
         PayloadChecksums payloadChecksums = new PayloadChecksums();
-        Arrays.stream(checksums).filter(Objects::nonNull).forEach(payloadChecksums::add);
+        Arrays.stream(checksums).forEach(payloadChecksums::add);
         return payloadChecksums;
     }
 
diff --git a/config/src/main/java/com/yahoo/vespa/config/RawConfig.java b/config/src/main/java/com/yahoo/vespa/config/RawConfig.java
index 30e169e2597..78c3fefc936 100755
--- a/config/src/main/java/com/yahoo/vespa/config/RawConfig.java
+++ b/config/src/main/java/com/yahoo/vespa/config/RawConfig.java
@@ -141,15 +141,7 @@ public class RawConfig extends ConfigInstance {
      * @return  true if this config is equal to the config in the given request.
      */
     public boolean hasEqualConfig(JRTServerConfigRequest req) {
-        PayloadChecksums payloadChecksums = getPayloadChecksums();
-        PayloadChecksum xxhash64 = payloadChecksums.getForType(PayloadChecksum.Type.XXHASH64);
-        PayloadChecksum md5 = payloadChecksums.getForType(PayloadChecksum.Type.MD5);
-        if (xxhash64 != null)
-            return xxhash64.equals(req.getRequestConfigChecksums().getForType(PayloadChecksum.Type.XXHASH64));
-        if (md5 != null)
-            return md5.equals(req.getRequestConfigChecksums().getForType(PayloadChecksum.Type.MD5));
-
-        return true;
+        return getConfigMd5().equals(req.getRequestConfigMd5());
     }
 
     /**
diff --git a/config/src/main/java/com/yahoo/vespa/config/protocol/ConfigResponse.java b/config/src/main/java/com/yahoo/vespa/config/protocol/ConfigResponse.java
index 47d3203b32e..98fc7f7a50e 100644
--- a/config/src/main/java/com/yahoo/vespa/config/protocol/ConfigResponse.java
+++ b/config/src/main/java/com/yahoo/vespa/config/protocol/ConfigResponse.java
@@ -1,7 +1,6 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.config.protocol;
 
-import com.yahoo.vespa.config.PayloadChecksum;
 import com.yahoo.vespa.config.PayloadChecksums;
 import com.yahoo.text.AbstractUtf8Array;
 
@@ -29,15 +28,7 @@ public interface ConfigResponse {
     void serialize(OutputStream os, CompressionType uncompressed) throws IOException;
 
     default boolean hasEqualConfig(JRTServerConfigRequest request) {
-        PayloadChecksums payloadChecksums = getPayloadChecksums();
-        PayloadChecksum xxhash64 = payloadChecksums.getForType(PayloadChecksum.Type.XXHASH64);
-        PayloadChecksum md5 = payloadChecksums.getForType(PayloadChecksum.Type.MD5);
-        if (xxhash64 != null)
-            return xxhash64.equals(request.getRequestConfigChecksums().getForType(PayloadChecksum.Type.XXHASH64));
-        if (md5 != null)
-            return md5.equals(request.getRequestConfigChecksums().getForType(PayloadChecksum.Type.MD5));
-
-        return true;
+        return (getConfigMd5().equals(request.getRequestConfigMd5()));
     }
 
     default boolean hasNewerGeneration(JRTServerConfigRequest request) {
diff --git a/config/src/main/java/com/yahoo/vespa/config/protocol/JRTServerConfigRequestV3.java b/config/src/main/java/com/yahoo/vespa/config/protocol/JRTServerConfigRequestV3.java
index d342e42ec03..13d0ca1119a 100644
--- a/config/src/main/java/com/yahoo/vespa/config/protocol/JRTServerConfigRequestV3.java
+++ b/config/src/main/java/com/yahoo/vespa/config/protocol/JRTServerConfigRequestV3.java
@@ -82,10 +82,8 @@ public class JRTServerConfigRequestV3 implements JRTServerConfigRequest {
             JsonGenerator jsonGenerator = createJsonGenerator(byteArrayOutputStream);
             jsonGenerator.writeStartObject();
             addCommonReturnValues(jsonGenerator);
-            if (payloadChecksums.getForType(MD5) != null)
-                setResponseField(jsonGenerator, SlimeResponseData.RESPONSE_CONFIG_MD5, payloadChecksums.getForType(MD5).asString());
-            if (payloadChecksums.getForType(XXHASH64) != null)
-                setResponseField(jsonGenerator, SlimeResponseData.RESPONSE_CONFIG_XXHASH64, payloadChecksums.getForType(XXHASH64).asString());
+            setResponseField(jsonGenerator, SlimeResponseData.RESPONSE_CONFIG_MD5, payloadChecksums.getForType(MD5).asString());
+            setResponseField(jsonGenerator, SlimeResponseData.RESPONSE_CONFIG_XXHASH64, payloadChecksums.getForType(XXHASH64).asString());
             setResponseField(jsonGenerator, SlimeResponseData.RESPONSE_CONFIG_GENERATION, generation);
             setResponseField(jsonGenerator, SlimeResponseData.RESPONSE_APPLY_ON_RESTART, applyOnRestart);
             jsonGenerator.writeObjectFieldStart(SlimeResponseData.RESPONSE_COMPRESSION_INFO);