Author: chetanm
Date: Thu Nov 24 14:00:52 2016
New Revision: 1771130
URL: http://svn.apache.org/viewvc?rev=1771130&view=rev
Log:
OAK-4898 - Allow for external changes to have a CommitInfo attached
Switch to Nonnull annotation for CommitInfo param
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeObserver.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/DiffObserver.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/EmptyObserver.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/NodeStateSolrServersObserver.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeObserver.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeObserver.java?rev=1771130&r1=1771129&r2=1771130&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeObserver.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeObserver.java
Thu Nov 24 14:00:52 2016
@@ -23,7 +23,6 @@ import static com.google.common.collect.
import java.util.Set;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -47,7 +46,7 @@ public class CompositeObserver implement
@Override
public synchronized void contentChanged(
- @Nonnull NodeState root, @Nullable CommitInfo info) {
+ @Nonnull NodeState root, @Nonnull CommitInfo info) {
checkNotNull(root);
for (Observer observer : observers) {
observer.contentChanged(root, info);
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/DiffObserver.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/DiffObserver.java?rev=1771130&r1=1771129&r2=1771130&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/DiffObserver.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/DiffObserver.java
Thu Nov 24 14:00:52 2016
@@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.spi.co
import static com.google.common.base.Preconditions.checkNotNull;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStateDiff;
@@ -44,13 +43,13 @@ public abstract class DiffObserver imple
*/
protected abstract NodeStateDiff getRootDiff(
@Nonnull NodeState before, @Nonnull NodeState after,
- @Nullable CommitInfo info);
+ @Nonnull CommitInfo info);
//----------------------------------------------------------< Observer >--
@Override
public final synchronized void contentChanged(
- @Nonnull NodeState root, @Nullable CommitInfo info) {
+ @Nonnull NodeState root, @Nonnull CommitInfo info) {
checkNotNull(root);
if (before != null) {
NodeStateDiff diff = getRootDiff(before, root, info);
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/EmptyObserver.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/EmptyObserver.java?rev=1771130&r1=1771129&r2=1771130&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/EmptyObserver.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/EmptyObserver.java
Thu Nov 24 14:00:52 2016
@@ -17,7 +17,6 @@
package org.apache.jackrabbit.oak.spi.commit;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -35,7 +34,7 @@ public class EmptyObserver implements Ob
@Override
public void contentChanged(
- @Nonnull NodeState root, @Nullable CommitInfo info) {
+ @Nonnull NodeState root, @Nonnull CommitInfo info) {
// do nothing
}
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/NodeStateSolrServersObserver.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/NodeStateSolrServersObserver.java?rev=1771130&r1=1771129&r2=1771130&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/NodeStateSolrServersObserver.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/NodeStateSolrServersObserver.java
Thu Nov 24 14:00:52 2016
@@ -17,18 +17,13 @@
package org.apache.jackrabbit.oak.plugins.index.solr.configuration.nodestate;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import org.apache.jackrabbit.oak.api.PropertyState;
-import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.SolrServerConfiguration;
import org.apache.jackrabbit.oak.plugins.index.solr.server.OakSolrServer;
-import org.apache.jackrabbit.oak.plugins.index.solr.server.SolrServerProvider;
-import org.apache.jackrabbit.oak.plugins.index.solr.server.SolrServerRegistry;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.DiffObserver;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStateDiff;
-import org.apache.solr.client.solrj.SolrServer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,7 +37,7 @@ public class NodeStateSolrServersObserve
private final Logger log = LoggerFactory.getLogger(getClass());
@Override
- protected NodeStateDiff getRootDiff(@Nonnull NodeState before, @Nonnull
NodeState after, @Nullable CommitInfo info) {
+ protected NodeStateDiff getRootDiff(@Nonnull NodeState before, @Nonnull
NodeState after, @Nonnull CommitInfo info) {
return new ChangingSolrServersNodeStateDiff(after);
}
