Author: reschke Date: Wed Nov 7 14:34:38 2018 New Revision: 1846034 URL: http://svn.apache.org/viewvc?rev=1846034&view=rev Log: OAK-7669: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-segment-tar
Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-segment-tar/pom.xml jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreBackupImpl.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreBackupRestoreImpl.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Cache.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CacheAccessTracker.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CacheWeights.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CheckpointCompactor.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Compactor.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriterBuilder.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/IdentityRecordNumbers.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/IllegalSegmentReferences.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ImmutableRecordNumbers.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapEntry.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapRecord.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MutableRecordNumbers.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MutableSegmentReferences.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/PropertyTemplate.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Record.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordId.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordNumbers.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordUsageAnalyser.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Revisions.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBlob.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriter.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPool.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentDiscoveryLiteDescriptors.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentId.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentIdFactory.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentIdProvider.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentIdTable.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeBuilder.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeState.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStore.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreBuilders.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreService.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNotFoundExceptionListener.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentParser.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentPropertyState.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentReader.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentStore.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentStream.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentTracker.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriter.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Template.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriteOperationHandler.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/SegmentGCOptions.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/SegmentRevisionGC.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/SegmentRevisionGCMBean.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/AbstractFileStore.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreBuilder.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreGCMonitor.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreStats.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/GCJournal.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/GCListener.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/GCMemoryBarrier.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/GCNodeWriteMonitor.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/JournalEntry.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/MetricsIOMonitor.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PrefixedGCListener.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/ReadOnlyFileStore.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/ReadOnlyRevisions.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/Reclaimers.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/SafeRunnable.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/Scheduler.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/SizeDeltaGcEstimation.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/TarRevisions.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/GCGeneration.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarFiles.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarReader.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tooling/BasicReadOnlyBlobStore.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tooling/RevisionHistory.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/memory/MemoryStore.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/memory/MemoryStoreRevisions.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/Commit.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/LockBasedScheduler.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/Scheduler.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClient.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSync.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSyncExecution.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/jmx/ObservablePartnerMBean.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/jmx/StandbyStatusMBean.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/server/StandbyServerSync.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/CommunicationPartnerMBean.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Compact.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Utils.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/BigInlinedBinaryIT.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/BlobIdRecordTest.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/CheckpointCompactorTest.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/CompactorTest.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/ExternalBlobIT.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/ManyChildNodesIT.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/NodeRecordTest.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/ReaderCacheTest.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPoolTest.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionIT.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentDataStoreBlobGCIT.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentIdTableBenchmark.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentIdTableTest.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/TestUtils.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/FileBlob.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/TarRevisionsTest.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/scheduler/LockBasedSchedulerCheckpointTest.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java Propchange: jackrabbit/oak/branches/1.8/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 7 14:34:38 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-1836187,1836189-1836190,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-1836187,1836189-1836191,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-segment-tar/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-segment-tar/pom.xml?rev=1846034&r1=1846033&r2=1846034&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-segment-tar/pom.xml (original) +++ jackrabbit/oak/branches/1.8/oak-segment-tar/pom.xml Wed Nov 7 14:34:38 2018 @@ -232,8 +232,8 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> + <groupId>org.jetbrains</groupId> + <artifactId>annotations</artifactId> <scope>provided</scope> </dependency> <dependency> Modified: jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreBackupImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreBackupImpl.java?rev=1846034&r1=1846033&r2=1846034&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreBackupImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreBackupImpl.java Wed Nov 7 14:34:38 2018 @@ -24,8 +24,6 @@ import static org.apache.jackrabbit.oak. import java.io.File; import java.io.IOException; -import javax.annotation.Nonnull; - import com.google.common.base.Stopwatch; import com.google.common.base.Suppliers; import org.apache.jackrabbit.oak.backup.FileStoreBackup; @@ -44,6 +42,7 @@ import org.apache.jackrabbit.oak.segment import org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException; import org.apache.jackrabbit.oak.segment.file.tar.GCGeneration; import org.apache.jackrabbit.oak.segment.file.tooling.BasicReadOnlyBlobStore; +import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,7 +53,7 @@ public class FileStoreBackupImpl impleme public static final boolean USE_FAKE_BLOBSTORE = Boolean.getBoolean("oak.backup.UseFakeBlobStore"); @Override - public void backup(@Nonnull SegmentReader reader, @Nonnull Revisions revisions, @Nonnull File destination) throws IOException, InvalidFileStoreVersionException { + public void backup(@NotNull SegmentReader reader, @NotNull Revisions revisions, @NotNull File destination) throws IOException, InvalidFileStoreVersionException { Stopwatch watch = Stopwatch.createStarted(); SegmentGCOptions gcOptions = SegmentGCOptions.defaultGCOptions().setOffline(); Modified: jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreBackupRestoreImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreBackupRestoreImpl.java?rev=1846034&r1=1846033&r2=1846034&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreBackupRestoreImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreBackupRestoreImpl.java Wed Nov 7 14:34:38 2018 @@ -29,7 +29,6 @@ import java.io.File; import java.util.concurrent.Callable; import java.util.concurrent.Executor; -import javax.annotation.Nonnull; import javax.management.openmbean.CompositeData; import org.apache.jackrabbit.oak.api.jmx.FileStoreBackupRestoreMBean; @@ -39,6 +38,7 @@ import org.apache.jackrabbit.oak.commons import org.apache.jackrabbit.oak.segment.Revisions; import org.apache.jackrabbit.oak.segment.SegmentNodeStore; import org.apache.jackrabbit.oak.segment.SegmentReader; +import org.jetbrains.annotations.NotNull; /** * Default implementation of {@link FileStoreBackupRestoreMBean} based on a @@ -74,11 +74,11 @@ public class FileStoreBackupRestoreImpl * @param executor executor for running the back up or restore operation */ public FileStoreBackupRestoreImpl( - @Nonnull SegmentNodeStore store, - @Nonnull Revisions revisions, - @Nonnull SegmentReader reader, - @Nonnull File file, - @Nonnull Executor executor + @NotNull SegmentNodeStore store, + @NotNull Revisions revisions, + @NotNull SegmentReader reader, + @NotNull File file, + @NotNull Executor executor ) { this.store = checkNotNull(store); this.revisions = checkNotNull(revisions); @@ -91,7 +91,7 @@ public class FileStoreBackupRestoreImpl } @Override - @Nonnull + @NotNull public synchronized CompositeData startBackup() { if (backupOp.isDone()) { backupOp = newManagementOperation("Backup", new Callable<String>() { @@ -111,13 +111,13 @@ public class FileStoreBackupRestoreImpl } @Override - @Nonnull + @NotNull public synchronized CompositeData getBackupStatus() { return backupOp.getStatus().toCompositeData(); } @Override - @Nonnull + @NotNull public synchronized CompositeData startRestore() { if (restoreOp.isDone()) { restoreOp = newManagementOperation("Restore", new Callable<String>() { @@ -137,13 +137,13 @@ public class FileStoreBackupRestoreImpl } @Override - @Nonnull + @NotNull public synchronized CompositeData getRestoreStatus() { return restoreOp.getStatus().toCompositeData(); } @Override - @Nonnull + @NotNull public String checkpoint(long lifetime) { return store.checkpoint(lifetime); } Modified: jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Cache.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Cache.java?rev=1846034&r1=1846033&r2=1846034&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Cache.java (original) +++ jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Cache.java Wed Nov 7 14:34:38 2018 @@ -18,8 +18,8 @@ package org.apache.jackrabbit.oak.segment; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Partial mapping of keys of type {@code K} to values of type {@link V}. If supported by the @@ -35,7 +35,7 @@ public interface Cache<K, V> { * support values without an associated cost and {@link #put(Object, Object, byte)} * should be used instead. */ - void put(@Nonnull K key, @Nonnull V value); + void put(@NotNull K key, @NotNull V value); /** * Add a mapping from {@code key} to {@code value} with a given {@code cost}. @@ -43,11 +43,11 @@ public interface Cache<K, V> { * support values with an associated cost and {@link #put(Object, Object)} * should be used instead. */ - void put(@Nonnull K key, @Nonnull V value, byte cost); + void put(@NotNull K key, @NotNull V value, byte cost); /** * @return The mapping for {@code key}, or {@code null} if none. */ - @CheckForNull - V get(@Nonnull K key); + @Nullable + V get(@NotNull K key); } Modified: jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CacheAccessTracker.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CacheAccessTracker.java?rev=1846034&r1=1846033&r2=1846034&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CacheAccessTracker.java (original) +++ jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CacheAccessTracker.java Wed Nov 7 14:34:38 2018 @@ -18,12 +18,11 @@ package org.apache.jackrabbit.oak.segment; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.stats.CounterStats; import org.apache.jackrabbit.oak.stats.StatisticsProvider; import org.apache.jackrabbit.oak.stats.StatsOptions; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * {@code Cache} wrapper exposing the number of read accesses and the @@ -42,9 +41,9 @@ public class CacheAccessTracker<K, V> im * @param delegate the underlying, wrapped cache. */ public CacheAccessTracker( - @Nonnull String name, - @Nonnull StatisticsProvider statisticsProvider, - @Nonnull Cache<K, V> delegate) { + @NotNull String name, + @NotNull StatisticsProvider statisticsProvider, + @NotNull Cache<K, V> delegate) { this.delegate = delegate; this.accessCount = statisticsProvider.getCounterStats( name + ".access-count", StatsOptions.DEFAULT); @@ -53,18 +52,18 @@ public class CacheAccessTracker<K, V> im } @Override - public void put(@Nonnull K key, @Nonnull V value) { + public void put(@NotNull K key, @NotNull V value) { delegate.put(key, value); } @Override - public void put(@Nonnull K key, @Nonnull V value, byte cost) { + public void put(@NotNull K key, @NotNull V value, byte cost) { delegate.put(key, value, cost); } - @CheckForNull + @Nullable @Override - public V get(@Nonnull K key) { + public V get(@NotNull K key) { V v = delegate.get(key); accessCount.inc(); if (v == null) { Modified: jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CacheWeights.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CacheWeights.java?rev=1846034&r1=1846033&r2=1846034&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CacheWeights.java (original) +++ jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CacheWeights.java Wed Nov 7 14:34:38 2018 @@ -20,9 +20,8 @@ package org.apache.jackrabbit.oak.segmen import static org.apache.jackrabbit.oak.commons.StringUtils.estimateMemoryUsage; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.segment.ReaderCache.CacheKey; +import org.jetbrains.annotations.NotNull; import com.google.common.cache.Weigher; @@ -55,7 +54,7 @@ public final class CacheWeights { public static class OneWeigher<K, V> implements Weigher<K, V> { @Override - public int weigh(@Nonnull Object key, @Nonnull Object value) { + public int weigh(@NotNull Object key, @NotNull Object value) { return 1; } } @@ -74,7 +73,7 @@ public final class CacheWeights { public static class SegmentCacheWeigher implements Weigher<SegmentId, Segment> { @Override - public int weigh(@Nonnull SegmentId id, @Nonnull Segment segment) { + public int weigh(@NotNull SegmentId id, @NotNull Segment segment) { return segmentWeight(segment); } } @@ -82,7 +81,7 @@ public final class CacheWeights { public static class NodeCacheWeigher implements Weigher<String, RecordId> { @Override - public int weigh(@Nonnull String key, @Nonnull RecordId value) { + public int weigh(@NotNull String key, @NotNull RecordId value) { int size = PRIORITY_CACHE_OVERHEAD; size += estimateMemoryUsage(key); size += value.estimateMemoryUsage(); @@ -93,7 +92,7 @@ public final class CacheWeights { public static class StringCacheWeigher implements Weigher<String, RecordId> { @Override - public int weigh(@Nonnull String key, @Nonnull RecordId value) { + public int weigh(@NotNull String key, @NotNull RecordId value) { int size = RECORD_CACHE_OVERHEAD; size += estimateMemoryUsage(key); size += value.estimateMemoryUsage(); @@ -105,7 +104,7 @@ public final class CacheWeights { Weigher<Template, RecordId> { @Override - public int weigh(@Nonnull Template key, @Nonnull RecordId value) { + public int weigh(@NotNull Template key, @NotNull RecordId value) { int size = RECORD_CACHE_OVERHEAD; size += key.estimateMemoryUsage(); size += value.estimateMemoryUsage(); @@ -117,7 +116,7 @@ public final class CacheWeights { Weigher<CacheKey, Template> { @Override - public int weigh(@Nonnull CacheKey key, @Nonnull Template value) { + public int weigh(@NotNull CacheKey key, @NotNull Template value) { int size = LIRS_CACHE_OVERHEAD; size += key.estimateMemoryUsage(); size += value.estimateMemoryUsage(); @@ -129,7 +128,7 @@ public final class CacheWeights { Weigher<CacheKey, String> { @Override - public int weigh(@Nonnull CacheKey key, @Nonnull String value) { + public int weigh(@NotNull CacheKey key, @NotNull String value) { int size = LIRS_CACHE_OVERHEAD; size += key.estimateMemoryUsage(); size += estimateMemoryUsage(value); Modified: jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java?rev=1846034&r1=1846033&r2=1846034&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java (original) +++ jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java Wed Nov 7 14:34:38 2018 @@ -21,15 +21,13 @@ package org.apache.jackrabbit.oak.segmen import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import com.google.common.base.Function; import com.google.common.base.Supplier; import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.spi.blob.BlobStore; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * This {@code SegmentReader} implementation implements caching for @@ -39,22 +37,22 @@ public class CachingSegmentReader implem public static final int DEFAULT_STRING_CACHE_MB = 256; public static final int DEFAULT_TEMPLATE_CACHE_MB = 64; - @Nonnull + @NotNull private final Supplier<SegmentWriter> writer; - @CheckForNull + @Nullable private final BlobStore blobStore; /** * Cache for string records */ - @Nonnull + @NotNull private final StringCache stringCache; /** * Cache for template records */ - @Nonnull + @NotNull private final TemplateCache templateCache; /** @@ -68,7 +66,7 @@ public class CachingSegmentReader implem * @param templateCacheMB the size of the template cache in MBs or {@code 0} for no cache. */ public CachingSegmentReader( - @Nonnull Supplier<SegmentWriter> writer, + @NotNull Supplier<SegmentWriter> writer, @Nullable BlobStore blobStore, long stringCacheMB, long templateCacheMB) { @@ -81,14 +79,14 @@ public class CachingSegmentReader implem /** * Cached reading of a string. */ - @Nonnull + @NotNull @Override - public String readString(@Nonnull RecordId id) { + public String readString(@NotNull RecordId id) { final SegmentId segmentId = id.getSegmentId(); long msb = segmentId.getMostSignificantBits(); long lsb = segmentId.getLeastSignificantBits(); return stringCache.get(msb, lsb, id.getRecordNumber(), new Function<Integer, String>() { - @Nonnull + @NotNull @Override public String apply(Integer offset) { return segmentId.getSegment().readString(offset); @@ -96,23 +94,23 @@ public class CachingSegmentReader implem }); } - @Nonnull + @NotNull @Override - public MapRecord readMap(@Nonnull RecordId id) { + public MapRecord readMap(@NotNull RecordId id) { return new MapRecord(this, id); } /** * Cached reading of a template. */ - @Nonnull + @NotNull @Override - public Template readTemplate(@Nonnull RecordId id) { + public Template readTemplate(@NotNull RecordId id) { final SegmentId segmentId = id.getSegmentId(); long msb = segmentId.getMostSignificantBits(); long lsb = segmentId.getLeastSignificantBits(); return templateCache.get(msb, lsb, id.getRecordNumber(), new Function<Integer, Template>() { - @Nonnull + @NotNull @Override public Template apply(Integer offset) { return segmentId.getSegment().readTemplate(offset); @@ -120,37 +118,37 @@ public class CachingSegmentReader implem }); } - @Nonnull + @NotNull @Override - public SegmentNodeState readNode(@Nonnull RecordId id) { + public SegmentNodeState readNode(@NotNull RecordId id) { return new SegmentNodeState(this, writer, blobStore, id); } - @Nonnull + @NotNull @Override - public SegmentNodeState readHeadState(@Nonnull Revisions revisions) { + public SegmentNodeState readHeadState(@NotNull Revisions revisions) { return readNode(revisions.getHead()); } - @Nonnull + @NotNull @Override public SegmentPropertyState readProperty( - @Nonnull RecordId id, @Nonnull PropertyTemplate template) { + @NotNull RecordId id, @NotNull PropertyTemplate template) { return new SegmentPropertyState(this, id, template); } - @Nonnull + @NotNull @Override - public SegmentBlob readBlob(@Nonnull RecordId id) { + public SegmentBlob readBlob(@NotNull RecordId id) { return new SegmentBlob(blobStore, id); } - @Nonnull + @NotNull public CacheStats getStringCacheStats() { return stringCache.getStats(); } - @Nonnull + @NotNull public CacheStats getTemplateCacheStats() { return templateCache.getStats(); } Modified: jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CheckpointCompactor.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CheckpointCompactor.java?rev=1846034&r1=1846033&r2=1846034&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CheckpointCompactor.java (original) +++ jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CheckpointCompactor.java Wed Nov 7 14:34:38 2018 @@ -34,10 +34,6 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import com.google.common.base.Supplier; import org.apache.jackrabbit.oak.segment.file.GCNodeWriteMonitor; import org.apache.jackrabbit.oak.spi.blob.BlobStore; @@ -45,6 +41,8 @@ import org.apache.jackrabbit.oak.spi.gc. import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * This compactor implementation is aware of the checkpoints in the repository. @@ -58,21 +56,21 @@ import org.apache.jackrabbit.oak.spi.sta * </ul> */ public class CheckpointCompactor { - @Nonnull + @NotNull private final GCMonitor gcListener; - @Nonnull + @NotNull private final Map<NodeState, NodeState> cpCache = newHashMap(); - @Nonnull + @NotNull private final Compactor compactor; - @Nonnull + @NotNull private final NodeWriter nodeWriter; private interface NodeWriter { - @Nonnull - SegmentNodeState writeNode(@Nonnull NodeState node, @Nullable ByteBuffer stableId) throws IOException; + @NotNull + SegmentNodeState writeNode(@NotNull NodeState node, @Nullable ByteBuffer stableId) throws IOException; } /** @@ -85,12 +83,12 @@ public class CheckpointCompactor { * properties, and binaries */ public CheckpointCompactor( - @Nonnull GCMonitor gcListener, - @Nonnull SegmentReader reader, - @Nonnull SegmentWriter writer, + @NotNull GCMonitor gcListener, + @NotNull SegmentReader reader, + @NotNull SegmentWriter writer, @Nullable BlobStore blobStore, - @Nonnull Supplier<Boolean> cancel, - @Nonnull GCNodeWriteMonitor compactionMonitor) { + @NotNull Supplier<Boolean> cancel, + @NotNull GCNodeWriteMonitor compactionMonitor) { this.gcListener = gcListener; this.compactor = new Compactor(reader, writer, blobStore, cancel, compactionMonitor); this.nodeWriter = (node, stableId) -> { @@ -108,11 +106,11 @@ public class CheckpointCompactor { * @return compacted clone of {@code uncompacted} or {@code null} if cancelled. * @throws IOException */ - @CheckForNull + @Nullable public SegmentNodeState compact( - @Nonnull NodeState base, - @Nonnull NodeState uncompacted, - @Nonnull NodeState onto) + @NotNull NodeState base, + @NotNull NodeState uncompacted, + @NotNull NodeState onto) throws IOException { // Collect a chronologically ordered list of roots for the uncompacted // state. This list consists of all checkpoints followed by the root. @@ -138,15 +136,15 @@ public class CheckpointCompactor { return nodeWriter.writeNode(builder.getNodeState(), getStableIdBytes(uncompacted)); } - @CheckForNull - private static ByteBuffer getStableIdBytes(@Nonnull NodeState node) { + @Nullable + private static ByteBuffer getStableIdBytes(@NotNull NodeState node) { return node instanceof SegmentNodeState ? ((SegmentNodeState) node).getStableIdBytes() : null; } - @Nonnull - private static NodeState getRoot(@Nonnull NodeState node) { + @NotNull + private static NodeState getRoot(@NotNull NodeState node) { return node.hasChildNode("root") ? node.getChildNode("root") : EMPTY_NODE; @@ -156,11 +154,11 @@ public class CheckpointCompactor { * Compact a list of uncompacted roots on top of base roots of the same key or * an empty node if none. */ - @CheckForNull + @Nullable private LinkedHashMap<String, NodeState> compact( - @Nonnull NodeState base, - @Nonnull LinkedHashMap<String, NodeState> uncompactedRoots, - @Nonnull NodeState onto) + @NotNull NodeState base, + @NotNull LinkedHashMap<String, NodeState> uncompactedRoots, + @NotNull NodeState onto) throws IOException { LinkedHashMap<String, NodeState> compactedRoots = newLinkedHashMap(); for (Entry<String, NodeState> uncompactedRoot : uncompactedRoots.entrySet()) { @@ -182,7 +180,7 @@ public class CheckpointCompactor { * state from a {@code superRoot}. This list consists of all checkpoints followed by * the root. */ - @Nonnull + @NotNull private LinkedHashMap<String, NodeState> collectRoots(@Nullable NodeState superRoot) { LinkedHashMap<String, NodeState> roots = newLinkedHashMap(); if (superRoot != null) { @@ -207,7 +205,7 @@ public class CheckpointCompactor { return roots; } - @Nonnull + @NotNull private static NodeBuilder getChild(NodeBuilder builder, String path) { for (String name : elements(path)) { builder = builder.getChildNode(name); @@ -220,7 +218,7 @@ public class CheckpointCompactor { final NodeState nextBefore; final NodeState nextOnto; - Result(@Nonnull NodeState compacted, @Nonnull NodeState nextBefore, @Nonnull NodeState nextOnto) { + Result(@NotNull NodeState compacted, @NotNull NodeState nextBefore, @NotNull NodeState nextOnto) { this.compacted = compacted; this.nextBefore = nextBefore; this.nextOnto = nextOnto; @@ -232,12 +230,12 @@ public class CheckpointCompactor { * {@code after} has been compacted before and is found in the cache. In this * case the cached version of the previously compacted {@code before} is returned. */ - @CheckForNull + @Nullable private Result compactWithCache( - @Nonnull NodeState before, - @Nonnull NodeState after, - @Nonnull NodeState onto, - @Nonnull String path) + @NotNull NodeState before, + @NotNull NodeState after, + @NotNull NodeState onto, + @NotNull String path) throws IOException { gcListener.info("compacting {}.", path); NodeState compacted = cpCache.get(after); Modified: jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Compactor.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Compactor.java?rev=1846034&r1=1846033&r2=1846034&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Compactor.java (original) +++ jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Compactor.java Wed Nov 7 14:34:38 2018 @@ -31,10 +31,6 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.util.List; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import com.google.common.base.Supplier; import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.api.PropertyState; @@ -44,6 +40,8 @@ import org.apache.jackrabbit.oak.segment import org.apache.jackrabbit.oak.spi.blob.BlobStore; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStateDiff; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Instances of this class can be used to compact a node state. I.e. to create a clone @@ -62,19 +60,19 @@ public class Compactor { static final int UPDATE_LIMIT = Integer.getInteger("compaction.update.limit", 10000); - @Nonnull + @NotNull private final SegmentWriter writer; - @Nonnull + @NotNull private final SegmentReader reader; @Nullable private final BlobStore blobStore; - @Nonnull + @NotNull private final Supplier<Boolean> cancel; - @Nonnull + @NotNull private final GCNodeWriteMonitor compactionMonitor; /** @@ -87,11 +85,11 @@ public class Compactor { * properties, and binaries */ public Compactor( - @Nonnull SegmentReader reader, - @Nonnull SegmentWriter writer, + @NotNull SegmentReader reader, + @NotNull SegmentWriter writer, @Nullable BlobStore blobStore, - @Nonnull Supplier<Boolean> cancel, - @Nonnull GCNodeWriteMonitor compactionMonitor) { + @NotNull Supplier<Boolean> cancel, + @NotNull GCNodeWriteMonitor compactionMonitor) { this.writer = checkNotNull(writer); this.reader = checkNotNull(reader); this.blobStore = blobStore; @@ -105,8 +103,8 @@ public class Compactor { * @return the compacted node state or {@code null} if cancelled. * @throws IOException */ - @CheckForNull - public SegmentNodeState compact(@Nonnull NodeState state) throws IOException { + @Nullable + public SegmentNodeState compact(@NotNull NodeState state) throws IOException { return compact(EMPTY_NODE, state, EMPTY_NODE); } @@ -118,11 +116,11 @@ public class Compactor { * @return the compacted node state or {@code null} if cancelled. * @throws IOException */ - @CheckForNull + @Nullable public SegmentNodeState compact( - @Nonnull NodeState before, - @Nonnull NodeState after, - @Nonnull NodeState onto) + @NotNull NodeState before, + @NotNull NodeState after, + @NotNull NodeState onto) throws IOException { checkNotNull(before); checkNotNull(after); @@ -130,7 +128,7 @@ public class Compactor { return new CompactDiff(onto).diff(before, after); } - @CheckForNull + @Nullable private static ByteBuffer getStableIdBytes(NodeState state) { if (state instanceof SegmentNodeState) { return ((SegmentNodeState) state).getStableIdBytes(); @@ -140,13 +138,13 @@ public class Compactor { } private class CompactDiff implements NodeStateDiff { - @Nonnull + @NotNull private MemoryNodeBuilder builder; - @Nonnull + @NotNull private final NodeState base; - @CheckForNull + @Nullable private IOException exception; private long modCount; @@ -159,13 +157,13 @@ public class Compactor { } } - CompactDiff(@Nonnull NodeState base) { + CompactDiff(@NotNull NodeState base) { this.builder = new MemoryNodeBuilder(checkNotNull(base)); this.base = base; } - @CheckForNull - SegmentNodeState diff(@Nonnull NodeState before, @Nonnull NodeState after) throws IOException { + @Nullable + SegmentNodeState diff(@NotNull NodeState before, @NotNull NodeState after) throws IOException { boolean success = after.compareAgainstBaseState(before, new CancelableDiff(this, cancel)); if (exception != null) { throw new IOException(exception); @@ -181,13 +179,13 @@ public class Compactor { } @Override - public boolean propertyAdded(@Nonnull PropertyState after) { + public boolean propertyAdded(@NotNull PropertyState after) { builder.setProperty(compact(after)); return true; } @Override - public boolean propertyChanged(@Nonnull PropertyState before, @Nonnull PropertyState after) { + public boolean propertyChanged(@NotNull PropertyState before, @NotNull PropertyState after) { builder.setProperty(compact(after)); return true; } @@ -199,7 +197,7 @@ public class Compactor { } @Override - public boolean childNodeAdded(@Nonnull String name, @Nonnull NodeState after) { + public boolean childNodeAdded(@NotNull String name, @NotNull NodeState after) { try { SegmentNodeState compacted = compact(after); if (compacted != null) { @@ -216,7 +214,7 @@ public class Compactor { } @Override - public boolean childNodeChanged(@Nonnull String name, @Nonnull NodeState before, @Nonnull NodeState after) { + public boolean childNodeChanged(@NotNull String name, @NotNull NodeState before, @NotNull NodeState after) { try { SegmentNodeState compacted = compact(before, after, base.getChildNode(name)); if (compacted != null) { @@ -245,8 +243,8 @@ public class Compactor { } } - @Nonnull - private PropertyState compact(@Nonnull PropertyState property) { + @NotNull + private PropertyState compact(@NotNull PropertyState property) { compactionMonitor.onProperty(); String name = property.getName(); Type<?> type = property.getType(); Modified: jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java?rev=1846034&r1=1846033&r2=1846034&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java (original) +++ jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java Wed Nov 7 14:34:38 2018 @@ -58,9 +58,6 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.PropertyType; import com.google.common.io.Closeables; @@ -74,6 +71,8 @@ import org.apache.jackrabbit.oak.spi.blo import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry; import org.apache.jackrabbit.oak.spi.state.DefaultNodeStateDiff; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -87,22 +86,22 @@ public class DefaultSegmentWriter implem private static final Logger LOG = LoggerFactory.getLogger(DefaultSegmentWriter.class); - @Nonnull + @NotNull private final WriterCacheManager cacheManager; - @Nonnull + @NotNull private final SegmentStore store; - @Nonnull + @NotNull private final SegmentReader reader; - @Nonnull + @NotNull private final SegmentIdProvider idProvider; - @CheckForNull + @Nullable private final BlobStore blobStore; - @Nonnull + @NotNull private final WriteOperationHandler writeOperationHandler; /** @@ -119,12 +118,12 @@ public class DefaultSegmentWriter implem * @param writeOperationHandler handler for write operations. */ public DefaultSegmentWriter( - @Nonnull SegmentStore store, - @Nonnull SegmentReader reader, - @Nonnull SegmentIdProvider idProvider, + @NotNull SegmentStore store, + @NotNull SegmentReader reader, + @NotNull SegmentIdProvider idProvider, @Nullable BlobStore blobStore, - @Nonnull WriterCacheManager cacheManager, - @Nonnull WriteOperationHandler writeOperationHandler + @NotNull WriterCacheManager cacheManager, + @NotNull WriteOperationHandler writeOperationHandler ) { this.store = checkNotNull(store); this.reader = checkNotNull(reader); @@ -140,110 +139,110 @@ public class DefaultSegmentWriter implem } @Override - @Nonnull + @NotNull public RecordId writeMap(@Nullable final MapRecord base, - @Nonnull final Map<String, RecordId> changes + @NotNull final Map<String, RecordId> changes ) throws IOException { return writeOperationHandler.execute(new SegmentWriteOperation() { - @Nonnull + @NotNull @Override - public RecordId execute(@Nonnull SegmentBufferWriter writer) throws IOException { + public RecordId execute(@NotNull SegmentBufferWriter writer) throws IOException { return with(writer).writeMap(base, changes); } }); } @Override - @Nonnull - public RecordId writeList(@Nonnull final List<RecordId> list) throws IOException { + @NotNull + public RecordId writeList(@NotNull final List<RecordId> list) throws IOException { return writeOperationHandler.execute(new SegmentWriteOperation() { - @Nonnull + @NotNull @Override - public RecordId execute(@Nonnull SegmentBufferWriter writer) throws IOException { + public RecordId execute(@NotNull SegmentBufferWriter writer) throws IOException { return with(writer).writeList(list); } }); } @Override - @Nonnull - public RecordId writeString(@Nonnull final String string) throws IOException { + @NotNull + public RecordId writeString(@NotNull final String string) throws IOException { return writeOperationHandler.execute(new SegmentWriteOperation() { - @Nonnull + @NotNull @Override - public RecordId execute(@Nonnull SegmentBufferWriter writer) throws IOException { + public RecordId execute(@NotNull SegmentBufferWriter writer) throws IOException { return with(writer).writeString(string); } }); } @Override - @Nonnull - public RecordId writeBlob(@Nonnull final Blob blob) throws IOException { + @NotNull + public RecordId writeBlob(@NotNull final Blob blob) throws IOException { return writeOperationHandler.execute(new SegmentWriteOperation() { - @Nonnull + @NotNull @Override - public RecordId execute(@Nonnull SegmentBufferWriter writer) throws IOException { + public RecordId execute(@NotNull SegmentBufferWriter writer) throws IOException { return with(writer).writeBlob(blob); } }); } @Override - @Nonnull - public RecordId writeBlock(@Nonnull final byte[] bytes, final int offset, final int length) + @NotNull + public RecordId writeBlock(@NotNull final byte[] bytes, final int offset, final int length) throws IOException { return writeOperationHandler.execute(new SegmentWriteOperation() { - @Nonnull + @NotNull @Override - public RecordId execute(@Nonnull SegmentBufferWriter writer) throws IOException { + public RecordId execute(@NotNull SegmentBufferWriter writer) throws IOException { return with(writer).writeBlock(bytes, offset, length); } }); } @Override - @Nonnull - public RecordId writeStream(@Nonnull final InputStream stream) throws IOException { + @NotNull + public RecordId writeStream(@NotNull final InputStream stream) throws IOException { return writeOperationHandler.execute(new SegmentWriteOperation() { - @Nonnull + @NotNull @Override - public RecordId execute(@Nonnull SegmentBufferWriter writer) throws IOException { + public RecordId execute(@NotNull SegmentBufferWriter writer) throws IOException { return with(writer).writeStream(stream); } }); } @Override - @Nonnull - public RecordId writeProperty(@Nonnull final PropertyState state) throws IOException { + @NotNull + public RecordId writeProperty(@NotNull final PropertyState state) throws IOException { return writeOperationHandler.execute(new SegmentWriteOperation() { - @Nonnull + @NotNull @Override - public RecordId execute(@Nonnull SegmentBufferWriter writer) throws IOException { + public RecordId execute(@NotNull SegmentBufferWriter writer) throws IOException { return with(writer).writeProperty(state); } }); } @Override - @Nonnull + @NotNull public RecordId writeNode( - @Nonnull final NodeState state, + @NotNull final NodeState state, @Nullable final ByteBuffer stableIdBytes) throws IOException { return writeOperationHandler.execute(new SegmentWriteOperation() { - @Nonnull + @NotNull @Override - public RecordId execute(@Nonnull SegmentBufferWriter writer) throws IOException { + public RecordId execute(@NotNull SegmentBufferWriter writer) throws IOException { return with(writer).writeNode(state, stableIdBytes); } }); @@ -264,12 +263,12 @@ public class DefaultSegmentWriter implem private Cache<String, RecordId> nodeCache; - @Nonnull + @NotNull @Override - public abstract RecordId execute(@Nonnull SegmentBufferWriter writer) throws IOException; + public abstract RecordId execute(@NotNull SegmentBufferWriter writer) throws IOException; - @Nonnull - SegmentWriteOperation with(@Nonnull SegmentBufferWriter writer) { + @NotNull + SegmentWriteOperation with(@NotNull SegmentBufferWriter writer) { checkState(this.writer == null); this.writer = writer; int generation = writer.getGCGeneration().getGeneration(); @@ -280,7 +279,7 @@ public class DefaultSegmentWriter implem } private RecordId writeMap(@Nullable MapRecord base, - @Nonnull Map<String, RecordId> changes + @NotNull Map<String, RecordId> changes ) throws IOException { if (base != null && base.isDiff()) { @@ -448,7 +447,7 @@ public class DefaultSegmentWriter implem * @param list list of record identifiers * @return list record identifier */ - private RecordId writeList(@Nonnull List<RecordId> list) throws IOException { + private RecordId writeList(@NotNull List<RecordId> list) throws IOException { checkNotNull(list); checkArgument(!list.isEmpty()); List<RecordId> thisLevel = list; @@ -506,7 +505,7 @@ public class DefaultSegmentWriter implem * @param string string to be written * @return value record identifier */ - private RecordId writeString(@Nonnull String string) throws IOException { + private RecordId writeString(@NotNull String string) throws IOException { RecordId id = stringCache.get(string); if (id != null) { return id; // shortcut if the same string was recently stored @@ -559,7 +558,7 @@ public class DefaultSegmentWriter implem && sameStore(((Record) blob).getRecordId().getSegmentId()); } - private RecordId writeBlob(@Nonnull Blob blob) throws IOException { + private RecordId writeBlob(@NotNull Blob blob) throws IOException { if (sameStore(blob)) { SegmentBlob segmentBlob = (SegmentBlob) blob; if (!isOldGeneration(segmentBlob.getRecordId())) { @@ -607,14 +606,14 @@ public class DefaultSegmentWriter implem return recordId; } - private RecordId writeBlock(@Nonnull byte[] bytes, int offset, int length) + private RecordId writeBlock(@NotNull byte[] bytes, int offset, int length) throws IOException { checkNotNull(bytes); checkPositionIndexes(offset, offset + length, bytes.length); return RecordWriters.newBlockWriter(bytes, offset, length).write(writer, store); } - private RecordId writeStream(@Nonnull InputStream stream) throws IOException { + private RecordId writeStream(@NotNull InputStream stream) throws IOException { boolean threw = true; try { RecordId id = SegmentStream.getRecordIdIfAvailable(stream, store); @@ -640,7 +639,7 @@ public class DefaultSegmentWriter implem } } - private RecordId internalWriteStream(@Nonnull InputStream stream) throws IOException { + private RecordId internalWriteStream(@NotNull InputStream stream) throws IOException { // Special case for short binaries (up to about 16kB): // store them directly as small- or medium-sized value records byte[] data = new byte[Segment.MEDIUM_LIMIT]; @@ -678,13 +677,13 @@ public class DefaultSegmentWriter implem return writeValueRecord(length, writeList(blockIds)); } - private RecordId writeProperty(@Nonnull PropertyState state) throws IOException { + private RecordId writeProperty(@NotNull PropertyState state) throws IOException { Map<String, RecordId> previousValues = emptyMap(); return writeProperty(state, previousValues); } - private RecordId writeProperty(@Nonnull PropertyState state, - @Nonnull Map<String, RecordId> previousValues + private RecordId writeProperty(@NotNull PropertyState state, + @NotNull Map<String, RecordId> previousValues ) throws IOException { Type<?> type = state.getType(); @@ -791,7 +790,7 @@ public class DefaultSegmentWriter implem return tid; } - private RecordId writeNode(@Nonnull NodeState state, @Nullable ByteBuffer stableIdBytes) + private RecordId writeNode(@NotNull NodeState state, @Nullable ByteBuffer stableIdBytes) throws IOException { RecordId compactedId = deduplicateNode(state); @@ -818,7 +817,7 @@ public class DefaultSegmentWriter implem return (byte) (Byte.MIN_VALUE + 64 - numberOfLeadingZeros(childCount)); } - private RecordId writeNodeUncached(@Nonnull NodeState state, @Nullable ByteBuffer stableIdBytes) + private RecordId writeNodeUncached(@NotNull NodeState state, @Nullable ByteBuffer stableIdBytes) throws IOException { ModifiedNodeState after = null; @@ -941,8 +940,8 @@ public class DefaultSegmentWriter implem * @param node The node states to de-duplicate. * @return the id of the de-duplicated node or {@code null} if none. */ - @CheckForNull - private RecordId deduplicateNode(@Nonnull NodeState node) { + @Nullable + private RecordId deduplicateNode(@NotNull NodeState node) { if (!(node instanceof SegmentNodeState)) { // De-duplication only for persisted node states return null; Modified: jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriterBuilder.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriterBuilder.java?rev=1846034&r1=1846033&r2=1846034&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriterBuilder.java (original) +++ jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriterBuilder.java Wed Nov 7 14:34:38 2018 @@ -21,8 +21,6 @@ package org.apache.jackrabbit.oak.segmen import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Nonnull; - import com.google.common.base.Supplier; import com.google.common.base.Suppliers; import org.apache.jackrabbit.oak.segment.WriterCacheManager.Empty; @@ -30,6 +28,7 @@ import org.apache.jackrabbit.oak.segment import org.apache.jackrabbit.oak.segment.file.ReadOnlyFileStore; import org.apache.jackrabbit.oak.segment.file.tar.GCGeneration; import org.apache.jackrabbit.oak.segment.memory.MemoryStore; +import org.jetbrains.annotations.NotNull; /** * Builder for building {@link DefaultSegmentWriter} instances. @@ -51,18 +50,18 @@ import org.apache.jackrabbit.oak.segment */ public final class DefaultSegmentWriterBuilder { - @Nonnull + @NotNull private final String name; - @Nonnull + @NotNull private Supplier<GCGeneration> generation = Suppliers.ofInstance(GCGeneration.NULL); private boolean pooled = false; - @Nonnull + @NotNull private WriterCacheManager cacheManager = new WriterCacheManager.Default(); - private DefaultSegmentWriterBuilder(@Nonnull String name) { + private DefaultSegmentWriterBuilder(@NotNull String name) { this.name = checkNotNull(name); } @@ -70,8 +69,8 @@ public final class DefaultSegmentWriterB * Set the {@code name} of this builder. This name will appear in the segment's * meta data. */ - @Nonnull - public static DefaultSegmentWriterBuilder defaultSegmentWriterBuilder(@Nonnull String name) { + @NotNull + public static DefaultSegmentWriterBuilder defaultSegmentWriterBuilder(@NotNull String name) { return new DefaultSegmentWriterBuilder(name); } @@ -86,8 +85,8 @@ public final class DefaultSegmentWriterB * at the generation that {@code generation.get()} returns when a new segment * is created by the returned writer. */ - @Nonnull - public DefaultSegmentWriterBuilder withGeneration(@Nonnull Supplier<GCGeneration> generation) { + @NotNull + public DefaultSegmentWriterBuilder withGeneration(@NotNull Supplier<GCGeneration> generation) { this.generation = checkNotNull(generation); return this; } @@ -96,8 +95,8 @@ public final class DefaultSegmentWriterB * Specify the {@code generation} for the segment written by the returned * segment writer. */ - @Nonnull - public DefaultSegmentWriterBuilder withGeneration(@Nonnull GCGeneration generation) { + @NotNull + public DefaultSegmentWriterBuilder withGeneration(@NotNull GCGeneration generation) { this.generation = Suppliers.ofInstance(checkNotNull(generation)); return this; } @@ -106,7 +105,7 @@ public final class DefaultSegmentWriterB * Create a {@code SegmentWriter} backed by a {@link SegmentBufferWriterPool}. * The returned instance is thread safe. */ - @Nonnull + @NotNull public DefaultSegmentWriterBuilder withWriterPool() { this.pooled = true; return this; @@ -116,7 +115,7 @@ public final class DefaultSegmentWriterB * Create a {@code SegmentWriter} backed by a {@link SegmentBufferWriter}. * The returned instance is <em>not</em> thread safe. */ - @Nonnull + @NotNull public DefaultSegmentWriterBuilder withoutWriterPool() { this.pooled = false; return this; @@ -125,7 +124,7 @@ public final class DefaultSegmentWriterB /** * Specify the {@code cacheManager} used by the returned writer. */ - @Nonnull + @NotNull public DefaultSegmentWriterBuilder with(WriterCacheManager cacheManager) { this.cacheManager = checkNotNull(cacheManager); return this; @@ -135,7 +134,7 @@ public final class DefaultSegmentWriterB * Specify that the returned writer should not use a cache. * @see #with(WriterCacheManager) */ - @Nonnull + @NotNull public DefaultSegmentWriterBuilder withoutCache() { this.cacheManager = Empty.INSTANCE; return this; @@ -144,8 +143,8 @@ public final class DefaultSegmentWriterB /** * Build a {@code SegmentWriter} for a {@code FileStore}. */ - @Nonnull - public DefaultSegmentWriter build(@Nonnull FileStore store) { + @NotNull + public DefaultSegmentWriter build(@NotNull FileStore store) { return new DefaultSegmentWriter( checkNotNull(store), store.getReader(), @@ -161,8 +160,8 @@ public final class DefaultSegmentWriterB * Attempting to write to the returned writer will cause a * {@code UnsupportedOperationException} to be thrown. */ - @Nonnull - public DefaultSegmentWriter build(@Nonnull ReadOnlyFileStore store) { + @NotNull + public DefaultSegmentWriter build(@NotNull ReadOnlyFileStore store) { return new DefaultSegmentWriter( checkNotNull(store), store.getReader(), @@ -170,14 +169,14 @@ public final class DefaultSegmentWriterB store.getBlobStore(), cacheManager, new WriteOperationHandler() { - @Nonnull + @NotNull @Override - public RecordId execute(@Nonnull WriteOperation writeOperation) { + public RecordId execute(@NotNull WriteOperation writeOperation) { throw new UnsupportedOperationException("Cannot write to read-only store"); } @Override - public void flush(@Nonnull SegmentStore store) { + public void flush(@NotNull SegmentStore store) { throw new UnsupportedOperationException("Cannot write to read-only store"); } } @@ -187,8 +186,8 @@ public final class DefaultSegmentWriterB /** * Build a {@code SegmentWriter} for a {@code MemoryStore}. */ - @Nonnull - public DefaultSegmentWriter build(@Nonnull MemoryStore store) { + @NotNull + public DefaultSegmentWriter build(@NotNull MemoryStore store) { return new DefaultSegmentWriter( checkNotNull(store), store.getReader(), @@ -199,8 +198,8 @@ public final class DefaultSegmentWriterB ); } - @Nonnull - private WriteOperationHandler createWriter(@Nonnull FileStore store, boolean pooled) { + @NotNull + private WriteOperationHandler createWriter(@NotNull FileStore store, boolean pooled) { if (pooled) { return new SegmentBufferWriterPool( store.getSegmentIdProvider(), @@ -218,8 +217,8 @@ public final class DefaultSegmentWriterB } } - @Nonnull - private WriteOperationHandler createWriter(@Nonnull MemoryStore store, boolean pooled) { + @NotNull + private WriteOperationHandler createWriter(@NotNull MemoryStore store, boolean pooled) { if (pooled) { return new SegmentBufferWriterPool( store.getSegmentIdProvider(), Modified: jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/IdentityRecordNumbers.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/IdentityRecordNumbers.java?rev=1846034&r1=1846033&r2=1846034&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/IdentityRecordNumbers.java (original) +++ jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/IdentityRecordNumbers.java Wed Nov 7 14:34:38 2018 @@ -19,7 +19,7 @@ package org.apache.jackrabbit.oak.segmen import java.util.Iterator; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * An implementation of a record number to offset table that assumes that a @@ -36,7 +36,7 @@ class IdentityRecordNumbers implements R return recordNumber; } - @Nonnull + @NotNull @Override public Iterator<Entry> iterator() { throw new UnsupportedOperationException("invalid usage of the record-number-to-offset table"); Modified: jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/IllegalSegmentReferences.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/IllegalSegmentReferences.java?rev=1846034&r1=1846033&r2=1846034&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/IllegalSegmentReferences.java (original) +++ jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/IllegalSegmentReferences.java Wed Nov 7 14:34:38 2018 @@ -19,7 +19,7 @@ package org.apache.jackrabbit.oak.segmen import java.util.Iterator; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * An implementation of {@link SegmentReferences} that throws {@link @@ -34,7 +34,7 @@ class IllegalSegmentReferences implement throw new IllegalStateException("invalid use"); } - @Nonnull + @NotNull @Override public Iterator<SegmentId> iterator() { throw new IllegalStateException("invalid use"); Modified: jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ImmutableRecordNumbers.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ImmutableRecordNumbers.java?rev=1846034&r1=1846033&r2=1846034&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ImmutableRecordNumbers.java (original) +++ jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ImmutableRecordNumbers.java Wed Nov 7 14:34:38 2018 @@ -19,10 +19,10 @@ package org.apache.jackrabbit.oak.segmen import java.util.Iterator; -import javax.annotation.Nonnull; - import com.google.common.collect.AbstractIterator; +import org.jetbrains.annotations.NotNull; + /** * An immutable record table. It is initialized at construction time and can * never be changed afterwards. @@ -31,10 +31,10 @@ import com.google.common.collect.Abstrac */ class ImmutableRecordNumbers implements RecordNumbers { - @Nonnull + @NotNull private final int[] offsets; - @Nonnull + @NotNull private final byte[] type; /** @@ -46,7 +46,7 @@ class ImmutableRecordNumbers implements * @param offsets Offsets per position. -1 if not mapped. * @param type Types per position. Not defined if not mapped. */ - public ImmutableRecordNumbers(@Nonnull int[] offsets, @Nonnull byte[] type) { + public ImmutableRecordNumbers(@NotNull int[] offsets, @NotNull byte[] type) { this.offsets = offsets; this.type = type; } @@ -61,7 +61,7 @@ class ImmutableRecordNumbers implements } } - @Nonnull + @NotNull @Override public Iterator<Entry> iterator() { return new AbstractIterator<Entry>() { Modified: jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapEntry.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapEntry.java?rev=1846034&r1=1846033&r2=1846034&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapEntry.java (original) +++ jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapEntry.java Wed Nov 7 14:34:38 2018 @@ -24,13 +24,11 @@ import static org.apache.jackrabbit.oak. import java.util.Map; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import com.google.common.collect.ComparisonChain; import com.google.common.collect.Ordering; import org.apache.jackrabbit.oak.spi.state.AbstractChildNodeEntry; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Representation of a single key-value entry in a map. @@ -38,22 +36,22 @@ import org.apache.jackrabbit.oak.spi.sta class MapEntry extends AbstractChildNodeEntry implements Map.Entry<RecordId, RecordId>, Comparable<MapEntry> { - @Nonnull + @NotNull private final SegmentReader reader; - @Nonnull + @NotNull private final String name; - @Nonnull + @NotNull private final RecordId key; - @CheckForNull + @Nullable private final RecordId value; private MapEntry( - @Nonnull SegmentReader reader, - @Nonnull String name, - @Nonnull RecordId key, + @NotNull SegmentReader reader, + @NotNull String name, + @NotNull RecordId key, @Nullable RecordId value) { this.reader = checkNotNull(reader); this.name = checkNotNull(name); @@ -70,10 +68,10 @@ class MapEntry extends AbstractChildNode * @param value record id of the value */ static MapEntry newMapEntry( - @Nonnull SegmentReader reader, - @Nonnull String name, - @Nonnull RecordId key, - @Nonnull RecordId value) { + @NotNull SegmentReader reader, + @NotNull String name, + @NotNull RecordId key, + @NotNull RecordId value) { return new MapEntry(reader, name, key, checkNotNull(value)); } @@ -92,9 +90,9 @@ class MapEntry extends AbstractChildNode * @see #getValue() */ static MapEntry newModifiedMapEntry( - @Nonnull SegmentReader reader, - @Nonnull String name, - @Nonnull RecordId key, + @NotNull SegmentReader reader, + @NotNull String name, + @NotNull RecordId key, @Nullable RecordId value) { return new MapEntry(reader, name, key, value); } @@ -112,12 +110,12 @@ class MapEntry extends AbstractChildNode //----------------------------------------------------< ChildNodeEntry >-- - @Override @Nonnull + @Override @NotNull public String getName() { return name; } - @Override @Nonnull + @Override @NotNull public SegmentNodeState getNodeState() { checkState(value != null); return reader.readNode(value); @@ -125,7 +123,7 @@ class MapEntry extends AbstractChildNode //---------------------------------------------------------< Map.Entry >-- - @Nonnull + @NotNull @Override public RecordId getKey() { return key; @@ -135,7 +133,7 @@ class MapEntry extends AbstractChildNode * @return the value of this mapping. * @throws IllegalStateException if {@link #isDeleted()} is {@code true}. */ - @Nonnull + @NotNull @Override public RecordId getValue() { checkState(value != null); @@ -150,7 +148,7 @@ class MapEntry extends AbstractChildNode //--------------------------------------------------------< Comparable >-- @Override - public int compareTo(@Nonnull MapEntry that) { + public int compareTo(@NotNull MapEntry that) { return ComparisonChain.start() .compare(getHash() & HASH_MASK, that.getHash() & HASH_MASK) .compare(name, that.name) Modified: jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapRecord.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapRecord.java?rev=1846034&r1=1846033&r2=1846034&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapRecord.java (original) +++ jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapRecord.java Wed Nov 7 14:34:38 2018 @@ -31,13 +31,12 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import javax.annotation.Nonnull; - import com.google.common.base.Objects; import com.google.common.collect.ComparisonChain; import org.apache.jackrabbit.oak.spi.state.DefaultNodeStateDiff; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStateDiff; +import org.jetbrains.annotations.NotNull; /** * A map. The top level record is either a record of type "BRANCH" or "LEAF" @@ -53,7 +52,7 @@ public class MapRecord extends Record { private static final int A = 0xB; static final long HASH_MASK = 0xFFFFFFFFL; - @Nonnull + @NotNull private final SegmentReader reader; /** @@ -98,7 +97,7 @@ public class MapRecord extends Record { */ protected static final int MAX_SIZE = (1 << SIZE_BITS) - 1; // ~268e6 - MapRecord(@Nonnull SegmentReader reader, @Nonnull RecordId id) { + MapRecord(@NotNull SegmentReader reader, @NotNull RecordId id) { super(id); this.reader = checkNotNull(reader); } @@ -307,7 +306,7 @@ public class MapRecord extends Record { newArrayListWithCapacity(buckets.size()); for (final MapRecord bucket : buckets) { keys.add(new Iterable<String>() { - @Nonnull + @NotNull @Override public Iterator<String> iterator() { return bucket.getKeys().iterator(); @@ -357,7 +356,7 @@ public class MapRecord extends Record { newArrayListWithCapacity(buckets.size()); for (final MapRecord bucket : buckets) { entries.add(new Iterable<MapEntry>() { - @Nonnull + @NotNull @Override public Iterator<MapEntry> iterator() { return bucket.getEntries(diffKey, diffValue).iterator(); Modified: jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MutableRecordNumbers.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MutableRecordNumbers.java?rev=1846034&r1=1846033&r2=1846034&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MutableRecordNumbers.java (original) +++ jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MutableRecordNumbers.java Wed Nov 7 14:34:38 2018 @@ -22,10 +22,10 @@ import static java.util.Arrays.fill; import java.util.Iterator; -import javax.annotation.Nonnull; - import com.google.common.collect.AbstractIterator; +import org.jetbrains.annotations.NotNull; + /** * A thread-safe, mutable record table. */ @@ -56,7 +56,7 @@ class MutableRecordNumbers implements Re : entries[index * 2]; } - @Nonnull + @NotNull @Override public synchronized Iterator<Entry> iterator() { return new AbstractIterator<Entry>() { Modified: jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MutableSegmentReferences.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MutableSegmentReferences.java?rev=1846034&r1=1846033&r2=1846034&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MutableSegmentReferences.java (original) +++ jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MutableSegmentReferences.java Wed Nov 7 14:34:38 2018 @@ -24,7 +24,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * A mutable, thread-safe implementation of {@link SegmentReferences}. @@ -112,7 +112,7 @@ class MutableSegmentReferences implement } } - @Nonnull + @NotNull @Override public Iterator<SegmentId> iterator() { synchronized (lock) { Modified: jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/PropertyTemplate.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/PropertyTemplate.java?rev=1846034&r1=1846033&r2=1846034&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/PropertyTemplate.java (original) +++ jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/PropertyTemplate.java Wed Nov 7 14:34:38 2018 @@ -21,11 +21,10 @@ package org.apache.jackrabbit.oak.segmen import static com.google.common.base.Preconditions.checkNotNull; import static org.apache.jackrabbit.oak.segment.CacheWeights.OBJECT_HEADER_SIZE; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.commons.StringUtils; +import org.jetbrains.annotations.NotNull; import com.google.common.collect.ComparisonChain; @@ -73,7 +72,7 @@ public class PropertyTemplate implements //--------------------------------------------------------< Comparable >-- @Override - public int compareTo(@Nonnull PropertyTemplate template) { + public int compareTo(@NotNull PropertyTemplate template) { checkNotNull(template); return ComparisonChain.start() .compare(hashCode(), template.hashCode()) // important @@ -110,4 +109,4 @@ public class PropertyTemplate implements return OBJECT_HEADER_SIZE + 16 + StringUtils.estimateMemoryUsage(name); } -} \ No newline at end of file +}