add a call to a milliner versioning endpoint for media (#70)

Author: elizoller

islandora-indexing-fcrepo/src/main/java/ca/islandora/alpaca/indexing/fcrepo/FcrepoIndexer.java

@@ -167,7 +167,8 @@ public void configure() {
                         .simple("${exchangeProperty.event.object.isNewVersion}")
                                 //pass it to milliner
                                 .toD(
-                                        getMillinerBaseUrl() + "version/${exchangeProperty.uuid}?connectionClose=true"
+                                        getMillinerBaseUrl() +
+                                        "node/${exchangeProperty.uuid}/version?connectionClose=true"
                                     ).endChoice();
 
 
@@ -225,7 +226,18 @@ public void configure() {
                 .setBody(simple("${null}"))
 
                 // Pass it to milliner.
-                .toD(getMillinerBaseUrl() + "media/${exchangeProperty.sourceField}?connectionClose=true");
+                .toD(getMillinerBaseUrl() + "media/${exchangeProperty.sourceField}?connectionClose=true")
+                .choice()
+                        .when()
+                        .simple("${exchangeProperty.event.object.isNewVersion}")
+                                .setHeader("Content-Location", simple(
+                                        "${exchangeProperty.jsonUrl}"))
+
+                                //pass it to milliner
+                                .toD(
+                                        getMillinerBaseUrl() +
+                                        "media/${exchangeProperty.sourceField}/version?connectionClose=true"
+                                    ).endChoice();
 
         from("{{file.stream}}")
                 .routeId("FcrepoIndexerFile")

islandora-indexing-fcrepo/src/test/java/ca/islandora/alpaca/indexing/fcrepo/FcrepoIndexerTest.java

@@ -89,22 +89,24 @@ public void configure() throws Exception {
     }
 
     @Test
-    public void testVersion() throws Exception {
+    public void testNodeVersion() throws Exception {
         final String route = "FcrepoIndexerNode";
         context.getRouteDefinition(route).adviceWith(context, new AdviceWithRouteBuilder() {
             @Override
             public void configure() throws Exception {
                 replaceFromWith("direct:start");
                 mockEndpointsAndSkip(
-                    "http://localhost:8000/milliner/version/72358916-51e9-4712-b756-4b0404c91b?connectionClose=true"
+                    "http://localhost:8000/milliner/node/72358916-51e9-"
+                    + "4712-b756-4b0404c91b/version?connectionClose=true"
                 );
             }
         });
         context.start();
 
         // Assert we POST to milliner with creds.
         final MockEndpoint milliner = getMockEndpoint(
-                "mock:http:localhost:8000/milliner/version/72358916-51e9-4712-b756-4b0404c91b"
+                "mock:http:localhost:8000/milliner/"
+                + "node/72358916-51e9-4712-b756-4b0404c91b/version"
         );
         milliner.expectedMessageCount(1);
         milliner.expectedHeaderReceived("Authorization", "Bearer islandora");
@@ -268,4 +270,34 @@ public void configure() throws Exception {
         assertMockEndpointsSatisfied();
     }
 
+    @Test
+    public void testVersionMedia() throws Exception {
+        final String route = "FcrepoIndexerMedia";
+        context.getRouteDefinition(route).adviceWith(context, new AdviceWithRouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                replaceFromWith("direct:start");
+                mockEndpointsAndSkip("http://localhost:8000/milliner/media/field_media_image/"
+                + "version?connectionClose=true");
+            }
+        });
+        context.start();
+
+        // Assert we POST the event to milliner with creds.
+        final MockEndpoint milliner = getMockEndpoint("mock:http:localhost:8000/milliner/media/"
+        + "field_media_image/version");
+        milliner.expectedHeaderReceived("Authorization", "Bearer islandora");
+        milliner.expectedHeaderReceived("Content-Location", "http://localhost:8000/media/7?_format=json");
+        milliner.expectedHeaderReceived(Exchange.HTTP_METHOD, "POST");
+
+        // Send an event.
+        template.send(exchange -> {
+            exchange.getIn().setHeader("Authorization", "Bearer islandora");
+            exchange.getIn().setBody(IOUtils.toString(loadResourceAsStream("MediaVersionAS2Event.jsonld"), "UTF-8"),
+                    String.class);
+        });
+
+        assertMockEndpointsSatisfied();
+    }
+
 }

islandora-indexing-fcrepo/src/test/resources/MediaVersionAS2Event.jsonld

@@ -0,0 +1,53 @@
+{
+   "@context":"https:\/\/www.w3.org\/ns\/activitystreams",
+   "actor":{
+      "type":"Person",
+      "id":"urn:uuid:9029a0c0-d845-4ddd-864c-2198d45839da",
+      "url":[
+         {
+            "name":"Canonical",
+            "type":"Link",
+            "href":"http:\/\/localhost:8000\/user\/1",
+            "mediaType":"text\/html",
+            "rel":"canonical"
+         }
+      ]
+   },
+   "object":{
+      "id":"urn:uuid:4f528a92-4be2-4a9d-85e6-c5f4d36b1bce",
+      "url":[
+         {
+            "name":"Canonical",
+            "type":"Link",
+            "href":"http:\/\/localhost:8000\/media\/7",
+            "mediaType":"text\/html",
+            "rel":"canonical"
+         },
+         {
+            "name":"JSON",
+            "type":"Link",
+            "href":"http:\/\/localhost:8000\/media\/7?_format=json",
+            "mediaType":"application\/json",
+            "rel":"alternate"
+         },
+         {
+            "name":"JSONLD",
+            "type":"Link",
+            "href":"http:\/\/localhost:8000\/media\/7?_format=jsonld",
+            "mediaType":"application\/ld+json",
+            "rel":"alternate"
+         }
+      ],
+      "isNewVersion":"true"
+   },
+   "type":"Update",
+   "summary":"Update a Media",
+   "target":"http://localhost:8080/fcrepo/rest/media",
+   "attachment":{
+      "type":"Object",
+      "content":{
+         "source_field":"field_media_image"
+      },
+      "mediaType":"application\/json"
+   }
+}