enable prov and access logs for [--prov-mode]

globalbioticinteractions · Jan 2, 2025 · 9482dc6 · 9482dc6
1 parent a000914
commit 9482dc6
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 23 deletions.
diff --git a/src/main/java/org/globalbioticinteractions/elton/cmd/CmdDefaultParams.java b/src/main/java/org/globalbioticinteractions/elton/cmd/CmdDefaultParams.java
@@ -274,9 +274,10 @@ protected void stop() {
 
 
     protected ActivityListener getActivityListener(String namespaceLocal) {
-        return getEnableProvMode()
-                ? new ProvLogger(getStatementListener())
-                : new AccessLogger(namespaceLocal, getProvDir());
+        AccessLogger accessLogger = new AccessLogger(namespaceLocal, getProvDir());
+        return new ActivityProxy(getEnableProvMode()
+                ? Arrays.asList(new ProvLogger(getStatementListener()), accessLogger)
+                : Collections.singletonList(accessLogger));
     }
 
     protected ActivityListener getActivityListener() {

diff --git a/src/main/java/org/globalbioticinteractions/elton/cmd/CmdList.java b/src/main/java/org/globalbioticinteractions/elton/cmd/CmdList.java
@@ -18,14 +18,11 @@
 import org.globalbioticinteractions.dataset.DatasetRegistryGitHubArchive;
 import org.globalbioticinteractions.dataset.DatasetRegistryProxy;
 import org.globalbioticinteractions.dataset.DatasetRegistryZenodo;
-import org.globalbioticinteractions.dataset.DatasetWithCache;
 import org.globalbioticinteractions.elton.store.AccessLogger;
 import org.globalbioticinteractions.elton.store.ActivityListener;
-import org.globalbioticinteractions.elton.store.CachePullThroughPrestonStore;
-import org.globalbioticinteractions.elton.store.LocalPathToHashIRI;
+import org.globalbioticinteractions.elton.store.ActivityProxy;
 import org.globalbioticinteractions.elton.store.ProvLoggerWithClock;
 import org.globalbioticinteractions.elton.util.DatasetRegistryUtil;
-import org.globalbioticinteractions.elton.util.ResourceServiceListening;
 import picocli.CommandLine;
 
 import java.io.File;
@@ -37,7 +34,6 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 @CommandLine.Command(
@@ -147,19 +143,7 @@ public Literal get() {
             public InputStream retrieve(URI uri) throws IOException {
                 IRI activityId = getActivityIdFactory().get();
                 IRI request = RefNodeFactory.toIRI(uri);
-                final ActivityListener proxy = new ActivityListener() {
-                    List<ActivityListener> listeners = Arrays.asList(logger, activityListener);
-
-                    @Override
-                    public void onStarted(IRI parentActivityId, IRI activityId, IRI request) {
-                        listeners.forEach(listener -> listener.onStarted(parentActivityId, activityId, request));
-                    }
-
-                    @Override
-                    public void onCompleted(IRI parentActivityId, IRI activityId, IRI request, IRI response, URI localPathOfResponseData) {
-                        listeners.forEach(listener -> listener.onCompleted(parentActivityId, activityId, request, response, localPathOfResponseData));
-                    }
-                };
+                final ActivityListener proxy = new ActivityProxy(Arrays.asList(logger, activityListener));
                 proxy.onStarted(getActivityContext().getActivity(), activityId, request);
                 InputStream retrieve = resourceServiceRemote.retrieve(uri);
                 IRI put = blobStore.put(retrieve);

diff --git a/src/main/java/org/globalbioticinteractions/elton/cmd/CmdUpdate.java b/src/main/java/org/globalbioticinteractions/elton/cmd/CmdUpdate.java
@@ -20,7 +20,9 @@
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.function.Consumer;
 
 @CommandLine.Command(
         name = "sync",
@@ -62,9 +64,18 @@ protected void doRun() {
         }
 
         DatasetRegistry registryProxy = new DatasetRegistryProxy(registries);
+
+        DatasetRegistryAccessLogger accessLogger = new DatasetRegistryAccessLogger(registryProxy, getProvDir());
+
+        DatasetRegistryProxy provAndAccessLogger = new DatasetRegistryProxy(
+                Arrays.asList(
+                        new DatasetRegistryProvLogger(registryProxy, getStatementListener(), getActivityContext()),
+                        accessLogger)
+        );
+
         DatasetRegistry registryProvenanceLogger = getEnableProvMode()
-                ? new DatasetRegistryProvLogger(registryProxy, getStatementListener(), getActivityContext())
-                : new DatasetRegistryAccessLogger(registryProxy, getProvDir());
+                ? provAndAccessLogger
+                : accessLogger;
 
 
         NamespaceHandler namespaceHandler = namespace -> {

diff --git a/src/main/java/org/globalbioticinteractions/elton/store/ActivityProxy.java b/src/main/java/org/globalbioticinteractions/elton/store/ActivityProxy.java
@@ -15,6 +15,7 @@ public ActivityProxy(List<ActivityListener> listeners) {
 
     @Override
     public void onStarted(IRI parentActivityId, IRI activityId, IRI request) {
+        listeners.forEach(l -> l.onStarted(parentActivityId, activityId, request));
 
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,7 @@ public ActivityProxy(List<ActivityListener> listeners) { @@
         @Override
         public void onStarted(IRI parentActivityId, IRI activityId, IRI request) {
+            listeners.forEach(l -> l.onStarted(parentActivityId, activityId, request));
         }
@@ Expand Down @@