diff --git a/src/main/java/org/example/Mapper/Collections/Serialize/ModifyMetadataOperations.java b/src/main/java/org/example/Mapper/Collections/Serialize/ModifyMetadataOperations.java deleted file mode 100644 index 0296dfc..0000000 --- a/src/main/java/org/example/Mapper/Collections/Serialize/ModifyMetadataOperations.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.example.Mapper.Collections.Serialize; - -import com.fasterxml.jackson.annotation.JsonProperty; - -/** - * For the modify_metadata() method. - * Represents the JSON object that is passed into the operations parameter - */ -public class ModifyMetadataOperations { - @JsonProperty("operation") - private String operation; - @JsonProperty("attribute") - private String attribute; - @JsonProperty("value") - private String value; - @JsonProperty("units") - private String units; // optional - - public ModifyMetadataOperations(String operation, String attribute, String value, String units) { - this.operation = operation; - this.attribute = attribute; - this.value = value; - this.units = units; - } -} diff --git a/src/main/java/org/example/Mapper/Collections/Serialize/ModifyPermissionsOperations.java b/src/main/java/org/example/Mapper/Collections/Serialize/ModifyPermissionsOperations.java deleted file mode 100644 index 89ed2b0..0000000 --- a/src/main/java/org/example/Mapper/Collections/Serialize/ModifyPermissionsOperations.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.example.Mapper.Collections.Serialize; - - -import com.fasterxml.jackson.annotation.JsonProperty; -import org.example.Collections.Permission; - -/** - * For the modify_permissions() method. - * Represents the JSON object that is passed into the operations parameter - */ -public class ModifyPermissionsOperations { - @JsonProperty("entity_name") - private String entity_name; - - @JsonProperty("acl") - private String acl; - - public ModifyPermissionsOperations(String entity_name, Permission acl) { - this.entity_name = entity_name; - this.acl = acl.getValue(); - } -} diff --git a/src/main/java/org/example/Operations/CollectionOperations.java b/src/main/java/org/example/Operations/CollectionOperations.java index 3843ce0..368d5d8 100644 --- a/src/main/java/org/example/Operations/CollectionOperations.java +++ b/src/main/java/org/example/Operations/CollectionOperations.java @@ -3,8 +3,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import org.example.Properties.Collection.*; import org.example.Wrapper; -import org.example.Mapper.Serialize.ModifyMetadataOperations; -import org.example.Mapper.Serialize.ModifyPermissionsOperations; +import org.example.Serialize.ModifyMetadataOperations; +import org.example.Serialize.ModifyPermissionsOperations; import org.example.Util.*; import java.io.IOException; @@ -24,7 +24,6 @@ public class CollectionOperations { private final Wrapper client; private String baseUrl; - public CollectionOperations(Wrapper client) { this.client = client; this.baseUrl = client.getBaseUrl() + "/collections"; @@ -78,7 +77,6 @@ public Response remove(String token, String lpath) { return this.remove(token, lpath, prop); } - /** * Returns information about a collection * @param lpath The logical path for the collection @@ -208,9 +206,7 @@ public Response modify_metadata(String token, String lpath, List formData.put("admin", String.valueOf(val))); HttpResponse response = HttpRequestUtil.sendAndParsePOST(formData, baseUrl, token, client.getClient()); - return new Response(response.statusCode(), response.body()); - } public Response modify_metadata(String token, String lpath, List jsonParam) { @@ -220,11 +216,10 @@ public Response modify_metadata(String token, String lpath, List formData = Map.of( - "op", "rename", - "old-lpath", oldPath, - "new-lpath", newPath - ); + Map formData = new HashMap<>(); + formData.put("op", "rename"); + formData.put("old-lpath", oldPath); + formData.put("new-lpath", newPath); HttpResponse response = HttpRequestUtil.sendAndParsePOST(formData, baseUrl, token, client.getClient()); return new Response(response.statusCode(), response.body()); @@ -242,13 +237,8 @@ public Response touch(String token, String lpath, CollectionsTouchParams prop) return new Response(response.statusCode(), response.body()); } - public Response touch(String token, String lpath) { CollectionsTouchParams prop = new CollectionsTouchParams(); return this.touch(token, lpath, prop); } -} - - - - +} \ No newline at end of file diff --git a/src/main/java/org/example/Operations/DataObjectOperations.java b/src/main/java/org/example/Operations/DataObjectOperations.java index e8f3c7d..43bd352 100644 --- a/src/main/java/org/example/Operations/DataObjectOperations.java +++ b/src/main/java/org/example/Operations/DataObjectOperations.java @@ -5,8 +5,8 @@ import org.example.Properties.DataObject.*; import org.example.Properties.DataObject.DataObjectModifyReplicaParams; import org.example.Wrapper; -import org.example.Mapper.Serialize.ModifyMetadataOperations; -import org.example.Mapper.Serialize.ModifyPermissionsOperations; +import org.example.Serialize.ModifyMetadataOperations; +import org.example.Serialize.ModifyPermissionsOperations; import org.example.Util.HttpRequestUtil; import org.example.Util.Response; diff --git a/src/main/java/org/example/Operations/ResourceOperations.java b/src/main/java/org/example/Operations/ResourceOperations.java index 9d104b3..d87d049 100644 --- a/src/main/java/org/example/Operations/ResourceOperations.java +++ b/src/main/java/org/example/Operations/ResourceOperations.java @@ -5,7 +5,7 @@ import org.example.Properties.Resource.ResourceAddChildParams; import org.example.Properties.Resource.ResourceCreateParams; import org.example.Wrapper; -import org.example.Mapper.Serialize.ModifyMetadataOperations; +import org.example.Serialize.ModifyMetadataOperations; import org.example.Util.HttpRequestUtil; import org.example.Util.Response; diff --git a/src/main/java/org/example/Operations/UserGroupOperations.java b/src/main/java/org/example/Operations/UserGroupOperations.java index 48fa93c..79fdd20 100644 --- a/src/main/java/org/example/Operations/UserGroupOperations.java +++ b/src/main/java/org/example/Operations/UserGroupOperations.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.example.Wrapper; -import org.example.Mapper.Serialize.ModifyMetadataOperations; +import org.example.Serialize.ModifyMetadataOperations; import org.example.Util.HttpRequestUtil; import org.example.Util.IrodsException; import org.example.Util.Response; @@ -17,7 +17,6 @@ public class UserGroupOperations { private final Wrapper client; private String baseUrl; - public UserGroupOperations(Wrapper client) { this.client = client; this.baseUrl = client.getBaseUrl() + "/users-groups"; @@ -168,6 +167,5 @@ public Response modify_metadata(String token, String name, List response = HttpRequestUtil.sendAndParsePOST(formData, baseUrl, token, client.getClient()); return new Response(response.statusCode(), response.body()); - } -} +} \ No newline at end of file diff --git a/src/main/java/org/example/Mapper/Serialize/ModifyMetadataOperations.java b/src/main/java/org/example/Serialize/ModifyMetadataOperations.java similarity index 96% rename from src/main/java/org/example/Mapper/Serialize/ModifyMetadataOperations.java rename to src/main/java/org/example/Serialize/ModifyMetadataOperations.java index e8a854f..1e06c8a 100644 --- a/src/main/java/org/example/Mapper/Serialize/ModifyMetadataOperations.java +++ b/src/main/java/org/example/Serialize/ModifyMetadataOperations.java @@ -1,4 +1,4 @@ -package org.example.Mapper.Serialize; +package org.example.Serialize; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/src/main/java/org/example/Mapper/Serialize/ModifyPermissionsOperations.java b/src/main/java/org/example/Serialize/ModifyPermissionsOperations.java similarity index 95% rename from src/main/java/org/example/Mapper/Serialize/ModifyPermissionsOperations.java rename to src/main/java/org/example/Serialize/ModifyPermissionsOperations.java index 9486051..8a28865 100644 --- a/src/main/java/org/example/Mapper/Serialize/ModifyPermissionsOperations.java +++ b/src/main/java/org/example/Serialize/ModifyPermissionsOperations.java @@ -1,4 +1,4 @@ -package org.example.Mapper.Serialize; +package org.example.Serialize; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/test/java/org/example/Operations/DataObjectOperationsTest.java b/src/test/java/org/example/Operations/DataObjectOperationsTest.java index 0a9112c..fd1e89b 100644 --- a/src/test/java/org/example/Operations/DataObjectOperationsTest.java +++ b/src/test/java/org/example/Operations/DataObjectOperationsTest.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import org.example.Mapper.Serialize.ModifyMetadataOperations; -import org.example.Mapper.Serialize.ModifyPermissionsOperations; +import org.example.Serialize.ModifyMetadataOperations; +import org.example.Serialize.ModifyPermissionsOperations; import org.example.Properties.DataObject.*; import org.example.Properties.Resource.ResourceCreateParams; import org.example.Util.Response; diff --git a/src/test/java/org/example/WrapperTest.java b/src/test/java/org/example/WrapperTest.java index e344810..9cead5d 100644 --- a/src/test/java/org/example/WrapperTest.java +++ b/src/test/java/org/example/WrapperTest.java @@ -3,15 +3,11 @@ import org.junit.Before; import org.junit.Test; import org.example.Util.Response; - import static org.junit.Assert.*; - - public class WrapperTest { private static String baseUrl; private static Wrapper rods; private Response response; - @Before public void setup() { String address = "52.91.145.195"; @@ -25,7 +21,6 @@ public void setup() { response = rods.information().info(); assertEquals(200, response.getHttpStatusCode()); } - @Test public void authenticate_valid() { response = rods.authenticate(); @@ -33,7 +28,6 @@ public void authenticate_valid() { assertEquals(response.getBody(), rods.getAuthToken()); } - @Test public void authenticate_invalid_user() { Wrapper test = new Wrapper(baseUrl, "test", "test");