From 3057086a437e8874e8c0de77b4f245c0e099e61d Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Wed, 25 Aug 2021 11:41:38 +0200 Subject: Provide the blob name externally --- .../src/main/java/com/yahoo/config/application/api/FileRegistry.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config-model-api/src') 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..376bb889dfe 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,7 +16,7 @@ public interface FileRegistry { FileReference addFile(String relativePath); FileReference addUri(String uri); - FileReference addBlob(ByteBuffer blob); + FileReference addBlob(String name, ByteBuffer blob); default FileReference addApplicationPackage() { return addFile(""); } /** -- cgit v1.2.3 From 2a1b69ec6a8e576ac4f7ce6abf95a5aa731d37fd Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Wed, 25 Aug 2021 13:15:44 +0200 Subject: Need default implementation for a short while. --- .../java/com/yahoo/config/application/api/FileRegistry.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'config-model-api/src') 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 376bb889dfe..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); + /** + * @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); -- cgit v1.2.3