Merge branch 'master' into master

Aman Alam · web-flow · commit 1640cddbb4a3 · 2019-03-18T22:05:48.000+05:30
diff --git a/src/com/akamai/APIEventBuilder.java b/src/com/akamai/APIEventBuilder.java
@@ -0,0 +1,19 @@
+package com.akamai;
+
+import com.akamai.builders.APIEventDu;
+import com.akamai.builders.APIEventMkDir;
+import com.akamai.builders.APIEventMtime;
+
+public class APIEventBuilder {
+    public static APIEventMkDir mkdir() {
+        return new APIEventMkDir();
+    }
+
+    public static APIEventDu du() {
+        return new APIEventDu();
+    }
+
+    public static APIEventMtime mtime() {
+        return new APIEventMtime();
+    }
+}
diff --git a/src/com/akamai/builders/APIEventDelete.java b/src/com/akamai/builders/APIEventDelete.java
@@ -0,0 +1,9 @@
+package com.akamai.builders;
+
+import com.akamai.netstorage.APIEventBean;
+
+public class APIEventDelete extends APIEventBean {
+    public APIEventDelete() {
+        super("delete");
+    }
+}
diff --git a/src/com/akamai/builders/APIEventDir.java b/src/com/akamai/builders/APIEventDir.java
@@ -0,0 +1,7 @@
+package com.akamai.builders;
+
+public class APIEventDir extends APIEventWithFormat {
+    public APIEventDir() {
+        super("dir");
+    }
+}
diff --git a/src/com/akamai/builders/APIEventDownload.java b/src/com/akamai/builders/APIEventDownload.java
@@ -0,0 +1,9 @@
+package com.akamai.builders;
+
+import com.akamai.netstorage.APIEventBean;
+
+public class APIEventDownload extends APIEventBean {
+    public APIEventDownload() {
+        super("download");
+    }
+}
diff --git a/src/com/akamai/builders/APIEventDu.java b/src/com/akamai/builders/APIEventDu.java
@@ -0,0 +1,7 @@
+package com.akamai.builders;
+
+public class APIEventDu extends APIEventWithFormat {
+    public APIEventDu() {
+        super("du");
+    }
+}
diff --git a/src/com/akamai/builders/APIEventMkDir.java b/src/com/akamai/builders/APIEventMkDir.java
@@ -0,0 +1,9 @@
+package com.akamai.builders;
+
+import com.akamai.netstorage.APIEventBean;
+
+public class APIEventMkDir extends APIEventBean {
+    public APIEventMkDir() {
+        super("mkdir");
+    }
+}
diff --git a/src/com/akamai/builders/APIEventMtime.java b/src/com/akamai/builders/APIEventMtime.java
@@ -0,0 +1,25 @@
+package com.akamai.builders;
+
+import com.akamai.netstorage.APIEventBean;
+import com.akamai.netstorage.parameter.DateValueFormatter;
+import com.akamai.netstorage.parameter.Parameter;
+
+import java.util.Date;
+
+public class APIEventMtime extends APIEventBean {
+    @Parameter(name = "mtime", formatter = DateValueFormatter.class)
+    private Date mtime;
+
+    public APIEventMtime() {
+        super("mtime");
+    }
+
+    public APIEventMtime withMtime(Date mtime) {
+        this.mtime = mtime;
+        return this;
+    }
+
+    public Date getMtime() {
+        return mtime;
+    }
+}
diff --git a/src/com/akamai/builders/APIEventQuickDelete.java b/src/com/akamai/builders/APIEventQuickDelete.java
@@ -0,0 +1,18 @@
+package com.akamai.builders;
+
+import com.akamai.netstorage.APIEventBean;
+import com.akamai.netstorage.parameter.Parameter;
+
+public class APIEventQuickDelete extends APIEventBean {
+    @Parameter(name = "quick-delete")
+    private final String quickDelete;
+
+    public APIEventQuickDelete() {
+        super("quick-delete");
+        this.quickDelete = "imreallyreallysure";
+    }
+
+    public String getQuickDelete() {
+        return quickDelete;
+    }
+}
diff --git a/src/com/akamai/builders/APIEventRename.java b/src/com/akamai/builders/APIEventRename.java
@@ -0,0 +1,20 @@
+package com.akamai.builders;
+
+import com.akamai.netstorage.APIEventBean;
+
+public class APIEventRename extends APIEventBean {
+    private String destination;
+
+    public APIEventRename() {
+        super("rename");
+    }
+
+    public APIEventBean to(String destination) {
+        this.destination = destination;
+        return this;
+    }
+
+    public String getDestination() {
+        return destination;
+    }
+}
diff --git a/src/com/akamai/builders/APIEventRmdir.java b/src/com/akamai/builders/APIEventRmdir.java
@@ -0,0 +1,9 @@
+package com.akamai.builders;
+
+import com.akamai.netstorage.APIEventBean;
+
+public class APIEventRmdir extends APIEventBean {
+    public APIEventRmdir() {
+        super("rmdir");
+    }
+}
diff --git a/src/com/akamai/builders/APIEventSetmd.java b/src/com/akamai/builders/APIEventSetmd.java
@@ -0,0 +1,9 @@
+package com.akamai.builders;
+
+import com.akamai.netstorage.APIEventBean;
+
+public class APIEventSetmd extends APIEventBean {
+    public APIEventSetmd() {
+        super("setmd");
+    }
+}
diff --git a/src/com/akamai/builders/APIEventStat.java b/src/com/akamai/builders/APIEventStat.java
@@ -0,0 +1,7 @@
+package com.akamai.builders;
+
+public class APIEventStat extends APIEventWithFormat {
+    public APIEventStat() {
+        super("stat");
+    }
+}
diff --git a/src/com/akamai/builders/APIEventSymlink.java b/src/com/akamai/builders/APIEventSymlink.java
@@ -0,0 +1,20 @@
+package com.akamai.builders;
+
+import com.akamai.netstorage.APIEventBean;
+
+public class APIEventSymlink extends APIEventBean {
+    private String target;
+
+    public APIEventSymlink() {
+        super("symlink");
+    }
+
+    public APIEventSymlink to(String target) {
+        this.target = target;
+        return this;
+    }
+
+    public String getTarget() {
+        return target;
+    }
+}
diff --git a/src/com/akamai/builders/APIEventUpload.java b/src/com/akamai/builders/APIEventUpload.java
@@ -0,0 +1,90 @@
+package com.akamai.builders;
+
+import com.akamai.netstorage.APIEventBean;
+import com.akamai.netstorage.parameter.BooleanValueFormatter;
+import com.akamai.netstorage.parameter.ByteArrayValueFormatter;
+import com.akamai.netstorage.parameter.DateValueFormatter;
+import com.akamai.netstorage.parameter.Parameter;
+
+import java.util.Date;
+
+public class APIEventUpload extends APIEventBean {
+    @Parameter(name = "mtime", formatter = DateValueFormatter.class)
+    private Date mtime;
+    private Long size;
+    @Parameter(name = "md5", formatter = ByteArrayValueFormatter.class)
+    private byte[] md5;
+    @Parameter(name = "sha1", formatter = ByteArrayValueFormatter.class)
+    private byte[] sha1;
+    @Parameter(name = "sha256", formatter = ByteArrayValueFormatter.class)
+    private byte[] sha256;
+    @Parameter(name = "index-zip", formatter = BooleanValueFormatter.class)
+    private Boolean indexZip;
+
+    public APIEventUpload() {
+        super("upload");
+    }
+
+    public APIEventUpload withMtime(Date mtime) {
+        this.mtime = mtime;
+        return this;
+    }
+
+    public Date getMtime() {
+        return mtime;
+    }
+
+    public APIEventUpload ofSize(Long size) {
+        this.size = size;
+        resetSizeIfNeeded();
+        return this;
+    }
+
+    public Long getSize() {
+        return size;
+    }
+
+    public APIEventUpload withMd5(byte[] md5Checksum) {
+        this.md5 = md5Checksum;
+        return this;
+    }
+
+    public byte[] getMd5() {
+        return md5;
+    }
+
+    public APIEventUpload withSha1(byte[] sha1Checksum) {
+        this.sha1 = sha1Checksum;
+        return this;
+    }
+
+    public byte[] getSha1() {
+        return sha1;
+    }
+
+    public APIEventUpload withSha256(byte[] sha256Checksum) {
+        this.sha256 = sha256Checksum;
+        return this;
+    }
+
+    public byte[] getSha256() {
+        return sha256;
+    }
+
+    public APIEventUpload isIndexZip(boolean indexZip) {
+        this.indexZip = indexZip ? indexZip : null;
+        resetSizeIfNeeded();
+        return this;
+    }
+
+    private void resetSizeIfNeeded() {
+        // size is not supported with zip since the index-zip functionality mutates the file thus inconsistency on which size value to use
+        // probably should throw an exception or a warning
+        if (getSize() != null && getIndexZip() != null && getIndexZip())
+            this.size = null;
+    }
+
+    public Boolean getIndexZip() {
+        return indexZip;
+    }
+}
diff --git a/src/com/akamai/builders/APIEventWithFormat.java b/src/com/akamai/builders/APIEventWithFormat.java
@@ -0,0 +1,20 @@
+package com.akamai.builders;
+
+import com.akamai.netstorage.APIEventBean;
+
+public abstract class APIEventWithFormat extends APIEventBean {
+    private String format;
+
+    protected APIEventWithFormat(String action) {
+        super(action);
+    }
+
+    public APIEventBean withFormat(String format) {
+        this.format = format;
+        return this;
+    }
+
+    public String getFormat() {
+        return format;
+    }
+}
diff --git a/src/com/akamai/netstorage/APIEventBean.java b/src/com/akamai/netstorage/APIEventBean.java
diff --git a/src/com/akamai/netstorage/NetStorage.java b/src/com/akamai/netstorage/NetStorage.java
diff --git a/src/com/akamai/netstorage/NetStorageException.java b/src/com/akamai/netstorage/NetStorageException.java
diff --git a/src/com/akamai/netstorage/Utils.java b/src/com/akamai/netstorage/Utils.java
diff --git a/test/com/akamai/netstorage/APIEventBeanTest.java b/test/com/akamai/netstorage/APIEventBeanTest.java
diff --git a/test/com/akamai/netstorage/NetStorageCMSv35SignerTest.java b/test/com/akamai/netstorage/NetStorageCMSv35SignerTest.java
