Changed dependensies

TanyaEf · TanyaEf · commit d58f24ef129b · 2015-09-28T11:36:53.000+03:00
diff --git a/pom.xml b/pom.xml
@@ -91,6 +91,13 @@
             <version>2.5.1</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.5.4</version>
+        </dependency>
+
+
         <!-- Jackson
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
diff --git a/src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/resources/ResourcesServiceIT.java b/src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/resources/ResourcesServiceIT.java
@@ -48,6 +48,7 @@ public void should_return_resource_details() throws InterruptedException {
                 .getEntity();
 
         Assert.assertNotNull(clientResource);
+        Assert.assertNotNull(clientResource.getCreationDate());
     }
 
     @AfterClass
diff --git a/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/authority/organizations/SingleOrganizationAdapter.java b/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/authority/organizations/SingleOrganizationAdapter.java
@@ -21,11 +21,6 @@
 
 package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.authority.organizations;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.AnnotationIntrospector;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.type.TypeFactory;
-import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
 import com.jaspersoft.jasperserver.dto.authority.ClientTenant;
 import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.AbstractAdapter;
 import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.authority.organizations.attributes.OrganizationBatchAttributeAdapter;
@@ -43,6 +38,11 @@
 import javax.ws.rs.core.MultivaluedHashMap;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.codehaus.jackson.map.AnnotationIntrospector;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.codehaus.jackson.map.SerializationConfig;
+import org.codehaus.jackson.map.annotate.JsonSerialize;
+import org.codehaus.jackson.xc.JaxbAnnotationIntrospector;
 
 
 public class SingleOrganizationAdapter extends AbstractAdapter {
@@ -76,8 +76,10 @@ public void run() {
 
     private String prepareJsonForUpdate(ClientTenant clientTenant) {
         ObjectMapper mapper = new ObjectMapper();
-        AnnotationIntrospector introspector = new JaxbAnnotationIntrospector(TypeFactory.defaultInstance());
-        mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+        SerializationConfig serializationConfig = mapper.getSerializationConfig();
+        serializationConfig = serializationConfig.withSerializationInclusion(JsonSerialize.Inclusion.NON_NULL);
+        AnnotationIntrospector introspector = new JaxbAnnotationIntrospector();
+        mapper.setSerializationConfig(serializationConfig);
         mapper.setAnnotationIntrospector(introspector);
 
         String json;
diff --git a/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/jobs/BatchJobsOperationsAdapter.java b/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/jobs/BatchJobsOperationsAdapter.java
@@ -20,36 +20,35 @@
  */
 package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.jobs;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.AnnotationIntrospector;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.type.TypeFactory;
-import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
 import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.AbstractAdapter;
 import com.jaspersoft.jasperserver.jaxrs.client.core.Callback;
 import com.jaspersoft.jasperserver.jaxrs.client.core.JerseyRequest;
-import com.jaspersoft.jasperserver.jaxrs.client.core.enums.MimeType;
 import com.jaspersoft.jasperserver.jaxrs.client.core.RequestExecution;
 import com.jaspersoft.jasperserver.jaxrs.client.core.SessionStorage;
 import com.jaspersoft.jasperserver.jaxrs.client.core.ThreadPoolUtil;
+import com.jaspersoft.jasperserver.jaxrs.client.core.enums.MimeType;
 import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
 import com.jaspersoft.jasperserver.jaxrs.client.dto.jobs.Job;
 import com.jaspersoft.jasperserver.jaxrs.client.dto.jobs.JobIdListWrapper;
 import com.jaspersoft.jasperserver.jaxrs.client.dto.jobs.jaxb.wrappers.JobSummaryListWrapper;
 import com.jaspersoft.jasperserver.jaxrs.client.dto.jobs.reportjobmodel.ReportJobModel;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.List;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Marshaller;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.codehaus.jackson.map.AnnotationIntrospector;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.codehaus.jackson.map.SerializationConfig;
+import org.codehaus.jackson.map.annotate.JsonSerialize;
+import org.codehaus.jackson.xc.JaxbAnnotationIntrospector;
 
 import static com.jaspersoft.jasperserver.jaxrs.client.core.JerseyRequest.buildRequest;
 
@@ -103,8 +102,10 @@ private JerseyRequest<JobSummaryListWrapper> prepareSearchRequest(Job searchCrit
     private String buildJson(Object object) {
 
         ObjectMapper mapper = new ObjectMapper();
-        AnnotationIntrospector introspector = new JaxbAnnotationIntrospector(TypeFactory.defaultInstance());
-        mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+        SerializationConfig serializationConfig = mapper.getSerializationConfig();
+        serializationConfig = serializationConfig.withSerializationInclusion(JsonSerialize.Inclusion.NON_NULL);
+        AnnotationIntrospector introspector = new JaxbAnnotationIntrospector();
+        mapper.setSerializationConfig(serializationConfig);
         mapper.setAnnotationIntrospector(introspector);
 
         try {
diff --git a/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/resources/SingleResourceAdapter.java b/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/resources/SingleResourceAdapter.java
@@ -34,13 +34,12 @@
 import com.jaspersoft.jasperserver.jaxrs.client.core.ThreadPoolUtil;
 import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.handling.DefaultErrorHandler;
 import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
-import org.glassfish.jersey.media.multipart.FormDataMultiPart;
-
+import com.sun.jersey.multipart.FormDataMultiPart;
+import java.io.File;
+import java.io.InputStream;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedHashMap;
 import javax.ws.rs.core.MultivaluedMap;
-import java.io.File;
-import java.io.InputStream;
 
 import static com.jaspersoft.jasperserver.jaxrs.client.core.JerseyRequest.buildRequest;
 
diff --git a/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/resources/support/decorator/DomainResourceOperationProcessorDecorator.java b/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/resources/support/decorator/DomainResourceOperationProcessorDecorator.java
@@ -25,8 +25,7 @@
 import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.resources.support.processor.CommonOperationProcessorImpl;
 import com.jaspersoft.jasperserver.jaxrs.client.core.SessionStorage;
 import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
-import org.glassfish.jersey.media.multipart.FormDataMultiPart;
-
+import com.sun.jersey.multipart.FormDataMultiPart;
 import javax.ws.rs.core.MediaType;
 
 /**
diff --git a/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/resources/support/decorator/MondrianConnectionResourceOperationProcessorDecorator.java b/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/resources/support/decorator/MondrianConnectionResourceOperationProcessorDecorator.java
@@ -24,8 +24,7 @@
 import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.resources.support.processor.CommonOperationProcessorImpl;
 import com.jaspersoft.jasperserver.jaxrs.client.core.SessionStorage;
 import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
-import org.glassfish.jersey.media.multipart.FormDataMultiPart;
-
+import com.sun.jersey.multipart.FormDataMultiPart;
 import javax.ws.rs.core.MediaType;
 
 /**
diff --git a/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/resources/support/decorator/ReportUnitResourceOperationProcessorDecorator.java b/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/resources/support/decorator/ReportUnitResourceOperationProcessorDecorator.java
@@ -24,8 +24,7 @@
 import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.resources.support.processor.CommonOperationProcessorImpl;
 import com.jaspersoft.jasperserver.jaxrs.client.core.SessionStorage;
 import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
-import org.glassfish.jersey.media.multipart.FormDataMultiPart;
-
+import com.sun.jersey.multipart.FormDataMultiPart;
 import javax.ws.rs.core.MediaType;
 
 /**
diff --git a/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/resources/support/decorator/SecureMondrianConnectionResourceOperationProcessorDecorator.java b/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/resources/support/decorator/SecureMondrianConnectionResourceOperationProcessorDecorator.java
@@ -24,8 +24,7 @@
 import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.resources.support.processor.CommonOperationProcessorImpl;
 import com.jaspersoft.jasperserver.jaxrs.client.core.SessionStorage;
 import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
-import org.glassfish.jersey.media.multipart.FormDataMultiPart;
-
+import com.sun.jersey.multipart.FormDataMultiPart;
 import javax.ws.rs.core.MediaType;
 
 /**
diff --git a/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/resources/support/processor/CommonOperationProcessor.java b/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/resources/support/processor/CommonOperationProcessor.java
@@ -21,8 +21,7 @@
 package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.resources.support.processor;
 
 import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
-import org.glassfish.jersey.media.multipart.FormDataMultiPart;
-
+import com.sun.jersey.multipart.FormDataMultiPart;
 import javax.ws.rs.core.MediaType;
 
 /**
diff --git a/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/resources/support/processor/CommonOperationProcessorImpl.java b/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/resources/support/processor/CommonOperationProcessorImpl.java
@@ -23,8 +23,7 @@
 import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.resources.SingleResourceAdapter;
 import com.jaspersoft.jasperserver.jaxrs.client.core.SessionStorage;
 import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
-import org.glassfish.jersey.media.multipart.FormDataMultiPart;
-
+import com.sun.jersey.multipart.FormDataMultiPart;
 import javax.ws.rs.core.MediaType;
 
 /**
diff --git a/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/core/SessionStorage.java b/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/core/SessionStorage.java
@@ -21,10 +21,8 @@
 
 package com.jaspersoft.jasperserver.jaxrs.client.core;
 
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
-import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
 import com.jaspersoft.jasperserver.jaxrs.client.providers.CustomRepresentationTypeProvider;
+import com.sun.jersey.multipart.impl.MultiPartWriter;
 import java.security.SecureRandom;
 import java.util.logging.Logger;
 import javax.net.ssl.HostnameVerifier;
@@ -33,10 +31,11 @@
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.WebTarget;
+import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider;
+import org.codehaus.jackson.jaxrs.JacksonJsonProvider;
 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;
 
 
@@ -80,6 +79,7 @@ private void init() {
         }
 
         Client client = clientBuilder.build();
+
         Integer connectionTimeout = configuration.getConnectionTimeout();
 
         if (connectionTimeout != null) {
@@ -92,10 +92,10 @@ private void init() {
             client.property(ClientProperties.READ_TIMEOUT, readTimeout);
         }
 
-        JacksonJsonProvider provider = new JacksonJaxbJsonProvider()
-                .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-        JacksonJsonProvider customRepresentationTypeProvider = new CustomRepresentationTypeProvider()
-                .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        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)
                     .register(provider)
diff --git a/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/core/operationresult/OperationResult.java b/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/core/operationresult/OperationResult.java
@@ -56,6 +56,7 @@ public T getEntity() {
             }
             return entity;
         } catch (Exception e) {
+            e.printStackTrace();
             return null;
         }
     }
diff --git a/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/providers/CustomRepresentationTypeProvider.java b/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/providers/CustomRepresentationTypeProvider.java
@@ -21,17 +21,16 @@
 
 package com.jaspersoft.jasperserver.jaxrs.client.providers;
 
-import com.fasterxml.jackson.jaxrs.cfg.Annotations;
-import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
 import com.jaspersoft.jasperserver.dto.resources.ResourceMediaType;
 import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.connection.ConnectionMediaType;
-
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.ext.Provider;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
+import org.codehaus.jackson.jaxrs.Annotations;
+import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider;
 
 
 @Provider
diff --git a/src/test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/resources/SingleResourceAdapterTest.java b/src/test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/resources/SingleResourceAdapterTest.java
@@ -8,14 +8,21 @@
 import com.jaspersoft.jasperserver.dto.resources.ResourceMediaType;
 import com.jaspersoft.jasperserver.jaxrs.client.core.Callback;
 import com.jaspersoft.jasperserver.jaxrs.client.core.JerseyRequest;
-import com.jaspersoft.jasperserver.jaxrs.client.core.enums.MimeType;
 import com.jaspersoft.jasperserver.jaxrs.client.core.RequestExecution;
 import com.jaspersoft.jasperserver.jaxrs.client.core.RestClientConfiguration;
 import com.jaspersoft.jasperserver.jaxrs.client.core.SessionStorage;
+import com.jaspersoft.jasperserver.jaxrs.client.core.enums.MimeType;
 import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.handling.DefaultErrorHandler;
 import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
-import org.glassfish.jersey.media.multipart.FormDataBodyPart;
-import org.glassfish.jersey.media.multipart.FormDataMultiPart;
+import com.sun.jersey.multipart.FormDataBodyPart;
+import com.sun.jersey.multipart.FormDataMultiPart;
+import java.io.File;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.MultivaluedMap;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
@@ -28,24 +35,24 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import java.io.File;
-import java.io.InputStream;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-
 import static com.jaspersoft.jasperserver.dto.resources.ClientFile.FileType;
 import static com.jaspersoft.jasperserver.jaxrs.client.core.JerseyRequest.buildRequest;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyObject;
 import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
 import static org.powermock.api.mockito.PowerMockito.mockStatic;
 import static org.powermock.api.mockito.PowerMockito.verifyStatic;
-import static org.testng.Assert.*;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNotSame;
+import static org.testng.Assert.assertSame;
 
 /**
 * Unit Tests for {@link com.jaspersoft.jasperserver.jaxrs.client.apiadapters.resources.SingleResourceAdapter}
diff --git a/src/test/java/com/jaspersoft/jasperserver/jaxrs/client/core/SessionStorageTest.java b/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.JacksonJsonProvider;
+import com.sun.jersey.multipart.impl.MultiPartWriter;
 import java.security.SecureRandom;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
@@ -12,9 +12,9 @@
 import javax.ws.rs.client.Invocation;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.Response;
+import org.codehaus.jackson.jaxrs.JacksonJsonProvider;
 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;

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ public void should_return_resource_details() throws InterruptedException {`
`48`	`48`	`.getEntity();`
`49`	`49`
`50`	`50`	`Assert.assertNotNull(clientResource);`
	`51`	`+ Assert.assertNotNull(clientResource.getCreationDate());`
`51`	`52`	`}`
`52`	`53`
`53`	`54`	`@AfterClass`