Updated OrganizationService, AttributeService unit tests

Author: TanyaEf

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/attributes/BatchAttributeAdapter.java

@@ -126,9 +126,8 @@ private JerseyRequest<HypermediaAttributesListWrapper> buildRequest() {
                 HypermediaAttributesListWrapper.class,
                 new String[]{holderUri, "attributes"}, new DefaultErrorHandler());
         if (includePermissions) {
-            request
-                    .setAccept(MimeTypeUtil.toCorrectAcceptMime(sessionStorage.getConfiguration(),"application/hal+{mime}"))
-                    .addParam("_embedded", "permission");
+            request.setAccept(MimeTypeUtil.toCorrectAcceptMime(sessionStorage.getConfiguration(),"application/hal+{mime}"));
+            request.addParam("_embedded", "permission");
         }
         return request;
     }

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/attributes/SingleAttributeAdapter.java

@@ -116,9 +116,8 @@ private JerseyRequest<HypermediaAttribute> buildRequest() {
         JerseyRequest<HypermediaAttribute> request = JerseyRequest.buildRequest(sessionStorage,HypermediaAttribute.class,
                 new String[]{holderUri,"attributes/",attributeName}, new DefaultErrorHandler());
         if (includePermissions) {
-            request
-                    .setAccept(MimeTypeUtil.toCorrectAcceptMime(sessionStorage.getConfiguration(),"application/hal+{mime}"))
-                    .addParam("_embedded", "permission");
+            request.setAccept(MimeTypeUtil.toCorrectAcceptMime(sessionStorage.getConfiguration(),"application/hal+{mime}"));
+            request.addParam("_embedded", "permission");
         }
         return request;
     }

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/authority/organizations/BatchOrganizationsAdapter.java

@@ -47,6 +47,11 @@ public BatchOrganizationsAdapter parameter(OrganizationParameter orgParam, Strin
         return this;
     }
 
+    public BatchOrganizationsAdapter parameter(OrganizationParameter orgParam, Boolean value) {
+        params.add(orgParam.getParamName(), value.toString());
+        return this;
+    }
+
     public OperationResult<OrganizationsListWrapper> get() {
         JerseyRequest<OrganizationsListWrapper> request = buildRequest(OrganizationsListWrapper.class);
         request.addParams(params);

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/authority/organizations/OrganizationsService.java

@@ -30,15 +30,15 @@ public OrganizationsService(SessionStorage sessionStorage) {
         super(sessionStorage);
     }
 
-    public BatchOrganizationsAdapter organizations() {
-        return new BatchOrganizationsAdapter(sessionStorage);
-    }
-
     public SingleOrganizationAdapter organization(ClientTenant organization) {
         return new SingleOrganizationAdapter(sessionStorage, organization);
     }
 
     public SingleOrganizationAdapter organization(String organizationId) {
         return new SingleOrganizationAdapter(sessionStorage, new ClientTenant().setId(organizationId));
     }
+
+    public BatchOrganizationsAdapter organizations() {
+        return new BatchOrganizationsAdapter(sessionStorage);
+    }
 }

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/authority/organizations/SingleOrganizationAdapter.java

@@ -41,7 +41,6 @@ public class SingleOrganizationAdapter extends AbstractAdapter {
 
     private final ClientTenant clientTenant;
     private final MultivaluedHashMap<String, String> params;
-    private final String prefix = "/organizations/";
 
     public SingleOrganizationAdapter(SessionStorage sessionStorage, ClientTenant clientTenant) {
         super(sessionStorage);
@@ -116,8 +115,8 @@ public OperationResult<ClientTenant> delete() {
         return buildRequest().delete();
     }
 
-    public <R> RequestExecution asyncDelete(final Callback<OperationResult, R> callback) {
-        final JerseyRequest request = buildRequest();
+    public <R> RequestExecution asyncDelete(final Callback<OperationResult<ClientTenant>, R> callback) {
+        final JerseyRequest<ClientTenant> request = buildRequest();
         RequestExecution task = new RequestExecution(new Runnable() {
             @Override
             public void run() {

src/test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/attributes/BatchAttributeAdapterTest.java

@@ -47,7 +47,7 @@
 /**
  * Unit tests for {@link com.jaspersoft.jasperserver.jaxrs.client.apiadapters.attributes.BatchAttributeAdapter}
  */
-@SuppressWarnings({"unchecked", "deprecation"})
+
 @PrepareForTest({BatchAttributeAdapter.class, JerseyRequest.class})
 public class BatchAttributeAdapterTest extends PowerMockTestCase {
 
@@ -224,7 +224,7 @@ public void should_retrieve_server_attributes_with_permissions() {
     }
 
     @Test
-    public void should_set_params() {
+    public void should_set_params_as_vararg() {
         BatchAttributeAdapter adapter = new BatchAttributeAdapter("/", sessionStorageMock, "x", "y", "z");
         MultivaluedMap<String, String> params = getInternalState(adapter, "params");
         List<String> list = params.get("name");
@@ -280,7 +280,7 @@ public Void execute(OperationResult<HypermediaAttributesListWrapper> data) {
     }
 
     @Test
-    public void should_delete_method_asynchronously() throws Exception {
+    public void should_delete_atributes_asynchronously() throws Exception {
 
         // Given
         final AtomicInteger newThreadId = new AtomicInteger();
@@ -318,7 +318,7 @@ public Void execute(OperationResult<HypermediaAttributesListWrapper> data) {
     }
 
     @Test
-    public void should_createOrUpdate_method_asynchronously() throws Exception {
+    public void should_createOrUpdate_atributes_asynchronously() throws Exception {
 
         // Given
         HypermediaAttributesListWrapper listWrapperMock = mock(HypermediaAttributesListWrapper.class);