Merge branch '1.9.1'

Author: tomkoptel

build.gradle

@@ -6,14 +6,13 @@ buildscript {
         mavenLocal()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:0.14.2"
+        classpath 'com.android.tools.build:gradle:1.0.0'
         classpath "com.github.dcendents:android-maven-plugin:1.2"
     }
 }
 
 subprojects {
     group = 'com.jaspersoft.android.sdk'
-    version = '1.9'
 
     ext.androidMinSdkVersion = 9
     ext.androidTargetSdkVersion = 19

client/build.gradle

@@ -1,12 +1,13 @@
 apply plugin: 'com.android.library'
-apply plugin: 'android-maven'
+apply plugin: 'com.github.dcendents.android-maven'
 
 description = 'js-android-sdk-client'
+version = '1.9.1'
 
 ext {
     PUBLISH_GROUP_ID = group
     PUBLISH_ARTIFACT_ID = description
-    PUBLISH_VERSION = '1.9'
+    PUBLISH_VERSION = '1.9.1'
 }
 
 android {
@@ -16,7 +17,7 @@ android {
     defaultConfig {
         minSdkVersion androidMinSdkVersion
         targetSdkVersion androidTargetSdkVersion
-        versionCode 9010900
+        versionCode 9010910
         versionName version
     }
 
@@ -32,7 +33,7 @@ android {
 
     buildTypes {
         debug {
-            runProguard false
+            minifyEnabled false
         }
     }
 }

client/src/main/java/com/jaspersoft/android/sdk/client/JsRestClient.java

@@ -64,8 +64,12 @@
 import org.springframework.http.client.ClientHttpRequestInterceptor;
 import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.http.converter.ByteArrayHttpMessageConverter;
+import org.springframework.http.converter.FormHttpMessageConverter;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.HttpMessageNotReadableException;
+import org.springframework.http.converter.ResourceHttpMessageConverter;
+import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.http.converter.xml.SimpleXmlHttpMessageConverter;
 import org.springframework.util.FileCopyUtils;
 import org.springframework.web.client.HttpStatusCodeException;
@@ -81,6 +85,7 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URLEncoder;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -110,7 +115,6 @@ public class JsRestClient {
     public static final String REST_REPORT_STATUS = "/status";
     public static final String REST_THUMBNAILS = "/thumbnails";
 
-    private SimpleXmlHttpMessageConverter simpleXmlHttpMessageConverter;
 
     // the timeout in milliseconds until a connection is established
     private int connectTimeout = 15 * 1000;
@@ -129,7 +133,7 @@ public class JsRestClient {
     //---------------------------------------------------------------------
 
     public JsRestClient() {
-        this(new RestTemplate(true), new SimpleClientHttpRequestFactory());
+        this(new RestTemplate(false), new SimpleClientHttpRequestFactory());
     }
 
     public JsRestClient(RestTemplate restTemplate) {
@@ -140,9 +144,7 @@ public JsRestClient(RestTemplate restTemplate,
                         SimpleClientHttpRequestFactory factory) {
         this.restTemplate = restTemplate;
         this.requestFactory = factory;
-
-        fetchXmlConverter();
-        configureAnnotationStrategy();
+        configureMessageConverters();
     }
 
     //---------------------------------------------------------------------
@@ -1235,22 +1237,24 @@ private String generateInputControlsUrl(String reportUri, List<String> controlsI
         return fullUri.toString();
     }
 
-    private void fetchXmlConverter() {
-        List<HttpMessageConverter<?>> converters = restTemplate.getMessageConverters();
-        for (HttpMessageConverter<?> converter : converters) {
-            if (converter instanceof SimpleXmlHttpMessageConverter) {
-                simpleXmlHttpMessageConverter =
-                        (SimpleXmlHttpMessageConverter) converter;
-            }
-        }
+    private void configureMessageConverters() {
+        List<HttpMessageConverter<?>> messageConverters = restTemplate.getMessageConverters();
+        messageConverters.add(new ByteArrayHttpMessageConverter());
+        messageConverters.add(new StringHttpMessageConverter(Charset.forName("UTF-8")));
+        messageConverters.add(new ResourceHttpMessageConverter());
+        messageConverters.add(new FormHttpMessageConverter());
+
+        SimpleXmlHttpMessageConverter simpleXmlHttpMessageConverter
+                = new SimpleXmlHttpMessageConverter();
+        configureAnnotationStrategy(simpleXmlHttpMessageConverter);
+        messageConverters.add(simpleXmlHttpMessageConverter);
     }
 
-    private void configureAnnotationStrategy() {
-        if (simpleXmlHttpMessageConverter != null) {
-            Strategy annotationStrategy = new AnnotationStrategy();
-            Serializer serializer = new Persister(annotationStrategy);
-            simpleXmlHttpMessageConverter.setSerializer(serializer);
-        }
+    private void configureAnnotationStrategy(
+            SimpleXmlHttpMessageConverter simpleXmlHttpMessageConverter) {
+        Strategy annotationStrategy = new AnnotationStrategy();
+        Serializer serializer = new Persister(annotationStrategy);
+        simpleXmlHttpMessageConverter.setSerializer(serializer);
     }
 
     //---------------------------------------------------------------------

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Dec 12 15:16:42 PST 2012
+#Wed Feb 11 18:44:30 EET 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip

ui/build.gradle

@@ -1,8 +1,8 @@
 apply plugin: 'com.android.library'
-apply plugin: 'android-maven'
+apply plugin: 'com.github.dcendents.android-maven'
 
 description = 'js-android-sdk-ui'
-
+version = '1.9'
 ext {
     PUBLISH_GROUP_ID = group
     PUBLISH_ARTIFACT_ID = description
@@ -25,8 +25,8 @@ android {
     lintOptions {
         abortOnError false
     }
-	
-	packagingOptions {
+
+    packagingOptions {
         exclude 'asm-license.txt'
         exclude 'NOTICE'
         exclude 'LICENSE'