Fixed bug#137

Author: TanyaEf

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

@@ -1,14 +1,18 @@
 package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.resources;
 
+import com.jaspersoft.jasperserver.dto.resources.ClientFolder;
 import com.jaspersoft.jasperserver.dto.resources.ClientResource;
 import com.jaspersoft.jasperserver.jaxrs.client.RestClientTestUtil;
+import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
 import java.io.ByteArrayInputStream;
 import javax.ws.rs.core.Response;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+import static org.testng.AssertJUnit.assertNotNull;
+
 /**
  * @author Alexander Krasnyanskiy
  * @author tetiana Iefimenko
@@ -51,6 +55,28 @@ public void should_return_resource_details() throws InterruptedException {
         Assert.assertNotNull(clientResource.getCreationDate());
     }
 
+
+
+    @Test
+    public void should_return_resource() throws InterruptedException {
+
+        // When
+        OperationResult<ClientFolder> clientFolderOperationResult = session.resourcesService()
+                .resource("/").get(ClientFolder.class);
+        Assert.assertTrue(clientFolderOperationResult.getResponse().getStatus() == 200);
+        assertNotNull(clientFolderOperationResult.getEntity());
+        assertNotNull(clientFolderOperationResult.getEntity().getVersion());
+
+        OperationResult<ClientResource> clientResource = session.resourcesService()
+                .resource("/").get(ClientResource.class);
+        Assert.assertTrue(clientResource.getResponse().getStatus() == 200);
+        assertNotNull(clientResource.getEntity());
+        assertNotNull(clientResource.getEntity().getVersion());
+
+
+
+    }
+
     @AfterClass
     public void after() {
         session.logout();

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/resources/SingleResourceAdapter.java

@@ -206,6 +206,11 @@ public <T> OperationResult<T> uploadMultipartResource(FormDataMultiPart multipar
 
     public <T> OperationResult<T> get(Class<T> clazz){
         JerseyRequest<T> request = buildRequest(sessionStorage, clazz, new String[]{"/resources", resourceUri});
+        if (isRootFolder(resourceUri)) {
+            request.setAccept(ResourceMediaType.FOLDER_JSON);
+        } else {
+            request.setAccept(ResourceMediaType.FILE_JSON);
+        }
         return request.get();
     }