Updated JerseyRequest and ResourceService to avoid erquest encoding bug

Author: TanyaEf

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/resources/SingleResourceAdapter.java

@@ -197,8 +197,8 @@ private JerseyRequest<ClientResource> prepareCopyOrMoveRequest(String fromUri) {
      * Allows to upload resource with MultiPart request.
      *
      * @param multipartResource form
-     * @param clazz entity class
-     * @param <T> type of entity class
+     * @param clazz             entity class
+     * @param <T>               type of entity class
      * @return result instance
      */
     public <T> OperationResult<T> uploadMultipartResource(FormDataMultiPart multipartResource, Class<T> clazz) {
@@ -207,7 +207,7 @@ public <T> OperationResult<T> uploadMultipartResource(FormDataMultiPart multipar
         return request.post(multipartResource);
     }
 
-    public <T> OperationResult<T> get(Class<T> clazz){
+    public <T> OperationResult<T> get(Class<T> clazz) {
         JerseyRequest<T> request = buildRequest(clazz);
         if (isRootFolder(resourceUri)) {
             request.setAccept(ResourceMediaType.FOLDER_JSON);
@@ -227,10 +227,10 @@ public OperationResult<ClientFile> uploadFile(File fileContent,
     }
 
     public <R> RequestExecution asyncUploadFile(final File fileContent,
-                                                 final ClientFile.FileType fileType,
-                                                 final String label,
-                                                 final String description,
-                                                 final Callback<OperationResult<ClientFile>, R> callback) {
+                                                final ClientFile.FileType fileType,
+                                                final String label,
+                                                final String description,
+                                                final Callback<OperationResult<ClientFile>, R> callback) {
         final FormDataMultiPart form = prepareUploadForm(fileContent, fileType, label, description);
         final JerseyRequest<ClientFile> request = prepareUploadFileRequest();
         RequestExecution task = new RequestExecution(new Runnable() {
@@ -321,9 +321,11 @@ private <ResourceType extends ClientResource> JerseyRequest<ResourceType> prepar
         return request;
     }
 
-    private  <P> JerseyRequest<P> buildRequest(Class<P> clazz) {
+    private <P> JerseyRequest<P> buildRequest(Class<P> clazz) {
         path.add(SERVICE_URI);
-        path.addAll((resourceUri.equals(REGEX)) ? Arrays.asList(REGEX) : Arrays.asList(resourceUri.split(REGEX)));
+        if (!resourceUri.equals(REGEX)) {
+            path.addAll(Arrays.asList(resourceUri.split(REGEX)));
+        }
         return JerseyRequest.buildRequest(sessionStorage,
                 clazz,
                 path.toArray(new String[path.size()]),

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

@@ -79,6 +79,7 @@ protected JerseyRequest(SessionStorage sessionStorage, GenericType<ResponseType>
         restrictedHttpMethods = sessionStorage.getConfiguration().getRestrictedHttpMethods();
         init(sessionStorage);
     }
+
     private void init(SessionStorage sessionStorage) {
         RestClientConfiguration configuration = sessionStorage.getConfiguration();
 
@@ -104,11 +105,20 @@ public static <T> JerseyRequest<T> buildRequest(SessionStorage sessionStorage, G
         JerseyRequest<T> request = new JerseyRequest<T>(sessionStorage, genericType);
         return configRequest(request, path, errorHandler);
     }
-    private static <T> JerseyRequest<T> configRequest(JerseyRequest<T> request, String[] path, ErrorHandler errorHandler){
+
+    private static <T> JerseyRequest<T> configRequest(JerseyRequest<T> request, String[] path, ErrorHandler errorHandler) {
         request.errorHandler = errorHandler != null ? errorHandler : new DefaultErrorHandler();
+        boolean validatNnext = true;
         for (String pathElem : path) {
-            if(!UriComponent.valid(pathElem, UriComponent.Type.PATH_SEGMENT)){
-                pathElem = UriComponent.contextualEncode(pathElem, UriComponent.Type.PATH_SEGMENT);
+            if (validatNnext) {
+                if (!UriComponent.valid(pathElem, UriComponent.Type.PATH_SEGMENT)) {
+                    pathElem = UriComponent.contextualEncode(pathElem, UriComponent.Type.PATH_SEGMENT);
+                }
+                if (pathElem.equals("inputControls")) {
+                    validatNnext = false;
+                }
+            } else {
+                validatNnext = true;
             }
             request.setPath(pathElem);
         }

src/test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/resources/SingleResourceAdapterTest.java

@@ -300,7 +300,7 @@ public void should_return_operation_result_with_client_resource_folder() {
 
         mockStatic(JerseyRequest.class);
         when(buildRequest(eq(sessionStorageMock), eq(ClientResource.class),
-                eq(new String[]{"resources", resourceUri}), any(DefaultErrorHandler.class))).thenReturn(jerseyRequestMock);
+                eq(new String[]{"resources"}), any(DefaultErrorHandler.class))).thenReturn(jerseyRequestMock);
         doReturn(operationResultMock).when(jerseyRequestMock).get();
 
         SingleResourceAdapter adapter = new SingleResourceAdapter(sessionStorageMock, resourceUri);
@@ -334,7 +334,7 @@ public void should_send_descriptor_into_server_asynchronously() throws Interrupt
 
         mockStatic(JerseyRequest.class);
         when(buildRequest(eq(sessionStorageMock), eq(ClientAdhocDataView.class),
-                eq(new String[]{"resources", resourceUri}),
+                eq(new String[]{"resources"}),
                 any(DefaultErrorHandler.class))).thenReturn(adhocDataViewJerseyRequestMock);
         doReturn(adhocDataViewOperationResultMock).when(adhocDataViewJerseyRequestMock).post(descriptorMock);
         doReturn(configurationMock).when(sessionStorageMock).getConfiguration();
@@ -391,7 +391,7 @@ public void should_send_descriptor_into_server() {
 
         mockStatic(JerseyRequest.class);
         when(buildRequest(eq(sessionStorageMock), eq(ClientAdhocDataView.class),
-                eq(new String[]{"resources", resourceUri}),
+                eq(new String[]{"resources"}),
                 any(DefaultErrorHandler.class))).thenReturn(adhocDataViewJerseyRequestMock);
         doReturn(adhocDataViewOperationResultMock).when(adhocDataViewJerseyRequestMock).post(descriptorMock);
         doReturn(configurationMock).when(sessionStorageMock).getConfiguration();
@@ -404,7 +404,10 @@ public void should_send_descriptor_into_server() {
 
         /** Then **/
         verifyStatic();
-        buildRequest(eq(sessionStorageMock), eq(ClientAdhocDataView.class), eq(new String[]{"resources", resourceUri}), any(DefaultErrorHandler.class));
+        buildRequest(eq(sessionStorageMock),
+                eq(ClientAdhocDataView.class),
+                eq(new String[]{"resources"}),
+                any(DefaultErrorHandler.class));
 
         assertNotNull(retrieved);
         assertSame(retrieved, adhocDataViewOperationResultMock);