Updated ConnectionService, fixed URI building in PermissionService

Author: TanyaEf

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/connections/ConnectionsService.java

@@ -43,7 +43,4 @@ public <C, M> SingleConnectionsAdapter<C, M> connection(Class<C> connection,
                 uuId);
     }
 
-
-
-
 }

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/connections/SingleConnectionsAdapter.java

@@ -5,7 +5,8 @@
 import com.jaspersoft.jasperserver.dto.resources.ClientCustomDataSource;
 import com.jaspersoft.jasperserver.dto.resources.ClientJdbcDataSource;
 import com.jaspersoft.jasperserver.dto.resources.ClientJndiJdbcDataSource;
-import com.jaspersoft.jasperserver.dto.resources.domain.ClientDomain;
+import com.jaspersoft.jasperserver.dto.resources.ClientReportUnit;
+import com.jaspersoft.jasperserver.dto.resources.ClientSemanticLayerDataSource;
 import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.AbstractAdapter;
 import com.jaspersoft.jasperserver.jaxrs.client.core.JerseyRequest;
 import com.jaspersoft.jasperserver.jaxrs.client.core.MimeTypeUtil;
@@ -130,9 +131,10 @@ protected <T> Boolean isConnectionTypeValid(T connection) {
         }
         return (connection instanceof FtpConnection ||
                 connection instanceof LfsConnection ||
+                connection instanceof ClientSemanticLayerDataSource ||
                 connection instanceof ClientCustomDataSource ||
                 connection instanceof ClientJndiJdbcDataSource ||
                 connection instanceof ClientJdbcDataSource ||
-                connection instanceof ClientDomain);
+                connection instanceof ClientReportUnit);
     }
 }

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/permissions/SinglePermissionRecipientRequestAdapter.java

@@ -24,17 +24,20 @@
 import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.AbstractAdapter;
 import com.jaspersoft.jasperserver.jaxrs.client.core.*;
 import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
+import java.util.ArrayList;
 
 import static com.jaspersoft.jasperserver.jaxrs.client.core.JerseyRequest.buildRequest;
+import static java.util.Arrays.asList;
 
 public class SinglePermissionRecipientRequestAdapter extends AbstractAdapter {
     public static final String SERVICE_URI = "permissions";
-    private final String resourceUri;
     private final String recipient;
+    private ArrayList<String> path = new ArrayList<String>();
 
     public SinglePermissionRecipientRequestAdapter(SessionStorage sessionStorage, String resourceUri, String recipient) {
         super(sessionStorage);
-        this.resourceUri = resourceUri;
+        this.path.add(SERVICE_URI);
+        this.path.addAll(asList(resourceUri.split("/")));
         this.recipient = recipient;
     }
 
@@ -87,7 +90,8 @@ public void run() {
     }
 
     private <T> JerseyRequest<T> getBuilder(Class<T> responseClass) {
-        JerseyRequest<T> request = buildRequest(sessionStorage, responseClass, new String[]{SERVICE_URI, resourceUri});
+
+        JerseyRequest<T> request = buildRequest(sessionStorage, responseClass, path.toArray(new String[path.size()]));
         request.addMatrixParam("recipient", recipient);
         return request;
     }