SSDM-5098: externally mmanaged datasets: added git repository id to content...

SSDM-5098: externally mmanaged datasets: added git repository id to content copy and all related models / functionalities

SVN: 38557

openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/ContentCopy.java

@@ -46,6 +46,9 @@ public class ContentCopy implements Serializable
     @JsonProperty
     private String gitCommitHash;
 
+    @JsonProperty
+    private String gitRepositoryId;
+
     @JsonIgnore
     public ContentCopyPermId getId()
     {
@@ -100,4 +103,14 @@ public class ContentCopy implements Serializable
     {
         this.gitCommitHash = gitCommitHash;
     }
+
+    @JsonIgnore
+	public String getGitRepositoryId() {
+		return gitRepositoryId;
+	}
+
+	public void setGitRepositoryId(String gitRepositoryId) {
+		this.gitRepositoryId = gitRepositoryId;
+	}
+
 }

openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/ContentCopyCreation.java

@@ -33,6 +33,8 @@ public class ContentCopyCreation implements ICreation
 
     private String gitCommitHash;
 
+	private String gitRepositoryId;
+
     private IExternalDmsId externalDmsId;
 
     public String getExternalId()
@@ -65,6 +67,15 @@ public class ContentCopyCreation implements ICreation
         this.gitCommitHash = gitCommitHash;
     }
 
+    public String getGitRepositoryId()
+    {
+        return gitRepositoryId;
+    }
+
+	public void setGitRepositoryId(String gitRepositoryId) {
+		this.gitRepositoryId = gitRepositoryId;
+	}
+
     public IExternalDmsId getExternalDmsId()
     {
         return externalDmsId;

openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/ContentCopySearchCriteria.java

@@ -50,6 +50,11 @@ public class ContentCopySearchCriteria extends AbstractObjectSearchCriteria<IExt
         return with(new GitCommitHashSearchCriteria());
     }
 
+    public GitRepositoryIdSearchCriteria withGitRepositoryId()
+    {
+        return with(new GitRepositoryIdSearchCriteria());
+    }
+
     @Override
     protected SearchCriteriaToStringBuilder createBuilder()
     {

openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/GitRepositoryIdSearchCriteria.java

+/*
+ * Copyright 2016 ETH Zuerich, CISD
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.search;
+
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchFieldType;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.StringFieldSearchCriteria;
+import ch.systemsx.cisd.base.annotation.JsonObject;
+
+@JsonObject("as.dto.dataset.search.GitRepositoryIdSearchCriteria")
+public class GitRepositoryIdSearchCriteria extends StringFieldSearchCriteria
+{
+
+    private static final long serialVersionUID = 1L;
+
+    public GitRepositoryIdSearchCriteria()
+    {
+        super("gitRepositoryId", SearchFieldType.ATTRIBUTE);
+    }
+
+}

openbis_api/sourceTest/java/ch/ethz/sis/openbis/generic/sharedapi/v3/dictionary.txt

@@ -1553,10 +1553,12 @@ ContentCopyCreation
 getContentCopies
 getExternalId
 getGitCommitHash
+getGitRepositoryId
 getSerialversionuid
 setContentCopies
 setExternalId
 setGitCommitHash
+setGitRepositoryId
 ContentCopy
 NO_COPY_EXTERNAL_CODE
 NO_COPY_EXTERNAL_DMS
@@ -1584,10 +1586,12 @@ AddressSearchCriteria
 ContentCopySearchCriteria
 ExternalDmsTypeSearchCriteria
 GitCommitHashSearchCriteria
+GitRepositoryIdSearchCriteria
 LabelSearchCriteria
 PathSearchCriteria
 withAddress
 withCopy
 withGitCommitHash
+withGitRepositoryId
 withLabel
 withPath
\ No newline at end of file