diff options
| author | Harald Musum <musum@yahooinc.com> | 2021-10-13 07:31:29 +0200 |
|---|---|---|
| committer | Harald Musum <musum@yahooinc.com> | 2021-10-13 07:31:29 +0200 |
| commit | 77bda8e21e3b4cd04eb68cd68590ce02176f253b (patch) | |
| tree | e0a7a9e66fcc81db14e9f24b9c3848e8bc47b2d5 /config-proxy | |
| parent | a5e37d9dfada0dbc346857b09be18779d2652adf (diff) | |
Cleanup, no functional changes
Diffstat (limited to 'config-proxy')
| -rw-r--r-- | config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigTester.java | 6 | ||||
| -rw-r--r-- | config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheTest.java | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigTester.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigTester.java index 45f52479cbd..82c6099b45b 100644 --- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigTester.java +++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigTester.java @@ -47,13 +47,13 @@ public class ConfigTester { long generation = 1; String defMd5 = ConfigUtils.getDefMd5(defContent); - PayloadChecksums configMd5 = PayloadChecksums.from(new PayloadChecksum(ConfigUtils.getMd5(fooConfigPayload), MD5), + PayloadChecksums payloadChecksums = PayloadChecksums.from(new PayloadChecksum(ConfigUtils.getMd5(fooConfigPayload), MD5), PayloadChecksum.empty(XXHASH64)); - fooConfig = new RawConfig(configKey, defMd5, fooPayload, configMd5, + fooConfig = new RawConfig(configKey, defMd5, fooPayload, payloadChecksums, generation, false, defContent, Optional.empty()); String defName2 = "bar"; - barConfig = new RawConfig(new ConfigKey<>(defName2, configId, namespace), defMd5, fooPayload, configMd5, + barConfig = new RawConfig(new ConfigKey<>(defName2, configId, namespace), defMd5, fooPayload, payloadChecksums, generation, false, defContent, Optional.empty()); } diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheTest.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheTest.java index b47c0bcc5ce..953b67b3ea5 100644 --- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheTest.java +++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheTest.java @@ -34,7 +34,7 @@ public class MemoryCacheTest { private final String configId2 = "clients/gateways/gateway/component/com.yahoo.feedhandler.VespaFeedHandlerRemoveLocation"; private static final String defMd52 = "a2"; private static final String differentDefMd5 = "09ef"; - private static final PayloadChecksums configMd5 = PayloadChecksums.from("b", ""); + private static final PayloadChecksums checksums = PayloadChecksums.from("b", ""); private final ConfigKey<?> configKey = new ConfigKey<>(defName, configId, namespace); private final ConfigKey<?> configKey2 = new ConfigKey<>(defName2, configId2, namespace2); private ConfigCacheKey cacheKey; @@ -64,9 +64,9 @@ public class MemoryCacheTest { slime.setString("bar \"value2\""); payloadDifferentMd5 = Payload.from(new ConfigPayload(slime)); - config = new RawConfig(configKey, defMd5, payload, configMd5, generation, false, defContent, Optional.empty()); - config2 = new RawConfig(configKey2, defMd52, payload2, configMd5, generation, false, defContent, Optional.empty()); - configDifferentMd5 = new RawConfig(configKey, differentDefMd5, payloadDifferentMd5, configMd5, generation, false, defContent, Optional.empty()); + config = new RawConfig(configKey, defMd5, payload, checksums, generation, false, defContent, Optional.empty()); + config2 = new RawConfig(configKey2, defMd52, payload2, checksums, generation, false, defContent, Optional.empty()); + configDifferentMd5 = new RawConfig(configKey, differentDefMd5, payloadDifferentMd5, checksums, generation, false, defContent, Optional.empty()); cacheKey = new ConfigCacheKey(configKey, config.getDefMd5()); cacheKey2 = new ConfigCacheKey(configKey2, config2.getDefMd5()); |