Refactor auto-delete code from Bramble to Briar.

This commit is contained in:
akwizgran
2020-11-26 11:20:31 +00:00
committed by Torsten Grote
parent fee2e503bd
commit 07f20e1e0d
42 changed files with 85 additions and 70 deletions

View File

@@ -6,11 +6,9 @@ import org.briarproject.bramble.api.data.BdfList;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import javax.annotation.Nullable;
import javax.annotation.concurrent.Immutable;
import static org.briarproject.bramble.api.autodelete.AutoDeleteConstants.MAX_AUTO_DELETE_TIMER_MS;
import static org.briarproject.bramble.api.autodelete.AutoDeleteConstants.MIN_AUTO_DELETE_TIMER_MS;
import static org.briarproject.bramble.api.autodelete.AutoDeleteConstants.NO_AUTO_DELETE_TIMER;
@Immutable
@NotNullByDefault
public class ValidationUtils {
@@ -73,11 +71,4 @@ public class ValidationUtils {
throws FormatException {
if (l != null && (l < min || l > max)) throw new FormatException();
}
public static long validateAutoDeleteTimer(@Nullable Long timer)
throws FormatException {
if (timer == null) return NO_AUTO_DELETE_TIMER;
checkRange(timer, MIN_AUTO_DELETE_TIMER_MS, MAX_AUTO_DELETE_TIMER_MS);
return timer;
}
}