You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2018/11/07 14:34:39 UTC
svn commit: r1846034 [5/5] - in /jackrabbit/oak/branches/1.8: ./
oak-segment-tar/
oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/
oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/
oak-segment-tar/src/main/java/org/ap...
Modified: jackrabbit/oak/branches/1.8/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java?rev=1846034&r1=1846033&r2=1846034&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java (original)
+++ jackrabbit/oak/branches/1.8/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java Wed Nov 7 14:34:38 2018
@@ -34,14 +34,13 @@ import static org.junit.Assert.fail;
import java.io.File;
import java.io.IOException;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.segment.SegmentVersion;
import org.apache.jackrabbit.oak.segment.data.SegmentData;
import org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException;
import org.apache.jackrabbit.oak.segment.file.tar.IOMonitorAdapter;
import org.apache.jackrabbit.oak.segment.file.tar.TarFiles;
import org.apache.jackrabbit.oak.segment.tool.Compact;
+import org.jetbrains.annotations.NotNull;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -128,7 +127,7 @@ public class UpgradeIT {
true, version, version).checkManifest();
}
- private void checkSegmentVersion(@Nonnull SegmentVersion version) throws IOException {
+ private void checkSegmentVersion(@NotNull SegmentVersion version) throws IOException {
try (TarFiles tarFiles = TarFiles.builder()
.withDirectory(fileStoreHome.getRoot())
.withTarRecovery((_1, _2, _3) -> fail("Unexpected recovery"))
@@ -145,7 +144,7 @@ public class UpgradeIT {
}
}
- private static Iterable<SegmentData> getSegments(@Nonnull TarFiles tarFiles) {
+ private static Iterable<SegmentData> getSegments(@NotNull TarFiles tarFiles) {
return transform(
tarFiles.getSegmentIds(),
uuid -> newSegmentData(tarFiles.readSegment(