Author: reschke Date: Wed Nov 7 13:45:01 2018 New Revision: 1846012 URL: http://svn.apache.org/viewvc?rev=1846012&view=rev Log: OAK-7669: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-blob-plugins
Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-blob-plugins/pom.xml jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/AbstractSharedCachingDataStore.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGC.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCMBean.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobStoreBlob.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobStoreStats.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CompositeDataStoreCache.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/ReferenceCollector.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCache.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTracker.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/FSBackend.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/SharedDataStoreUtils.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/TextWriter.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/migration/BlobMigration.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/migration/BlobMigrationMBean.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/serializer/FSBlobSerializer.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/AbstractBlobTrackerRegistrationTest.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/AbstractDataStoreCacheTest.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCTest.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/SharedDataStoreUtilsTest.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStoreTest.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/OakFileDataStoreTest.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/serializer/FSBlobSerializerTest.java Propchange: jackrabbit/oak/branches/1.8/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 7 13:45:01 2018 @@ -1,3 +1,3 @@ /jackrabbit/oak/branches/1.0:1665962 -/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1830911,1830923,1831157 -1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836174,1836487,1836493,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840455,1840574,1841314,1841352,1842089,1842677,1843222,1843231,1843398,1843618,1843652,1843911,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845336 +/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1830911,1830923,1831157 -1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836175,1836487,1836493,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840455,1840574,1841314,1841352,1842089,1842677,1843222,1843231,1843398,1843618,1843652,1843911,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845336 /jackrabbit/trunk:1345480 Modified: jackrabbit/oak/branches/1.8/oak-blob-plugins/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-plugins/pom.xml?rev=1846012&r1=1846011&r2=1846012&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-blob-plugins/pom.xml (original) +++ jackrabbit/oak/branches/1.8/oak-blob-plugins/pom.xml Wed Nov 7 13:45:01 2018 @@ -156,10 +156,10 @@ <artifactId>slf4j-api</artifactId> </dependency> - <!-- Findbugs annotations --> + <!-- Nullability annotations --> <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> + <groupId>org.jetbrains</groupId> + <artifactId>annotations</artifactId> </dependency> <!-- Test Dependencies --> Modified: jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/AbstractSharedCachingDataStore.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/AbstractSharedCachingDataStore.java?rev=1846012&r1=1846011&r2=1846012&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/AbstractSharedCachingDataStore.java (original) +++ jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/AbstractSharedCachingDataStore.java Wed Nov 7 13:45:01 2018 @@ -32,8 +32,6 @@ import java.util.concurrent.ExecutorServ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import javax.annotation.Nullable; - import com.google.common.base.Function; import com.google.common.base.Stopwatch; import com.google.common.cache.CacheLoader; @@ -56,6 +54,7 @@ import org.apache.jackrabbit.oak.spi.blo import org.apache.jackrabbit.oak.stats.StatisticsProvider; import org.apache.jackrabbit.util.LazyFileInputStream; import org.apache.jackrabbit.util.TransientFileFactory; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGC.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGC.java?rev=1846012&r1=1846011&r2=1846012&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGC.java (original) +++ jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGC.java Wed Nov 7 13:45:01 2018 @@ -31,7 +31,6 @@ import java.util.List; import java.util.concurrent.Callable; import java.util.concurrent.Executor; -import javax.annotation.Nonnull; import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.CompositeType; @@ -44,6 +43,7 @@ import javax.management.openmbean.Tabula import org.apache.jackrabbit.oak.commons.jmx.AnnotatedStandardMBean; import org.apache.jackrabbit.oak.commons.jmx.ManagementOperation; +import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -69,14 +69,14 @@ public class BlobGC extends AnnotatedSt * @param executor executor for running the garbage collection task */ public BlobGC( - @Nonnull BlobGarbageCollector blobGarbageCollector, - @Nonnull Executor executor) { + @NotNull BlobGarbageCollector blobGarbageCollector, + @NotNull Executor executor) { super(BlobGCMBean.class); this.blobGarbageCollector = checkNotNull(blobGarbageCollector); this.executor = checkNotNull(executor); } - @Nonnull + @NotNull @Override public CompositeData startBlobGC(final boolean markOnly) { if (gcOp.isDone()) { @@ -109,7 +109,7 @@ public class BlobGC extends AnnotatedSt return getBlobGCStatus(); } - @Nonnull + @NotNull @Override public CompositeData getBlobGCStatus() { return gcOp.getStatus().toCompositeData(); @@ -152,7 +152,7 @@ public class BlobGC extends AnnotatedSt return getConsistencyCheckStatus(); } - @Nonnull + @NotNull @Override public CompositeData getConsistencyCheckStatus() { return consistencyOp.getStatus().toCompositeData(); Modified: jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCMBean.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCMBean.java?rev=1846012&r1=1846011&r2=1846012&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCMBean.java (original) +++ jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCMBean.java Wed Nov 7 13:45:01 2018 @@ -21,8 +21,8 @@ package org.apache.jackrabbit.oak.plugin import org.apache.jackrabbit.oak.api.jmx.Description; import org.apache.jackrabbit.oak.api.jmx.Name; +import org.jetbrains.annotations.NotNull; -import javax.annotation.Nonnull; import javax.management.openmbean.CompositeData; import javax.management.openmbean.TabularData; @@ -68,7 +68,7 @@ public interface BlobGCMBean { * @return the status of the ongoing operation or if none the terminal * status of the last operation or <em>Status not available</em> if none. */ - @Nonnull + @NotNull CompositeData getBlobGCStatus(); /** @@ -91,6 +91,6 @@ public interface BlobGCMBean { * @return the status of the ongoing operation or if none the terminal * status of the last operation or <em>Status not available</em> if none. */ - @Nonnull + @NotNull CompositeData getConsistencyCheckStatus(); } Modified: jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobStoreBlob.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobStoreBlob.java?rev=1846012&r1=1846011&r2=1846012&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobStoreBlob.java (original) +++ jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobStoreBlob.java Wed Nov 7 13:45:01 2018 @@ -21,11 +21,10 @@ package org.apache.jackrabbit.oak.plugin import java.io.IOException; import java.io.InputStream; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.spi.blob.BlobStore; import org.apache.jackrabbit.oak.api.Blob; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * A blob implementation. @@ -41,7 +40,7 @@ public class BlobStoreBlob implements Bl } @Override - @Nonnull + @NotNull public InputStream getNewStream() { try { return blobStore.getInputStream(blobId); @@ -60,7 +59,7 @@ public class BlobStoreBlob implements Bl } } - @Override @CheckForNull + @Override @Nullable public String getReference() { return blobStore.getReference(blobId); } Modified: jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobStoreStats.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobStoreStats.java?rev=1846012&r1=1846011&r2=1846012&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobStoreStats.java (original) +++ jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobStoreStats.java Wed Nov 7 13:45:01 2018 @@ -21,7 +21,6 @@ package org.apache.jackrabbit.oak.plugin import java.util.concurrent.TimeUnit; -import javax.annotation.Nonnull; import javax.management.openmbean.CompositeData; import org.apache.jackrabbit.api.stats.TimeSeries; @@ -34,6 +33,7 @@ import org.apache.jackrabbit.oak.stats.S import org.apache.jackrabbit.oak.stats.StatsOptions; import org.apache.jackrabbit.stats.TimeSeriesAverage; import org.apache.jackrabbit.stats.TimeSeriesStatsUtil; +import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -64,7 +64,7 @@ public class BlobStoreStats extends Anno private final TimeUnit recordedTimeUnit = TimeUnit.NANOSECONDS; - public BlobStoreStats(@Nonnull StatisticsProvider sp) { + public BlobStoreStats(@NotNull StatisticsProvider sp) { super(BlobStoreStatsMBean.class); this.statisticsProvider = checkNotNull(sp); Modified: jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java?rev=1846012&r1=1846011&r2=1846012&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java (original) +++ jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java Wed Nov 7 13:45:01 2018 @@ -16,12 +16,11 @@ */ package org.apache.jackrabbit.oak.plugins.blob; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.cache.CacheLIRS; import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.commons.StringUtils; import org.apache.jackrabbit.oak.spi.blob.AbstractBlobStore; +import org.jetbrains.annotations.NotNull; import com.google.common.cache.Weigher; import org.slf4j.Logger; @@ -42,7 +41,7 @@ public abstract class CachingBlobStore e private final Weigher<String, byte[]> weigher = new Weigher<String, byte[]>() { @Override - public int weigh(@Nonnull String key, @Nonnull byte[] value) { + public int weigh(@NotNull String key, @NotNull byte[] value) { long weight = (long)StringUtils.estimateMemoryUsage(key) + value.length; if (weight > Integer.MAX_VALUE) { LOG.debug("Calculated weight larger than Integer.MAX_VALUE: {}.", weight); Modified: jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CompositeDataStoreCache.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CompositeDataStoreCache.java?rev=1846012&r1=1846011&r2=1846012&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CompositeDataStoreCache.java (original) +++ jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CompositeDataStoreCache.java Wed Nov 7 13:45:01 2018 @@ -25,13 +25,12 @@ import java.io.InputStream; import java.util.concurrent.ExecutorService; import java.util.concurrent.ScheduledExecutorService; -import javax.annotation.Nullable; - import com.google.common.cache.AbstractCache; import com.google.common.cache.CacheLoader; import com.google.common.util.concurrent.ListeningExecutorService; import org.apache.jackrabbit.oak.stats.StatisticsProvider; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java?rev=1846012&r1=1846011&r2=1846012&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java (original) +++ jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java Wed Nov 7 13:45:01 2018 @@ -30,9 +30,6 @@ import java.util.concurrent.ExecutorServ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import com.google.common.base.Predicate; import com.google.common.base.Stopwatch; import com.google.common.cache.AbstractCache; @@ -48,6 +45,8 @@ import org.apache.jackrabbit.oak.cache.C import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.commons.StringUtils; import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -110,8 +109,8 @@ public class FileCache extends AbstractC .weigher(weigher) .evictionCallback(new EvictionCallback<String, File>() { @Override - public void evicted(@Nonnull String key, @Nullable File cachedFile, - @Nonnull RemovalCause cause) { + public void evicted(@NotNull String key, @Nullable File cachedFile, + @NotNull RemovalCause cause) { try { if (cachedFile != null && cachedFile.exists() && cause != RemovalCause.REPLACED) { Modified: jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java?rev=1846012&r1=1846011&r2=1846012&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java (original) +++ jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java Wed Nov 7 13:45:01 2018 @@ -36,8 +36,6 @@ import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import javax.annotation.Nullable; - import com.google.common.base.Charsets; import com.google.common.base.Function; import com.google.common.base.Joiner; @@ -64,6 +62,7 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.spi.blob.GarbageCollectableBlobStore; import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard; import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/ReferenceCollector.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/ReferenceCollector.java?rev=1846012&r1=1846011&r2=1846012&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/ReferenceCollector.java (original) +++ jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/ReferenceCollector.java Wed Nov 7 13:45:01 2018 @@ -18,7 +18,7 @@ */ package org.apache.jackrabbit.oak.plugins.blob; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; /** * Callback interface for collecting all blob references that are Modified: jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCache.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCache.java?rev=1846012&r1=1846011&r2=1846012&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCache.java (original) +++ jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCache.java Wed Nov 7 13:45:01 2018 @@ -32,8 +32,6 @@ import java.util.concurrent.ScheduledExe import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import javax.annotation.Nullable; - import com.google.common.base.Optional; import com.google.common.base.Predicate; import com.google.common.cache.Weigher; @@ -58,6 +56,7 @@ import org.apache.jackrabbit.oak.stats.M import org.apache.jackrabbit.oak.stats.StatisticsProvider; import org.apache.jackrabbit.oak.stats.StatsOptions; import org.apache.jackrabbit.oak.stats.TimerStats; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTracker.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTracker.java?rev=1846012&r1=1846011&r2=1846012&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTracker.java (original) +++ jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTracker.java Wed Nov 7 13:45:01 2018 @@ -30,8 +30,6 @@ import java.util.concurrent.ScheduledExe import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantLock; -import javax.annotation.Nullable; - import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.base.Stopwatch; @@ -42,6 +40,7 @@ import org.apache.jackrabbit.oak.commons import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser; import org.apache.jackrabbit.oak.plugins.blob.SharedDataStore; import org.apache.jackrabbit.oak.stats.Clock; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java?rev=1846012&r1=1846011&r2=1846012&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java (original) +++ jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java Wed Nov 7 13:45:01 2018 @@ -38,8 +38,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.RepositoryException; import com.google.common.base.Function; @@ -67,6 +65,8 @@ import org.apache.jackrabbit.oak.spi.blo import org.apache.jackrabbit.oak.spi.blob.stats.StatsCollectingStreams; import org.apache.jackrabbit.oak.spi.blob.stats.BlobStatsCollector; import org.apache.jackrabbit.oak.spi.blob.GarbageCollectableBlobStore; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -109,7 +109,7 @@ public class DataStoreBlobStore private final Weigher<String, byte[]> weigher = new Weigher<String, byte[]>() { @Override - public int weigh(@Nonnull String key, @Nonnull byte[] value) { + public int weigh(@NotNull String key, @NotNull byte[] value) { long weight = (long)StringUtils.estimateMemoryUsage(key) + value.length; if (weight > Integer.MAX_VALUE) { log.debug("Calculated weight larger than Integer.MAX_VALUE: {}.", weight); @@ -277,7 +277,7 @@ public class DataStoreBlobStore } @Override - public String getBlobId(@Nonnull String reference) { + public String getBlobId(@NotNull String reference) { checkNotNull(reference); DataRecord record; try { @@ -292,7 +292,7 @@ public class DataStoreBlobStore } @Override - public String getReference(@Nonnull String encodedBlobId) { + public String getReference(@NotNull String encodedBlobId) { checkNotNull(encodedBlobId); String blobId = extractBlobId(encodedBlobId); //Reference are not created for in memory record Modified: jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/FSBackend.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/FSBackend.java?rev=1846012&r1=1846011&r2=1846012&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/FSBackend.java (original) +++ jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/FSBackend.java Wed Nov 7 13:45:01 2018 @@ -29,8 +29,6 @@ import java.util.Iterator; import java.util.List; import java.util.Properties; -import javax.annotation.Nonnull; - import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.io.Closeables; @@ -44,6 +42,7 @@ import org.apache.jackrabbit.core.data.D import org.apache.jackrabbit.core.data.LazyFileInputStream; import org.apache.jackrabbit.oak.spi.blob.AbstractDataRecord; import org.apache.jackrabbit.oak.spi.blob.AbstractSharedBackend; +import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -413,7 +412,7 @@ public class FSBackend extends AbstractS private File file; public FSBackendDataRecord(AbstractSharedBackend backend, - @Nonnull DataIdentifier identifier, @Nonnull File file) { + @NotNull DataIdentifier identifier, @NotNull File file) { super(backend, identifier); this.file = file; this.length = file.length(); Modified: jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/SharedDataStoreUtils.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/SharedDataStoreUtils.java?rev=1846012&r1=1846011&r2=1846012&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/SharedDataStoreUtils.java (original) +++ jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/SharedDataStoreUtils.java Wed Nov 7 13:45:01 2018 @@ -19,9 +19,6 @@ package org.apache.jackrabbit.oak.plugin import java.util.List; import java.util.Set; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.Splitter; @@ -32,6 +29,8 @@ import com.google.common.collect.Sets; import org.apache.jackrabbit.core.data.DataRecord; import org.apache.jackrabbit.oak.plugins.blob.SharedDataStore; import org.apache.jackrabbit.oak.spi.blob.BlobStore; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Utility class for {@link SharedDataStore}. @@ -59,7 +58,7 @@ public class SharedDataStoreUtils { new Function<DataRecord, Long>() { @Override @Nullable - public Long apply(@Nonnull DataRecord input) { + public Long apply(@NotNull DataRecord input) { return input.getLastModified(); } }).min(recs); @@ -78,7 +77,7 @@ public class SharedDataStoreUtils { new Function<DataRecord, String>() { @Override @Nullable - public String apply(@Nonnull DataRecord input) { + public String apply(@NotNull DataRecord input) { return SharedStoreRecordType.REPOSITORY.getIdFromName(input.getIdentifier().toString()); } }).keySet(), @@ -86,7 +85,7 @@ public class SharedDataStoreUtils { new Function<DataRecord, String>() { @Override @Nullable - public String apply(@Nonnull DataRecord input) { + public String apply(@NotNull DataRecord input) { return SharedStoreRecordType.REFERENCES.getIdFromName(input.getIdentifier().toString()); } }).keySet()); Modified: jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/TextWriter.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/TextWriter.java?rev=1846012&r1=1846011&r2=1846012&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/TextWriter.java (original) +++ jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/TextWriter.java Wed Nov 7 13:45:01 2018 @@ -21,11 +21,11 @@ package org.apache.jackrabbit.oak.plugin import java.io.IOException; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; public interface TextWriter { - void write(@Nonnull String blobId, @Nonnull String text) throws IOException; + void write(@NotNull String blobId, @NotNull String text) throws IOException; void markEmpty(String blobId); Modified: jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/migration/BlobMigration.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/migration/BlobMigration.java?rev=1846012&r1=1846011&r2=1846012&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/migration/BlobMigration.java (original) +++ jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/migration/BlobMigration.java Wed Nov 7 13:45:01 2018 @@ -31,7 +31,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.Executor; import java.util.concurrent.Executors; -import javax.annotation.Nonnull; import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.CompositeType; @@ -52,6 +51,7 @@ import org.apache.jackrabbit.oak.spi.blo import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.apache.jackrabbit.oak.spi.whiteboard.Registration; import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard; +import org.jetbrains.annotations.NotNull; import org.osgi.framework.BundleContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -116,7 +116,7 @@ public class BlobMigration extends Annot } } - @Nonnull + @NotNull @Override public String startBlobMigration(final boolean resume) { if (migrationOp.isDone()) { @@ -145,14 +145,14 @@ public class BlobMigration extends Annot } } - @Nonnull + @NotNull @Override public String stopBlobMigration() { migrator.stop(); return "Migration will be stopped"; } - @Nonnull + @NotNull @Override public CompositeData getBlobMigrationStatus() throws OpenDataException { Map<String, Object> status = new HashMap<String, Object>(); Modified: jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/migration/BlobMigrationMBean.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/migration/BlobMigrationMBean.java?rev=1846012&r1=1846011&r2=1846012&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/migration/BlobMigrationMBean.java (original) +++ jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/migration/BlobMigrationMBean.java Wed Nov 7 13:45:01 2018 @@ -19,27 +19,27 @@ package org.apache.jackrabbit.oak.plugins.blob.migration; -import javax.annotation.Nonnull; import javax.management.openmbean.CompositeData; import javax.management.openmbean.OpenDataException; import org.apache.jackrabbit.oak.api.jmx.Description; import org.apache.jackrabbit.oak.api.jmx.Name; +import org.jetbrains.annotations.NotNull; public interface BlobMigrationMBean { String TYPE = "BlobMigration"; - @Nonnull + @NotNull @Description("Start or resume the blob migration") String startBlobMigration( @Name("resume") @Description("true to resume stopped migration or false to start it from scratch") boolean resume); - @Nonnull + @NotNull @Description("Stop the blob migration") String stopBlobMigration(); - @Nonnull + @NotNull CompositeData getBlobMigrationStatus() throws OpenDataException; } Modified: jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/serializer/FSBlobSerializer.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/serializer/FSBlobSerializer.java?rev=1846012&r1=1846011&r2=1846012&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/serializer/FSBlobSerializer.java (original) +++ jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/serializer/FSBlobSerializer.java Wed Nov 7 13:45:01 2018 @@ -24,8 +24,6 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.core.data.DataStoreException; import org.apache.jackrabbit.core.data.FileDataStore; import org.apache.jackrabbit.oak.api.Blob; @@ -35,6 +33,7 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreBlobStore; import org.apache.jackrabbit.oak.plugins.blob.datastore.OakFileDataStore; import org.apache.jackrabbit.oak.plugins.memory.AbstractBlob; +import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -113,7 +112,7 @@ public class FSBlobSerializer extends Bl return id; } - @Nonnull + @NotNull @Override public InputStream getNewStream() { throw createError(); Modified: jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/AbstractBlobTrackerRegistrationTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/AbstractBlobTrackerRegistrationTest.java?rev=1846012&r1=1846011&r2=1846012&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/AbstractBlobTrackerRegistrationTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/AbstractBlobTrackerRegistrationTest.java Wed Nov 7 13:45:01 2018 @@ -21,8 +21,6 @@ package org.apache.jackrabbit.oak.plugin import java.io.File; -import javax.annotation.Nullable; - import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; import com.google.common.io.Files; @@ -33,6 +31,7 @@ import org.apache.jackrabbit.oak.spi.blo import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.apache.jackrabbit.oak.stats.StatisticsProvider; import org.apache.sling.testing.mock.osgi.junit.OsgiContext; +import org.jetbrains.annotations.Nullable; import org.junit.After; import org.junit.Before; import org.junit.Rule; Modified: jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/AbstractDataStoreCacheTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/AbstractDataStoreCacheTest.java?rev=1846012&r1=1846011&r2=1846012&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/AbstractDataStoreCacheTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/AbstractDataStoreCacheTest.java Wed Nov 7 13:45:01 2018 @@ -40,9 +40,6 @@ import java.util.concurrent.LinkedBlocki import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import com.google.common.cache.CacheLoader; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -60,6 +57,8 @@ import org.apache.jackrabbit.core.data.u import org.apache.jackrabbit.oak.commons.FileIOUtils; import org.apache.jackrabbit.oak.spi.blob.AbstractDataRecord; import org.apache.jackrabbit.oak.spi.blob.AbstractSharedBackend; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -131,7 +130,7 @@ public class AbstractDataStoreCacheTest } } - @Override public FileInputStream load(@Nonnull String key) throws Exception { + @Override public FileInputStream load(@NotNull String key) throws Exception { return FileUtils.openInputStream(getFile(key, root)); } } @@ -180,7 +179,7 @@ public class AbstractDataStoreCacheTest this.max = max; } - @Override public FileInputStream load(@Nonnull String key) throws Exception { + @Override public FileInputStream load(@NotNull String key) throws Exception { return new ErrorInputStream(getFile(key, root), max); } } @@ -234,7 +233,7 @@ public class AbstractDataStoreCacheTest this.afterLatch = afterLatch; } - @Override @Nonnull public ListenableFuture<?> submit(@Nonnull Callable task) { + @Override @NotNull public ListenableFuture<?> submit(@NotNull Callable task) { LOG.trace("Before submitting to super...."); ListenableFuture<Integer> submit = super.submit(task); LOG.trace("After submitting to super...."); @@ -246,7 +245,7 @@ public class AbstractDataStoreCacheTest return submit; } - @Override public void execute(@Nonnull Runnable command) { + @Override public void execute(@NotNull Runnable command) { delegate.execute(command); } @@ -254,7 +253,7 @@ public class AbstractDataStoreCacheTest delegate.shutdown(); } - @Override @Nonnull public List<Runnable> shutdownNow() { + @Override @NotNull public List<Runnable> shutdownNow() { return delegate.shutdownNow(); } @@ -266,7 +265,7 @@ public class AbstractDataStoreCacheTest return delegate.isTerminated(); } - @Override public boolean awaitTermination(long timeout, @Nonnull TimeUnit unit) + @Override public boolean awaitTermination(long timeout, @NotNull TimeUnit unit) throws InterruptedException { return delegate.awaitTermination(timeout, unit); } @@ -288,7 +287,7 @@ public class AbstractDataStoreCacheTest } } - @Override public void onFailure(@Nonnull Throwable t) { + @Override public void onFailure(@NotNull Throwable t) { try { LOG.trace("Waiting for latch onFailure in callback"); latch.await(100, TimeUnit.MILLISECONDS); Modified: jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCTest.java?rev=1846012&r1=1846011&r2=1846012&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCTest.java Wed Nov 7 13:45:01 2018 @@ -37,9 +37,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; - import ch.qos.logback.classic.Level; import com.google.common.collect.Iterators; import com.google.common.collect.Lists; @@ -69,6 +66,8 @@ import org.apache.jackrabbit.oak.spi.whi import org.apache.jackrabbit.oak.spi.whiteboard.Registration; import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard; import org.apache.jackrabbit.oak.stats.Clock; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -360,7 +359,7 @@ public class BlobGCTest { public String getContentIdentity() { return id; } - @Nonnull + @NotNull @Override public InputStream getNewStream() { try { @@ -471,11 +470,11 @@ public class BlobGCTest { return null; } - @CheckForNull @Override public String getBlobId(@Nonnull String reference) { + @Nullable @Override public String getBlobId(@NotNull String reference) { return reference; } - @CheckForNull @Override public String getReference(@Nonnull String blobId) { + @Nullable @Override public String getReference(@NotNull String blobId) { return blobId; } Modified: jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/SharedDataStoreUtilsTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/SharedDataStoreUtilsTest.java?rev=1846012&r1=1846011&r2=1846012&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/SharedDataStoreUtilsTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/SharedDataStoreUtilsTest.java Wed Nov 7 13:45:01 2018 @@ -33,8 +33,6 @@ import java.util.Set; import java.util.UUID; import java.util.concurrent.TimeUnit; -import javax.annotation.Nullable; - import com.google.common.base.Function; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; @@ -50,6 +48,7 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.blob.datastore.SharedDataStoreUtils; import org.apache.jackrabbit.oak.plugins.blob.datastore.SharedDataStoreUtils.SharedStoreRecordType; import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreUtils; +import org.jetbrains.annotations.Nullable; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; Modified: jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStoreTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStoreTest.java?rev=1846012&r1=1846011&r2=1846012&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStoreTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStoreTest.java Wed Nov 7 13:45:01 2018 @@ -28,8 +28,6 @@ import java.util.List; import java.util.Random; import java.util.Set; -import javax.annotation.Nullable; - import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; @@ -44,6 +42,7 @@ import org.apache.jackrabbit.core.data.D import org.apache.jackrabbit.oak.spi.blob.AbstractBlobStoreTest; import org.apache.jackrabbit.oak.spi.blob.BlobStoreInputStream; import org.apache.jackrabbit.oak.spi.blob.stats.BlobStatsCollector; +import org.jetbrains.annotations.Nullable; import org.junit.After; import org.junit.Before; import org.junit.Test; Modified: jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/OakFileDataStoreTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/OakFileDataStoreTest.java?rev=1846012&r1=1846011&r2=1846012&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/OakFileDataStoreTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/OakFileDataStoreTest.java Wed Nov 7 13:45:01 2018 @@ -24,8 +24,6 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; -import javax.annotation.Nullable; - import com.google.common.base.Function; import com.google.common.collect.Iterators; import com.google.common.collect.Sets; @@ -33,6 +31,7 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.apache.jackrabbit.core.data.DataIdentifier; import org.apache.jackrabbit.core.data.FileDataStore; +import org.jetbrains.annotations.Nullable; import org.junit.Test; import static org.junit.Assert.assertEquals; Modified: jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/serializer/FSBlobSerializerTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/serializer/FSBlobSerializerTest.java?rev=1846012&r1=1846011&r2=1846012&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/serializer/FSBlobSerializerTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/serializer/FSBlobSerializerTest.java Wed Nov 7 13:45:01 2018 @@ -22,13 +22,12 @@ package org.apache.jackrabbit.oak.plugin import java.io.File; import java.io.InputStream; -import javax.annotation.Nonnull; - import com.google.common.base.Strings; import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.plugins.blob.serializer.FSBlobSerializer; import org.apache.jackrabbit.oak.plugins.memory.AbstractBlob; import org.apache.jackrabbit.oak.plugins.memory.ArrayBasedBlob; +import org.jetbrains.annotations.NotNull; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -80,7 +79,7 @@ public class FSBlobSerializerTest { return "foo"; } - @Nonnull + @NotNull @Override public InputStream getNewStream() { throw new RuntimeException(); @@ -91,4 +90,4 @@ public class FSBlobSerializerTest { return 0; } } -} \ No newline at end of file +}