svn commit: r1845994 - /jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CommitsTracker.java
Author: mduerig
Date: Wed Nov 7 09:15:42 2018
New Revision: 1845994
URL: http://svn.apache.org/viewvc?rev=1845994=rev
Log:
OAK-7885: Performance regression in FlatTreeUpdateTest
Break out early when purging the tracked commits.
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CommitsTracker.java
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CommitsTracker.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CommitsTracker.java?rev=1845994=1845993=1845994=diff
==
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CommitsTracker.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CommitsTracker.java
Wed Nov 7 09:15:42 2018
@@ -23,6 +23,7 @@ import static com.google.common.collect.
import static com.google.common.collect.Queues.newConcurrentLinkedQueue;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
import java.util.Queue;
import java.util.concurrent.ConcurrentHashMap;
@@ -83,7 +84,17 @@ class CommitsTracker {
public void trackExecutedCommitOf(Thread thread) {
long t = System.currentTimeMillis();
-commits.removeIf(c -> c.timeStamp < t - 6);
+final Iterator it = commits.iterator();
+
+// Purge the queue
+// Avoiding removeIf allows us to bail out early. See OAK-7885
+while (it.hasNext()) {
+if (it.next().timeStamp < t - 6) {
+it.remove();
+} else {
+break;
+}
+}
commits.offer(new Commit(t, thread.getName()));
}
svn commit: r1846006 [3/3] - in /jackrabbit/oak/branches/1.8: ./ oak-auth-external/ oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ oak-auth-external/sr
Modified:
jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContextTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContextTest.java?rev=1846006=1846005=1846006=diff
==
---
jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContextTest.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContextTest.java
Wed Nov 7 13:33:31 2018
@@ -19,8 +19,6 @@ package org.apache.jackrabbit.oak.spi.se
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
import javax.jcr.ValueFactory;
@@ -50,6 +48,8 @@ import org.apache.jackrabbit.oak.spi.sec
import
org.apache.jackrabbit.oak.spi.security.authentication.external.TestIdentityProvider;
import
org.apache.jackrabbit.oak.spi.security.authentication.external.basic.DefaultSyncConfig;
import
org.apache.jackrabbit.oak.spi.security.authentication.external.basic.DefaultSyncContext;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -96,13 +96,13 @@ public class DynamicSyncContextTest exte
return sc;
}
-private void sync(@Nonnull ExternalIdentity externalIdentity, @Nonnull
SyncResult.Status expectedStatus) throws Exception {
+private void sync(@NotNull ExternalIdentity externalIdentity, @NotNull
SyncResult.Status expectedStatus) throws Exception {
SyncResult result = syncContext.sync(externalIdentity);
assertSame(expectedStatus, result.getStatus());
r.commit();
}
-private void assertDynamicMembership(@Nonnull Authorizable a, @Nonnull
ExternalIdentity externalIdentity, long depth) throws Exception {
+private void assertDynamicMembership(@NotNull Authorizable a, @NotNull
ExternalIdentity externalIdentity, long depth) throws Exception {
Value[] vs =
a.getProperty(ExternalIdentityConstants.REP_EXTERNAL_PRINCIPAL_NAMES);
Iterable pNames =
Iterables.transform(ImmutableList.copyOf(vs), new Function() {
@Nullable
@@ -123,7 +123,7 @@ public class DynamicSyncContextTest exte
assertEquals(expected, ImmutableSet.copyOf(pNames));
}
-private void collectGroupPrincipals(Set pNames, @Nonnull
Iterable declaredGroups, long depth) throws
ExternalIdentityException {
+private void collectGroupPrincipals(Set pNames, @NotNull
Iterable declaredGroups, long depth) throws
ExternalIdentityException {
if (depth <= 0) {
return;
}
@@ -134,9 +134,9 @@ public class DynamicSyncContextTest exte
}
}
-private static void assertSyncedMembership(@Nonnull UserManager
userManager,
- @Nonnull Authorizable a,
- @Nonnull ExternalIdentity
externalIdentity) throws Exception {
+private static void assertSyncedMembership(@NotNull UserManager
userManager,
+ @NotNull Authorizable a,
+ @NotNull ExternalIdentity
externalIdentity) throws Exception {
for (ExternalIdentityRef ref : externalIdentity.getDeclaredGroups()) {
Group gr = userManager.getAuthorizable(ref.getId(), Group.class);
assertNotNull(gr);
@@ -439,7 +439,7 @@ public class DynamicSyncContextTest exte
private Iterable declaredGroupRefs;
-private TestUserWithGroupRefs(@Nonnull ExternalUser base, @Nonnull
Iterable declaredGroupRefs) {
+private TestUserWithGroupRefs(@NotNull ExternalUser base, @NotNull
Iterable declaredGroupRefs) {
super(base);
this.declaredGroupRefs = declaredGroupRefs;
}
@@ -448,10 +448,10 @@ public class DynamicSyncContextTest exte
return "";
}
-@Nonnull
+@NotNull
@Override
public Iterable getDeclaredGroups() {
return declaredGroupRefs;
}
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/PrincipalResolutionTest.java
URL:
svn commit: r1846006 [1/3] - in /jackrabbit/oak/branches/1.8: ./ oak-auth-external/ oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ oak-auth-external/sr
Author: reschke Date: Wed Nov 7 13:33:31 2018 New Revision: 1846006 URL: http://svn.apache.org/viewvc?rev=1846006=rev Log: OAK-7669: backport of: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-auth-external Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-auth-external/pom.xml jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalGroup.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalGroupRef.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalIdentity.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalIdentityProvider.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalIdentityProviderManager.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalIdentityRef.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/PrincipalNameResolver.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/SyncContext.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/SyncHandler.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/SyncManager.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/SyncResult.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/SyncedIdentity.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncConfig.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContext.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncResultImpl.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncedIdentity.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/package-info.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncConfigImpl.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandler.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContext.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalIDPManagerImpl.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/SyncManagerImpl.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImpl.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncRuntimeException.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SynchronizationMBean.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityImporter.java
svn commit: r1846006 [2/3] - in /jackrabbit/oak/branches/1.8: ./ oak-auth-external/ oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ oak-auth-external/sr
Modified:
jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java?rev=1846006=1846005=1846006=diff
==
---
jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java
Wed Nov 7 13:33:31 2018
@@ -23,9 +23,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.NoSuchWorkspaceException;
import javax.jcr.RepositoryException;
import javax.security.auth.Subject;
@@ -57,6 +54,8 @@ import org.apache.jackrabbit.oak.spi.sec
import
org.apache.jackrabbit.oak.spi.security.authentication.external.basic.DefaultSyncResultImpl;
import
org.apache.jackrabbit.oak.spi.security.authentication.external.basic.DefaultSyncedIdentity;
import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -81,8 +80,8 @@ final class Delegatee {
private SyncContext context;
-private Delegatee(@Nonnull SyncHandler handler, @Nonnull
ExternalIdentityProvider idp,
- @Nonnull ContentSession systemSession, @Nonnull
SecurityProvider securityProvider, int batchSize) throws SyncException {
+private Delegatee(@NotNull SyncHandler handler, @NotNull
ExternalIdentityProvider idp,
+ @NotNull ContentSession systemSession, @NotNull
SecurityProvider securityProvider, int batchSize) throws SyncException {
this.handler = handler;
this.idp = idp;
@@ -96,15 +95,15 @@ final class Delegatee {
log.info("Created delegatee for SyncMBean with session: {} {}",
systemSession, systemSession.getAuthInfo().getUserID());
}
-static Delegatee createInstance(@Nonnull ContentRepository repository,
@Nonnull SecurityProvider securityProvider,
-@Nonnull SyncHandler handler, @Nonnull
ExternalIdentityProvider idp) {
+static Delegatee createInstance(@NotNull ContentRepository repository,
@NotNull SecurityProvider securityProvider,
+@NotNull SyncHandler handler, @NotNull
ExternalIdentityProvider idp) {
return createInstance(repository, securityProvider, handler, idp,
DEFAULT_BATCH_SIZE);
}
-static Delegatee createInstance(@Nonnull final ContentRepository
repository,
-@Nonnull SecurityProvider securityProvider,
-@Nonnull SyncHandler handler,
-@Nonnull ExternalIdentityProvider idp,
+static Delegatee createInstance(@NotNull final ContentRepository
repository,
+@NotNull SecurityProvider securityProvider,
+@NotNull SyncHandler handler,
+@NotNull ExternalIdentityProvider idp,
int batchSize) {
ContentSession systemSession;
try {
@@ -126,7 +125,7 @@ final class Delegatee {
}
}
-private static void close(@Nonnull ContentSession systemSession) {
+private static void close(@NotNull ContentSession systemSession) {
try {
systemSession.close();
} catch (IOException e) {
@@ -145,8 +144,8 @@ final class Delegatee {
/**
* @see SynchronizationMBean#syncUsers(String[], boolean)
*/
-@Nonnull
-String[] syncUsers(@Nonnull String[] userIds, boolean purge) {
+@NotNull
+String[] syncUsers(@NotNull String[] userIds, boolean purge) {
context.setKeepMissing(!purge)
.setForceGroupSync(true)
.setForceUserSync(true);
@@ -163,7 +162,7 @@ final class Delegatee {
/**
* @see SynchronizationMBean#syncAllUsers(boolean)
*/
-@Nonnull
+@NotNull
String[] syncAllUsers(boolean purge) {
try {
List list = new ArrayList();
@@ -189,8 +188,8 @@ final class Delegatee {
/**
* @see SynchronizationMBean#syncExternalUsers(String[])
*/
-@Nonnull
-String[] syncExternalUsers(@Nonnull String[] externalIds) {
+@NotNull
+String[] syncExternalUsers(@NotNull String[] externalIds) {
List list = new ArrayList();
svn commit: r1846012 - in /jackrabbit/oak/branches/1.8: ./ oak-blob-plugins/ oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/ oak-blob-plugins/src/main/java/org/apache/jackrabbit
Author: reschke Date: Wed Nov 7 13:45:01 2018 New Revision: 1846012 URL: http://svn.apache.org/viewvc?rev=1846012=rev Log: OAK-7669: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-blob-plugins Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-blob-plugins/pom.xml jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/AbstractSharedCachingDataStore.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGC.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCMBean.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobStoreBlob.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobStoreStats.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CompositeDataStoreCache.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/ReferenceCollector.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCache.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTracker.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/FSBackend.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/SharedDataStoreUtils.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/TextWriter.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/migration/BlobMigration.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/migration/BlobMigrationMBean.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/serializer/FSBlobSerializer.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/AbstractBlobTrackerRegistrationTest.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/AbstractDataStoreCacheTest.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCTest.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/SharedDataStoreUtilsTest.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStoreTest.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/OakFileDataStoreTest.java jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/serializer/FSBlobSerializerTest.java Propchange: jackrabbit/oak/branches/1.8/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 7 13:45:01 2018 @@ -1,3 +1,3 @@ /jackrabbit/oak/branches/1.0:1665962
svn commit: r1846014 [5/14] - in /jackrabbit/oak/branches/1.8: ./ oak-core/ oak-core/src/main/java/org/apache/jackrabbit/oak/ oak-core/src/main/java/org/apache/jackrabbit/oak/core/ oak-core/src/main/j
Modified:
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathFilter.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathFilter.java?rev=1846014=1846013=1846014=diff
==
---
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathFilter.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathFilter.java
Wed Nov 7 13:57:55 2018
@@ -29,13 +29,12 @@ import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
-import javax.annotation.Nonnull;
-
import com.google.common.base.Joiner;
import com.google.common.collect.Iterators;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
/**
* This {@code Filter} implementation supports filtering on paths using
@@ -74,7 +73,7 @@ public class GlobbingPathFilter implemen
private final List pattern;
private final Map patternMap;
-private GlobbingPathFilter(@Nonnull List pattern, Map patternMap) {
+private GlobbingPathFilter(@NotNull List pattern, Map patternMap) {
// OAK-5589 : for internal constructor case don't copy the pattern,
refer to the same one
// this will work fine given the public constructors make a copy and
internally we're
// never fiddling with the pattern list
@@ -82,7 +81,7 @@ public class GlobbingPathFilter implemen
this.patternMap = checkNotNull(patternMap);
}
-public GlobbingPathFilter(@Nonnull String pattern, Map
patternMap) {
+public GlobbingPathFilter(@NotNull String pattern, Map
patternMap) {
// OAK-5589 : use the fastest way to create a List based on an unknown
deep pattern
this.pattern = new ArrayList(10);
Iterators.addAll(this.pattern,
elements(checkNotNull(pattern)).iterator());
@@ -90,7 +89,7 @@ public class GlobbingPathFilter implemen
}
/** for testing only - use variant which passes the patternMap for
productive code **/
-public GlobbingPathFilter(@Nonnull String pattern) {
+public GlobbingPathFilter(@NotNull String pattern) {
this(pattern, new HashMap());
}
Modified:
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PermissionProviderFactory.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PermissionProviderFactory.java?rev=1846014=1846013=1846014=diff
==
---
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PermissionProviderFactory.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PermissionProviderFactory.java
Wed Nov 7 13:57:55 2018
@@ -19,10 +19,9 @@
package org.apache.jackrabbit.oak.plugins.observation.filter;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.Root;
import
org.apache.jackrabbit.oak.spi.security.authorization.permission.PermissionProvider;
+import org.jetbrains.annotations.NotNull;
/**
* Factory for {@link PermissionProvider} instances.
@@ -33,6 +32,6 @@ public interface PermissionProviderFacto
* Create a new {@code PermissionProvider} instance.
* @return
*/
-@Nonnull
+@NotNull
PermissionProvider create(Root root);
}
Modified:
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PropertyPredicate.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PropertyPredicate.java?rev=1846014=1846013=1846014=diff
==
---
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PropertyPredicate.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PropertyPredicate.java
Wed Nov 7 13:57:55 2018
@@ -21,11 +21,10 @@ package org.apache.jackrabbit.oak.plugin
import static com.google.common.base.Preconditions.checkNotNull;
-import javax.annotation.Nonnull;
-
import com.google.common.base.Predicate;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
/**
* Predicate on property values. This property holds if and only if
@@ -41,7
svn commit: r1846014 [14/14] - in /jackrabbit/oak/branches/1.8: ./ oak-core/ oak-core/src/main/java/org/apache/jackrabbit/oak/ oak-core/src/main/java/org/apache/jackrabbit/oak/core/ oak-core/src/main/
Modified:
jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserAuthenticationTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserAuthenticationTest.java?rev=1846014=1846013=1846014=diff
==
---
jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserAuthenticationTest.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserAuthenticationTest.java
Wed Nov 7 13:57:55 2018
@@ -20,7 +20,6 @@ import java.security.Principal;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
-import javax.annotation.Nonnull;
import javax.jcr.Credentials;
import javax.jcr.GuestCredentials;
import javax.jcr.SimpleCredentials;
@@ -36,6 +35,7 @@ import org.apache.jackrabbit.oak.Abstrac
import org.apache.jackrabbit.oak.api.AuthInfo;
import org.apache.jackrabbit.oak.spi.security.authentication.Authentication;
import
org.apache.jackrabbit.oak.spi.security.authentication.ImpersonationCredentials;
+import org.jetbrains.annotations.NotNull;
import org.junit.Before;
import org.junit.Test;
@@ -230,7 +230,7 @@ public class UserAuthenticationTest exte
public String getUserID() {
return userId;
}
-@Nonnull
+@NotNull
@Override
public String[] getAttributeNames() {
return new String[0];
@@ -239,10 +239,10 @@ public class UserAuthenticationTest exte
public Object getAttribute(String attributeName) {
return null;
}
-@Nonnull
+@NotNull
@Override
public Set getPrincipals() {
return null;
}
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserContextTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserContextTest.java?rev=1846014=1846013=1846014=diff
==
---
jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserContextTest.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserContextTest.java
Wed Nov 7 13:57:55 2018
@@ -20,8 +20,6 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
@@ -39,6 +37,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.tree.TreeProvider;
import org.apache.jackrabbit.oak.spi.security.Context;
import org.apache.jackrabbit.oak.spi.security.user.UserConstants;
+import org.jetbrains.annotations.NotNull;
import org.junit.Test;
import org.mockito.Mockito;
@@ -51,7 +50,7 @@ public class UserContextTest implements
private final Context ctx = UserContext.getInstance();
-private static Tree mockTree(@Nonnull String name, @Nonnull String ntName)
{
+private static Tree mockTree(@NotNull String name, @NotNull String ntName)
{
Tree t = Mockito.mock(Tree.class);
when(t.getName()).thenReturn(name);
when(t.getProperty(JcrConstants.JCR_PRIMARYTYPE)).thenReturn(PropertyStates.createProperty(JcrConstants.JCR_PRIMARYTYPE,
ntName, Type.NAME));
@@ -306,4 +305,4 @@ public class UserContextTest implements
assertFalse(ctx.definesInternal(mockTree("anyName", ntName)));
}
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserImporterBaseTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserImporterBaseTest.java?rev=1846014=1846013=1846014=diff
==
---
jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserImporterBaseTest.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserImporterBaseTest.java
Wed Nov 7 13:57:55 2018
@@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.securi
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nonnull;
import javax.jcr.ImportUUIDBehavior;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
@@ -54,6 +53,7 @@ import org.apache.jackrabbit.oak.spi.xml
import
svn commit: r1846014 [13/14] - in /jackrabbit/oak/branches/1.8: ./ oak-core/ oak-core/src/main/java/org/apache/jackrabbit/oak/ oak-core/src/main/java/org/apache/jackrabbit/oak/core/ oak-core/src/main/
Modified:
jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/LimitedScopeProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/LimitedScopeProvider.java?rev=1846014=1846013=1846014=diff
==
---
jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/LimitedScopeProvider.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/LimitedScopeProvider.java
Wed Nov 7 13:57:55 2018
@@ -17,9 +17,6 @@
package org.apache.jackrabbit.oak.security.authorization.composite;
import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -34,6 +31,8 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.util.Text;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Test implementation of the {@code AggregatedPermissionProvider} with
following
@@ -65,12 +64,12 @@ class LimitedScopeProvider extends Abstr
private static final long GRANTED_PERMS = Permissions.REMOVE_NODE |
Permissions.REMOVE_PROPERTY | Permissions.MODIFY_PROPERTY;
private static final long DENIED_PERMS = Permissions.ADD_NODE |
Permissions.ADD_PROPERTY;
-LimitedScopeProvider(@Nonnull Root root) {
+LimitedScopeProvider(@NotNull Root root) {
super(root);
}
//-< PermissionProvider
>---
-@Nonnull
+@NotNull
@Override
public Set getPrivileges(@Nullable Tree tree) {
if (tree == null) {
@@ -83,7 +82,7 @@ class LimitedScopeProvider extends Abstr
}
@Override
-public boolean hasPrivileges(@Nullable Tree tree, @Nonnull String...
privilegeNames) {
+public boolean hasPrivileges(@Nullable Tree tree, @NotNull String...
privilegeNames) {
Set pSet = Sets.newHashSet(privilegeNames);
if (tree == null) {
if (pSet.contains(JCR_NAMESPACE_MANAGEMENT)) {
@@ -102,7 +101,7 @@ class LimitedScopeProvider extends Abstr
return false;
}
-@Nonnull
+@NotNull
@Override
public RepositoryPermission getRepositoryPermission() {
return new RepositoryPermission() {
@@ -113,14 +112,14 @@ class LimitedScopeProvider extends Abstr
};
}
-@Nonnull
+@NotNull
@Override
-public TreePermission getTreePermission(@Nonnull Tree tree, @Nonnull
TreePermission parentPermission) {
+public TreePermission getTreePermission(@NotNull Tree tree, @NotNull
TreePermission parentPermission) {
return createTreePermission(tree.getPath());
}
@Override
-public boolean isGranted(@Nonnull Tree tree, @Nullable PropertyState
property, long permissions) {
+public boolean isGranted(@NotNull Tree tree, @Nullable PropertyState
property, long permissions) {
if (isSupported(tree)) {
if (Permissions.includes(permissions, DENIED_PERMS)) {
return false;
@@ -133,7 +132,7 @@ class LimitedScopeProvider extends Abstr
}
@Override
-public boolean isGranted(@Nonnull String oakPath, @Nonnull String
jcrActions) {
+public boolean isGranted(@NotNull String oakPath, @NotNull String
jcrActions) {
if (isSupported(oakPath)) {
Tree tree = root.getTree(oakPath);
long perms = Permissions.getPermissions(jcrActions,
TreeLocation.create(tree), false);
@@ -148,7 +147,7 @@ class LimitedScopeProvider extends Abstr
}
//---< AggregatedPermissionProvider
>---
-@Nonnull
+@NotNull
@Override
public PrivilegeBits supportedPrivileges(@Nullable Tree tree, @Nullable
PrivilegeBits privilegeBits) {
PrivilegeBits supported;
@@ -181,7 +180,7 @@ class LimitedScopeProvider extends Abstr
}
@Override
-public long supportedPermissions(@Nonnull TreeLocation location, long
permissions) {
+public long supportedPermissions(@NotNull TreeLocation location, long
permissions) {
if (isSupported(location.getPath())) {
return permissions & Permissions.WRITE;
} else {
@@ -190,7 +189,7 @@ class LimitedScopeProvider extends Abstr
}
@Override
-public long supportedPermissions(@Nonnull TreePermission treePermission,
@Nullable PropertyState property, long permissions) {
+public long supportedPermissions(@NotNull TreePermission treePermission,
svn commit: r1846014 [12/14] - in /jackrabbit/oak/branches/1.8: ./ oak-core/ oak-core/src/main/java/org/apache/jackrabbit/oak/ oak-core/src/main/java/org/apache/jackrabbit/oak/core/ oak-core/src/main/
Modified:
jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/query/ast/AndImplTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/query/ast/AndImplTest.java?rev=1846014=1846013=1846014=diff
==
---
jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/query/ast/AndImplTest.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/query/ast/AndImplTest.java
Wed Nov 7 13:57:55 2018
@@ -26,8 +26,7 @@ import static org.mockito.Mockito.when;
import java.util.Set;
-import javax.annotation.Nonnull;
-
+import org.jetbrains.annotations.NotNull;
import org.junit.Test;
public class AndImplTest {
@@ -72,8 +71,8 @@ public class AndImplTest {
* @param clazz the class you want Mockito to generate for you.
* @return a Mockito instance of the provided ConstraintImpl
*/
-private static ConstraintImpl mockConstraint(@Nonnull String toString,
- @Nonnull Class clazz) {
+private static ConstraintImpl mockConstraint(@NotNull String toString,
+ @NotNull Class clazz) {
ConstraintImpl c = mock(checkNotNull(clazz));
when(c.toString()).thenReturn(checkNotNull(toString));
return c;
Modified:
jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/IndexSelectionTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/IndexSelectionTest.java?rev=1846014=1846013=1846014=diff
==
---
jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/IndexSelectionTest.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/IndexSelectionTest.java
Wed Nov 7 13:57:55 2018
@@ -22,8 +22,6 @@ package org.apache.jackrabbit.oak.query.
import java.util.List;
import java.util.UUID;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.ImmutableList;
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.oak.Oak;
@@ -40,6 +38,7 @@ import org.apache.jackrabbit.oak.spi.que
import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.util.NodeUtil;
+import org.jetbrains.annotations.NotNull;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -99,7 +98,7 @@ public class IndexSelectionTest extends
private static class TestIndexProvider implements QueryIndexProvider {
TestIndex index = new TestIndex();
-@Nonnull
+@NotNull
@Override
public List getQueryIndexes(NodeState nodeState)
{
return ImmutableList.of(index);
@@ -134,4 +133,4 @@ public class IndexSelectionTest extends
return "test-index";
}
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/TraversingIndexQueryTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/TraversingIndexQueryTest.java?rev=1846014=1846013=1846014=diff
==
---
jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/TraversingIndexQueryTest.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/TraversingIndexQueryTest.java
Wed Nov 7 13:57:55 2018
@@ -24,9 +24,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.ContentRepository;
@@ -35,6 +32,8 @@ import org.apache.jackrabbit.oak.api.Typ
import org.apache.jackrabbit.oak.InitialContent;
import org.apache.jackrabbit.oak.query.AbstractQueryTest;
import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.Ignore;
import org.junit.Test;
@@ -439,8 +438,8 @@ public class TraversingIndexQueryTest ex
* @param value
* @return
*/
-private static Tree addNtUnstructuredChild(@Nonnull final Tree parent,
- @Nonnull final String name,
+private static Tree addNtUnstructuredChild(@NotNull final Tree parent,
+
svn commit: r1846014 [6/14] - in /jackrabbit/oak/branches/1.8: ./ oak-core/ oak-core/src/main/java/org/apache/jackrabbit/oak/ oak-core/src/main/java/org/apache/jackrabbit/oak/core/ oak-core/src/main/j
Modified:
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ExecutionContext.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ExecutionContext.java?rev=1846014=1846013=1846014=diff
==
---
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ExecutionContext.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ExecutionContext.java
Wed Nov 7 13:57:55 2018
@@ -19,14 +19,13 @@
package org.apache.jackrabbit.oak.query;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.query.ast.NodeTypeInfoProvider;
import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider;
import
org.apache.jackrabbit.oak.spi.security.authorization.permission.PermissionProvider;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* An instance of this class provides the context for the execution of a query,
@@ -65,7 +64,7 @@ public class ExecutionContext {
*
* @return base state of the content tree against which the query runs.
*/
-@Nonnull
+@NotNull
public NodeState getBaseState() {
return baseState;
}
@@ -85,7 +84,7 @@ public class ExecutionContext {
*
* @return root of the content tree against which the query runs.
*/
-@Nonnull
+@NotNull
public Root getRoot() {
return root;
}
@@ -94,7 +93,7 @@ public class ExecutionContext {
* @return Index provider for indexes matching the state of the content
tree as
* returned from {@link #getBaseState()}.
*/
-@Nonnull
+@NotNull
public QueryIndexProvider getIndexProvider() {
return indexProvider;
}
@@ -103,7 +102,7 @@ public class ExecutionContext {
return settings;
}
-@CheckForNull
+@Nullable
public PermissionProvider getPermissionProvider() {
return permissionProvider;
}
Modified:
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/Query.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/Query.java?rev=1846014=1846013=1846014=diff
==
---
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/Query.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/Query.java
Wed Nov 7 13:57:55 2018
@@ -16,9 +16,8 @@ package org.apache.jackrabbit.oak.query;
import java.util.Iterator;
import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
import org.apache.jackrabbit.oak.api.PropertyValue;
@@ -139,7 +138,7 @@ public interface Query {
* @return {@code this} if no conversions are possible or a new instance of
* a {@link Query}. Cannot return null.
*/
-@Nonnull
+@NotNull
Query buildAlternativeQuery();
/**
Modified:
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineImpl.java?rev=1846014=1846013=1846014=diff
==
---
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineImpl.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineImpl.java
Wed Nov 7 13:57:55 2018
@@ -27,8 +27,6 @@ import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.PropertyValue;
import org.apache.jackrabbit.oak.api.QueryEngine;
import org.apache.jackrabbit.oak.api.Result;
@@ -38,6 +36,7 @@ import org.apache.jackrabbit.oak.namepat
import org.apache.jackrabbit.oak.query.ast.NodeTypeInfoProvider;
import
org.apache.jackrabbit.oak.query.stats.QueryStatsData.QueryExecutionStats;
import org.apache.jackrabbit.oak.query.xpath.XPathToSQL2Converter;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.MDC;
@@ -293,8 +292,8 @@ public abstract class QueryEngineImpl im
* If there are multiple, the first one is the original, and the
second the alternative.
*
svn commit: r1846014 [4/14] - in /jackrabbit/oak/branches/1.8: ./ oak-core/ oak-core/src/main/java/org/apache/jackrabbit/oak/ oak-core/src/main/java/org/apache/jackrabbit/oak/core/ oak-core/src/main/j
Modified:
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeTypeImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeTypeImpl.java?rev=1846014=1846013=1846014=diff
==
---
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeTypeImpl.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeTypeImpl.java
Wed Nov 7 13:57:55 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 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 getNamedPropertyDefinitions(
String oakName) {
List definitions = newArrayList();
@@ -253,7 +253,7 @@ class EffectiveNodeTypeImpl implements E
* @return All residual node definitions.
*/
@Override
-@Nonnull
+@NotNull
public Iterable getResidualNodeDefinitions() {
List 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 getResidualPropertyDefinitions() {
List definitions = newArrayList();
for (NodeTypeImpl type : nodeTypes.values()) {
Modified:
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java?rev=1846014=1846013=1846014=diff
==
---
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java
Wed Nov 7 13:57:55 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 types;
-EffectiveType(@Nonnull List types) {
+EffectiveType(@NotNull List 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 getMandatoryProperties() {
return getNameSet(REP_MANDATORY_PROPERTIES);
}
-boolean isMandatoryChildNode(@Nonnull String name) {
+boolean
svn commit: r1846014 [2/14] - in /jackrabbit/oak/branches/1.8: ./ oak-core/ oak-core/src/main/java/org/apache/jackrabbit/oak/ oak-core/src/main/java/org/apache/jackrabbit/oak/core/ oak-core/src/main/j
Modified:
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeBuilder.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeBuilder.java?rev=1846014=1846013=1846014=diff
==
---
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeBuilder.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeBuilder.java
Wed Nov 7 13:57:55 2018
@@ -18,10 +18,6 @@ package org.apache.jackrabbit.oak.core;
import java.io.IOException;
import java.io.InputStream;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import com.google.common.base.Predicate;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -33,6 +29,8 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStateUtils;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
@@ -95,8 +93,8 @@ class SecureNodeBuilder implements NodeB
* @param permissionProvider The {@code PermissionProvider} used to
evaluation read access.
*/
SecureNodeBuilder(
-@Nonnull NodeBuilder builder,
-@Nonnull LazyValue permissionProvider) {
+@NotNull NodeBuilder builder,
+@NotNull LazyValue permissionProvider) {
this.rootBuilder = this;
this.parent = null;
this.name = null;
@@ -112,12 +110,12 @@ class SecureNodeBuilder implements NodeB
this.builder = parent.builder.getChildNode(name);
}
-@Override @Nonnull
+@Override @NotNull
public NodeState getBaseState() {
return new SecureNodeState(builder.getBaseState(),
getTreePermission());
}
-@Override @Nonnull
+@Override @NotNull
public NodeState getNodeState() {
return new SecureNodeState(builder.getNodeState(),
getTreePermission());
}
@@ -169,11 +167,11 @@ class SecureNodeBuilder implements NodeB
@Override
-public boolean moveTo(@Nonnull NodeBuilder newParent, @Nonnull String
newName) {
+public boolean moveTo(@NotNull NodeBuilder newParent, @NotNull String
newName) {
return exists() && builder.moveTo(newParent, newName);
}
-@CheckForNull
+@Nullable
@Override
public PropertyState getProperty(String name) {
PropertyState property = builder.getProperty(name);
@@ -200,7 +198,7 @@ class SecureNodeBuilder implements NodeB
}
}
-@Nonnull
+@NotNull
@Override
public Iterable getProperties() {
if (getTreePermission().canReadProperties() || isNew()) {
@@ -213,14 +211,14 @@ class SecureNodeBuilder implements NodeB
}
@Override
-public boolean getBoolean(@Nonnull String name) {
+public boolean getBoolean(@NotNull String name) {
PropertyState property = getProperty(name);
return isType(property, BOOLEAN) && property.getValue(BOOLEAN);
}
-@CheckForNull
+@Nullable
@Override
-public String getString(@Nonnull String name) {
+public String getString(@NotNull String name) {
PropertyState property = getProperty(name);
if (isType(property, STRING)) {
return property.getValue(STRING);
@@ -229,9 +227,9 @@ class SecureNodeBuilder implements NodeB
}
}
-@CheckForNull
+@Nullable
@Override
-public String getName(@Nonnull String name) {
+public String getName(@NotNull String name) {
PropertyState property = getProperty(name);
if (isType(property, NAME)) {
return property.getValue(NAME);
@@ -240,9 +238,9 @@ class SecureNodeBuilder implements NodeB
}
}
-@Nonnull
+@NotNull
@Override
-public Iterable getNames(@Nonnull String name) {
+public Iterable getNames(@NotNull String name) {
PropertyState property = getProperty(name);
if (isType(property, NAMES)) {
return property.getValue(NAMES);
@@ -251,29 +249,29 @@ class SecureNodeBuilder implements NodeB
}
}
-@Nonnull
+@NotNull
@Override
-public NodeBuilder setProperty(@Nonnull PropertyState property) {
+public NodeBuilder setProperty(@NotNull PropertyState property) {
builder.setProperty(property);
return this;
}
-@Nonnull
+@NotNull
@Override
-public NodeBuilder setProperty(String name, @Nonnull T value) {
+public NodeBuilder setProperty(String name,
svn commit: r1846014 [10/14] - in /jackrabbit/oak/branches/1.8: ./ oak-core/ oak-core/src/main/java/org/apache/jackrabbit/oak/ oak-core/src/main/java/org/apache/jackrabbit/oak/core/ oak-core/src/main/
Modified:
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipProvider.java?rev=1846014=1846013=1846014=diff
==
---
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipProvider.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipProvider.java
Wed Nov 7 13:57:55 2018
@@ -22,8 +22,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
import javax.jcr.RepositoryException;
import com.google.common.collect.Iterators;
@@ -35,6 +33,8 @@ import org.apache.jackrabbit.oak.api.Typ
import org.apache.jackrabbit.oak.plugins.memory.PropertyValues;
import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
import org.apache.jackrabbit.oak.spi.security.user.AuthorizableType;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -114,7 +114,7 @@ class MembershipProvider extends Authori
* @param root the current root
* @param config the security configuration
*/
-MembershipProvider(@Nonnull Root root, @Nonnull ConfigurationParameters
config) {
+MembershipProvider(@NotNull Root root, @NotNull ConfigurationParameters
config) {
super(root, config);
}
@@ -133,8 +133,8 @@ class MembershipProvider extends Authori
* @param includeInherited {@code true} to include inherited memberships
* @return an iterator over all membership paths.
*/
-@Nonnull
-Iterator getMembership(@Nonnull Tree authorizableTree, final
boolean includeInherited) {
+@NotNull
+Iterator getMembership(@NotNull Tree authorizableTree, final
boolean includeInherited) {
return getMembership(authorizableTree, includeInherited, new
HashSet());
}
@@ -146,16 +146,16 @@ class MembershipProvider extends Authori
* @param processedPaths helper set that contains the processed paths
* @return an iterator over all membership paths.
*/
-@Nonnull
-private Iterator getMembership(@Nonnull Tree authorizableTree,
final boolean includeInherited,
- @Nonnull final Set
processedPaths) {
+@NotNull
+private Iterator getMembership(@NotNull Tree authorizableTree,
final boolean includeInherited,
+ @NotNull final Set
processedPaths) {
final Iterable refPaths = identifierManager.getReferences(
authorizableTree, REP_MEMBERS, NT_REP_MEMBER_REFERENCES, true
);
return new AbstractMemberIterator(refPaths.iterator()) {
@Override
-protected String internalGetNext(@Nonnull String propPath) {
+protected String internalGetNext(@NotNull String propPath) {
String next = null;
String groupPath = getGroupPath(propPath);
@@ -177,14 +177,14 @@ class MembershipProvider extends Authori
return next;
}
-@Nonnull
+@NotNull
@Override
-protected Iterator getNextIterator(@Nonnull Tree
groupTree) {
+protected Iterator getNextIterator(@NotNull Tree
groupTree) {
return getMembership(groupTree, true, processedPaths);
}
-@CheckForNull
-private String getGroupPath(@Nonnull String membersPropPath) {
+@Nullable
+private String getGroupPath(@NotNull String membersPropPath) {
int index = membersPropPath.indexOf('/' + REP_MEMBERS_LIST);
if (index < 0) {
index = membersPropPath.indexOf('/' + REP_MEMBERS);
@@ -207,7 +207,7 @@ class MembershipProvider extends Authori
* @param groupPath The path of the group which needs to be tested.
* @return {@code true} if the group is contained in the membership of the
specified authorizable.
*/
-private boolean hasMembership(@Nonnull Tree authorizableTree, @Nonnull
String groupPath) {
+private boolean hasMembership(@NotNull Tree authorizableTree, @NotNull
String groupPath) {
return Iterators.contains(getMembership(authorizableTree, true),
groupPath);
}
@@ -218,8 +218,8 @@ class MembershipProvider extends Authori
* @param includeInherited {@code true} to include inherited members
* @return an iterator over all member paths
*/
-@Nonnull
-Iterator getMembers(@Nonnull Tree groupTree, boolean
includeInherited) {
+@NotNull
+Iterator
svn commit: r1846014 [1/14] - in /jackrabbit/oak/branches/1.8: ./ oak-core/ oak-core/src/main/java/org/apache/jackrabbit/oak/ oak-core/src/main/java/org/apache/jackrabbit/oak/core/ oak-core/src/main/j
Author: reschke Date: Wed Nov 7 13:57:55 2018 New Revision: 1846014 URL: http://svn.apache.org/viewvc?rev=1846014=rev Log: OAK-7669: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-core Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-core/pom.xml jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/InitialContent.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/OakInitializer.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/OakVersion.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentRepositoryImpl.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentSessionImpl.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ImmutableRoot.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableRoot.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableTree.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeBuilder.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeState.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SystemRoot.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/management/RepositoryManager.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/impl/GlobalNameMapper.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/impl/LocalNameMapper.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/impl/NamePathMapperImpl.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditor.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditorProvider.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/ConflictHook.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/DefaultThreeWayConflictHandler.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/JcrLastModifiedConflictHandler.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/cow/BranchNodeStore.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/cow/COWNodeStore.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexInfo.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexInfoService.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/CompositeIndexEditorProvider.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/Cursors.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexEditorProvider.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexInfo.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexInfoProvider.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexInfoService.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateProvider.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUtils.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/WhiteboardIndexEditorProvider.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/AggregateIndexPlan.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/AggregateIndexProvider.java jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/counter/NodeCounterEditor.java
svn commit: r1846014 [9/14] - in /jackrabbit/oak/branches/1.8: ./ oak-core/ oak-core/src/main/java/org/apache/jackrabbit/oak/ oak-core/src/main/java/org/apache/jackrabbit/oak/core/ oak-core/src/main/j
Modified:
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/ConfigurationInitializer.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/ConfigurationInitializer.java?rev=1846014=1846013=1846014=diff
==
---
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/ConfigurationInitializer.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/ConfigurationInitializer.java
Wed Nov 7 13:57:55 2018
@@ -17,8 +17,6 @@
package org.apache.jackrabbit.oak.security.internal;
import java.util.List;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.plugins.tree.RootProvider;
import org.apache.jackrabbit.oak.plugins.tree.TreeProvider;
import org.apache.jackrabbit.oak.spi.security.CompositeConfiguration;
@@ -26,18 +24,19 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
import org.apache.jackrabbit.oak.spi.security.SecurityConfiguration;
import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
+import org.jetbrains.annotations.NotNull;
final class ConfigurationInitializer {
private ConfigurationInitializer() {}
-@Nonnull
-static T
initializeConfiguration(@Nonnull T configuration, @Nonnull SecurityProvider
securityProvider, @Nonnull RootProvider rootProvider, @Nonnull TreeProvider
treeProvider) {
+@NotNull
+static T
initializeConfiguration(@NotNull T configuration, @NotNull SecurityProvider
securityProvider, @NotNull RootProvider rootProvider, @NotNull TreeProvider
treeProvider) {
return initializeConfiguration(configuration, securityProvider,
ConfigurationParameters.EMPTY, rootProvider, treeProvider);
}
-@Nonnull
-static T
initializeConfiguration(@Nonnull T configuration, @Nonnull SecurityProvider
securityProvider, @Nonnull ConfigurationParameters parameters, @Nonnull
RootProvider rootProvider, @Nonnull TreeProvider treeProvider) {
+@NotNull
+static T
initializeConfiguration(@NotNull T configuration, @NotNull SecurityProvider
securityProvider, @NotNull ConfigurationParameters parameters, @NotNull
RootProvider rootProvider, @NotNull TreeProvider treeProvider) {
if (configuration instanceof ConfigurationBase) {
ConfigurationBase base = (ConfigurationBase) configuration;
base.setSecurityProvider(securityProvider);
@@ -48,10 +47,10 @@ final class ConfigurationInitializer {
return configuration;
}
-static void initializeConfigurations(@Nonnull CompositeConfiguration
configuration, @Nonnull SecurityProvider securityProvider,
- @Nonnull ConfigurationParameters
parameters,
- @Nonnull RootProvider rootProvider,
- @Nonnull TreeProvider treeProvider) {
+static void initializeConfigurations(@NotNull CompositeConfiguration
configuration, @NotNull SecurityProvider securityProvider,
+ @NotNull ConfigurationParameters
parameters,
+ @NotNull RootProvider rootProvider,
+ @NotNull TreeProvider treeProvider) {
configuration.setSecurityProvider(securityProvider);
configuration.setRootProvider(rootProvider);
configuration.setTreeProvider(treeProvider);
@@ -61,4 +60,4 @@ final class ConfigurationInitializer {
initializeConfiguration(config, securityProvider, parameters,
rootProvider, treeProvider);
}
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/InternalSecurityProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/InternalSecurityProvider.java?rev=1846014=1846013=1846014=diff
==
---
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/InternalSecurityProvider.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/InternalSecurityProvider.java
Wed Nov 7 13:57:55 2018
@@ -27,9 +27,8 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration;
import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardAware;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.NotNull;
+import
svn commit: r1846014 [3/14] - in /jackrabbit/oak/branches/1.8: ./ oak-core/ oak-core/src/main/java/org/apache/jackrabbit/oak/ oak-core/src/main/java/org/apache/jackrabbit/oak/core/ oak-core/src/main/j
Modified:
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/WhiteboardIndexEditorProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/WhiteboardIndexEditorProvider.java?rev=1846014=1846013=1846014=diff
==
---
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/WhiteboardIndexEditorProvider.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/WhiteboardIndexEditorProvider.java
Wed Nov 7 13:57:55 2018
@@ -18,13 +18,12 @@
*/
package org.apache.jackrabbit.oak.plugins.index;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.CommitFailedException;
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.apache.jackrabbit.oak.spi.whiteboard.AbstractServiceTracker;
+import org.jetbrains.annotations.NotNull;
/**
* Dynamic {@link IndexEditorProvider} based on the available
@@ -39,8 +38,8 @@ public class WhiteboardIndexEditorProvid
}
@Override
-public Editor getIndexEditor(@Nonnull String type, @Nonnull NodeBuilder
builder,
-@Nonnull NodeState root, @Nonnull IndexUpdateCallback callback)
+public Editor getIndexEditor(@NotNull String type, @NotNull NodeBuilder
builder,
+@NotNull NodeState root, @NotNull IndexUpdateCallback callback)
throws CommitFailedException {
IndexEditorProvider composite = CompositeIndexEditorProvider
.compose(getServices());
Modified:
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/AggregateIndexPlan.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/AggregateIndexPlan.java?rev=1846014=1846013=1846014=diff
==
---
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/AggregateIndexPlan.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/AggregateIndexPlan.java
Wed Nov 7 13:57:55 2018
@@ -20,13 +20,12 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.List;
-import javax.annotation.CheckForNull;
-
import org.apache.jackrabbit.oak.spi.query.Filter;
import org.apache.jackrabbit.oak.spi.query.Filter.PropertyRestriction;
import org.apache.jackrabbit.oak.spi.query.QueryIndex.IndexPlan;
import org.apache.jackrabbit.oak.spi.query.QueryIndex.OrderEntry;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.Nullable;
/**
* An index plan for multiple query indexes.
@@ -176,7 +175,7 @@ public class AggregateIndexPlan implemen
// as they are only used locally (in the ordered index, or in the lucene
index)
@Override
-@CheckForNull
+@Nullable
public PropertyRestriction getPropertyRestriction() {
return null;
}
@@ -202,7 +201,7 @@ public class AggregateIndexPlan implemen
}
@Override
-@CheckForNull
+@Nullable
public Object getAttribute(String name) {
return null;
}
Modified:
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/AggregateIndexProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/AggregateIndexProvider.java?rev=1846014=1846013=1846014=diff
==
---
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/AggregateIndexProvider.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/AggregateIndexProvider.java
Wed Nov 7 13:57:55 2018
@@ -19,11 +19,10 @@ package org.apache.jackrabbit.oak.plugin
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nonnull;
-
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 static
org.apache.jackrabbit.oak.spi.query.QueryIndex.AdvanceFulltextQueryIndex;
@@ -38,13 +37,13 @@ public class AggregateIndexProvider impl
this.baseProvider = baseProvider;
}
-@Nonnull
+@NotNull
public static QueryIndexProvider wrap(
-@Nonnull QueryIndexProvider baseProvider) {
+
svn commit: r1846014 [8/14] - in /jackrabbit/oak/branches/1.8: ./ oak-core/ oak-core/src/main/java/org/apache/jackrabbit/oak/ oak-core/src/main/java/org/apache/jackrabbit/oak/core/ oak-core/src/main/j
Modified:
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntry.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntry.java?rev=1846014=1846013=1846014=diff
==
---
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntry.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntry.java
Wed Nov 7 13:57:55 2018
@@ -16,9 +16,6 @@
*/
package org.apache.jackrabbit.oak.security.authorization.permission;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import com.google.common.base.Objects;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
@@ -27,6 +24,8 @@ import org.apache.jackrabbit.oak.spi.sec
import
org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionPattern;
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeBits;
import org.apache.jackrabbit.util.Text;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
final class PermissionEntry implements Comparable,
PermissionConstants {
@@ -55,9 +54,9 @@ final class PermissionEntry implements C
*/
final RestrictionPattern restriction;
-PermissionEntry(@Nonnull String path, boolean isAllow, int index,
-@Nonnull PrivilegeBits privilegeBits,
-@Nonnull RestrictionPattern restriction) {
+PermissionEntry(@NotNull String path, boolean isAllow, int index,
+@NotNull PrivilegeBits privilegeBits,
+@NotNull RestrictionPattern restriction) {
this.path = path;
this.isAllow = isAllow;
this.index = index;
@@ -65,11 +64,11 @@ final class PermissionEntry implements C
this.restriction = restriction;
}
-boolean matches(@Nonnull Tree tree, @Nullable PropertyState property) {
+boolean matches(@NotNull Tree tree, @Nullable PropertyState property) {
return restriction == RestrictionPattern.EMPTY ||
restriction.matches(tree, property);
}
-boolean matches(@Nonnull String treePath) {
+boolean matches(@NotNull String treePath) {
return restriction == RestrictionPattern.EMPTY ||
restriction.matches(treePath);
}
@@ -77,12 +76,12 @@ final class PermissionEntry implements C
return restriction == RestrictionPattern.EMPTY ||
restriction.matches();
}
-boolean matchesParent(@Nonnull String parentPath) {
+boolean matchesParent(@NotNull String parentPath) {
return Text.isDescendantOrEqual(path, parentPath) && (restriction ==
RestrictionPattern.EMPTY || restriction.matches(parentPath));
}
@Override
-public int compareTo(@Nonnull PermissionEntry pe) {
+public int compareTo(@NotNull PermissionEntry pe) {
if (Objects.equal(path, pe.path)) {
// reverse order
if (index == pe.index) {
@@ -122,4 +121,4 @@ final class PermissionEntry implements C
public int hashCode() {
return Objects.hashCode(privilegeBits, index, path, isAllow,
restriction);
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryCache.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryCache.java?rev=1846014=1846013=1846014=diff
==
---
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryCache.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryCache.java
Wed Nov 7 13:57:55 2018
@@ -21,7 +21,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
/**
* {@code PermissionEntryCache} caches the permission entries of principals.
@@ -39,9 +39,9 @@ class PermissionEntryCache {
private final Map entries = new
HashMap();
-@Nonnull
-PrincipalPermissionEntries getEntries(@Nonnull PermissionStore store,
- @Nonnull String
principalName) {
+@NotNull
+PrincipalPermissionEntries getEntries(@NotNull PermissionStore store,
+ @NotNull String
principalName) {
svn commit: r1846014 [7/14] - in /jackrabbit/oak/branches/1.8: ./ oak-core/ oak-core/src/main/java/org/apache/jackrabbit/oak/ oak-core/src/main/java/org/apache/jackrabbit/oak/core/ oak-core/src/main/j
Modified:
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java?rev=1846014=1846013=1846014=diff
==
---
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java
Wed Nov 7 13:57:55 2018
@@ -30,9 +30,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.AccessDeniedException;
import javax.jcr.RepositoryException;
import javax.jcr.UnsupportedRepositoryOperationException;
@@ -94,6 +91,8 @@ import org.apache.jackrabbit.oak.spi.xml
import org.apache.jackrabbit.oak.plugins.tree.TreeUtil;
import org.apache.jackrabbit.util.ISO9075;
import org.apache.jackrabbit.util.Text;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -115,8 +114,8 @@ public class AccessControlManagerImpl ex
private final ConfigurationParameters configParams;
private final Set readPaths;
-public AccessControlManagerImpl(@Nonnull Root root, @Nonnull
NamePathMapper namePathMapper,
-@Nonnull SecurityProvider
securityProvider) {
+public AccessControlManagerImpl(@NotNull Root root, @NotNull
NamePathMapper namePathMapper,
+@NotNull SecurityProvider
securityProvider) {
super(root, namePathMapper, securityProvider);
bitsProvider = new PrivilegeBitsProvider(root);
@@ -130,7 +129,7 @@ public class AccessControlManagerImpl ex
}
//---< AccessControlManager
>---
-@Nonnull
+@NotNull
@Override
public AccessControlPolicy[] getPolicies(@Nullable String absPath) throws
RepositoryException {
String oakPath = getOakPath(absPath);
@@ -147,7 +146,7 @@ public class AccessControlManagerImpl ex
return policies.toArray(new AccessControlPolicy[policies.size()]);
}
-@Nonnull
+@NotNull
@Override
public AccessControlPolicy[] getEffectivePolicies(@Nullable String
absPath) throws RepositoryException {
String oakPath = getOakPath(absPath);
@@ -178,7 +177,7 @@ public class AccessControlManagerImpl ex
return effective.toArray(new AccessControlPolicy[effective.size()]);
}
-@Nonnull
+@NotNull
@Override
public AccessControlPolicyIterator getApplicablePolicies(@Nullable String
absPath) throws RepositoryException {
String oakPath = getOakPath(absPath);
@@ -210,7 +209,7 @@ public class AccessControlManagerImpl ex
}
@Override
-public void setPolicy(@Nullable String absPath, @Nonnull
AccessControlPolicy policy) throws RepositoryException {
+public void setPolicy(@Nullable String absPath, @NotNull
AccessControlPolicy policy) throws RepositoryException {
String oakPath = getOakPath(absPath);
Util.checkValidPolicy(oakPath, policy);
@@ -289,8 +288,8 @@ public class AccessControlManagerImpl ex
}
}
-private void setNodeBasedAcl(@Nullable String oakPath, @Nonnull Tree tree,
- @Nonnull ACL acl) throws RepositoryException {
+private void setNodeBasedAcl(@Nullable String oakPath, @NotNull Tree tree,
+ @NotNull ACL acl) throws RepositoryException {
Tree aclTree = getAclTree(oakPath, tree);
if (aclTree != null) {
// remove all existing aces
@@ -316,7 +315,7 @@ public class AccessControlManagerImpl ex
}
@Override
-public void removePolicy(@Nullable String absPath, @Nonnull
AccessControlPolicy policy) throws RepositoryException {
+public void removePolicy(@Nullable String absPath, @NotNull
AccessControlPolicy policy) throws RepositoryException {
String oakPath = getOakPath(absPath);
Util.checkValidPolicy(oakPath, policy);
@@ -352,9 +351,9 @@ public class AccessControlManagerImpl ex
}
//-< JackrabbitAccessControlManager
>---
-@Nonnull
+@NotNull
@Override
-public JackrabbitAccessControlPolicy[] getApplicablePolicies(@Nonnull
Principal principal) throws RepositoryException {
+public JackrabbitAccessControlPolicy[] getApplicablePolicies(@NotNull
Principal principal) throws RepositoryException {
svn commit: r1846004 - in /jackrabbit/oak/branches/1.8: ./ oak-parent/pom.xml
Author: reschke Date: Wed Nov 7 13:18:51 2018 New Revision: 1846004 URL: http://svn.apache.org/viewvc?rev=1846004=rev Log: OAK-7669: backport of: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - add jetbrains annotations to parent pom Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-parent/pom.xml Propchange: jackrabbit/oak/branches/1.8/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 7 13:18:51 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,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,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-parent/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-parent/pom.xml?rev=1846004=1846003=1846004=diff == --- jackrabbit/oak/branches/1.8/oak-parent/pom.xml (original) +++ jackrabbit/oak/branches/1.8/oak-parent/pom.xml Wed Nov 7 13:18:51 2018 @@ -528,6 +528,12 @@ provided +org.jetbrains +annotations +16.0.2 +provided + + junit junit 4.12
svn commit: r1846007 - in /jackrabbit/oak/branches/1.8: ./ oak-auth-ldap/ oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/
Author: reschke Date: Wed Nov 7 13:35:46 2018 New Revision: 1846007 URL: http://svn.apache.org/viewvc?rev=1846007=rev Log: OAK-7669: backport of: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-auth-ldap Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-auth-ldap/pom.xml jackrabbit/oak/branches/1.8/oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/LdapGroup.java jackrabbit/oak/branches/1.8/oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/LdapIdentity.java jackrabbit/oak/branches/1.8/oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/LdapIdentityProperties.java jackrabbit/oak/branches/1.8/oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/LdapIdentityProvider.java jackrabbit/oak/branches/1.8/oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/LdapProviderConfig.java Propchange: jackrabbit/oak/branches/1.8/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 7 13:35:46 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,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-1836171,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-auth-ldap/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-auth-ldap/pom.xml?rev=1846007=1846006=1846007=diff
svn commit: r1846009 [1/2] - in /jackrabbit/oak/branches/1.8: ./ oak-authorization-cug/ oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/ oak-authorization-
Author: reschke Date: Wed Nov 7 13:38:35 2018 New Revision: 1846009 URL: http://svn.apache.org/viewvc?rev=1846009=rev Log: OAK-7669: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-authorization-cug Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-authorization-cug/pom.xml jackrabbit/oak/branches/1.8/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/CugExclude.java jackrabbit/oak/branches/1.8/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/AbstractTreePermission.java jackrabbit/oak/branches/1.8/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManager.java jackrabbit/oak/branches/1.8/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfiguration.java jackrabbit/oak/branches/1.8/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugContext.java jackrabbit/oak/branches/1.8/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugExcludeImpl.java jackrabbit/oak/branches/1.8/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugImporter.java jackrabbit/oak/branches/1.8/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPermissionProvider.java jackrabbit/oak/branches/1.8/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPolicyImpl.java jackrabbit/oak/branches/1.8/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugTreePermission.java jackrabbit/oak/branches/1.8/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugUtil.java jackrabbit/oak/branches/1.8/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugValidatorProvider.java jackrabbit/oak/branches/1.8/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/EmptyCugTreePermission.java jackrabbit/oak/branches/1.8/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/NestedCugHook.java jackrabbit/oak/branches/1.8/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/SupportedPaths.java jackrabbit/oak/branches/1.8/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/TopLevelPaths.java jackrabbit/oak/branches/1.8/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/package-info.java jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/AbstractCugTest.java jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManagerTest.java jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfigurationTest.java jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugExcludeImplTest.java jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugImportBaseTest.java jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPermissionProviderTest.java jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPolicyImplTest.java jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugSecurityProvider.java jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugTreePermissionTest.java jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugUtilTest.java jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugValidatorTest.java jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/NestedCugHookTest.java jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/VersionTest.java Propchange:
svn commit: r1846009 [2/2] - in /jackrabbit/oak/branches/1.8: ./ oak-authorization-cug/ oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/ oak-authorization-
Modified:
jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPolicyImplTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPolicyImplTest.java?rev=1846009=1846008=1846009=diff
==
---
jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPolicyImplTest.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPolicyImplTest.java
Wed Nov 7 13:38:35 2018
@@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.spi.se
import java.security.Principal;
import java.util.Iterator;
import java.util.Set;
-import javax.annotation.Nonnull;
import javax.jcr.security.AccessControlException;
import com.google.common.collect.ImmutableMap;
@@ -34,6 +33,7 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
import org.apache.jackrabbit.oak.spi.security.principal.PrincipalImpl;
import org.apache.jackrabbit.oak.spi.xml.ImportBehavior;
+import org.jetbrains.annotations.NotNull;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -59,7 +59,7 @@ public class CugPolicyImplTest extends A
return new CugPolicyImpl(path, NamePathMapper.DEFAULT,
principalManager, ImportBehavior.ABORT);
}
-private CugPolicyImpl createCugPolicy(@Nonnull Set principals) {
+private CugPolicyImpl createCugPolicy(@NotNull Set principals) {
return new CugPolicyImpl(path, NamePathMapper.DEFAULT,
principalManager, ImportBehavior.ABORT, principals);
}
@@ -218,4 +218,4 @@ public class CugPolicyImplTest extends A
public void testInvalidImportBehavior() {
CugPolicy cug = new CugPolicyImpl(path, NamePathMapper.DEFAULT,
principalManager, -1, principals);
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugSecurityProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugSecurityProvider.java?rev=1846009=1846008=1846009=diff
==
---
jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugSecurityProvider.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugSecurityProvider.java
Wed Nov 7 13:38:35 2018
@@ -16,19 +16,18 @@
*/
package org.apache.jackrabbit.oak.spi.security.authorization.cug.impl;
-import javax.annotation.Nonnull;
-
import
org.apache.jackrabbit.oak.security.authorization.composite.CompositeAuthorizationConfiguration;
import org.apache.jackrabbit.oak.security.internal.SecurityProviderBuilder;
import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
import
org.apache.jackrabbit.oak.spi.security.authorization.AuthorizationConfiguration;
+import org.jetbrains.annotations.NotNull;
final class CugSecurityProvider {
private CugSecurityProvider() {}
-public static SecurityProvider newTestSecurityProvider(@Nonnull
ConfigurationParameters configuration) {
+public static SecurityProvider newTestSecurityProvider(@NotNull
ConfigurationParameters configuration) {
CugConfiguration cugConfiguration = new CugConfiguration();
ConfigurationParameters params =
configuration.getConfigValue(AuthorizationConfiguration.NAME,
ConfigurationParameters.EMPTY);
@@ -37,7 +36,7 @@ final class CugSecurityProvider {
return new
SecurityProviderBuilder().with(configuration).with(cugConfiguration,
AuthorizationConfiguration.class).build();
}
-public static CugConfiguration getCugConfiguration(@Nonnull
SecurityProvider securityProvider) {
+public static CugConfiguration getCugConfiguration(@NotNull
SecurityProvider securityProvider) {
AuthorizationConfiguration ac =
securityProvider.getConfiguration(AuthorizationConfiguration.class);
if (!(ac instanceof CompositeAuthorizationConfiguration)) {
throw new IllegalStateException();
@@ -49,4 +48,4 @@ final class CugSecurityProvider {
}
throw new IllegalStateException();
}
-}
\ No newline at end of file
+}
Modified:
svn commit: r1846013 - in /jackrabbit/oak/branches/1.8: ./ oak-commons/ oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/ oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/concurr
Author: reschke Date: Wed Nov 7 13:46:58 2018 New Revision: 1846013 URL: http://svn.apache.org/viewvc?rev=1846013=rev Log: OAK-7669: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-commons Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-commons/pom.xml jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/FileIOUtils.java jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/OakVersion.java jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/PathUtils.java jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/QueryUtils.java jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/StringUtils.java jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/UUIDUtils.java jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/concurrent/ExecutorCloser.java jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/concurrent/package-info.java jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/json/JsopReader.java jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/json/package-info.java jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/package-info.java jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/EscapeUtils.java jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/package-info.java jackrabbit/oak/branches/1.8/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FileIOUtilsTest.java jackrabbit/oak/branches/1.8/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FileLineDifferenceIteratorTest.java Propchange: jackrabbit/oak/branches/1.8/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 7 13:46:58 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-1836175,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
svn commit: r1846018 - in /jackrabbit/oak/branches/1.8/oak-exercise: ./ src/main/java/org/apache/jackrabbit/oak/exercise/security/authentication/external/ src/main/java/org/apache/jackrabbit/oak/exerc
Author: reschke
Date: Wed Nov 7 14:02:54 2018
New Revision: 1846018
URL: http://svn.apache.org/viewvc?rev=1846018=rev
Log:
OAK-7669: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability
annotations instead - oak-exercise
Modified:
jackrabbit/oak/branches/1.8/oak-exercise/pom.xml
jackrabbit/oak/branches/1.8/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authentication/external/CustomExternalIdentityProvider.java
jackrabbit/oak/branches/1.8/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/restriction/CustomRestrictionProvider.java
jackrabbit/oak/branches/1.8/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/principal/CustomPrincipalConfiguration.java
jackrabbit/oak/branches/1.8/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/principal/CustomPrincipalProvider.java
jackrabbit/oak/branches/1.8/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/ExerciseUtility.java
jackrabbit/oak/branches/1.8/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/permission/L1_IntroductionTest.java
jackrabbit/oak/branches/1.8/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/privilege/L3_BuiltInPrivilegesTest.java
jackrabbit/oak/branches/1.8/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/privilege/L4_CustomPrivilegeTest.java
Modified: jackrabbit/oak/branches/1.8/oak-exercise/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-exercise/pom.xml?rev=1846018=1846017=1846018=diff
==
--- jackrabbit/oak/branches/1.8/oak-exercise/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-exercise/pom.xml Wed Nov 7 14:02:54 2018
@@ -119,10 +119,10 @@
${jackrabbit.version}
-
+
- com.google.code.findbugs
- jsr305
+ org.jetbrains
+ annotations
Modified:
jackrabbit/oak/branches/1.8/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authentication/external/CustomExternalIdentityProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authentication/external/CustomExternalIdentityProvider.java?rev=1846018=1846017=1846018=diff
==
---
jackrabbit/oak/branches/1.8/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authentication/external/CustomExternalIdentityProvider.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authentication/external/CustomExternalIdentityProvider.java
Wed Nov 7 14:02:54 2018
@@ -22,8 +22,6 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.Credentials;
import javax.jcr.SimpleCredentials;
import javax.security.auth.login.LoginException;
@@ -46,6 +44,8 @@ import org.apache.jackrabbit.oak.spi.sec
import
org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentityRef;
import
org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalUser;
import org.apache.jackrabbit.util.Text;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -98,14 +98,14 @@ public class CustomExternalIdentityProvi
log.info("modified IDP: " + getName());
}
-@Nonnull
+@NotNull
@Override
public String getName() {
return "CustomExternalIdentityProvider";
}
@Override
-public ExternalIdentity getIdentity(@Nonnull ExternalIdentityRef ref)
throws ExternalIdentityException {
+public ExternalIdentity getIdentity(@NotNull ExternalIdentityRef ref)
throws ExternalIdentityException {
if (getName().equals(ref.getProviderName())) {
String id = ref.getId();
ExternalIdentity ei = getUser(id);
@@ -119,23 +119,23 @@ public class CustomExternalIdentityProvi
}
@Override
-public ExternalUser getUser(@Nonnull final String userId) throws
ExternalIdentityException {
+public ExternalUser getUser(@NotNull final String userId) throws
ExternalIdentityException {
if (userGroupMap.containsKey(userId)) {
return new ExternalUser() {
-@Nonnull
+@NotNull
@Override
public ExternalIdentityRef getExternalId() {
return new ExternalIdentityRef(userId, getName());
}
-@Nonnull
+@NotNull
@Override
public String getId() {
svn commit: r1846019 - /jackrabbit/oak/branches/1.8/
Author: reschke Date: Wed Nov 7 14:03:15 2018 New Revision: 1846019 URL: http://svn.apache.org/viewvc?rev=1846019=rev Log: OAK-7669: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-exercise Modified: jackrabbit/oak/branches/1.8/ (props changed) Propchange: jackrabbit/oak/branches/1.8/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 7 14:03:15 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-1836178,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-1836179,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
svn commit: r1846021 - in /jackrabbit/oak/branches/1.8: ./ oak-it/ oak-it/src/test/java/org/apache/jackrabbit/oak/composite/ oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/index/ oak-it/src/te
Author: reschke Date: Wed Nov 7 14:06:20 2018 New Revision: 1846021 URL: http://svn.apache.org/viewvc?rev=1846021=rev Log: OAK-7669: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-it Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-it/pom.xml jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreTest.java jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateClusterTestIT.java jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/ClusterPermissionsTest.java jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/commit/CommitContextTest.java jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/CheckpointTest.java jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java Propchange: jackrabbit/oak/branches/1.8/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 7 14:06:20 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-1836180,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-1836181,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-it/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-it/pom.xml?rev=1846021=1846020=1846021=diff == ---
svn commit: r1846027 - in /jackrabbit/oak/branches/1.8: ./ oak-pojosr/pom.xml oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactoryTest.java
Author: reschke Date: Wed Nov 7 14:16:30 2018 New Revision: 1846027 URL: http://svn.apache.org/viewvc?rev=1846027=rev Log: OAK-7669: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-pojosr Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-pojosr/pom.xml jackrabbit/oak/branches/1.8/oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactoryTest.java Propchange: jackrabbit/oak/branches/1.8/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 7 14:16:30 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-1836183,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-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/trunk:1345480 Modified: jackrabbit/oak/branches/1.8/oak-pojosr/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-pojosr/pom.xml?rev=1846027=1846026=1846027=diff == --- jackrabbit/oak/branches/1.8/oak-pojosr/pom.xml (original) +++ jackrabbit/oak/branches/1.8/oak-pojosr/pom.xml Wed Nov 7 14:16:30 2018 @@ -141,10 +141,10 @@ 1.0.4 - + - com.google.code.findbugs - jsr305 + org.jetbrains + annotations Modified: jackrabbit/oak/branches/1.8/oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactoryTest.java URL:
svn commit: r1846028 - in /jackrabbit/oak/branches/1.8: ./ oak-query-spi/ oak-query-spi/src/main/java/org/apache/jackrabbit/oak/query/facet/ oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/q
Author: reschke Date: Wed Nov 7 14:17:56 2018 New Revision: 1846028 URL: http://svn.apache.org/viewvc?rev=1846028=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
svn commit: r1846010 - in /jackrabbit/oak/branches/1.8/oak-benchmarks: ./ src/main/java/org/apache/jackrabbit/oak/benchmark/ src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/
Author: reschke Date: Wed Nov 7 13:41:08 2018 New Revision: 1846010 URL: http://svn.apache.org/viewvc?rev=1846010=rev Log: OAK-7669: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-benchmarks Modified: jackrabbit/oak/branches/1.8/oak-benchmarks/pom.xml jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractTest.java jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AddMemberTest.java jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AddMembersTest.java jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AddUniqueMembersTest.java jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BundlingNodeTest.java jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/CompositeAuthorizationTest.java jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/CugOakTest.java jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/CugTest.java jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSolrSearchTest.java jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/HybridIndexTest.java jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/LucenePropertyFullTextTest.java jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberBaseTest.java jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberDeclaredMemberOf.java jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberIsDeclaredMember.java jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberIsMember.java jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberMemberOf.java jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ObservationTest.java jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/RemoveMemberTest.java jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/RemoveMembersTest.java jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/AbstractExternalTest.java jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/ExternalLoginTest.java jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/SyncAllExternalUsersTest.java jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/SyncExternalUsersTest.java jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/util/MimeType.java jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/util/OakIndexUtils.java jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/AggregateNodeSearcher.java jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/FacetSearcher.java jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/FullTextSearcher.java jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/MultiFilterOrderBySearcher.java jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/MultiFilterSplitOrderBySearcher.java jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/NodeTypeSearcher.java jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/OrderBySearcher.java jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/PaginationEnabledSearcher.java jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/SearchScalabilityBenchmark.java jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/SplitOrderBySearcher.java Modified: jackrabbit/oak/branches/1.8/oak-benchmarks/pom.xml URL:
svn commit: r1846011 - in /jackrabbit/oak/branches/1.8: ./ oak-blob/ oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/
Author: reschke Date: Wed Nov 7 13:42:38 2018 New Revision: 1846011 URL: http://svn.apache.org/viewvc?rev=1846011=rev Log: OAK-7669: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-blob Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-blob/pom.xml jackrabbit/oak/branches/1.8/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/AbstractBlobStore.java jackrabbit/oak/branches/1.8/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/BlobStore.java jackrabbit/oak/branches/1.8/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/FileBlobStore.java Propchange: jackrabbit/oak/branches/1.8/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 7 13:42:38 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-1836172,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-1836174,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-blob/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob/pom.xml?rev=1846011=1846010=1846011=diff == --- jackrabbit/oak/branches/1.8/oak-blob/pom.xml (original) +++ jackrabbit/oak/branches/1.8/oak-blob/pom.xml Wed Nov 7 13:42:38 2018 @@ -118,10 +118,10 @@ slf4j-api - + - com.google.code.findbugs - jsr305 + org.jetbrains + annotations Modified:
svn commit: r1846015 - in /jackrabbit/oak/branches/1.8: ./ oak-core-spi/ oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/ oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/ o
Author: reschke Date: Wed Nov 7 14:01:00 2018 New Revision: 1846015 URL: http://svn.apache.org/viewvc?rev=1846015=rev Log: OAK-7669: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-core-spi Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-core-spi/pom.xml jackrabbit/oak/branches/1.8/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java jackrabbit/oak/branches/1.8/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheLIRS.java jackrabbit/oak/branches/1.8/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java jackrabbit/oak/branches/1.8/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java jackrabbit/oak/branches/1.8/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/ManagementOperation.java jackrabbit/oak/branches/1.8/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/package-info.java jackrabbit/oak/branches/1.8/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/namepath/NameMapper.java jackrabbit/oak/branches/1.8/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/namepath/NamePathMapper.java jackrabbit/oak/branches/1.8/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/namepath/PathMapper.java jackrabbit/oak/branches/1.8/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/namepath/package-info.java jackrabbit/oak/branches/1.8/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/osgi/OsgiWhiteboard.java jackrabbit/oak/branches/1.8/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/osgi/package-info.java jackrabbit/oak/branches/1.8/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/descriptors/AggregatingDescriptors.java jackrabbit/oak/branches/1.8/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/descriptors/GenericDescriptors.java jackrabbit/oak/branches/1.8/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/descriptors/package-info.java jackrabbit/oak/branches/1.8/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/gc/DelegatingGCMonitor.java jackrabbit/oak/branches/1.8/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/gc/package-info.java jackrabbit/oak/branches/1.8/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/MountInfoProvider.java jackrabbit/oak/branches/1.8/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/package-info.java jackrabbit/oak/branches/1.8/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/nodetype/DefinitionProvider.java jackrabbit/oak/branches/1.8/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/nodetype/EffectiveNodeType.java jackrabbit/oak/branches/1.8/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/nodetype/EffectiveNodeTypeProvider.java jackrabbit/oak/branches/1.8/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/nodetype/package-info.java jackrabbit/oak/branches/1.8/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/observation/ChangeSet.java jackrabbit/oak/branches/1.8/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/observation/ChangeSetBuilder.java jackrabbit/oak/branches/1.8/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/observation/package-info.java jackrabbit/oak/branches/1.8/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/AbstractServiceTracker.java jackrabbit/oak/branches/1.8/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/DefaultWhiteboard.java jackrabbit/oak/branches/1.8/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardAware.java jackrabbit/oak/branches/1.8/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardExecutor.java jackrabbit/oak/branches/1.8/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardUtils.java jackrabbit/oak/branches/1.8/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/package-info.java jackrabbit/oak/branches/1.8/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/stats/StopwatchLogger.java jackrabbit/oak/branches/1.8/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/stats/package-info.java jackrabbit/oak/branches/1.8/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheStatsTest.java Propchange: jackrabbit/oak/branches/1.8/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 7 14:01:00 2018 @@ -1,3 +1,3 @@ /jackrabbit/oak/branches/1.0:1665962
svn commit: r1846020 - in /jackrabbit/oak/branches/1.8: ./ oak-http/pom.xml
Author: reschke Date: Wed Nov 7 14:04:27 2018 New Revision: 1846020 URL: http://svn.apache.org/viewvc?rev=1846020=rev Log: OAK-7669: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-http Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-http/pom.xml Propchange: jackrabbit/oak/branches/1.8/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 7 14:04:27 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-1836179,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-1836180,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-http/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-http/pom.xml?rev=1846020=1846019=1846020=diff == --- jackrabbit/oak/branches/1.8/oak-http/pom.xml (original) +++ jackrabbit/oak/branches/1.8/oak-http/pom.xml Wed Nov 7 14:04:27 2018 @@ -89,10 +89,10 @@ provided - + - com.google.code.findbugs - jsr305 + org.jetbrains + annotations
svn commit: r1846026 [1/2] - in /jackrabbit/oak/branches/1.8: ./ oak-lucene/ oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ oak-lucene/src/main/java/org/apache/jackrabbit/oak
Author: reschke Date: Wed Nov 7 14:14:25 2018 New Revision: 1846026 URL: http://svn.apache.org/viewvc?rev=1846026=rev Log: OAK-7669: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-lucene Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-lucene/pom.xml jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBean.java jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBeanImpl.java jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/Aggregate.java jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ExtractedTextCache.java jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexAugmentorFactory.java jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexNode.java jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexNodeManager.java jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexTracker.java jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneDocumentMaker.java jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProvider.java jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexMBeanImpl.java jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneRequestFacade.java jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/PropertyDefinition.java jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/PropertyUpdateCallback.java jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/binary/BinaryTextExtractor.java jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectorFactory.java jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/BufferedOakDirectory.java jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/DefaultDirectoryFactory.java jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexMeta.java jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexRootDirectory.java jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakBufferedIndexFile.java jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakDirectory.java jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakIndexFile.java jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakStreamingIndexFile.java jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ExternalIndexObserver.java jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ExternalObserverBuilder.java jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexObserver.java jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDoc.java
svn commit: r1846026 [2/2] - in /jackrabbit/oak/branches/1.8: ./ oak-lucene/ oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ oak-lucene/src/main/java/org/apache/jackrabbit/oak
Modified:
jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDoc.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDoc.java?rev=1846026=1846025=1846026=diff
==
---
jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDoc.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDoc.java
Wed Nov 7 14:14:25 2018
@@ -19,9 +19,8 @@
package org.apache.jackrabbit.oak.plugins.index.lucene.hybrid;
-import javax.annotation.Nullable;
-
import org.apache.lucene.index.IndexableField;
+import org.jetbrains.annotations.Nullable;
import static com.google.common.base.Preconditions.checkNotNull;
Modified:
jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDocumentHolder.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDocumentHolder.java?rev=1846026=1846025=1846026=diff
==
---
jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDocumentHolder.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDocumentHolder.java
Wed Nov 7 14:14:25 2018
@@ -22,13 +22,12 @@ package org.apache.jackrabbit.oak.plugin
import java.util.Collection;
import java.util.Map;
-import javax.annotation.Nonnull;
-
import com.google.common.base.Function;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Iterables;
import com.google.common.collect.ListMultimap;
import org.apache.jackrabbit.oak.plugins.document.spi.JournalProperty;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -48,7 +47,7 @@ public class LuceneDocumentHolder implem
private boolean docAddedToQueue;
private boolean schedulingDone;
-public LuceneDocumentHolder(@Nonnull IndexingQueue documentQueue, int
inMemoryDocsLimit) {
+public LuceneDocumentHolder(@NotNull IndexingQueue documentQueue, int
inMemoryDocsLimit) {
this.documentQueue = checkNotNull(documentQueue);
this.inMemoryDocsLimit = inMemoryDocsLimit;
}
Modified:
jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneJournalPropertyBuilder.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneJournalPropertyBuilder.java?rev=1846026=1846025=1846026=diff
==
---
jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneJournalPropertyBuilder.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneJournalPropertyBuilder.java
Wed Nov 7 14:14:25 2018
@@ -22,8 +22,6 @@ package org.apache.jackrabbit.oak.plugin
import java.util.Collection;
import java.util.Map;
-import javax.annotation.Nullable;
-
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import org.apache.jackrabbit.oak.commons.json.JsopBuilder;
@@ -32,6 +30,7 @@ import org.apache.jackrabbit.oak.commons
import org.apache.jackrabbit.oak.commons.json.JsopWriter;
import org.apache.jackrabbit.oak.plugins.document.spi.JournalProperty;
import org.apache.jackrabbit.oak.plugins.document.spi.JournalPropertyBuilder;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndex.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndex.java?rev=1846026=1846025=1846026=diff
==
---
jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndex.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndex.java
Wed Nov 7 14:14:25 2018
@@ -27,9 +27,6 @@ import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.annotation.CheckForNull;
-import
svn commit: r1846005 - in /jackrabbit/oak/branches/1.8: ./ oak-api/ oak-api/src/main/java/org/apache/jackrabbit/oak/api/ oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/
Author: reschke Date: Wed Nov 7 13:30:17 2018 New Revision: 1846005 URL: http://svn.apache.org/viewvc?rev=1846005=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
svn commit: r1846023 [1/3] - in /jackrabbit/oak/branches/1.8: ./ oak-jcr/ oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/ oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/ oak-jcr/src
Author: reschke Date: Wed Nov 7 14:10:06 2018 New Revision: 1846023 URL: http://svn.apache.org/viewvc?rev=1846023=rev Log: OAK-7669: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-jcr Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-jcr/ (props changed) jackrabbit/oak/branches/1.8/oak-jcr/pom.xml jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/AccessControlManagerDelegator.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/AuthorizableDelegator.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/GroupDelegator.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/ImpersonationDelegator.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/ItemDelegate.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/JackrabbitAccessControlManagerDelegator.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PrincipalManagerDelegator.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PrivilegeManagerDelegator.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PropertyDelegate.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/UserDelegator.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/UserManagerDelegator.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionDelegate.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionHistoryDelegate.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionManagerDelegate.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/WorkspaceDelegate.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockImpl.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockManagerImpl.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockOperation.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeProcessor.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/EventQueue.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/OakEventFilterImpl.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ObservationManagerImpl.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/QueryImpl.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/QueryResultImpl.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/repository/RepositoryImpl.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/AccessManager.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/ItemImpl.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/PropertyImpl.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionContext.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionImpl.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionNamespaces.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/WorkspaceImpl.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/operation/SessionOperation.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/operation/UserManagerOperation.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/ReadWriteVersionManager.java
svn commit: r1846023 [3/3] - in /jackrabbit/oak/branches/1.8: ./ oak-jcr/ oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/ oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/ oak-jcr/src
Modified:
jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionContext.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionContext.java?rev=1846023=1846022=1846023=diff
==
---
jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionContext.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionContext.java
Wed Nov 7 14:10:06 2018
@@ -26,9 +26,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.PathNotFoundException;
import javax.jcr.Repository;
import javax.jcr.RepositoryException;
@@ -70,6 +67,8 @@ import org.apache.jackrabbit.oak.stats.S
import org.apache.jackrabbit.oak.stats.CounterStats;
import org.apache.jackrabbit.oak.stats.MeterStats;
import org.apache.jackrabbit.oak.stats.TimerStats;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -115,9 +114,9 @@ public class SessionContext implements N
private final boolean fastQueryResultSize;
public SessionContext(
- @Nonnull Repository repository, @Nonnull StatisticManager
statisticManager,
- @Nonnull SecurityProvider securityProvider, @Nonnull Whiteboard
whiteboard,
- @Nonnull Map attributes, @Nonnull final
SessionDelegate delegate,
+ @NotNull Repository repository, @NotNull StatisticManager
statisticManager,
+ @NotNull SecurityProvider securityProvider, @NotNull Whiteboard
whiteboard,
+ @NotNull Map attributes, @NotNull final
SessionDelegate delegate,
int observationQueueLength, CommitRateLimiter commitRateLimiter) {
this(repository, statisticManager, securityProvider, whiteboard,
attributes, delegate,
@@ -125,9 +124,9 @@ public class SessionContext implements N
}
public SessionContext(
-@Nonnull Repository repository, @Nonnull StatisticManager
statisticManager,
-@Nonnull SecurityProvider securityProvider, @Nonnull Whiteboard
whiteboard,
-@Nonnull Map attributes, @Nonnull final
SessionDelegate delegate,
+@NotNull Repository repository, @NotNull StatisticManager
statisticManager,
+@NotNull SecurityProvider securityProvider, @NotNull Whiteboard
whiteboard,
+@NotNull Map attributes, @NotNull final
SessionDelegate delegate,
int observationQueueLength, CommitRateLimiter commitRateLimiter,
MountInfoProvider mountInfoProvider, boolean fastQueryResultSize) {
this.repository = checkNotNull(repository);
@@ -189,32 +188,32 @@ public class SessionContext implements N
return new WorkspaceImpl(this);
}
-@Nonnull
+@NotNull
public StatisticManager getStatisticManager() {
return statisticManager;
}
-@Nonnull
+@NotNull
public MeterStats getMeter(Type type){
return statisticManager.getMeter(type);
}
-@Nonnull
+@NotNull
public TimerStats getTimer(Type type) {
return statisticManager.getTimer(type);
}
-@Nonnull
+@NotNull
public CounterStats getCount(Type type) {
return statisticManager.getStatsCounter(type);
}
-@Nonnull
+@NotNull
public Repository getRepository() {
return repository;
}
-@Nonnull
+@NotNull
public SessionDelegate getSessionDelegate() {
return delegate;
}
@@ -224,7 +223,7 @@ public class SessionContext implements N
}
@Override
-@Nonnull
+@NotNull
public Map getSessionLocalMappings() {
return getNamespaces().getSessionLocalMappings();
}
@@ -233,7 +232,7 @@ public class SessionContext implements N
return valueFactory;
}
-@Nonnull
+@NotNull
public AccessControlManager getAccessControlManager() throws
RepositoryException {
if (accessControlManager == null) {
AccessControlManager acm =
getConfig(AuthorizationConfiguration.class)
@@ -248,7 +247,7 @@ public class SessionContext implements N
return accessControlManager;
}
-@Nonnull
+@NotNull
public PrincipalManager getPrincipalManager() {
if (principalManager == null) {
principalManager = new PrincipalManagerDelegator(delegate,
@@ -258,7 +257,7 @@ public class SessionContext implements N
return principalManager;
}
-@Nonnull
+@NotNull
public UserManager getUserManager() {
if (userManager == null) {
userManager = new UserManagerDelegator(delegate,
svn commit: r1846023 [2/3] - in /jackrabbit/oak/branches/1.8: ./ oak-jcr/ oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/ oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/ oak-jcr/src
Modified:
jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionHistoryDelegate.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionHistoryDelegate.java?rev=1846023=1846022=1846023=diff
==
---
jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionHistoryDelegate.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionHistoryDelegate.java
Wed Nov 7 14:10:06 2018
@@ -24,7 +24,6 @@ import java.util.Deque;
import java.util.Iterator;
import java.util.List;
-import javax.annotation.Nonnull;
import javax.jcr.InvalidItemStateException;
import javax.jcr.RepositoryException;
import javax.jcr.version.LabelExistsVersionException;
@@ -38,6 +37,7 @@ import org.apache.jackrabbit.oak.api.Pro
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.spi.version.VersionConstants;
+import org.jetbrains.annotations.NotNull;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.apache.jackrabbit.JcrConstants.JCR_BASEVERSION;
@@ -47,8 +47,8 @@ import static org.apache.jackrabbit.JcrC
*/
public class VersionHistoryDelegate extends NodeDelegate {
-VersionHistoryDelegate(@Nonnull SessionDelegate sessionDelegate,
- @Nonnull Tree vhTree) {
+VersionHistoryDelegate(@NotNull SessionDelegate sessionDelegate,
+ @NotNull Tree vhTree) {
super(sessionDelegate, checkNotNull(vhTree));
}
@@ -56,7 +56,7 @@ public class VersionHistoryDelegate exte
return
getTree().getProperty(JcrConstants.JCR_VERSIONABLEUUID).getValue(Type.STRING);
}
-@Nonnull
+@NotNull
public VersionDelegate getRootVersion() throws RepositoryException {
Tree rootVersion =
getTree().getChild(VersionConstants.JCR_ROOTVERSION);
if (!rootVersion.exists()) {
@@ -74,8 +74,8 @@ public class VersionHistoryDelegate exte
* @throws VersionException if there is no version with the given name.
* @throws RepositoryException if another error occurs.
*/
-@Nonnull
-public VersionDelegate getVersion(@Nonnull String versionName)
+@NotNull
+public VersionDelegate getVersion(@NotNull String versionName)
throws VersionException, RepositoryException {
checkNotNull(versionName);
Tree version = getTree().getChild(versionName);
@@ -85,8 +85,8 @@ public class VersionHistoryDelegate exte
return VersionDelegate.create(sessionDelegate, version);
}
-@Nonnull
-public VersionDelegate getVersionByLabel(@Nonnull String label)
+@NotNull
+public VersionDelegate getVersionByLabel(@NotNull String label)
throws VersionException, RepositoryException {
checkNotNull(label);
Tree versionLabels = getVersionLabelsTree();
@@ -102,7 +102,7 @@ public class VersionHistoryDelegate exte
return VersionDelegate.create(sessionDelegate, version);
}
-@Nonnull
+@NotNull
public Iterable getVersionLabels() throws RepositoryException {
Tree versionLabels = getVersionLabelsTree();
List labels = new ArrayList();
@@ -114,8 +114,8 @@ public class VersionHistoryDelegate exte
return labels;
}
-@Nonnull
-public Iterable getVersionLabels(@Nonnull String identifier)
+@NotNull
+public Iterable getVersionLabels(@NotNull String identifier)
throws RepositoryException {
checkNotNull(identifier);
Tree versionLabels = getVersionLabelsTree();
@@ -129,7 +129,7 @@ public class VersionHistoryDelegate exte
return labels;
}
-@Nonnull
+@NotNull
public Iterator getAllVersions() throws
RepositoryException {
List versions = new ArrayList();
for (Iterator it = getChildren(); it.hasNext();) {
@@ -170,7 +170,7 @@ public class VersionHistoryDelegate exte
});
}
-@Nonnull
+@NotNull
public Iterator getAllLinearVersions()
throws RepositoryException {
String id = getVersionableIdentifier();
@@ -190,21 +190,21 @@ public class VersionHistoryDelegate exte
return linearVersions.descendingIterator();
}
-public void addVersionLabel(@Nonnull VersionDelegate version,
-@Nonnull String oakVersionLabel,
+public void addVersionLabel(@NotNull VersionDelegate version,
+@NotNull String oakVersionLabel,
boolean moveLabel)
throws LabelExistsVersionException, VersionException,
RepositoryException {
VersionManagerDelegate vMgr =
VersionManagerDelegate.create(sessionDelegate);
svn commit: r1846033 [5/5] - in /jackrabbit/oak/branches/1.8: ./ oak-security-spi/ oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/ oak-security-spi/src/main/java/org/apache/jack
Modified:
jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManagerTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManagerTest.java?rev=1846033=1846032=1846033=diff
==
---
jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManagerTest.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManagerTest.java
Wed Nov 7 14:29:24 2018
@@ -22,7 +22,6 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Set;
-import javax.annotation.Nonnull;
import javax.jcr.AccessDeniedException;
import javax.jcr.PathNotFoundException;
import javax.jcr.RepositoryException;
@@ -49,6 +48,7 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConfiguration;
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
+import org.jetbrains.annotations.NotNull;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
@@ -130,7 +130,7 @@ public class AbstractAccessControlManage
acMgr = createAccessControlManager(root, getNamePathMapper());
}
-private AbstractAccessControlManager createAccessControlManager(@Nonnull
Root root, @Nonnull NamePathMapper namePathMapper) {
+private AbstractAccessControlManager createAccessControlManager(@NotNull
Root root, @NotNull NamePathMapper namePathMapper) {
return new TestAcMgr(root, namePathMapper, securityProvider);
}
@@ -144,7 +144,7 @@ public class AbstractAccessControlManage
return invalid;
}
-private static Privilege mockPrivilege(@Nonnull String name) {
+private static Privilege mockPrivilege(@NotNull String name) {
Privilege p = Mockito.mock(Privilege.class);
when(p.getName()).thenReturn(name);
return p;
@@ -227,7 +227,7 @@ public class AbstractAccessControlManage
public void testGetTreeDefinesAcContent() throws Exception {
Context ctx = new Context.Default() {
@Override
-public boolean definesTree(@Nonnull Tree tree) {
+public boolean definesTree(@NotNull Tree tree) {
return true;
}
};
@@ -436,7 +436,7 @@ public class AbstractAccessControlManage
private final class TestAcMgr extends AbstractAccessControlManager {
-protected TestAcMgr(@Nonnull Root root, @Nonnull NamePathMapper
namePathMapper, @Nonnull SecurityProvider securityProvider) {
+protected TestAcMgr(@NotNull Root root, @NotNull NamePathMapper
namePathMapper, @NotNull SecurityProvider securityProvider) {
super(root, namePathMapper, securityProvider);
}
@@ -480,4 +480,4 @@ public class AbstractAccessControlManage
throw new UnsupportedOperationException();
}
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ImmutableACLTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ImmutableACLTest.java?rev=1846033=1846032=1846033=diff
==
---
jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ImmutableACLTest.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ImmutableACLTest.java
Wed Nov 7 14:29:24 2018
@@ -19,8 +19,6 @@ package org.apache.jackrabbit.oak.spi.se
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.Value;
import javax.jcr.security.AccessControlEntry;
import javax.jcr.security.AccessControlException;
@@ -32,6 +30,8 @@ import org.apache.jackrabbit.oak.namepat
import
org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionProvider;
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeBits;
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.Before;
import org.junit.Test;
svn commit: r1846033 [4/5] - in /jackrabbit/oak/branches/1.8: ./ oak-security-spi/ oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/ oak-security-spi/src/main/java/org/apache/jack
Modified:
jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/AuthorizableType.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/AuthorizableType.java?rev=1846033=1846032=1846033=diff
==
---
jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/AuthorizableType.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/AuthorizableType.java
Wed Nov 7 14:29:24 2018
@@ -18,12 +18,11 @@
*/
package org.apache.jackrabbit.oak.spi.security.user;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.Group;
import org.apache.jackrabbit.api.security.user.User;
import org.apache.jackrabbit.api.security.user.UserManager;
+import org.jetbrains.annotations.NotNull;
/**
* The different authorizable types.
@@ -40,7 +39,7 @@ public enum AuthorizableType {
this.userType = jcrUserType;
}
-@Nonnull
+@NotNull
public static AuthorizableType getType(int jcrUserType) {
switch (jcrUserType) {
case UserManager.SEARCH_TYPE_AUTHORIZABLE:
Modified:
jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserAuthenticationFactory.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserAuthenticationFactory.java?rev=1846033=1846032=1846033=diff
==
---
jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserAuthenticationFactory.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserAuthenticationFactory.java
Wed Nov 7 14:29:24 2018
@@ -18,10 +18,8 @@ package org.apache.jackrabbit.oak.spi.se
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.spi.security.authentication.Authentication;
-
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Provides a user management specific implementation of the
@@ -43,6 +41,6 @@ public interface UserAuthenticationFacto
* {@code userId} or {@code null} if this implementation cannot not handle
the
* specified parameters.
*/
-@CheckForNull
-Authentication getAuthentication(@Nonnull UserConfiguration configuration,
@Nonnull Root root, @Nullable String userId);
+@Nullable
+Authentication getAuthentication(@NotNull UserConfiguration configuration,
@NotNull Root root, @Nullable String userId);
}
Modified:
jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserConfiguration.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserConfiguration.java?rev=1846033=1846032=1846033=diff
==
---
jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserConfiguration.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserConfiguration.java
Wed Nov 7 14:29:24 2018
@@ -16,14 +16,13 @@
*/
package org.apache.jackrabbit.oak.spi.security.user;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.api.security.user.UserManager;
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.namepath.NamePathMapper;
import org.apache.jackrabbit.oak.spi.security.SecurityConfiguration;
import org.apache.jackrabbit.oak.spi.security.principal.PrincipalProvider;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Configuration interface for user management.
@@ -39,7 +38,7 @@ public interface UserConfiguration exten
* @param namePathMapper A name path mapper used for conversion of jcr/oak
names/paths.
* @return a new instance of {@code UserManager}
*/
-@Nonnull
+@NotNull
UserManager getUserManager(Root root, NamePathMapper namePathMapper);
/**
@@ -63,5 +62,5 @@ public interface UserConfiguration exten
* @see
org.apache.jackrabbit.oak.spi.security.principal.PrincipalConfiguration
*/
@Nullable
-PrincipalProvider getUserPrincipalProvider(@Nonnull Root root, @Nonnull
NamePathMapper
svn commit: r1846038 [1/3] - in /jackrabbit/oak/branches/1.8: ./ oak-store-spi/ oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/ oak-store-spi/src/main/java/org/apache/jackrabbit/
Author: reschke Date: Wed Nov 7 14:48:58 2018 New Revision: 1846038 URL: http://svn.apache.org/viewvc?rev=1846038=rev Log: OAK-7669: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-store-spi Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-store-spi/pom.xml jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/AbstractBlob.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/ArrayBasedBlob.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/BinaryPropertyState.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/BooleanPropertyState.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/DecimalPropertyState.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/DoublePropertyState.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/EmptyNodeState.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/EmptyPropertyState.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/GenericPropertyState.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/LongPropertyState.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeState.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStore.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/ModifiedNodeState.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MultiPropertyState.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MutableNodeState.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyBuilder.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyStateValue.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyStates.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyValues.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/SinglePropertyState.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/StringBasedBlob.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/StringPropertyState.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/BinaryBasedBlob.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/BinaryImpl.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueFactoryImpl.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueImpl.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/cluster/ClusterRepositoryInfo.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserver.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ChangeDispatcher.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitContext.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitHook.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitInfo.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeConflictHandler.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditor.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditorProvider.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeHook.java
svn commit: r1846038 [3/3] - in /jackrabbit/oak/branches/1.8: ./ oak-store-spi/ oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/ oak-store-spi/src/main/java/org/apache/jackrabbit/
Modified:
jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeBuilder.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeBuilder.java?rev=1846038=1846037=1846038=diff
==
---
jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeBuilder.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeBuilder.java
Wed Nov 7 14:48:58 2018
@@ -19,12 +19,11 @@ package org.apache.jackrabbit.oak.spi.st
import java.io.IOException;
import java.io.InputStream;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Builder interface for constructing new {@link NodeState node states}.
@@ -79,7 +78,7 @@ public interface NodeBuilder {
*
* @return immutable node state
*/
-@Nonnull
+@NotNull
NodeState getNodeState();
/**
@@ -90,7 +89,7 @@ public interface NodeBuilder {
*
* @return base node state, possibly non-existent
*/
-@Nonnull
+@NotNull
NodeState getBaseState();
/**
@@ -158,7 +157,7 @@ public interface NodeBuilder {
*
* @return child node names
*/
-@Nonnull
+@NotNull
Iterable getChildNodeNames();
/**
@@ -168,7 +167,7 @@ public interface NodeBuilder {
* @return {@code true} if the named child node exists,
* {@code false} otherwise
*/
-boolean hasChildNode(@Nonnull String name);
+boolean hasChildNode(@NotNull String name);
/**
* Returns a builder for constructing changes to the named child node.
@@ -193,8 +192,8 @@ public interface NodeBuilder {
* @throws IllegalArgumentException if the given name string is empty
* or contains the forward slash character
*/
-@Nonnull
-NodeBuilder child(@Nonnull String name) throws IllegalArgumentException;
+@NotNull
+NodeBuilder child(@NotNull String name) throws IllegalArgumentException;
/**
* Returns a builder for constructing changes to the named child node.
@@ -208,8 +207,8 @@ public interface NodeBuilder {
* @throws IllegalArgumentException if the given name string is empty
* or contains the forward slash character
*/
-@Nonnull
-NodeBuilder getChildNode(@Nonnull String name)
+@NotNull
+NodeBuilder getChildNode(@NotNull String name)
throws IllegalArgumentException;
/**
@@ -222,8 +221,8 @@ public interface NodeBuilder {
* @throws IllegalArgumentException if the given name string is empty
* or contains the forward slash character
*/
-@Nonnull
-NodeBuilder setChildNode(@Nonnull String name)
+@NotNull
+NodeBuilder setChildNode(@NotNull String name)
throws IllegalArgumentException;
/**
@@ -235,8 +234,8 @@ public interface NodeBuilder {
* @throws IllegalArgumentException if the given name string is empty
* or contains the forward slash character
*/
-@Nonnull
-NodeBuilder setChildNode(@Nonnull String name, @Nonnull NodeState
nodeState)
+@NotNull
+NodeBuilder setChildNode(@NotNull String name, @NotNull NodeState
nodeState)
throws IllegalArgumentException;
/**
@@ -267,7 +266,7 @@ public interface NodeBuilder {
* @throws IllegalArgumentException if the given name string is empty
* or contains the forward slash character
*/
-boolean moveTo(@Nonnull NodeBuilder newParent, @Nonnull String newName)
+boolean moveTo(@NotNull NodeBuilder newParent, @NotNull String newName)
throws IllegalArgumentException;
/**
@@ -282,7 +281,7 @@ public interface NodeBuilder {
*
* @return current properties
*/
-@Nonnull
+@NotNull
Iterable getProperties();
/**
@@ -303,7 +302,7 @@ public interface NodeBuilder {
* @param name property name
* @return property state
*/
-@CheckForNull
+@Nullable
PropertyState getProperty(String name);
/**
@@ -321,7 +320,7 @@ public interface NodeBuilder {
* @param name property name
* @return boolean value of the named property, or {@code false}
*/
-boolean getBoolean(@Nonnull String name);
+boolean getBoolean(@NotNull String name);
/**
* Returns the name value of the named property. The implementation
@@ -340,7 +339,7 @@ public interface
svn commit: r1846038 [2/3] - in /jackrabbit/oak/branches/1.8: ./ oak-store-spi/ oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/ oak-store-spi/src/main/java/org/apache/jackrabbit/
Modified:
jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueImpl.java?rev=1846038=1846037=1846038=diff
==
---
jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueImpl.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueImpl.java
Wed Nov 7 14:48:58 2018
@@ -24,7 +24,6 @@ import java.io.InputStream;
import java.math.BigDecimal;
import java.util.Calendar;
-import javax.annotation.Nonnull;
import javax.jcr.Binary;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
@@ -41,6 +40,7 @@ import org.apache.jackrabbit.oak.namepat
import org.apache.jackrabbit.oak.plugins.value.Conversions;
import org.apache.jackrabbit.oak.plugins.value.ErrorValue;
import org.apache.jackrabbit.oak.plugins.value.OakValue;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -66,7 +66,7 @@ class ValueImpl implements JackrabbitVal
* @throws IllegalArgumentException if {@code index <
propertyState.count()}
* @throws RepositoryException if the underlying node state cannot be
accessed
*/
-ValueImpl(@Nonnull PropertyState property, int index, @Nonnull
NamePathMapper namePathMapper)
+ValueImpl(@NotNull PropertyState property, int index, @NotNull
NamePathMapper namePathMapper)
throws RepositoryException {
checkArgument(index < property.count());
this.propertyState = checkNotNull(property);
@@ -83,7 +83,7 @@ class ValueImpl implements JackrabbitVal
* @throws IllegalArgumentException if {@code property.isArray()} is
{@code true}.
* @throws RepositoryException if the underlying node state cannot be
accessed
*/
-ValueImpl(@Nonnull PropertyState property, @Nonnull NamePathMapper
namePathMapper)
+ValueImpl(@NotNull PropertyState property, @NotNull NamePathMapper
namePathMapper)
throws RepositoryException {
this(checkSingleValued(property), 0, namePathMapper);
}
@@ -101,8 +101,8 @@ class ValueImpl implements JackrabbitVal
* the internal representation.
* @throws IllegalArgumentException if {@code index <
propertyState.count()}
*/
-@Nonnull
-static Value newValue(@Nonnull PropertyState property, int index, @Nonnull
NamePathMapper namePathMapper) {
+@NotNull
+static Value newValue(@NotNull PropertyState property, int index, @NotNull
NamePathMapper namePathMapper) {
try {
return new ValueImpl(property, index, namePathMapper);
} catch (RepositoryException e) {
@@ -117,8 +117,8 @@ class ValueImpl implements JackrabbitVal
* the internal representation.
* @throws IllegalArgumentException if {@code property.isArray()} is
{@code true}.
*/
-@Nonnull
-static Value newValue(@Nonnull PropertyState property, @Nonnull
NamePathMapper namePathMapper) {
+@NotNull
+static Value newValue(@NotNull PropertyState property, @NotNull
NamePathMapper namePathMapper) {
try {
return new ValueImpl(property, 0, namePathMapper);
} catch (RepositoryException e) {
@@ -389,4 +389,4 @@ class ValueImpl implements JackrabbitVal
}
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/cluster/ClusterRepositoryInfo.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/cluster/ClusterRepositoryInfo.java?rev=1846038=1846037=1846038=diff
==
---
jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/cluster/ClusterRepositoryInfo.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/cluster/ClusterRepositoryInfo.java
Wed Nov 7 14:48:58 2018
@@ -20,9 +20,6 @@ import static com.google.common.base.Pre
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.Type;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
@@ -30,6 +27,8 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -60,8
svn commit: r1846040 - in /jackrabbit/oak/branches/1.8: ./ oak-parent/pom.xml
Author: reschke Date: Wed Nov 7 15:02:21 2018 New Revision: 1846040 URL: http://svn.apache.org/viewvc?rev=1846040=rev Log: OAK-7669: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - remove JSR305 dependency Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-parent/pom.xml Propchange: jackrabbit/oak/branches/1.8/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 7 15:02:21 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-1836187,1836189-1836196,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-1836187,1836189-1836196,1836206,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-parent/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-parent/pom.xml?rev=1846040=1846039=1846040=diff == --- jackrabbit/oak/branches/1.8/oak-parent/pom.xml (original) +++ jackrabbit/oak/branches/1.8/oak-parent/pom.xml Wed Nov 7 15:02:21 2018 @@ -522,12 +522,6 @@ 6.0.0 -com.google.code.findbugs -jsr305 -2.0.0 -provided - - org.jetbrains annotations 16.0.2
svn commit: r1846030 - in /jackrabbit/oak/branches/1.8: ./ oak-run/ oak-run/src/main/java/org/apache/jackrabbit/oak/checkpoint/ oak-run/src/main/java/org/apache/jackrabbit/oak/console/ oak-run/src/mai
Author: reschke Date: Wed Nov 7 14:21:22 2018 New Revision: 1846030 URL: http://svn.apache.org/viewvc?rev=1846030=rev Log: OAK-7669: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-run Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-run/pom.xml jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/checkpoint/Checkpoints.java jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/console/ConsoleSession.java jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/SegmentTarExplorerBackend.java jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexHelper.java jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/SegmentPropertyIndexEditorProvider.java jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/LuceneIndexerProvider.java jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/NodeStateEntryTraverser.java jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/NodeStateIndexerProvider.java jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/ChildNodeStateProvider.java jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileBufferLinkedList.java jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/LazyChildrenNodeState.java jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionContextWrapper.java jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/BinaryResource.java jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/BlobStoreByteSource.java jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/CSVFileBinaryResourceProvider.java jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/NodeStoreBinaryResourceProvider.java jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TikaHelper.java jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java jackrabbit/oak/branches/1.8/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCheckTest.java Propchange: jackrabbit/oak/branches/1.8/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 7 14:21:22 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-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
svn commit: r1846032 - in /jackrabbit/oak/branches/1.8: ./ oak-search-mt/ oak-search-mt/src/main/java/org/apache/jackrabbit/oak/plugins/index/mt/
Author: reschke Date: Wed Nov 7 14:24:58 2018 New Revision: 1846032 URL: http://svn.apache.org/viewvc?rev=1846032=rev Log: OAK-7669: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-search-mt Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-search-mt/pom.xml jackrabbit/oak/branches/1.8/oak-search-mt/src/main/java/org/apache/jackrabbit/oak/plugins/index/mt/MTFulltextQueryTermsProvider.java jackrabbit/oak/branches/1.8/oak-search-mt/src/main/java/org/apache/jackrabbit/oak/plugins/index/mt/MTFulltextQueryTermsProviderFactory.java Propchange: jackrabbit/oak/branches/1.8/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 7 14:24:58 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-1836187,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-1836187,1836189,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-search-mt/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-search-mt/pom.xml?rev=1846032=1846031=1846032=diff == --- jackrabbit/oak/branches/1.8/oak-search-mt/pom.xml (original) +++ jackrabbit/oak/branches/1.8/oak-search-mt/pom.xml Wed Nov 7 14:24:58 2018 @@ -131,10 +131,10 @@ provided - + -com.google.code.findbugs -jsr305 +org.jetbrains +annotations provided Modified:
svn commit: r1846033 [1/5] - in /jackrabbit/oak/branches/1.8: ./ oak-security-spi/ oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/ oak-security-spi/src/main/java/org/apache/jack
Author: reschke Date: Wed Nov 7 14:29:24 2018 New Revision: 1846033 URL: http://svn.apache.org/viewvc?rev=1846033=rev Log: OAK-7669: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-security-spi Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-security-spi/pom.xml jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/RootProvider.java jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeContext.java jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeLocation.java jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeProvider.java jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeTypeAware.java jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeTypeProvider.java jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeUtil.java jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/package-info.java jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationBase.java jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParameters.java jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/Context.java jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/OpenSecurityProvider.java jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/SecurityConfiguration.java jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/SecurityProvider.java jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AuthInfoImpl.java jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/Authentication.java jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AuthenticationConfiguration.java jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/LoginContextProvider.java jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/OpenAuthenticationConfiguration.java jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/callback/CredentialsCallback.java jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/callback/RepositoryCallback.java jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/callback/SecurityProviderCallback.java jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/callback/package-info.java jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/AbstractCredentials.java jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CompositeCredentialsSupport.java jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CredentialsSupport.java jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/SimpleCredentialsSupport.java jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/package-info.java jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/package-info.java jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/CompositeTokenConfiguration.java jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/CompositeTokenProvider.java
svn commit: r1846033 [3/5] - in /jackrabbit/oak/branches/1.8: ./ oak-security-spi/ oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/ oak-security-spi/src/main/java/org/apache/jack
Modified:
jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/PermissionProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/PermissionProvider.java?rev=1846033=1846032=1846033=diff
==
---
jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/PermissionProvider.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/PermissionProvider.java
Wed Nov 7 14:29:24 2018
@@ -17,11 +17,10 @@
package org.apache.jackrabbit.oak.spi.security.authorization.permission;
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.Tree;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Main entry point for permission evaluation in Oak. This provider covers
@@ -48,7 +47,7 @@ public interface PermissionProvider {
* @param tree The {@code tree} for which the privileges should be
retrieved.
* @return set of privilege names
*/
-@Nonnull
+@NotNull
Set getPrivileges(@Nullable Tree tree);
/**
@@ -67,7 +66,7 @@ public interface PermissionProvider {
* @param privilegeNames The name of the privileges.
* @return {@code true} if all privileges are granted; {@code false}
otherwise.
*/
-boolean hasPrivileges(@Nullable Tree tree, @Nonnull String...
privilegeNames);
+boolean hasPrivileges(@Nullable Tree tree, @NotNull String...
privilegeNames);
/**
* Return the {@code RepositoryPermission} for the set of {@code
Principal}s
@@ -76,7 +75,7 @@ public interface PermissionProvider {
* @return The {@link
org.apache.jackrabbit.oak.spi.security.authorization.permission.RepositoryPermission}
* for the set of {@code Principal}s this provider instance has been
created for.
*/
-@Nonnull
+@NotNull
RepositoryPermission getRepositoryPermission();
/**
@@ -88,8 +87,8 @@ public interface PermissionProvider {
* obtained before for the parent tree.
* @return The {@code TreePermission} object for the specified {@code
tree}.
*/
-@Nonnull
-TreePermission getTreePermission(@Nonnull Tree tree, @Nonnull
TreePermission parentPermission);
+@NotNull
+TreePermission getTreePermission(@NotNull Tree tree, @NotNull
TreePermission parentPermission);
/**
* Test if the specified permissions are granted for the set of {@code
Principal}s
@@ -104,7 +103,7 @@ public interface PermissionProvider {
* @return {@code true} if the specified permissions are granted for the
item identified
* by the given tree and optionally property state.
*/
-boolean isGranted(@Nonnull Tree tree, @Nullable PropertyState property,
long permissions);
+boolean isGranted(@NotNull Tree tree, @Nullable PropertyState property,
long permissions);
/**
* Tests if the the specified actions are granted at the given path for
@@ -122,5 +121,5 @@ public interface PermissionProvider {
* @return {@code true} if all actions are granted at the specified path;
* {@code false} otherwise.
*/
-boolean isGranted(@Nonnull String oakPath, @Nonnull String jcrActions);
+boolean isGranted(@NotNull String oakPath, @NotNull String jcrActions);
}
Modified:
jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/Permissions.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/Permissions.java?rev=1846033=1846032=1846033=diff
==
---
jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/Permissions.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/Permissions.java
Wed Nov 7 14:29:24 2018
@@ -22,8 +22,6 @@ import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.Session;
import com.google.common.base.Predicate;
@@ -37,6 +35,8 @@ import org.apache.jackrabbit.oak.spi.nod
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
import org.apache.jackrabbit.oak.spi.version.VersionConstants;
import org.apache.jackrabbit.util.Text;
+import
svn commit: r1846033 [2/5] - in /jackrabbit/oak/branches/1.8: ./ oak-security-spi/ oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/ oak-security-spi/src/main/java/org/apache/jack
Modified:
jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java?rev=1846033=1846032=1846033=diff
==
---
jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java
Wed Nov 7 14:29:24 2018
@@ -24,8 +24,6 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
import javax.jcr.Credentials;
import javax.jcr.NoSuchWorkspaceException;
import javax.security.auth.Subject;
@@ -52,6 +50,8 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.principal.PrincipalProvider;
import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration;
import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -225,7 +225,7 @@ public abstract class AbstractLoginModul
/**
* @return A set of supported credential classes.
*/
-@Nonnull
+@NotNull
protected abstract Set getSupportedCredentials();
/**
@@ -239,7 +239,7 @@ public abstract class AbstractLoginModul
*
* @return Valid (supported) credentials or {@code null}.
*/
-@CheckForNull
+@Nullable
protected Credentials getCredentials() {
Set supported = getSupportedCredentials();
if (callbackHandler != null) {
@@ -284,7 +284,7 @@ public abstract class AbstractLoginModul
* @return The credentials passed to this login module with the shared
state.
* @see #SHARED_KEY_CREDENTIALS
*/
-@CheckForNull
+@Nullable
protected Credentials getSharedCredentials() {
Credentials shared = null;
if (sharedState.containsKey(SHARED_KEY_CREDENTIALS)) {
@@ -303,7 +303,7 @@ public abstract class AbstractLoginModul
* @return The login name passed to this login module with the shared
state.
* @see #SHARED_KEY_LOGIN_NAME
*/
-@CheckForNull
+@Nullable
protected String getSharedLoginName() {
if (sharedState.containsKey(SHARED_KEY_LOGIN_NAME)) {
return sharedState.get(SHARED_KEY_LOGIN_NAME).toString();
@@ -316,7 +316,7 @@ public abstract class AbstractLoginModul
* @return The pre authenticated login or {@code null}
* @see #SHARED_KEY_PRE_AUTH_LOGIN
*/
-@CheckForNull
+@Nullable
protected PreAuthenticatedLogin getSharedPreAuthLogin() {
Object login = sharedState.get(SHARED_KEY_PRE_AUTH_LOGIN);
if (login instanceof PreAuthenticatedLogin) {
@@ -335,7 +335,7 @@ public abstract class AbstractLoginModul
* @return The {@code SecurityProvider} associated with this
* {@code LoginModule} or {@code null}.
*/
-@CheckForNull
+@Nullable
protected SecurityProvider getSecurityProvider() {
if (securityProvider == null && callbackHandler != null) {
RepositoryCallback rcb = new RepositoryCallback();
@@ -358,7 +358,7 @@ public abstract class AbstractLoginModul
* @return The {@code Whiteboard} associated with this
* {@code LoginModule} or {@code null}.
*/
-@CheckForNull
+@Nullable
protected Whiteboard getWhiteboard() {
if (whiteboard == null && callbackHandler != null) {
WhiteboardCallback cb = new WhiteboardCallback();
@@ -381,7 +381,7 @@ public abstract class AbstractLoginModul
* @return The {@code Root} associated with this {@code LoginModule} or
* {@code null}.
*/
-@CheckForNull
+@Nullable
protected Root getRoot() {
if (root == null && callbackHandler != null) {
try {
@@ -414,7 +414,7 @@ public abstract class AbstractLoginModul
*
* @return A instance of {@code UserManager} or {@code null}.
*/
-@CheckForNull
+@Nullable
protected UserManager getUserManager() {
UserManager userManager = null;
SecurityProvider sp = getSecurityProvider();
@@ -444,7 +444,7 @@ public abstract class AbstractLoginModul
*
* @return A instance of {@code PrincipalProvider} or {@code null}.
*/
-@CheckForNull
+@Nullable
protected PrincipalProvider getPrincipalProvider() {
PrincipalProvider principalProvider = null;
SecurityProvider sp = getSecurityProvider();
@@ -474,8 +474,8 @@
svn commit: r1846034 [4/5] - in /jackrabbit/oak/branches/1.8: ./ oak-segment-tar/ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/ oak-segment-tar/src/main/java/org/apache/jackrabb
Modified:
jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/Reclaimers.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/Reclaimers.java?rev=1846034=1846033=1846034=diff
==
---
jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/Reclaimers.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/Reclaimers.java
Wed Nov 7 14:34:38 2018
@@ -19,11 +19,10 @@ package org.apache.jackrabbit.oak.segmen
import static com.google.common.base.Preconditions.checkNotNull;
-import javax.annotation.Nonnull;
-
import com.google.common.base.Predicate;
import org.apache.jackrabbit.oak.segment.compaction.SegmentGCOptions.GCType;
import org.apache.jackrabbit.oak.segment.file.tar.GCGeneration;
+import org.jetbrains.annotations.NotNull;
/**
* Helper class exposing static factories for reclaimers. A reclaimer
@@ -59,8 +58,8 @@ class Reclaimers {
* @param retainedGenerations number of generations to retain.
*/
static Predicate newOldReclaimer(
-@Nonnull GCType lastGCType,
-@Nonnull final GCGeneration referenceGeneration,
+@NotNull GCType lastGCType,
+@NotNull final GCGeneration referenceGeneration,
int retainedGenerations) {
switch (checkNotNull(lastGCType)) {
@@ -74,7 +73,7 @@ class Reclaimers {
}
private static Predicate newOldFullReclaimer(
-@Nonnull final GCGeneration referenceGeneration,
+@NotNull final GCGeneration referenceGeneration,
int retainedGenerations) {
return new Predicate() {
@@ -104,7 +103,7 @@ class Reclaimers {
}
private static Predicate newOldTailReclaimer(
-@Nonnull final GCGeneration referenceGeneration,
+@NotNull final GCGeneration referenceGeneration,
int retainedGenerations) {
return new Predicate() {
@@ -141,7 +140,7 @@ class Reclaimers {
* @return an new instance of an exact reclaimer for segments with their
generation
* matching {@code referenceGeneration}.
*/
-static Predicate newExactReclaimer(@Nonnull final
GCGeneration referenceGeneration) {
+static Predicate newExactReclaimer(@NotNull final
GCGeneration referenceGeneration) {
return new Predicate() {
@Override
public boolean apply(GCGeneration generation) {
Modified:
jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/SafeRunnable.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/SafeRunnable.java?rev=1846034=1846033=1846034=diff
==
---
jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/SafeRunnable.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/SafeRunnable.java
Wed Nov 7 14:34:38 2018
@@ -22,8 +22,7 @@ package org.apache.jackrabbit.oak.segmen
import static com.google.common.base.Preconditions.checkNotNull;
import static java.lang.Thread.currentThread;
-import javax.annotation.Nonnull;
-
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,10 +40,10 @@ class SafeRunnable implements Runnable {
private static final Logger log =
LoggerFactory.getLogger(SafeRunnable.class);
-@Nonnull
+@NotNull
private final String name;
-@Nonnull
+@NotNull
private final Runnable runnable;
/**
@@ -54,7 +53,7 @@ class SafeRunnable implements Runnable {
* @param name The name of the background operation.
* @param runnable The background operation.
*/
-SafeRunnable(@Nonnull String name, @Nonnull Runnable runnable) {
+SafeRunnable(@NotNull String name, @NotNull Runnable runnable) {
this.name = checkNotNull(name);
this.runnable = checkNotNull(runnable);
}
Modified:
jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/Scheduler.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/Scheduler.java?rev=1846034=1846033=1846034=diff
==
---
jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/Scheduler.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/Scheduler.java
Wed Nov 7
svn commit: r1846034 [3/5] - in /jackrabbit/oak/branches/1.8: ./ oak-segment-tar/ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/ oak-segment-tar/src/main/java/org/apache/jackrabb
Modified:
jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentTracker.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentTracker.java?rev=1846034=1846033=1846034=diff
==
---
jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentTracker.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentTracker.java
Wed Nov 7 14:34:38 2018
@@ -26,7 +26,7 @@ import java.util.Set;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
/**
* Tracker of references to segment identifiers and segment instances
@@ -47,7 +47,7 @@ public class SegmentTracker implements S
/**
* The random number source for generating new segment identifiers.
*/
-@Nonnull
+@NotNull
private final SecureRandom random = new SecureRandom();
/**
@@ -59,19 +59,19 @@ public class SegmentTracker implements S
* (when there are no matching identifiers) or a list of weak references
* to the matching identifiers.
*/
-@Nonnull
+@NotNull
private final SegmentIdTable[] tables = new SegmentIdTable[32];
/**
* Number of segment tracked since this tracker was instantiated
*/
-@Nonnull
+@NotNull
private final AtomicInteger segmentCounter = new AtomicInteger();
-@Nonnull
+@NotNull
private final SegmentIdFactory segmentIdFactory;
-public SegmentTracker(@Nonnull SegmentIdFactory segmentIdFactory) {
+public SegmentTracker(@NotNull SegmentIdFactory segmentIdFactory) {
this.segmentIdFactory = checkNotNull(segmentIdFactory);
for (int i = 0; i < tables.length; i++) {
tables[i] = new SegmentIdTable();
@@ -105,7 +105,7 @@ public class SegmentTracker implements S
* @return the segment id
*/
@Override
-@Nonnull
+@NotNull
public SegmentId newSegmentId(long msb, long lsb) {
int index = ((int) msb) & (tables.length - 1);
return tables[index].newSegmentId(msb, lsb, segmentIdFactory);
@@ -117,7 +117,7 @@ public class SegmentTracker implements S
* @return the segment id
*/
@Override
-@Nonnull
+@NotNull
public SegmentId newDataSegmentId() {
return newSegmentId(DATA);
}
@@ -128,12 +128,12 @@ public class SegmentTracker implements S
* @return the segment id
*/
@Override
-@Nonnull
+@NotNull
public SegmentId newBulkSegmentId() {
return newSegmentId(BULK);
}
-@Nonnull
+@NotNull
private SegmentId newSegmentId(long type) {
segmentCounter.incrementAndGet();
long msb = (random.nextLong() & MSB_MASK) | VERSION;
@@ -141,7 +141,7 @@ public class SegmentTracker implements S
return newSegmentId(msb, lsb);
}
-public synchronized void clearSegmentIdTables(@Nonnull Set
reclaimed, @Nonnull String gcInfo) {
+public synchronized void clearSegmentIdTables(@NotNull Set
reclaimed, @NotNull String gcInfo) {
for (SegmentIdTable table : tables) {
table.clearSegmentIdTables(reclaimed, gcInfo);
}
Modified:
jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriter.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriter.java?rev=1846034=1846033=1846034=diff
==
---
jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriter.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriter.java
Wed Nov 7 14:34:38 2018
@@ -23,12 +23,11 @@ import java.nio.ByteBuffer;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Converts nodes, properties, values, etc. to records and persists them.
@@ -46,9 +45,9 @@ public interface SegmentWriter {
* @return the record id of the map written
* @throws IOException
*/
-@Nonnull
+@NotNull
// TODO frm this method is only used from test code, should it be removed?
-RecordId writeMap(@Nullable MapRecord base, @Nonnull Map
changes) throws IOException;
+RecordId writeMap(@Nullable MapRecord base, @NotNull Map
changes)
svn commit: r1846034 [1/5] - in /jackrabbit/oak/branches/1.8: ./ oak-segment-tar/ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/ oak-segment-tar/src/main/java/org/apache/jackrabb
Author: reschke Date: Wed Nov 7 14:34:38 2018 New Revision: 1846034 URL: http://svn.apache.org/viewvc?rev=1846034=rev Log: OAK-7669: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-segment-tar Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-segment-tar/pom.xml jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreBackupImpl.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreBackupRestoreImpl.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Cache.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CacheAccessTracker.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CacheWeights.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CheckpointCompactor.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Compactor.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriterBuilder.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/IdentityRecordNumbers.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/IllegalSegmentReferences.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ImmutableRecordNumbers.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapEntry.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapRecord.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MutableRecordNumbers.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MutableSegmentReferences.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/PropertyTemplate.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Record.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordId.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordNumbers.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordUsageAnalyser.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Revisions.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBlob.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriter.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPool.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentDiscoveryLiteDescriptors.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentId.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentIdFactory.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentIdProvider.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentIdTable.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeBuilder.java jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeState.java
svn commit: r1846036 - in /jackrabbit/oak/branches/1.8: ./ oak-store-composite/ oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/ oak-store-composite/src/test/java/org/apache/jack
Author: reschke Date: Wed Nov 7 14:39:07 2018 New Revision: 1846036 URL: http://svn.apache.org/viewvc?rev=1846036=rev Log: OAK-7669: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-store-composite Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-store-composite/pom.xml jackrabbit/oak/branches/1.8/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CommitHookEnhancer.java jackrabbit/oak/branches/1.8/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/PrivateStoreValidatorProvider.java jackrabbit/oak/branches/1.8/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/package-info.java jackrabbit/oak/branches/1.8/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/CompositeChildrenCountTest.java Propchange: jackrabbit/oak/branches/1.8/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 7 14:39:07 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-1836187,1836189-1836192,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-1836187,1836189-1836193,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-store-composite/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-composite/pom.xml?rev=1846036=1846035=1846036=diff == --- jackrabbit/oak/branches/1.8/oak-store-composite/pom.xml (original) +++
svn commit: r1846039 - in /jackrabbit/oak/branches/1.8: ./ oak-upgrade/ oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/ oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/checkpo
Author: reschke Date: Wed Nov 7 14:51:01 2018 New Revision: 1846039 URL: http://svn.apache.org/viewvc?rev=1846039=rev Log: OAK-7669: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-upgrade Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-upgrade/pom.xml jackrabbit/oak/branches/1.8/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java jackrabbit/oak/branches/1.8/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/PersistingDiff.java jackrabbit/oak/branches/1.8/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java jackrabbit/oak/branches/1.8/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java jackrabbit/oak/branches/1.8/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/UpgradeRoot.java jackrabbit/oak/branches/1.8/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/checkpoint/CheckpointRetriever.java jackrabbit/oak/branches/1.8/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/LoopbackBlobStore.java jackrabbit/oak/branches/1.8/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/SafeDataStoreBlobStore.java jackrabbit/oak/branches/1.8/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentFactory.java jackrabbit/oak/branches/1.8/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/nodestate/MetadataExposingNodeState.java jackrabbit/oak/branches/1.8/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/nodestate/NameFilteringNodeState.java jackrabbit/oak/branches/1.8/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/security/GroupEditor.java jackrabbit/oak/branches/1.8/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/security/GroupEditorProvider.java jackrabbit/oak/branches/1.8/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepeatedRepositoryUpgradeTest.java jackrabbit/oak/branches/1.8/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/AbstractOak2OakTest.java Propchange: jackrabbit/oak/branches/1.8/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 7 14:51:01 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-1836187,1836189-1836195,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
svn commit: r1846031 - in /jackrabbit/oak/branches/1.8: ./ oak-run-commons/ oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/ oak-run-commons/src/main/java/org/apache/jackrabbit/oak/plu
Author: reschke Date: Wed Nov 7 14:22:58 2018 New Revision: 1846031 URL: http://svn.apache.org/viewvc?rev=1846031=rev Log: OAK-7669: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-run-commons Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-run-commons/pom.xml jackrabbit/oak/branches/1.8/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/BlobStoreFixture.java jackrabbit/oak/branches/1.8/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/SegmentTarFixture.java jackrabbit/oak/branches/1.8/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreHelper.java jackrabbit/oak/branches/1.8/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentHelper.java jackrabbit/oak/branches/1.8/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/BlobStoreFixtureProvider.java jackrabbit/oak/branches/1.8/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/NodeStoreFixture.java jackrabbit/oak/branches/1.8/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/OakHelpFormatter.java Propchange: jackrabbit/oak/branches/1.8/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 7 14:22:58 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-1836186,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-1836187,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-run-commons/pom.xml URL:
svn commit: r1846034 [5/5] - in /jackrabbit/oak/branches/1.8: ./ oak-segment-tar/ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/ oak-segment-tar/src/main/java/org/apache/jackrabb
Modified:
jackrabbit/oak/branches/1.8/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java?rev=1846034=1846033=1846034=diff
==
---
jackrabbit/oak/branches/1.8/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java
Wed Nov 7 14:34:38 2018
@@ -34,14 +34,13 @@ import static org.junit.Assert.fail;
import java.io.File;
import java.io.IOException;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.segment.SegmentVersion;
import org.apache.jackrabbit.oak.segment.data.SegmentData;
import org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException;
import org.apache.jackrabbit.oak.segment.file.tar.IOMonitorAdapter;
import org.apache.jackrabbit.oak.segment.file.tar.TarFiles;
import org.apache.jackrabbit.oak.segment.tool.Compact;
+import org.jetbrains.annotations.NotNull;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -128,7 +127,7 @@ public class UpgradeIT {
true, version, version).checkManifest();
}
-private void checkSegmentVersion(@Nonnull SegmentVersion version) throws
IOException {
+private void checkSegmentVersion(@NotNull SegmentVersion version) throws
IOException {
try (TarFiles tarFiles = TarFiles.builder()
.withDirectory(fileStoreHome.getRoot())
.withTarRecovery((_1, _2, _3) -> fail("Unexpected recovery"))
@@ -145,7 +144,7 @@ public class UpgradeIT {
}
}
-private static Iterable getSegments(@Nonnull TarFiles
tarFiles) {
+private static Iterable getSegments(@NotNull TarFiles
tarFiles) {
return transform(
tarFiles.getSegmentIds(),
uuid -> newSegmentData(tarFiles.readSegment(
svn commit: r1846034 [2/5] - in /jackrabbit/oak/branches/1.8: ./ oak-segment-tar/ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/ oak-segment-tar/src/main/java/org/apache/jackrabb
Modified:
jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java?rev=1846034=1846033=1846034=diff
==
---
jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java
Wed Nov 7 14:34:38 2018
@@ -24,11 +24,10 @@ import static org.apache.jackrabbit.oak.
import java.util.Arrays;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.cache.CacheLIRS;
import org.apache.jackrabbit.oak.cache.CacheStats;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import com.google.common.base.Function;
import com.google.common.cache.Weigher;
@@ -39,22 +38,22 @@ import com.google.common.cache.Weigher;
*/
public abstract class ReaderCache {
-@Nonnull
+@NotNull
private final Weigher weigher;
-@Nonnull
+@NotNull
private final String name;
/**
* The fast (array based) cache.
*/
-@CheckForNull
+@Nullable
private final FastCache fastCache;
/**
* The slower (LIRS) cache.
*/
-@Nonnull
+@NotNull
private final CacheLIRS cache;
/**
@@ -66,7 +65,7 @@ public abstract class ReaderCache {
* @param weigher Needed to provide an estimation of the cache weight in
memory
*/
protected ReaderCache(long maxWeight, int averageWeight,
-@Nonnull String name, @Nonnull Weigher weigher) {
+@NotNull String name, @NotNull Weigher weigher) {
this.name = checkNotNull(name);
this.weigher = checkNotNull(weigher);
fastCache = new FastCache<>();
@@ -78,7 +77,7 @@ public abstract class ReaderCache {
.build();
}
-@Nonnull
+@NotNull
public CacheStats getStats() {
return new CacheStats(cache, name, weigher, cache.getMaxMemory());
}
@@ -98,7 +97,7 @@ public abstract class ReaderCache {
* @param loader the loader function
* @return the value
*/
-@Nonnull
+@NotNull
public T get(long msb, long lsb, int offset, Function loader) {
int hash = getEntryHash(msb, lsb, offset);
if (fastCache == null) {
@@ -266,4 +265,4 @@ public abstract class ReaderCache {
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Record.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Record.java?rev=1846034=1846033=1846034=diff
==
---
jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Record.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Record.java
Wed Nov 7 14:34:38 2018
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.segment;
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
/**
* Record within a segment.
@@ -29,11 +29,11 @@ class Record {
return a instanceof Record && fastEquals((Record) a, b);
}
-private static boolean fastEquals(@Nonnull Record a, Object b) {
+private static boolean fastEquals(@NotNull Record a, Object b) {
return b instanceof Record && fastEquals(a, (Record) b);
}
-private static boolean fastEquals(@Nonnull Record a, @Nonnull Record b) {
+private static boolean fastEquals(@NotNull Record a, @NotNull Record b) {
return a == b || (a.recordNumber == b.recordNumber &&
a.segmentId.equals(b.segmentId));
}
@@ -52,11 +52,11 @@ class Record {
*
* @param id record identified
*/
-protected Record(@Nonnull RecordId id) {
+protected Record(@NotNull RecordId id) {
this(id.getSegmentId(), id.getRecordNumber());
}
-protected Record(@Nonnull SegmentId segmentId, int recordNumber) {
+protected Record(@NotNull SegmentId segmentId, int recordNumber) {
this.segmentId = segmentId;
this.recordNumber = recordNumber;
}
Modified:
jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java?rev=1846034=1846033=1846034=diff
==
---
svn commit: r1846035 - in /jackrabbit/oak/branches/1.8: ./ oak-solr-core/ oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/ oak-solr-core/src/main/java/org/apache
Author: reschke Date: Wed Nov 7 14:36:46 2018 New Revision: 1846035 URL: http://svn.apache.org/viewvc?rev=1846035=rev Log: OAK-7669: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-solr-core Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-solr-core/pom.xml jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultSolrConfiguration.java jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultSolrConfigurationProvider.java jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfiguration.java jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfigurationProvider.java jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfigurationProvider.java jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/NodeStateSolrServerConfigurationProvider.java jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/NodeStateSolrServersObserver.java jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.java jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorProvider.java jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/EmbeddedSolrServerConfigurationProvider.java jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/OakSolrConfigurationProviderService.java jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/RemoteSolrServerConfigurationProvider.java jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrIndexEditorProviderService.java jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrServerProviderService.java jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexProvider.java jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/DefaultSolrServerProvider.java jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProvider.java jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/OakSolrServer.java jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/RemoteSolrServerProvider.java jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/SolrServerProvider.java jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/SolrServerRegistry.java jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/util/SolrIndexInitializer.java jackrabbit/oak/branches/1.8/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/SolrOakRepositoryStub.java jackrabbit/oak/branches/1.8/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/TestUtils.java jackrabbit/oak/branches/1.8/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorTest.java jackrabbit/oak/branches/1.8/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexLookupTest.java Propchange: jackrabbit/oak/branches/1.8/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 7 14:36:46 2018 @@ -1,3 +1,3 @@ /jackrabbit/oak/branches/1.0:1665962
svn commit: r1846037 [3/6] - in /jackrabbit/oak/branches/1.8: ./ oak-store-document/ oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ oak-store-document/src/main/java/org/a
Modified:
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java?rev=1846037=1846036=1846037=diff
==
---
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
Wed Nov 7 14:46:03 2018
@@ -32,10 +32,6 @@ import java.util.TreeMap;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.collect.AbstractIterator;
@@ -52,6 +48,8 @@ import org.apache.jackrabbit.oak.commons
import org.apache.jackrabbit.oak.commons.json.JsopWriter;
import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -357,7 +355,7 @@ public final class NodeDocument extends
private final long creationTime;
-NodeDocument(@Nonnull DocumentStore store) {
+NodeDocument(@NotNull DocumentStore store) {
this(store, Revision.getCurrentTimestamp());
}
@@ -368,7 +366,7 @@ public final class NodeDocument extends
* @param creationTime time at which it was created. Would be different
from current time
* in case of being resurrected from a serialized for
*/
-public NodeDocument(@Nonnull DocumentStore store, long creationTime) {
+public NodeDocument(@NotNull DocumentStore store, long creationTime) {
this.store = checkNotNull(store);
this.creationTime = creationTime;
}
@@ -382,8 +380,8 @@ public final class NodeDocument extends
* @param key a string key.
* @return the map associated with the key.
*/
-@Nonnull
-public Map getValueMap(@Nonnull String key) {
+@NotNull
+public Map getValueMap(@NotNull String key) {
return ValueMap.create(this, key);
}
@@ -400,7 +398,7 @@ public final class NodeDocument extends
* @return the time in seconds this document was last modified with five
* seconds precision. Returns {@code null} if none is set.
*/
-@CheckForNull
+@Nullable
public Long getModified() {
return (Long) get(MODIFIED_IN_SECS);
}
@@ -498,7 +496,7 @@ public final class NodeDocument extends
*
* @return the path of the main document.
*/
-@Nonnull
+@NotNull
public String getMainPath() {
String p = getPath();
if (p.startsWith("p")) {
@@ -516,7 +514,7 @@ public final class NodeDocument extends
/**
* @return a map of the last known revision for each clusterId.
*/
-@Nonnull
+@NotNull
public Map getLastRev() {
Map map = Maps.newHashMap();
Map valueMap = getLocalMap(LAST_REV);
@@ -539,7 +537,7 @@ public final class NodeDocument extends
* @param revision the revision to check.
* @return true if this document contains the given revision.
*/
-public boolean containsRevision(@Nonnull Revision revision) {
+public boolean containsRevision(@NotNull Revision revision) {
if (getLocalRevisions().containsKey(revision)) {
return true;
}
@@ -621,8 +619,8 @@ public final class NodeDocument extends
* @param changes the changes to check.
* @return the conflict revisions.
*/
-@Nonnull
-Set getConflictsFor(@Nonnull Iterable changes) {
+@NotNull
+Set getConflictsFor(@NotNull Iterable changes) {
checkNotNull(changes);
Set conflicts = Sets.newHashSet();
@@ -649,7 +647,7 @@ public final class NodeDocument extends
* @param revision a revision.
* @return the commit root path or null.
*/
-@CheckForNull
+@Nullable
public String getCommitRootPath(Revision revision) {
String depth = getCommitRootDepth(revision);
if (depth != null) {
@@ -687,7 +685,7 @@ public final class NodeDocument extends
* {@code null} if {@code changeRev} is not a branch commit.
* @param collisions changes that happened after {@code baseRev}.
*/
-@CheckForNull
+@Nullable
Revision getNewestRevision(final RevisionContext context,
final RevisionVector baseRev,
final Revision changeRev,
@@
svn commit: r1846037 [2/6] - in /jackrabbit/oak/branches/1.8: ./ oak-store-document/ oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ oak-store-document/src/main/java/org/a
Modified:
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1846037=1846036=1846037=diff
==
---
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
Wed Nov 7 14:46:03 2018
@@ -63,9 +63,6 @@ import java.util.concurrent.atomic.Atomi
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.PropertyType;
import javax.management.NotCompliantMBeanException;
@@ -125,6 +122,8 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
import org.apache.jackrabbit.oak.stats.Clock;
import org.apache.jackrabbit.oak.commons.PerfLogger;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -252,7 +251,7 @@ public final class DocumentNodeStore
/**
* The cluster instance info.
*/
-@Nonnull
+@NotNull
private final ClusterNodeInfo clusterNodeInfo;
/**
@@ -320,13 +319,13 @@ public final class DocumentNodeStore
/**
* Background thread performing the clusterId lease renew.
*/
-@Nonnull
+@NotNull
private Thread leaseUpdateThread;
/**
* Background thread performing the cluster update
*/
-@Nonnull
+@NotNull
private Thread clusterUpdateThread;
/**
@@ -767,7 +766,7 @@ public final class DocumentNodeStore
Revision tombstone = commitQueue.createRevision();
commitQueue.done(tombstone, new CommitQueue.Callback() {
@Override
-public void headOfQueue(@Nonnull Revision revision) {
+public void headOfQueue(@NotNull Revision revision) {
setRoot(getHeadRevision().update(revision));
unsavedLastRevisions.put(ROOT_PATH, revision);
}
@@ -840,12 +839,12 @@ public final class DocumentNodeStore
return (readOnlyMode?"readOnly:true, ":"") +
clusterNodeInfo.toString().replaceAll("[\r\n\t]", " ").trim();
}
-void setRoot(@Nonnull RevisionVector newHead) {
+void setRoot(@NotNull RevisionVector newHead) {
checkArgument(!newHead.isBranch());
root = getRoot(newHead);
}
-@Nonnull
+@NotNull
public DocumentStore getDocumentStore() {
return store;
}
@@ -864,7 +863,7 @@ public final class DocumentNodeStore
* free to remove the commits associated with the branch.
* @return a new commit.
*/
-@Nonnull
+@NotNull
Commit newCommit(@Nullable RevisionVector base,
@Nullable DocumentNodeStoreBranch branch) {
if (base == null) {
@@ -887,7 +886,7 @@ public final class DocumentNodeStore
* @param numBranchCommits the number of branch commits to merge.
* @return a new merge commit.
*/
-@Nonnull
+@NotNull
MergeCommit newMergeCommit(@Nullable RevisionVector base, int
numBranchCommits) {
if (base == null) {
base = getHeadRevision();
@@ -907,14 +906,14 @@ public final class DocumentNodeStore
return c;
}
-RevisionVector done(final @Nonnull Commit c, boolean isBranch, final
@Nonnull CommitInfo info) {
+RevisionVector done(final @NotNull Commit c, boolean isBranch, final
@NotNull CommitInfo info) {
if (commitQueue.contains(c.getRevision())) {
try {
inDoubtTrunkCommits.remove(c.getRevision());
final RevisionVector[] newHead = new RevisionVector[1];
commitQueue.done(c.getRevision(), new CommitQueue.Callback() {
@Override
-public void headOfQueue(@Nonnull Revision revision) {
+public void headOfQueue(@NotNull Revision revision) {
// remember before revision
RevisionVector before = getHeadRevision();
// apply changes to cache based on before revision
@@ -1025,7 +1024,7 @@ public final class DocumentNodeStore
this.journalPushThreshold = journalPushThreshold;
}
-@Nonnull
+@NotNull
public ClusterNodeInfo getClusterInfo() {
return clusterNodeInfo;
}
@@ -1038,7 +1037,7 @@ public final class DocumentNodeStore
return nodeChildrenCacheStats;
}
-
svn commit: r1846037 [5/6] - in /jackrabbit/oak/branches/1.8: ./ oak-store-document/ oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ oak-store-document/src/main/java/org/a
Modified:
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MongoConnection.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MongoConnection.java?rev=1846037=1846036=1846037=diff
==
---
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MongoConnection.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MongoConnection.java
Wed Nov 7 14:46:03 2018
@@ -19,8 +19,6 @@ package org.apache.jackrabbit.oak.plugin
import java.util.Set;
import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
-
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.mongodb.DB;
@@ -34,6 +32,8 @@ import com.mongodb.WriteConcern;
import static com.google.common.base.Preconditions.checkNotNull;
+import org.jetbrains.annotations.NotNull;
+
/**
* The {@code MongoConnection} abstracts connection to the {@code MongoDB}.
*/
@@ -97,7 +97,7 @@ public class MongoConnection {
*
* @return The {@link DB}.
*/
-public DB getDB(@Nonnull String name) {
+public DB getDB(@NotNull String name) {
return mongo.getDB(name);
}
@@ -142,7 +142,7 @@ public class MongoConnection {
* @return {@code true} if the URI has a write concern set, {@code false}
* otherwise.
*/
-public static boolean hasWriteConcern(@Nonnull String uri) {
+public static boolean hasWriteConcern(@NotNull String uri) {
MongoClientOptions.Builder builder = MongoClientOptions.builder();
builder.writeConcern(WC_UNKNOWN);
WriteConcern wc = new MongoClientURI(checkNotNull(uri), builder)
@@ -156,7 +156,7 @@ public class MongoConnection {
* @return {@code true} if the URI has a read concern set, {@code false}
* otherwise.
*/
-public static boolean hasReadConcern(@Nonnull String uri) {
+public static boolean hasReadConcern(@NotNull String uri) {
ReadConcern rc = new MongoClientURI(checkNotNull(uri))
.getOptions().getReadConcern();
return readConcernLevel(rc) != null;
@@ -172,7 +172,7 @@ public class MongoConnection {
* @param db the connection to MongoDB.
* @return the default write concern to use for Oak.
*/
-public static WriteConcern getDefaultWriteConcern(@Nonnull DB db) {
+public static WriteConcern getDefaultWriteConcern(@NotNull DB db) {
WriteConcern w;
if (checkNotNull(db).getMongo().getReplicaSetStatus() != null) {
w = WriteConcern.MAJORITY;
@@ -192,7 +192,7 @@ public class MongoConnection {
* @param db the connection to MongoDB.
* @return the default write concern to use for Oak.
*/
-public static ReadConcern getDefaultReadConcern(@Nonnull DB db) {
+public static ReadConcern getDefaultReadConcern(@NotNull DB db) {
ReadConcern r;
if (checkNotNull(db).getMongo().getReplicaSetStatus() != null &&
isMajorityWriteConcern(db)) {
r = ReadConcern.MAJORITY;
@@ -208,7 +208,7 @@ public class MongoConnection {
* @param db the connection to MongoDB.
* @return true if the majority write concern has been configured; false
otherwise
*/
-public static boolean isMajorityWriteConcern(@Nonnull DB db) {
+public static boolean isMajorityWriteConcern(@NotNull DB db) {
return "majority".equals(db.getWriteConcern().getWObject());
}
@@ -220,7 +220,7 @@ public class MongoConnection {
* @param db the database.
* @return whether the write concern is sufficient.
*/
-public static boolean hasSufficientWriteConcern(@Nonnull DB db) {
+public static boolean hasSufficientWriteConcern(@NotNull DB db) {
Object wObj = checkNotNull(db).getWriteConcern().getWObject();
int w;
if (wObj instanceof Number) {
@@ -250,7 +250,7 @@ public class MongoConnection {
* @param db the database.
* @return whether the read concern is sufficient.
*/
-public static boolean hasSufficientReadConcern(@Nonnull DB db) {
+public static boolean hasSufficientReadConcern(@NotNull DB db) {
ReadConcernLevel r =
readConcernLevel(checkNotNull(db).getReadConcern());
if (db.getMongo().getReplicaSetStatus() == null) {
return true;
@@ -266,4 +266,4 @@ public class MongoConnection {
return
ReadConcernLevel.fromString(readConcern.asDocument().getString("level").getValue());
}
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ReadOnlyDocumentStoreWrapperFactory.java
svn commit: r1846037 [4/6] - in /jackrabbit/oak/branches/1.8: ./ oak-store-document/ oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ oak-store-document/src/main/java/org/a
Modified:
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java?rev=1846037=1846036=1846037=diff
==
---
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java
Wed Nov 7 14:46:03 2018
@@ -28,10 +28,6 @@ import java.util.concurrent.CopyOnWriteA
import java.util.concurrent.ExecutionException;
import java.util.concurrent.locks.Lock;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
@@ -41,6 +37,8 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
import org.apache.jackrabbit.oak.plugins.document.locks.NodeDocumentLocks;
import org.apache.jackrabbit.oak.plugins.document.util.StringValue;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import com.google.common.base.Objects;
import com.google.common.cache.Cache;
@@ -68,11 +66,11 @@ public class NodeDocumentCache implement
private final List changeTrackers;
-public NodeDocumentCache(@Nonnull Cache
nodeDocumentsCache,
- @Nonnull CacheStats nodeDocumentsCacheStats,
- @Nonnull Cache
prevDocumentsCache,
- @Nonnull CacheStats prevDocumentsCacheStats,
- @Nonnull NodeDocumentLocks locks) {
+public NodeDocumentCache(@NotNull Cache
nodeDocumentsCache,
+ @NotNull CacheStats nodeDocumentsCacheStats,
+ @NotNull Cache
prevDocumentsCache,
+ @NotNull CacheStats prevDocumentsCacheStats,
+ @NotNull NodeDocumentLocks locks) {
this.nodeDocumentsCache = nodeDocumentsCache;
this.nodeDocumentsCacheStats = nodeDocumentsCacheStats;
this.prevDocumentsCache = prevDocumentsCache;
@@ -86,7 +84,7 @@ public class NodeDocumentCache implement
*
* @param key to invalidate
*/
-public void invalidate(@Nonnull String key) {
+public void invalidate(@NotNull String key) {
Lock lock = locks.acquire(key);
try {
if (isLeafPreviousDocId(key)) {
@@ -106,7 +104,7 @@ public class NodeDocumentCache implement
*
* @param key to mark
*/
-public void markChanged(@Nonnull String key) {
+public void markChanged(@NotNull String key) {
Lock lock = locks.acquire(key);
try {
internalMarkChanged(key);
@@ -123,7 +121,7 @@ public class NodeDocumentCache implement
* modification stamps.
* @return number of invalidated entries
*/
-public int invalidateOutdated(@Nonnull Map
modStamps) {
+public int invalidateOutdated(@NotNull Map
modStamps) {
int invalidatedCount = 0;
for (Entry e : modStamps.entrySet()) {
String id = e.getKey();
@@ -147,8 +145,8 @@ public class NodeDocumentCache implement
* @param key document key
* @return cached value of null if there's no document with given key
cached
*/
-@CheckForNull
-public NodeDocument getIfPresent(@Nonnull String key) {
+@Nullable
+public NodeDocument getIfPresent(@NotNull String key) {
if (isLeafPreviousDocId(key)) {
return prevDocumentsCache.getIfPresent(new StringValue(key));
} else {
@@ -169,8 +167,8 @@ public class NodeDocumentCache implement
* @param valueLoader object used to retrieve the document
* @return document matching given key
*/
-@Nonnull
-public NodeDocument get(@Nonnull final String key, @Nonnull final
Callable valueLoader)
+@NotNull
+public NodeDocument get(@NotNull final String key, @NotNull final
Callable valueLoader)
throws ExecutionException {
Callable wrappedLoader = new Callable() {
@Override
@@ -198,7 +196,7 @@ public class NodeDocumentCache implement
*
* @param doc document to put
*/
-public void put(@Nonnull NodeDocument doc) {
+public void put(@NotNull NodeDocument doc) {
if (doc != NodeDocument.NULL) {
Lock lock = locks.acquire(doc.getId());
try {
@@ -217,8 +215,8 @@ public class NodeDocumentCache implement
* @return either the given doc or the document already
svn commit: r1846037 [6/6] - in /jackrabbit/oak/branches/1.8: ./ oak-store-document/ oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ oak-store-document/src/main/java/org/a
Modified:
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCTest.java?rev=1846037=1846036=1846037=diff
==
---
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCTest.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCTest.java
Wed Nov 7 14:46:03 2018
@@ -28,8 +28,6 @@ import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.Lists;
import org.apache.jackrabbit.oak.api.CommitFailedException;
@@ -40,6 +38,7 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.gc.GCMonitor;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.stats.Clock;
+import org.jetbrains.annotations.NotNull;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
@@ -269,7 +268,7 @@ public class VersionGCTest {
AtomicLong findVersionGC = new AtomicLong();
-@Nonnull
+@NotNull
@Override
public List query(Collection collection,
String fromKey,
Modified:
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCWithSplitTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCWithSplitTest.java?rev=1846037=1846036=1846037=diff
==
---
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCWithSplitTest.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCWithSplitTest.java
Wed Nov 7 14:46:03 2018
@@ -24,8 +24,6 @@ import java.util.Map;
import java.util.concurrent.Semaphore;
import java.util.concurrent.atomic.AtomicReference;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@@ -36,6 +34,7 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.stats.Clock;
+import org.jetbrains.annotations.NotNull;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -208,7 +207,7 @@ public class VersionGCWithSplitTest {
this.docStore = base;
}
-@Nonnull
+@NotNull
@Override
public T createOrUpdate(final Collection
collection,
final UpdateOp update) {
Modified:
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java?rev=1846037=1846036=1846037=diff
==
---
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java
Wed Nov 7 14:46:03 2018
@@ -33,8 +33,6 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
-import javax.annotation.Nonnull;
-
import static com.google.common.collect.Iterables.filter;
import static com.google.common.collect.Iterables.size;
import static java.util.concurrent.TimeUnit.HOURS;
@@ -76,6 +74,7 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.stats.Clock;
+import org.jetbrains.annotations.NotNull;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -681,7 +680,7 @@ public class VersionGarbageCollectorIT {
@Override
public Iterable getPossiblyDeletedDocs(final long
fromModified, final long toModified) {
return new Iterable() {
-@Nonnull
+@NotNull
svn commit: r1846037 [1/6] - in /jackrabbit/oak/branches/1.8: ./ oak-store-document/ oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ oak-store-document/src/main/java/org/a
Author: reschke Date: Wed Nov 7 14:46:03 2018 New Revision: 1846037 URL: http://svn.apache.org/viewvc?rev=1846037=rev Log: OAK-7669: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-store-document Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-store-document/pom.xml jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentNodeBuilder.java jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentNodeState.java jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/BatchCommitQueue.java jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Branch.java jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Checkpoints.java jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfoDocument.java jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Collection.java jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Collision.java jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitDiff.java jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitQueue.java jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitValueResolver.java jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ConflictException.java jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Document.java jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentDiscoveryLiteService.java jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeBuilder.java jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStateCache.java jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranch.java jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentPropertyState.java jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentRootBuilder.java jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ExternalChange.java jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/FailedWithConflictException.java jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/FormatVersion.java jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalEntry.java jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JsopNodeStateDiffer.java jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryAgent.java jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LastRevs.java
svn commit: r1846057 - in /jackrabbit/oak/trunk/oak-core/src/test: java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeRegistryTest.java resources/org/apache/jackrabbit/oak/plugins/nodetype/
Author: mreutegg
Date: Wed Nov 7 16:38:37 2018
New Revision: 1846057
URL: http://svn.apache.org/viewvc?rev=1846057=rev
Log:
OAK-7886: Re-registering node type may corrupt registry
Add ignored test
Added:
jackrabbit/oak/trunk/oak-core/src/test/resources/org/apache/jackrabbit/oak/plugins/nodetype/write/ntResource.cnd
(with props)
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeRegistryTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeRegistryTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeRegistryTest.java?rev=1846057=1846056=1846057=diff
==
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeRegistryTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeRegistryTest.java
Wed Nov 7 16:38:37 2018
@@ -22,6 +22,7 @@ import static com.google.common.collect.
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.jackrabbit.JcrConstants.JCR_MIXINTYPES;
import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE;
+import static org.apache.jackrabbit.JcrConstants.NT_BASE;
import static org.apache.jackrabbit.JcrConstants.NT_FOLDER;
import static org.apache.jackrabbit.JcrConstants.NT_UNSTRUCTURED;
import static org.apache.jackrabbit.JcrConstants.JCR_CONTENT;
@@ -40,11 +41,14 @@ import java.io.Closeable;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.util.Arrays;
import java.util.List;
+import javax.annotation.Nonnull;
import javax.jcr.NamespaceRegistry;
import javax.jcr.NoSuchWorkspaceException;
import javax.jcr.ValueFactory;
+import javax.jcr.nodetype.NodeType;
import javax.jcr.nodetype.NodeTypeDefinition;
import javax.jcr.nodetype.NodeTypeManager;
import javax.jcr.nodetype.NodeTypeTemplate;
@@ -66,6 +70,7 @@ import org.apache.jackrabbit.oak.api.Typ
import org.apache.jackrabbit.oak.namepath.impl.GlobalNameMapper;
import org.apache.jackrabbit.oak.namepath.impl.NamePathMapperImpl;
import org.apache.jackrabbit.oak.plugins.name.ReadOnlyNamespaceRegistry;
+import org.apache.jackrabbit.oak.plugins.name.ReadWriteNamespaceRegistry;
import org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeDefDiff;
import org.apache.jackrabbit.oak.plugins.nodetype.ReadOnlyNodeTypeManager;
import org.apache.jackrabbit.oak.plugins.nodetype.TypeEditorProvider;
@@ -75,9 +80,12 @@ import org.apache.jackrabbit.oak.plugins
import org.jetbrains.annotations.NotNull;
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
+import static org.hamcrest.Matchers.hasItem;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
public class NodeTypeRegistryTest {
@@ -223,4 +231,54 @@ public class NodeTypeRegistryTest {
NodeTypeDefDiff diff = NodeTypeDefDiff.create(beforeDef, afterDef);
assertFalse(diff.isMajor());
}
+
+// OAK-7886
+@Ignore("OAK-7886")
+@Test
+public void reRegisterNtResource() throws Exception {
+NodeTypeManager ntMgr = new ReadWriteNodeTypeManager() {
+@Override
+protected Tree getTypes() {
+return root.getTree(NODE_TYPES_PATH);
+}
+
+@Nonnull
+@Override
+protected Root getWriteRoot() {
+return root;
+}
+};
+ValueFactory vf = new ValueFactoryImpl(
+root, new NamePathMapperImpl(new GlobalNameMapper(root)));
+NamespaceRegistry nsReg = new ReadWriteNamespaceRegistry(root) {
+@Override
+protected Root getWriteRoot() {
+return root;
+}
+};
+DefinitionBuilderFactory factory
+= new TemplateBuilderFactory(ntMgr, vf, nsReg);
+
+NodeType ntResource = ntMgr.getNodeType(NT_RESOURCE);
+List supertypeNames =
Arrays.asList(ntResource.getDeclaredSupertypeNames());
+assertThat(supertypeNames, hasItem(NT_BASE));
+
+List templates;
+InputStream in =
NodeTypeRegistryTest.class.getResourceAsStream("ntResource.cnd");
+try {
+CompactNodeTypeDefReader
reader
+= new CompactNodeTypeDefReader(
+new InputStreamReader(in, UTF_8), "ntResource.cnd",
factory);
+templates = reader.getNodeTypeDefinitions();
+} finally {
+in.close();
+}
+for (NodeTypeTemplate t : templates) {
+ntMgr.registerNodeType(t, true);
+}
+
+ntResource =
