diff options
Diffstat (limited to 'configserver')
3 files changed, 12 insertions, 40 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/AddFileInterface.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/AddFileInterface.java index 39bf2ee02fd..2250f2dc579 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/AddFileInterface.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/AddFileInterface.java @@ -3,9 +3,10 @@ package com.yahoo.vespa.config.server.filedistribution; import com.yahoo.config.FileReference; +/** + * @author baldersheim + */ public interface AddFileInterface { FileReference addUri(String uri, String relativePath); - FileReference addUri(String uri, String relativePath, FileReference reference); FileReference addFile(String relativePath); - FileReference addFile(String relativePath, FileReference reference); } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/ApplicationFileManager.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/ApplicationFileManager.java index 0e7aa4a4fd2..2cb94b4bb9e 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/ApplicationFileManager.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/ApplicationFileManager.java @@ -10,24 +10,22 @@ import java.nio.channels.Channels; import java.nio.channels.ReadableByteChannel; import java.nio.file.Files; +/** + * @author baldersheim + */ public class ApplicationFileManager implements AddFileInterface { private final File applicationDir; - private final FileDirectory master; + private final FileDirectory fileDirectory; - ApplicationFileManager(File applicationDir, FileDirectory master) { + ApplicationFileManager(File applicationDir, FileDirectory fileDirectory) { this.applicationDir = applicationDir; - this.master = master; - } - - @Override - public FileReference addFile(String relativePath, FileReference reference) { - return master.addFile(new File(applicationDir, relativePath), reference); + this.fileDirectory = fileDirectory; } @Override public FileReference addFile(String relativePath) { - return master.addFile(new File(applicationDir, relativePath)); + return fileDirectory.addFile(new File(applicationDir, relativePath)); } @Override @@ -36,13 +34,7 @@ public class ApplicationFileManager implements AddFileInterface { return addFile(relativePath); } - @Override - public FileReference addUri(String uri, String relativePath, FileReference reference) { - download(uri, relativePath); - return addFile(relativePath, reference); - } - - void download(String uri, String relativePath) { + private void download(String uri, String relativePath) { File file = new File(applicationDir, relativePath); FileOutputStream fos = null; ReadableByteChannel rbc = null; diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDBRegistry.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDBRegistry.java index b0a802d831d..fc3f55cc6aa 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDBRegistry.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDBRegistry.java @@ -15,7 +15,7 @@ import java.util.Map; import java.util.Optional; /** - * @author tonytv + * @author Tony Vaagenes */ public class FileDBRegistry implements FileRegistry { @@ -27,27 +27,6 @@ public class FileDBRegistry implements FileRegistry { this.manager = manager; } - public synchronized FileReference addFile(String relativePath, FileReference reference) { - Optional<FileReference> cachedReference = Optional.ofNullable(fileReferenceCache.get(relativePath)); - return cachedReference.orElseGet(() -> { - FileReference newRef = manager.addFile(relativePath, reference); - entries.add(new Entry(relativePath, newRef)); - fileReferenceCache.put(relativePath, newRef); - return newRef; - }); - } - - public synchronized FileReference addUri(String uri, FileReference reference) { - String relativePath = uriToRelativeFile(uri); - Optional<FileReference> cachedReference = Optional.ofNullable(fileReferenceCache.get(uri)); - return cachedReference.orElseGet(() -> { - FileReference newRef = manager.addUri(uri, relativePath, reference); - entries.add(new Entry(uri, newRef)); - fileReferenceCache.put(uri, newRef); - return newRef; - }); - } - @Override public synchronized FileReference addFile(String relativePath) { Optional<FileReference> cachedReference = Optional.ofNullable(fileReferenceCache.get(relativePath)); |