Add Repository creation support

danf · danf · commit 21b28cd375f6 · 2015-06-15T18:47:10.000+03:00
see: RTFACT-7576
diff --git a/api/src/main/java/com/jfrog/bintray/client/api/details/RepositoryDetails.java b/api/src/main/java/com/jfrog/bintray/client/api/details/RepositoryDetails.java
@@ -1,5 +1,6 @@
 package com.jfrog.bintray.client.api.details;
 
+import org.codehaus.jackson.annotate.JsonIgnore;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
 import org.codehaus.jackson.annotate.JsonProperty;
 import org.codehaus.jackson.map.ObjectMapper;
@@ -17,31 +18,67 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class RepositoryDetails {
 
-    @JsonProperty(value = "name")
+    //Properties marked with @JsonPropery here are serialized to the create \ update version requests, the rest are
+    // only deserialized when getting the version info
+    @JsonIgnore
     String name;
-    @JsonProperty(value = "owner")
+    @JsonIgnore
     String owner;
+    @JsonProperty
+    String type;
+    @JsonProperty(value = "private")
+    Boolean isPrivate;
+    @JsonProperty
+    Boolean premium;
     @JsonProperty(value = "desc")
     String description;
-    @JsonProperty(value = "created")
-    DateTime created;
-    @JsonProperty(value = "labels")
+    @JsonProperty
     List<String> labels;
-    @JsonProperty(value = "package_count")
+    @JsonIgnore
+    DateTime created;
+    @JsonIgnore
     Integer packageCount;
+    @JsonIgnore
+    Boolean updateExisting; //Property is not used in the Bintray API but Artifactory uses is in it's Bintray integration
 
     public static ObjectMapper getObjectMapper() {
         return ObjectMapperHelper.objectMapper;
     }
 
+    @JsonIgnore
     public String getName() {
         return name;
     }
 
+    @JsonProperty(value = "name")
     public void setName(String name) {
         this.name = name;
     }
 
+    public String getType() {
+        return type;
+    }
+
+    public Boolean getIsPrivate() {
+        return isPrivate;
+    }
+
+    public void setIsPrivate(Boolean isPrivate) {
+        this.isPrivate = isPrivate;
+    }
+
+    public Boolean getPremium() {
+        return premium;
+    }
+
+    public void setPremium(Boolean premium) {
+        this.premium = premium;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
     public String getOwner() {
         return owner;
     }
@@ -58,10 +95,12 @@ public void setDescription(String description) {
         this.description = description;
     }
 
+    @JsonIgnore
     public DateTime getCreated() {
         return created;
     }
 
+    @JsonProperty(value = "created")
     public void setCreated(DateTime created) {
         this.created = created;
     }
@@ -74,11 +113,23 @@ public void setLabels(List<String> labels) {
         this.labels = labels;
     }
 
+    @JsonIgnore
     public Integer getPackageCount() {
         return packageCount;
     }
 
+    @JsonProperty(value = "package_count")
     public void setPackageCount(Integer packageCount) {
         this.packageCount = packageCount;
     }
+
+    @JsonIgnore
+    public Boolean getUpdateExisting() {
+        return updateExisting;
+    }
+
+    @JsonProperty(value = "updateExisting")
+    public void setUpdateExisting(Boolean updateExisting) {
+        this.updateExisting = updateExisting;
+    }
 }
diff --git a/api/src/main/java/com/jfrog/bintray/client/api/handle/SubjectHandle.java b/api/src/main/java/com/jfrog/bintray/client/api/handle/SubjectHandle.java
@@ -1,6 +1,7 @@
 package com.jfrog.bintray.client.api.handle;
 
 import com.jfrog.bintray.client.api.BintrayCallException;
+import com.jfrog.bintray.client.api.details.RepositoryDetails;
 import com.jfrog.bintray.client.api.model.Subject;
 
 import java.io.IOException;
@@ -15,4 +16,6 @@ public interface SubjectHandle extends Handle<Subject> {
     Subject get() throws IOException, BintrayCallException;
 
     RepositoryHandle repository(String name);
+
+    RepositoryHandle createRepo(RepositoryDetails repoDetails) throws IOException, BintrayCallException;
 }
diff --git a/impl/src/main/java/com/jfrog/bintray/client/impl/handle/SubjectHandleImpl.java b/impl/src/main/java/com/jfrog/bintray/client/impl/handle/SubjectHandleImpl.java
@@ -2,18 +2,23 @@
 
 import com.jfrog.bintray.client.api.BintrayCallException;
 import com.jfrog.bintray.client.api.details.ObjectMapperHelper;
+import com.jfrog.bintray.client.api.details.RepositoryDetails;
 import com.jfrog.bintray.client.api.details.SubjectDetails;
 import com.jfrog.bintray.client.api.handle.RepositoryHandle;
 import com.jfrog.bintray.client.api.handle.SubjectHandle;
 import com.jfrog.bintray.client.api.model.Subject;
+import com.jfrog.bintray.client.impl.model.RepositoryImpl;
 import com.jfrog.bintray.client.impl.model.SubjectImpl;
+import org.apache.commons.io.IOUtils;
 import org.apache.http.HttpResponse;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @author Dan Feldman
@@ -39,6 +44,15 @@ public RepositoryHandle repository(String repoName) {
         return new RepositoryHandleImpl(bintrayHandle, this, repoName);
     }
 
+    @Override
+    public RepositoryHandle createRepo(RepositoryDetails repoDetails) throws IOException, BintrayCallException {
+        Map<String, String> headers = new HashMap<>();
+        String jsonContent = RepositoryImpl.getCreateUpdateJson(repoDetails);
+        BintrayImpl.addContentTypeJsonHeader(headers);
+        bintrayHandle.post(getRepoUri(repoDetails), headers, IOUtils.toInputStream(jsonContent));
+        return new RepositoryHandleImpl(bintrayHandle, this, repoDetails.getName());
+    }
+
     @Override
     public Subject get() throws IOException, BintrayCallException {
         HttpResponse response = bintrayHandle.get("users/" + subject, null);
@@ -53,4 +67,8 @@ public Subject get() throws IOException, BintrayCallException {
         }
         return new SubjectImpl(subjectDetails);
     }
+
+    private String getRepoUri(RepositoryDetails repoDetails) {
+        return String.format("repos/%s/%s", subject, repoDetails.getName());
+    }
 }
diff --git a/impl/src/main/java/com/jfrog/bintray/client/impl/model/RepositoryImpl.java b/impl/src/main/java/com/jfrog/bintray/client/impl/model/RepositoryImpl.java
@@ -1,18 +1,27 @@
 package com.jfrog.bintray.client.impl.model;
 
+import com.jfrog.bintray.client.api.details.ObjectMapperHelper;
 import com.jfrog.bintray.client.api.details.RepositoryDetails;
 import com.jfrog.bintray.client.api.model.Repository;
+import org.codehaus.jackson.map.ObjectMapper;
 import org.joda.time.DateTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
 import java.util.List;
 
 /**
  * @author Noam Y. Tenne
  */
 public class RepositoryImpl implements Repository {
+    private static final Logger log = LoggerFactory.getLogger(RepositoryImpl.class);
 
     private String name;
     private String owner;
+    private String type;
+    private Boolean isPrivate;
+    private Boolean premium;
     private String desc;
     private List<String> labels;
     private DateTime created;
@@ -24,21 +33,40 @@ public RepositoryImpl() {
     public RepositoryImpl(RepositoryDetails repositoryDetails) {
         this.name = repositoryDetails.getName();
         this.owner = repositoryDetails.getOwner();
+        this.type = repositoryDetails.getType();
+        this.isPrivate = repositoryDetails.getIsPrivate();
+        this.premium = repositoryDetails.getPremium();
         this.desc = repositoryDetails.getDescription();
         this.labels = repositoryDetails.getLabels();
         this.created = repositoryDetails.getCreated();
         this.packageCount = repositoryDetails.getPackageCount();
     }
 
-    public RepositoryImpl(String name, String owner, String desc, List<String> labels, DateTime created, Integer packageCount) {
+    public RepositoryImpl(String name, String owner, String type, Boolean isPrivate, Boolean premium, String desc,
+                          List<String> labels, DateTime created, Integer packageCount) {
         this.name = name;
         this.owner = owner;
+        this.type = type;
+        this.isPrivate = isPrivate;
+        this.premium = premium;
         this.desc = desc;
         this.labels = labels;
         this.created = created;
         this.packageCount = packageCount;
     }
 
+    public static String getCreateUpdateJson(RepositoryDetails repositoryDetails) throws IOException {
+        ObjectMapper mapper = ObjectMapperHelper.objectMapper;
+        try {
+            return mapper.writeValueAsString(repositoryDetails);
+        } catch (IOException e) {
+            log.error("Can't process the json file: " + e.getMessage());
+            log.debug("{}", e);
+            throw e;
+        }
+    }
+
+
     public String getName() {
         return name;
     }
@@ -47,6 +75,18 @@ public String getOwner() {
         return owner;
     }
 
+    public String getType() {
+        return type;
+    }
+
+    public Boolean getIsPrivate() {
+        return isPrivate;
+    }
+
+    public Boolean getPremium() {
+        return premium;
+    }
+
     public String getDesc() {
         return desc;
     }
diff --git a/impl/src/test/groovy/com/jfrog/bintray/client/test/BintraySpecSuite.groovy b/impl/src/test/groovy/com/jfrog/bintray/client/test/BintraySpecSuite.groovy
@@ -32,6 +32,7 @@ import static org.apache.http.HttpStatus.SC_NOT_FOUND
 @Suite.SuiteClasses([RepoSpec.class, PackageSpec.class, VersionSpec.class, BintrayClientSpec.class])
 class BintraySpecSuite {
 
+    public static final String REPO_CREATE_NAME = 'repoTest'
     public static final String REPO_NAME = 'generic'
     public static final String PKG_NAME = 'bla'
     public static final String VERSION = '1.0'
@@ -50,11 +51,13 @@ class BintraySpecSuite {
     @Shared
     public static String tempPkgName = "PkgTest"
     @Shared
-    public static String pkgJson;
-    @Shared
     public static String tempVerName = "3.0"
     @Shared
-    public static String verJson;
+    public static String pkgJson
+    @Shared
+    public static String verJson
+    @Shared
+    public static String repoJson
 
     public static ArrayList<Attribute<String>> attributes = [
             new Attribute<String>('a', Attribute.Type.string, "ay1", "ay2"),
@@ -137,6 +140,15 @@ class BintraySpecSuite {
                 "        {\"name\": \"VerAtt3\",\"values\": [\"2015-01-01T19:43:37+0100\"],\"type\": \"date\"}]\n" +
                 "}"
 
+        repoJson = "{\n" +
+                "  \"name\": \"" + REPO_CREATE_NAME + "\",\n" +
+                "  \"type\": \"maven\",\n" +
+                "  \"private\": false,\n" +
+                "  \"premium\": false,\n" +
+                "  \"desc\": \"Test Repo\",\n" +
+                "  \"labels\":[\"lable1\", \"label2\"]\n" +
+                "}"
+
         LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();
         //Set level for root logger
         loggerContext.getLogger("ROOT").setLevel(Level.INFO)
diff --git a/impl/src/test/groovy/com/jfrog/bintray/client/test/spec/RepoSpec.groovy b/impl/src/test/groovy/com/jfrog/bintray/client/test/spec/RepoSpec.groovy
