Author: reschke
Date: Wed Jul 18 14:21:12 2018
New Revision: 1836174
URL: http://svn.apache.org/viewvc?rev=1836174&view=rev
Log:
OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations
instead - oak-blob
Modified:
jackrabbit/oak/trunk/oak-blob/pom.xml
jackrabbit/oak/trunk/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/AbstractBlobStore.java
jackrabbit/oak/trunk/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/BlobStore.java
jackrabbit/oak/trunk/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/FileBlobStore.java
Modified: jackrabbit/oak/trunk/oak-blob/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob/pom.xml?rev=1836174&r1=1836173&r2=1836174&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-blob/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-blob/pom.xml Wed Jul 18 14:21:12 2018
@@ -119,10 +119,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/trunk/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/AbstractBlobStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/AbstractBlobStore.java?rev=1836174&r1=1836173&r2=1836174&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/AbstractBlobStore.java
(original)
+++
jackrabbit/oak/trunk/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/AbstractBlobStore.java
Wed Jul 18 14:21:12 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/trunk/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/BlobStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/BlobStore.java?rev=1836174&r1=1836173&r2=1836174&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/BlobStore.java
(original)
+++
jackrabbit/oak/trunk/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/BlobStore.java
Wed Jul 18 14:21:12 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/trunk/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/FileBlobStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/FileBlobStore.java?rev=1836174&r1=1836173&r2=1836174&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/FileBlobStore.java
(original)
+++
jackrabbit/oak/trunk/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/FileBlobStore.java
Wed Jul 18 14:21:12 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.
