Updated README.md, integration tests and unit test for Attribute, Organization and User Services

Author: TanyaEf

pom.xml

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

src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/attributes/ServerBatchAttributesServiceIT.java

@@ -41,7 +41,8 @@ public void should_create_attributes() {
 
         OperationResult<HypermediaAttributesListWrapper> attributes = session
                 .attributesService()
-                .allAttributes()
+                .attributes(asList(serverAttributes.getProfileAttributes().get(0).getName(),
+                        serverAttributes.getProfileAttributes().get(1).getName()))
                 .createOrUpdate(serverAttributes);
 
         assertNotNull(attributes);
@@ -50,6 +51,26 @@ public void should_create_attributes() {
     }
 
     @Test(dependsOnMethods = "should_create_attributes")
+    public void should_update_attributes() {
+        HypermediaAttributesListWrapper newServerAttributes = new HypermediaAttributesListWrapper(serverAttributes);
+        newServerAttributes.getProfileAttributes().get(0).setValue("new_value");
+        newServerAttributes.getProfileAttributes().get(1).setValue("new_value");
+        newServerAttributes.getProfileAttributes().add((HypermediaAttribute) new HypermediaAttribute().setName("extra_attr_1").setValue("some_value_1"));
+        newServerAttributes.getProfileAttributes().add((HypermediaAttribute) new HypermediaAttribute().setName("extra_attr_2").setValue("some_value_2"));
+        newServerAttributes.getProfileAttributes().add((HypermediaAttribute) new HypermediaAttribute().setName("extra_attr_3").setValue("some_value_3"));
+        OperationResult<HypermediaAttributesListWrapper> attributes = session
+                .attributesService()
+                .attributes(asList(serverAttributes.getProfileAttributes().get(0).getName(),
+                        serverAttributes.getProfileAttributes().get(1).getName()))
+                .createOrUpdate(newServerAttributes);
+
+        assertNotNull(attributes);
+        assertEquals(Response.Status.OK.getStatusCode(), attributes.getResponse().getStatus());
+        assertTrue(attributes.getEntity().getProfileAttributes().size() == 2);
+
+    }
+
+    @Test(dependsOnMethods = "should_update_attributes")
     public void should_return_server_attributes() {
         List<HypermediaAttribute> attributes = session
                 .attributesService()
@@ -86,7 +107,7 @@ public void should_return_specified_server_attributes() {
                 .getEntity()
                 .getProfileAttributes();
 
-        assertTrue(attributes.size() >= 2);
+        assertTrue(attributes.size() == 2);
 
     }
 

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

@@ -34,10 +34,10 @@ public void before() {
     @Test
     public void should_create_organization() {
 
-        OperationResult<ClientTenant> operationResult = session.
-                organizationsService().
-                organization(organization).
-                create();
+        OperationResult<ClientTenant> operationResult = session
+                .organizationsService()
+                .organization(organization)
+                .create();
 
         ClientTenant entity = operationResult.getEntity();
 
@@ -64,7 +64,7 @@ public void should_return_organizations() {
 
         OperationResult<OrganizationsListWrapper> operationResult = session
                 .organizationsService()
-                .organizations()
+                .allOrganizations()
                 .get();
 
         OrganizationsListWrapper entity = operationResult.getEntity();

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/AbstractAdapter.java

@@ -26,6 +26,9 @@ public abstract class AbstractAdapter {
     protected final SessionStorage sessionStorage;
 
     public AbstractAdapter(SessionStorage sessionStorage) {
+        if (sessionStorage == null ) {
+            throw new IllegalArgumentException("SessionStorage is null, adapter can not be initialized.");
+        }
         this.sessionStorage = sessionStorage;
     }
 

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

@@ -26,6 +26,8 @@
 import com.jaspersoft.jasperserver.jaxrs.client.core.SessionStorage;
 import java.util.Collection;
 
+import static java.util.Arrays.asList;
+
 /**
  * @author Alex Krasnyanskiy
  * @since 6.0.1-ALPHA
@@ -38,27 +40,34 @@ public AttributesService(SessionStorage sessionStorage) {
     }
 
     public AttributesService forOrganization(String organizationName) {
-        this.holderUri.append("organizations/").append(organizationName).append("/");
-        return this;
+        return this.forOrganization(new ClientTenant().setId(organizationName));
     }
 
     public AttributesService forOrganization(ClientTenant organization) {
+        if (organization == null || organization.getId() == null || organization.getId().equals("")) {
+            throw new IllegalArgumentException("Organization is not valid.");
+        }
         this.holderUri.append("organizations/").append(organization.getId()).append("/");
         return this;
     }
 
     public AttributesService forUser(ClientUser user) {
+        if (user == null || user.getUsername() == null|| user.getUsername().equals("")) {
+            throw new IllegalArgumentException("User is not valid.");
+        }
         this.holderUri.append("users/").append(user.getUsername()).append("/");
         return this;
     }
 
 
     public AttributesService forUser(String userName) {
-        this.holderUri.append("users/").append(userName).append("/");
-        return this;
+        return this.forUser(new ClientUser().setUsername(userName));
     }
 
     public SingleAttributeAdapter attribute(String attributeName) {
+        if (attributeName == null || attributeName.equals("")) {
+            throw new IllegalArgumentException("Attribute name is not valid.");
+        }
         return new SingleAttributeAdapter(holderUri.toString(), sessionStorage, attributeName);
     }
 
@@ -67,10 +76,13 @@ public BatchAttributeAdapter allAttributes() {
     }
 
     public BatchAttributeAdapter attributes(Collection<String> attributesNames) {
+        if (attributesNames == null || attributesNames.size() == 0) {
+            throw new IllegalArgumentException("List of attributes is not valid.");
+        }
         return new BatchAttributeAdapter(holderUri.toString(), sessionStorage, attributesNames);
     }
 
     public BatchAttributeAdapter attributes(String... attributesNames) {
-        return new BatchAttributeAdapter(holderUri.toString(), sessionStorage, attributesNames);
+        return this.attributes(asList(attributesNames));
     }
 }

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

@@ -62,6 +62,9 @@ public BatchAttributeAdapter(String holderUri, SessionStorage sessionStorage, St
     public BatchAttributeAdapter(String holderUri, SessionStorage sessionStorage, Collection<String> attributesNames) {
         this(holderUri, sessionStorage);
         for (String attributeName : attributesNames) {
+            if (attributeName.equals("")) {
+                throw new IllegalArgumentException("Names of attributes are not valid.");
+            }
             params.add("name", attributeName);
         }
     }
@@ -107,7 +110,7 @@ public void run() {
     }
 
     public OperationResult<HypermediaAttributesListWrapper> createOrUpdate(HypermediaAttributesListWrapper attributesListWrapper) {
-        if (params.size() == 0) {
+        if (params.get("name") == null || params.get("name").size() == 0) {
             throw new IllegalStateException("Names of attributes were not defined.");
         }
         LinkedList<HypermediaAttribute> list = new LinkedList<HypermediaAttribute>(attributesListWrapper.getProfileAttributes());

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

@@ -46,9 +46,6 @@ public class SingleAttributeAdapter extends AbstractAdapter {
 
     public SingleAttributeAdapter(String holderUri, SessionStorage sessionStorage, String attributeName) {
         super(sessionStorage);
-        if (sessionStorage == null || holderUri == null) {
-            throw new IllegalArgumentException("URI cannot be null.");
-        }
         this.holderUri = holderUri;
         this.attributeName = attributeName;
     }

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

@@ -48,8 +48,7 @@ public BatchOrganizationsAdapter parameter(OrganizationParameter orgParam, Strin
     }
 
     public BatchOrganizationsAdapter parameter(OrganizationParameter orgParam, Boolean value) {
-        params.add(orgParam.getParamName(), value.toString());
-        return this;
+        return this.parameter(orgParam, value.toString());
     }
 
     public OperationResult<OrganizationsListWrapper> get() {

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

@@ -31,14 +31,18 @@ public OrganizationsService(SessionStorage sessionStorage) {
     }
 
     public SingleOrganizationAdapter organization(ClientTenant organization) {
+        if (organization == null || (organization.getId() == null || organization.getId().equals("")
+                && (organization.getAlias() == null || organization.getAlias().equals("")))) {
+            throw new IllegalArgumentException("Organization is not valid.");
+        }
         return new SingleOrganizationAdapter(sessionStorage, organization);
     }
 
     public SingleOrganizationAdapter organization(String organizationId) {
-        return new SingleOrganizationAdapter(sessionStorage, new ClientTenant().setId(organizationId));
+        return this.organization(new ClientTenant().setId(organizationId));
     }
 
-    public BatchOrganizationsAdapter organizations() {
+    public BatchOrganizationsAdapter allOrganizations() {
         return new BatchOrganizationsAdapter(sessionStorage);
     }
 }

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

@@ -44,7 +44,7 @@ public class SingleOrganizationAdapter extends AbstractAdapter {
 
     public SingleOrganizationAdapter(SessionStorage sessionStorage, ClientTenant clientTenant) {
         super(sessionStorage);
-        this.clientTenant= clientTenant;
+        this.clientTenant = clientTenant;
         this.params = new MultivaluedHashMap<String, String>();
     }
 
@@ -131,7 +131,8 @@ private JerseyRequest<ClientTenant> buildRequest() {
         return JerseyRequest.buildRequest(
                 sessionStorage,
                 ClientTenant.class,
-                new String[]{"/organizations", clientTenant.getId()},
+                new String[]{"/organizations",
+                        (clientTenant.getId() == null) ? clientTenant.getAlias() : clientTenant.getId()},
                 new DefaultErrorHandler()
         );
     }