Make the redirection service optional

HuygensING · Sep 5, 2023 · 87bdb82 · 87bdb82
1 parent 4fadc24
commit 87bdb82
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 56 deletions.
diff --git a/timbuctoo-instancev4/src/main/java/nl/knaw/huygens/timbuctoo/core/TimbuctooActions.java b/timbuctoo-instancev4/src/main/java/nl/knaw/huygens/timbuctoo/core/TimbuctooActions.java
@@ -73,17 +73,19 @@ public UUID createEntity(Collection collection, Optional<Collection> baseCollect
 
     dataStoreOperations.createEntity(collection, baseCollection, createEntity);
 
-    afterSuccessTaskExecutor.addTask(
-      new AddPersistentUrlTask(
-        redirectionService,
-        uriToRedirectToFromPersistentUrls.apply(collection.getCollectionName(), id, 1),
-        ImmutableEntityLookup.builder()
-          .rev(1)
-          .timId(id)
-          .collection(collection.getCollectionName())
-          .build()
-      )
-    );
+    if (redirectionService != null) {
+      afterSuccessTaskExecutor.addTask(
+          new AddPersistentUrlTask(
+              redirectionService,
+              uriToRedirectToFromPersistentUrls.apply(collection.getCollectionName(), id, 1),
+              ImmutableEntityLookup.builder()
+                  .rev(1)
+                  .timId(id)
+                  .collection(collection.getCollectionName())
+                  .build()
+          )
+      );
+    }
 
     return id;
   }
@@ -96,17 +98,20 @@ public void replaceEntity(Collection collection, UpdateEntity updateEntity, User
     updateEntity.setModified(createChange(user));
 
     int rev = dataStoreOperations.replaceEntity(collection, updateEntity);
-    afterSuccessTaskExecutor.addTask(
-      new AddPersistentUrlTask(
-        redirectionService,
-        uriToRedirectToFromPersistentUrls.apply(collection.getCollectionName(), updateEntity.getId(), rev),
-        ImmutableEntityLookup.builder()
-          .rev(rev)
-          .timId(updateEntity.getId())
-          .collection(collection.getCollectionName())
-          .build()
-      )
-    );
+
+    if (redirectionService != null) {
+      afterSuccessTaskExecutor.addTask(
+          new AddPersistentUrlTask(
+              redirectionService,
+              uriToRedirectToFromPersistentUrls.apply(collection.getCollectionName(), updateEntity.getId(), rev),
+              ImmutableEntityLookup.builder()
+                  .rev(rev)
+                  .timId(updateEntity.getId())
+                  .collection(collection.getCollectionName())
+                  .build()
+          )
+      );
+    }
   }
   //FIXME: when adding the new datamodel. We need to fix the persistent url generator. It now generates a url per
   // collection, but writes to a property that exists regardless of the collection. It also generates a new persistent
@@ -118,18 +123,19 @@ public void deleteEntity(Collection collection, UUID uuid, User user)
 
     int rev = dataStoreOperations.deleteEntity(collection, uuid, createChange(user));
 
-
-    afterSuccessTaskExecutor.addTask(
-      new AddPersistentUrlTask(
-        redirectionService,
-        uriToRedirectToFromPersistentUrls.apply(collection.getCollectionName(), uuid, rev),
-        ImmutableEntityLookup.builder()
-          .rev(rev)
-          .timId(uuid)
-          .collection(collection.getCollectionName())
-          .build()
-      )
-    );
+    if (redirectionService != null) {
+      afterSuccessTaskExecutor.addTask(
+          new AddPersistentUrlTask(
+              redirectionService,
+              uriToRedirectToFromPersistentUrls.apply(collection.getCollectionName(), uuid, rev),
+              ImmutableEntityLookup.builder()
+                  .rev(rev)
+                  .timId(uuid)
+                  .collection(collection.getCollectionName())
+                  .build()
+          )
+      );
+    }
   }
 
   /**

diff --git a/...too-instancev4/src/main/java/nl/knaw/huygens/timbuctoo/server/TimbuctooConfiguration.java b/...too-instancev4/src/main/java/nl/knaw/huygens/timbuctoo/server/TimbuctooConfiguration.java
@@ -29,6 +29,7 @@
 import nl.knaw.huygens.timbuctoo.v5.util.TimbuctooRdfIdHelper;
 import org.immutables.value.Value;
 
+import javax.annotation.Nullable;
 import javax.validation.Valid;
 import javax.ws.rs.DefaultValue;
 import java.net.URI;
@@ -90,10 +91,10 @@ public HttpClientConfiguration getHttpClientConfiguration() {
   public abstract Optional<DatabaseBackupperFactory> getDatabaseBackupper();
 
   @Valid
+  @Nullable
   @JsonProperty("redirectionService")
   public abstract RedirectionServiceFactory getRedirectionServiceFactory();
 
-
   public abstract String getArchetypesSchema();
 
   public abstract Optional<URI> getUserRedirectUrl();

diff --git a/timbuctoo-instancev4/src/main/java/nl/knaw/huygens/timbuctoo/server/TimbuctooV4.java b/timbuctoo-instancev4/src/main/java/nl/knaw/huygens/timbuctoo/server/TimbuctooV4.java
@@ -231,10 +231,8 @@ public void run(TimbuctooConfiguration configuration, Environment environment) t
     register(environment, "dataStoreAvailabilityCheck", new DatabaseAvailabilityCheck(dataSetRepository));
 
     RedirectionServiceFactory redirectionServiceFactory = configuration.getRedirectionServiceFactory();
-    RedirectionService redirectionService = redirectionServiceFactory.makeRedirectionService(
-      new ActiveMqManager(activeMqBundle), dataSetRepository
-      );
-
+    RedirectionService redirectionService = redirectionServiceFactory != null ?
+        redirectionServiceFactory.makeRedirectionService(new ActiveMqManager(activeMqBundle), dataSetRepository) : null;
 
     // TODO make function when TimbuctooActions does not depend on TransactionEnforcer anymore
     TimbuctooActions.TimbuctooActionsFactory timbuctooActionsFactory = new TimbuctooActions.TimbuctooActionsFactoryImpl(
@@ -249,7 +247,9 @@ public void run(TimbuctooConfiguration configuration, Environment environment) t
     );
     graphManager.onGraph(g -> new ScaffoldMigrator(graphManager).execute());
 
-    redirectionService.init(transactionEnforcer);
+    if (redirectionService != null) {
+      redirectionService.init(transactionEnforcer);
+    }
 
     final Vres vres = new DatabaseConfiguredVres(transactionEnforcer);
     migrations.put("prepare-for-bia-import-migration", new PrepareForBiaImportMigration(vres, graphManager));

diff --git a/...4/src/main/java/nl/knaw/huygens/timbuctoo/v5/graphql/mutations/PersistEntityMutation.java b/...4/src/main/java/nl/knaw/huygens/timbuctoo/v5/graphql/mutations/PersistEntityMutation.java
@@ -35,24 +35,29 @@ public PersistEntityMutation(Runnable schemaUpdater, RedirectionService redirect
 
   @Override
   public Object executeAction(DataFetchingEnvironment env) {
-    User user = MutationHelpers.getUser(env);
-    String graph = env.getArgument("graph");
-    String entityUri = env.getArgument("entityUri");
-    URI uri;
-    try {
-      if (graph != null) {
-        uri = GetEntityInGraph.makeUrl(ownerId, dataSetName, graph, entityUri);
-      } else {
-        uri = GetEntity.makeUrl(ownerId, dataSetName, entityUri);
+    if (redirectionService != null) {
+      User user = MutationHelpers.getUser(env);
+      String graph = env.getArgument("graph");
+      String entityUri = env.getArgument("entityUri");
+      URI uri;
+      try {
+        if (graph != null) {
+          uri = GetEntityInGraph.makeUrl(ownerId, dataSetName, graph, entityUri);
+        } else {
+          uri = GetEntity.makeUrl(ownerId, dataSetName, entityUri);
+        }
+      } catch (UnsupportedEncodingException e) {
+        return ImmutableMap.of("message", "Request for persistent Uri failed.");
       }
-    } catch (UnsupportedEncodingException e) {
-      return ImmutableMap.of("message", "Request for persistent Uri failed.");
-    }
-    URI fullUri = uriHelper.fromResourceUri(uri);
+      URI fullUri = uriHelper.fromResourceUri(uri);
+
+      EntityLookup entityLookup =
+          ImmutableEntityLookup.builder().dataSetId(dataSetId).uri(entityUri).user(user).build();
+      redirectionService.add(fullUri, entityLookup);
 
-    EntityLookup entityLookup = ImmutableEntityLookup.builder().dataSetId(dataSetId).uri(entityUri).user(user).build();
-    redirectionService.add(fullUri, entityLookup);
+      return ImmutableMap.of("message", "Request for persistent Uri accepted");
+    }
 
-    return ImmutableMap.of("message", "Request for persistent Uri accepted");
+    return ImmutableMap.of("message", "Request for persistent Uri failed: no service configured!");
   }
 }