Move addTransaction to individual builders

This is to remove it from being able to be called in the memento builders rather than throwing an exception
fcrepo-exts · Aug 24, 2022 · 6b1cea9 · 6b1cea9
1 parent 916e1ff
commit 6b1cea9
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 25 deletions.
diff --git a/src/main/java/org/fcrepo/client/DeleteBuilder.java b/src/main/java/org/fcrepo/client/DeleteBuilder.java
@@ -5,6 +5,8 @@
  */
 package org.fcrepo.client;
 
+import static org.fcrepo.client.FedoraHeaderConstants.ATOMIC_ID;
+
 import java.net.URI;
 
 import org.apache.http.client.methods.HttpRequestBase;
@@ -37,9 +39,9 @@ public DeleteBuilder addHeader(final String name, final String value) {
         return (DeleteBuilder) super.addHeader(name, value);
     }
 
-    @Override
     public DeleteBuilder addTransaction(final TransactionURI transaction) {
-        return (DeleteBuilder) super.addTransaction(transaction);
+        request.addHeader(ATOMIC_ID, transaction.asString());
+        return this;
     }
 
 }
diff --git a/src/main/java/org/fcrepo/client/GetBuilder.java b/src/main/java/org/fcrepo/client/GetBuilder.java
@@ -6,6 +6,7 @@
 package org.fcrepo.client;
 
 import static org.fcrepo.client.FedoraHeaderConstants.ACCEPT;
+import static org.fcrepo.client.FedoraHeaderConstants.ATOMIC_ID;
 import static org.fcrepo.client.FedoraHeaderConstants.IF_MODIFIED_SINCE;
 import static org.fcrepo.client.FedoraHeaderConstants.IF_NONE_MATCH;
 import static org.fcrepo.client.FedoraHeaderConstants.PREFER;
@@ -184,8 +185,8 @@ public GetBuilder addLinkHeader(final FcrepoLink linkHeader) {
         return (GetBuilder) super.addLinkHeader(linkHeader);
     }
 
-    @Override
     public GetBuilder addTransaction(final TransactionURI transaction) {
-        return (GetBuilder) super.addTransaction(transaction);
+        request.addHeader(ATOMIC_ID, transaction.asString());
+        return this;
     }
 }
diff --git a/src/main/java/org/fcrepo/client/HeadBuilder.java b/src/main/java/org/fcrepo/client/HeadBuilder.java
@@ -5,6 +5,8 @@
  */
 package org.fcrepo.client;
 
+import static org.fcrepo.client.FedoraHeaderConstants.ATOMIC_ID;
+
 import java.net.URI;
 import java.time.Instant;
 
@@ -69,8 +71,8 @@ public HeadBuilder addLinkHeader(final FcrepoLink linkHeader) {
         return (HeadBuilder) super.addLinkHeader(linkHeader);
     }
 
-    @Override
     public HeadBuilder addTransaction(final TransactionURI transaction) {
-        return (HeadBuilder) super.addTransaction(transaction);
+        request.addHeader(ATOMIC_ID, transaction.asString());
+        return this;
     }
 }
diff --git a/src/main/java/org/fcrepo/client/OptionsBuilder.java b/src/main/java/org/fcrepo/client/OptionsBuilder.java
@@ -5,6 +5,8 @@
  */
 package org.fcrepo.client;
 
+import static org.fcrepo.client.FedoraHeaderConstants.ATOMIC_ID;
+
 import java.net.URI;
 
 import org.apache.http.client.methods.HttpRequestBase;
@@ -42,8 +44,8 @@ public OptionsBuilder addLinkHeader(final FcrepoLink linkHeader) {
         return (OptionsBuilder) super.addLinkHeader(linkHeader);
     }
 
-    @Override
     public OptionsBuilder addTransaction(final TransactionURI transaction) {
-        return (OptionsBuilder) super.addTransaction(transaction);
+        request.addHeader(ATOMIC_ID, transaction.asString());
+        return this;
     }
 }
diff --git a/src/main/java/org/fcrepo/client/OriginalMementoBuilder.java b/src/main/java/org/fcrepo/client/OriginalMementoBuilder.java
@@ -8,7 +8,6 @@
 import java.net.URI;
 
 import org.apache.http.client.methods.HttpRequestBase;
-import org.fcrepo.client.FcrepoResponse.TransactionURI;
 
 /**
  * Builds a POST request for creating a memento (LDPRm) from the current state of an LDPRv.
@@ -42,8 +41,4 @@ public OriginalMementoBuilder addLinkHeader(final FcrepoLink linkHeader) {
         return (OriginalMementoBuilder) super.addLinkHeader(linkHeader);
     }
 
-    @Override
-    public OriginalMementoBuilder addTransaction(final TransactionURI transaction) {
-        throw new IllegalStateException("Mementos are not allowed in transactions");
-    }
 }
diff --git a/src/main/java/org/fcrepo/client/PatchBuilder.java b/src/main/java/org/fcrepo/client/PatchBuilder.java
@@ -5,6 +5,8 @@
  */
 package org.fcrepo.client;
 
+import static org.fcrepo.client.FedoraHeaderConstants.ATOMIC_ID;
+
 import java.io.InputStream;
 import java.net.URI;
 
@@ -103,8 +105,8 @@ public PatchBuilder addLinkHeader(final FcrepoLink linkHeader) {
         return (PatchBuilder) super.addLinkHeader(linkHeader);
     }
 
-    @Override
     public PatchBuilder addTransaction(final TransactionURI transaction) {
-        return (PatchBuilder) super.addTransaction(transaction);
+        request.addHeader(ATOMIC_ID, transaction.asString());
+        return this;
     }
 }
diff --git a/src/main/java/org/fcrepo/client/PostBuilder.java b/src/main/java/org/fcrepo/client/PostBuilder.java
@@ -5,6 +5,7 @@
  */
 package org.fcrepo.client;
 
+import static org.fcrepo.client.FedoraHeaderConstants.ATOMIC_ID;
 import static org.fcrepo.client.FedoraHeaderConstants.CONTENT_DISPOSITION;
 import static org.fcrepo.client.FedoraHeaderConstants.SLUG;
 
@@ -102,9 +103,9 @@ public PostBuilder addHeader(final String name, final String value) {
         return (PostBuilder) super.addHeader(name, value);
     }
 
-    @Override
     public PostBuilder addTransaction(final TransactionURI transaction) {
-        return (PostBuilder) super.addTransaction(transaction);
+        request.addHeader(ATOMIC_ID, transaction.asString());
+        return this;
     }
 
     @Override

diff --git a/src/main/java/org/fcrepo/client/PutBuilder.java b/src/main/java/org/fcrepo/client/PutBuilder.java
@@ -5,6 +5,7 @@
  */
 package org.fcrepo.client;
 
+import static org.fcrepo.client.FedoraHeaderConstants.ATOMIC_ID;
 import static org.fcrepo.client.FedoraHeaderConstants.CONTENT_DISPOSITION;
 import static org.fcrepo.client.FedoraHeaderConstants.PREFER;
 
@@ -122,9 +123,9 @@ public PutBuilder addLinkHeader(final FcrepoLink linkHeader) {
         return (PutBuilder) super.addLinkHeader(linkHeader);
     }
 
-    @Override
     public PutBuilder addTransaction(final TransactionURI transaction) {
-        return (PutBuilder) super.addTransaction(transaction);
+        request.addHeader(ATOMIC_ID, transaction.asString());
+        return this;
     }
 
     /**

diff --git a/src/main/java/org/fcrepo/client/RequestBuilder.java b/src/main/java/org/fcrepo/client/RequestBuilder.java
@@ -5,15 +5,13 @@
  */
 package org.fcrepo.client;
 
-import static org.fcrepo.client.FedoraHeaderConstants.ATOMIC_ID;
 import static org.slf4j.LoggerFactory.getLogger;
 import static org.fcrepo.client.FedoraHeaderConstants.LINK;
 
 import java.net.URI;
 
 import org.apache.http.client.methods.HttpRequestBase;
 import org.apache.http.util.Args;
-import org.fcrepo.client.FcrepoResponse.TransactionURI;
 import org.slf4j.Logger;
 
 /**
@@ -98,8 +96,4 @@ protected RequestBuilder addLinkHeader(final FcrepoLink linkHeader) {
      * @param transaction transaction atomic id
      * @return this builder
      */
-    public RequestBuilder addTransaction(final TransactionURI transaction) {
-        request.addHeader(ATOMIC_ID, transaction.asString());
-        return this;
-    }
 }