diff options
| author | Harald Musum <musum@verizonmedia.com> | 2021-08-25 14:32:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-25 14:32:24 +0200 |
| commit | 2aea4b1dfb55cd84ba6dad77ede5a89754a0c8cf (patch) | |
| tree | 40590ff134fae7943664673d56d7051e7e572ef4 /config-model-api | |
| parent | f676ed9f34b927f975e58db18589484dfa438c72 (diff) | |
| parent | a6820a3ad4297c047468f5c3a6bcc7d91e61914e (diff) | |
Merge pull request #18857 from vespa-engine/balder/debug-1
Balder/debug 1
Diffstat (limited to 'config-model-api')
| -rw-r--r-- | config-model-api/abi-spec.json | 3 | ||||
| -rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/application/api/FileRegistry.java | 13 |
2 files changed, 13 insertions, 3 deletions
diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json index c6808f8091c..b3223c1a7b6 100644 --- a/config-model-api/abi-spec.json +++ b/config-model-api/abi-spec.json @@ -440,7 +440,8 @@ "methods": [ "public abstract com.yahoo.config.FileReference addFile(java.lang.String)", "public abstract com.yahoo.config.FileReference addUri(java.lang.String)", - "public abstract com.yahoo.config.FileReference addBlob(java.nio.ByteBuffer)", + "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()", 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 a0b1402f559..8f75d97d2d4 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 @@ -16,12 +16,17 @@ public interface FileRegistry { FileReference addFile(String relativePath); FileReference addUri(String uri); - FileReference addBlob(ByteBuffer blob); + /** + * @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.253 + * @deprecated Remove after 7.453 */ @Deprecated default String fileSourceHost() { return HostName.getLocalhost(); } @@ -38,6 +43,10 @@ public interface FileRegistry { } } + /** + * @deprecated Remove after 7.455 + */ + @Deprecated static String blobName(ByteBuffer blob) { blob.mark(); long blobHash = XXHashFactory.fastestJavaInstance().hash64().hash(blob, 0); |