Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/counter/NodeCounterEditorProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/counter/NodeCounterEditorProvider.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/counter/NodeCounterEditorProvider.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/counter/NodeCounterEditorProvider.java Wed Jul 18 14:37:06 2018 @@ -20,9 +20,6 @@ package org.apache.jackrabbit.oak.plugin import java.util.UUID; -import javax.annotation.CheckForNull; -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; @@ -34,6 +31,8 @@ import org.apache.jackrabbit.oak.spi.mou import org.apache.jackrabbit.oak.spi.mount.Mounts; 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; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; @@ -50,10 +49,10 @@ public class NodeCounterEditorProvider i private MountInfoProvider mountInfoProvider = Mounts.defaultMountInfoProvider(); @Override - @CheckForNull - public Editor getIndexEditor(@Nonnull String type, - @Nonnull NodeBuilder definition, @Nonnull NodeState root, - @Nonnull IndexUpdateCallback callback) throws CommitFailedException { + @Nullable + public Editor getIndexEditor(@NotNull String type, + @NotNull NodeBuilder definition, @NotNull NodeState root, + @NotNull IndexUpdateCallback callback) throws CommitFailedException { if (!TYPE.equals(type)) { return null; }
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/datastore/DataStoreTextWriter.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/datastore/DataStoreTextWriter.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/datastore/DataStoreTextWriter.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/datastore/DataStoreTextWriter.java Wed Jul 18 14:37:06 2018 @@ -27,8 +27,6 @@ import java.lang.ref.SoftReference; import java.util.Set; import java.util.concurrent.Callable; -import javax.annotation.Nonnull; - import com.google.common.base.Charsets; import com.google.common.collect.Sets; import com.google.common.io.Files; @@ -40,6 +38,7 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.index.fulltext.ExtractedText; import org.apache.jackrabbit.oak.plugins.index.fulltext.ExtractedText.ExtractionResult; import org.apache.jackrabbit.oak.plugins.index.fulltext.PreExtractedTextProvider; +import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -123,7 +122,7 @@ public class DataStoreTextWriter impleme } @Override - public void write(@Nonnull String blobId,@Nonnull String text) throws IOException { + public void write(@NotNull String blobId,@NotNull String text) throws IOException { checkIfReadOnlyModeEnabled(); checkNotNull(blobId, "BlobId cannot be null"); checkNotNull(text, "Text passed for [%s] was null", blobId); Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/fulltext/ExtractedText.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/fulltext/ExtractedText.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/fulltext/ExtractedText.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/fulltext/ExtractedText.java Wed Jul 18 14:37:06 2018 @@ -19,11 +19,11 @@ package org.apache.jackrabbit.oak.plugins.index.fulltext; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; - import static com.google.common.base.Preconditions.checkNotNull; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + public class ExtractedText { public enum ExtractionResult { /** @@ -51,22 +51,22 @@ public class ExtractedText { private final ExtractionResult extractionResult; private final CharSequence extractedText; - public ExtractedText(@Nonnull ExtractionResult extractionResult){ + public ExtractedText(@NotNull ExtractionResult extractionResult){ this(extractionResult, null); } - public ExtractedText(@Nonnull ExtractionResult extractionResult,CharSequence extractedText) { + public ExtractedText(@NotNull ExtractionResult extractionResult,CharSequence extractedText) { this.extractionResult = extractionResult; this.extractedText = extractedText; checkState(); } - @Nonnull + @NotNull public ExtractionResult getExtractionResult() { return extractionResult; } - @CheckForNull + @Nullable public CharSequence getExtractedText() { return extractedText; } Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/fulltext/PreExtractedTextProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/fulltext/PreExtractedTextProvider.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/fulltext/PreExtractedTextProvider.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/fulltext/PreExtractedTextProvider.java Wed Jul 18 14:37:06 2018 @@ -21,8 +21,7 @@ package org.apache.jackrabbit.oak.plugin import java.io.IOException; -import javax.annotation.CheckForNull; - +import org.jetbrains.annotations.Nullable; import org.osgi.annotation.versioning.ConsumerType; import org.apache.jackrabbit.oak.api.Blob; @@ -38,6 +37,6 @@ public interface PreExtractedTextProvide * @return pre extracted text or null if no * pre extracted text found for given blob */ - @CheckForNull + @Nullable ExtractedText getText(String propertyPath, Blob blob) throws IOException; } Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/nodetype/NodeTypeIndexProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/nodetype/NodeTypeIndexProvider.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/nodetype/NodeTypeIndexProvider.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/nodetype/NodeTypeIndexProvider.java Wed Jul 18 14:37:06 2018 @@ -20,13 +20,12 @@ package org.apache.jackrabbit.oak.plugin import java.util.List; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.spi.mount.MountInfoProvider; import org.apache.jackrabbit.oak.spi.mount.Mounts; import org.apache.jackrabbit.oak.spi.query.QueryIndex; import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; import com.google.common.collect.ImmutableList; import org.osgi.service.component.annotations.Component; @@ -43,7 +42,7 @@ public class NodeTypeIndexProvider imple private MountInfoProvider mountInfoProvider = Mounts .defaultMountInfoProvider(); - @Nonnull + @NotNull @Override public List<? extends QueryIndex> getQueryIndexes(NodeState nodeState) { return ImmutableList.of(new NodeTypeIndex(mountInfoProvider)); Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/progress/ProgressTrackingEditor.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/progress/ProgressTrackingEditor.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/progress/ProgressTrackingEditor.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/progress/ProgressTrackingEditor.java Wed Jul 18 14:37:06 2018 @@ -19,15 +19,14 @@ package org.apache.jackrabbit.oak.plugins.index.progress; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.plugins.index.NodeTraversalCallback; import org.apache.jackrabbit.oak.spi.commit.Editor; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Editor to track traversal and notify the callback for each node traversed. @@ -54,8 +53,8 @@ class ProgressTrackingEditor implements this.parent = parent; } - @CheckForNull - public static Editor wrap(@CheckForNull Editor editor, NodeTraversalCallback onProgress) { + @Nullable + public static Editor wrap(@Nullable Editor editor, NodeTraversalCallback onProgress) { if (editor != null && !(editor instanceof ProgressTrackingEditor)) { return new ProgressTrackingEditor(editor, "/", onProgress); } @@ -113,7 +112,7 @@ class ProgressTrackingEditor implements } } - private void buildPath(@Nonnull StringBuilder sb) { + private void buildPath(@NotNull StringBuilder sb) { if (parent != null) { parent.buildPath(sb); sb.append('/').append(name); Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedIndex.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedIndex.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedIndex.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedIndex.java Wed Jul 18 14:37:06 2018 @@ -17,11 +17,9 @@ package org.apache.jackrabbit.oak.plugins.index.property; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * interface for shared constants around different actors: QueryIndex, IndexEditors, @@ -71,8 +69,7 @@ public interface OrderedIndex { * @return the direction */ @Nullable - @CheckForNull - public static OrderDirection fromString(@Nonnull final String direction) { + public static OrderDirection fromString(@NotNull final String direction) { for (OrderDirection d : OrderDirection.values()) { if (d.getDirection().equalsIgnoreCase(direction)) { return d; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedPropertyIndexEditorProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedPropertyIndexEditorProvider.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedPropertyIndexEditorProvider.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedPropertyIndexEditorProvider.java Wed Jul 18 14:37:06 2018 @@ -17,9 +17,6 @@ package org.apache.jackrabbit.oak.plugins.index.property; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.plugins.index.ContextAwareCallback; import org.apache.jackrabbit.oak.plugins.index.IndexEditorProvider; @@ -27,6 +24,8 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.spi.commit.Editor; 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; import org.osgi.service.component.annotations.Component; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,11 +37,11 @@ public class OrderedPropertyIndexEditorP private static int threshold = OrderedIndex.TRACK_DEPRECATION_EVERY; @Override - @CheckForNull - public Editor getIndexEditor(@Nonnull String type, - @Nonnull NodeBuilder definition, - @Nonnull NodeState root, - @Nonnull IndexUpdateCallback callback) throws CommitFailedException { + @Nullable + public Editor getIndexEditor(@NotNull String type, + @NotNull NodeBuilder definition, + @NotNull NodeState root, + @NotNull IndexUpdateCallback callback) throws CommitFailedException { if (OrderedIndex.TYPE.equals(type)) { if (hit() % threshold == 0) { if (callback instanceof ContextAwareCallback) { Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexEditor.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexEditor.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexEditor.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexEditor.java Wed Jul 18 14:37:06 2018 @@ -35,7 +35,6 @@ import java.util.Collections; import java.util.Iterator; import java.util.Set; -import javax.annotation.Nonnull; import javax.jcr.PropertyType; import com.google.common.base.Supplier; @@ -53,6 +52,7 @@ import org.apache.jackrabbit.oak.spi.fil import org.apache.jackrabbit.oak.spi.mount.MountInfoProvider; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; import com.google.common.base.Predicate; @@ -423,7 +423,7 @@ class PropertyIndexEditor implements Ind * @param name the name of the child node * @return an instance of the PropertyIndexEditor */ - PropertyIndexEditor getChildIndexEditor(@Nonnull PropertyIndexEditor parent, @Nonnull String name, PathFilter.Result filterResult) { + PropertyIndexEditor getChildIndexEditor(@NotNull PropertyIndexEditor parent, @NotNull String name, PathFilter.Result filterResult) { return new PropertyIndexEditor(parent, name, filterResult); } @@ -462,4 +462,4 @@ class PropertyIndexEditor implements Ind private PathFilter.Result getPathFilterResult(String childNodeName) { return pathFilter.filter(concat(getPath(), childNodeName)); } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexEditorProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexEditorProvider.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexEditorProvider.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexEditorProvider.java Wed Jul 18 14:37:06 2018 @@ -16,8 +16,6 @@ */ package org.apache.jackrabbit.oak.plugins.index.property; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.plugins.index.IndexConstants; import org.apache.jackrabbit.oak.plugins.index.IndexEditorProvider; import org.apache.jackrabbit.oak.spi.commit.Editor; @@ -26,6 +24,7 @@ import org.apache.jackrabbit.oak.spi.mou import org.apache.jackrabbit.oak.spi.mount.Mounts; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; @@ -48,7 +47,7 @@ public class PropertyIndexEditorProvider @Override public Editor getIndexEditor( - @Nonnull String type, @Nonnull NodeBuilder definition, @Nonnull NodeState root, @Nonnull IndexUpdateCallback callback) { + @NotNull String type, @NotNull NodeBuilder definition, @NotNull NodeState root, @NotNull IndexUpdateCallback callback) { if (TYPE.equals(type)) { return new PropertyIndexEditor(definition, root, callback, mountInfoProvider); } @@ -59,4 +58,4 @@ public class PropertyIndexEditorProvider this.mountInfoProvider = mountInfoProvider; return this; } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexLookup.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexLookup.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexLookup.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexLookup.java Wed Jul 18 14:37:06 2018 @@ -29,10 +29,6 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.PropertyValue; import org.apache.jackrabbit.oak.api.Type; @@ -44,6 +40,8 @@ import org.apache.jackrabbit.oak.spi.mou import org.apache.jackrabbit.oak.spi.query.Filter; import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; @@ -211,7 +209,7 @@ public class PropertyIndexLookup { return TYPE; } - @CheckForNull + @Nullable private static Set<String> getSuperTypes(Filter filter) { if (filter != null && !filter.matchesAllTypes()) { return filter.getSupertypes(); @@ -219,8 +217,8 @@ public class PropertyIndexLookup { return null; } - @Nonnull - private static Iterable<String> getNames(@Nonnull NodeState state, @Nonnull String propertyName) { + @NotNull + private static Iterable<String> getNames(@NotNull NodeState state, @NotNull String propertyName) { Iterable<String> ret = state.getNames(propertyName); if (ret.iterator().hasNext()) { return ret; @@ -237,4 +235,4 @@ public class PropertyIndexLookup { return ret; } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexProvider.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexProvider.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexProvider.java Wed Jul 18 14:37:06 2018 @@ -18,13 +18,12 @@ package org.apache.jackrabbit.oak.plugin import java.util.List; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.spi.mount.MountInfoProvider; import org.apache.jackrabbit.oak.spi.mount.Mounts; import org.apache.jackrabbit.oak.spi.query.QueryIndex; import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; import com.google.common.collect.ImmutableList; import org.osgi.service.component.annotations.Component; @@ -44,7 +43,7 @@ public class PropertyIndexProvider imple @Reference private MountInfoProvider mountInfoProvider = Mounts.defaultMountInfoProvider(); - @Override @Nonnull + @Override @NotNull public List<QueryIndex> getQueryIndexes(NodeState state) { return ImmutableList.<QueryIndex>of(new PropertyIndex(mountInfoProvider)); } Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/ValuePatternUtil.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/ValuePatternUtil.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/ValuePatternUtil.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/ValuePatternUtil.java Wed Jul 18 14:37:06 2018 @@ -24,12 +24,11 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.annotation.CheckForNull; - import org.apache.jackrabbit.oak.api.PropertyValue; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.spi.query.Filter; import org.apache.jackrabbit.oak.spi.query.Filter.PropertyRestriction; +import org.jetbrains.annotations.Nullable; import static com.google.common.collect.Sets.newLinkedHashSet; @@ -41,7 +40,7 @@ public final class ValuePatternUtil { * @param property the property * @return the longest prefix, or null if none */ - @CheckForNull + @Nullable public static String getLongestPrefix(Filter filter, String property) { boolean first = false, last = false; List<String> list = new ArrayList<>(); @@ -79,12 +78,12 @@ public final class ValuePatternUtil { return prefix; } - @CheckForNull + @Nullable public static Set<String> getAllValues(PropertyRestriction restriction){ return getValues(restriction, ValuePattern.MATCH_ALL); } - @CheckForNull + @Nullable public static Set<String> getValues(PropertyRestriction restriction, ValuePattern pattern) { if (restriction.firstIncluding && restriction.lastIncluding @@ -105,7 +104,7 @@ public final class ValuePatternUtil { } } - @CheckForNull + @Nullable public static Set<String> read(PropertyValue value, ValuePattern pattern) { if (value == null) { return null; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexAsyncReindex.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexAsyncReindex.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexAsyncReindex.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexAsyncReindex.java Wed Jul 18 14:37:06 2018 @@ -26,11 +26,11 @@ import static org.apache.jackrabbit.oak. import java.util.concurrent.Callable; import java.util.concurrent.Executor; -import javax.annotation.Nonnull; import javax.management.openmbean.CompositeData; import org.apache.jackrabbit.oak.commons.jmx.ManagementOperation; import org.apache.jackrabbit.oak.plugins.index.AsyncIndexUpdate; +import org.jetbrains.annotations.NotNull; /** * Default implementation of {@link PropertyIndexAsyncReindexMBean} based on a @@ -51,13 +51,13 @@ public class PropertyIndexAsyncReindex i * @param executor * executor for running the garbage collection task */ - public PropertyIndexAsyncReindex(@Nonnull AsyncIndexUpdate async, - @Nonnull Executor executor) { + public PropertyIndexAsyncReindex(@NotNull AsyncIndexUpdate async, + @NotNull Executor executor) { this.async = checkNotNull(async); this.executor = checkNotNull(executor); } - @Nonnull + @NotNull @Override public CompositeData startPropertyIndexAsyncReindex() { if (arOp.isDone()) { @@ -78,7 +78,7 @@ public class PropertyIndexAsyncReindex i return getPropertyIndexAsyncReindexStatus(); } - @Nonnull + @NotNull @Override public CompositeData getPropertyIndexAsyncReindexStatus() { return arOp.getStatus().toCompositeData(); Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexAsyncReindexMBean.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexAsyncReindexMBean.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexAsyncReindexMBean.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexAsyncReindexMBean.java Wed Jul 18 14:37:06 2018 @@ -17,9 +17,10 @@ package org.apache.jackrabbit.oak.plugins.index.property.jmx; -import javax.annotation.Nonnull; import javax.management.openmbean.CompositeData; +import org.jetbrains.annotations.NotNull; + /** * MBean for starting and monitoring the progress of asynchronous reindexing of * the property index @@ -36,7 +37,7 @@ public interface PropertyIndexAsyncReind * * @return the status of the operation right after it was initiated */ - @Nonnull + @NotNull CompositeData startPropertyIndexAsyncReindex(); /** @@ -46,7 +47,7 @@ public interface PropertyIndexAsyncReind * status of the last operation or <em>Status not available</em> if * none. */ - @Nonnull + @NotNull CompositeData getPropertyIndexAsyncReindexStatus(); } Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexStats.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexStats.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexStats.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexStats.java Wed Jul 18 14:37:06 2018 @@ -24,7 +24,6 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import javax.annotation.Nonnull; import javax.management.openmbean.ArrayType; import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; @@ -51,6 +50,7 @@ import org.apache.jackrabbit.oak.spi.sta import org.apache.jackrabbit.oak.spi.state.NodeStateUtils; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.apache.jackrabbit.oak.spi.whiteboard.Registration; +import org.jetbrains.annotations.NotNull; import org.osgi.framework.BundleContext; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; @@ -170,7 +170,7 @@ public class PropertyIndexStats extends Tree t = TreeFactory.createReadOnlyTree(cne.getNodeState()); TreeTraverser<Tree> traverser = new TreeTraverser<Tree>() { @Override - public Iterable<Tree> children(@Nonnull Tree root) { + public Iterable<Tree> children(@NotNull Tree root) { //Break at maxLevel if (PathUtils.getDepth(root.getPath()) >= maxDepth) { return Collections.emptyList(); Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/ContentMirrorStoreStrategy.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/ContentMirrorStoreStrategy.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/ContentMirrorStoreStrategy.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/ContentMirrorStoreStrategy.java Wed Jul 18 14:37:06 2018 @@ -25,9 +25,6 @@ import java.util.Deque; import java.util.Iterator; import java.util.Set; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.commons.PathUtils; @@ -42,6 +39,8 @@ import org.apache.jackrabbit.oak.spi.sta import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStateUtils; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -187,8 +186,8 @@ public class ContentMirrorStoreStrategy }; } - @Nonnull - Iterable<? extends ChildNodeEntry> getChildNodeEntries(@Nonnull + @NotNull + Iterable<? extends ChildNodeEntry> getChildNodeEntries(@NotNull final NodeState index) { return index.getChildNodeEntries(); } @@ -590,8 +589,8 @@ public class ContentMirrorStoreStrategy * the 'key' to fetch from the repo * @return the node representing the key */ - NodeBuilder fetchKeyNode(@Nonnull NodeBuilder index, - @Nonnull String key) { + NodeBuilder fetchKeyNode(@NotNull NodeBuilder index, + @NotNull String key) { return index.child(key); } @@ -627,4 +626,4 @@ public class ContentMirrorStoreStrategy public String getIndexNodeName() { return indexName; } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/UniqueEntryStoreStrategy.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/UniqueEntryStoreStrategy.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/UniqueEntryStoreStrategy.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/UniqueEntryStoreStrategy.java Wed Jul 18 14:37:06 2018 @@ -24,9 +24,6 @@ import java.util.Iterator; import java.util.Set; import java.util.function.Consumer; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import com.google.common.base.Supplier; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; @@ -36,6 +33,8 @@ import org.apache.jackrabbit.oak.spi.sta import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.plugins.index.counter.ApproximateCounter; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -64,7 +63,7 @@ public class UniqueEntryStoreStrategy im this(indexName, NOOP); } - public UniqueEntryStoreStrategy(String indexName, @Nonnull Consumer<NodeBuilder> insertCallback) { + public UniqueEntryStoreStrategy(String indexName, @NotNull Consumer<NodeBuilder> insertCallback) { this.indexName = indexName; this.insertCallback = insertCallback; } Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceEditorProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceEditorProvider.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceEditorProvider.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceEditorProvider.java Wed Jul 18 14:37:06 2018 @@ -18,8 +18,6 @@ package org.apache.jackrabbit.oak.plugin import static org.apache.jackrabbit.oak.plugins.index.reference.NodeReferenceConstants.TYPE; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.plugins.index.IndexConstants; import org.apache.jackrabbit.oak.plugins.index.IndexEditorProvider; import org.apache.jackrabbit.oak.plugins.index.IndexUpdateCallback; @@ -28,6 +26,7 @@ import org.apache.jackrabbit.oak.spi.mou import org.apache.jackrabbit.oak.spi.mount.Mounts; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; @@ -40,8 +39,8 @@ public class ReferenceEditorProvider imp private MountInfoProvider mountInfoProvider = Mounts.defaultMountInfoProvider(); @Override - public Editor getIndexEditor(@Nonnull String type, @Nonnull NodeBuilder definition, - @Nonnull NodeState root, @Nonnull IndexUpdateCallback callback) { + public Editor getIndexEditor(@NotNull String type, @NotNull NodeBuilder definition, + @NotNull NodeState root, @NotNull IndexUpdateCallback callback) { if (TYPE.equals(type)) { return new ReferenceEditor(definition, root, mountInfoProvider); } Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceIndexProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceIndexProvider.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceIndexProvider.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceIndexProvider.java Wed Jul 18 14:37:06 2018 @@ -18,13 +18,12 @@ package org.apache.jackrabbit.oak.plugin import java.util.List; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.spi.mount.MountInfoProvider; import org.apache.jackrabbit.oak.spi.mount.Mounts; import org.apache.jackrabbit.oak.spi.query.QueryIndex; import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; import com.google.common.collect.ImmutableList; import org.osgi.service.component.annotations.Component; @@ -40,7 +39,7 @@ public class ReferenceIndexProvider impl private MountInfoProvider mountInfoProvider = Mounts.defaultMountInfoProvider(); @Override - @Nonnull + @NotNull public List<QueryIndex> getQueryIndexes(NodeState state) { return ImmutableList.<QueryIndex> of(new ReferenceIndex(mountInfoProvider)); } Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/itemsave/ItemSaveValidatorProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/itemsave/ItemSaveValidatorProvider.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/itemsave/ItemSaveValidatorProvider.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/itemsave/ItemSaveValidatorProvider.java Wed Jul 18 14:37:06 2018 @@ -18,14 +18,13 @@ */ package org.apache.jackrabbit.oak.plugins.itemsave; -import javax.annotation.CheckForNull; - import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.commit.EditorProvider; import org.apache.jackrabbit.oak.spi.commit.Validator; import org.apache.jackrabbit.oak.spi.commit.ValidatorProvider; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.Nullable; import org.osgi.service.component.annotations.Component; /** @@ -35,7 +34,7 @@ import org.osgi.service.component.annota @Component(service = EditorProvider.class) public class ItemSaveValidatorProvider extends ValidatorProvider { - @Override @CheckForNull + @Override @Nullable protected Validator getRootValidator( NodeState before, NodeState after, CommitInfo info) { String path = info.getPath(); Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/AbstractDecoratedNodeState.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/AbstractDecoratedNodeState.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/AbstractDecoratedNodeState.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/AbstractDecoratedNodeState.java Wed Jul 18 14:37:06 2018 @@ -30,16 +30,14 @@ import org.apache.jackrabbit.oak.spi.sta import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStateDiff; import org.apache.jackrabbit.oak.spi.state.ReadOnlyBuilder; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.Set; - import static com.google.common.base.Predicates.notNull; import static org.apache.jackrabbit.oak.plugins.tree.TreeConstants.OAK_CHILD_ORDER; @@ -49,7 +47,7 @@ public abstract class AbstractDecoratedN private final boolean useNativeEquals; - protected AbstractDecoratedNodeState(@Nonnull final NodeState delegate, boolean useNativeEquals) { + protected AbstractDecoratedNodeState(@NotNull final NodeState delegate, boolean useNativeEquals) { this.delegate = delegate; this.useNativeEquals = useNativeEquals; } @@ -58,31 +56,31 @@ public abstract class AbstractDecoratedN return delegate; } - protected boolean hideChild(@Nonnull final String name, @Nonnull final NodeState delegateChild) { + protected boolean hideChild(@NotNull final String name, @NotNull final NodeState delegateChild) { return false; } - @Nonnull - protected abstract NodeState decorateChild(@Nonnull final String name, @Nonnull final NodeState delegateChild); + @NotNull + protected abstract NodeState decorateChild(@NotNull final String name, @NotNull final NodeState delegateChild); - @Nonnull - private NodeState decorate(@Nonnull final String name, @Nonnull final NodeState child) { + @NotNull + private NodeState decorate(@NotNull final String name, @NotNull final NodeState child) { return hideChild(name, child) ? EmptyNodeState.MISSING_NODE : decorateChild(name, child); } - protected boolean hideProperty(@Nonnull final String name) { + protected boolean hideProperty(@NotNull final String name) { return false; } - @Nonnull + @NotNull protected Iterable<PropertyState> getNewPropertyStates() { return Collections.emptyList(); } - @CheckForNull - protected abstract PropertyState decorateProperty(@Nonnull final PropertyState delegatePropertyState); + @Nullable + protected abstract PropertyState decorateProperty(@NotNull final PropertyState delegatePropertyState); - @CheckForNull + @Nullable private PropertyState decorate(@Nullable final PropertyState property) { return property == null || hideProperty(property.getName()) ? null : decorateProperty(property); } @@ -117,7 +115,7 @@ public abstract class AbstractDecoratedN * @return a NodeBuilder instance corresponding to this NodeState. */ @Override - @Nonnull + @NotNull public NodeBuilder builder() { return new ReadOnlyBuilder(this); } @@ -128,18 +126,18 @@ public abstract class AbstractDecoratedN } @Override - public boolean hasChildNode(@Nonnull final String name) { + public boolean hasChildNode(@NotNull final String name) { return getChildNode(name).exists(); } @Override - @Nonnull - public NodeState getChildNode(@Nonnull final String name) throws IllegalArgumentException { + @NotNull + public NodeState getChildNode(@NotNull final String name) throws IllegalArgumentException { return decorate(name, delegate.getChildNode(name)); } @Override - @Nonnull + @NotNull public Iterable<? extends ChildNodeEntry> getChildNodeEntries() { final Iterable<ChildNodeEntry> transformed = Iterables.transform( delegate.getChildNodeEntries(), @@ -162,8 +160,8 @@ public abstract class AbstractDecoratedN } @Override - @CheckForNull - public PropertyState getProperty(@Nonnull String name) { + @Nullable + public PropertyState getProperty(@NotNull String name) { PropertyState ps = decorate(delegate.getProperty(name)); if (ps == null) { for (PropertyState p : getNewPropertyStates()) { @@ -177,13 +175,13 @@ public abstract class AbstractDecoratedN } @Override - @Nonnull + @NotNull public Iterable<? extends PropertyState> getProperties() { final Iterable<PropertyState> propertyStates = Iterables.transform( delegate.getProperties(), new Function<PropertyState, PropertyState>() { @Override - @CheckForNull + @Nullable public PropertyState apply(@Nullable final PropertyState propertyState) { return decorate(propertyState); } Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/FilteringNodeState.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/FilteringNodeState.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/FilteringNodeState.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/FilteringNodeState.java Wed Jul 18 14:37:06 2018 @@ -20,11 +20,10 @@ import com.google.common.collect.Immutab import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.Set; - /** * NodeState implementation that decorates another node-state instance * in order to hide subtrees or partial subtrees from the consumer of @@ -83,10 +82,10 @@ public class FilteringNodeState extends * @param excludedFragments A Set of name fragments that should be hidden. Empty if {@code null}. * @return The decorated node-state if required, the original node-state if decoration is unnecessary. */ - @Nonnull + @NotNull public static NodeState wrap( - @Nonnull final String path, - @Nonnull final NodeState delegate, + @NotNull final String path, + @NotNull final NodeState delegate, @Nullable final Set<String> includePaths, @Nullable final Set<String> excludePaths, @Nullable final Set<String> fragmentPaths, @@ -103,12 +102,12 @@ public class FilteringNodeState extends } private FilteringNodeState( - @Nonnull final String path, - @Nonnull final NodeState delegate, - @Nonnull final Set<String> includedPaths, - @Nonnull final Set<String> excludedPaths, - @Nonnull final Set<String> fragmentPaths, - @Nonnull final Set<String> excludedFragments + @NotNull final String path, + @NotNull final NodeState delegate, + @NotNull final Set<String> includedPaths, + @NotNull final Set<String> excludedPaths, + @NotNull final Set<String> fragmentPaths, + @NotNull final Set<String> excludedFragments ) { super(delegate, false); this.path = path; @@ -118,20 +117,20 @@ public class FilteringNodeState extends this.excludedFragments = excludedFragments; } - @Nonnull + @NotNull @Override - protected NodeState decorateChild(@Nonnull final String name, @Nonnull final NodeState child) { + protected NodeState decorateChild(@NotNull final String name, @NotNull final NodeState child) { final String childPath = PathUtils.concat(path, name); return wrap(childPath, child, includedPaths, excludedPaths, fragmentPaths, excludedFragments); } @Override - protected boolean hideChild(@Nonnull final String name, @Nonnull final NodeState delegateChild) { + protected boolean hideChild(@NotNull final String name, @NotNull final NodeState delegateChild) { return isHidden(PathUtils.concat(path, name), includedPaths, excludedPaths, excludedFragments); } @Override - protected PropertyState decorateProperty(@Nonnull final PropertyState propertyState) { + protected PropertyState decorateProperty(@NotNull final PropertyState propertyState) { return fixChildOrderPropertyState(this, propertyState); } @@ -146,10 +145,10 @@ public class FilteringNodeState extends * @return Whether the {@code path} is hidden or not. */ private static boolean isHidden( - @Nonnull final String path, - @Nonnull final Set<String> includes, - @Nonnull final Set<String> excludes, - @Nonnull final Set<String> excludedFragments + @NotNull final String path, + @NotNull final Set<String> includes, + @NotNull final Set<String> excludes, + @NotNull final Set<String> excludedFragments ) { return isExcluded(path, excludes, excludedFragments) || !isIncluded(path, includes); } @@ -165,11 +164,11 @@ public class FilteringNodeState extends * @return Whether the {@code path} or any of its descendants are hidden or not. */ private static boolean hasHiddenDescendants( - @Nonnull final String path, - @Nonnull final Set<String> includePaths, - @Nonnull final Set<String> excludePaths, - @Nonnull final Set<String> fragmentPaths, - @Nonnull final Set<String> excludedFragments + @NotNull final String path, + @NotNull final Set<String> includePaths, + @NotNull final Set<String> excludePaths, + @NotNull final Set<String> fragmentPaths, + @NotNull final Set<String> excludedFragments ) { return isHidden(path, includePaths, excludePaths, excludedFragments) || isAncestorOfAnyPath(path, fragmentPaths) @@ -190,7 +189,7 @@ public class FilteringNodeState extends * @param includePaths Include paths * @return Whether the path is covered by the include paths or not. */ - private static boolean isIncluded(@Nonnull final String path, @Nonnull final Set<String> includePaths) { + private static boolean isIncluded(@NotNull final String path, @NotNull final Set<String> includePaths) { return isAncestorOfAnyPath(path, includePaths) || includePaths.contains(path) || isDescendantOfAnyPath(path, includePaths); @@ -206,7 +205,7 @@ public class FilteringNodeState extends * @param excludedFragments Exclude fragments * @return Whether the path is covered by the excldue paths or not. */ - private static boolean isExcluded(@Nonnull final String path, @Nonnull final Set<String> excludePaths, @Nonnull final Set<String> excludedFragments) { + private static boolean isExcluded(@NotNull final String path, @NotNull final Set<String> excludePaths, @NotNull final Set<String> excludedFragments) { return excludePaths.contains(path) || isDescendantOfAnyPath(path, excludePaths) || containsAnyFragment(path, excludedFragments); } @@ -218,7 +217,7 @@ public class FilteringNodeState extends * @param paths Paths that may be descendants of {@code ancestor}. * @return true if {@code paths} contains a descendant of {@code ancestor}, false otherwise. */ - private static boolean isAncestorOfAnyPath(@Nonnull final String ancestor, @Nonnull final Set<String> paths) { + private static boolean isAncestorOfAnyPath(@NotNull final String ancestor, @NotNull final Set<String> paths) { for (final String p : paths) { if (PathUtils.isAncestor(ancestor, p)) { return true; @@ -235,7 +234,7 @@ public class FilteringNodeState extends * @param paths Paths that may be ancestors of {@code descendant}. * @return true if {@code paths} contains an ancestor of {@code descendant}, false otherwise. */ - private static boolean isDescendantOfAnyPath(@Nonnull final String descendant, @Nonnull final Set<String> paths) { + private static boolean isDescendantOfAnyPath(@NotNull final String descendant, @NotNull final Set<String> paths) { for (final String p : paths) { if (PathUtils.isAncestor(p, descendant)) { return true; @@ -251,7 +250,7 @@ public class FilteringNodeState extends * @param fragments Fragments, which the path may contain * @return true if {@code path} contains any of the {@code fragments}, false otherwise. */ - private static boolean containsAnyFragment(@Nonnull final String path, @Nonnull final Set<String> fragments) { + private static boolean containsAnyFragment(@NotNull final String path, @NotNull final Set<String> fragments) { for (final String f : fragments) { if (path.contains(f)) { return true; @@ -267,8 +266,8 @@ public class FilteringNodeState extends * @param defaultValue Default value * @return return the given {@code Set} if it is not empty and a default Set otherwise */ - @Nonnull - private static <T> Set<T> defaultIfEmpty(@Nullable Set<T> value, @Nonnull Set<T> defaultValue) { + @NotNull + private static <T> Set<T> defaultIfEmpty(@Nullable Set<T> value, @NotNull Set<T> defaultValue) { return !isEmpty(value) ? value : defaultValue; } Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/NodeStateCopier.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/NodeStateCopier.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/NodeStateCopier.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/NodeStateCopier.java Wed Jul 18 14:37:06 2018 @@ -28,12 +28,11 @@ import org.apache.jackrabbit.oak.spi.sta import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStateUtils; import org.apache.jackrabbit.oak.spi.state.NodeStore; +import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.annotation.Nonnull; import java.util.Set; - import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.ImmutableSet.copyOf; import static com.google.common.collect.ImmutableSet.of; @@ -114,7 +113,7 @@ public class NodeStateCopier { * @throws CommitFailedException if the operation fails * @see NodeStateCopier.Builder#copy(NodeStore, NodeStore) */ - public static boolean copyNodeStore(@Nonnull final NodeStore source, @Nonnull final NodeStore target) + public static boolean copyNodeStore(@NotNull final NodeStore source, @NotNull final NodeStore target) throws CommitFailedException { return builder().copy(checkNotNull(source), checkNotNull(target)); } @@ -149,7 +148,7 @@ public class NodeStateCopier { return hasChanges; } - private boolean copyNodeState(@Nonnull final NodeState sourceRoot, @Nonnull final NodeBuilder targetRoot) { + private boolean copyNodeState(@NotNull final NodeState sourceRoot, @NotNull final NodeBuilder targetRoot) { final NodeState wrappedSource = FilteringNodeState.wrap("/", sourceRoot, this.includePaths, this.excludePaths, this.fragmentPaths, this.excludeFragments); boolean hasChanges = false; for (String includePath : this.includePaths) { @@ -180,8 +179,8 @@ public class NodeStateCopier { * preserved, even if the do not exist in the source. * @return An indication of whether there were changes or not. */ - private static boolean copyNodeState(@Nonnull final NodeState source, @Nonnull final NodeBuilder target, - @Nonnull final String currentPath, @Nonnull final Set<String> mergePaths) { + private static boolean copyNodeState(@NotNull final NodeState source, @NotNull final NodeBuilder target, + @NotNull final String currentPath, @NotNull final Set<String> mergePaths) { boolean hasChanges = false; @@ -263,8 +262,8 @@ public class NodeStateCopier { * @param path An absolute or relative path, which is evaluated as a relative path under the root NodeBuilder. * @return a NodeBuilder instance, never null */ - @Nonnull - private static NodeBuilder getChildNodeBuilder(@Nonnull final NodeBuilder root, @Nonnull final String path) { + @NotNull + private static NodeBuilder getChildNodeBuilder(@NotNull final NodeBuilder root, @NotNull final String path) { NodeBuilder child = root; for (String name : PathUtils.elements(path)) { child = child.child(name); @@ -319,8 +318,8 @@ public class NodeStateCopier { * @return this Builder instance * @see NodeStateCopier#NodeStateCopier(Set, Set, Set, Set, Set) */ - @Nonnull - public Builder include(@Nonnull Set<String> paths) { + @NotNull + public Builder include(@NotNull Set<String> paths) { if (!checkNotNull(paths).isEmpty()) { this.includePaths = copyOf(paths); } @@ -334,8 +333,8 @@ public class NodeStateCopier { * @return this Builder instance * @see NodeStateCopier#NodeStateCopier(Set, Set, Set, Set, Set) */ - @Nonnull - public Builder include(@Nonnull String... paths) { + @NotNull + public Builder include(@NotNull String... paths) { return include(copyOf(checkNotNull(paths))); } @@ -346,8 +345,8 @@ public class NodeStateCopier { * @return this Builder instance * @see NodeStateCopier#NodeStateCopier(Set, Set, Set, Set, Set) */ - @Nonnull - public Builder exclude(@Nonnull Set<String> paths) { + @NotNull + public Builder exclude(@NotNull Set<String> paths) { if (!checkNotNull(paths).isEmpty()) { this.excludePaths = copyOf(paths); } @@ -361,8 +360,8 @@ public class NodeStateCopier { * @return this Builder instance * @see NodeStateCopier#NodeStateCopier(Set, Set, Set, Set, Set) */ - @Nonnull - public Builder exclude(@Nonnull String... paths) { + @NotNull + public Builder exclude(@NotNull String... paths) { return exclude(copyOf(checkNotNull(paths))); } @@ -373,8 +372,8 @@ public class NodeStateCopier { * @return this Builder instance * @see NodeStateCopier#NodeStateCopier(Set, Set, Set, Set, Set) */ - @Nonnull - public Builder supportFragment(@Nonnull Set<String> paths) { + @NotNull + public Builder supportFragment(@NotNull Set<String> paths) { if (!checkNotNull(paths).isEmpty()) { this.fragmentPaths = copyOf(paths); } @@ -388,8 +387,8 @@ public class NodeStateCopier { * @return this Builder instance * @see NodeStateCopier#NodeStateCopier(Set, Set, Set, Set, Set) */ - @Nonnull - public Builder supportFragment(@Nonnull String... paths) { + @NotNull + public Builder supportFragment(@NotNull String... paths) { return supportFragment(copyOf(checkNotNull(paths))); } @@ -400,8 +399,8 @@ public class NodeStateCopier { * @return this Builder instance * @see NodeStateCopier#NodeStateCopier(Set, Set, Set, Set, Set) */ - @Nonnull - public Builder excludeFragments(@Nonnull Set<String> fragments) { + @NotNull + public Builder excludeFragments(@NotNull Set<String> fragments) { if (!checkNotNull(fragments).isEmpty()) { this.excludeFragments = copyOf(fragments); } @@ -415,8 +414,8 @@ public class NodeStateCopier { * @return this Builder instance * @see NodeStateCopier#NodeStateCopier(Set, Set, Set, Set, Set) */ - @Nonnull - public Builder excludeFragments(@Nonnull String... fragments) { + @NotNull + public Builder excludeFragments(@NotNull String... fragments) { return exclude(copyOf(checkNotNull(fragments))); } @@ -427,8 +426,8 @@ public class NodeStateCopier { * @return this Builder instance * @see NodeStateCopier#NodeStateCopier(Set, Set, Set, Set, Set) */ - @Nonnull - public Builder merge(@Nonnull Set<String> paths) { + @NotNull + public Builder merge(@NotNull Set<String> paths) { if (!checkNotNull(paths).isEmpty()) { this.mergePaths = copyOf(paths); } @@ -442,8 +441,8 @@ public class NodeStateCopier { * @return this Builder instance * @see NodeStateCopier#NodeStateCopier(Set, Set, Set, Set, Set) */ - @Nonnull - public Builder merge(@Nonnull String... paths) { + @NotNull + public Builder merge(@NotNull String... paths) { return merge(copyOf(checkNotNull(paths))); } @@ -460,7 +459,7 @@ public class NodeStateCopier { * @return true if there were any changes, false if sourceRoot and targetRoot represent * the same content */ - public boolean copy(@Nonnull final NodeState sourceRoot, @Nonnull final NodeBuilder targetRoot) { + public boolean copy(@NotNull final NodeState sourceRoot, @NotNull final NodeBuilder targetRoot) { final NodeStateCopier copier = new NodeStateCopier(includePaths, excludePaths, fragmentPaths, excludeFragments, mergePaths); return copier.copyNodeState(checkNotNull(sourceRoot), checkNotNull(targetRoot)); } @@ -479,7 +478,7 @@ public class NodeStateCopier { * the same content * @throws CommitFailedException if the copy operation fails */ - public boolean copy(@Nonnull final NodeStore source, @Nonnull final NodeStore target) + public boolean copy(@NotNull final NodeStore source, @NotNull final NodeStore target) throws CommitFailedException { final NodeBuilder targetRoot = checkNotNull(target).getRoot().builder(); if (copy(checkNotNull(source).getRoot(), targetRoot)) { Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/report/LoggingReporter.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/report/LoggingReporter.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/report/LoggingReporter.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/report/LoggingReporter.java Wed Jul 18 14:37:06 2018 @@ -20,10 +20,9 @@ package org.apache.jackrabbit.oak.plugin import com.google.common.collect.EvictingQueue; import org.apache.jackrabbit.oak.commons.PathUtils; +import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; -import javax.annotation.Nonnull; - /** * A Reporter implementation that logs every nth node * and/or any nth property to the given logger on {@code info} @@ -67,16 +66,16 @@ public class LoggingReporter extends Per } @Override - protected void reportPeriodicNode(final long count, @Nonnull final ReportingNodeState nodeState) { + protected void reportPeriodicNode(final long count, @NotNull final ReportingNodeState nodeState) { logger.info("{} node #{}: {}", verb, count, nodeState.getPath()); } @Override - protected void reportPeriodicProperty(final long count, @Nonnull final ReportingNodeState parent, @Nonnull final String propertyName) { + protected void reportPeriodicProperty(final long count, @NotNull final ReportingNodeState parent, @NotNull final String propertyName) { logger.info("{} properties #{}: {}", verb, count, PathUtils.concat(parent.getPath(), propertyName)); } - protected boolean skipNodeState(@Nonnull final ReportingNodeState nodeState) { + protected boolean skipNodeState(@NotNull final ReportingNodeState nodeState) { String path = nodeState.getPath(); if (lastPaths.contains(path)) { return true; @@ -85,4 +84,4 @@ public class LoggingReporter extends Per return false; } } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/report/PeriodicReporter.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/report/PeriodicReporter.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/report/PeriodicReporter.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/report/PeriodicReporter.java Wed Jul 18 14:37:06 2018 @@ -18,8 +18,8 @@ */ package org.apache.jackrabbit.oak.plugins.migration.report; -import javax.annotation.Nonnull; import java.util.concurrent.atomic.AtomicLong; +import org.jetbrains.annotations.NotNull; /** * Abstract class that simplifies development of a Reporter @@ -56,7 +56,7 @@ public abstract class PeriodicReporter i * @param nodeState The node that was reported. */ protected abstract void reportPeriodicNode( - final long count, @Nonnull final ReportingNodeState nodeState); + final long count, @NotNull final ReportingNodeState nodeState); /** * Callback called every nth time a property is accessed. @@ -66,15 +66,15 @@ public abstract class PeriodicReporter i * @param propertyName The name of the reported property. */ protected abstract void reportPeriodicProperty( - final long count, @Nonnull final ReportingNodeState parent, @Nonnull final String propertyName); + final long count, @NotNull final ReportingNodeState parent, @NotNull final String propertyName); - protected boolean skipNodeState(@Nonnull final ReportingNodeState nodeState) { + protected boolean skipNodeState(@NotNull final ReportingNodeState nodeState) { return false; } @Override - public final void reportNode(@Nonnull final ReportingNodeState nodeState) { + public final void reportNode(@NotNull final ReportingNodeState nodeState) { if (nodeLogInterval == -1) { return; } @@ -90,7 +90,7 @@ public abstract class PeriodicReporter i } @Override - public final void reportProperty(@Nonnull final ReportingNodeState parent, @Nonnull final String propertyName) { + public final void reportProperty(@NotNull final ReportingNodeState parent, @NotNull final String propertyName) { if (propertyLogInterval == -1) { return; } Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/report/Reporter.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/report/Reporter.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/report/Reporter.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/report/Reporter.java Wed Jul 18 14:37:06 2018 @@ -18,7 +18,7 @@ */ package org.apache.jackrabbit.oak.plugins.migration.report; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * A {@code Reporter} receives callbacks for every NodeState @@ -32,7 +32,7 @@ public interface Reporter { * * @param nodeState The accessed {@code ReportingNodeState} instance. */ - void reportNode(@Nonnull final ReportingNodeState nodeState); + void reportNode(@NotNull final ReportingNodeState nodeState); /** * Callback reporting that the property named {@code propertyName} @@ -41,5 +41,5 @@ public interface Reporter { * @param parent The parent node state of the reported property. * @param propertyName The name of the reported property. */ - void reportProperty(@Nonnull final ReportingNodeState parent, @Nonnull final String propertyName); + void reportProperty(@NotNull final ReportingNodeState parent, @NotNull final String propertyName); } Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/report/ReportingNodeState.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/report/ReportingNodeState.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/report/ReportingNodeState.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/report/ReportingNodeState.java Wed Jul 18 14:37:06 2018 @@ -22,10 +22,8 @@ import org.apache.jackrabbit.oak.api.Pro import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.plugins.migration.AbstractDecoratedNodeState; import org.apache.jackrabbit.oak.spi.state.NodeState; - -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * A decoration layer for NodeState instances that intercepts @@ -69,8 +67,8 @@ public class ReportingNodeState extends return wrapAndReport(null, "/", nodeState, reporter); } - private static NodeState wrapAndReport(@Nullable ReportingNodeState parent, @Nonnull String name, - @Nonnull NodeState delegate, @Nonnull Reporter reporter) { + private static NodeState wrapAndReport(@Nullable ReportingNodeState parent, @NotNull String name, + @NotNull NodeState delegate, @NotNull Reporter reporter) { final ReportingNodeState nodeState = new ReportingNodeState(parent, name, delegate, reporter); reporter.reportNode(nodeState); return nodeState; @@ -98,15 +96,15 @@ public class ReportingNodeState extends return PathUtils.concat(this.parent.getPath(), name); } - @Nonnull + @NotNull @Override - protected NodeState decorateChild(@Nonnull final String name, @Nonnull final NodeState delegateChild) { + protected NodeState decorateChild(@NotNull final String name, @NotNull final NodeState delegateChild) { return wrapAndReport(this, name, delegateChild, reporter); } @Override - @CheckForNull - protected PropertyState decorateProperty(@Nonnull final PropertyState delegatePropertyState) { + @Nullable + protected PropertyState decorateProperty(@NotNull final PropertyState delegatePropertyState) { reporter.reportProperty(this, delegatePropertyState.getName()); return delegatePropertyState; } Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/ReadOnlyNamespaceRegistry.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/ReadOnlyNamespaceRegistry.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/ReadOnlyNamespaceRegistry.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/ReadOnlyNamespaceRegistry.java Wed Jul 18 14:37:06 2018 @@ -21,7 +21,6 @@ import static java.util.Collections.empt import static org.apache.jackrabbit.oak.api.Type.STRING; import static org.apache.jackrabbit.oak.api.Type.STRINGS; -import javax.annotation.Nonnull; import javax.jcr.NamespaceException; import javax.jcr.NamespaceRegistry; import javax.jcr.RepositoryException; @@ -31,6 +30,7 @@ import org.apache.jackrabbit.oak.api.Pro import org.apache.jackrabbit.oak.api.Root; import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.spi.namespace.NamespaceConstants; +import org.jetbrains.annotations.NotNull; /** * Read-only namespace registry. Used mostly internally when access to the @@ -72,17 +72,17 @@ public class ReadOnlyNamespaceRegistry throw new UnsupportedRepositoryOperationException(); } - @Override @Nonnull + @Override @NotNull public String[] getPrefixes() { return toArray(getNSData(REP_PREFIXES), String.class); } - @Override @Nonnull + @Override @NotNull public String[] getURIs() { return toArray(getNSData(REP_URIS), String.class); } - @Override @Nonnull + @Override @NotNull public String getURI(String prefix) throws NamespaceException { if (prefix.isEmpty()) { return prefix; // the default empty namespace @@ -97,7 +97,7 @@ public class ReadOnlyNamespaceRegistry "No namespace registered for prefix " + prefix); } - @Override @Nonnull + @Override @NotNull public String getPrefix(String uri) throws NamespaceException { if (uri.isEmpty()) { return uri; // the default empty namespace Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/AbstractTypeDefinition.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/AbstractTypeDefinition.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/AbstractTypeDefinition.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/AbstractTypeDefinition.java Wed Jul 18 14:37:06 2018 @@ -18,13 +18,12 @@ package org.apache.jackrabbit.oak.plugin import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.namepath.NamePathMapper; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Abstract base class for the various kinds of type definition classes @@ -49,7 +48,7 @@ abstract class AbstractTypeDefinition { * @param name property name * @return property value, or {@code false} if the property does not exist */ - protected boolean getBoolean(@Nonnull String name) { + protected boolean getBoolean(@NotNull String name) { PropertyState property = definition.getProperty(checkNotNull(name)); return property != null && property.getValue(Type.BOOLEAN); } @@ -60,8 +59,8 @@ abstract class AbstractTypeDefinition { * @param oakName property name * @return property value, or {@code null} if the property does not exist */ - @CheckForNull - protected String getString(@Nonnull String oakName) { + @Nullable + protected String getString(@NotNull String oakName) { return getValue(oakName, Type.STRING); } @@ -71,8 +70,8 @@ abstract class AbstractTypeDefinition { * @param oakName property name * @return property values, or {@code null} if the property does not exist */ - @CheckForNull - protected String[] getStrings(@Nonnull String oakName) { + @Nullable + protected String[] getStrings(@NotNull String oakName) { return getValues(oakName, Type.STRING); } /** @@ -81,8 +80,8 @@ abstract class AbstractTypeDefinition { * @param oakName property name * @return property value, or {@code null} if the property does not exist */ - @CheckForNull - protected String getName(@Nonnull String oakName) { + @Nullable + protected String getName(@NotNull String oakName) { return getValue(oakName, Type.NAME); } @@ -92,8 +91,8 @@ abstract class AbstractTypeDefinition { * @param oakName property name * @return property values, or {@code null} if the property does not exist */ - @CheckForNull - protected String[] getNames(@Nonnull String oakName) { + @Nullable + protected String[] getNames(@NotNull String oakName) { return getValues(oakName, Type.NAME); } Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeTypeImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeTypeImpl.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeTypeImpl.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeTypeImpl.java Wed Jul 18 14:37:06 2018 @@ -25,7 +25,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.annotation.Nonnull; import javax.jcr.PropertyType; import javax.jcr.RepositoryException; import javax.jcr.UnsupportedRepositoryOperationException; @@ -40,6 +39,7 @@ import org.apache.jackrabbit.oak.api.Pro import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.plugins.value.jcr.ValueFactoryImpl; import org.apache.jackrabbit.oak.spi.nodetype.EffectiveNodeType; +import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -217,7 +217,7 @@ class EffectiveNodeTypeImpl implements E * @return All node definitions that match the given internal oak name. */ @Override - @Nonnull + @NotNull public Iterable<NodeDefinition> getNamedNodeDefinitions( final String oakName) { return Iterables.concat(Iterables.transform( @@ -237,7 +237,7 @@ class EffectiveNodeTypeImpl implements E * @return All property definitions that match the given internal oak name. */ @Override - @Nonnull + @NotNull public Iterable<PropertyDefinition> getNamedPropertyDefinitions( String oakName) { List<PropertyDefinition> definitions = newArrayList(); @@ -253,7 +253,7 @@ class EffectiveNodeTypeImpl implements E * @return All residual node definitions. */ @Override - @Nonnull + @NotNull public Iterable<NodeDefinition> getResidualNodeDefinitions() { List<NodeDefinition> definitions = newArrayList(); for (NodeTypeImpl type : nodeTypes.values()) { @@ -268,7 +268,7 @@ class EffectiveNodeTypeImpl implements E * @return All residual property definitions. */ @Override - @Nonnull + @NotNull public Iterable<PropertyDefinition> getResidualPropertyDefinitions() { List<PropertyDefinition> definitions = newArrayList(); for (NodeTypeImpl type : nodeTypes.values()) { Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java Wed Jul 18 14:37:06 2018 @@ -18,14 +18,13 @@ package org.apache.jackrabbit.oak.plugin import java.util.List; import java.util.Set; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants; import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.Iterables.addAll; @@ -55,7 +54,7 @@ class EffectiveType { private final List<NodeState> types; - EffectiveType(@Nonnull List<NodeState> types) { + EffectiveType(@NotNull List<NodeState> types) { this.types = checkNotNull(types); } @@ -66,7 +65,7 @@ class EffectiveType { * @return {@code true} if the named type is included, * {@code false} otherwise */ - boolean isNodeType(@Nonnull String name) { + boolean isNodeType(@NotNull String name) { for (NodeState type : types) { if (name.equals(type.getName(JCR_NODETYPENAME)) || contains(type.getNames(REP_SUPERTYPES), name)) { @@ -76,20 +75,20 @@ class EffectiveType { return false; } - boolean isMandatoryProperty(@Nonnull String name) { + boolean isMandatoryProperty(@NotNull String name) { return nameSetContains(REP_MANDATORY_PROPERTIES, name); } - @Nonnull + @NotNull Set<String> getMandatoryProperties() { return getNameSet(REP_MANDATORY_PROPERTIES); } - boolean isMandatoryChildNode(@Nonnull String name) { + boolean isMandatoryChildNode(@NotNull String name) { return nameSetContains(REP_MANDATORY_CHILD_NODES, name); } - @Nonnull + @NotNull Set<String> getMandatoryChildNodes() { return getNameSet(REP_MANDATORY_CHILD_NODES); } @@ -100,8 +99,8 @@ class EffectiveType { * @param property modified property * @return matching property definition, or {@code null} */ - @CheckForNull - NodeState getDefinition(@Nonnull PropertyState property) { + @Nullable + NodeState getDefinition(@NotNull PropertyState property) { String propertyName = property.getName(); Type<?> propertyType = property.getType(); @@ -179,7 +178,7 @@ class EffectiveType { * @return {@code true} if there's a matching child node definition, * {@code false} otherwise */ - boolean isValidChildNode(@Nonnull String nameWithIndex, @Nonnull EffectiveType effective) { + boolean isValidChildNode(@NotNull String nameWithIndex, @NotNull EffectiveType effective) { String name = dropIndexFromName(nameWithIndex); boolean sns = !name.equals(nameWithIndex); Set<String> typeNames = effective.getTypeNames(); @@ -232,8 +231,8 @@ class EffectiveType { * @param nameWithIndex child node name, possibly with an SNS index * @return default type, or {@code null} if not found */ - @CheckForNull - String getDefaultType(@Nonnull String nameWithIndex) { + @Nullable + String getDefaultType(@NotNull String nameWithIndex) { String name = dropIndexFromName(nameWithIndex); boolean sns = !name.equals(nameWithIndex); @@ -258,7 +257,7 @@ class EffectiveType { return null; } - @Nonnull + @NotNull Set<String> getTypeNames() { Set<String> names = newHashSet(); for (NodeState type : types) { @@ -292,11 +291,11 @@ class EffectiveType { * @param sns SNS flag, {@code true} if processing an SNS node * @param definition child node definition */ - private boolean snsMatch(boolean sns, @Nonnull NodeState definition) { + private boolean snsMatch(boolean sns, @NotNull NodeState definition) { return !sns || definition.getBoolean(JCR_SAMENAMESIBLINGS); } - private boolean nameSetContains(@Nonnull String set, @Nonnull String name) { + private boolean nameSetContains(@NotNull String set, @NotNull String name) { for (NodeState type : types) { if (contains(type.getNames(set), name)) { return true; @@ -305,8 +304,8 @@ class EffectiveType { return false; } - @Nonnull - private Set<String> getNameSet(@Nonnull String set) { + @NotNull + private Set<String> getNameSet(@NotNull String set) { Set<String> names = newHashSet(); for (NodeState type : types) { addAll(names, type.getNames(set));
