[sling-org-apache-sling-clam] 02/02: SLING-8304 Use Observer Whiteboard for NodeObservingJcrPropertyDigger

[olli]

This is an automated email from the ASF dual-hosted git repository.

olli pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-clam.git

commit bdf2cc8b6118775acde466c7091e940f6331fb59
Author: Oliver Lietz <o...@apache.org>
AuthorDate: Wed Mar 6 07:43:01 2019 +0100

    SLING-8304 Use Observer Whiteboard for NodeObservingJcrPropertyDigger
---
 .../oak/internal/NodeObservingJcrPropertyDigger.java    | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/clam/oak/internal/NodeObservingJcrPropertyDigger.java
 
b/src/main/java/org/apache/sling/clam/oak/internal/NodeObservingJcrPropertyDigger.java
index 1186825..8060828 100644
--- 
a/src/main/java/org/apache/sling/clam/oak/internal/NodeObservingJcrPropertyDigger.java
+++ 
b/src/main/java/org/apache/sling/clam/oak/internal/NodeObservingJcrPropertyDigger.java
@@ -18,7 +18,6 @@
  */
 package org.apache.sling.clam.oak.internal;
 
-import java.io.Closeable;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
@@ -30,8 +29,7 @@ import javax.jcr.Session;
 
 import org.apache.jackrabbit.oak.plugins.observation.NodeObserver;
 import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
-import org.apache.jackrabbit.oak.spi.commit.Observable;
-import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.apache.jackrabbit.oak.spi.commit.Observer;
 import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.api.resource.ResourceResolverFactory;
 import org.apache.sling.commons.threads.ThreadPool;
@@ -56,6 +54,7 @@ import static 
org.apache.sling.clam.internal.ClamUtil.properties;
 import static org.apache.sling.clam.internal.ClamUtil.scanJobTopic;
 
 @Component(
+    service = Observer.class,
     immediate = true,
     property = {
         Constants.SERVICE_DESCRIPTION + "=Apache Sling Clam Node Observing JCR 
Property Digger",
@@ -68,9 +67,6 @@ import static 
org.apache.sling.clam.internal.ClamUtil.scanJobTopic;
 )
 public class NodeObservingJcrPropertyDigger extends NodeObserver {
 
-    @Reference
-    private volatile NodeStore nodeStore;
-
     @Reference(
         policy = ReferencePolicy.DYNAMIC,
         policyOption = ReferencePolicyOption.GREEDY
@@ -98,8 +94,6 @@ public class NodeObservingJcrPropertyDigger extends 
NodeObserver {
 
     private ThreadPool threadPool;
 
-    private Closeable closeable;
-
     private NodeObservingJcrPropertyDiggerConfiguration configuration;
 
     private final Logger logger = 
LoggerFactory.getLogger(NodeObservingJcrPropertyDigger.class);
@@ -114,8 +108,6 @@ public class NodeObservingJcrPropertyDigger extends 
NodeObserver {
         this.configuration = configuration;
         configure(configuration);
         threadPool = threadPoolManager.get(configuration.threadpool_name());
-        final Observable observable = (Observable) nodeStore;
-        closeable = observable.addObserver(this);
     }
 
     @Modified
@@ -128,11 +120,6 @@ public class NodeObservingJcrPropertyDigger extends 
NodeObserver {
     @Deactivate
     private void deactivate() {
         logger.debug("deactivating");
-        try {
-            closeable.close();
-        } catch (Exception e) {
-            logger.error(e.getMessage());
-        }
         threadPoolManager.release(threadPool);
         configuration = null;
     }