Merge pull request #2 from Jaspersoft/develop

Release: Publishing 1.9.3 changes

Author: andrewtivodar

client/build.gradle

@@ -2,12 +2,12 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 
 description = 'js-android-sdk-client'
-version = '1.9.2'
+version = '1.9.3'
 
 ext {
     PUBLISH_GROUP_ID = group
     PUBLISH_ARTIFACT_ID = description
-    PUBLISH_VERSION = '1.9.2'
+    PUBLISH_VERSION = '1.9.3'
 }
 
 android {
@@ -17,7 +17,7 @@ android {
     defaultConfig {
         minSdkVersion androidMinSdkVersion
         targetSdkVersion androidTargetSdkVersion
-        versionCode 9010920
+        versionCode 9010930
         versionName version
     }
 

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

@@ -181,6 +181,33 @@ public JsServerProfile getServerProfile() {
         return jsServerProfile;
     }
 
+    /**
+     * Alternative way to change server profile.
+     * This method mutates request factory.
+     * This method doesn't mutates interceptors collection.
+     *
+     * @param serverProfile store of user auth credentials
+     */
+    public void updateServerProfile(final JsServerProfile serverProfile) {
+        this.serverInfo = null;
+        this.jsServerProfile = serverProfile;
+
+        // We allow user to set profile to null value
+        if (jsServerProfile != null) {
+            this.restServicesUrl = serverProfile.getServerUrl() + REST_SERVICES_URI;
+            updateRequestFactoryTimeouts();
+            restTemplate.setRequestFactory(requestFactory);
+        }
+    }
+
+    /**
+     * Legacy way to change server profile.
+     * This method mutates request factory.
+     * This method mutates interceptors collection.
+     *
+     * @param serverProfile store of user auth credentials
+     */
+    @Deprecated
     public void setServerProfile(final JsServerProfile serverProfile) {
         this.serverInfo = null;
         this.jsServerProfile = serverProfile;
@@ -200,6 +227,15 @@ public void setServerProfile(final JsServerProfile serverProfile) {
         }
     }
 
+    /**
+     * Allows to mutate list of request request interceptors.
+     *
+     * @param interceptors list of new request interceptors.
+     */
+    public void setRequestInterceptors(List<ClientHttpRequestInterceptor> interceptors) {
+        restTemplate.setInterceptors(interceptors);
+    }
+
     /**
      * Gets server information details
      *
@@ -767,6 +803,32 @@ public URI getReportStatusCheckURI(String executionId) {
         return new UriTemplate(fullUri).expand(executionId);
     }
 
+    /**
+     * Sends request for the current running export for the status check.
+     *
+     * @param executionId Identifies current id of running report.
+     * @param exportOutput Identifier which refers to current requested export.
+     * @return response which expose current export status.
+     */
+    public ReportStatusResponse runExportStatusCheck(String executionId, String exportOutput) {
+        return restTemplate.getForObject(getExportStatusCheckURI(executionId, exportOutput), ReportStatusResponse.class);
+    }
+
+    /**
+     * Generates link for requesting report execution status.
+     *
+     * @param executionId Identifies current id of running report.
+     * @param exportOutput Identifier which refers to current requested export.
+     * @return "{server url}/rest_v2/reportExecutions/{executionId}/exports/{exportOutput}/status"
+     */
+    public URI getExportStatusCheckURI(String executionId, String exportOutput) {
+        String outputResourceUri = "/{executionId}/exports/{exportOutput}/status";
+        String fullUri = jsServerProfile.getServerUrl() + REST_SERVICES_V2_URI + REST_REPORT_EXECUTIONS + outputResourceUri;
+
+        UriTemplate uriTemplate = new UriTemplate(fullUri);
+        return uriTemplate.expand(executionId, exportOutput);
+    }
+
     /**
      * Saves resource ouput in file.
      *

client/src/main/java/com/jaspersoft/android/sdk/client/oxm/report/ErrorDescriptor.java

@@ -1,12 +1,14 @@
 package com.jaspersoft.android.sdk.client.oxm.report;
 
 import org.simpleframework.xml.Element;
+import org.simpleframework.xml.ElementList;
 import org.simpleframework.xml.Root;
 import org.simpleframework.xml.Serializer;
 import org.simpleframework.xml.core.Persister;
 import org.springframework.web.client.HttpStatusCodeException;
 
 import java.io.StringWriter;
+import java.util.List;
 
 /**
  * @author Tom Koptel
@@ -19,6 +21,9 @@ public class ErrorDescriptor {
     @Element(required = false)
     private String message;
 
+    @ElementList(name = "parameters", entry = "parameter", required = false)
+    private List<String> parameters;
+
     public static ErrorDescriptor valueOf(HttpStatusCodeException exception) {
         String response = exception.getResponseBodyAsString();
         Serializer serializer = new Persister();
@@ -46,4 +51,13 @@ public String getMessage() {
     public void setMessage(String message) {
         this.message = message;
     }
+
+    public List<String> getParameters() {
+        return parameters;
+    }
+
+    public void setParameters(List<String> parameters) {
+        this.parameters = parameters;
+    }
+
 }

client/src/main/java/com/jaspersoft/android/sdk/client/oxm/report/ExportExecution.java

@@ -50,6 +50,9 @@ public class ExportExecution {
     @ElementList(empty=false, entry="attachment", required=false)
     private List<ReportOutputResource> attachments;
 
+    @Element(required=false)
+    private ErrorDescriptor errorDescriptor;
+
 
     public String getId() {
         return id;
@@ -83,4 +86,12 @@ public void setAttachments(List<ReportOutputResource> attachments) {
         this.attachments = attachments;
     }
 
+    public ErrorDescriptor getErrorDescriptor() {
+        return errorDescriptor;
+    }
+
+    public void setErrorDescriptor(ErrorDescriptor errorDescriptor) {
+        this.errorDescriptor = errorDescriptor;
+    }
+
 }

client/src/main/java/com/jaspersoft/android/sdk/client/oxm/report/ReportExecutionResponse.java

@@ -57,6 +57,9 @@ public class ReportExecutionResponse {
     @Element(required=false)
     private int totalPages;
 
+    @Element(required=false)
+    ErrorDescriptor errorDescriptor;
+
 
     public String getRequestId() {
         return requestId;
@@ -109,4 +112,13 @@ public void setTotalPages(int totalPages) {
     public ReportStatus getReportStatus() {
         return ReportStatus.valueOf(status);
     }
+
+    public ErrorDescriptor getErrorDescriptor() {
+        return errorDescriptor;
+    }
+
+    public void setErrorDescriptor(ErrorDescriptor errorDescriptor) {
+        this.errorDescriptor = errorDescriptor;
+    }
+
 }

client/src/main/java/com/jaspersoft/android/sdk/util/CookieHttpRequestInterceptor.java

@@ -18,6 +18,7 @@
  * @author Tom Koptel
  * @since 1.9
  */
+@Deprecated
 public class CookieHttpRequestInterceptor implements ClientHttpRequestInterceptor {
     private static final String SET_COOKIE = "set-cookie";
     private static final String COOKIE = "Cookie";