BXC-3419 - Upgrade to camel 3 (#1765)

* Update to camel 3, fix syntax errors

* Get OrderMembersRouter working with junit 5 and camel 3. Add mockito-junit-jupiter to services-camel and make it centrally managed

* Update longleaf register test to work with camel 3, junit 5. Add slightly more test coverage

* Update deregister test

* Update enhancement router and test to work with camel 3

* Update full text router

* Update DestroyDerivatives router and test

* Split router test from processor test

* Update CdrEventRouter and related tests. Update SolrUpdateRouter, although tests specific to it still need updating. Add camel spring junit 5 library

* Update destroy route

* Update ViewSettingRouter

* Commiting updates for triples indexing router

* Potential local inclusion of triplestore router from fcrepo camel due to conflict with camel 3

* Non-functional fcrepo jetty impl

* Continuing to update tests

* Update AccessSurrogateRouter for camel 3

* Mostly working TriplesReindexingRouter and test. Added method for executing updates to triple store. Performing updates via a processor rather than forwarding to fcrepo camel toolbox

* Use TriplestoreRouter for indexing. Replace deprecated inOnly call. Adjust test to start checking for objects to be indexed sooner, to be more flexible about the exact number of messages being processed

* Updating tests

* Replace redirect uuidGenerator usage with a lambda since it doesn't have a process method anymore.

* Update test to junit 5

* Update SolrUpdateRouter and test

* Update DestroyDerivativesRouterIT

* Updated ExportXMLRouteIT

* Updated ImportXMLIT

* Get Solr related tests working, and a few others

* Junit 5 updates

* Restoring EnhancementRouterIT

* Tidying up and fixing longleaf routes

* Remove unused embedded-redis

* Move sparql update usage over to SparqlUpdateService. Remove method from the query service

* Remove unused dependencies and class

* Remove unnecessary changes, commented out code

* Group camel routes into single context. Add spring boot xml jar which seems to be necessary for camel namespaces in spring context files now. Replace some additional hardcoded activemq routes with variables

* Adjusting startup orders to avoid conflicts now that everything is in the same context

* Remove import

* Fix property name

* Codeclimate

* Remove unused import

Author: bbpennel

Diff for: common-utils/pom.xml

@@ -34,6 +34,10 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+        </dependency>
         <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>

Diff for: fcrepo-utils/src/main/java/edu/unc/lib/boxc/fcrepo/utils/FedoraSparqlUpdateService.java

@@ -32,7 +32,7 @@ public void executeUpdate(String uri, String updateString) {
         URI rescUri = URI.create(uri);
 
         try (InputStream sparqlStream = new ByteArrayInputStream(updateString.getBytes(UTF_8))) {
-            try (FcrepoResponse response = fcrepoClient.patch(rescUri)
+            try (FcrepoResponse ignored = fcrepoClient.patch(rescUri)
                     .body(sparqlStream)
                     .perform()) {
             }
@@ -43,6 +43,11 @@ public void executeUpdate(String uri, String updateString) {
         }
     }
 
+    @Override
+    public void executeUpdate(String updateString) {
+        throw new UnsupportedOperationException("FedoraSparqlUpdateService requires a resource URI to update");
+    }
+
     /**
      * @param fcrepoClient the fcrepoClient to set
      */

Diff for: model-api/src/main/java/edu/unc/lib/boxc/model/api/sparql/SparqlUpdateService.java

@@ -17,4 +17,6 @@ public interface SparqlUpdateService {
      */
     public void executeUpdate(String uri, String updateString);
 
+    public void executeUpdate(String updateString);
+
 }

Diff for: model-fcrepo/src/main/java/edu/unc/lib/boxc/model/fcrepo/sparql/TripleStoreSparqlUpdateService.java

@@ -0,0 +1,32 @@
+package edu.unc.lib.boxc.model.fcrepo.sparql;
+
+import edu.unc.lib.boxc.model.api.sparql.SparqlUpdateService;
+import org.apache.jena.update.UpdateExecutionFactory;
+import org.apache.jena.update.UpdateFactory;
+import org.apache.jena.update.UpdateProcessor;
+import org.apache.jena.update.UpdateRequest;
+
+/**
+ * Query service for updating triples in a triple store
+ *
+ * @author bbpennel
+ */
+public class TripleStoreSparqlUpdateService implements SparqlUpdateService {
+    private String fusekiQueryURL;
+
+    @Override
+    public void executeUpdate(String uri, String updateString) {
+        executeUpdate(updateString);
+    }
+
+    @Override
+    public void executeUpdate(String queryString) {
+        UpdateRequest updateRequest = UpdateFactory.create(queryString);
+        UpdateProcessor updateProcessor = UpdateExecutionFactory.createRemote(updateRequest, fusekiQueryURL);
+        updateProcessor.execute();
+    }
+
+    public void setFusekiQueryURL(String fusekiQueryURL) {
+        this.fusekiQueryURL = fusekiQueryURL;
+    }
+}

Diff for: pom.xml

@@ -75,7 +75,7 @@
         <grizzly.version>2.4.4</grizzly.version>
         <jersey.version>2.34</jersey.version>
         <mockito.version>5.11.0</mockito.version>
-        <mockito.junit.version>5.0.0</mockito.junit.version>
+        <mockito.junit.version>5.11.0</mockito.junit.version>
         <fcrepo.client.version>5.0.0</fcrepo.client.version>
         <mock.server.version>5.4.1</mock.server.version>
         <awaitility.version>4.0.3</awaitility.version>
@@ -101,10 +101,10 @@
         <commons-csv.version>1.6</commons-csv.version>
         <commons-lang3.version>3.8.1</commons-lang3.version>
         <commons-fileupload.version>1.5</commons-fileupload.version>
+        <commons-collections.version>4.4</commons-collections.version>
         <abdera.version>1.1.3</abdera.version>
 
         <activemq.version>5.17.6</activemq.version>
-        <activemq-camel.version>5.16.7</activemq-camel.version>
         <activemq-protobuf.version>1.1</activemq-protobuf.version>
 
         <slf4j.version>1.7.25</slf4j.version>
@@ -126,13 +126,12 @@
         <jsp-api.version>2.3.6</jsp-api.version>
 
         <jedis.version>3.10.0</jedis.version>
-        <embedded-redis.version>0.7.3</embedded-redis.version>
         <solr.version>8.10.1</solr.version>
         <metrics.version>5.0.0</metrics.version>
         <jena.version>4.4.0</jena.version>
 
-        <fcrepo-camel.version>5.0.0</fcrepo-camel.version>
-        <camel.version>2.25.4</camel.version>
+        <fcrepo-camel.version>6.0.0</fcrepo-camel.version>
+        <camel.version>3.22.1</camel.version>
         <tika.version>2.8.0</tika.version>
 
         <maven.failsafe.version>2.22.1</maven.failsafe.version>
@@ -681,6 +680,12 @@
                 <version>${mockito.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-junit-jupiter</artifactId>
+                <version>${mockito.junit.version}</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>org.awaitility</groupId>
                 <artifactId>awaitility</artifactId>
@@ -885,6 +890,11 @@
                 <artifactId>commons-fileupload</artifactId>
                 <version>${commons-fileupload.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-collections4</artifactId>
+                <version>${commons-collections.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.abdera</groupId>
                 <artifactId>abdera-client</artifactId>
@@ -896,12 +906,6 @@
                 <artifactId>jedis</artifactId>
                 <version>${jedis.version}</version>
             </dependency>
-            <dependency>
-                <groupId>it.ozimov</groupId>
-                <artifactId>embedded-redis</artifactId>
-                <version>${embedded-redis.version}</version>
-                <scope>test</scope>
-            </dependency>
             <dependency>
                 <groupId>org.apache.activemq</groupId>
                 <artifactId>activemq-kahadb-store</artifactId>

Diff for: services-camel-app/pom.xml

@@ -31,12 +31,11 @@
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-spring</artifactId>
         <version>${camel.version}</version>
-        <exclusions>
-            <exclusion>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-expression</artifactId>
-            </exclusion>
-        </exclusions>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.camel.springboot</groupId>
+        <artifactId>camel-spring-boot-xml-starter</artifactId>
+        <version>${camel.version}</version>
     </dependency>
     <dependency>
         <groupId>org.apache.camel</groupId>
@@ -50,14 +49,9 @@
     </dependency>
     <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-spring-javaconfig</artifactId>
+        <artifactId>camel-activemq</artifactId>
         <version>${camel.version}</version>
     </dependency>
-    <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-camel</artifactId>
-        <version>${activemq-camel.version}</version>
-    </dependency>
     <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-broker</artifactId>
@@ -66,11 +60,6 @@
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-client</artifactId>
     </dependency>
-    <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-sjms</artifactId>
-        <version>${camel.version}</version>
-    </dependency>
 
     <dependency>
         <groupId>commons-io</groupId>
@@ -81,39 +70,13 @@
         <groupId>org.fcrepo.camel</groupId>
         <artifactId>fcrepo-camel</artifactId>
         <version>${fcrepo-camel.version}</version>
-        <exclusions>
-            <exclusion>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-jackson</artifactId>
-            </exclusion>
-            <exclusion>
-                <groupId>org.apache.jena</groupId>
-                <artifactId>jena-osgi</artifactId>
-            </exclusion>
-        </exclusions>
     </dependency>
 
     <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-http4</artifactId>
+        <artifactId>camel-http</artifactId>
         <version>${camel.version}</version>
     </dependency>
-
-    <dependency>
-        <groupId>org.fcrepo.camel</groupId>
-        <artifactId>fcrepo-indexing-triplestore</artifactId>
-        <version>${fcrepo-indexing-triplestore.version}</version>
-        <exclusions>
-            <exclusion>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-blueprint</artifactId>
-            </exclusion>
-            <exclusion>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-http4</artifactId>
-            </exclusion>
-        </exclusions>
-    </dependency>
 
     <dependency>
         <groupId>org.fcrepo.client</groupId>
@@ -130,6 +93,10 @@
         <groupId>org.springframework</groupId>
         <artifactId>spring-core</artifactId>
     </dependency>
+    <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-context</artifactId>
+    </dependency>
     <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-expression</artifactId>
@@ -229,6 +196,22 @@
         <version>${camel.version}</version>
         <scope>test</scope>
     </dependency>
+    <dependency>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-test-spring-junit5</artifactId>
+        <version>${camel.version}</version>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-test-junit5</artifactId>
+        <version>${camel.version}</version>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.mockito</groupId>
+        <artifactId>mockito-junit-jupiter</artifactId>
+    </dependency>
     <dependency>
         <groupId>org.junit.jupiter</groupId>
         <artifactId>junit-jupiter-engine</artifactId>
@@ -241,11 +224,6 @@
         <groupId>org.junit.jupiter</groupId>
         <artifactId>junit-jupiter-params</artifactId>
     </dependency>
-    <dependency>
-        <groupId>org.junit.vintage</groupId>
-        <artifactId>junit-vintage-engine</artifactId>
-        <version>${junit.jupiter.version}</version>
-    </dependency>
     <dependency>
         <groupId>com.github.tomakehurst</groupId>
         <artifactId>wiremock-jre8</artifactId>
@@ -299,10 +277,14 @@
         <artifactId>activemq-protobuf</artifactId>
         <scope>test</scope>
     </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-        </dependency>
+    <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-api</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>com.github.tomakehurst</groupId>
+        <artifactId>wiremock-jre8</artifactId>
+    </dependency>
     </dependencies>
 
     <build>

Diff for: services-camel-app/src/main/java/edu/unc/lib/boxc/services/camel/accessSurrogates/AccessSurrogateRouter.java

@@ -1,6 +1,7 @@
 package edu.unc.lib.boxc.services.camel.accessSurrogates;
 
 import org.apache.camel.BeanInject;
+import org.apache.camel.PropertyInject;
 import org.apache.camel.builder.RouteBuilder;
 import org.slf4j.Logger;
 
@@ -16,11 +17,22 @@ public class AccessSurrogateRouter extends RouteBuilder {
     @BeanInject(value = "accessSurrogateRequestProcessor")
     private AccessSurrogateRequestProcessor processor;
 
+    private String accessSurrogatesStreamCamel;
+
     @Override
     public void configure() throws Exception {
-        from("{{cdr.access.surrogates.stream.camel}}")
+        from(accessSurrogatesStreamCamel)
                 .routeId("DcrAccessSurrogates")
                 .log(DEBUG, log, "Received access surrogate request")
                 .bean(processor);
     }
+
+    public void setAccessSurrogateRequestProcessor(AccessSurrogateRequestProcessor processor) {
+        this.processor = processor;
+    }
+
+    @PropertyInject("cdr.access.surrogates.stream.camel")
+    public void setAccessSurrogatesStreamCamel(String accessSurrogatesStreamCamel) {
+        this.accessSurrogatesStreamCamel = accessSurrogatesStreamCamel;
+    }
 }

Diff for: services-camel-app/src/main/java/edu/unc/lib/boxc/services/camel/binaryCleanup/BinaryCleanupRouter.java

@@ -3,6 +3,7 @@
 import static org.slf4j.LoggerFactory.getLogger;
 
 import org.apache.camel.LoggingLevel;
+import org.apache.camel.PropertyInject;
 import org.apache.camel.builder.RouteBuilder;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,13 +16,23 @@ public class BinaryCleanupRouter extends RouteBuilder {
     private final Logger log = getLogger(BinaryCleanupRouter.class);
     @Autowired
     private BinaryCleanupProcessor binaryCleanupProcessor;
+    private String binaryCleanupStream;
 
     @Override
     public void configure() throws Exception {
-        from("{{cdr.registration.successful.dest}}")
+        from(binaryCleanupStream)
             .routeId("CleanupOldBinaryBatch")
             .log(LoggingLevel.DEBUG, log, "Cleaning up old binaries")
             .startupOrder(119)
             .process(binaryCleanupProcessor);
     }
+
+    public void setBinaryCleanupProcessor(BinaryCleanupProcessor binaryCleanupProcessor) {
+        this.binaryCleanupProcessor = binaryCleanupProcessor;
+    }
+
+    @PropertyInject("cdr.registration.successful.dest")
+    public void setBinaryCleanupStream(String binaryCleanupStream) {
+        this.binaryCleanupStream = binaryCleanupStream;
+    }
 }