Code Review
/
vid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge from ECOMP's repository
[vid.git]
/
vid-app-common
/
src
/
main
/
java
/
org
/
onap
/
vid
/
client
/
SyncRestClient.java
diff --git
a/vid-app-common/src/main/java/org/onap/vid/client/SyncRestClient.java
b/vid-app-common/src/main/java/org/onap/vid/client/SyncRestClient.java
index
9e50c44
..
ed1401c
100644
(file)
--- a/
vid-app-common/src/main/java/org/onap/vid/client/SyncRestClient.java
+++ b/
vid-app-common/src/main/java/org/onap/vid/client/SyncRestClient.java
@@
-42,11
+42,7
@@
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.security.KeyManagementException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.UnrecoverableKeyException;
+import java.security.*;
import java.security.cert.CertificateException;
import java.util.Map;
import java.security.cert.CertificateException;
import java.util.Map;
@@
-170,7
+166,7
@@
public class SyncRestClient implements SyncRestClientInterface {
}
private ObjectMapper defaultObjectMapper() {
}
private ObjectMapper defaultObjectMapper() {
-
org.codehaus.jackson.map.ObjectMapper objectMapper = new org.codehaus.jackson.map
.ObjectMapper();
+
com.fasterxml.jackson.databind.ObjectMapper objectMapper = new com.fasterxml.jackson.databind
.ObjectMapper();
return new ObjectMapper() {
@Override
return new ObjectMapper() {
@Override