Commit 6281e485 authored by Maxym Borodenko's avatar Maxym Borodenko Committed by Matija Obreza
Browse files

Dependency updates

parent 47de510f
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<maven-gpg-plugin.version>1.5</maven-gpg-plugin.version> <maven-gpg-plugin.version>1.5</maven-gpg-plugin.version>
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version> <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
<slf4j.version>1.7.21</slf4j.version> <slf4j.version>1.7.30</slf4j.version>
<show.deprecations>true</show.deprecations> <show.deprecations>true</show.deprecations>
</properties> </properties>
...@@ -106,17 +106,17 @@ ...@@ -106,17 +106,17 @@
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<version>2.4</version> <version>2.8.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId> <artifactId>jackson-databind</artifactId>
<version>2.6.4</version> <version>2.11.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.12</version> <version>4.13.1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>4.3.6</version> <version>4.5.13</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
......
...@@ -22,6 +22,7 @@ import java.io.Serializable; ...@@ -22,6 +22,7 @@ import java.io.Serializable;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
...@@ -66,7 +67,7 @@ public class GenesysClient { ...@@ -66,7 +67,7 @@ public class GenesysClient {
private static final Logger LOG = LoggerFactory.getLogger(GenesysClient.class); private static final Logger LOG = LoggerFactory.getLogger(GenesysClient.class);
/** The mapper. */ /** The mapper. */
private static ObjectMapper objectMapper; private static final ObjectMapper objectMapper;
/** The service. */ /** The service. */
private final OAuth20Service service; private final OAuth20Service service;
...@@ -75,15 +76,15 @@ public class GenesysClient { ...@@ -75,15 +76,15 @@ public class GenesysClient {
private GenesysTokens tokens = new GenesysTokens(); private GenesysTokens tokens = new GenesysTokens();
/** Base URL of Genesys */ /** Base URL of Genesys */
private String baseUrl; private final String baseUrl;
/** UTF8 charset */ /** UTF8 charset */
private static Charset CHARSET_UTF8 = Charset.forName("UTF8"); private static final Charset CHARSET_UTF8 = StandardCharsets.UTF_8;
static { static {
objectMapper = new ObjectMapper(); objectMapper = new ObjectMapper();
objectMapper.configure(SerializationFeature.WRITE_ENUMS_USING_TO_STRING, true); objectMapper.configure(SerializationFeature.WRITE_ENUMS_USING_TO_STRING, true);
objectMapper.configure(SerializationFeature.WRITE_EMPTY_JSON_ARRAYS, false); objectMapper.setSerializationInclusion(Include.NON_EMPTY);
objectMapper.setSerializationInclusion(Include.NON_NULL); objectMapper.setSerializationInclusion(Include.NON_NULL);
objectMapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); objectMapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
} }
......
...@@ -51,7 +51,7 @@ import com.fasterxml.jackson.databind.SerializationFeature; ...@@ -51,7 +51,7 @@ import com.fasterxml.jackson.databind.SerializationFeature;
public class AccessionApiTest { public class AccessionApiTest {
/** The object mapper. */ /** The object mapper. */
private static ObjectMapper objectMapper; private static final ObjectMapper objectMapper;
/** The genesys client. */ /** The genesys client. */
@Mock @Mock
...@@ -66,7 +66,7 @@ public class AccessionApiTest { ...@@ -66,7 +66,7 @@ public class AccessionApiTest {
static { static {
objectMapper = new ObjectMapper(); objectMapper = new ObjectMapper();
objectMapper.configure(SerializationFeature.WRITE_ENUMS_USING_TO_STRING, true); objectMapper.configure(SerializationFeature.WRITE_ENUMS_USING_TO_STRING, true);
objectMapper.configure(SerializationFeature.WRITE_EMPTY_JSON_ARRAYS, false); objectMapper.setSerializationInclusion(Include.NON_EMPTY);
objectMapper.setSerializationInclusion(Include.NON_NULL); objectMapper.setSerializationInclusion(Include.NON_NULL);
} }
......
...@@ -52,7 +52,7 @@ import com.github.scribejava.core.model.Verb; ...@@ -52,7 +52,7 @@ import com.github.scribejava.core.model.Verb;
public class ApiTest { public class ApiTest {
/** The object mapper. */ /** The object mapper. */
private static ObjectMapper objectMapper; private static final ObjectMapper objectMapper;
/** The http get mock. */ /** The http get mock. */
@Mock @Mock
...@@ -69,7 +69,7 @@ public class ApiTest { ...@@ -69,7 +69,7 @@ public class ApiTest {
static { static {
objectMapper = new ObjectMapper(); objectMapper = new ObjectMapper();
objectMapper.configure(SerializationFeature.WRITE_ENUMS_USING_TO_STRING, true); objectMapper.configure(SerializationFeature.WRITE_ENUMS_USING_TO_STRING, true);
objectMapper.configure(SerializationFeature.WRITE_EMPTY_JSON_ARRAYS, false); objectMapper.setSerializationInclusion(Include.NON_EMPTY);
objectMapper.setSerializationInclusion(Include.NON_NULL); objectMapper.setSerializationInclusion(Include.NON_NULL);
} }
......
...@@ -48,12 +48,12 @@ public class MockGenesysServer { ...@@ -48,12 +48,12 @@ public class MockGenesysServer {
private final Map<String, List<AccessionJson>> instAcc = new HashMap<String, List<AccessionJson>>(); private final Map<String, List<AccessionJson>> instAcc = new HashMap<String, List<AccessionJson>>();
/** The object mapper. */ /** The object mapper. */
private static ObjectMapper objectMapper; private static final ObjectMapper objectMapper;
static { static {
objectMapper = new ObjectMapper(); objectMapper = new ObjectMapper();
objectMapper.configure(SerializationFeature.WRITE_ENUMS_USING_TO_STRING, true); objectMapper.configure(SerializationFeature.WRITE_ENUMS_USING_TO_STRING, true);
objectMapper.configure(SerializationFeature.WRITE_EMPTY_JSON_ARRAYS, false); objectMapper.setSerializationInclusion(Include.NON_EMPTY);
objectMapper.setSerializationInclusion(Include.NON_NULL); objectMapper.setSerializationInclusion(Include.NON_NULL);
} }
......
...@@ -41,12 +41,12 @@ import org.junit.Test; ...@@ -41,12 +41,12 @@ import org.junit.Test;
public class ModelTests { public class ModelTests {
/** The object mapper. */ /** The object mapper. */
private static ObjectMapper objectMapper; private static final ObjectMapper objectMapper;
static { static {
objectMapper = new ObjectMapper(); objectMapper = new ObjectMapper();
objectMapper.configure(SerializationFeature.WRITE_ENUMS_USING_TO_STRING, true); objectMapper.configure(SerializationFeature.WRITE_ENUMS_USING_TO_STRING, true);
objectMapper.configure(SerializationFeature.WRITE_EMPTY_JSON_ARRAYS, false); objectMapper.setSerializationInclusion(Include.NON_EMPTY);
objectMapper.setSerializationInclusion(Include.NON_NULL); objectMapper.setSerializationInclusion(Include.NON_NULL);
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment