Resolved issue #120, fixed SessionStorageTest

Author: TanyaEf

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

@@ -21,7 +21,7 @@
 package com.jaspersoft.jasperserver.jaxrs.client.core;
 
 import com.jaspersoft.jasperserver.jaxrs.client.core.enums.AuthenticationType;
-import com.jaspersoft.jasperserver.jaxrs.client.core.enums.ResponseStatus;
+import javax.ws.rs.core.Response.Status;
 import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.handling.DefaultErrorHandler;
 import com.jaspersoft.jasperserver.jaxrs.client.filters.BasicAuthenticationFilter;
 import com.jaspersoft.jasperserver.jaxrs.client.filters.SessionOutputFilter;
@@ -73,7 +73,7 @@ protected void login(SessionStorage storage) {
         String sessionId = null;
         String location = response.getLocation().toString();
 
-        if (response.getStatus() == ResponseStatus.FOUND && !location.matches("[^?]+\\?([^&]*&)*error=1(&[^&]*)*$")) {
+        if (response.getStatus() == Status.FOUND.getStatusCode() && !location.matches("[^?]+\\?([^&]*&)*error=1(&[^&]*)*$")) {
             sessionId = response.getCookies().get("JSESSIONID").getValue();
             storage.setSessionId(sessionId);
         } else {

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/core/enums/ResourceMediaType.java

@@ -24,7 +24,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-
+@Deprecated
 public interface ResourceMediaType {
     public static final String RESOURCE_MEDIA_TYPE_PREFIX = "application/repository.";
     public static final String RESOURCE_MIME_TYPE = "+{mime}";

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/core/enums/ResponseStatus.java

@@ -21,6 +21,7 @@
 
 package com.jaspersoft.jasperserver.jaxrs.client.core.enums;
 
+@Deprecated
 public final class ResponseStatus {
 
     /**

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/core/exceptions/handling/DefaultErrorHandler.java

@@ -21,7 +21,7 @@
 
 package com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.handling;
 
-import com.jaspersoft.jasperserver.jaxrs.client.core.enums.ResponseStatus;
+import javax.ws.rs.core.Response.Status;
 import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.AccessDeniedException;
 import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.AuthenticationFailedException;
 import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.BadRequestException;
@@ -46,17 +46,17 @@ public class DefaultErrorHandler implements ErrorHandler {
 
 //    private static final Log log = LogFactory.getLog(DefaultErrorHandler.class);
 
-    protected static final Map<Integer, Class<? extends JSClientWebException>> httpErrorCodeToTypeMap =
-            new HashMap<Integer, Class<? extends JSClientWebException>>() {{
-                put(ResponseStatus.BAD_REQUEST, BadRequestException.class);
-                put(ResponseStatus.FORBIDDEN, AccessDeniedException.class);
-                put(ResponseStatus.NOT_ALLOWED, HttpMethodNotAllowedException.class);
-                put(ResponseStatus.SERVER_ERROR, InternalServerErrorException.class);
-                put(ResponseStatus.NOT_ACCEPTABLE, RequestedRepresentationNotAvailableForResourceException.class);
-                put(ResponseStatus.NOT_FOUND, ResourceNotFoundException.class);
-                put(ResponseStatus.UNAUTHORIZED, AuthenticationFailedException.class);
-                put(ResponseStatus.CONFLICT, ConflictException.class);
-                put(ResponseStatus.UNSUPPORTED_TYPE, RepresentationalTypeNotSupportedForResourceException.class);
+    protected static final Map<Response.Status, Class<? extends JSClientWebException>> httpErrorCodeToTypeMap =
+            new HashMap<Response.Status, Class<? extends JSClientWebException>>() {{
+                put(Status.BAD_REQUEST, BadRequestException.class);
+                put(Status.FORBIDDEN, AccessDeniedException.class);
+                put(Status.NOT_ACCEPTABLE, HttpMethodNotAllowedException.class);
+                put(Status.INTERNAL_SERVER_ERROR, InternalServerErrorException.class);
+                put(Status.NOT_ACCEPTABLE, RequestedRepresentationNotAvailableForResourceException.class);
+                put(Status.NOT_FOUND, ResourceNotFoundException.class);
+                put(Status.UNAUTHORIZED, AuthenticationFailedException.class);
+                put(Status.CONFLICT, ConflictException.class);
+                put(Status.UNSUPPORTED_MEDIA_TYPE, RepresentationalTypeNotSupportedForResourceException.class);
             }};
 
     @Override
@@ -104,7 +104,7 @@ protected void handleBodyError(Response response) {
     }
 
     protected void handleStatusCodeError(Response response, String overridingMessage) {
-        Class<? extends JSClientWebException> exceptionType = httpErrorCodeToTypeMap.get(response.getStatus());
+        Class<? extends JSClientWebException> exceptionType = httpErrorCodeToTypeMap.get(Response.Status.fromStatusCode(response.getStatus()));
         String reasonPhrase = response.getStatusInfo().getReasonPhrase();
         JSClientWebException exception = new JSClientWebException(overridingMessage != null ? overridingMessage : reasonPhrase);
         try {

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

@@ -21,6 +21,7 @@
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.reset;
 import static org.mockito.MockitoAnnotations.initMocks;
 import static org.powermock.api.support.membermodification.MemberMatcher.method;
@@ -29,7 +30,7 @@
 /**
  * Unit tests for {@link com.jaspersoft.jasperserver.jaxrs.client.core.SessionStorage}
  */
-@PrepareForTest({SessionStorage.class, SSLContext.class, EncryptionUtils.class, ClientBuilder.class})
+@PrepareForTest({SSLContext.class, EncryptionUtils.class, ClientBuilder.class})
 public class SessionStorageTest extends PowerMockTestCase {
 
     @Mock
@@ -59,6 +60,7 @@ public void should_create_new_instance_session_storage() throws Exception {
 
         // Given
         PowerMockito.suppress(method(SessionStorage.class, "init"));
+        doReturn("http").when(configurationMock).getJasperReportsServerUrl();
         // When
         SessionStorage sessionStorage = new SessionStorage(configurationMock, credentialsMock);
         // Then
@@ -106,15 +108,16 @@ public void should_set_and_get_state_for_object() {
 
         // Given
         PowerMockito.suppress(method(SessionStorage.class, "init"));
-        SessionStorage sessionStorageSpy = PowerMockito.spy(new SessionStorage(configurationMock, credentialsMock));
+        doReturn("http").when(configurationMock).getJasperReportsServerUrl();
+        SessionStorage sessionStorage = new SessionStorage(configurationMock, credentialsMock);
         // When
-        Whitebox.setInternalState(sessionStorageSpy, "rootTarget", targetMock);
-        Whitebox.setInternalState(sessionStorageSpy, "sessionId", "sessionId");
+        Whitebox.setInternalState(sessionStorage, "rootTarget", targetMock);
+        Whitebox.setInternalState(sessionStorage, "sessionId", "sessionId");
         // Then
-        assertNotNull(sessionStorageSpy.getConfiguration());
-        assertNotNull(sessionStorageSpy.getCredentials());
-        assertNotNull(sessionStorageSpy.getRootTarget());
-        assertNotNull(sessionStorageSpy.getSessionId());
+        assertNotNull(sessionStorage.getConfiguration());
+        assertNotNull(sessionStorage.getCredentials());
+        assertNotNull(sessionStorage.getRootTarget());
+        assertNotNull(sessionStorage.getSessionId());
     }
 
     @AfterMethod