diff options
| author | Harald Musum <musum@verizonmedia.com> | 2022-01-03 11:02:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-03 11:02:53 +0100 |
| commit | 997befd90e1d059c06eba100103fce58cce7ff9e (patch) | |
| tree | a330864d75b4558d70502653c590e6240f3c871f | |
| parent | 2b75400bbde6241259afe75ae6d8ceb7a8a4eaf3 (diff) | |
| parent | 9e91b543d4dd2c7536f3028500c44f59ac24201f (diff) | |
Merge pull request #20626 from vespa-engine/hmusum/deprecated-get-and-set-config-md5
Deprecate getConfigMd5() and setConfigMd5() [run-systemtest]
| -rw-r--r-- | config-lib/src/main/java/com/yahoo/config/ConfigInstance.java | 11 | ||||
| -rw-r--r-- | config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/config-lib/src/main/java/com/yahoo/config/ConfigInstance.java b/config-lib/src/main/java/com/yahoo/config/ConfigInstance.java index fad386b288e..5f06bc27dec 100644 --- a/config-lib/src/main/java/com/yahoo/config/ConfigInstance.java +++ b/config-lib/src/main/java/com/yahoo/config/ConfigInstance.java @@ -110,11 +110,20 @@ public abstract class ConfigInstance extends InnerNode { } } - + /** + * @deprecated do not use + */ + @Deprecated + // TODO: Remove in Vespa 8 public String getConfigMd5() { return configMd5; } + /** + * @deprecated do not use + */ + @Deprecated + // TODO: Remove in Vespa 8 public void setConfigMd5(String configMd5) { this.configMd5 = configMd5; } diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java b/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java index 0b98e9cd1b2..7af4144a060 100644 --- a/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java +++ b/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java @@ -124,6 +124,7 @@ public class JRTConfigSubscription<T extends ConfigInstance> extends ConfigSubsc * @param jrtRequest a config request * @return an instance of a config class (subclass of ConfigInstance) */ + @SuppressWarnings("deprecation") private T toConfigInstance(JRTClientConfigRequest jrtRequest) { Payload payload = jrtRequest.getNewPayload(); ConfigPayload configPayload = ConfigPayload.fromUtf8Array(payload.withCompression(CompressionType.UNCOMPRESSED).getData()); |