Merge pull request #147 from TanyaEf/master

Fixed #135 (warnings in logs)

Author: yaroslav-kovalchyk

pom.xml

@@ -43,30 +43,29 @@
         <dependency>
             <groupId>com.jaspersoft.jasperserver</groupId>
             <artifactId>jasperserver-dto</artifactId>
-            <version>6.1.0</version>
+            <version>6.1.1</version>
         </dependency>
 
         <!-- Jersey-->
-
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-client</artifactId>
-            <version>2.5</version>
+            <version>2.22.1</version>
         </dependency>
         <dependency>
             <groupId>com.sun.jersey</groupId>
             <artifactId>jersey-json</artifactId>
-            <version>1.18</version>
+            <version>1.19</version>
         </dependency>
         <dependency>
             <groupId>com.sun.jersey.contribs</groupId>
             <artifactId>jersey-multipart</artifactId>
-            <version>1.17</version>
+            <version>1.19</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.media</groupId>
             <artifactId>jersey-media-json-jackson</artifactId>
-            <version>2.5.1</version>
+            <version>2.22.1</version>
         </dependency>
 
         <!-- TestNG -->
@@ -177,8 +176,9 @@
                     <instrumentation>
                         <excludes>
                             <exclude>**/com/jaspersoft/jasperserver/jaxrs/client/dto/**</exclude>
-                            <exclude>**/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/resources/support/**
-                            </exclude>
+                            <exclude>**/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/resources/support/**</exclude>
+                            <exclude>**/com/jaspersoft/jasperserver/jaxrs/client/core/exceptions/**</exclude>
+                            <exclude>**/com/jaspersoft/jasperserver/jaxrs/client/core/enums/**</exclude>
                         </excludes>
                     </instrumentation>
                 </configuration>

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

@@ -99,7 +99,6 @@ private void init() {
                 .configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         rootTarget = client.target(configuration.getJasperReportsServerUrl());
         rootTarget
-                .register(provider)
                 .register(customRepresentationTypeProvider)
                 .register(JacksonFeature.class)
                 .register(MultiPartWriter.class);

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/core/operationresult/OperationResult.java

@@ -58,7 +58,6 @@ public T getEntity() {
             }
             return entity;
         } catch (Exception e) {
-
             return null;
         }
     }

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/providers/CustomRepresentationTypeProvider.java

@@ -29,7 +29,6 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.ext.Provider;
-import org.codehaus.jackson.jaxrs.Annotations;
 import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider;
 
 
@@ -39,6 +38,7 @@
         "application/collection+json",
         "application/collection+xml",
         "application/job+json",
+        "application/json",
         "application/job+xml",
         ConnectionMediaType.FTP_JSON,
         ConnectionMediaType.FTP_XML,
@@ -104,6 +104,7 @@
         "application/collection+json",
         "application/collection+xml",
         "application/job+json",
+        "application/json",
         "application/job+xml",
         ConnectionMediaType.FTP_JSON,
         ConnectionMediaType.FTP_XML,
@@ -168,10 +169,6 @@
         "text/xml"})
 public class CustomRepresentationTypeProvider extends JacksonJaxbJsonProvider {
 
-    public CustomRepresentationTypeProvider() {
-        super(Annotations.JACKSON, Annotations.JAXB);
-    }
-
     @Override
     public boolean isReadable(Class<?> aClass, Type type, Annotation[] annotations, MediaType mediaType) {
         return super.isReadable(aClass, type, annotations, mediaType);
@@ -181,6 +178,5 @@ public boolean isReadable(Class<?> aClass, Type type, Annotation[] annotations,
     public boolean isWriteable(Class<?> aClass, Type type, Annotation[] annotations, MediaType mediaType) {
         return super.isWriteable(aClass, type, annotations, mediaType);
     }
-
 }
 

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

@@ -36,6 +36,7 @@
 import static org.powermock.api.mockito.PowerMockito.when;
 import static org.powermock.api.support.membermodification.MemberMatcher.method;
 import static org.powermock.api.support.membermodification.MemberModifier.suppress;
+import static org.powermock.reflect.internal.WhiteboxImpl.getInternalState;
 import static org.powermock.reflect.internal.WhiteboxImpl.setInternalState;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
@@ -120,7 +121,7 @@ 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, times(2)).register(isA(JacksonJsonProvider.class));
+        verify(targetMock, times(1)).register(isA(JacksonJsonProvider.class));
         verify(targetMock).register(MultiPartWriter.class);
         verify(configurationMock).getLogHttp();
         verify(targetMock, never()).register(LoggingFilter.class);
@@ -159,7 +160,7 @@ 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, times(2)).register(isA(JacksonJsonProvider.class));
+        verify(targetMock, times(1)).register(isA(JacksonJsonProvider.class));
         verify(targetMock).register(MultiPartWriter.class);
         verify(configurationMock).getLogHttp();
         verify(targetMock).register(isA(LoggingFilter.class));
@@ -237,6 +238,22 @@ public void should_set_and_get_state_for_object() {
         assertNotNull(sessionStorage.getSessionId());
     }
 
+    @Test
+    public void should_set_session_id_for_object() {
+
+        // Given
+        suppress(method(SessionStorage.class, "init"));
+        doReturn("http").when(configurationMock).getJasperReportsServerUrl();
+
+        SessionStorage sessionStorage = new SessionStorage(configurationMock, credentialsMock);
+        // When
+        String sessionId = "JSESSIONID";
+        sessionStorage.setSessionId(sessionId);
+        // Then
+
+        assertEquals(sessionId, getInternalState(sessionStorage, "sessionId"));
+    }
+
     @AfterMethod
     public void after() {
         reset(builderMock, configurationMock, credentialsMock, invocationBuilderMock, responseMock, ctxMock, clientMock, targetMock);