Author: reschke
Date: Wed Jul 18 15:11:21 2018
New Revision: 1836196
URL: http://svn.apache.org/viewvc?rev=1836196&view=rev
Log:
OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations
instead - oak-upgrade
Modified:
jackrabbit/oak/trunk/oak-upgrade/pom.xml
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/PersistingDiff.java
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/UpgradeRoot.java
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/checkpoint/CheckpointRetriever.java
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/LoopbackBlobStore.java
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/SafeDataStoreBlobStore.java
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentFactory.java
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/nodestate/MetadataExposingNodeState.java
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/nodestate/NameFilteringNodeState.java
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/security/GroupEditor.java
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/security/GroupEditorProvider.java
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepeatedRepositoryUpgradeTest.java
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/AbstractOak2OakTest.java
Modified: jackrabbit/oak/trunk/oak-upgrade/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/pom.xml?rev=1836196&r1=1836195&r2=1836196&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-upgrade/pom.xml Wed Jul 18 15:11:21 2018
@@ -160,10 +160,10 @@
<artifactId>logback-classic</artifactId>
</dependency>
- <!-- Findbugs annotations -->
+ <!-- Nullability annotations -->
<dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
+ <groupId>org.jetbrains</groupId>
+ <artifactId>annotations</artifactId>
<scope>provided</scope>
</dependency>
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java?rev=1836196&r1=1836195&r2=1836196&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java
(original)
+++
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java
Wed Jul 18 15:11:21 2018
@@ -54,8 +54,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
import javax.jcr.Binary;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
@@ -86,6 +84,8 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.spi.Name;
import org.apache.jackrabbit.spi.Path;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -258,16 +258,16 @@ class JackrabbitNodeState extends Abstra
}
@Override
- public boolean hasProperty(@Nonnull String name) {
+ public boolean hasProperty(@NotNull String name) {
return properties.containsKey(name);
}
@Override
- public PropertyState getProperty(@Nonnull String name) {
+ public PropertyState getProperty(@NotNull String name) {
return properties.get(name);
}
- @Nonnull
+ @NotNull
@Override
public Iterable<PropertyState> getProperties() {
return properties.values();
@@ -279,13 +279,13 @@ class JackrabbitNodeState extends Abstra
}
@Override
- public boolean hasChildNode(@Nonnull String name) {
+ public boolean hasChildNode(@NotNull String name) {
return nodes.containsKey(name);
}
- @Nonnull
+ @NotNull
@Override
- public NodeState getChildNode(@Nonnull String name) {
+ public NodeState getChildNode(@NotNull String name) {
NodeId id = nodes.get(name);
NodeState state = null;
if (id != null) {
@@ -300,7 +300,7 @@ class JackrabbitNodeState extends Abstra
return nodes.keySet();
}
- @Nonnull
+ @NotNull
@Override
public Iterable<MemoryChildNodeEntry> getChildNodeEntries() {
List<MemoryChildNodeEntry> entries =
newArrayListWithCapacity(nodes.size());
@@ -314,7 +314,7 @@ class JackrabbitNodeState extends Abstra
return entries;
}
- @Nonnull
+ @NotNull
@Override
public NodeBuilder builder() {
return new MemoryNodeBuilder(this);
@@ -322,7 +322,7 @@ class JackrabbitNodeState extends Abstra
//-----------------------------------------------------------< private >--
- @CheckForNull
+ @Nullable
private JackrabbitNodeState createChildNodeState(NodeId id, String name) {
if (mountPoints.containsKey(id)) {
final JackrabbitNodeState nodeState = mountPoints.get(id);
@@ -347,7 +347,7 @@ class JackrabbitNodeState extends Abstra
return state;
}
- private void handleBundleLoadingException(final @Nonnull String name,
final Exception e) {
+ private void handleBundleLoadingException(final @NotNull String name,
final Exception e) {
if (!skipOnError) {
throw new IllegalStateException("Unable to access child node " +
name + " of " + getPath(), e);
}
@@ -602,7 +602,7 @@ class JackrabbitNodeState extends Abstra
}
}
- @Nonnull
+ @NotNull
@Override
public InputStream getNewStream() {
try {
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/PersistingDiff.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/PersistingDiff.java?rev=1836196&r1=1836195&r2=1836196&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/PersistingDiff.java
(original)
+++
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/PersistingDiff.java
Wed Jul 18 15:11:21 2018
@@ -27,17 +27,16 @@ 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;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
import java.util.function.Supplier;
-
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
import static
org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
@@ -65,18 +64,18 @@ public class PersistingDiff implements N
private final Reporter reporter;
- @Nonnull
+ @NotNull
private MemoryNodeBuilder builder;
- @Nonnull
+ @NotNull
private final NodeState base;
- @CheckForNull
+ @Nullable
private IOException exception;
private long modCount;
- private PersistingDiff(PersistingDiff parent, String nodeName, @Nonnull
NodeState base) {
+ private PersistingDiff(PersistingDiff parent, String nodeName, @NotNull
NodeState base) {
this.writer = parent.writer;
this.reader = parent.reader;
this.blobStore = parent.blobStore;
@@ -87,7 +86,7 @@ public class PersistingDiff implements N
this.nodeName = nodeName;
}
- private PersistingDiff(SegmentWriter writer, SegmentReader reader,
BlobStore blobStore, @Nonnull NodeState base) {
+ private PersistingDiff(SegmentWriter writer, SegmentReader reader,
BlobStore blobStore, @NotNull NodeState base) {
this.writer = writer;
this.reader = reader;
this.blobStore = blobStore;
@@ -100,9 +99,9 @@ public class PersistingDiff implements N
public static SegmentNodeState applyDiffOnNodeState(
FileStore fileStore,
- @Nonnull NodeState before,
- @Nonnull NodeState after,
- @Nonnull NodeState onto) throws IOException {
+ @NotNull NodeState before,
+ @NotNull NodeState after,
+ @NotNull NodeState onto) throws IOException {
return new PersistingDiff(fileStore.getWriter(),
fileStore.getReader(), fileStore.getBlobStore(), onto).diff(before, after);
}
@@ -134,8 +133,8 @@ public class PersistingDiff implements N
return path.toString();
}
- @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, this);
if (exception != null) {
throw new IOException(exception);
@@ -151,13 +150,13 @@ public class PersistingDiff implements N
}
@Override
- public boolean propertyAdded(@Nonnull PropertyState after) {
+ public boolean propertyAdded(@NotNull PropertyState after) {
builder.setProperty(after);
return true;
}
@Override
- public boolean propertyChanged(@Nonnull PropertyState before, @Nonnull
PropertyState after) {
+ public boolean propertyChanged(@NotNull PropertyState before, @NotNull
PropertyState after) {
builder.setProperty(after);
return true;
}
@@ -169,7 +168,7 @@ public class PersistingDiff implements N
}
@Override
- public boolean childNodeAdded(@Nonnull String name, @Nonnull NodeState
after) {
+ public boolean childNodeAdded(@NotNull String name, @NotNull NodeState
after) {
try {
SegmentNodeState segmentNodeState = new PersistingDiff(this, name,
EMPTY_NODE).diff(EMPTY_NODE, after);
if (segmentNodeState != null) {
@@ -186,7 +185,7 @@ public class PersistingDiff implements N
}
@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 = new PersistingDiff(this, name,
base.getChildNode(name)).diff(before, after);
if (compacted != null) {
@@ -214,7 +213,7 @@ public class PersistingDiff implements N
}
}
- @CheckForNull
+ @Nullable
private static ByteBuffer getStableIdBytes(NodeState state) {
if (state instanceof SegmentNodeState) {
return ((SegmentNodeState) state).getStableIdBytes();
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java?rev=1836196&r1=1836195&r2=1836196&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
(original)
+++
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
Wed Jul 18 15:11:21 2018
@@ -24,7 +24,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nonnull;
import javax.jcr.RepositoryException;
import com.google.common.collect.Lists;
@@ -59,6 +58,7 @@ import org.apache.jackrabbit.oak.upgrade
import org.apache.jackrabbit.oak.upgrade.version.VersionCopyConfiguration;
import org.apache.jackrabbit.oak.upgrade.version.VersionHistoryUtil;
import org.apache.jackrabbit.oak.upgrade.version.VersionableEditor;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -208,7 +208,7 @@ public class RepositorySidegrade {
*
* @param includes Paths to be included in the copy.
*/
- public void setIncludes(@Nonnull String... includes) {
+ public void setIncludes(@NotNull String... includes) {
this.includePaths = copyOf(checkNotNull(includes));
}
@@ -218,7 +218,7 @@ public class RepositorySidegrade {
*
* @param excludes Paths to be excluded from the copy.
*/
- public void setExcludes(@Nonnull String... excludes) {
+ public void setExcludes(@NotNull String... excludes) {
this.excludePaths = copyOf(checkNotNull(excludes));
}
@@ -228,7 +228,7 @@ public class RepositorySidegrade {
*
* @param merges Paths to be merged during copy.
*/
- public void setMerges(@Nonnull String... merges) {
+ public void setMerges(@NotNull String... merges) {
this.mergePaths = copyOf(checkNotNull(merges));
}
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java?rev=1836196&r1=1836195&r2=1836196&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
(original)
+++
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
Wed Jul 18 15:11:21 2018
@@ -46,8 +46,6 @@ import java.util.Properties;
import java.util.Set;
import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.NamespaceException;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
@@ -146,6 +144,8 @@ import org.apache.lucene.index.IndexRead
import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermDocs;
import org.apache.lucene.index.TermEnum;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -326,7 +326,7 @@ public class RepositoryUpgrade {
*
* @param includes Paths to be included in the copy.
*/
- public void setIncludes(@Nonnull String... includes) {
+ public void setIncludes(@NotNull String... includes) {
this.includePaths = copyOf(checkNotNull(includes));
}
@@ -336,7 +336,7 @@ public class RepositoryUpgrade {
*
* @param excludes Paths to be excluded from the copy.
*/
- public void setExcludes(@Nonnull String... excludes) {
+ public void setExcludes(@NotNull String... excludes) {
this.excludePaths = copyOf(checkNotNull(excludes));
}
@@ -346,7 +346,7 @@ public class RepositoryUpgrade {
*
* @param merges Paths to be merged during copy.
*/
- public void setMerges(@Nonnull String... merges) {
+ public void setMerges(@NotNull String... merges) {
this.mergePaths = copyOf(checkNotNull(merges));
}
@@ -456,7 +456,7 @@ public class RepositoryUpgrade {
return upgradeRoot.getTree(NODE_TYPES_PATH);
}
- @Nonnull
+ @NotNull
@Override
protected Root getWriteRoot() {
return upgradeRoot;
@@ -1055,7 +1055,7 @@ public class RepositoryUpgrade {
this.source = source;
}
- @Nonnull
+ @NotNull
@Override
public NodeState processCommit(NodeState before, NodeState after,
CommitInfo info) throws CommitFailedException {
NodeState newState = after;
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/UpgradeRoot.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/UpgradeRoot.java?rev=1836196&r1=1836195&r2=1836196&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/UpgradeRoot.java
(original)
+++
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/UpgradeRoot.java
Wed Jul 18 15:11:21 2018
@@ -24,8 +24,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.Map;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.AuthInfo;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.CommitFailedException;
@@ -35,6 +33,7 @@ import org.apache.jackrabbit.oak.api.Roo
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.plugins.tree.impl.NodeBuilderTree;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.jetbrains.annotations.NotNull;
/**
* Simplistic 'Root' implementation around the {@code NodeBuilder} used for the
@@ -54,9 +53,9 @@ class UpgradeRoot implements Root {
throw new UnsupportedOperationException();
}
- @Nonnull
+ @NotNull
@Override
- public Tree getTree(@Nonnull String path) {
+ public Tree getTree(@NotNull String path) {
Tree child = rootTree;
for (String name : elements(path)) {
child = child.getChild(name);
@@ -75,7 +74,7 @@ class UpgradeRoot implements Root {
}
@Override
- public void commit(@Nonnull Map<String, Object> info) throws
CommitFailedException {
+ public void commit(@NotNull Map<String, Object> info) throws
CommitFailedException {
// ignore
}
@@ -89,28 +88,28 @@ class UpgradeRoot implements Root {
return false;
}
- @Nonnull
+ @NotNull
@Override
public QueryEngine getQueryEngine() {
throw new UnsupportedOperationException();
}
- @Nonnull
+ @NotNull
@Override
- public Blob createBlob(@Nonnull InputStream stream) throws IOException {
+ public Blob createBlob(@NotNull InputStream stream) throws IOException {
throw new UnsupportedOperationException();
}
@Override
- public Blob getBlob(@Nonnull String reference) {
+ public Blob getBlob(@NotNull String reference) {
throw new UnsupportedOperationException();
}
- @Nonnull
+ @NotNull
@Override
public ContentSession getContentSession() {
return new ContentSession() {
- @Nonnull
+ @NotNull
@Override
public AuthInfo getAuthInfo() {
throw new UnsupportedOperationException();
@@ -121,7 +120,7 @@ class UpgradeRoot implements Root {
throw new UnsupportedOperationException();
}
- @Nonnull
+ @NotNull
@Override
public Root getLatestRoot() {
return UpgradeRoot.this;
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/checkpoint/CheckpointRetriever.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/checkpoint/CheckpointRetriever.java?rev=1836196&r1=1836195&r2=1836196&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/checkpoint/CheckpointRetriever.java
(original)
+++
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/checkpoint/CheckpointRetriever.java
Wed Jul 18 15:11:21 2018
@@ -29,11 +29,10 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.apache.jackrabbit.oak.upgrade.cli.node.SegmentTarFactory;
+import org.jetbrains.annotations.Nullable;
-import javax.annotation.Nullable;
import java.util.Collections;
import java.util.List;
-
public final class CheckpointRetriever {
public static class Checkpoint implements Comparable<Checkpoint> {
@@ -97,4 +96,4 @@ public final class CheckpointRetriever {
}
}));
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/LoopbackBlobStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/LoopbackBlobStore.java?rev=1836196&r1=1836195&r2=1836196&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/LoopbackBlobStore.java
(original)
+++
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/LoopbackBlobStore.java
Wed Jul 18 15:11:21 2018
@@ -21,13 +21,12 @@ package org.apache.jackrabbit.oak.upgrad
import org.apache.jackrabbit.oak.spi.blob.BlobOptions;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
+import org.jetbrains.annotations.NotNull;
-import javax.annotation.Nonnull;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
-
import static com.google.common.base.Preconditions.checkNotNull;
/**
@@ -101,12 +100,12 @@ public class LoopbackBlobStore implement
}
@Override
- public String getBlobId(@Nonnull String reference) {
+ public String getBlobId(@NotNull String reference) {
return checkNotNull(reference);
}
@Override
- public String getReference(@Nonnull String blobId) {
+ public String getReference(@NotNull String blobId) {
return checkNotNull(blobId);
}
}
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/SafeDataStoreBlobStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/SafeDataStoreBlobStore.java?rev=1836196&r1=1836195&r2=1836196&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/SafeDataStoreBlobStore.java
(original)
+++
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/SafeDataStoreBlobStore.java
Wed Jul 18 15:11:21 2018
@@ -23,15 +23,14 @@ import org.apache.jackrabbit.core.data.D
import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreBlobStore;
import org.apache.jackrabbit.oak.plugins.blob.datastore.InMemoryDataRecord;
import org.apache.jackrabbit.oak.spi.blob.stats.StatsCollectingStreams;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.Nonnull;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
-
import static com.google.common.base.Preconditions.checkNotNull;
/**
@@ -48,7 +47,7 @@ public class SafeDataStoreBlobStore exte
}
@Override
- public String getReference(@Nonnull String encodedBlobId) {
+ public String getReference(@NotNull String encodedBlobId) {
checkNotNull(encodedBlobId);
String blobId = extractBlobId(encodedBlobId);
//Reference are not created for in memory record
@@ -99,4 +98,4 @@ public class SafeDataStoreBlobStore exte
}
return id;
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentFactory.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentFactory.java?rev=1836196&r1=1836195&r2=1836196&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentFactory.java
(original)
+++
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentFactory.java
Wed Jul 18 15:11:21 2018
@@ -27,11 +27,10 @@ import org.apache.jackrabbit.oak.plugins
import
org.apache.jackrabbit.oak.plugins.segment.file.InvalidFileStoreVersionException;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.jetbrains.annotations.Nullable;
import com.google.common.io.Closer;
-import javax.annotation.Nullable;
-
public class SegmentFactory implements NodeStoreFactory {
private final File dir;
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/nodestate/MetadataExposingNodeState.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/nodestate/MetadataExposingNodeState.java?rev=1836196&r1=1836195&r2=1836196&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/nodestate/MetadataExposingNodeState.java
(original)
+++
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/nodestate/MetadataExposingNodeState.java
Wed Jul 18 15:11:21 2018
@@ -21,11 +21,10 @@ import org.apache.jackrabbit.oak.commons
import org.apache.jackrabbit.oak.plugins.document.AbstractDocumentNodeState;
import org.apache.jackrabbit.oak.plugins.migration.AbstractDecoratedNodeState;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
-import javax.annotation.Nonnull;
import java.util.ArrayList;
import java.util.List;
-
import static
org.apache.jackrabbit.oak.plugins.document.secondary.DelegatingDocumentNodeState.PROP_LAST_REV;
import static
org.apache.jackrabbit.oak.plugins.document.secondary.DelegatingDocumentNodeState.PROP_REVISION;
import static
org.apache.jackrabbit.oak.plugins.memory.PropertyStates.createProperty;
@@ -44,20 +43,20 @@ public class MetadataExposingNodeState e
metadataProperties.add(createProperty(PROP_LAST_REV,
documentNodeState.getLastRevision().asString()));
}
- @Nonnull
+ @NotNull
@Override
protected Iterable<PropertyState> getNewPropertyStates() {
return metadataProperties;
}
- @Nonnull
+ @NotNull
@Override
- protected NodeState decorateChild(@Nonnull String name, @Nonnull NodeState
delegateChild) {
+ protected NodeState decorateChild(@NotNull String name, @NotNull NodeState
delegateChild) {
return wrap(delegateChild);
}
@Override
- protected PropertyState decorateProperty(@Nonnull PropertyState
delegatePropertyState) {
+ protected PropertyState decorateProperty(@NotNull PropertyState
delegatePropertyState) {
return delegatePropertyState;
}
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/nodestate/NameFilteringNodeState.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/nodestate/NameFilteringNodeState.java?rev=1836196&r1=1836195&r2=1836196&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/nodestate/NameFilteringNodeState.java
(original)
+++
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/nodestate/NameFilteringNodeState.java
Wed Jul 18 15:11:21 2018
@@ -22,13 +22,12 @@ import org.apache.jackrabbit.oak.commons
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.apache.jackrabbit.oak.plugins.migration.AbstractDecoratedNodeState;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.Nonnull;
import java.util.ArrayList;
import java.util.List;
-
public class NameFilteringNodeState extends AbstractDecoratedNodeState {
private static final Logger LOG =
LoggerFactory.getLogger(NameFilteringNodeState.class);
@@ -48,7 +47,7 @@ public class NameFilteringNodeState exte
}
@Override
- protected boolean hideChild(@Nonnull final String name, @Nonnull final
NodeState delegateChild) {
+ protected boolean hideChild(@NotNull final String name, @NotNull final
NodeState delegateChild) {
if (isNameTooLong(name)) {
LOG.warn("Node name '{}' too long. Skipping child of {}", name,
this);
return true;
@@ -57,13 +56,13 @@ public class NameFilteringNodeState exte
}
@Override
- @Nonnull
- protected NodeState decorateChild(@Nonnull final String name, @Nonnull
final NodeState delegateChild) {
+ @NotNull
+ protected NodeState decorateChild(@NotNull final String name, @NotNull
final NodeState delegateChild) {
return new NameFilteringNodeState(delegateChild, this, name);
}
@Override
- protected PropertyState decorateProperty(@Nonnull final PropertyState
delegatePropertyState) {
+ protected PropertyState decorateProperty(@NotNull final PropertyState
delegatePropertyState) {
return fixChildOrderPropertyState(this, delegatePropertyState);
}
@@ -75,7 +74,7 @@ public class NameFilteringNodeState exte
* to check
* @return true if the name is longer than {@link
org.apache.jackrabbit.oak.plugins.document.util.Utils#NODE_NAME_LIMIT}
*/
- private boolean isNameTooLong(@Nonnull String name) {
+ private boolean isNameTooLong(@NotNull String name) {
// OAK-1589: maximum supported length of name for DocumentNodeStore
// is 150 bytes. Skip the sub tree if the the name is too long
if (name.length() <= Utils.NODE_NAME_LIMIT / 3) {
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/security/GroupEditor.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/security/GroupEditor.java?rev=1836196&r1=1836195&r2=1836196&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/security/GroupEditor.java
(original)
+++
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/security/GroupEditor.java
Wed Jul 18 15:11:21 2018
@@ -18,8 +18,6 @@ package org.apache.jackrabbit.oak.upgrad
import java.util.Set;
import java.util.TreeSet;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
@@ -31,6 +29,7 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.util.Text;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -50,7 +49,7 @@ class GroupEditor extends DefaultEditor
private final UpgradeMembershipWriter writer = new
UpgradeMembershipWriter();
- GroupEditor(@Nonnull NodeBuilder builder, @Nonnull String groupsPath) {
+ GroupEditor(@NotNull NodeBuilder builder, @NotNull String groupsPath) {
this.state = new State(builder);
this.groupsRoot = Text.explode(groupsPath, '/', false);
// writer.setMembershipSizeThreshold(10); // uncomment to test
different split sizes
@@ -188,7 +187,7 @@ class GroupEditor extends DefaultEditor
* @param group node builder of group
* @param members set of content ids to set
*/
- public void setMembers(@Nonnull NodeBuilder group, @Nonnull
Set<String> members) {
+ public void setMembers(@NotNull NodeBuilder group, @NotNull
Set<String> members) {
group.removeProperty(UserConstants.REP_MEMBERS);
if (group.hasChildNode(UserConstants.REP_MEMBERS)) {
group.getChildNode(UserConstants.REP_MEMBERS).remove();
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/security/GroupEditorProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/security/GroupEditorProvider.java?rev=1836196&r1=1836195&r2=1836196&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/security/GroupEditorProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/security/GroupEditorProvider.java
Wed Jul 18 15:11:21 2018
@@ -16,13 +16,12 @@
*/
package org.apache.jackrabbit.oak.upgrade.security;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.Editor;
import org.apache.jackrabbit.oak.spi.commit.EditorProvider;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
/**
*/
@@ -30,7 +29,7 @@ public class GroupEditorProvider impleme
private final String groupsPath;
- public GroupEditorProvider(@Nonnull String groupsPath) {
+ public GroupEditorProvider(@NotNull String groupsPath) {
this.groupsPath = groupsPath;
}
@@ -46,4 +45,4 @@ public class GroupEditorProvider impleme
public String toString() {
return "GroupEditorProvider : groupsPath = " + groupsPath;
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepeatedRepositoryUpgradeTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepeatedRepositoryUpgradeTest.java?rev=1836196&r1=1836195&r2=1836196&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepeatedRepositoryUpgradeTest.java
(original)
+++
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepeatedRepositoryUpgradeTest.java
Wed Jul 18 15:11:21 2018
@@ -23,7 +23,6 @@ import static org.apache.jackrabbit.oak.
import java.io.File;
import java.io.IOException;
-import javax.annotation.Nonnull;
import javax.jcr.NamespaceRegistry;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
@@ -41,6 +40,7 @@ import org.apache.jackrabbit.oak.segment
import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.jetbrains.annotations.NotNull;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -132,7 +132,7 @@ public class RepeatedRepositoryUpgradeTe
repositoryUpgrade.setSkipInitialization(skipInit);
repositoryUpgrade.copy(new RepositoryInitializer() {
@Override
- public void initialize(@Nonnull NodeBuilder builder) {
+ public void initialize(@NotNull NodeBuilder builder) {
builder.child("foo").child("bar");
}
});
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/AbstractOak2OakTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/AbstractOak2OakTest.java?rev=1836196&r1=1836195&r2=1836196&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/AbstractOak2OakTest.java
(original)
+++
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/AbstractOak2OakTest.java
Wed Jul 18 15:11:21 2018
@@ -31,7 +31,6 @@ import java.util.List;
import java.util.Map;
import java.util.Random;
-import javax.annotation.Nullable;
import javax.jcr.Node;
import javax.jcr.Property;
import javax.jcr.RepositoryException;
@@ -59,6 +58,7 @@ import org.apache.jackrabbit.oak.upgrade
import org.apache.jackrabbit.oak.upgrade.cli.container.NodeStoreContainer;
import
org.apache.jackrabbit.oak.upgrade.cli.container.SegmentNodeStoreContainer;
import org.apache.jackrabbit.oak.upgrade.cli.parser.CliArgumentException;
+import org.jetbrains.annotations.Nullable;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -267,4 +267,4 @@ public abstract class AbstractOak2OakTes
protected boolean supportsCheckpointMigration() {
return false;
}
-}
\ No newline at end of file
+}
