Added OrganizationServiceIT, checked issue #117 (Get tenant attributes throws NPE)

Author: TanyaEf

src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/authority/organizations/OrganizationsServiceIT.java

@@ -5,9 +5,16 @@
 import com.jaspersoft.jasperserver.jaxrs.client.core.Session;
 import com.jaspersoft.jasperserver.jaxrs.client.core.enums.JRSVersion;
 import com.jaspersoft.jasperserver.jaxrs.client.core.enums.MimeType;
+import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
+import com.jaspersoft.jasperserver.jaxrs.client.dto.attributes.ClientTenantAttribute;
+import com.jaspersoft.jasperserver.jaxrs.client.dto.attributes.TenantAttributesListWrapper;
+import java.util.Arrays;
+import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import static org.testng.AssertJUnit.assertNotNull;
+
 /**
  * @author Tetiana Iefimenko
  */
@@ -25,18 +32,51 @@ public void before() {
         config.setContentMimeType(MimeType.JSON);
         config.setJrsVersion(JRSVersion.v6_0_1);
         config.setLogHttp(true);
+        config.setLogHttpEntity(true);
         client = new JasperserverRestClient(config);
 
         session = client.authenticate("superuser", "superuser");
     }
 
-    @Test(enabled = false)
+
+    @Test
+    public void should_create_tenant_attributes() {
+
+        TenantAttributesListWrapper attributes = new TenantAttributesListWrapper();
+        attributes.setAttributes(Arrays.asList(
+                new ClientTenantAttribute("number_of_employees", "1000+"),
+                new ClientTenantAttribute("number_of_units", "29"),
+                new ClientTenantAttribute("country_code", "FR")));
+
+        OperationResult<TenantAttributesListWrapper> retrieved = session
+                .organizationsService()
+                .organization("myOrg1")
+                .attributes()
+                .createOrUpdate(attributes);
+
+        assertNotNull(retrieved);
+
+    }
+
+    @Test(dependsOnMethods = "should_create_tenant_attributes")
     public void should_return_tenant_attributes() {
-//        OperationResult<TenantAttributesListWrapper> result3 = session
-//                .organizationsService()
-//                .organization("organization_1")
-//                .attributes()
-//                .get();
+
+
+        OperationResult<TenantAttributesListWrapper> result3 = session
+                .organizationsService()
+                .organization("myOrg1")
+                .attributes()
+                .get();
+
+        TenantAttributesListWrapper result = result3.getEntity();
+        assertNotNull(result3);
+        assertNotNull(result);
+
+    }
+
+    @AfterMethod
+    public void after() {
+        session.logout();
     }
 
 }

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

@@ -28,6 +28,8 @@
 import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
 import com.jaspersoft.jasperserver.dto.authority.ClientTenant;
 import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.AbstractAdapter;
+import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.authority.organizations.attributes.OrganizationBatchAttributeAdapter;
+import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.authority.organizations.attributes.OrganizationSingleAttributeAdapter;
 import com.jaspersoft.jasperserver.jaxrs.client.core.Callback;
 import com.jaspersoft.jasperserver.jaxrs.client.core.JerseyRequest;
 import com.jaspersoft.jasperserver.jaxrs.client.core.RequestExecution;
@@ -36,12 +38,12 @@
 import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.JSClientException;
 import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.handling.DefaultErrorHandler;
 import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
+import java.io.IOException;
+import java.util.Collection;
+import javax.ws.rs.core.MultivaluedHashMap;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import javax.ws.rs.core.MultivaluedHashMap;
-import java.io.IOException;
-
 
 public class SingleOrganizationAdapter extends AbstractAdapter {
 
@@ -154,6 +156,22 @@ public void run() {
         return task;
     }
 
+    public OrganizationSingleAttributeAdapter attribute() {
+        return new OrganizationSingleAttributeAdapter(sessionStorage, organizationId);
+    }
+
+    public OrganizationBatchAttributeAdapter attributes(Collection<String> attributesNames) {
+        return new OrganizationBatchAttributeAdapter(sessionStorage, organizationId, attributesNames);
+    }
+
+    public OrganizationBatchAttributeAdapter attributes(String... attributesNames) {
+        return new OrganizationBatchAttributeAdapter(sessionStorage, organizationId, attributesNames);
+    }
+
+    public OrganizationBatchAttributeAdapter attributes() {
+        return new OrganizationBatchAttributeAdapter(sessionStorage, organizationId);
+    }
+
     private JerseyRequest<ClientTenant> buildRequest() {
         return JerseyRequest.buildRequest(
                 sessionStorage,