Code Review
/
so.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Adding Junit"
[so.git]
/
adapters
/
mso-catalog-db-adapter
/
src
/
main
/
java
/
org
/
openecomp
/
mso
/
adapters
/
catalogdb
/
catalogrest
/
CatalogQueryExceptionCommon.java
diff --git
a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/CatalogQueryExceptionCommon.java
b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/CatalogQueryExceptionCommon.java
index
a1bc085
..
a1414e0
100644
(file)
--- a/
adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/CatalogQueryExceptionCommon.java
+++ b/
adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/CatalogQueryExceptionCommon.java
@@
-20,8
+20,8
@@
*/
package org.openecomp.mso.adapters.catalogdb.catalogrest;
*/
package org.openecomp.mso.adapters.catalogdb.catalogrest;
-import
org.codehaus.jackson.map
.ObjectMapper;
-import
org.codehaus.jackson.map.SerializationConfig
;
+import
com.fasterxml.jackson.databind
.ObjectMapper;
+import
com.fasterxml.jackson.databind.SerializationFeature
;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Marshaller;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Marshaller;
@@
-42,7
+42,7
@@
public abstract class CatalogQueryExceptionCommon {
try {
String jsonString;
ObjectMapper mapper = new ObjectMapper();
try {
String jsonString;
ObjectMapper mapper = new ObjectMapper();
- mapper.enable(Serialization
Config.
Feature.WRAP_ROOT_VALUE);
+ mapper.enable(SerializationFeature.WRAP_ROOT_VALUE);
jsonString = mapper.writeValueAsString(this);
return jsonString;
} catch (Exception e) {
jsonString = mapper.writeValueAsString(this);
return jsonString;
} catch (Exception e) {