diff options
author | Harald Musum <musum@yahooinc.com> | 2021-11-05 07:23:28 +0100 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2021-11-05 07:23:28 +0100 |
commit | 073fc34e37e40c329269a8ff83a8ed492cd7fb90 (patch) | |
tree | bcd46e44f99116e33ba749260a394a86877f3ce4 | |
parent | 807c50798c764fc59da27cfef67d0697eb1d5ae4 (diff) |
GC unused methods
-rw-r--r-- | config-model-api/abi-spec.json | 5 | ||||
-rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/application/api/FileRegistry.java | 30 |
2 files changed, 3 insertions, 32 deletions
diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json index e9431622027..15e53492860 100644 --- a/config-model-api/abi-spec.json +++ b/config-model-api/abi-spec.json @@ -479,12 +479,9 @@ "methods": [ "public abstract com.yahoo.config.FileReference addFile(java.lang.String)", "public abstract com.yahoo.config.FileReference addUri(java.lang.String)", - "public com.yahoo.config.FileReference addBlob(java.nio.ByteBuffer)", "public abstract com.yahoo.config.FileReference addBlob(java.lang.String, java.nio.ByteBuffer)", "public com.yahoo.config.FileReference addApplicationPackage()", - "public java.lang.String fileSourceHost()", - "public abstract java.util.List export()", - "public static java.lang.String blobName(java.nio.ByteBuffer)" + "public abstract java.util.List export()" ], "fields": [] }, diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/FileRegistry.java b/config-model-api/src/main/java/com/yahoo/config/application/api/FileRegistry.java index 7436b7a989a..5fdafd3f9e3 100644 --- a/config-model-api/src/main/java/com/yahoo/config/application/api/FileRegistry.java +++ b/config-model-api/src/main/java/com/yahoo/config/application/api/FileRegistry.java @@ -1,13 +1,11 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.application.api; +import com.yahoo.config.FileReference; + import java.nio.ByteBuffer; import java.util.List; -import com.yahoo.config.FileReference; -import com.yahoo.net.HostName; -import net.jpountz.xxhash.XXHashFactory; - /** * @author Tony Vaagenes @@ -16,21 +14,8 @@ public interface FileRegistry { FileReference addFile(String relativePath); FileReference addUri(String uri); - /** - * @deprecated Remove after 7.455 - */ - @Deprecated - default FileReference addBlob(ByteBuffer blob) { return null; } FileReference addBlob(String name, ByteBuffer blob); default FileReference addApplicationPackage() { return addFile(""); } - - /** - * Returns the name of the host which is the source of the files - * @deprecated Remove after 7.453 - */ - @Deprecated - default String fileSourceHost() { return HostName.getLocalhost(); } - List<Entry> export(); class Entry { @@ -43,15 +28,4 @@ public interface FileRegistry { } } - /** - * @deprecated Remove after 7.455 - */ - @Deprecated - static String blobName(ByteBuffer blob) { - blob.mark(); - long blobHash = XXHashFactory.fastestJavaInstance().hash64().hash(blob, 0); - blob.reset(); - return Long.toHexString(blobHash); - } - } |