Merge pull request #129 from TanyaEf/master

Fixed bug #126(null entity in Resource Service)

Author: yaroslav-kovalchyk

src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/resources/ResourcesServiceIT.java

@@ -1,8 +1,8 @@
 package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.resources;
 
+import com.jaspersoft.jasperserver.dto.resources.ClientResource;
 import com.jaspersoft.jasperserver.jaxrs.client.RestClientTestUtil;
 import java.io.ByteArrayInputStream;
-import java.util.concurrent.TimeUnit;
 import javax.ws.rs.core.Response;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
@@ -23,10 +23,7 @@ public void before() {
 
 
     @Test
-    public void shouldDeleteAFolder() throws InterruptedException {
-
-        // Given
-        TimeUnit.SECONDS.sleep(1);
+    public void should_delete_folder() throws InterruptedException {
 
         // When
         Response resp = session.resourcesService()
@@ -41,6 +38,18 @@ public void shouldDeleteAFolder() throws InterruptedException {
         Assert.assertNotNull(is);
     }
 
+    @Test
+    public void should_return_resource_details() throws InterruptedException {
+
+        // When
+        ClientResource clientResource = session.resourcesService()
+                .resource("/organizations/organization_1/Domains/supermartDomain")
+                .details()
+                .getEntity();
+
+        Assert.assertNotNull(clientResource);
+    }
+
     @AfterClass
     public void after() {
         session.logout();

src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/core/JasperserverRestClientIT.java

@@ -5,7 +5,7 @@
 import com.jaspersoft.jasperserver.jaxrs.client.core.enums.AuthenticationType;
 import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.JSClientWebException;
 import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import static org.testng.AssertJUnit.assertNotNull;
@@ -15,7 +15,7 @@
  */
 public class JasperserverRestClientIT extends RestClientTestUtil {
 
-    @BeforeClass
+    @BeforeMethod
     public void before() {
         initClient();
     }

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

@@ -27,7 +27,6 @@
 import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
 import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResultFactory;
 import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResultFactoryImpl;
-import com.jaspersoft.jasperserver.jaxrs.client.providers.CustomRepresentationTypeProvider;
 import java.util.List;
 import java.util.Map;
 import javax.ws.rs.client.Entity;
@@ -37,7 +36,6 @@
 import javax.ws.rs.core.MultivaluedHashMap;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.Response;
-import org.glassfish.jersey.media.multipart.internal.MultiPartWriter;
 
 import static com.jaspersoft.jasperserver.jaxrs.client.core.enums.MimeType.JSON;
 import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
@@ -81,10 +79,9 @@ private void init(SessionStorage sessionStorage) {
         contentType = configuration.getContentMimeType() == JSON ? APPLICATION_JSON : APPLICATION_XML;
         acceptType = configuration.getAcceptMimeType() == JSON ? APPLICATION_JSON : APPLICATION_XML;
         headers = new MultivaluedHashMap<String, String>();
+
         usersWebTarget = sessionStorage.getRootTarget()
-                .path("/rest_v2")
-                .register(CustomRepresentationTypeProvider.class)
-                .register(MultiPartWriter.class);
+                .path("/rest_v2");
     }
 
     public static <T> JerseyRequest<T> buildRequest(SessionStorage sessionStorage, Class<T> responseClass, String[] path) {

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

@@ -25,9 +25,11 @@
 import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
 import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
 
+import com.jaspersoft.jasperserver.jaxrs.client.providers.CustomRepresentationTypeProvider;
 import org.glassfish.jersey.client.ClientProperties;
 import org.glassfish.jersey.filter.LoggingFilter;
 import org.glassfish.jersey.jackson.JacksonFeature;
+import org.glassfish.jersey.media.multipart.internal.MultiPartWriter;
 import org.slf4j.bridge.SLF4JBridgeHandler;
 
 
@@ -96,10 +98,13 @@ private void init() {
 
         JacksonJsonProvider provider = new JacksonJaxbJsonProvider()
                 .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-
+        JacksonJsonProvider customRepresentationTypeProvider = new CustomRepresentationTypeProvider()
+                .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         rootTarget = client.target(configuration.getJasperReportsServerUrl());
-        rootTarget.register(JacksonFeature.class);
-        rootTarget.register(provider);
+        rootTarget.register(JacksonFeature.class)
+                    .register(provider)
+                    .register(customRepresentationTypeProvider)
+                    .register(MultiPartWriter.class);
         if (configuration.getLogHttp()) {
             rootTarget.register(initLoggingFilter());
         }

src/test/java/com/jaspersoft/jasperserver/jaxrs/client/core/SessionStorageTest.java

@@ -1,6 +1,6 @@
 package com.jaspersoft.jasperserver.jaxrs.client.core;
 
-import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
+import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
 import java.security.SecureRandom;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
@@ -14,6 +14,7 @@
 import javax.ws.rs.core.Response;
 import org.glassfish.jersey.filter.LoggingFilter;
 import org.glassfish.jersey.jackson.JacksonFeature;
+import org.glassfish.jersey.media.multipart.internal.MultiPartWriter;
 import org.mockito.Mock;
 import org.mockito.internal.util.reflection.Whitebox;
 import org.powermock.api.mockito.PowerMockito;
@@ -103,7 +104,8 @@ public void should_invoke_init_method_with_default_configuration() throws Except
         doReturn(null).when(configurationMock).getReadTimeout();
         doReturn(targetMock).when(clientMock).target(anyString());
         doReturn(targetMock).when(targetMock).register(JacksonFeature.class);
-        doReturn(targetMock).when(targetMock).register(any(JacksonJaxbJsonProvider.class));
+        doReturn(targetMock).when(targetMock).register(MultiPartWriter.class);
+        doReturn(targetMock).when(targetMock).register(any(JacksonJsonProvider.class));
         doReturn(false).when(configurationMock).getLogHttp();
         //when
         SessionStorage sessionStorage = new SessionStorage(configurationMock, credentialsMock);
@@ -116,7 +118,8 @@ public void should_invoke_init_method_with_default_configuration() throws Except
         verify(configurationMock).getReadTimeout();
         verify(clientMock).target("http://54.83.98.156/jasperserver-pro");
         verify(targetMock).register(JacksonFeature.class);
-        verify(targetMock).register(isA(JacksonJaxbJsonProvider.class));
+        verify(targetMock, times(2)).register(isA(JacksonJsonProvider.class));
+        verify(targetMock).register(MultiPartWriter.class);
         verify(configurationMock).getLogHttp();
         verify(targetMock, never()).register(LoggingFilter.class);
     }
@@ -134,7 +137,8 @@ public void should_invoke_init_method_with_custom_configuration() throws Excepti
         doReturn(clientMock).when(clientMock).property("jersey.config.client.readTimeout", 200);
         doReturn(targetMock).when(clientMock).target(anyString());
         doReturn(targetMock).when(targetMock).register(JacksonFeature.class);
-        doReturn(targetMock).when(targetMock).register(any(JacksonJaxbJsonProvider.class));
+        doReturn(targetMock).when(targetMock).register(MultiPartWriter.class);
+        doReturn(targetMock).when(targetMock).register(any(JacksonJsonProvider.class));
         doReturn(true).when(configurationMock).getLogHttp();
         doReturn(targetMock).when(targetMock).register(any(LoggingFilter.class));
         //when
@@ -150,7 +154,8 @@ public void should_invoke_init_method_with_custom_configuration() throws Excepti
         verify(clientMock).property("jersey.config.client.readTimeout", 200);
         verify(clientMock).target("http://54.83.98.156/jasperserver-pro");
         verify(targetMock).register(JacksonFeature.class);
-        verify(targetMock).register(isA(JacksonJaxbJsonProvider.class));
+        verify(targetMock, times(2)).register(isA(JacksonJsonProvider.class));
+        verify(targetMock).register(MultiPartWriter.class);
         verify(configurationMock).getLogHttp();
         verify(targetMock).register(isA(LoggingFilter.class));
     }