diff options
author | Harald Musum <musum@yahooinc.com> | 2023-01-13 11:47:28 +0100 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2023-01-13 11:47:28 +0100 |
commit | 2df02633234efe398f0f1b02443393e26108cde6 (patch) | |
tree | 431dea52258a6abaf271e60ac9e6fddd26056014 /fileacquirer/src | |
parent | c6f8458bfa881c44f9c61524dadaae09df830e8b (diff) |
Remove unused error code and exception
Diffstat (limited to 'fileacquirer/src')
4 files changed, 11 insertions, 41 deletions
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 122027d706b..5d6477cd927 100644 --- a/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileAcquirerImpl.java +++ b/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileAcquirerImpl.java @@ -30,9 +30,7 @@ class FileAcquirerImpl implements FileAcquirer { 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; } @@ -113,16 +111,10 @@ class FileAcquirerImpl implements FileAcquirer { private final Connection connection = new Connection(); private boolean temporaryError(int errorCode) { - switch (errorCode) { - case ErrorCode.ABORT: - case ErrorCode.CONNECTION: - case ErrorCode.GENERAL_ERROR: - case ErrorCode.OVERLOAD: - case ErrorCode.TIMEOUT: - return true; - default: - return false; - } + return switch (errorCode) { + case ErrorCode.ABORT, ErrorCode.CONNECTION, ErrorCode.GENERAL_ERROR, ErrorCode.OVERLOAD, ErrorCode.TIMEOUT -> true; + default -> false; + }; } public FileAcquirerImpl(String configId) { @@ -168,12 +160,11 @@ class FileAcquirerImpl implements FileAcquirer { } else { if (request.errorCode() == FileDistributionErrorCode.fileReferenceDoesNotExists) throw new FileReferenceDoesNotExistException(fileReference.value()); - else if (request.errorCode() == FileDistributionErrorCode.fileReferenceRemoved) - throw new FileReferenceRemovedException(fileReference.value()); else - throw new RuntimeException("Wait for " + fileReference + " failed:" + request.errorMessage() + " (" + request.errorCode() + ")"); + throw new RuntimeException("Wait for " + fileReference + " failed: " + request.errorMessage() + " (" + request.errorCode() + ")"); } } while ( timer.isTimeLeft() ); + throw new TimeoutException("Timed out waiting for " + fileReference + " after " + timeout + " " + timeUnit.name().toLowerCase()); } diff --git a/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileReferenceRemovedException.java b/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileReferenceRemovedException.java deleted file mode 100644 index 542fbcc7532..00000000000 --- a/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileReferenceRemovedException.java +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.filedistribution.fileacquirer; - -/** - * @author Tony Vaagenes - */ -public class FileReferenceRemovedException extends RuntimeException { - public final String fileReference; - - FileReferenceRemovedException(String fileReference) { - super("The file with file reference '" + fileReference + "' was removed while waiting."); - this.fileReference = fileReference; - } -} 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 024aa8990d7..744c49629e9 100644 --- a/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/MockFileAcquirer.java +++ b/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/MockFileAcquirer.java @@ -3,9 +3,6 @@ package com.yahoo.filedistribution.fileacquirer; import com.yahoo.config.FileReference; import java.io.File; -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; -import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -19,8 +16,7 @@ public abstract class MockFileAcquirer implements FileAcquirer { public static FileAcquirer returnFile(File file) { return new MockFileAcquirer() { @Override - public File waitFor(FileReference fileReference, - long timeout, TimeUnit timeUnit) throws InterruptedException { + public File waitFor(FileReference fileReference, long timeout, TimeUnit timeUnit) { return file; } }; @@ -30,8 +26,7 @@ public abstract class MockFileAcquirer implements FileAcquirer { public static FileAcquirer returnFiles(Map<String, File> files) { return new MockFileAcquirer() { @Override - public File waitFor(FileReference fileReference, - long timeout, TimeUnit timeUnit) throws InterruptedException { + public File waitFor(FileReference fileReference, long timeout, TimeUnit timeUnit) { return files.get(fileReference.value()); } }; @@ -41,8 +36,7 @@ public abstract class MockFileAcquirer implements FileAcquirer { public static FileAcquirer throwTimeoutException() { return new MockFileAcquirer() { @Override - public File waitFor(FileReference fileReference, - long timeout, TimeUnit timeUnit) throws InterruptedException { + public File waitFor(FileReference fileReference, long timeout, TimeUnit timeUnit) { throw new TimeoutException("Timed out"); } }; @@ -52,8 +46,7 @@ public abstract class MockFileAcquirer implements FileAcquirer { public static FileAcquirer throwFileReferenceDoesNotExistException() { return new MockFileAcquirer() { @Override - public File waitFor(FileReference fileReference, - long timeout, TimeUnit timeUnit) throws InterruptedException { + public File waitFor(FileReference fileReference, long timeout, TimeUnit timeUnit) { throw new FileReferenceDoesNotExistException(null); } }; diff --git a/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/TimeoutException.java b/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/TimeoutException.java index ebb14a99239..8360a9db13d 100644 --- a/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/TimeoutException.java +++ b/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/TimeoutException.java @@ -7,7 +7,7 @@ package com.yahoo.filedistribution.fileacquirer; public class TimeoutException extends RuntimeException { /** Do not use this constructor */ - public TimeoutException() { + private TimeoutException() { super(); } |