Skip to content

Commit

Permalink
Make Fedora Base url more obvious
Browse files Browse the repository at this point in the history
  • Loading branch information
@whikloj
whikloj committed Nov 2, 2019
1 parent 4a5644e commit 0582a39
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 18 deletions.
4 changes: 1 addition & 3 deletions islandora-indexing-fcrepo/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ dependencies {
implementation group: 'org.apache.camel', name: 'camel-http4', version: versions.camel
implementation group: 'org.apache.camel', name: 'camel-jackson', version: versions.camel
implementation group: 'org.apache.camel', name: 'camel-jsonpath', version: versions.camel
implementation(project(':islandora-event-support')) {
transitive = true
}
implementation(project(':islandora-event-support'))
implementation group: 'org.slf4j', name: 'slf4j-api', version: versions.slf4j
implementation group: 'commons-io', name: 'commons-io', version: versions.commonsIo
testImplementation group: 'org.apache.camel', name: 'camel-test-blueprint', version: versions.camel
Expand Down
30 changes: 15 additions & 15 deletions ...dora-indexing-fcrepo/src/main/java/ca/islandora/alpaca/indexing/fcrepo/FcrepoIndexer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,15 +148,15 @@ public void configure() {
.setProperty("event").simple("${body}")
.setProperty("uuid").simple("${exchangeProperty.event.object.id.replaceAll(\"urn:uuid:\",\"\")}")
.setProperty("jsonldUrl").simple("${exchangeProperty.event.object.url[2].href}")
.setProperty("fedoraUrl").simple("${exchangeProperty.event.target}")
.setProperty("fedoraBaseUrl").simple("${exchangeProperty.event.target}")
.log(DEBUG, LOGGER, "Received Node event for UUID (${exchangeProperty.uuid}), jsonld URL (" +
"${exchangeProperty.jsonldUrl}), fedora base URL (${exchangeProperty.fedoraUrl})")
"${exchangeProperty.jsonldUrl}), fedora base URL (${exchangeProperty.fedoraBaseUrl})")

// Prepare the message.
.removeHeaders("*", "Authorization")
.setHeader(Exchange.HTTP_METHOD, constant("POST"))
.setHeader("Content-Location", simple("${exchangeProperty.jsonldUrl}"))
.setHeader(FEDORA_HEADER, exchangeProperty("fedoraUrl"))
.setHeader(FEDORA_HEADER, exchangeProperty("fedoraBaseUrl"))
.setBody(simple("${null}"))

// Pass it to milliner.
Expand All @@ -180,14 +180,14 @@ public void configure() {
// Extract relevant data from the event.
.setProperty("event").simple("${body}")
.setProperty("uuid").simple("${exchangeProperty.event.object.id.replaceAll(\"urn:uuid:\",\"\")}")
.setProperty("fedoraUrl").simple("${exchangeProperty.event.target}")
.setProperty("fedoraBaseUrl").simple("${exchangeProperty.event.target}")
.log(DEBUG, LOGGER, "Received Node delete event for UUID (${exchangeProperty.uuid}), fedora base URL" +
" (${exchangeProperty.fedoraUrl})")
" (${exchangeProperty.fedoraBaseUrl})")

// Prepare the message.
.removeHeaders("*", "Authorization")
.setHeader(Exchange.HTTP_METHOD, constant("DELETE"))
.setHeader(FEDORA_HEADER, exchangeProperty("fedoraUrl"))
.setHeader(FEDORA_HEADER, exchangeProperty("fedoraBaseUrl"))
.setBody(simple("${null}"))

// Remove the file from Gemini.
Expand All @@ -203,15 +203,15 @@ public void configure() {
.setProperty("event").simple("${body}")
.setProperty("sourceField").simple("${exchangeProperty.event.attachment.content.sourceField}")
.setProperty("jsonUrl").simple("${exchangeProperty.event.object.url[1].href}")
.setProperty("fedoraUrl").simple("${exchangeProperty.event.target}")
.setProperty("fedoraBaseUrl").simple("${exchangeProperty.event.target}")
.log(DEBUG, LOGGER, "Received Media event for sourceField (${exchangeProperty.sourceField}), jsonld" +
" URL (${exchangeProperty.jsonUrl}), fedora Base URL (${exchangeProperty.fedoraUrl})")
" URL (${exchangeProperty.jsonUrl}), fedora Base URL (${exchangeProperty.fedoraBaseUrl})")

// Prepare the message.
.removeHeaders("*", "Authorization")
.setHeader(Exchange.HTTP_METHOD, constant("POST"))
.setHeader("Content-Location", simple("${exchangeProperty.jsonUrl}"))
.setHeader(FEDORA_HEADER, exchangeProperty("fedoraUrl"))
.setHeader(FEDORA_HEADER, exchangeProperty("fedoraBaseUrl"))
.setBody(simple("${null}"))

// Pass it to milliner.
Expand All @@ -228,16 +228,16 @@ public void configure() {
.setProperty("uuid").simple("${exchangeProperty.event.object.id.replaceAll(\"urn:uuid:\",\"\")}")
.setProperty("drupal").simple("${exchangeProperty.event.object.url[0].href}")
.setProperty("fedora").simple("${exchangeProperty.event.attachment.content.fedoraUri}")
.setProperty("fedoraUrl").simple("${exchangeProperty.event.target}")
.setProperty("fedoraBaseUrl").simple("${exchangeProperty.event.target}")
.log(DEBUG, LOGGER, "Received File event for UUID (${exchangeProperty.uuid}), drupal URL (" +
"${exchangeProperty.drupal}), fedoraURL (${exchangeProperty.fedora}), fedora base URL " +
"(${exchangeProperty.fedoraUrl})")
"(${exchangeProperty.fedoraBaseUrl})")

// Prepare the message.
.removeHeaders("*", "Authorization")
.setHeader(Exchange.CONTENT_TYPE, constant("application/json"))
.setHeader(Exchange.HTTP_METHOD, constant("PUT"))
.setHeader(FEDORA_HEADER, exchangeProperty("fedoraUrl"))
.setHeader(FEDORA_HEADER, exchangeProperty("fedoraBaseUrl"))
.setBody(simple(
"{\"drupal\": \"${exchangeProperty.drupal}\", \"fedora\": \"${exchangeProperty.fedora}\"}")
)
Expand All @@ -255,15 +255,15 @@ public void configure() {
.setProperty("event").simple("${body}")
.setProperty("uuid").simple("${exchangeProperty.event.object.id.replaceAll(\"urn:uuid:\",\"\")}")
.setProperty("drupal").simple("${exchangeProperty.event.object.url[0].href}")
.setProperty("fedoraUrl").simple("${exchangeProperty.event.target}")
.setProperty("fedoraBaseUrl").simple("${exchangeProperty.event.target}")
.log(DEBUG, LOGGER, "Received File external event for UUID (${exchangeProperty.uuid}), drupal URL " +
"(${exchangeProperty.drupal}), fedora base URL (${exchangeProperty.fedoraUrl})")
"(${exchangeProperty.drupal}), fedora base URL (${exchangeProperty.fedoraBaseUrl})")

// Prepare the message.
.removeHeaders("*", "Authorization")
.setHeader(Exchange.HTTP_METHOD, constant("POST"))
.setHeader("Content-Location", simple("${exchangeProperty.drupal}"))
.setHeader(FEDORA_HEADER, exchangeProperty("fedoraUrl"))
.setHeader(FEDORA_HEADER, exchangeProperty("fedoraBaseUrl"))
.setBody(simple("${null}"))

// Pass it to milliner.
Expand Down

0 comments on commit 0582a39

Please sign in to comment.