You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2018/11/07 13:42:38 UTC
svn commit: r1846011 - in /jackrabbit/oak/branches/1.8: ./ oak-blob/
oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/
Author: reschke
Date: Wed Nov 7 13:42:38 2018
New Revision: 1846011
URL: http://svn.apache.org/viewvc?rev=1846011&view=rev
Log:
OAK-7669: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-blob
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-blob/pom.xml
jackrabbit/oak/branches/1.8/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/AbstractBlobStore.java
jackrabbit/oak/branches/1.8/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/BlobStore.java
jackrabbit/oak/branches/1.8/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/FileBlobStore.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 7 13:42: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-1836172,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-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/trunk:1345480
Modified: jackrabbit/oak/branches/1.8/oak-blob/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob/pom.xml?rev=1846011&r1=1846010&r2=1846011&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-blob/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-blob/pom.xml Wed Nov 7 13:42:38 2018
@@ -118,10 +118,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/src/main/java/org/apache/jackrabbit/oak/spi/blob/AbstractBlobStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/AbstractBlobStore.java?rev=1846011&r1=1846010&r2=1846011&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/AbstractBlobStore.java (original)
+++ jackrabbit/oak/branches/1.8/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/AbstractBlobStore.java Wed Nov 7 13:42:38 2018
@@ -40,7 +40,6 @@ import java.util.WeakHashMap;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
-import javax.annotation.Nonnull;
import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;
@@ -51,6 +50,7 @@ import org.apache.jackrabbit.oak.commons
import org.apache.jackrabbit.oak.commons.IOUtils;
import org.apache.jackrabbit.oak.commons.StringUtils;
import org.apache.jackrabbit.oak.spi.blob.stats.BlobStatsCollector;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -231,7 +231,7 @@ public abstract class AbstractBlobStore
//--------------------------------------------< Blob Reference >
@Override
- public String getReference(@Nonnull String blobId) {
+ public String getReference(@NotNull String blobId) {
checkNotNull(blobId, "BlobId must be specified");
try {
Mac mac = Mac.getInstance(ALGORITHM);
@@ -248,7 +248,7 @@ public abstract class AbstractBlobStore
}
@Override
- public String getBlobId(@Nonnull String reference) {
+ public String getBlobId(@NotNull String reference) {
checkNotNull(reference, "BlobId must be specified");
int colon = reference.indexOf(':');
if (colon != -1) {
Modified: jackrabbit/oak/branches/1.8/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/BlobStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/BlobStore.java?rev=1846011&r1=1846010&r2=1846011&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/BlobStore.java (original)
+++ jackrabbit/oak/branches/1.8/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/BlobStore.java Wed Nov 7 13:42:38 2018
@@ -19,8 +19,8 @@ package org.apache.jackrabbit.oak.spi.bl
import java.io.IOException;
import java.io.InputStream;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* An interface to store and read large binary objects.
@@ -87,8 +87,8 @@ public interface BlobStore {
* @param reference binary reference
* @return matching blobId, or {@code null}
*/
- @CheckForNull
- String getBlobId(@Nonnull String reference);
+ @Nullable
+ String getBlobId(@NotNull String reference);
/**
* Returns a secure reference to blob referred by blobid, or {@code null} if no such
@@ -97,7 +97,7 @@ public interface BlobStore {
* @param blobId blobId referring the blob for which reference is required
* @return binary reference, or {@code null}
*/
- @CheckForNull
- String getReference(@Nonnull String blobId);
+ @Nullable
+ String getReference(@NotNull String blobId);
}
Modified: jackrabbit/oak/branches/1.8/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/FileBlobStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/FileBlobStore.java?rev=1846011&r1=1846010&r2=1846011&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/FileBlobStore.java (original)
+++ jackrabbit/oak/branches/1.8/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/FileBlobStore.java Wed Nov 7 13:42:38 2018
@@ -29,8 +29,6 @@ import java.security.NoSuchAlgorithmExce
import java.util.Iterator;
import java.util.List;
-import javax.annotation.Nullable;
-
import com.google.common.base.Predicate;
import com.google.common.collect.AbstractIterator;
import com.google.common.collect.FluentIterable;
@@ -40,6 +38,7 @@ import org.apache.commons.io.FileUtils;
import org.apache.commons.io.FilenameUtils;
import org.apache.jackrabbit.oak.commons.IOUtils;
import org.apache.jackrabbit.oak.commons.StringUtils;
+import org.jetbrains.annotations.Nullable;
/**
* A file blob store.