Small interface fixes

danf · danf · commit 033724896df1 · 2016-06-06T11:57:15.000+03:00
diff --git a/api/src/main/java/com/jfrog/bintray/client/api/details/PackageDetails.java b/api/src/main/java/com/jfrog/bintray/client/api/details/PackageDetails.java
@@ -1,14 +1,13 @@
 package com.jfrog.bintray.client.api.details;
 
 import com.jfrog.bintray.client.api.ObjectMapperHelper;
-import org.codehaus.jackson.annotate.JsonCreator;
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
+import org.codehaus.jackson.annotate.*;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.joda.time.DateTime;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * This class is used to serialize and deserialize the needed json to
@@ -70,10 +69,22 @@ public class PackageDetails {
     private List<String> systemIds;
     @JsonProperty(value = "vcs_url")
     private String vcsUrl;
-
     @JsonIgnore
     private List<Attribute> attributes;
 
+    //All other props that don't have specific fields
+    private Map<String, Object> other = new HashMap<>();
+
+    @JsonAnySetter
+    public void set(String name, Object value) {
+        other.put(name, value);
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> other() {
+        return other;
+    }
+
     @JsonCreator
     public PackageDetails() {
     }
diff --git a/api/src/main/java/com/jfrog/bintray/client/api/details/ProductDetails.java b/api/src/main/java/com/jfrog/bintray/client/api/details/ProductDetails.java
@@ -1,13 +1,13 @@
 package com.jfrog.bintray.client.api.details;
 
 import com.jfrog.bintray.client.api.ObjectMapperHelper;
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
+import org.codehaus.jackson.annotate.*;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.joda.time.DateTime;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * This class is used to serialize and deserialize the needed json to
@@ -40,6 +40,19 @@ public class ProductDetails {
     @JsonProperty(value = "sign_url_expiry")
     Integer signUrlExpiry;
 
+    //All other props that don't have specific fields
+    private Map<String, Object> other = new HashMap<>();
+
+    @JsonAnySetter
+    public void set(String name, Object value) {
+        other.put(name, value);
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> other() {
+        return other;
+    }
+
     public String getName() {
         return name;
     }
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,13 +1,13 @@
 package com.jfrog.bintray.client.api.details;
 
 import com.jfrog.bintray.client.api.ObjectMapperHelper;
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
+import org.codehaus.jackson.annotate.*;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.joda.time.DateTime;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * This class is used to serialize and deserialize the needed json to
@@ -42,6 +42,19 @@ public class RepositoryDetails {
     @JsonIgnore
     Boolean updateExisting; //Property is not used in the Bintray API but Artifactory uses is in it's Bintray integration
 
+    //All other props that don't have specific fields
+    private Map<String, Object> other = new HashMap<>();
+
+    @JsonAnySetter
+    public void set(String name, Object value) {
+        other.put(name, value);
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> other() {
+        return other;
+    }
+
     public static ObjectMapper getObjectMapper() {
         return ObjectMapperHelper.get();
     }
diff --git a/api/src/main/java/com/jfrog/bintray/client/api/details/SubjectDetails.java b/api/src/main/java/com/jfrog/bintray/client/api/details/SubjectDetails.java
@@ -1,12 +1,16 @@
 package com.jfrog.bintray.client.api.details;
 
 import com.jfrog.bintray.client.api.ObjectMapperHelper;
+import org.codehaus.jackson.annotate.JsonAnyGetter;
+import org.codehaus.jackson.annotate.JsonAnySetter;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
 import org.codehaus.jackson.annotate.JsonProperty;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.joda.time.DateTime;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * This class is used to serialize and deserialize the needed json to
@@ -35,6 +39,19 @@ public class SubjectDetails {
     @JsonProperty("quota_used_bytes")
     Long quotaUsedBytes;
 
+    //All other props that don't have specific fields
+    private Map<String, Object> other = new HashMap<>();
+
+    @JsonAnySetter
+    public void set(String name, Object value) {
+        other.put(name, value);
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> other() {
+        return other;
+    }
+
     public static ObjectMapper getObjectMapper() {
         return ObjectMapperHelper.get();
     }
diff --git a/api/src/main/java/com/jfrog/bintray/client/api/details/VersionDetails.java b/api/src/main/java/com/jfrog/bintray/client/api/details/VersionDetails.java
@@ -1,13 +1,13 @@
 package com.jfrog.bintray.client.api.details;
 
 import com.jfrog.bintray.client.api.ObjectMapperHelper;
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
+import org.codehaus.jackson.annotate.*;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.joda.time.DateTime;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * This class is used to serialize and deserialize the needed json to
@@ -54,6 +54,19 @@ public class VersionDetails {
     @JsonProperty("vcs_tag")
     private String vcsTag;
 
+    //All other props that don't have specific fields
+    private Map<String, Object> other = new HashMap<>();
+
+    @JsonAnySetter
+    public void set(String name, Object value) {
+        other.put(name, value);
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> other() {
+        return other;
+    }
+
     public VersionDetails() {
 
     }
diff --git a/api/src/main/java/com/jfrog/bintray/client/api/model/Pkg.java b/api/src/main/java/com/jfrog/bintray/client/api/model/Pkg.java
@@ -38,4 +38,6 @@ public interface Pkg {
     List<String> linkedToRepos();
 
     List<String> systemIds();
+
+    Object getFieldByKey(String key);
 }
diff --git a/api/src/main/java/com/jfrog/bintray/client/api/model/Product.java b/api/src/main/java/com/jfrog/bintray/client/api/model/Product.java
@@ -24,4 +24,6 @@ public interface Product {
     List<String> getPackages();
 
     List<String> getVersions();
+
+    Object getFieldByKey(String key);
 }
diff --git a/api/src/main/java/com/jfrog/bintray/client/api/model/Repository.java b/api/src/main/java/com/jfrog/bintray/client/api/model/Repository.java
@@ -13,11 +13,19 @@ public interface Repository {
 
     String getOwner();
 
+    String getType();
+
+    Boolean isPrivate();
+
+    Boolean isPremium();
+
     String getDesc();
 
     List<String> getLabels();
 
     DateTime getCreated();
 
     Integer getPackageCount();
+
+    Object getFieldByKey(String key);
 }
diff --git a/api/src/main/java/com/jfrog/bintray/client/api/model/Subject.java b/api/src/main/java/com/jfrog/bintray/client/api/model/Subject.java
@@ -24,4 +24,6 @@ public interface Subject {
     DateTime getRegistered();
 
     Long getQuotaUsedBytes();
+
+    Object getFieldByKey(String key);
 }
diff --git a/api/src/main/java/com/jfrog/bintray/client/api/model/Version.java b/api/src/main/java/com/jfrog/bintray/client/api/model/Version.java
@@ -32,4 +32,6 @@ public interface Version {
     Integer ordinal();
 
     String vcsTag();
+
+    Object getFieldByKey(String key);
 }
diff --git a/impl/src/main/java/com/jfrog/bintray/client/impl/model/PackageImpl.java b/impl/src/main/java/com/jfrog/bintray/client/impl/model/PackageImpl.java
@@ -10,12 +10,14 @@
 
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author Noam Y. Tenne
  */
 public class PackageImpl implements Pkg {
     private static final Logger log = LoggerFactory.getLogger(PackageImpl.class);
+
     private String name;
     private String repository;
     private String owner;
@@ -31,6 +33,7 @@ public class PackageImpl implements Pkg {
     private DateTime updated;
     private List<String> linkedToRepos;
     private List<String> systemIds;
+    private Map<String, Object> other;
 
     public PackageImpl(PackageDetails packageDetails) {
         this.name = packageDetails.getName();
@@ -47,6 +50,7 @@ public PackageImpl(PackageDetails packageDetails) {
         this.updated = packageDetails.getUpdated();
         this.linkedToRepos = packageDetails.getLinkedRepos();
         this.systemIds = packageDetails.getSystemIds();
+        this.other = packageDetails.other();
     }
 
     public PackageImpl(String name, String repository, String owner, String description, List<String> labels,
@@ -82,66 +86,86 @@ public static String getCreateUpdateJson(PackageDetails packageDetails) throws I
         return jsonContent;
     }
 
+    @Override
     public String name() {
         return name;
     }
 
+    @Override
     public String repository() {
         return repository;
     }
 
+    @Override
     public String owner() {
         return owner;
     }
 
+    @Override
     public String description() {
         return description;
     }
 
+    @Override
     public List<String> labels() {
         return labels;
     }
 
+    @Override
     public List<String> attributeNames() {
         return attributeNames;
     }
 
+    @Override
     public Integer rating() {
         return rating;
     }
 
+    @Override
     public Integer ratingCount() {
         return ratingCount;
     }
 
+    @Override
     public Integer followersCount() {
         return followersCount;
     }
 
+    @Override
     public DateTime created() {
         return created;
     }
 
+    @Override
     public List<String> versions() {
         return versions;
     }
 
+    @Override
     public String latestVersion() {
         return latestVersion;
     }
 
+    @Override
     public DateTime updated() {
         return updated;
     }
 
+    @Override
     public List<String> linkedToRepos() {
         return linkedToRepos;
     }
 
+    @Override
     public List<String> systemIds() {
         return systemIds;
     }
 
+    @Override
+    public Object getFieldByKey(String key) {
+        return other.get(key);
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
diff --git a/impl/src/main/java/com/jfrog/bintray/client/impl/model/ProductImpl.java b/impl/src/main/java/com/jfrog/bintray/client/impl/model/ProductImpl.java
@@ -5,6 +5,7 @@
 import org.joda.time.DateTime;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author Dan Feldman
@@ -19,6 +20,7 @@ public class ProductImpl implements Product {
     private String vcsUrl;
     private List<String> packages;
     private List<String> versions;
+    private Map<String, Object> other;
 
     public ProductImpl() {
     }
@@ -32,6 +34,7 @@ public ProductImpl(ProductDetails productDetails) {
         this.vcsUrl = productDetails.getVcsUrl();
         this.packages = productDetails.getPackages();
         this.versions = productDetails.getVersions();
+        this.other = productDetails.other();
     }
 
     public ProductImpl(String name, String owner, String description, List<String> packages, List<String> versions,
@@ -83,4 +86,9 @@ public List<String> getPackages() {
     public List<String> getVersions() {
         return versions;
     }
+
+    @Override
+    public Object getFieldByKey(String key) {
+        return other.get(key);
+    }
 }
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
diff --git a/impl/src/main/java/com/jfrog/bintray/client/impl/model/SubjectImpl.java b/impl/src/main/java/com/jfrog/bintray/client/impl/model/SubjectImpl.java
diff --git a/impl/src/main/java/com/jfrog/bintray/client/impl/model/VersionImpl.java b/impl/src/main/java/com/jfrog/bintray/client/impl/model/VersionImpl.java

Original file line number	Diff line number	Diff line change
`@@ -38,4 +38,6 @@ public interface Pkg {`
`38`	`38`	`List<String> linkedToRepos();`
`39`	`39`
`40`	`40`	`List<String> systemIds();`
	`41`	`+`
	`42`	`+ Object getFieldByKey(String key);`
`41`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,4 +24,6 @@ public interface Product {`
`24`	`24`	`List<String> getPackages();`
`25`	`25`
`26`	`26`	`List<String> getVersions();`
	`27`	`+`
	`28`	`+ Object getFieldByKey(String key);`
`27`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,4 +24,6 @@ public interface Subject {`
`24`	`24`	`DateTime getRegistered();`
`25`	`25`
`26`	`26`	`Long getQuotaUsedBytes();`
	`27`	`+`
	`28`	`+ Object getFieldByKey(String key);`
`27`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,4 +32,6 @@ public interface Version {`
`32`	`32`	`Integer ordinal();`
`33`	`33`
`34`	`34`	`String vcsTag();`
	`35`	`+`
	`36`	`+ Object getFieldByKey(String key);`
`35`	`37`	`}`