Merge pull request #178 from TanyaEf/develop

Fixed #176 (The defaultAllowed parameter is not added to request for thumbnails service)

Author: TanyaEf

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/thumbnails/SingleThumbnailAdapter.java

@@ -18,13 +18,16 @@
 public class SingleThumbnailAdapter extends AbstractAdapter {
 
     private final MultivaluedHashMap<String, String> params = new MultivaluedHashMap<String, String>();
+    private String reportName;
 
     public SingleThumbnailAdapter(SessionStorage sessionStorage) {
         super(sessionStorage);
     }
 
     public SingleThumbnailAdapter report(String uri) {
-        params.add("uri", uri);
+        if (uri != null && !uri.equals("")) {
+            reportName = uri;
+        }
         return this;
     }
 
@@ -34,14 +37,17 @@ public SingleThumbnailAdapter defaultAllowed(Boolean value) {
     }
 
     public OperationResult<InputStream> get() {
-        return request().setAccept("image/jpeg").get();
+        return request().get();
     }
 
     private JerseyRequest<InputStream> request() {
-        if (params.size() == 0) {
+        if (reportName == null) {
             throw new MandatoryParameterNotFoundException("URI of report should be specified");
         }
-        return JerseyRequest.buildRequest(sessionStorage, InputStream.class,
-                new String[]{"/thumbnails",  params.get("uri").get(0)}, new DefaultErrorHandler());
+        JerseyRequest<InputStream> request = JerseyRequest.buildRequest(sessionStorage, InputStream.class,
+                new String[]{"/thumbnails", reportName}, new DefaultErrorHandler());
+        request.setAccept("image/jpeg");
+        request.addParams(params);
+        return request;
     }
 }

src/test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/thumbnails/SingleThumbnailAdapterTest.java

@@ -3,6 +3,7 @@
 import com.jaspersoft.jasperserver.jaxrs.client.core.JerseyRequest;
 import com.jaspersoft.jasperserver.jaxrs.client.core.RequestBuilder;
 import com.jaspersoft.jasperserver.jaxrs.client.core.SessionStorage;
+import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.MandatoryParameterNotFoundException;
 import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.handling.DefaultErrorHandler;
 import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
 import java.io.InputStream;
@@ -17,6 +18,7 @@
 import org.testng.annotations.Test;
 
 import static com.jaspersoft.jasperserver.jaxrs.client.core.JerseyRequest.buildRequest;
+import static org.junit.Assert.assertNull;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.reset;
@@ -74,12 +76,56 @@ public void should_set_report_uri() {
         // When
         SingleThumbnailAdapter retrieved = thumbnailAdapter.report("/public/Samples/Reports/07g.RevenueDetailReport");
 
+        // Then
+        String reportName = (String) Whitebox.getInternalState(retrieved, "reportName");
+        assertEquals(reportName, "/public/Samples/Reports/07g.RevenueDetailReport");
+    }    @Test
+    /**
+     * for {@link SingleThumbnailAdapter#report(String)}
+     */
+    public void should_not_set_null_report_uri() {
+        // Given
+        SingleThumbnailAdapter thumbnailAdapter = new SingleThumbnailAdapter(sessionStorageMock);
+
+        // When
+        SingleThumbnailAdapter retrieved = thumbnailAdapter.report(null);
+
+        // Then
+        assertNull(Whitebox.getInternalState(retrieved, "reportName"));
+    }
+
+    @Test
+    /**
+     * for {@link SingleThumbnailAdapter#report(String)}
+     */
+    public void should_not_set_empty_report_uri() {
+        // Given
+        SingleThumbnailAdapter thumbnailAdapter = new SingleThumbnailAdapter(sessionStorageMock);
+
+        // When
+        SingleThumbnailAdapter retrieved = thumbnailAdapter.report("");
+
+        // Then
+        assertNull(Whitebox.getInternalState(retrieved, "reportName"));
+    }
+
+    @Test
+    /**
+     * for {@link SingleThumbnailAdapter#report(String)}
+     */
+    public void should_set_report_uri_with_default_allowed() {
+        // Given
+        SingleThumbnailAdapter thumbnailAdapter = new SingleThumbnailAdapter(sessionStorageMock);
+
+        // When
+        SingleThumbnailAdapter retrieved = thumbnailAdapter.defaultAllowed(true).report("/public/Samples/Reports/07g.RevenueDetailReport");
+
         // Then
         MultivaluedHashMap<String, String> params =
-                (MultivaluedHashMap<String, String>) Whitebox.getInternalState(thumbnailAdapter, "params");
-        List<String> list = params.get("uri");
+                (MultivaluedHashMap<String, String>) Whitebox.getInternalState(retrieved, "params");
+        List<String> list = params.get("defaultAllowed");
         assertSame(retrieved, thumbnailAdapter);
-        assertEquals(list.get(0), "/public/Samples/Reports/07g.RevenueDetailReport");
+        assertEquals(list.get(0), "true");
     }
 
     @Test
@@ -115,20 +161,20 @@ public void should_return_proper_operation_result() {
                 eq(InputStream.class),
                 eq(new String[]{"/thumbnails", "/public/Samples/Reports/07g.RevenueDetailReport"}),
                 any(DefaultErrorHandler.class))).thenReturn(jerseyRequestMock);
-        when(jerseyRequestMock.setAccept("image/jpeg")).thenReturn(requestBuilderMock);
-        when(requestBuilderMock.get()).thenReturn(operationResultMock);
+        when(jerseyRequestMock.setAccept("image/jpeg")).thenReturn(jerseyRequestMock);
+        when(jerseyRequestMock.get()).thenReturn(operationResultMock);
         SingleThumbnailAdapter thumbnailAdapter = new SingleThumbnailAdapter(sessionStorageMock);
         thumbnailAdapter.report("/public/Samples/Reports/07g.RevenueDetailReport");
 
-        // When /
+        // When
         OperationResult<InputStream> retrieved = thumbnailAdapter.get();
 
 
-        // Then /
+        // Then
         assertNotNull(retrieved);
         assertSame(retrieved, operationResultMock);
         verify(jerseyRequestMock).setAccept(eq("image/jpeg"));
-        verify(requestBuilderMock).get();
+        verify(jerseyRequestMock).get();
         verifyStatic(times(1));
         buildRequest(
                 eq(sessionStorageMock),
@@ -138,6 +184,27 @@ public void should_return_proper_operation_result() {
 
     }
 
+
+    @Test(expectedExceptions = MandatoryParameterNotFoundException.class)
+    /**
+     * for {@link SingleThumbnailAdapter#get()}
+     */
+    public void should_throw_exception() {
+
+        // Given
+        SingleThumbnailAdapter thumbnailAdapter = new SingleThumbnailAdapter(sessionStorageMock);
+        thumbnailAdapter.report(null);
+
+        // When
+        OperationResult<InputStream> retrieved = thumbnailAdapter.get();
+
+
+        // Then
+        //An exception should be thrown
+
+
+    }
+
     @AfterMethod
     public void after() {
         reset(sessionStorageMock, jerseyRequestMock, requestBuilderMock, operationResultMock);