Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Genesys PGR
Java Client API
Commits
6281e485
Commit
6281e485
authored
Jan 11, 2021
by
Maxym Borodenko
Committed by
Matija Obreza
Jan 28, 2021
Browse files
Dependency updates
parent
47de510f
Changes
6
Hide whitespace changes
Inline
Side-by-side
pom.xml
View file @
6281e485
...
...
@@ -39,7 +39,7 @@
<maven-gpg-plugin.version>
1.5
</maven-gpg-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>
</properties>
...
...
@@ -106,17 +106,17 @@
<dependency>
<groupId>
commons-io
</groupId>
<artifactId>
commons-io
</artifactId>
<version>
2.
4
</version>
<version>
2.
8.0
</version>
</dependency>
<dependency>
<groupId>
com.fasterxml.jackson.core
</groupId>
<artifactId>
jackson-databind
</artifactId>
<version>
2.
6
.4
</version>
<version>
2.
11
.4
</version>
</dependency>
<dependency>
<groupId>
junit
</groupId>
<artifactId>
junit
</artifactId>
<version>
4.1
2
</version>
<version>
4.1
3.1
</version>
<scope>
test
</scope>
</dependency>
<dependency>
...
...
@@ -134,7 +134,7 @@
<dependency>
<groupId>
org.apache.httpcomponents
</groupId>
<artifactId>
httpclient
</artifactId>
<version>
4.
3.6
</version>
<version>
4.
5.13
</version>
<scope>
test
</scope>
</dependency>
</dependencies>
...
...
src/main/java/org/genesys2/client/oauth/GenesysClient.java
View file @
6281e485
...
...
@@ -22,6 +22,7 @@ import java.io.Serializable;
import
java.net.URI
;
import
java.net.URISyntaxException
;
import
java.nio.charset.Charset
;
import
java.nio.charset.StandardCharsets
;
import
java.util.Collection
;
import
java.util.Collections
;
import
java.util.HashMap
;
...
...
@@ -66,7 +67,7 @@ public class GenesysClient {
private
static
final
Logger
LOG
=
LoggerFactory
.
getLogger
(
GenesysClient
.
class
);
/** The mapper. */
private
static
ObjectMapper
objectMapper
;
private
static
final
ObjectMapper
objectMapper
;
/** The service. */
private
final
OAuth20Service
service
;
...
...
@@ -75,15 +76,15 @@ public class GenesysClient {
private
GenesysTokens
tokens
=
new
GenesysTokens
();
/** Base URL of Genesys */
private
String
baseUrl
;
private
final
String
baseUrl
;
/** UTF8 charset */
private
static
Charset
CHARSET_UTF8
=
Charset
.
forName
(
"UTF8"
)
;
private
static
final
Charset
CHARSET_UTF8
=
StandardCharsets
.
UTF_8
;
static
{
objectMapper
=
new
ObjectMapper
();
objectMapper
.
configure
(
SerializationFeature
.
WRITE_ENUMS_USING_TO_STRING
,
true
);
objectMapper
.
configure
(
Serialization
Feature
.
WRITE_EMPTY_JSON_ARRAYS
,
false
);
objectMapper
.
set
Serialization
Inclusion
(
Include
.
NON_EMPTY
);
objectMapper
.
setSerializationInclusion
(
Include
.
NON_NULL
);
objectMapper
.
disable
(
DeserializationFeature
.
FAIL_ON_UNKNOWN_PROPERTIES
);
}
...
...
src/test/java/org/geneys2/client/oauth/AccessionApiTest.java
View file @
6281e485
...
...
@@ -51,7 +51,7 @@ import com.fasterxml.jackson.databind.SerializationFeature;
public
class
AccessionApiTest
{
/** The object mapper. */
private
static
ObjectMapper
objectMapper
;
private
static
final
ObjectMapper
objectMapper
;
/** The genesys client. */
@Mock
...
...
@@ -66,7 +66,7 @@ public class AccessionApiTest {
static
{
objectMapper
=
new
ObjectMapper
();
objectMapper
.
configure
(
SerializationFeature
.
WRITE_ENUMS_USING_TO_STRING
,
true
);
objectMapper
.
configure
(
Serialization
Feature
.
WRITE_EMPTY_JSON_ARRAYS
,
false
);
objectMapper
.
set
Serialization
Inclusion
(
Include
.
NON_EMPTY
);
objectMapper
.
setSerializationInclusion
(
Include
.
NON_NULL
);
}
...
...
src/test/java/org/geneys2/client/oauth/ApiTest.java
View file @
6281e485
...
...
@@ -52,7 +52,7 @@ import com.github.scribejava.core.model.Verb;
public
class
ApiTest
{
/** The object mapper. */
private
static
ObjectMapper
objectMapper
;
private
static
final
ObjectMapper
objectMapper
;
/** The http get mock. */
@Mock
...
...
@@ -69,7 +69,7 @@ public class ApiTest {
static
{
objectMapper
=
new
ObjectMapper
();
objectMapper
.
configure
(
SerializationFeature
.
WRITE_ENUMS_USING_TO_STRING
,
true
);
objectMapper
.
configure
(
Serialization
Feature
.
WRITE_EMPTY_JSON_ARRAYS
,
false
);
objectMapper
.
set
Serialization
Inclusion
(
Include
.
NON_EMPTY
);
objectMapper
.
setSerializationInclusion
(
Include
.
NON_NULL
);
}
...
...
src/test/java/org/geneys2/client/oauth/MockGenesysServer.java
View file @
6281e485
...
...
@@ -48,12 +48,12 @@ public class MockGenesysServer {
private
final
Map
<
String
,
List
<
AccessionJson
>>
instAcc
=
new
HashMap
<
String
,
List
<
AccessionJson
>>();
/** The object mapper. */
private
static
ObjectMapper
objectMapper
;
private
static
final
ObjectMapper
objectMapper
;
static
{
objectMapper
=
new
ObjectMapper
();
objectMapper
.
configure
(
SerializationFeature
.
WRITE_ENUMS_USING_TO_STRING
,
true
);
objectMapper
.
configure
(
Serialization
Feature
.
WRITE_EMPTY_JSON_ARRAYS
,
false
);
objectMapper
.
set
Serialization
Inclusion
(
Include
.
NON_EMPTY
);
objectMapper
.
setSerializationInclusion
(
Include
.
NON_NULL
);
}
...
...
src/test/java/org/geneys2/client/oauth/ModelTests.java
View file @
6281e485
...
...
@@ -41,12 +41,12 @@ import org.junit.Test;
public
class
ModelTests
{
/** The object mapper. */
private
static
ObjectMapper
objectMapper
;
private
static
final
ObjectMapper
objectMapper
;
static
{
objectMapper
=
new
ObjectMapper
();
objectMapper
.
configure
(
SerializationFeature
.
WRITE_ENUMS_USING_TO_STRING
,
true
);
objectMapper
.
configure
(
Serialization
Feature
.
WRITE_EMPTY_JSON_ARRAYS
,
false
);
objectMapper
.
set
Serialization
Inclusion
(
Include
.
NON_EMPTY
);
objectMapper
.
setSerializationInclusion
(
Include
.
NON_NULL
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment