Author: reschke Date: Wed Nov 7 14:17:56 2018 New Revision: 1846028 URL: http://svn.apache.org/viewvc?rev=1846028&view=rev Log: OAK-7669: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-query-spi
Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-query-spi/pom.xml jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/query/facet/FacetResult.java jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/query/facet/package-info.java jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/CompositeQueryIndexProvider.java jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/Filter.java jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/QueryIndex.java jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/QueryIndexProvider.java jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/WhiteboardIndexProvider.java jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/package-info.java Propchange: jackrabbit/oak/branches/1.8/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 7 14:17:56 2018 @@ -1,3 +1,3 @@ /jackrabbit/oak/branches/1.0:1665962 -/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1830911,1830923,1831157 -1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836184,1836487,1836493,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840455,1840574,1841314,1841352,1842089,1842677,1843222,1843231,1843398,1843618,1843652,1843911,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845336 +/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1830911,1830923,1831157 -1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836185,1836487,1836493,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840455,1840574,1841314,1841352,1842089,1842677,1843222,1843231,1843398,1843618,1843652,1843911,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845336 /jackrabbit/trunk:1345480 Modified: jackrabbit/oak/branches/1.8/oak-query-spi/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-query-spi/pom.xml?rev=1846028&r1=1846027&r2=1846028&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-query-spi/pom.xml (original) +++ jackrabbit/oak/branches/1.8/oak-query-spi/pom.xml Wed Nov 7 14:17:56 2018 @@ -107,10 +107,10 @@ <artifactId>guava</artifactId> </dependency> - <!-- Findbugs annotations --> + <!-- Nullability annotations --> <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> + <groupId>org.jetbrains</groupId> + <artifactId>annotations</artifactId> </dependency> <!-- Test dependencies --> Modified: jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/query/facet/FacetResult.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/query/facet/FacetResult.java?rev=1846028&r1=1846027&r2=1846028&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/query/facet/FacetResult.java (original) +++ jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/query/facet/FacetResult.java Wed Nov 7 14:17:56 2018 @@ -19,8 +19,6 @@ package org.apache.jackrabbit.oak.query.facet; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; import javax.jcr.Value; import javax.jcr.query.QueryResult; import javax.jcr.query.Row; @@ -34,6 +32,8 @@ import java.util.Set; import org.apache.jackrabbit.oak.commons.json.JsopReader; import org.apache.jackrabbit.oak.commons.json.JsopTokenizer; import org.apache.jackrabbit.oak.spi.query.QueryConstants; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * A facet result is a wrapper for {@link javax.jcr.query.QueryResult} capable of returning information about facets @@ -84,13 +84,13 @@ public class FacetResult { perDimFacets.put(dimension, facets); } - @Nonnull + @NotNull public Set<String> getDimensions() { return perDimFacets.keySet(); } - @CheckForNull - public List<Facet> getFacets(@Nonnull String dimension) { + @Nullable + public List<Facet> getFacets(@NotNull String dimension) { return perDimFacets.get(dimension); } @@ -111,7 +111,7 @@ public class FacetResult { * get the facet label * @return a label */ - @Nonnull + @NotNull public String getLabel() { return label; } Modified: jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/query/facet/package-info.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/query/facet/package-info.java?rev=1846028&r1=1846027&r2=1846028&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/query/facet/package-info.java (original) +++ jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/query/facet/package-info.java Wed Nov 7 14:17:56 2018 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@Version("1.0") +@Version("1.0.1") package org.apache.jackrabbit.oak.query.facet; import org.osgi.annotation.versioning.Version; Modified: jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/CompositeQueryIndexProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/CompositeQueryIndexProvider.java?rev=1846028&r1=1846027&r2=1846028&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/CompositeQueryIndexProvider.java (original) +++ jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/CompositeQueryIndexProvider.java Wed Nov 7 14:17:56 2018 @@ -20,9 +20,8 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; @@ -43,9 +42,9 @@ public class CompositeQueryIndexProvider this(Arrays.asList(providers)); } - @Nonnull + @NotNull public static QueryIndexProvider compose( - @Nonnull Collection<QueryIndexProvider> providers) { + @NotNull Collection<QueryIndexProvider> providers) { if (providers.isEmpty()) { return new QueryIndexProvider() { @Override @@ -61,7 +60,7 @@ public class CompositeQueryIndexProvider } } - @Override @Nonnull + @Override @NotNull public List<? extends QueryIndex> getQueryIndexes(NodeState nodeState) { List<QueryIndex> indexes = Lists.newArrayList(); for (QueryIndexProvider provider : providers) { Modified: jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/Filter.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/Filter.java?rev=1846028&r1=1846027&r2=1846028&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/Filter.java (original) +++ jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/Filter.java Wed Nov 7 14:17:56 2018 @@ -23,13 +23,13 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.PropertyType; import org.apache.jackrabbit.oak.api.PropertyValue; import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextExpression; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The filter for an index lookup that contains a number of restrictions that @@ -143,7 +143,7 @@ public interface Filter { * * @return supertype name */ - @Nonnull + @NotNull Set<String> getSupertypes(); /** @@ -151,7 +151,7 @@ public interface Filter { * * @return primary node type names */ - @Nonnull + @NotNull Set<String> getPrimaryTypes(); /** @@ -159,7 +159,7 @@ public interface Filter { * * @return mixin node type names */ - @Nonnull + @NotNull Set<String> getMixinTypes(); /** @@ -502,19 +502,19 @@ public interface Filter { return false; } - @Nonnull + @NotNull @Override public Set<String> getSupertypes() { return Collections.emptySet(); } - @Nonnull + @NotNull @Override public Set<String> getPrimaryTypes() { return Collections.emptySet(); } - @Nonnull + @NotNull @Override public Set<String> getMixinTypes() { return Collections.emptySet(); Modified: jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/QueryIndex.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/QueryIndex.java?rev=1846028&r1=1846027&r2=1846028&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/QueryIndex.java (original) +++ jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/QueryIndex.java Wed Nov 7 14:17:56 2018 @@ -23,8 +23,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import javax.annotation.CheckForNull; - +import org.jetbrains.annotations.Nullable; import org.osgi.annotation.versioning.ProviderType; import com.google.common.collect.Maps; @@ -146,7 +145,7 @@ public interface QueryIndex { * * @return the node aggregator or null */ - @CheckForNull + @Nullable NodeAggregator getNodeAggregator(); } @@ -301,7 +300,7 @@ public interface QueryIndex { * * @return the restriction this plan is based on or <code>null</code>. */ - @CheckForNull + @Nullable PropertyRestriction getPropertyRestriction(); /** @@ -322,7 +321,7 @@ public interface QueryIndex { * @return an <code>Object</code> containing the value * of the attribute, or <code>null</code> if the attribute does not exist */ - @CheckForNull + @Nullable Object getAttribute(String name); /** @@ -330,7 +329,7 @@ public interface QueryIndex { * * @return the plan name */ - @CheckForNull + @Nullable String getPlanName(); /** Modified: jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/QueryIndexProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/QueryIndexProvider.java?rev=1846028&r1=1846027&r2=1846028&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/QueryIndexProvider.java (original) +++ jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/QueryIndexProvider.java Wed Nov 7 14:17:56 2018 @@ -20,9 +20,8 @@ package org.apache.jackrabbit.oak.spi.qu import java.util.List; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; /** * A mechanism to index data. Indexes might be added or removed at runtime, @@ -37,7 +36,7 @@ public interface QueryIndexProvider { * @param nodeState the node state of the root * @return the list of indexes */ - @Nonnull + @NotNull List<? extends QueryIndex> getQueryIndexes(NodeState nodeState); } Modified: jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/WhiteboardIndexProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/WhiteboardIndexProvider.java?rev=1846028&r1=1846027&r2=1846028&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/WhiteboardIndexProvider.java (original) +++ jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/WhiteboardIndexProvider.java Wed Nov 7 14:17:56 2018 @@ -20,10 +20,9 @@ package org.apache.jackrabbit.oak.spi.qu import java.util.List; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.whiteboard.AbstractServiceTracker; +import org.jetbrains.annotations.NotNull; /** * Dynamic {@link QueryIndexProvider} based on the available @@ -37,7 +36,7 @@ public class WhiteboardIndexProvider super(QueryIndexProvider.class); } - @Override @Nonnull + @Override @NotNull public List<? extends QueryIndex> getQueryIndexes(NodeState nodeState) { QueryIndexProvider composite = CompositeQueryIndexProvider.compose(getServices()); Modified: jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/package-info.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/package-info.java?rev=1846028&r1=1846027&r2=1846028&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/package-info.java (original) +++ jackrabbit/oak/branches/1.8/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/package-info.java Wed Nov 7 14:17:56 2018 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@Version("1.0.0") +@Version("1.0.1") package org.apache.jackrabbit.oak.spi.query; -import org.osgi.annotation.versioning.Version; \ No newline at end of file +import org.osgi.annotation.versioning.Version;