summaryrefslogtreecommitdiffstats
path: root/fileacquirer
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2018-09-10 09:27:22 +0200
committerJon Bratseth <bratseth@oath.com>2018-09-10 09:27:22 +0200
commit80476877f811f0a90cc1e692d56b5fbd11fbe76c (patch)
tree8b6451c43e3d90bc0ddf9fbcf268dcbd6d1c2a05 /fileacquirer
parent48f9a4071b5f6f75114cd1b94eb09bec36f77061 (diff)
Use fileAcquirer
Diffstat (limited to 'fileacquirer')
-rw-r--r--fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileAcquirerFactory.java3
-rw-r--r--fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileAcquirerImpl.java12
-rw-r--r--fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/MockFileAcquirer.java6
3 files changed, 13 insertions, 8 deletions
diff --git a/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileAcquirerFactory.java b/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileAcquirerFactory.java
index d8ea45e716d..e8a3038639a 100644
--- a/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileAcquirerFactory.java
+++ b/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileAcquirerFactory.java
@@ -4,10 +4,13 @@ package com.yahoo.filedistribution.fileacquirer;
/**
* Hides the real file acquirer type from 3rd party developers.
* Not intended to be used by 3rd parties.
+ *
* @author Tony Vaagenes
*/
public class FileAcquirerFactory {
+
public static FileAcquirer create(String configId) {
return new FileAcquirerImpl(configId);
}
+
}
diff --git a/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileAcquirerImpl.java b/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileAcquirerImpl.java
index fca4b206fc9..ab0f7521e7e 100644
--- a/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileAcquirerImpl.java
+++ b/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileAcquirerImpl.java
@@ -23,12 +23,15 @@ import java.io.File;
* @author Tony Vaagenes
*/
class FileAcquirerImpl implements FileAcquirer {
+
static final class FileDistributionErrorCode {
+
public static final int baseErrorCode = 0x10000;
public static final int baseFileProviderErrorCode = baseErrorCode + 0x1000;
public static final int fileReferenceDoesNotExists = baseFileProviderErrorCode;
public static final int fileReferenceRemoved = fileReferenceDoesNotExists + 1;
+
}
private static final Logger log = Logger.getLogger(FileAcquirerImpl.class.getName());
@@ -131,13 +134,10 @@ class FileAcquirerImpl implements FileAcquirer {
* given file reference. File references are produced by the
* config system.
*
- * @throws TimeoutException if the file or directory could not be
- * retrieved in time.
- * @throws FileReferenceDoesNotExistException if the file is no
- * longer available (due to reloading of config).
+ * @throws TimeoutException if the file or directory could not be retrieved in time.
+ * @throws FileReferenceDoesNotExistException if the file is no longer available (due to reloading of config).
*/
- public File waitFor(FileReference fileReference, long timeout, TimeUnit timeUnit)
- throws InterruptedException {
+ public File waitFor(FileReference fileReference, long timeout, TimeUnit timeUnit) throws InterruptedException {
Timer timer = new Timer(timeout, timeUnit);
do {
Target target = connection.getTarget(timer);
diff --git a/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/MockFileAcquirer.java b/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/MockFileAcquirer.java
index 25732d2dcc8..1a8a05d0a53 100644
--- a/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/MockFileAcquirer.java
+++ b/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/MockFileAcquirer.java
@@ -14,8 +14,9 @@ import java.util.concurrent.TimeUnit;
* @author Tony Vaagenes
*/
public abstract class MockFileAcquirer implements FileAcquirer {
+
/** Creates a FileAcquirer that always returns the given file. **/
- public static FileAcquirer returnFile(final File file) {
+ public static FileAcquirer returnFile(File file) {
return new MockFileAcquirer() {
@Override
public File waitFor(FileReference fileReference,
@@ -26,7 +27,7 @@ public abstract class MockFileAcquirer implements FileAcquirer {
}
/** Creates a FileAcquirer that maps from fileReference.value to a file. **/
- public static FileAcquirer returnFiles(final Map<String, File> files) {
+ public static FileAcquirer returnFiles(Map<String, File> files) {
return new MockFileAcquirer() {
@Override
public File waitFor(FileReference fileReference,
@@ -60,4 +61,5 @@ public abstract class MockFileAcquirer implements FileAcquirer {
@Override
public void shutdown() {}
+
}