AT&T 1712 and 1802 release code

[so.git] / adapters / mso-adapters-rest-interface / src / main / java / org / openecomp / mso / adapters / providers / JettisonStyleMapperProvider.java

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAICommonObjectMapperProvider.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/providers/JettisonStyleMapperProvider.java
similarity index 78%
rename from bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAICommonObjectMapperProvider.java
rename to adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/providers/JettisonStyleMapperProvider.java
index b15059e..aa55c63 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAICommonObjectMapperProvider.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/providers/JettisonStyleMapperProvider.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,8 +18,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.client.aai;
+package org.openecomp.mso.adapters.providers;
 
+import javax.ws.rs.Produces;
 import javax.ws.rs.ext.ContextResolver;
 import javax.ws.rs.ext.Provider;
 
@@ -30,20 +31,23 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 
 @Provider
-public class AAICommonObjectMapperProvider implements ContextResolver<ObjectMapper> {
-
+@Produces("application/json")
+public class JettisonStyleMapperProvider implements ContextResolver<ObjectMapper> {
+       
        final ObjectMapper mapper;
 
-       public AAICommonObjectMapperProvider() {
+       public JettisonStyleMapperProvider() {
+               
                mapper = new ObjectMapper();
                mapper.setSerializationInclusion(Include.NON_NULL);
                mapper.enable(MapperFeature.USE_ANNOTATIONS);
-               mapper.configure(SerializationFeature.WRAP_ROOT_VALUE, false);
-               mapper.configure(DeserializationFeature.UNWRAP_ROOT_VALUE, false);
+               mapper.configure(SerializationFeature.WRAP_ROOT_VALUE, true);
+               mapper.configure(DeserializationFeature.UNWRAP_ROOT_VALUE, true);
+               mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
        }
 
        @Override
        public ObjectMapper getContext(Class<?> type) {
                return mapper;
        }
-}
+}
\ No newline at end of file