[ARVADOS] created: 2.1.0-1910-g85e4b8259

[Git user]

        at  85e4b825947790d9cde66cb8c390dc2e216dac9a (commit)


commit 85e4b825947790d9cde66cb8c390dc2e216dac9a
Merge: 06c2c19bf 3f127283e
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Thu Feb 10 13:35:27 2022 -0500

    Merge remote-tracking branch 'MajewskiKrzysztof/exclude_home_project_parameter' into 18655-java-prs
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>


commit 06c2c19bfe18a52348b72d93db59df4b03a4fcaa
Merge: 0892f09ae 3f21facc4
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Thu Feb 10 13:35:03 2022 -0500

    Merge remote-tracking branch 'MajewskiKrzysztof/keep_client_delete_method' into 18655-java-prs
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>


commit 3f127283eabb55e64f1135c7b6ed0180b16255a2
Author: majewsk6 <krzysztof.majewski.km1 at contractors.roche.com>
Date:   Tue Jan 18 10:03:40 2022 +0100

    Add excludeHomeProject parameter to ListArgument
    Arvados-DCO-1.1-Signed-off-by: Krzysztof Majewski majewski.kielce at gmail.com

diff --git a/sdk/java-v2/src/main/java/org/arvados/client/api/model/argument/ListArgument.java b/sdk/java-v2/src/main/java/org/arvados/client/api/model/argument/ListArgument.java
index 70231e676..ca86c585e 100644
--- a/sdk/java-v2/src/main/java/org/arvados/client/api/model/argument/ListArgument.java
+++ b/sdk/java-v2/src/main/java/org/arvados/client/api/model/argument/ListArgument.java
@@ -14,7 +14,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import java.util.List;
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
- at JsonPropertyOrder({ "limit", "offset", "filters", "order", "select", "distinct", "count" })
+ at JsonPropertyOrder({ "limit", "offset", "filters", "order", "select", "distinct", "count", "exclude_home_project" })
 public class ListArgument extends Argument {
 
     @JsonProperty("limit")
@@ -38,8 +38,10 @@ public class ListArgument extends Argument {
     @JsonProperty("count")
     private Count count;
 
+    @JsonProperty("exclude_home_project")
+    private Boolean excludeHomeProject;
 
-    ListArgument(Integer limit, Integer offset, List<Filter> filters, List<String> order, List<String> select, Boolean distinct, Count count) {
+    ListArgument(Integer limit, Integer offset, List<Filter> filters, List<String> order, List<String> select, Boolean distinct, Count count, Boolean excludeHomeProject) {
         this.limit = limit;
         this.offset = offset;
         this.filters = filters;
@@ -47,6 +49,7 @@ public class ListArgument extends Argument {
         this.select = select;
         this.distinct = distinct;
         this.count = count;
+        this.excludeHomeProject = excludeHomeProject;
     }
 
     public static ListArgumentBuilder builder() {
@@ -70,6 +73,7 @@ public class ListArgument extends Argument {
         private List<String> select;
         private Boolean distinct;
         private Count count;
+        private Boolean excludeHomeProject;
 
         ListArgumentBuilder() {
         }
@@ -109,15 +113,21 @@ public class ListArgument extends Argument {
             return this;
         }
 
+        public ListArgument.ListArgumentBuilder excludeHomeProject(Boolean excludeHomeProject) {
+            this.excludeHomeProject = excludeHomeProject;
+            return this;
+        }
+
         public ListArgument build() {
-            return new ListArgument(limit, offset, filters, order, select, distinct, count);
+            return new ListArgument(limit, offset, filters, order, select, distinct, count, excludeHomeProject);
         }
 
         public String toString() {
             return "ListArgument.ListArgumentBuilder(limit=" + this.limit +
                     ", offset=" + this.offset + ", filters=" + this.filters +
                     ", order=" + this.order + ", select=" + this.select +
-                    ", distinct=" + this.distinct + ", count=" + this.count + ")";
+                    ", distinct=" + this.distinct + ", count=" + this.count +
+                    ", excludeHomeProject=" + this.excludeHomeProject + ")";
         }
     }
 }

commit 3f21facc44a04c6e67a25cd37407b569b965bb65
Author: majewsk6 <krzysztof.majewski.km1 at contractors.roche.com>
Date:   Tue Jan 18 09:59:50 2022 +0100

    Add DELETE method to Keep Client
    Arvados-DCO-1.1-Signed-off-by: Krzysztof Majewski majewski.kielce at gmail.com

diff --git a/sdk/java-v2/src/main/java/org/arvados/client/api/client/KeepWebApiClient.java b/sdk/java-v2/src/main/java/org/arvados/client/api/client/KeepWebApiClient.java
index 4cd08b783..0145b0fc4 100644
--- a/sdk/java-v2/src/main/java/org/arvados/client/api/client/KeepWebApiClient.java
+++ b/sdk/java-v2/src/main/java/org/arvados/client/api/client/KeepWebApiClient.java
@@ -26,6 +26,15 @@ public class KeepWebApiClient extends BaseApiClient {
         return newFileCall(request);
     }
 
+    public String delete(String collectionUuid, String filePathName) {
+        Request request = getRequestBuilder()
+                .url(getUrlBuilder(collectionUuid, filePathName).build())
+                .delete()
+                .build();
+
+        return newCall(request);
+    }
+
     private HttpUrl.Builder getUrlBuilder(String collectionUuid, String filePathName) {
         return new HttpUrl.Builder()
                 .scheme(config.getApiProtocol())

-----------------------------------------------------------------------


hooks/post-receive
--