Author: alexparvulescu Date: Wed Apr 5 10:16:03 2017 New Revision: 1790199
URL: http://svn.apache.org/viewvc?rev=1790199&view=rev Log: OAK-6036 Remove WhiteboardUtils#registerObserver method Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardUtils.java jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeProcessor.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java?rev=1790199&r1=1790198&r2=1790199&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java Wed Apr 5 10:16:03 2017 @@ -19,8 +19,8 @@ package org.apache.jackrabbit.oak; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.Lists.newArrayList; +import static java.util.Collections.emptyMap; import static org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils.registerMBean; -import static org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils.registerObserver; import java.io.Closeable; import java.io.IOException; @@ -686,7 +686,7 @@ public class Oak { // Register observer last to prevent sending events while initialising for (Observer observer : observers) { - regs.add(registerObserver(whiteboard, observer)); + regs.add(whiteboard.register(Observer.class, observer, emptyMap())); } RepositoryManager repositoryManager = new RepositoryManager(whiteboard); Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardUtils.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardUtils.java?rev=1790199&r1=1790198&r2=1790199&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardUtils.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardUtils.java Wed Apr 5 10:16:03 2017 @@ -16,9 +16,6 @@ */ package org.apache.jackrabbit.oak.spi.whiteboard; -import static com.google.common.base.Preconditions.checkNotNull; -import static java.util.Collections.emptyMap; - import java.util.Collections; import java.util.Hashtable; import java.util.List; @@ -31,7 +28,6 @@ import javax.management.MalformedObjectN import javax.management.ObjectName; import org.apache.jackrabbit.oak.commons.jmx.JmxUtil; -import org.apache.jackrabbit.oak.spi.commit.Observer; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; @@ -98,13 +94,6 @@ public class WhiteboardUtils { } } - public static Registration registerObserver( - @Nonnull Whiteboard whiteboard, - @Nonnull Observer observer) { - return checkNotNull(whiteboard) - .register(Observer.class, checkNotNull(observer), emptyMap()); - } - /** * Returns the currently available services from the whiteboard of the tracked type. * Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeProcessor.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeProcessor.java?rev=1790199&r1=1790198&r2=1790199&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeProcessor.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeProcessor.java Wed Apr 5 10:16:03 2017 @@ -20,12 +20,12 @@ package org.apache.jackrabbit.oak.jcr.ob import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; +import static java.util.Collections.emptyMap; import static org.apache.jackrabbit.api.stats.RepositoryStatistics.Type.OBSERVATION_EVENT_COUNTER; import static org.apache.jackrabbit.api.stats.RepositoryStatistics.Type.OBSERVATION_EVENT_DURATION; import static org.apache.jackrabbit.oak.plugins.observation.ChangeCollectorProvider.COMMIT_CONTEXT_OBSERVATION_CHANGESET; import static org.apache.jackrabbit.oak.plugins.observation.filter.VisibleFilter.VISIBLE_FILTER; import static org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils.registerMBean; -import static org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils.registerObserver; import static org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils.scheduleWithFixedDelay; import java.util.Map; @@ -57,6 +57,7 @@ import org.apache.jackrabbit.oak.spi.com import org.apache.jackrabbit.oak.spi.commit.BackgroundObserverMBean; import org.apache.jackrabbit.oak.spi.commit.CommitContext; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; +import org.apache.jackrabbit.oak.spi.commit.Observer; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.whiteboard.CompositeRegistration; import org.apache.jackrabbit.oak.spi.whiteboard.Registration; @@ -269,7 +270,7 @@ class ChangeProcessor implements Filteri Map<String, String> attrs = ImmutableMap.of(LISTENER_ID, listenerId); String name = tracker.toString(); registration = new CompositeRegistration( - registerObserver(whiteboard, filteringObserver), + whiteboard.register(Observer.class, filteringObserver, emptyMap()), registerMBean(whiteboard, EventListenerMBean.class, tracker.getListenerMBean(), "EventListener", name, attrs), registerMBean(whiteboard, BackgroundObserverMBean.class,
