New InputControlsService implementation

Author: TanyaEf

pom.xml

@@ -7,7 +7,7 @@
 
     <groupId>com.jaspersoft</groupId>
     <artifactId>jrs-rest-java-client</artifactId>
-    <version>6.1.5</version>
+    <version>6.1.4</version>
     <name>REST client for JasperReports server</name>
     <url>http://github.com/Jaspersoft/jrs-rest-java-client</url>
 

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/inputControls/InputControlsAdapter.java

@@ -1,25 +1,58 @@
 package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.inputControls;
 
+import com.jaspersoft.jasperserver.dto.reports.inputcontrols.ReportInputControl;
+import com.jaspersoft.jasperserver.dto.reports.inputcontrols.ReportInputControlsListWrapper;
 import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.AbstractAdapter;
+import com.jaspersoft.jasperserver.jaxrs.client.core.JerseyRequest;
 import com.jaspersoft.jasperserver.jaxrs.client.core.SessionStorage;
+import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.handling.DefaultErrorHandler;
+import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
+import java.util.List;
 
 /**
  * @author Tetiana Iefimenko
  */
 public class InputControlsAdapter extends AbstractAdapter{
 
-    private String reportUri;
+    private String containerUri;
+    private Boolean excludeState = false;
 
     public InputControlsAdapter container(String uri) {
-        this.reportUri = uri;
+        this.containerUri = uri;
         return  this;
     }
 
+    public InputControlsAdapter excludeState(Boolean value) {
+        this.excludeState = value;
+        return this;
+    }
+
     public InputControlsAdapter(SessionStorage sessionStorage) {
         super(sessionStorage);
     }
 
     public InputControlsValuesAdapter values() {
-        return new InputControlsValuesAdapter(sessionStorage);
+        return new InputControlsValuesAdapter(sessionStorage, containerUri);
     }
+
+    public OperationResult<ReportInputControlsListWrapper> get(){
+        return buildRequest().get();
+    }
+
+    public OperationResult<ReportInputControlsListWrapper> reorder(List<ReportInputControl> inputControls){
+        ReportInputControlsListWrapper wrapper = new ReportInputControlsListWrapper(inputControls);
+        return buildRequest().put(wrapper);
+    }
+
+    private JerseyRequest<ReportInputControlsListWrapper> buildRequest(){
+        JerseyRequest<ReportInputControlsListWrapper> request = JerseyRequest.buildRequest(sessionStorage,
+                ReportInputControlsListWrapper.class,
+                new String[]{"/reports", containerUri, "/inputControls"},
+                new DefaultErrorHandler());
+        if (excludeState) {
+            request.addParam("exclude", "state");
+        }
+        return request;
+    }
+
 }

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/inputControls/InputControlsValuesAdapter.java

@@ -1,16 +1,86 @@
 package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.inputControls;
 
 import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.AbstractAdapter;
+import com.jaspersoft.jasperserver.jaxrs.client.core.JerseyRequest;
 import com.jaspersoft.jasperserver.jaxrs.client.core.SessionStorage;
+import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.MandatoryParameterNotFoundException;
+import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.handling.DefaultErrorHandler;
+import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
+import com.jaspersoft.jasperserver.jaxrs.client.dto.reports.inputcontrols.InputControlStateListWrapper;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import javax.ws.rs.core.MultivaluedHashMap;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * @author Tetiana Iefimenko
  */
 public class InputControlsValuesAdapter extends AbstractAdapter{
 
-    public InputControlsValuesAdapter(SessionStorage sessionStorage) {
+    private String containerUri;
+    private Boolean useFreshData = false;
+    private MultivaluedHashMap<String, String> inputControlsValues = new MultivaluedHashMap<String, String>();
+    private StringBuilder ids = new StringBuilder("");
+
+    public InputControlsValuesAdapter(SessionStorage sessionStorage, String containerUri) {
         super(sessionStorage);
+        this.containerUri = containerUri;
+    }
+
+    public InputControlsValuesAdapter useCashedData(Boolean value) {
+        useFreshData = !value;
+        return this;
+    }
+
+    public InputControlsValuesAdapter parameter(String name, String value) {
+        this.inputControlsValues.add(name, value);
+        return this;
+    }
+
+    public InputControlsValuesAdapter parameter(String name, String... values) {
+        this.inputControlsValues.addAll(name, values);
+        return this;
     }
 
+    public OperationResult<InputControlStateListWrapper> run() {
+        if (inputControlsValues.size() == 0) {
+            throw new MandatoryParameterNotFoundException();
+        }
+        ids.append("/");
+        Set<String> keySet = inputControlsValues.keySet();
+        String[] idsArray = keySet.toArray(new String[keySet.size()]);
+        ids.append(StringUtils.join(idsArray, ";"));
+        return buildRequest().post(valuesToArrays());
+    }
+
+    public OperationResult<InputControlStateListWrapper> get(){
+        return buildRequest().get();
+    }
+
+    private JerseyRequest<InputControlStateListWrapper> buildRequest(){
+
+        JerseyRequest<InputControlStateListWrapper> request = JerseyRequest.buildRequest(sessionStorage,
+                InputControlStateListWrapper.class,
+                new String[]{"/reports", containerUri, "/inputControls",ids.toString(), "/values"},
+                new DefaultErrorHandler());
+        if (useFreshData) {
+            request.addParam("freshData", useFreshData.toString());
+        }
+        return request;
+    }
+
+    private Map<String, String[]> valuesToArrays() {
+        Map<String, String[]> result = new LinkedHashMap<String, String[]>();
+        List<String> listValues;
+        String[] arrayValues;
+        for (String key : inputControlsValues.keySet()) {
+            listValues = inputControlsValues.get(key);
+            arrayValues = new String[listValues.size()];
+            result.put(key, listValues.toArray(arrayValues));
+        }
+        return result;
+    }
 
 }

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/reporting/reportparameters/ReorderingReportParametersAdapter.java

@@ -29,7 +29,9 @@
 import java.util.List;
 
 import static com.jaspersoft.jasperserver.jaxrs.client.core.JerseyRequest.buildRequest;
-
+/**
+ * @deprecated Replaced by {@link com.jaspersoft.jasperserver.jaxrs.client.apiadapters.inputControls.InputControlsAdapter}.
+ */
 public class ReorderingReportParametersAdapter extends ReportParametersAdapter {
 
     public ReorderingReportParametersAdapter(SessionStorage sessionStorage, String reportUnitUri) {

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/reporting/reportparameters/ReportParametersConverter.java

@@ -28,6 +28,9 @@
 
 import java.util.*;
 
+/**
+ * @deprecated Replaced by {@link com.jaspersoft.jasperserver.jaxrs.client.apiadapters.inputControls.InputControlsValuesAdapter}.
+ */
 public class ReportParametersConverter {
 
     public static Map<String, Object> getValueMapFromInputControlStates(List<InputControlState> states) {

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/reporting/reportparameters/ReportParametersUtils.java

@@ -28,6 +28,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * @deprecated Replaced by {@link com.jaspersoft.jasperserver.jaxrs.client.apiadapters.inputControls.InputControlsValuesAdapter}.
+ */
 public class ReportParametersUtils {
 
     public static ReportParameters toReportParameters(MultivaluedMap<String, String> params){

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/core/Session.java

@@ -27,6 +27,7 @@
 import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.domain.DomainMetadataService;
 import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.importexport.exportservice.ExportService;
 import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.importexport.importservice.ImportService;
+import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.inputControls.InputControlsService;
 import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.jobs.JobsService;
 import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.permissions.PermissionsService;
 import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.query.QueryExecutorService;
@@ -112,4 +113,6 @@ public AttributesService attributesService() {
         return getService(AttributesService.class);
     }
 
+    public InputControlsService inputControlsService() {return getService(InputControlsService.class);}
+
 }

…ters/connection/ConnectionMediaType.java …ient/core/enums/ConnectionMediaType.javasrc/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/connection/ConnectionMediaType.java renamed to src/main/java/com/jaspersoft/jasperserver/jaxrs/client/core/enums/ConnectionMediaType.java src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/connection/ConnectionMediaType.java renamed to src/main/java/com/jaspersoft/jasperserver/jaxrs/client/core/enums/ConnectionMediaType.java

@@ -19,7 +19,7 @@
  * along with this program.&nbsp; If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.connection;
+package com.jaspersoft.jasperserver.jaxrs.client.core.enums;
 
 public final class ConnectionMediaType {
 

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/providers/CustomRepresentationTypeProvider.java

@@ -22,7 +22,7 @@
 package com.jaspersoft.jasperserver.jaxrs.client.providers;
 
 import com.jaspersoft.jasperserver.dto.resources.ResourceMediaType;
-import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.connection.ConnectionMediaType;
+import com.jaspersoft.jasperserver.jaxrs.client.core.enums.ConnectionMediaType;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import javax.ws.rs.Consumes;

src/test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/connection/ConnectionMediaTypeTest.java

@@ -1,5 +1,6 @@
 package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.connection;
 
+import com.jaspersoft.jasperserver.jaxrs.client.core.enums.ConnectionMediaType;
 import org.testng.annotations.Test;
 
 import java.lang.reflect.Constructor;
@@ -10,7 +11,7 @@
 import static org.testng.Assert.assertNotNull;
 
 /**
- * Unit test for {@link com.jaspersoft.jasperserver.jaxrs.client.apiadapters.connection.ConnectionMediaType}
+ * Unit test for {@link com.jaspersoft.jasperserver.jaxrs.client.core.enums.ConnectionMediaType}
  */
 public class ConnectionMediaTypeTest {