From 9652a685a7e4f2c507a37b5c2d8a3475a8e04bf0 Mon Sep 17 00:00:00 2001
From: Jared Whiklo <jwhiklo@gmail.com>
Date: Wed, 12 Jan 2022 13:19:50 -0600
Subject: [PATCH 1/2] Fix typo (#85)

---
 .github/workflows/build-1.x.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-1.x.yml b/.github/workflows/build-1.x.yml
index 0b1ed759..75fba97d 100644
--- a/.github/workflows/build-1.x.yml
+++ b/.github/workflows/build-1.x.yml
@@ -2,7 +2,7 @@ name: CI
 
 on:
   push:
-    braches: [1.x]
+    branches: [1.x]
   pull_request:
     branches: [1.x]
 

From 44ae96e493da73af1c4903c319896e750ab2e809 Mon Sep 17 00:00:00 2001
From: Jason Hildebrand <jason@peaceworks.ca>
Date: Thu, 20 Oct 2022 13:59:53 -0500
Subject: [PATCH 2/2] Derivative connector: accept an inputargs property and
 pass it through in a new X-Islandora-Input-Args header.

---
 .../derivative/DerivativeConnector.java       |  1 +
 .../support/event/AS2AttachmentContent.java   | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/islandora-connector-derivative/src/main/java/ca/islandora/alpaca/connector/derivative/DerivativeConnector.java b/islandora-connector-derivative/src/main/java/ca/islandora/alpaca/connector/derivative/DerivativeConnector.java
index 556bd0a4..fa90ffa6 100644
--- a/islandora-connector-derivative/src/main/java/ca/islandora/alpaca/connector/derivative/DerivativeConnector.java
+++ b/islandora-connector-derivative/src/main/java/ca/islandora/alpaca/connector/derivative/DerivativeConnector.java
@@ -64,6 +64,7 @@ public void configure() {
             .setHeader(Exchange.HTTP_METHOD, constant("GET"))
             .setHeader("Accept", simple("${exchangeProperty.event.attachment.content.mimetype}"))
             .setHeader("X-Islandora-Args", simple("${exchangeProperty.event.attachment.content.args}"))
+            .setHeader("X-Islandora-Input-Args", simple("${exchangeProperty.event.attachment.content.inputargs}"))
             .setHeader("Apix-Ldp-Resource", simple("${exchangeProperty.event.attachment.content.sourceUri}"))
             .setBody(simple("${null}"))
             .to("{{derivative.service.url}}?connectionClose=true")
diff --git a/islandora-event-support/src/main/java/ca/islandora/alpaca/support/event/AS2AttachmentContent.java b/islandora-event-support/src/main/java/ca/islandora/alpaca/support/event/AS2AttachmentContent.java
index 72d7d123..19ebd597 100644
--- a/islandora-event-support/src/main/java/ca/islandora/alpaca/support/event/AS2AttachmentContent.java
+++ b/islandora-event-support/src/main/java/ca/islandora/alpaca/support/event/AS2AttachmentContent.java
@@ -51,6 +51,10 @@ public class AS2AttachmentContent {
      * Arguments to pass to derivative connector, ie. "-thumbnail 100x100".
      */
     private String args;
+    /**
+     * Arguments to pass to derivative connector, ie. "-density 144".
+     */
+    private String inputargs;
     /**
      * Path to attachment file, ie. public://2019-11/2-Thumbnail Image.jpg.
      */
@@ -144,6 +148,21 @@ public void setArgs(final String args) {
         this.args = args;
     }
 
+    /**
+     * @return  inputargs
+     */
+    @JsonProperty("inputargs")
+    public String getInputargs() {
+        return inputargs;
+    }
+
+    /**
+     * @param   inputargs    inputargs
+     */
+    public void setInputargs(final String inputargs) {
+        this.inputargs = inputargs;
+    }
+
     /**
      * @return  File upload uri
      */