Author: reschke
Date: Wed Nov 7 13:30:17 2018
New Revision: 1846005
URL: http://svn.apache.org/viewvc?rev=1846005&view=rev
Log:
OAK-7669: backport of: OAK-7511: get rid of JSR 305 dependency - use jetbrains
nullability annotations instead - oak-api
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-api/pom.xml
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/AuthInfo.java
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/Blob.java
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/CommitFailedException.java
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/ContentRepository.java
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/ContentSession.java
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/Descriptors.java
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/PropertyState.java
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/PropertyValue.java
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/Root.java
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/Tree.java
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/Type.java
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/FileStoreBackupRestoreMBean.java
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/RepositoryManagementMBean.java
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/package-info.java
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/package-info.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 7 13:30:17 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,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,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-api/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-api/pom.xml?rev=1846005&r1=1846004&r2=1846005&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-api/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-api/pom.xml Wed Nov 7 13:30:17 2018
@@ -99,10 +99,10 @@
<version>2.0</version>
</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 -->
@@ -112,4 +112,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified:
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/AuthInfo.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/AuthInfo.java?rev=1846005&r1=1846004&r2=1846005&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/AuthInfo.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/AuthInfo.java
Wed Nov 7 13:30:17 2018
@@ -19,8 +19,8 @@ package org.apache.jackrabbit.oak.api;
import java.security.Principal;
import java.util.Collections;
import java.util.Set;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* {@code AuthInfo} instances provide access to information related
@@ -35,7 +35,7 @@ public interface AuthInfo {
return null;
}
- @Nonnull
+ @NotNull
@Override
public String[] getAttributeNames() {
return new String[0];
@@ -46,7 +46,7 @@ public interface AuthInfo {
return null;
}
- @Nonnull
+ @NotNull
@Override
public Set<Principal> getPrincipals() {
return Collections.emptySet();
@@ -65,7 +65,7 @@ public interface AuthInfo {
*
* @return the user ID such as exposed on the JCR Session object.
*/
- @CheckForNull
+ @Nullable
String getUserID();
/**
@@ -74,7 +74,7 @@ public interface AuthInfo {
* @return The attribute names with that instance or an empty array if
* no attributes are present.
*/
- @Nonnull
+ @NotNull
String[] getAttributeNames();
/**
@@ -84,7 +84,7 @@ public interface AuthInfo {
* @param attributeName The attribute name.
* @return The attribute or {@code null}.
*/
- @CheckForNull
+ @Nullable
Object getAttribute(String attributeName);
/**
@@ -92,6 +92,6 @@ public interface AuthInfo {
*
* @return A set of principals.
*/
- @Nonnull
+ @NotNull
Set<Principal> getPrincipals();
}
Modified:
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/Blob.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/Blob.java?rev=1846005&r1=1846004&r2=1846005&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/Blob.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/Blob.java
Wed Nov 7 13:30:17 2018
@@ -20,8 +20,8 @@ package org.apache.jackrabbit.oak.api;
import java.io.InputStream;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Immutable representation of a binary value of finite length.
@@ -47,7 +47,7 @@ public interface Blob {
*
* @return a new stream for this blob
*/
- @Nonnull
+ @NotNull
InputStream getNewStream();
/**
@@ -64,7 +64,7 @@ public interface Blob {
* @see <a href="https://issues.apache.org/jira/browse/OAK-834";>OAK-834</a>
* @return binary reference, or {@code null}
*/
- @CheckForNull
+ @Nullable
String getReference();
/**
@@ -85,6 +85,6 @@ public interface Blob {
*
* @return the unique identifier or null
*/
- @CheckForNull
+ @Nullable
String getContentIdentity();
}
Modified:
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/CommitFailedException.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/CommitFailedException.java?rev=1846005&r1=1846004&r2=1846005&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/CommitFailedException.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/CommitFailedException.java
Wed Nov 7 13:30:17 2018
@@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.api;
import static java.lang.String.format;
-import javax.annotation.Nonnull;
import javax.jcr.AccessDeniedException;
import javax.jcr.InvalidItemStateException;
import javax.jcr.NamespaceException;
@@ -32,6 +31,8 @@ import javax.jcr.security.AccessControlE
import javax.jcr.version.LabelExistsVersionException;
import javax.jcr.version.VersionException;
+import org.jetbrains.annotations.NotNull;
+
/**
* Main exception thrown by methods defined on the {@code ContentSession}
* interface indicating that committing a given set of changes failed.
@@ -220,7 +221,7 @@ public class CommitFailedException exten
* @param message The exception message.
* @return matching repository exception
*/
- public RepositoryException asRepositoryException(@Nonnull String message) {
+ public RepositoryException asRepositoryException(@NotNull String message) {
if (isConstraintViolation()) {
return new ConstraintViolationException(message, this);
} else if (isOfType(NAMESPACE)) {
Modified:
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/ContentRepository.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/ContentRepository.java?rev=1846005&r1=1846004&r2=1846005&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/ContentRepository.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/ContentRepository.java
Wed Nov 7 13:30:17 2018
@@ -16,12 +16,13 @@
*/
package org.apache.jackrabbit.oak.api;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.Credentials;
import javax.jcr.NoSuchWorkspaceException;
import javax.security.auth.login.LoginException;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
/**
* Oak content repository. The repository may be local or remote, or a cluster
* of any size. These deployment details are all hidden behind this interface.
@@ -75,7 +76,7 @@ public interface ContentRepository {
* @throws LoginException if authentication failed
* @throws NoSuchWorkspaceException if the specified workspace name is
invalid.
*/
- @Nonnull
+ @NotNull
ContentSession login(@Nullable Credentials credentials, @Nullable String
workspaceName)
throws LoginException, NoSuchWorkspaceException;
@@ -85,6 +86,6 @@ public interface ContentRepository {
*
* @return the repository descriptors
*/
- @Nonnull
+ @NotNull
Descriptors getDescriptors();
}
Modified:
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/ContentSession.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/ContentSession.java?rev=1846005&r1=1846004&r2=1846005&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/ContentSession.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/ContentSession.java
Wed Nov 7 13:30:17 2018
@@ -17,7 +17,7 @@
package org.apache.jackrabbit.oak.api;
import java.io.Closeable;
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
/**
* Authentication session for accessing a content repository.
@@ -36,7 +36,7 @@ public interface ContentSession extends
*
* @return immutable {@link AuthInfo} instance
*/
- @Nonnull
+ @NotNull
AuthInfo getAuthInfo();
/**
@@ -67,6 +67,6 @@ public interface ContentSession extends
*
* @return the current head root
*/
- @Nonnull
+ @NotNull
Root getLatestRoot();
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/Descriptors.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/Descriptors.java?rev=1846005&r1=1846004&r2=1846005&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/Descriptors.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/Descriptors.java
Wed Nov 7 13:30:17 2018
@@ -16,10 +16,11 @@
*/
package org.apache.jackrabbit.oak.api;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
import javax.jcr.Value;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
/**
* Repository descriptors interface that is used to support providing the
repository descriptors of
* {@link javax.jcr.Repository}
@@ -36,7 +37,7 @@ public interface Descriptors {
*
* @return a string array holding all descriptor keys.
*/
- @Nonnull
+ @NotNull
String[] getKeys();
/**
@@ -47,7 +48,7 @@ public interface Descriptors {
* @param key a descriptor key.
* @return whether {@code key} is a standard descriptor.
*/
- boolean isStandardDescriptor(@Nonnull String key);
+ boolean isStandardDescriptor(@NotNull String key);
/**
* Returns {@code true} if {@code key} is a valid single-value
@@ -57,7 +58,7 @@ public interface Descriptors {
* @return whether the specified descriptor is multi-valued.
* @since JCR 2.0
*/
- boolean isSingleValueDescriptor(@Nonnull String key);
+ boolean isSingleValueDescriptor(@NotNull String key);
/**
* The value of a single-value descriptor is found by passing the key for
@@ -68,8 +69,8 @@ public interface Descriptors {
* @param key a descriptor key.
* @return The value of the indicated descriptor
*/
- @CheckForNull
- Value getValue(@Nonnull String key);
+ @Nullable
+ Value getValue(@NotNull String key);
/**
* The value array of a multi-value descriptor is found by passing the key
@@ -81,6 +82,6 @@ public interface Descriptors {
* @param key a descriptor key.
* @return the value array for the indicated descriptor
*/
- @CheckForNull
- Value[] getValues(@Nonnull String key);
-}
\ No newline at end of file
+ @Nullable
+ Value[] getValues(@NotNull String key);
+}
Modified:
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/PropertyState.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/PropertyState.java?rev=1846005&r1=1846004&r2=1846005&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/PropertyState.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/PropertyState.java
Wed Nov 7 13:30:17 2018
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.api;
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
/**
* Immutable property state. A property consists of a name and a value.
@@ -36,7 +36,7 @@ public interface PropertyState {
/**
* @return the name of this property state
*/
- @Nonnull
+ @NotNull
String getName();
/**
@@ -71,7 +71,7 @@ public interface PropertyState {
* @throws NumberFormatException if conversion to a number failed.
* @throws UnsupportedOperationException if conversion to boolean failed.
*/
- @Nonnull
+ @NotNull
<T> T getValue(Type<T> type);
/**
@@ -91,7 +91,7 @@ public interface PropertyState {
* @throws IllegalArgumentException if {@code type} refers to an unknown
type or if
* {@code type.isArray()} is true.
*/
- @Nonnull
+ @NotNull
<T> T getValue(Type<T> type, int index);
/**
Modified:
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/PropertyValue.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/PropertyValue.java?rev=1846005&r1=1846004&r2=1846005&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/PropertyValue.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/PropertyValue.java
Wed Nov 7 13:30:17 2018
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.api;
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
/**
* Immutable property value.
@@ -56,7 +56,7 @@ public interface PropertyValue extends C
* @throws NumberFormatException if conversion to a number failed.
* @throws UnsupportedOperationException if conversion to boolean failed.
*/
- @Nonnull
+ @NotNull
<T> T getValue(Type<T> type);
/**
@@ -75,7 +75,7 @@ public interface PropertyValue extends C
* @throws IllegalArgumentException if {@code type} refers to an unknown
type or if
* {@code type.isArray()} is true.
*/
- @Nonnull
+ @NotNull
<T> T getValue(Type<T> type, int index);
/**
Modified:
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/Root.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/Root.java?rev=1846005&r1=1846004&r2=1846005&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/Root.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/Root.java
Wed Nov 7 13:30:17 2018
@@ -22,8 +22,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.Map;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* A {@code Root} instance serves as a container for a {@link Tree}. It is
@@ -75,8 +75,8 @@ public interface Root {
* @param path absolute path to the tree
* @return tree at the given path.
*/
- @Nonnull
- Tree getTree(@Nonnull String path);
+ @NotNull
+ Tree getTree(@NotNull String path);
/**
* Rebase this root instance to the latest revision. After a call to this
method,
@@ -114,7 +114,7 @@ public interface Root {
* @param info commit information
* @throws CommitFailedException if the commit failed
*/
- void commit(@Nonnull Map<String, Object> info) throws
CommitFailedException;
+ void commit(@NotNull Map<String, Object> info) throws
CommitFailedException;
/**
* Atomically persists all changes made to the tree attached to this root.
@@ -136,7 +136,7 @@ public interface Root {
*
* @return the query engine
*/
- @Nonnull
+ @NotNull
QueryEngine getQueryEngine();
/**
@@ -154,8 +154,8 @@ public interface Root {
* @return the blob that was created
* @throws IOException if the stream could not be read
*/
- @Nonnull
- Blob createBlob(@Nonnull InputStream stream) throws IOException;
+ @NotNull
+ Blob createBlob(@NotNull InputStream stream) throws IOException;
/**
* Get a blob by its reference.
@@ -163,8 +163,8 @@ public interface Root {
* @return blob or {@code null} if the reference does not resolve to a
blob.
* @see Blob#getReference()
*/
- @CheckForNull
- Blob getBlob(@Nonnull String reference);
+ @Nullable
+ Blob getBlob(@NotNull String reference);
/**
* Get the {@code ContentSession} from which this root was acquired
@@ -173,7 +173,7 @@ public interface Root {
*
* @throws UnsupportedOperationException
*/
- @Nonnull
+ @NotNull
ContentSession getContentSession();
}
Modified:
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/Tree.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/Tree.java?rev=1846005&r1=1846004&r2=1846005&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/Tree.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/Tree.java
Wed Nov 7 13:30:17 2018
@@ -18,9 +18,8 @@
*/
package org.apache.jackrabbit.oak.api;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* A tree instance represents a snapshot of the {@link ContentRepository}
@@ -109,7 +108,7 @@ public interface Tree {
/**
* @return the name of this {@code Tree} instance.
*/
- @Nonnull
+ @NotNull
String getName();
/**
@@ -120,7 +119,7 @@ public interface Tree {
/**
* @return the absolute path of this {@code Tree} instance from its {@link
Root}.
*/
- @Nonnull
+ @NotNull
String getPath();
/**
@@ -128,7 +127,7 @@ public interface Tree {
*
* @return The status of this tree instance.
*/
- @Nonnull
+ @NotNull
Status getStatus();
/**
@@ -143,7 +142,7 @@ public interface Tree {
* @return the possibly non existent parent of this {@code Tree}.
* @throws IllegalStateException if called on the root tree.
*/
- @Nonnull
+ @NotNull
Tree getParent();
/**
@@ -153,8 +152,8 @@ public interface Tree {
* @return the property state with the given {@code name} or {@code null}
* if no such property state exists or the property is not
accessible.
*/
- @CheckForNull
- PropertyState getProperty(@Nonnull String name);
+ @Nullable
+ PropertyState getProperty(@NotNull String name);
/**
* Get the {@code Status} of a property state or {@code null}.
@@ -164,8 +163,8 @@ public interface Tree {
* or {@code null} in no such property state exists or if the name
refers
* to a property that is not accessible.
*/
- @CheckForNull
- Status getPropertyStatus(@Nonnull String name);
+ @Nullable
+ Status getPropertyStatus(@NotNull String name);
/**
* Determine if a property state exists and is accessible.
@@ -174,7 +173,7 @@ public interface Tree {
* @return {@code true} if and only if a property with the given {@code
name}
* exists and is accessible.
*/
- boolean hasProperty(@Nonnull String name);
+ boolean hasProperty(@NotNull String name);
/**
* Determine the number of properties accessible to the current content
session.
@@ -191,7 +190,7 @@ public interface Tree {
*
* @return An {@code Iterable} for all accessible property states.
*/
- @Nonnull
+ @NotNull
Iterable<? extends PropertyState> getProperties();
/**
@@ -200,8 +199,8 @@ public interface Tree {
* @return The child with the given {@code name}.
* @throws IllegalArgumentException if the given name is invalid
*/
- @Nonnull
- Tree getChild(@Nonnull String name) throws IllegalArgumentException;
+ @NotNull
+ Tree getChild(@NotNull String name) throws IllegalArgumentException;
/**
* Determine if a child of this {@code Tree} instance exists. If no child
@@ -211,7 +210,7 @@ public interface Tree {
* @return {@code true} if and only if a child with the given {@code name}
* exists and is accessible for the current content session.
*/
- boolean hasChild(@Nonnull String name);
+ boolean hasChild(@NotNull String name);
/**
* Determine the number of children of this {@code Tree} instance taking
@@ -235,7 +234,7 @@ public interface Tree {
*
* @return An {@code Iterable} for all accessible children
*/
- @Nonnull
+ @NotNull
Iterable<Tree> getChildren();
/**
@@ -254,8 +253,8 @@ public interface Tree {
* @return the {@code Tree} instance of the child with the given {@code
name}.
* @throws IllegalArgumentException if {@code name} is not valid.
*/
- @Nonnull
- Tree addChild(@Nonnull String name) throws IllegalArgumentException;
+ @NotNull
+ Tree addChild(@NotNull String name) throws IllegalArgumentException;
/**
* Changes the nature of this tree such that the order of the children
@@ -306,7 +305,7 @@ public interface Tree {
* @throws IllegalArgumentException if {@code property} has a non valid
name. A valid name
* does not start with a colon, is not empty and does not contain
a forward slash.
*/
- void setProperty(@Nonnull PropertyState property);
+ void setProperty(@NotNull PropertyState property);
/**
* Set a property state
@@ -318,7 +317,7 @@ public interface Tree {
* @throws IllegalArgumentException if {@code T} is not one of the above
types or
* if {@code name} is not valid.
*/
- <T> void setProperty(@Nonnull String name, @Nonnull T value)
+ <T> void setProperty(@NotNull String name, @NotNull T value)
throws IllegalArgumentException;
/**
@@ -331,7 +330,7 @@ public interface Tree {
* @param <T> The type of this property.
* @throws IllegalArgumentException if {@code name} is not valid.
*/
- <T> void setProperty(@Nonnull String name, @Nonnull T value, @Nonnull
Type<T> type)
+ <T> void setProperty(@NotNull String name, @NotNull T value, @NotNull
Type<T> type)
throws IllegalArgumentException;
/**
@@ -340,7 +339,7 @@ public interface Tree {
*
* @param name The name of the property
*/
- void removeProperty(@Nonnull String name);
+ void removeProperty(@NotNull String name);
/**
* Empty array of trees.
Modified:
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/Type.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/Type.java?rev=1846005&r1=1846004&r2=1846005&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/Type.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/Type.java
Wed Nov 7 13:30:17 2018
@@ -22,9 +22,10 @@ import java.math.BigDecimal;
import java.util.HashMap;
import java.util.Map;
-import javax.annotation.Nonnull;
import javax.jcr.PropertyType;
+import org.jetbrains.annotations.NotNull;
+
/**
* Instances of this class map Java types to {@link PropertyType property
types}.
* Passing an instance of this class to {@link PropertyState#getValue(Type)}
determines
@@ -236,7 +237,7 @@ public final class Type<T> implements Co
//--------------------------------------------------------< Comparable >--
@Override
- public int compareTo(@Nonnull Type<?> that) {
+ public int compareTo(@NotNull Type<?> that) {
if (tag < that.tag) {
return -1;
}
Modified:
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/FileStoreBackupRestoreMBean.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/FileStoreBackupRestoreMBean.java?rev=1846005&r1=1846004&r2=1846005&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/FileStoreBackupRestoreMBean.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/FileStoreBackupRestoreMBean.java
Wed Nov 7 13:30:17 2018
@@ -19,9 +19,9 @@
package org.apache.jackrabbit.oak.api.jmx;
-import javax.annotation.Nonnull;
import javax.management.openmbean.CompositeData;
+import org.jetbrains.annotations.NotNull;
import org.osgi.annotation.versioning.ProviderType;
/**
@@ -38,7 +38,7 @@ public interface FileStoreBackupRestoreM
*
* @return the status of the operation right after it was initiated
*/
- @Nonnull
+ @NotNull
CompositeData startBackup();
/**
@@ -47,7 +47,7 @@ public interface FileStoreBackupRestoreM
* @return the status of the ongoing operation or if none the terminal
* status of the last operation or <em>Status not available</em> if none.
*/
- @Nonnull
+ @NotNull
CompositeData getBackupStatus();
/**
@@ -55,7 +55,7 @@ public interface FileStoreBackupRestoreM
*
* @return the status of the operation right after it was initiated
*/
- @Nonnull
+ @NotNull
CompositeData startRestore();
/**
@@ -64,7 +64,7 @@ public interface FileStoreBackupRestoreM
* @return the status of the ongoing operation or if none the terminal
* status of the last operation or <em>Status not available</em> if none.
*/
- @Nonnull
+ @NotNull
CompositeData getRestoreStatus();
/**
@@ -80,7 +80,7 @@ public interface FileStoreBackupRestoreM
* @deprecated Use {@link
org.apache.jackrabbit.oak.api.jmx.CheckpointMBean} instead
*/
@Deprecated
- @Nonnull
+ @NotNull
String checkpoint(long lifetime);
}
Modified:
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/RepositoryManagementMBean.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/RepositoryManagementMBean.java?rev=1846005&r1=1846004&r2=1846005&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/RepositoryManagementMBean.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/RepositoryManagementMBean.java
Wed Nov 7 13:30:17 2018
@@ -19,11 +19,11 @@
package org.apache.jackrabbit.oak.api.jmx;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
import javax.management.openmbean.CompositeData;
import javax.management.openmbean.TabularData;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
/**
@@ -102,7 +102,7 @@ public interface RepositoryManagementMBe
*
* @return the status of the operation right after it was initiated
*/
- @Nonnull
+ @NotNull
@Description("Creates a backup of the persistent state of the repository")
CompositeData startBackup();
@@ -112,7 +112,7 @@ public interface RepositoryManagementMBe
* @return the status of the ongoing operation or if none the terminal
* status of the last operation or <em>Status not available</em> if none.
*/
- @Nonnull
+ @NotNull
@Description("The status of the ongoing operation, or the terminal status
of the last completed backup operation")
CompositeData getBackupStatus();
@@ -121,7 +121,7 @@ public interface RepositoryManagementMBe
*
* @return the status of the operation right after it was initiated
*/
- @Nonnull
+ @NotNull
@Description("Restores the repository from a backup")
CompositeData startRestore();
@@ -131,7 +131,7 @@ public interface RepositoryManagementMBe
* @return the status of the ongoing operation or if none the terminal
* status of the last operation or <em>Status not available</em> if none.
*/
- @Nonnull
+ @NotNull
@Description("The status of the ongoing operation, or the terminal status
of the last completed restore operation")
CompositeData getRestoreStatus();
@@ -141,7 +141,7 @@ public interface RepositoryManagementMBe
* @param markOnly whether to only mark references and not sweep in the
mark and sweep operation.
* @return the status of the operation right after it was initiated
*/
- @Nonnull
+ @NotNull
@Description("Initiates a data store garbage collection operation")
CompositeData startDataStoreGC(@Name("markOnly")
@Description("Set to true to only mark references and not sweep in
the mark and sweep operation. " +
@@ -155,7 +155,7 @@ public interface RepositoryManagementMBe
* @return the status of the ongoing operation or if none the terminal
* status of the last operation or <em>Status not available</em> if none.
*/
- @Nonnull
+ @NotNull
@Description("Data store garbage collection status")
CompositeData getDataStoreGCStatus();
@@ -164,7 +164,7 @@ public interface RepositoryManagementMBe
*
* @return the status of the operation right after it was initiated
*/
- @Nonnull
+ @NotNull
@Description("Initiates a revision garbage collection operation")
CompositeData startRevisionGC();
@@ -173,7 +173,7 @@ public interface RepositoryManagementMBe
*
* @return the status of the operation right after it was initiated
*/
- @Nonnull
+ @NotNull
@Description("Initiates a revision garbage collection operation for a
given role")
CompositeData startRevisionGCForRole(String role);
@@ -183,7 +183,7 @@ public interface RepositoryManagementMBe
*
* @return the status of the operation right after it was initiated
*/
- @Nonnull
+ @NotNull
@Description("Cancel a running revision garbage collection operation. Does
nothing if revision garbage collection is not running.")
CompositeData cancelRevisionGC();
@@ -193,7 +193,7 @@ public interface RepositoryManagementMBe
*
* @return the status of the operation right after it was initiated
*/
- @Nonnull
+ @NotNull
@Description("Cancel a running revision garbage collection operation. Does
nothing if revision garbage collection is not running.")
CompositeData cancelRevisionGCForRole(String role);
@@ -203,7 +203,7 @@ public interface RepositoryManagementMBe
* @return the status of the ongoing operation or if none the terminal
* status of the last operation or <em>Status not available</em> if none.
*/
- @Nonnull
+ @NotNull
@Description("Revision garbage collection status")
CompositeData getRevisionGCStatus();
@@ -213,7 +213,7 @@ public interface RepositoryManagementMBe
* @return the status of the ongoing operation or if none the terminal
* status of the last operation or <em>Status not available</em> if none.
*/
- @Nonnull
+ @NotNull
@Description("Revision garbage collection status for a given role")
CompositeData getRevisionGCStatusForRole(String role);
@@ -231,7 +231,7 @@ public interface RepositoryManagementMBe
* @deprecated Use {@link CheckpointMBean} instead
*/
@Deprecated
- @CheckForNull
+ @Nullable
String checkpoint(long lifetime);
/**
@@ -240,7 +240,7 @@ public interface RepositoryManagementMBe
*
* @return the status of the operation right after it was initiated
*/
- @Nonnull
+ @NotNull
@Description("Initiates a reindex operation for the property indexes
marked for reindexing")
CompositeData startPropertyIndexAsyncReindex();
@@ -251,7 +251,7 @@ public interface RepositoryManagementMBe
* status of the last operation or <em>Status not available</em> if
* none.
*/
- @Nonnull
+ @NotNull
@Description("Asynchronous Property Index reindexing status")
CompositeData getPropertyIndexAsyncReindexStatus();
@@ -259,7 +259,7 @@ public interface RepositoryManagementMBe
* Refresh all currently open sessions.
* <em>Warning</em>: this operation might be disruptive to the owner of
the affected sessions
*/
- @Nonnull
+ @NotNull
@Description("Refresh all currently open sessions")
TabularData refreshAllSessions();
Modified:
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/package-info.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/package-info.java?rev=1846005&r1=1846004&r2=1846005&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/package-info.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/package-info.java
Wed Nov 7 13:30:17 2018
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-@Version("4.7.0")
+@Version("4.7.1")
package org.apache.jackrabbit.oak.api.jmx;
import org.osgi.annotation.versioning.Version;
Modified:
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/package-info.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/package-info.java?rev=1846005&r1=1846004&r2=1846005&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/package-info.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-api/src/main/java/org/apache/jackrabbit/oak/api/package-info.java
Wed Nov 7 13:30:17 2018
@@ -18,7 +18,7 @@
/**
* Oak repository API
*/
-@Version("3.1.1")
+@Version("3.1.2")
package org.apache.jackrabbit.oak.api;
import org.osgi.annotation.versioning.Version;
