0.7.1 - Jackson configuration changed to not send nulls for missing json keys (i.e. in details classes)

Author: danf

api/src/main/java/com/jfrog/bintray/client/api/details/ObjectMapperHelper.java

@@ -1,8 +1,10 @@
 package com.jfrog.bintray.client.api.details;
 
 import org.codehaus.jackson.JsonFactory;
+import org.codehaus.jackson.map.DeserializationConfig;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.map.SerializationConfig;
+import org.codehaus.jackson.map.annotate.JsonSerialize;
 
 /**
  * Helper class that provides the ObjectMapper for all Details classes
@@ -19,6 +21,11 @@ private static ObjectMapper buildDetailsMapper() {
         // TODO: when moving to Jackson 2.x these can be replaced with JodaModule
         mapper.configure(SerializationConfig.Feature.WRITE_DATES_AS_TIMESTAMPS, false);
         mapper.configure(SerializationConfig.Feature.WRITE_DATE_KEYS_AS_TIMESTAMPS, false);
+
+        //Don't include keys with null values implicitly, only explicitly set values should be sent over
+        mapper.configure(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY, false);
+        mapper.configure(SerializationConfig.Feature.WRITE_NULL_MAP_VALUES, false);
+        mapper.setSerializationInclusion(JsonSerialize.Inclusion.NON_NULL);
         return mapper;
     }
 }

gradle.properties

@@ -1 +1 @@
-version=0.8-SNAPSHOT
+version=0.7.1-SNAPSHOT

impl/src/main/java/com/jfrog/bintray/client/impl/BintrayClient.java

@@ -40,7 +40,7 @@ static public Bintray create(String userName, String apiKey) {
      */
     static public Bintray create(String url, String userName, String apiKey) {
         UsernamePasswordCredentials creds = new UsernamePasswordCredentials(userName, apiKey);
-        return new BintrayImpl(createClient(creds, null, BINTRAY_API_URL), BINTRAY_API_URL, DEFAULT_THREAD_POOL_SIZE,
+        return new BintrayImpl(createClient(creds, null, url), url, DEFAULT_THREAD_POOL_SIZE,
                 DEFAULT_SIGN_REQUEST_TIMEOUT_PER_FILE);
     }
 
@@ -66,14 +66,15 @@ static public Bintray create(String bintrayUserName, String bintrayApiKey,
     private static CloseableHttpClient createClient(UsernamePasswordCredentials creds,
                                                     HttpClientConfigurator.ProxyConfig proxyConfig, String url) {
 
-        String baseUrl = (url == null || url.isEmpty()) ? BINTRAY_API_URL : url;
         return new HttpClientConfigurator()
-                .hostFromUrl(baseUrl)
+                .hostFromUrl(url)
                 .soTimeout(DEFAULT_TIMEOUT)
                 .connectionTimeout(DEFAULT_TIMEOUT)
                 .noRetry()
                 .proxy(proxyConfig)
                 .authentication(creds)
+                .maxTotalConnections(50)
+                .defaultMaxConnectionsPerHost(30)
                 .getClient();
     }
 }

impl/src/main/java/com/jfrog/bintray/client/impl/handle/BintrayImpl.java

@@ -3,7 +3,6 @@
 import com.jfrog.bintray.client.api.BintrayCallException;
 import com.jfrog.bintray.client.api.MultipleBintrayCallException;
 import com.jfrog.bintray.client.api.handle.*;
-import com.jfrog.bintray.client.impl.BintrayClient;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.*;
 import org.apache.http.client.ResponseHandler;
@@ -43,7 +42,7 @@ public class BintrayImpl implements Bintray {
 
     public BintrayImpl(CloseableHttpClient client, String baseUrl, int threadPoolSize, int signRequestTimeoutPerFile) {
         this.client = client;
-        this.baseUrl = (baseUrl == null || baseUrl.isEmpty()) ? BintrayClient.BINTRAY_API_URL : baseUrl;
+        this.baseUrl = baseUrl;
         this.executorService = Executors.newFixedThreadPool(threadPoolSize);
         this.signRequestTimeoutPerFile = signRequestTimeoutPerFile;
     }

impl/src/test/groovy/com/jfrog/bintray/client/impl/BintrayClientSpec.groovy

@@ -5,10 +5,12 @@ import ch.qos.logback.classic.Logger
 import ch.qos.logback.classic.LoggerContext
 import com.jfrog.bintray.client.api.BintrayCallException
 import com.jfrog.bintray.client.api.details.Attribute
+import com.jfrog.bintray.client.api.details.ObjectMapperHelper
 import com.jfrog.bintray.client.api.details.PackageDetails
 import com.jfrog.bintray.client.api.details.VersionDetails
 import com.jfrog.bintray.client.api.handle.Bintray
 import com.jfrog.bintray.client.api.handle.PackageHandle
+import com.jfrog.bintray.client.api.handle.RepositoryHandle
 import com.jfrog.bintray.client.api.handle.VersionHandle
 import com.jfrog.bintray.client.api.model.Pkg
 import com.jfrog.bintray.client.api.model.Subject
@@ -98,7 +100,7 @@ class BintrayClientSpec extends Specification {
         assert this.connectionProperties.username
         assert this.connectionProperties.apiKey
         assert this.connectionProperties.email
-        bintray = BintrayClient.create(this.connectionProperties.username as String, this.connectionProperties.apiKey as String, null, null)
+        bintray = BintrayClient.create(this.connectionProperties.username as String, this.connectionProperties.apiKey as String)
         restClient = createClient()
         pkgBuilder = new PackageDetails(PKG_NAME).description('bla-bla').labels(['l1', 'l2']).licenses(['Apache-2.0'])
         versionBuilder = new VersionDetails(VERSION).description('versionDesc')
@@ -412,7 +414,7 @@ class BintrayClientSpec extends Specification {
 
     def 'on error response is returned without parsing'() {
         setup:
-        Bintray wrongBintray = BintrayClient.create(this.connectionProperties.username as String, this.connectionProperties.apiKey as String, null, null)
+        Bintray wrongBintray = BintrayClient.create(this.connectionProperties.username as String, this.connectionProperties.apiKey as String)
         when:
         wrongBintray.subject('bla').get()
         then:
@@ -596,6 +598,70 @@ class BintrayClientSpec extends Specification {
 
     }
 
+    def 'send empty values - verify they are not null'() {
+
+        String minimalPkgName = "MyPackage"
+
+        String minimalPkgJson = "{\n" +
+                "\t\t\"name\": \"" + minimalPkgName + "\",\n" +
+                "\t\t\"repo\": \"" + REPO_NAME + "\",\n" +
+                "\t\t\"owner\": \"" + connectionProperties.username + "\",\n" +
+                "\t\t\"desc\": \"\",\n" +
+                "\t\t\"website_url\": \"\",\n" +
+                "\t\t\"labels\": [],\n" +
+                "\t\t\"licenses\": [\"MIT\"]\n" +
+                "}"
+
+        String minimalVerJson = "{\n" +
+                "\t\t\"name\": \"3.3.3\",\n" +
+                "\t\t\"vcs_tag\": \"\",\n" +
+                "\t\t\"labels\": null,\n" +
+                "\t\t\"description\": \"\"\n" +
+                "}"
+
+        setup:
+        ObjectMapper mapper = ObjectMapperHelper.objectMapper
+
+        ArrayList<String> licenses = new ArrayList<>();
+        licenses.add("Apache-2.0")
+        PackageDetails newPkgDetails = new PackageDetails(minimalPkgName);
+        newPkgDetails.licenses(licenses);
+        newPkgDetails.setRepo(REPO_NAME)
+        newPkgDetails.setSubject(connectionProperties.username)
+        newPkgDetails.setVcsUrl("")
+        newPkgDetails.setDescription("")
+
+        VersionDetails newVerDetails = new VersionDetails("2.2.0")
+        newVerDetails.setDescription("")
+
+        PackageDetails pkgDetailsFromJson = mapper.readValue(minimalPkgJson, PackageDetails.class)
+        VersionDetails verDetailsFromJson = mapper.readValue(minimalVerJson, VersionDetails.class)
+
+        when:
+        RepositoryHandle repo = bintray.subject(connectionProperties.username).repository(REPO_NAME)
+
+        PackageHandle pkg = repo.createPkg(newPkgDetails)
+        VersionHandle ver = pkg.createVersion(newVerDetails)
+
+        pkg.update(pkgDetailsFromJson)
+        ver.update(verDetailsFromJson)
+
+        String pkgJsonContent = PackageImpl.getCreateUpdateJson(pkgDetailsFromJson);
+        String verJsonContent = VersionImpl.getCreateUpdateJson(verDetailsFromJson);
+
+        then:
+        pkgJsonContent.equals("{\"name\":\"MyPackage\",\"labels\":[],\"licenses\":[\"MIT\"],\"desc\":\"\",\"website_url\":\"\"}")
+        verJsonContent.contentEquals("{\"name\":\"3.3.3\",\"vcs_tag\":\"\"}")
+
+        cleanup:
+        try {
+            String cleanPkg = "/packages/" + connectionProperties.username + "/" + REPO_NAME + "/" + minimalPkgName
+            restClient.delete(cleanPkg, null)
+        } catch (Exception e) {
+            System.err.println("cleanup: " + e)
+        }
+    }
+
 
     def cleanup() {
         try {