Use fasterxml jackson implementation in so/libs

NexusIQ issue: org.codehaus.jackson

This commit changes so/libs from the old codehaus jackson
implementation to the fasterxml implementation.

2.8.10 is the latest version compatible with the 1.5.13.RELEASE
springboot version used in SO.

Change-Id: I3b1167dd0efeb3463efb7e01fac26d0f312d7aad
Issue-ID: SO-864
Signed-off-by: Rob Daugherty <rd472p@att.com>

diff --git a/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Meter.java b/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Meter.java
index e9ff2aa..6faafc0 100644 (file)
--- a/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Meter.java
+++ b/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Meter.java
@@ -16,7 +16,7 @@
 
 package com.woorea.openstack.ceilometer.v2.model;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Meter {
 

diff --git a/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Resource.java b/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Resource.java
index bb8e991..193ce29 100644 (file)
--- a/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Resource.java
+++ b/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Resource.java
@@ -18,7 +18,7 @@ package com.woorea.openstack.ceilometer.v2.model;
 
 import java.util.Map;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Resource {
     //{"resource_id": "23b55841eedd41e99d5f3f32149ca086", "timestamp": "2013-03-03T15:19:00", "project_id": "23b55841eedd41e99d5f3f32149ca086", "user_id": null, "metadata": {}}

diff --git a/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Sample.java b/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Sample.java
index 722b1a9..2808113 100644 (file)
--- a/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Sample.java
+++ b/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Sample.java
@@ -18,7 +18,7 @@ package com.woorea.openstack.ceilometer.v2.model;
 
 import java.util.Map;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Sample {
 

diff --git a/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Statistics.java b/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Statistics.java
index c741abc..747c9f0 100644 (file)
--- a/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Statistics.java
+++ b/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Statistics.java
@@ -18,7 +18,7 @@ package com.woorea.openstack.ceilometer.v2.model;
 
 import java.math.BigDecimal;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Statistics {
     

diff --git a/ceilometer-model/src/test/java/com/woorea/openstack/ceilometer/v2/model/MeterTest.java b/ceilometer-model/src/test/java/com/woorea/openstack/ceilometer/v2/model/MeterTest.java
index 97bb2af..361bf9c 100644 (file)
--- a/ceilometer-model/src/test/java/com/woorea/openstack/ceilometer/v2/model/MeterTest.java
+++ b/ceilometer-model/src/test/java/com/woorea/openstack/ceilometer/v2/model/MeterTest.java
@@ -20,11 +20,11 @@
 
 package com.woorea.openstack.ceilometer.v2.model;
 
-import com.woorea.openstack.ceilometer.v2.model.Meter;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -44,9 +44,10 @@ public class MeterTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/ceilometer-model/src/test/java/com/woorea/openstack/ceilometer/v2/model/ResourceTest.java b/ceilometer-model/src/test/java/com/woorea/openstack/ceilometer/v2/model/ResourceTest.java
index 10b361e..08cbcd5 100644 (file)
--- a/ceilometer-model/src/test/java/com/woorea/openstack/ceilometer/v2/model/ResourceTest.java
+++ b/ceilometer-model/src/test/java/com/woorea/openstack/ceilometer/v2/model/ResourceTest.java
@@ -20,12 +20,13 @@
 
 package com.woorea.openstack.ceilometer.v2.model;
 
-import com.woorea.openstack.ceilometer.v2.model.Resource;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.Map;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -47,9 +48,10 @@ public class ResourceTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/ceilometer-model/src/test/java/com/woorea/openstack/ceilometer/v2/model/SampleTest.java b/ceilometer-model/src/test/java/com/woorea/openstack/ceilometer/v2/model/SampleTest.java
index fa8325e..e647f42 100644 (file)
--- a/ceilometer-model/src/test/java/com/woorea/openstack/ceilometer/v2/model/SampleTest.java
+++ b/ceilometer-model/src/test/java/com/woorea/openstack/ceilometer/v2/model/SampleTest.java
@@ -20,12 +20,13 @@
 
 package com.woorea.openstack.ceilometer.v2.model;
 
-import com.woorea.openstack.ceilometer.v2.model.Sample;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.Map;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -53,9 +54,10 @@ public class SampleTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/ceilometer-model/src/test/java/com/woorea/openstack/ceilometer/v2/model/StatisticsTest.java b/ceilometer-model/src/test/java/com/woorea/openstack/ceilometer/v2/model/StatisticsTest.java
index d3e7597..741e53b 100644 (file)
--- a/ceilometer-model/src/test/java/com/woorea/openstack/ceilometer/v2/model/StatisticsTest.java
+++ b/ceilometer-model/src/test/java/com/woorea/openstack/ceilometer/v2/model/StatisticsTest.java
@@ -20,12 +20,13 @@
 
 package com.woorea.openstack.ceilometer.v2.model;
 
-import com.woorea.openstack.ceilometer.v2.model.Statistics;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.math.BigDecimal;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -50,9 +51,10 @@ public class StatisticsTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/glance-client/src/main/java/com/woorea/openstack/glance/ImagesResource.java b/glance-client/src/main/java/com/woorea/openstack/glance/ImagesResource.java
index 03ff825..2dc1b9c 100644 (file)
--- a/glance-client/src/main/java/com/woorea/openstack/glance/ImagesResource.java
+++ b/glance-client/src/main/java/com/woorea/openstack/glance/ImagesResource.java
@@ -16,6 +16,7 @@
 
 package com.woorea.openstack.glance;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.woorea.openstack.base.client.Entity;
 import com.woorea.openstack.base.client.HttpMethod;
 import com.woorea.openstack.base.client.OpenStackClient;
@@ -31,7 +32,6 @@ import java.util.Calendar;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
-import org.codehaus.jackson.annotate.JsonProperty;
 
 public class ImagesResource {
 

diff --git a/glance-model/src/main/java/com/woorea/openstack/glance/model/Image.java b/glance-model/src/main/java/com/woorea/openstack/glance/model/Image.java
index 59eb6eb..aa7be87 100644 (file)
--- a/glance-model/src/main/java/com/woorea/openstack/glance/model/Image.java
+++ b/glance-model/src/main/java/com/woorea/openstack/glance/model/Image.java
@@ -20,9 +20,10 @@ import java.io.Serializable;
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Map;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("image")
 @JsonIgnoreProperties(ignoreUnknown = true)

diff --git a/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMember.java b/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMember.java
index 5378139..8cecda9 100644 (file)
--- a/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMember.java
+++ b/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMember.java
@@ -18,7 +18,7 @@ package com.woorea.openstack.glance.model;
 
 import java.io.Serializable;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class ImageMember implements Serializable {
 

diff --git a/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMembers.java b/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMembers.java
index 21d6d57..fd977ed 100644 (file)
--- a/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMembers.java
+++ b/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMembers.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class ImageMembers implements Iterable<ImageMember>, Serializable {
 
@@ -39,4 +39,4 @@ public class ImageMembers implements Iterable<ImageMember>, Serializable {
         return list.iterator();
     }
     
-}
\ No newline at end of file
+}

diff --git a/glance-model/src/main/java/com/woorea/openstack/glance/model/Images.java b/glance-model/src/main/java/com/woorea/openstack/glance/model/Images.java
index 191c889..b3b278c 100644 (file)
--- a/glance-model/src/main/java/com/woorea/openstack/glance/model/Images.java
+++ b/glance-model/src/main/java/com/woorea/openstack/glance/model/Images.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Images implements Iterable<Image>, Serializable {
 

diff --git a/glance-model/src/main/java/com/woorea/openstack/glance/model/SharedImages.java b/glance-model/src/main/java/com/woorea/openstack/glance/model/SharedImages.java
index 412e724..6239a2b 100644 (file)
--- a/glance-model/src/main/java/com/woorea/openstack/glance/model/SharedImages.java
+++ b/glance-model/src/main/java/com/woorea/openstack/glance/model/SharedImages.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class SharedImages implements Iterable<SharedImage>, Serializable {
 
@@ -39,4 +39,4 @@ public class SharedImages implements Iterable<SharedImage>, Serializable {
         return list.iterator();
     }
     
-}
\ No newline at end of file
+}

diff --git a/glance-model/src/test/java/com/woorea/openstack/glance/model/ImageMemberTest.java b/glance-model/src/test/java/com/woorea/openstack/glance/model/ImageMemberTest.java
index 155aac0..e8323d9 100644 (file)
--- a/glance-model/src/test/java/com/woorea/openstack/glance/model/ImageMemberTest.java
+++ b/glance-model/src/test/java/com/woorea/openstack/glance/model/ImageMemberTest.java
@@ -20,11 +20,11 @@
 
 package com.woorea.openstack.glance.model;
 
-import com.woorea.openstack.glance.model.ImageMember;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -40,9 +40,10 @@ public class ImageMemberTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/glance-model/src/test/java/com/woorea/openstack/glance/model/ImageMembersTest.java b/glance-model/src/test/java/com/woorea/openstack/glance/model/ImageMembersTest.java
index 0b9e94c..513791a 100644 (file)
--- a/glance-model/src/test/java/com/woorea/openstack/glance/model/ImageMembersTest.java
+++ b/glance-model/src/test/java/com/woorea/openstack/glance/model/ImageMembersTest.java
@@ -20,13 +20,13 @@
 
 package com.woorea.openstack.glance.model;
 
-import com.woorea.openstack.glance.model.ImageMember;
-import com.woorea.openstack.glance.model.ImageMembers;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -47,9 +47,10 @@ public class ImageMembersTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/glance-model/src/test/java/com/woorea/openstack/glance/model/ImageTest.java b/glance-model/src/test/java/com/woorea/openstack/glance/model/ImageTest.java
index 4e54413..8e8914c 100644 (file)
--- a/glance-model/src/test/java/com/woorea/openstack/glance/model/ImageTest.java
+++ b/glance-model/src/test/java/com/woorea/openstack/glance/model/ImageTest.java
@@ -20,13 +20,14 @@
 
 package com.woorea.openstack.glance.model;
 
-import com.woorea.openstack.glance.model.Image;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.Calendar;
 import java.util.Map;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -65,11 +66,12 @@ public class ImageTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/glance-model/src/test/java/com/woorea/openstack/glance/model/ImagesTest.java b/glance-model/src/test/java/com/woorea/openstack/glance/model/ImagesTest.java
index 913fa01..1ba0907 100644 (file)
--- a/glance-model/src/test/java/com/woorea/openstack/glance/model/ImagesTest.java
+++ b/glance-model/src/test/java/com/woorea/openstack/glance/model/ImagesTest.java
@@ -20,13 +20,13 @@
 
 package com.woorea.openstack.glance.model;
 
-import com.woorea.openstack.glance.model.Image;
-import com.woorea.openstack.glance.model.Images;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -89,9 +89,10 @@ public class ImagesTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/glance-model/src/test/java/com/woorea/openstack/glance/model/SharedImageTest.java b/glance-model/src/test/java/com/woorea/openstack/glance/model/SharedImageTest.java
index f1348ee..41805cb 100644 (file)
--- a/glance-model/src/test/java/com/woorea/openstack/glance/model/SharedImageTest.java
+++ b/glance-model/src/test/java/com/woorea/openstack/glance/model/SharedImageTest.java
@@ -20,28 +20,26 @@
 
 package com.woorea.openstack.glance.model;
 
-import com.woorea.openstack.glance.model.SharedImage;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
-import org.junit.Assert;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.skyscreamer.jsonassert.JSONCompareMode;
 
 public class SharedImageTest {
 
-    private static final String EOL = System.lineSeparator();
-
     private static final String JSON_FULL = "{ }";
 
     // FAIL_ON_EMPTY_BEANS set to false to conform to legacy behavior
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .disable(SerializationConfig.Feature.FAIL_ON_EMPTY_BEANS)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/glance-model/src/test/java/com/woorea/openstack/glance/model/SharedImagesTest.java b/glance-model/src/test/java/com/woorea/openstack/glance/model/SharedImagesTest.java
index f888fb2..7695f54 100644 (file)
--- a/glance-model/src/test/java/com/woorea/openstack/glance/model/SharedImagesTest.java
+++ b/glance-model/src/test/java/com/woorea/openstack/glance/model/SharedImagesTest.java
@@ -20,13 +20,13 @@
 
 package com.woorea.openstack.glance.model;
 
-import com.woorea.openstack.glance.model.SharedImage;
-import com.woorea.openstack.glance.model.SharedImages;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -42,10 +42,11 @@ public class SharedImagesTest {
 
     // FAIL_ON_EMPTY_BEANS set to false to conform to legacy behavior
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .disable(SerializationConfig.Feature.FAIL_ON_EMPTY_BEANS)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/heat-model/src/main/java/com/woorea/openstack/heat/model/CreateStackParam.java b/heat-model/src/main/java/com/woorea/openstack/heat/model/CreateStackParam.java
index 19808e3..09bb14c 100644 (file)
--- a/heat-model/src/main/java/com/woorea/openstack/heat/model/CreateStackParam.java
+++ b/heat-model/src/main/java/com/woorea/openstack/heat/model/CreateStackParam.java
@@ -21,7 +21,8 @@ package com.woorea.openstack.heat.model;
  */
 
 import java.util.Map;
-import org.codehaus.jackson.annotate.JsonProperty;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class CreateStackParam {
 

diff --git a/heat-model/src/main/java/com/woorea/openstack/heat/model/Explanation.java b/heat-model/src/main/java/com/woorea/openstack/heat/model/Explanation.java
index ed2395b..2b1628b 100644 (file)
--- a/heat-model/src/main/java/com/woorea/openstack/heat/model/Explanation.java
+++ b/heat-model/src/main/java/com/woorea/openstack/heat/model/Explanation.java
@@ -16,13 +16,13 @@
 
 package com.woorea.openstack.heat.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+
 /*
  * Modifications copyright (c) 2017 AT&T Intellectual Property
  */
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
-
 // There is no Root element for the Explanation return
 //@JsonRootName("error")
 public class Explanation {

diff --git a/heat-model/src/main/java/com/woorea/openstack/heat/model/Link.java b/heat-model/src/main/java/com/woorea/openstack/heat/model/Link.java
index a40ff7d..f70229e 100644 (file)
--- a/heat-model/src/main/java/com/woorea/openstack/heat/model/Link.java
+++ b/heat-model/src/main/java/com/woorea/openstack/heat/model/Link.java
@@ -16,7 +16,7 @@
 
 package com.woorea.openstack.heat.model;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Link {
     @JsonProperty("href")

diff --git a/heat-model/src/main/java/com/woorea/openstack/heat/model/Resource.java b/heat-model/src/main/java/com/woorea/openstack/heat/model/Resource.java
index 977ba2f..df8ef01 100644 (file)
--- a/heat-model/src/main/java/com/woorea/openstack/heat/model/Resource.java
+++ b/heat-model/src/main/java/com/woorea/openstack/heat/model/Resource.java
@@ -16,11 +16,11 @@
 
 package com.woorea.openstack.heat.model;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-
 import java.util.Date;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 public class Resource {
     @JsonProperty("resource_name")
     private String name;

diff --git a/heat-model/src/main/java/com/woorea/openstack/heat/model/Resources.java b/heat-model/src/main/java/com/woorea/openstack/heat/model/Resources.java
index 93922f4..dd2b935 100644 (file)
--- a/heat-model/src/main/java/com/woorea/openstack/heat/model/Resources.java
+++ b/heat-model/src/main/java/com/woorea/openstack/heat/model/Resources.java
@@ -16,12 +16,12 @@
 
 package com.woorea.openstack.heat.model;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-
 import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 public class Resources implements Iterable<Resource>, Serializable {
     @JsonProperty("resources")
     private List<Resource> list;
@@ -41,4 +41,4 @@ public class Resources implements Iterable<Resource>, Serializable {
                 "list=" + list +
                 '}';
     }
-}
\ No newline at end of file
+}

diff --git a/heat-model/src/main/java/com/woorea/openstack/heat/model/Stack.java b/heat-model/src/main/java/com/woorea/openstack/heat/model/Stack.java
index a07764b..340f3d1 100644 (file)
--- a/heat-model/src/main/java/com/woorea/openstack/heat/model/Stack.java
+++ b/heat-model/src/main/java/com/woorea/openstack/heat/model/Stack.java
@@ -20,12 +20,6 @@ package com.woorea.openstack.heat.model;
  * Modifications copyright (c) 2017 AT&T Intellectual Property
  */
 
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.annotate.JsonRootName;
-
 import java.io.IOException;
 import java.util.Date;
 import java.util.HashMap;
@@ -33,6 +27,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonRootName("stack")
 public class Stack {

diff --git a/heat-model/src/main/java/com/woorea/openstack/heat/model/Stacks.java b/heat-model/src/main/java/com/woorea/openstack/heat/model/Stacks.java
index 6c32a77..d4b11d6 100644 (file)
--- a/heat-model/src/main/java/com/woorea/openstack/heat/model/Stacks.java
+++ b/heat-model/src/main/java/com/woorea/openstack/heat/model/Stacks.java
@@ -16,12 +16,12 @@
 
 package com.woorea.openstack.heat.model;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-
 import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 public class Stacks implements Iterable<Stack>, Serializable {
     @JsonProperty("stacks")
     private List<Stack> list;

diff --git a/heat-model/src/main/java/com/woorea/openstack/heat/model/UpdateStackParam.java b/heat-model/src/main/java/com/woorea/openstack/heat/model/UpdateStackParam.java
index 5274d16..64e7e64 100644 (file)
--- a/heat-model/src/main/java/com/woorea/openstack/heat/model/UpdateStackParam.java
+++ b/heat-model/src/main/java/com/woorea/openstack/heat/model/UpdateStackParam.java
@@ -17,7 +17,7 @@
 /*
  * ============LICENSE_START==========================================
  * ===================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
  * ===================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,10 +39,10 @@
 
 package com.woorea.openstack.heat.model;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-
 import java.util.Map;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 public class UpdateStackParam {
     @JsonProperty("template_url")
     private String templateUrl;

diff --git a/heat-model/src/test/java/com/woorea/openstack/heat/model/CreateStackParamTest.java b/heat-model/src/test/java/com/woorea/openstack/heat/model/CreateStackParamTest.java
index f181175..a57eced 100644 (file)
--- a/heat-model/src/test/java/com/woorea/openstack/heat/model/CreateStackParamTest.java
+++ b/heat-model/src/test/java/com/woorea/openstack/heat/model/CreateStackParamTest.java
@@ -20,12 +20,13 @@
 
 package com.woorea.openstack.heat.model;
 
-import com.woorea.openstack.heat.model.CreateStackParam;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.Map;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -53,9 +54,10 @@ public class CreateStackParamTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/heat-model/src/test/java/com/woorea/openstack/heat/model/ErrorTest.java b/heat-model/src/test/java/com/woorea/openstack/heat/model/ErrorTest.java
index 76582e7..084fd26 100644 (file)
--- a/heat-model/src/test/java/com/woorea/openstack/heat/model/ErrorTest.java
+++ b/heat-model/src/test/java/com/woorea/openstack/heat/model/ErrorTest.java
@@ -20,11 +20,12 @@
 
 package com.woorea.openstack.heat.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.heat.model.Explanation.Error;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -43,11 +44,12 @@ public class ErrorTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/heat-model/src/test/java/com/woorea/openstack/heat/model/ExplanationTest.java b/heat-model/src/test/java/com/woorea/openstack/heat/model/ExplanationTest.java
index 4132cb0..ff8ebb2 100644 (file)
--- a/heat-model/src/test/java/com/woorea/openstack/heat/model/ExplanationTest.java
+++ b/heat-model/src/test/java/com/woorea/openstack/heat/model/ExplanationTest.java
@@ -20,12 +20,12 @@
 
 package com.woorea.openstack.heat.model;
 
-import com.woorea.openstack.heat.model.Explanation;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.heat.model.Explanation.Error;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -47,9 +47,10 @@ public class ExplanationTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/heat-model/src/test/java/com/woorea/openstack/heat/model/LinkTest.java b/heat-model/src/test/java/com/woorea/openstack/heat/model/LinkTest.java
index 503e0e5..4565fe8 100644 (file)
--- a/heat-model/src/test/java/com/woorea/openstack/heat/model/LinkTest.java
+++ b/heat-model/src/test/java/com/woorea/openstack/heat/model/LinkTest.java
@@ -20,11 +20,11 @@
 
 package com.woorea.openstack.heat.model;
 
-import com.woorea.openstack.heat.model.Link;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -40,9 +40,10 @@ public class LinkTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/heat-model/src/test/java/com/woorea/openstack/heat/model/OutputTest.java b/heat-model/src/test/java/com/woorea/openstack/heat/model/OutputTest.java
index cc07012..a91eeff 100644 (file)
--- a/heat-model/src/test/java/com/woorea/openstack/heat/model/OutputTest.java
+++ b/heat-model/src/test/java/com/woorea/openstack/heat/model/OutputTest.java
@@ -20,11 +20,12 @@
 
 package com.woorea.openstack.heat.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.heat.model.Stack.Output;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -41,9 +42,10 @@ public class OutputTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/heat-model/src/test/java/com/woorea/openstack/heat/model/ResourceTest.java b/heat-model/src/test/java/com/woorea/openstack/heat/model/ResourceTest.java
index ff7497e..0079ef3 100644 (file)
--- a/heat-model/src/test/java/com/woorea/openstack/heat/model/ResourceTest.java
+++ b/heat-model/src/test/java/com/woorea/openstack/heat/model/ResourceTest.java
@@ -20,14 +20,14 @@
 
 package com.woorea.openstack.heat.model;
 
-import com.woorea.openstack.heat.model.Link;
-import com.woorea.openstack.heat.model.Resource;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.Date;
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -56,9 +56,10 @@ public class ResourceTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/heat-model/src/test/java/com/woorea/openstack/heat/model/ResourcesTest.java b/heat-model/src/test/java/com/woorea/openstack/heat/model/ResourcesTest.java
index 0093ab3..37c5e72 100644 (file)
--- a/heat-model/src/test/java/com/woorea/openstack/heat/model/ResourcesTest.java
+++ b/heat-model/src/test/java/com/woorea/openstack/heat/model/ResourcesTest.java
@@ -20,13 +20,13 @@
 
 package com.woorea.openstack.heat.model;
 
-import com.woorea.openstack.heat.model.Resource;
-import com.woorea.openstack.heat.model.Resources;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -73,9 +73,10 @@ public class ResourcesTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/heat-model/src/test/java/com/woorea/openstack/heat/model/StackTest.java b/heat-model/src/test/java/com/woorea/openstack/heat/model/StackTest.java
index 8659895..ea38918 100644 (file)
--- a/heat-model/src/test/java/com/woorea/openstack/heat/model/StackTest.java
+++ b/heat-model/src/test/java/com/woorea/openstack/heat/model/StackTest.java
@@ -20,16 +20,16 @@
 
 package com.woorea.openstack.heat.model;
 
-import com.woorea.openstack.heat.model.Link;
-import com.woorea.openstack.heat.model.Stack;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.heat.model.Stack.Output;
+
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -76,11 +76,12 @@ public class StackTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/heat-model/src/test/java/com/woorea/openstack/heat/model/StacksTest.java b/heat-model/src/test/java/com/woorea/openstack/heat/model/StacksTest.java
index 884d5a9..880c482 100644 (file)
--- a/heat-model/src/test/java/com/woorea/openstack/heat/model/StacksTest.java
+++ b/heat-model/src/test/java/com/woorea/openstack/heat/model/StacksTest.java
@@ -20,13 +20,11 @@
 
 package com.woorea.openstack.heat.model;
 
-import com.woorea.openstack.heat.model.Stack;
-import com.woorea.openstack.heat.model.Stacks;
-import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -105,9 +103,10 @@ public class StacksTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/heat-model/src/test/java/com/woorea/openstack/heat/model/UpdateStackParamTest.java b/heat-model/src/test/java/com/woorea/openstack/heat/model/UpdateStackParamTest.java
index 5bff417..5eb99c3 100644 (file)
--- a/heat-model/src/test/java/com/woorea/openstack/heat/model/UpdateStackParamTest.java
+++ b/heat-model/src/test/java/com/woorea/openstack/heat/model/UpdateStackParamTest.java
@@ -20,12 +20,13 @@
 
 package com.woorea.openstack.heat.model;
 
-import com.woorea.openstack.heat.model.UpdateStackParam;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.Map;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -52,9 +53,10 @@ public class UpdateStackParamTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Access.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Access.java
index b55ef65..0ec9a1c 100644 (file)
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Access.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Access.java
@@ -20,9 +20,9 @@ import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("access")
 public class Access implements Serializable {

diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Authentication.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Authentication.java
index 1f1bf2f..6c6b536 100644 (file)
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Authentication.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Authentication.java
@@ -18,8 +18,6 @@ package com.woorea.openstack.keystone.model;
 
 import java.io.Serializable;
 
-import org.codehaus.jackson.map.annotate.JsonRootName;
-
 public abstract class Authentication implements Serializable {
 
     private String tenantId;

diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Endpoint.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Endpoint.java
index 019b3df..87c93ec 100644 (file)
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Endpoint.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Endpoint.java
@@ -18,8 +18,8 @@ package com.woorea.openstack.keystone.model;
 
 import java.io.Serializable;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("endpoint")
 public class Endpoint implements Serializable {

diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Endpoints.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Endpoints.java
index b4e4a16..68ed95c 100644 (file)
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Endpoints.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Endpoints.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Endpoints implements Iterable<Endpoint>, Serializable {
 

diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Error.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Error.java
index ba49b11..2da9408 100644 (file)
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Error.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Error.java
@@ -18,7 +18,7 @@ package com.woorea.openstack.keystone.model;
 
 import java.io.Serializable;
 
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("error")
 public class Error implements Serializable {

diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Role.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Role.java
index 7ae36de..8885d51 100644 (file)
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Role.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Role.java
@@ -18,7 +18,7 @@ package com.woorea.openstack.keystone.model;
 
 import java.io.Serializable;
 
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("role")
 public class Role implements Serializable {

diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Roles.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Roles.java
index 79fe04c..bc9e6a5 100644 (file)
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Roles.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Roles.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Roles implements Iterable<Role>, Serializable {
 

diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Service.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Service.java
index c5a1650..40cdfae 100644 (file)
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Service.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Service.java
@@ -18,7 +18,7 @@ package com.woorea.openstack.keystone.model;
 
 import java.io.Serializable;
 
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("OS-KSADM:service")
 public class Service implements Serializable {

diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Services.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Services.java
index 99be776..a0ba675 100644 (file)
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Services.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Services.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Services implements Iterable<Service>,  Serializable {
 

diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Tenant.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Tenant.java
index 840d507..a8a84fd 100644 (file)
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Tenant.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Tenant.java
@@ -18,8 +18,8 @@ package com.woorea.openstack.keystone.model;
 
 import java.io.Serializable;
 
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("tenant")
 @JsonIgnoreProperties(ignoreUnknown=true)

diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Tenants.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Tenants.java
index c7958f3..7ebb1f5 100644 (file)
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Tenants.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Tenants.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Tenants implements Iterable<Tenant>, Serializable {
 

diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/User.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/User.java
index 830d3fa..bd1652e 100644 (file)
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/User.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/User.java
@@ -22,8 +22,7 @@ package com.woorea.openstack.keystone.model;
 
 import java.io.Serializable;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("user")
 public class User implements Serializable {

diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Users.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Users.java
index b3013bf..4f511c1 100644 (file)
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Users.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Users.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Users implements Iterable<User>, Serializable {
 

diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/AccessKey.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/AccessKey.java
index bb308f0..99c776a 100644 (file)
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/AccessKey.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/AccessKey.java
@@ -16,8 +16,7 @@
 
 package com.woorea.openstack.keystone.model.authentication;
 
-import org.codehaus.jackson.map.annotate.JsonRootName;
-
+import com.fasterxml.jackson.annotation.JsonRootName;
 import com.woorea.openstack.keystone.model.Authentication;
 
 @JsonRootName("auth")

diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/TokenAuthentication.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/TokenAuthentication.java
index f47a94b..f730fc0 100644 (file)
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/TokenAuthentication.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/TokenAuthentication.java
@@ -16,8 +16,7 @@
 
 package com.woorea.openstack.keystone.model.authentication;
 
-import org.codehaus.jackson.map.annotate.JsonRootName;
-
+import com.fasterxml.jackson.annotation.JsonRootName;
 import com.woorea.openstack.keystone.model.Authentication;
 
 @JsonRootName("auth")

diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/UsernamePassword.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/UsernamePassword.java
index 5c94d31..1c07283 100644 (file)
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/UsernamePassword.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/UsernamePassword.java
@@ -16,8 +16,7 @@
 
 package com.woorea.openstack.keystone.model.authentication;
 
-import org.codehaus.jackson.map.annotate.JsonRootName;
-
+import com.fasterxml.jackson.annotation.JsonRootName;
 import com.woorea.openstack.keystone.model.Authentication;
 
 @JsonRootName("auth")

diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Authentication.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Authentication.java
index 2281d01..c92d1da 100644 (file)
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Authentication.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Authentication.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("auth")
 public class Authentication implements Serializable {

diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Credential.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Credential.java
index 7f36b15..26d0b89 100644 (file)
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Credential.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Credential.java
@@ -19,7 +19,7 @@ package com.woorea.openstack.keystone.v3.model;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("credential")
 public class Credential {

diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Credentials.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Credentials.java
index 4051fa0..b0e6944 100644 (file)
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Credentials.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Credentials.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Credentials implements Iterable<Credential>,  Serializable {
 

diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Domain.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Domain.java
index cfb5d07..6509f79 100644 (file)
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Domain.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Domain.java
@@ -16,7 +16,7 @@
 
 package com.woorea.openstack.keystone.v3.model;
 
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("domain")
 public class Domain {

diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Domains.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Domains.java
index 27765ef..32a5442 100644 (file)
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Domains.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Domains.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Domains implements Iterable<Domain>,  Serializable {
 

diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Endpoint.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Endpoint.java
index 5fa9afe..5a60998 100644 (file)
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Endpoint.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Endpoint.java
@@ -16,8 +16,8 @@
 
 package com.woorea.openstack.keystone.v3.model;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("endpoint")
 public class Endpoint {

diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Endpoints.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Endpoints.java
index ac5f9a5..b8711d6 100644 (file)
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Endpoints.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Endpoints.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Endpoints implements Iterable<Endpoint>,  Serializable {
 

diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Group.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Group.java
index ed7f3a0..7573119 100644 (file)
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Group.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Group.java
@@ -16,8 +16,8 @@
 
 package com.woorea.openstack.keystone.v3.model;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("group")
 public class Group {

diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Groups.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Groups.java
index ec9e558..2929030 100644 (file)
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Groups.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Groups.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Groups implements Iterable<Group>,  Serializable {
 

diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Policies.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Policies.java
index a82d1b6..1d51d64 100644 (file)
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Policies.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Policies.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Policies implements Iterable<Policy>,  Serializable {
 

diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Policy.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Policy.java
index 12c6f04..777ff67 100644 (file)
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Policy.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Policy.java
@@ -19,7 +19,7 @@ package com.woorea.openstack.keystone.v3.model;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("policy")
 public class Policy {

diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Project.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Project.java
index b0f6288..5345cb8 100644 (file)
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Project.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Project.java
@@ -16,8 +16,8 @@
 
 package com.woorea.openstack.keystone.v3.model;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("project")
 public class Project {

diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Projects.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Projects.java
index 984c4d2..bc11b9d 100644 (file)
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Projects.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Projects.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Projects implements Iterable<Project>,  Serializable {
 

diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Role.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Role.java
index 317ea35..4407bba 100644 (file)
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Role.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Role.java
@@ -18,7 +18,7 @@ package com.woorea.openstack.keystone.v3.model;
 
 import java.io.Serializable;
 
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("role")
 public class Role implements Serializable {

diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Roles.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Roles.java
index bee8b66..ed0d21f 100644 (file)
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Roles.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Roles.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Roles implements Iterable<Role>, Serializable {
 

diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Service.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Service.java
index ff01737..713a370 100644 (file)
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Service.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Service.java
@@ -16,7 +16,7 @@
 
 package com.woorea.openstack.keystone.v3.model;
 
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("service")
 public class Service {

diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Services.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Services.java
index 466817e..d9e23f1 100644 (file)
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Services.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Services.java
@@ -20,8 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.woorea.openstack.keystone.model.Service;
 
 public class Services implements Iterable<Service>,  Serializable {

diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Token.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Token.java
index 2078804..ce38ff0 100644 (file)
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Token.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Token.java
@@ -20,9 +20,9 @@ import java.io.Serializable;
 import java.util.Calendar;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("token")
 @JsonIgnoreProperties(ignoreUnknown=true)

diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/User.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/User.java
index 9675ce5..91a6230 100644 (file)
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/User.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/User.java
@@ -16,8 +16,8 @@
 
 package com.woorea.openstack.keystone.v3.model;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("user")
 public class User {

diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Users.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Users.java
index 208af1a..a371018 100644 (file)
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Users.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Users.java
@@ -20,8 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.woorea.openstack.keystone.model.User;
 
 public class Users implements Iterable<User>,  Serializable {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/AccessTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/AccessTest.java
index c6c3ec5..807c528 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/AccessTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/AccessTest.java
@@ -20,16 +20,16 @@
 
 package com.woorea.openstack.keystone.model;
 
-import com.woorea.openstack.keystone.model.Access;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.keystone.model.Access.Service;
 import com.woorea.openstack.keystone.model.Access.User;
-import com.woorea.openstack.keystone.model.Token;
+
 import java.util.List;
 import java.util.Map;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -128,11 +128,12 @@ public class AccessTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/EndpointTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/EndpointTest.java
index a379617..5d94b2b 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/EndpointTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/EndpointTest.java
@@ -20,11 +20,11 @@
 
 package com.woorea.openstack.keystone.model;
 
-import com.woorea.openstack.keystone.model.Endpoint;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -46,11 +46,12 @@ public class EndpointTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/EndpointsTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/EndpointsTest.java
index a566f0f..a20e058 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/EndpointsTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/EndpointsTest.java
@@ -20,13 +20,13 @@
 
 package com.woorea.openstack.keystone.model;
 
-import com.woorea.openstack.keystone.model.Endpoint;
-import com.woorea.openstack.keystone.model.Endpoints;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -55,9 +55,10 @@ public class EndpointsTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/ErrorTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/ErrorTest.java
index 357f9c6..c9903b9 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/ErrorTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/ErrorTest.java
@@ -20,11 +20,11 @@
 
 package com.woorea.openstack.keystone.model;
 
-import com.woorea.openstack.keystone.model.Error;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -43,11 +43,12 @@ public class ErrorTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/LinkTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/LinkTest.java
index a7a20b9..493abb4 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/LinkTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/LinkTest.java
@@ -20,11 +20,11 @@
 
 package com.woorea.openstack.keystone.model;
 
-import com.woorea.openstack.keystone.model.Link;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -41,9 +41,10 @@ public class LinkTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/RoleTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/RoleTest.java
index b93532c..739767b 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/RoleTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/RoleTest.java
@@ -20,11 +20,11 @@
 
 package com.woorea.openstack.keystone.model;
 
-import com.woorea.openstack.keystone.model.Role;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -44,11 +44,12 @@ public class RoleTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/RolesTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/RolesTest.java
index 98a7c79..86f64df 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/RolesTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/RolesTest.java
@@ -20,13 +20,13 @@
 
 package com.woorea.openstack.keystone.model;
 
-import com.woorea.openstack.keystone.model.Role;
-import com.woorea.openstack.keystone.model.Roles;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -51,9 +51,10 @@ public class RolesTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/ServiceTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/ServiceTest.java
index e6c8a28..fec059e 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/ServiceTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/ServiceTest.java
@@ -20,11 +20,11 @@
 
 package com.woorea.openstack.keystone.model;
 
-import com.woorea.openstack.keystone.model.Service;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -44,11 +44,12 @@ public class ServiceTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/ServicesTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/ServicesTest.java
index 28b7517..6c60bcc 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/ServicesTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/ServicesTest.java
@@ -20,13 +20,13 @@
 
 package com.woorea.openstack.keystone.model;
 
-import com.woorea.openstack.keystone.model.Service;
-import com.woorea.openstack.keystone.model.Services;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -51,9 +51,10 @@ public class ServicesTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/TenantTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/TenantTest.java
index 6ce4a11..6ddc765 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/TenantTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/TenantTest.java
@@ -20,11 +20,11 @@
 
 package com.woorea.openstack.keystone.model;
 
-import com.woorea.openstack.keystone.model.Tenant;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -44,11 +44,12 @@ public class TenantTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/TenantsTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/TenantsTest.java
index f3d10e3..e79394e 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/TenantsTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/TenantsTest.java
@@ -20,14 +20,13 @@
 
 package com.woorea.openstack.keystone.model;
 
-import com.woorea.openstack.keystone.model.Link;
-import com.woorea.openstack.keystone.model.Tenant;
-import com.woorea.openstack.keystone.model.Tenants;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -61,9 +60,10 @@ public class TenantsTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/TokenTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/TokenTest.java
index 65308b9..f91b97a 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/TokenTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/TokenTest.java
@@ -20,13 +20,13 @@
 
 package com.woorea.openstack.keystone.model;
 
-import com.woorea.openstack.keystone.model.Tenant;
-import com.woorea.openstack.keystone.model.Token;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.Calendar;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -49,9 +49,10 @@ public class TokenTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/UserTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/UserTest.java
index 5669dab..0b7b9c1 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/UserTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/UserTest.java
@@ -20,11 +20,11 @@
 
 package com.woorea.openstack.keystone.model;
 
-import com.woorea.openstack.keystone.model.User;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -47,11 +47,12 @@ public class UserTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/UsersTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/UsersTest.java
index acb96a3..eea318b 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/UsersTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/UsersTest.java
@@ -20,13 +20,13 @@
 
 package com.woorea.openstack.keystone.model;
 
-import com.woorea.openstack.keystone.model.User;
-import com.woorea.openstack.keystone.model.Users;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -57,9 +57,10 @@ public class UsersTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/AccessKeyTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/AccessKeyTest.java
index 413097f..ffaae7e 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/AccessKeyTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/AccessKeyTest.java
@@ -20,12 +20,12 @@
 
 package com.woorea.openstack.keystone.model.authentication;
 
-import com.woorea.openstack.keystone.model.authentication.AccessKey;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.keystone.model.authentication.AccessKey.ApiAccessKeyCredentials;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -47,11 +47,12 @@ public class AccessKeyTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/ApiAccessKeyCredentialsTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/ApiAccessKeyCredentialsTest.java
index ae63a61..4a0534c 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/ApiAccessKeyCredentialsTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/ApiAccessKeyCredentialsTest.java
@@ -20,11 +20,12 @@
 
 package com.woorea.openstack.keystone.model.authentication;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.keystone.model.authentication.AccessKey.ApiAccessKeyCredentials;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -40,9 +41,10 @@ public class ApiAccessKeyCredentialsTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/PasswordCredentialsTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/PasswordCredentialsTest.java
index 4c71e1c..02adcaa 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/PasswordCredentialsTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/PasswordCredentialsTest.java
@@ -20,11 +20,12 @@
 
 package com.woorea.openstack.keystone.model.authentication;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.keystone.model.authentication.UsernamePassword.PasswordCredentials;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -40,9 +41,10 @@ public class PasswordCredentialsTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/TokenTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/TokenTest.java
index 170f0b4..5fd13ef 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/TokenTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/TokenTest.java
@@ -20,11 +20,12 @@
 
 package com.woorea.openstack.keystone.model.authentication;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.keystone.model.authentication.TokenAuthentication.Token;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -39,9 +40,10 @@ public class TokenTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/UsernamePasswordTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/UsernamePasswordTest.java
index ee98274..60d5385 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/UsernamePasswordTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/UsernamePasswordTest.java
@@ -20,12 +20,12 @@
 
 package com.woorea.openstack.keystone.model.authentication;
 
-import com.woorea.openstack.keystone.model.authentication.UsernamePassword;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.keystone.model.authentication.UsernamePassword.PasswordCredentials;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -47,11 +47,12 @@ public class UsernamePasswordTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/AuthenticationTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/AuthenticationTest.java
index 31a1099..2779e1b 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/AuthenticationTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/AuthenticationTest.java
@@ -20,13 +20,13 @@
 
 package com.woorea.openstack.keystone.v3.model;
 
-import com.woorea.openstack.keystone.v3.model.Authentication;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.keystone.v3.model.Authentication.Identity;
 import com.woorea.openstack.keystone.v3.model.Authentication.Scope;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -69,11 +69,12 @@ public class AuthenticationTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/CredentialTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/CredentialTest.java
index b0c75b2..aaa2725 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/CredentialTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/CredentialTest.java
@@ -20,12 +20,13 @@
 
 package com.woorea.openstack.keystone.v3.model;
 
-import com.woorea.openstack.keystone.v3.model.Credential;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.Map;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -49,11 +50,12 @@ public class CredentialTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/CredentialsTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/CredentialsTest.java
index a158efb..a2e2e52 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/CredentialsTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/CredentialsTest.java
@@ -20,13 +20,13 @@
 
 package com.woorea.openstack.keystone.v3.model;
 
-import com.woorea.openstack.keystone.v3.model.Credential;
-import com.woorea.openstack.keystone.v3.model.Credentials;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -59,9 +59,10 @@ public class CredentialsTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/DomainTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/DomainTest.java
index f4e75c3..f2ea79a 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/DomainTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/DomainTest.java
@@ -20,11 +20,12 @@
 
 package com.woorea.openstack.keystone.v3.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.keystone.v3.model.Token.Domain;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -38,11 +39,12 @@ public class DomainTest {
         + "  \"id\" : \"id\"," + EOL
         + "  \"name\" : \"name\"" + EOL
         + "}";
-
+    
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/DomainsTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/DomainsTest.java
index ee694d5..e517ff7 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/DomainsTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/DomainsTest.java
@@ -20,13 +20,13 @@
 
 package com.woorea.openstack.keystone.v3.model;
 
-import com.woorea.openstack.keystone.v3.model.Domain;
-import com.woorea.openstack.keystone.v3.model.Domains;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -51,9 +51,10 @@ public class DomainsTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/EndpointTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/EndpointTest.java
index 75a4441..91807cf 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/EndpointTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/EndpointTest.java
@@ -20,11 +20,12 @@
 
 package com.woorea.openstack.keystone.v3.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.keystone.v3.model.Token.Service.Endpoint;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -44,9 +45,10 @@ public class EndpointTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/EndpointsTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/EndpointsTest.java
index 8002b1c..ef75d1b 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/EndpointsTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/EndpointsTest.java
@@ -20,13 +20,13 @@
 
 package com.woorea.openstack.keystone.v3.model;
 
-import com.woorea.openstack.keystone.v3.model.Endpoint;
-import com.woorea.openstack.keystone.v3.model.Endpoints;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -51,9 +51,10 @@ public class EndpointsTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/GroupTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/GroupTest.java
index 75fc901..f9ee0a4 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/GroupTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/GroupTest.java
@@ -20,11 +20,11 @@
 
 package com.woorea.openstack.keystone.v3.model;
 
-import com.woorea.openstack.keystone.v3.model.Group;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -44,11 +44,12 @@ public class GroupTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/GroupsTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/GroupsTest.java
index c16c25a..eea955d 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/GroupsTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/GroupsTest.java
@@ -20,13 +20,13 @@
 
 package com.woorea.openstack.keystone.v3.model;
 
-import com.woorea.openstack.keystone.v3.model.Group;
-import com.woorea.openstack.keystone.v3.model.Groups;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -51,9 +51,10 @@ public class GroupsTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/IdentityTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/IdentityTest.java
index ba55e8b..799708f 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/IdentityTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/IdentityTest.java
@@ -20,14 +20,16 @@
 
 package com.woorea.openstack.keystone.v3.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.keystone.v3.model.Authentication.Identity;
 import com.woorea.openstack.keystone.v3.model.Authentication.Identity.Password;
 import com.woorea.openstack.keystone.v3.model.Authentication.Identity.Token;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -56,9 +58,10 @@ public class IdentityTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/PasswordTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/PasswordTest.java
index d1230e2..4b2cd04 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/PasswordTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/PasswordTest.java
@@ -20,12 +20,13 @@
 
 package com.woorea.openstack.keystone.v3.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.keystone.v3.model.Authentication.Identity.Password;
 import com.woorea.openstack.keystone.v3.model.Authentication.Identity.Password.User;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -48,9 +49,10 @@ public class PasswordTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/PoliciesTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/PoliciesTest.java
index a3e8a8a..3a8dc83 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/PoliciesTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/PoliciesTest.java
@@ -20,13 +20,13 @@
 
 package com.woorea.openstack.keystone.v3.model;
 
-import com.woorea.openstack.keystone.v3.model.Policies;
-import com.woorea.openstack.keystone.v3.model.Policy;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -59,9 +59,10 @@ public class PoliciesTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/PolicyTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/PolicyTest.java
index 2aae601..c4f7a73 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/PolicyTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/PolicyTest.java
@@ -20,12 +20,13 @@
 
 package com.woorea.openstack.keystone.v3.model;
 
-import com.woorea.openstack.keystone.v3.model.Policy;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.Map;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -49,11 +50,12 @@ public class PolicyTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/ProjectTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/ProjectTest.java
index 80b4122..5526ad1 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/ProjectTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/ProjectTest.java
@@ -20,12 +20,13 @@
 
 package com.woorea.openstack.keystone.v3.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.keystone.v3.model.Token.Domain;
 import com.woorea.openstack.keystone.v3.model.Token.Project;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -45,9 +46,10 @@ public class ProjectTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/ProjectsTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/ProjectsTest.java
index 6ab1c88..3582a4a 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/ProjectsTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/ProjectsTest.java
@@ -20,13 +20,13 @@
 
 package com.woorea.openstack.keystone.v3.model;
 
-import com.woorea.openstack.keystone.v3.model.Project;
-import com.woorea.openstack.keystone.v3.model.Projects;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -51,9 +51,10 @@ public class ProjectsTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/RoleTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/RoleTest.java
index 189205e..ad39df2 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/RoleTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/RoleTest.java
@@ -20,26 +20,25 @@
 
 package com.woorea.openstack.keystone.v3.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.keystone.v3.model.Token.Role;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
-import org.junit.Assert;
+
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.skyscreamer.jsonassert.JSONCompareMode;
 
 public class RoleTest {
 
-    private static final String EOL = System.lineSeparator();
-
     private static final String JSON_FULL = "{ }";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/RolesTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/RolesTest.java
index 6ee1b2c..cd8fbde 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/RolesTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/RolesTest.java
@@ -20,13 +20,13 @@
 
 package com.woorea.openstack.keystone.v3.model;
 
-import com.woorea.openstack.keystone.v3.model.Role;
-import com.woorea.openstack.keystone.v3.model.Roles;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -51,9 +51,10 @@ public class RolesTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/ScopeTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/ScopeTest.java
index 3f3708b..6beedb5 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/ScopeTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/ScopeTest.java
@@ -20,12 +20,13 @@
 
 package com.woorea.openstack.keystone.v3.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.keystone.v3.model.Authentication.Scope;
 import com.woorea.openstack.keystone.v3.model.Authentication.Scope.Project;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -47,9 +48,10 @@ public class ScopeTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/ServiceTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/ServiceTest.java
index 31430de..5edf7d6 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/ServiceTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/ServiceTest.java
@@ -20,13 +20,15 @@
 
 package com.woorea.openstack.keystone.v3.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.keystone.v3.model.Token.Service;
 import com.woorea.openstack.keystone.v3.model.Token.Service.Endpoint;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -57,9 +59,10 @@ public class ServiceTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/ServicesTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/ServicesTest.java
index 28246c6..0a88d6a 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/ServicesTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/ServicesTest.java
@@ -20,13 +20,14 @@
 
 package com.woorea.openstack.keystone.v3.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.keystone.model.Service;
-import com.woorea.openstack.keystone.v3.model.Services;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -51,9 +52,10 @@ public class ServicesTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/TokenTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/TokenTest.java
index aabcfb7..4852e61 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/TokenTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/TokenTest.java
@@ -20,18 +20,19 @@
 
 package com.woorea.openstack.keystone.v3.model;
 
-import com.woorea.openstack.keystone.v3.model.Token;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.keystone.v3.model.Token.Domain;
 import com.woorea.openstack.keystone.v3.model.Token.Project;
 import com.woorea.openstack.keystone.v3.model.Token.Role;
 import com.woorea.openstack.keystone.v3.model.Token.Service;
 import com.woorea.openstack.keystone.v3.model.Token.User;
+
 import java.util.Calendar;
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -105,11 +106,12 @@ public class TokenTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/UserTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/UserTest.java
index 061b0bc..dc144ed 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/UserTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/UserTest.java
@@ -20,11 +20,11 @@
 
 package com.woorea.openstack.keystone.v3.model;
 
-import com.woorea.openstack.keystone.v3.model.User;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -48,11 +48,12 @@ public class UserTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/UsersTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/UsersTest.java
index 35554bd..ab6c557 100644 (file)
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/UsersTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/UsersTest.java
@@ -20,13 +20,14 @@
 
 package com.woorea.openstack.keystone.v3.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.keystone.model.User;
-import com.woorea.openstack.keystone.v3.model.Users;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -57,9 +58,10 @@ public class UsersTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Certificate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Certificate.java
index 31811f5..5ff1a2b 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Certificate.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Certificate.java
@@ -16,8 +16,8 @@
 
 package com.woorea.openstack.nova.model;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("certificate")
 public class Certificate {

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Cloudpipe.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Cloudpipe.java
index dc0f21d..205816f 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Cloudpipe.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Cloudpipe.java
@@ -19,7 +19,7 @@ package com.woorea.openstack.nova.model;
 import java.io.Serializable;
 import java.util.Calendar;
 
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("cloudpipe")
 public class Cloudpipe implements Serializable {

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Cloudpipes.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Cloudpipes.java
index a9920d6..09e02e0 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Cloudpipes.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Cloudpipes.java
@@ -19,7 +19,7 @@ package com.woorea.openstack.nova.model;
 import java.io.Serializable;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Cloudpipes implements Serializable {
 

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Extension.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Extension.java
index bdf37c2..89b1121 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Extension.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Extension.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Calendar;
 import java.util.List;
 
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("extension")
 public class Extension implements Serializable {

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Extensions.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Extensions.java
index 0ecb493..ce13b14 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Extensions.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Extensions.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Extensions implements Iterable<Extension>, Serializable {
 

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Flavor.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Flavor.java
index 817c50f..00740f4 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Flavor.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Flavor.java
@@ -19,8 +19,8 @@ package com.woorea.openstack.nova.model;
 import java.io.Serializable;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("flavor")
 public class Flavor implements Serializable {

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/FlavorForCreate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/FlavorForCreate.java
index 481e3bf..5677cb3 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/FlavorForCreate.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/FlavorForCreate.java
@@ -19,8 +19,8 @@ package com.woorea.openstack.nova.model;
 import java.io.Serializable;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("flavor")
 public class FlavorForCreate implements Serializable {

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Flavors.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Flavors.java
index 0bc4ae8..95decf4 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Flavors.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Flavors.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Flavors implements Iterable<Flavor>, Serializable {
 

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIp.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIp.java
index b38e78e..990b980 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIp.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIp.java
@@ -18,8 +18,8 @@ package com.woorea.openstack.nova.model;
 
 import java.io.Serializable;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("floating_ip")
 public class FloatingIp implements Serializable {

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpDomain.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpDomain.java
index 2a5eb75..5f134c2 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpDomain.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpDomain.java
@@ -18,8 +18,8 @@ package com.woorea.openstack.nova.model;
 
 import java.io.Serializable;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("floating-ip-pool")
 public class FloatingIpDomain implements Serializable {

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpDomains.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpDomains.java
index bf849f3..45c7f6e 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpDomains.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpDomains.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class FloatingIpDomains implements Iterable<FloatingIpDomain>, Serializable {
 

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpPools.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpPools.java
index b3196b6..451bd03 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpPools.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpPools.java
@@ -20,8 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.woorea.openstack.nova.model.FloatingIpPools.FloatingIpPool;
 
 public class FloatingIpPools implements Iterable<FloatingIpPool>, Serializable {

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIps.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIps.java
index 5c05794..58eb173 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIps.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIps.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class FloatingIps implements Iterable<FloatingIp>, Serializable {
 

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Host.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Host.java
index f193e2d..c41eb65 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Host.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Host.java
@@ -19,7 +19,7 @@ package com.woorea.openstack.nova.model;
 import java.io.Serializable;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Host implements Serializable {
     

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/HostAggregate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/HostAggregate.java
index 4ba26e7..d08c7f0 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/HostAggregate.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/HostAggregate.java
@@ -20,8 +20,8 @@ import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("aggregate")
 public class HostAggregate implements Serializable {

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/HostAggregates.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/HostAggregates.java
index 56da094..fd83d16 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/HostAggregates.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/HostAggregates.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class HostAggregates implements Iterable<HostAggregate>, Serializable {
 

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Hosts.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Hosts.java
index b97a7ae..1cdf0ae 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Hosts.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Hosts.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Hosts implements Iterable<Hosts.Host>, Serializable {
     

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Image.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Image.java
index 2a03f6f..e29f961 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Image.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Image.java
@@ -21,8 +21,8 @@ import java.util.Calendar;
 import java.util.List;
 import java.util.Map;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("image")
 public class Image implements Serializable {

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/ImageFromVolume.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/ImageFromVolume.java
index 1e34a43..9191fa3 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/ImageFromVolume.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/ImageFromVolume.java
@@ -18,8 +18,8 @@ package com.woorea.openstack.nova.model;
 
 import java.io.Serializable;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("os-volume_upload_image")
 public class ImageFromVolume implements Serializable {

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Images.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Images.java
index e19892d..2d2ec5d 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Images.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Images.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Images implements Iterable<Image>, Serializable {
 

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/KeyPair.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/KeyPair.java
index b7bd148..fb1a1e1 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/KeyPair.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/KeyPair.java
@@ -18,8 +18,8 @@ package com.woorea.openstack.nova.model;
 
 import java.io.Serializable;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("keypair")
 public class KeyPair implements Serializable {

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/KeyPairs.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/KeyPairs.java
index b36a91e..2095a73 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/KeyPairs.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/KeyPairs.java
@@ -21,7 +21,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class KeyPairs implements Iterable<KeyPair>, Serializable {
     

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Limits.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Limits.java
index d9a949e..fd1d113 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Limits.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Limits.java
@@ -20,8 +20,8 @@ import java.io.Serializable;
 import java.util.Calendar;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("limits")
 public class Limits implements Serializable {

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Network.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Network.java
index 2b8ac85..67bfba6 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Network.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Network.java
@@ -18,8 +18,8 @@ package com.woorea.openstack.nova.model;
 
 import java.io.Serializable;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("network")
 public class Network implements Serializable {

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/NetworkForCreate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/NetworkForCreate.java
index ea9f23e..0524006 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/NetworkForCreate.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/NetworkForCreate.java
@@ -16,8 +16,7 @@
 
 package com.woorea.openstack.nova.model;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class NetworkForCreate {
 

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Networks.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Networks.java
index 7dac2c6..3f86d4f 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Networks.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Networks.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Networks implements Iterable<Network>, Serializable {
 

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/QuotaSet.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/QuotaSet.java
index 52bc930..d03bea0 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/QuotaSet.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/QuotaSet.java
@@ -16,8 +16,8 @@
 
 package com.woorea.openstack.nova.model;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("quota_set")
 public class QuotaSet {
@@ -169,4 +169,4 @@ public class QuotaSet {
     public void setInjectedFilePathBytes(Integer injectedFilePathBytes) {
         this.injectedFilePathBytes = injectedFilePathBytes;
     }
-}
\ No newline at end of file
+}

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroup.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroup.java
index a57fd69..de1ac85 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroup.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroup.java
@@ -19,8 +19,8 @@ package com.woorea.openstack.nova.model;
 import java.io.Serializable;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("security_group")
 public class SecurityGroup implements Serializable {

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupForCreate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupForCreate.java
index 2a40173..ca4ebbe 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupForCreate.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupForCreate.java
@@ -18,7 +18,7 @@ package com.woorea.openstack.nova.model;
 
 import java.io.Serializable;
 
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("security_group")
 public class SecurityGroupForCreate implements Serializable {

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupRuleForCreate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupRuleForCreate.java
index 8911156..6ddba5f 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupRuleForCreate.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupRuleForCreate.java
@@ -20,9 +20,9 @@ import java.io.Serializable;
 
 import javax.xml.bind.annotation.XmlElement;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("security_group_rule")
 public class SecurityGroupRuleForCreate implements Serializable {

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroups.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroups.java
index 4d3ebbb..705432b 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroups.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroups.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class SecurityGroups implements Iterable<SecurityGroup>, Serializable {
 

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Server.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Server.java
index 63acbc2..4dd6dfa 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Server.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Server.java
@@ -22,10 +22,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("server")
 public class Server implements Serializable {

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/ServerAction.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/ServerAction.java
index c0289be..76acc20 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/ServerAction.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/ServerAction.java
@@ -22,8 +22,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 public interface ServerAction extends Serializable {
     

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/ServerForCreate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/ServerForCreate.java
index 4858e01..f5fe889 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/ServerForCreate.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/ServerForCreate.java
@@ -22,8 +22,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("server")
 public class ServerForCreate implements Serializable {

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Servers.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Servers.java
index 92643b9..772c1fb 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Servers.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Servers.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Servers implements Iterable<Server>, Serializable {
 

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/SimpleTenantUsage.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/SimpleTenantUsage.java
index ea6f77e..bed84dc 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/SimpleTenantUsage.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/SimpleTenantUsage.java
@@ -20,8 +20,8 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("tenant_usage")
 public class SimpleTenantUsage implements Serializable {

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/SimpleTenantUsages.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/SimpleTenantUsages.java
index 313e5eb..20db05e 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/SimpleTenantUsages.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/SimpleTenantUsages.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class SimpleTenantUsages implements Iterable<SimpleTenantUsage>, Serializable {
 

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Snapshot.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Snapshot.java
index c51ab62..9216854 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Snapshot.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Snapshot.java
@@ -18,8 +18,8 @@ package com.woorea.openstack.nova.model;
 
 import java.io.Serializable;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("snapshot")
 public class Snapshot implements Serializable {

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/SnapshotForCreate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/SnapshotForCreate.java
index 752eb59..5fcd76e 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/SnapshotForCreate.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/SnapshotForCreate.java
@@ -18,8 +18,8 @@ package com.woorea.openstack.nova.model;
 
 import java.io.Serializable;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("snapshot")
 public class SnapshotForCreate implements Serializable {

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Snapshots.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Snapshots.java
index 238a173..060ca48 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Snapshots.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Snapshots.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Snapshots implements Iterable<Snapshot>, Serializable {
 

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Volume.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Volume.java
index 453bf24..841d5b5 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Volume.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Volume.java
@@ -20,8 +20,8 @@ import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("volume")
 public class Volume implements Serializable {

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeAttachment.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeAttachment.java
index 3a62cca..76b0d31 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeAttachment.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeAttachment.java
@@ -18,7 +18,7 @@ package com.woorea.openstack.nova.model;
 
 import java.io.Serializable;
 
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("volumeAttachment")
 public class VolumeAttachment implements Serializable {

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeAttachments.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeAttachments.java
index 2a5ecba..7c8355c 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeAttachments.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeAttachments.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class VolumeAttachments implements Iterable<VolumeAttachment>, Serializable {
 

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeForCreate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeForCreate.java
index c06d692..49feab7 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeForCreate.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeForCreate.java
@@ -19,8 +19,8 @@ package com.woorea.openstack.nova.model;
 import java.io.Serializable;
 import java.util.Map;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("volume")
 public class VolumeForCreate implements Serializable {

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeForImageCreate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeForImageCreate.java
index f368f5c..95abf39 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeForImageCreate.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeForImageCreate.java
@@ -18,8 +18,8 @@ package com.woorea.openstack.nova.model;
 
 import java.io.Serializable;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("os-volume_upload_image")
 public class VolumeForImageCreate implements Serializable {

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeType.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeType.java
index 59717d4..28390d3 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeType.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeType.java
@@ -18,7 +18,7 @@ package com.woorea.openstack.nova.model;
 
 import java.io.Serializable;
 
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("volume-type")
 public class VolumeType implements Serializable {

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeTypes.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeTypes.java
index 96fc6c5..351a92a 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeTypes.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeTypes.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class VolumeTypes implements Iterable<VolumeType>, Serializable {
 

diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Volumes.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Volumes.java
index 1dc5bde..4266e63 100644 (file)
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Volumes.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Volumes.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Volumes implements Iterable<Volume>, Serializable {
 

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/AbsoluteLimitTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/AbsoluteLimitTest.java
index 2fabb2b..d24531b 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/AbsoluteLimitTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/AbsoluteLimitTest.java
@@ -20,11 +20,12 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.Limits.AbsoluteLimit;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -64,9 +65,10 @@ public class AbsoluteLimitTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/AddressTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/AddressTest.java
index 45e1f1d..3d34523 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/AddressTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/AddressTest.java
@@ -20,11 +20,12 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.Server.Addresses.Address;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -42,9 +43,10 @@ public class AddressTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/AddressesTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/AddressesTest.java
index 8449f83..132537d 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/AddressesTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/AddressesTest.java
@@ -20,14 +20,16 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.Server.Addresses;
 import com.woorea.openstack.nova.model.Server.Addresses.Address;
+
 import java.util.List;
 import java.util.Map;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -65,9 +67,10 @@ public class AddressesTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/AssociateFloatingIpTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/AssociateFloatingIpTest.java
index a242728..b93912b 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/AssociateFloatingIpTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/AssociateFloatingIpTest.java
@@ -20,11 +20,12 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.ServerAction.AssociateFloatingIp;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -41,11 +42,12 @@ public class AssociateFloatingIpTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/CertificateTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/CertificateTest.java
index 24ca40c..bb5dd4d 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/CertificateTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/CertificateTest.java
@@ -20,11 +20,11 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.Certificate;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -42,11 +42,12 @@ public class CertificateTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/ChangePasswordTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/ChangePasswordTest.java
index 35a3c8d..a52c99e 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/ChangePasswordTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/ChangePasswordTest.java
@@ -20,11 +20,12 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.ServerAction.ChangePassword;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -41,11 +42,12 @@ public class ChangePasswordTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/CloudpipeTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/CloudpipeTest.java
index b59703c..7552f13 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/CloudpipeTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/CloudpipeTest.java
@@ -20,12 +20,13 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.Cloudpipe;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.Calendar;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -48,11 +49,12 @@ public class CloudpipeTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/CloudpipesTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/CloudpipesTest.java
index b7e0b01..491b005 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/CloudpipesTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/CloudpipesTest.java
@@ -20,13 +20,13 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.Cloudpipe;
-import com.woorea.openstack.nova.model.Cloudpipes;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -57,9 +57,10 @@ public class CloudpipesTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/ConfirmResizeTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/ConfirmResizeTest.java
index c5710a9..f311074 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/ConfirmResizeTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/ConfirmResizeTest.java
@@ -20,12 +20,12 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.ServerAction.ConfirmResize;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
-import org.junit.Assert;
+
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.skyscreamer.jsonassert.JSONCompareMode;
@@ -39,11 +39,12 @@ public class ConfirmResizeTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/ConsoleOutputTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/ConsoleOutputTest.java
index 85385d8..240e11e 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/ConsoleOutputTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/ConsoleOutputTest.java
@@ -20,11 +20,12 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.ServerAction.ConsoleOutput;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -39,9 +40,10 @@ public class ConsoleOutputTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/CreateBackupTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/CreateBackupTest.java
index 84b0622..271cc69 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/CreateBackupTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/CreateBackupTest.java
@@ -20,12 +20,14 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.ServerAction.CreateBackup;
+
 import java.util.Map;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -48,11 +50,12 @@ public class CreateBackupTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/CreateImageTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/CreateImageTest.java
index cd0603d..2c33b27 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/CreateImageTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/CreateImageTest.java
@@ -20,12 +20,14 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.ServerAction.CreateImage;
+
 import java.util.Map;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -46,11 +48,12 @@ public class CreateImageTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/DisassociateFloatingIpTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/DisassociateFloatingIpTest.java
index c58daa1..502e943 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/DisassociateFloatingIpTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/DisassociateFloatingIpTest.java
@@ -20,11 +20,12 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.ServerAction.DisassociateFloatingIp;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -41,11 +42,12 @@ public class DisassociateFloatingIpTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/ExtensionTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/ExtensionTest.java
index 2047d22..514ea22 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/ExtensionTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/ExtensionTest.java
@@ -20,14 +20,14 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.Extension;
-import com.woorea.openstack.nova.model.Link;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.Calendar;
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -57,11 +57,12 @@ public class ExtensionTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/ExtensionsTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/ExtensionsTest.java
index 56bdf9c..6fe182d 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/ExtensionsTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/ExtensionsTest.java
@@ -20,13 +20,13 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.Extension;
-import com.woorea.openstack.nova.model.Extensions;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -71,9 +71,10 @@ public class ExtensionsTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/FaultTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/FaultTest.java
index d4d58fb..a426d8a 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/FaultTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/FaultTest.java
@@ -20,12 +20,14 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.Server.Fault;
+
 import java.util.Calendar;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -43,9 +45,10 @@ public class FaultTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/FlavorForCreateTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/FlavorForCreateTest.java
index 578f55a..2d6e1a7 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/FlavorForCreateTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/FlavorForCreateTest.java
@@ -20,11 +20,11 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.FlavorForCreate;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -48,11 +48,12 @@ public class FlavorForCreateTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/FlavorTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/FlavorTest.java
index d3a369f..63fa405 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/FlavorTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/FlavorTest.java
@@ -20,13 +20,13 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.Flavor;
-import com.woorea.openstack.nova.model.Link;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -64,11 +64,12 @@ public class FlavorTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/FlavorsTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/FlavorsTest.java
index 326b11e..5316006 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/FlavorsTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/FlavorsTest.java
@@ -20,13 +20,13 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.Flavor;
-import com.woorea.openstack.nova.model.Flavors;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -87,9 +87,10 @@ public class FlavorsTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/FloatingIpDomainTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/FloatingIpDomainTest.java
index 02fd66c..dac8a45 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/FloatingIpDomainTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/FloatingIpDomainTest.java
@@ -20,11 +20,11 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.FloatingIpDomain;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -44,11 +44,12 @@ public class FloatingIpDomainTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/FloatingIpDomainsTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/FloatingIpDomainsTest.java
index 6cc5108..6cfe54f 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/FloatingIpDomainsTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/FloatingIpDomainsTest.java
@@ -20,13 +20,13 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.FloatingIpDomain;
-import com.woorea.openstack.nova.model.FloatingIpDomains;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -51,9 +51,10 @@ public class FloatingIpDomainsTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/FloatingIpPoolTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/FloatingIpPoolTest.java
index d8dd6c2..7048b63 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/FloatingIpPoolTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/FloatingIpPoolTest.java
@@ -20,11 +20,12 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.FloatingIpPools.FloatingIpPool;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -39,9 +40,10 @@ public class FloatingIpPoolTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/FloatingIpPoolsTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/FloatingIpPoolsTest.java
index d4dcfd6..7f5c1c1 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/FloatingIpPoolsTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/FloatingIpPoolsTest.java
@@ -20,13 +20,14 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.FloatingIpPools;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.FloatingIpPools.FloatingIpPool;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -45,9 +46,10 @@ public class FloatingIpPoolsTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/FloatingIpTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/FloatingIpTest.java
index f184e83..00d382c 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/FloatingIpTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/FloatingIpTest.java
@@ -20,11 +20,11 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.FloatingIp;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -45,11 +45,12 @@ public class FloatingIpTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/FloatingIpsTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/FloatingIpsTest.java
index 9cfd3ec..4b279df 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/FloatingIpsTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/FloatingIpsTest.java
@@ -20,13 +20,13 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.FloatingIp;
-import com.woorea.openstack.nova.model.FloatingIps;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -53,9 +53,10 @@ public class FloatingIpsTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/ForceDeleteTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/ForceDeleteTest.java
index 87a904c..bf26778 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/ForceDeleteTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/ForceDeleteTest.java
@@ -20,12 +20,12 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.ServerAction.ForceDelete;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
-import org.junit.Assert;
+
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.skyscreamer.jsonassert.JSONCompareMode;
@@ -39,11 +39,12 @@ public class ForceDeleteTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/GetConsoleOutputTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/GetConsoleOutputTest.java
index 6293712..8f2ea1e 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/GetConsoleOutputTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/GetConsoleOutputTest.java
@@ -20,11 +20,12 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.ServerAction.GetConsoleOutput;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -41,11 +42,12 @@ public class GetConsoleOutputTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/GetVncConsoleTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/GetVncConsoleTest.java
index 0de38d7..d7ed6c9 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/GetVncConsoleTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/GetVncConsoleTest.java
@@ -20,11 +20,12 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.ServerAction.GetVncConsole;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -41,11 +42,12 @@ public class GetVncConsoleTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/GroupTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/GroupTest.java
index 3cb1144..561ea9a 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/GroupTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/GroupTest.java
@@ -20,11 +20,12 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.SecurityGroup.Rule.Group;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -40,9 +41,10 @@ public class GroupTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/HostAggregateTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/HostAggregateTest.java
index f694e44..5631245 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/HostAggregateTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/HostAggregateTest.java
@@ -20,13 +20,14 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.HostAggregate;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
 import java.util.Map;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -54,11 +55,12 @@ public class HostAggregateTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/HostAggregatesTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/HostAggregatesTest.java
index 8e97938..6fba9c2 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/HostAggregatesTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/HostAggregatesTest.java
@@ -20,13 +20,13 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.HostAggregate;
-import com.woorea.openstack.nova.model.HostAggregates;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -67,9 +67,10 @@ public class HostAggregatesTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/HostTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/HostTest.java
index 424a265..99d747c 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/HostTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/HostTest.java
@@ -20,11 +20,12 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.Hosts.Host;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -41,9 +42,10 @@ public class HostTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/HostsTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/HostsTest.java
index ae0c6d8..ad60a69 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/HostsTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/HostsTest.java
@@ -20,13 +20,14 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.Hosts;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.Hosts.Host;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -49,9 +50,10 @@ public class HostsTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/ImageFromVolumeTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/ImageFromVolumeTest.java
index 2c4b6c4..4983a55 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/ImageFromVolumeTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/ImageFromVolumeTest.java
@@ -20,11 +20,11 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.ImageFromVolume;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -50,11 +50,12 @@ public class ImageFromVolumeTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/ImageTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/ImageTest.java
index 4fa6869..4fce1d4 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/ImageTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/ImageTest.java
@@ -20,16 +20,16 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.Image;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.Image.Server;
-import com.woorea.openstack.nova.model.Link;
+
 import java.util.Calendar;
 import java.util.List;
 import java.util.Map;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -79,11 +79,12 @@ public class ImageTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/ImagesTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/ImagesTest.java
index bd92fb2..2b52804 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/ImagesTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/ImagesTest.java
@@ -20,13 +20,13 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.Image;
-import com.woorea.openstack.nova.model.Images;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -111,9 +111,10 @@ public class ImagesTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/IpRangeTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/IpRangeTest.java
index 2db77e5..0505671 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/IpRangeTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/IpRangeTest.java
@@ -20,11 +20,12 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.SecurityGroup.Rule.IpRange;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -39,9 +40,10 @@ public class IpRangeTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/KeyPairTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/KeyPairTest.java
index 39a159e..c7f564c 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/KeyPairTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/KeyPairTest.java
@@ -20,11 +20,11 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.KeyPair;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -45,11 +45,12 @@ public class KeyPairTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/KeyPairWrapperTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/KeyPairWrapperTest.java
index b71cc09..3ba27d0 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/KeyPairWrapperTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/KeyPairWrapperTest.java
@@ -20,13 +20,12 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.KeyPair;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.KeyPairs.KeyPairWrapper;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
-import org.junit.Assert;
+
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.skyscreamer.jsonassert.JSONCompareMode;
@@ -46,9 +45,10 @@ public class KeyPairWrapperTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/KeyPairsTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/KeyPairsTest.java
index 4eb25a8..fe6d090 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/KeyPairsTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/KeyPairsTest.java
@@ -20,12 +20,13 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.KeyPairs;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -57,9 +58,10 @@ public class KeyPairsTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     // This is test is ignored because The KeyPairs class does not
     // serialize into JSON correctly.  It is probably not an operational

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/LimitEntryTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/LimitEntryTest.java
index 2396827..25f6ab9 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/LimitEntryTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/LimitEntryTest.java
@@ -20,12 +20,14 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.Limits.RateLimit.LimitEntry;
+
 import java.util.Calendar;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -45,9 +47,10 @@ public class LimitEntryTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/LimitsTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/LimitsTest.java
index 2977a3a..ec450d3 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/LimitsTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/LimitsTest.java
@@ -20,14 +20,15 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.Limits;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.Limits.AbsoluteLimit;
 import com.woorea.openstack.nova.model.Limits.RateLimit;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -108,11 +109,12 @@ public class LimitsTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/LinkTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/LinkTest.java
index 81b91a8..c2fae01 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/LinkTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/LinkTest.java
@@ -20,11 +20,11 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.Link;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -41,9 +41,10 @@ public class LinkTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/LockTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/LockTest.java
index aca120e..1c017de 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/LockTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/LockTest.java
@@ -20,12 +20,12 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.ServerAction.Lock;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
-import org.junit.Assert;
+
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.skyscreamer.jsonassert.JSONCompareMode;
@@ -39,11 +39,12 @@ public class LockTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/NetworkForCreateTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/NetworkForCreateTest.java
index e5b379b..aae0c7f 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/NetworkForCreateTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/NetworkForCreateTest.java
@@ -20,11 +20,11 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.NetworkForCreate;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -40,9 +40,10 @@ public class NetworkForCreateTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/NetworkTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/NetworkTest.java
index ef4a683..73b871d 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/NetworkTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/NetworkTest.java
@@ -20,11 +20,11 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.Network;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -68,11 +68,12 @@ public class NetworkTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/NetworksTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/NetworksTest.java
index 9268445..3e4272c 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/NetworksTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/NetworksTest.java
@@ -20,13 +20,13 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.Network;
-import com.woorea.openstack.nova.model.Networks;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -99,9 +99,10 @@ public class NetworksTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/PauseTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/PauseTest.java
index a5ec89d..c14cc40 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/PauseTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/PauseTest.java
@@ -20,12 +20,12 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.ServerAction.Pause;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
-import org.junit.Assert;
+
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.skyscreamer.jsonassert.JSONCompareMode;
@@ -39,11 +39,12 @@ public class PauseTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/PersonalityFileTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/PersonalityFileTest.java
index 81cc6ac..6e113cb 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/PersonalityFileTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/PersonalityFileTest.java
@@ -20,11 +20,11 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.PersonalityFile;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -40,9 +40,10 @@ public class PersonalityFileTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/QuotaSetTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/QuotaSetTest.java
index 0a424ed..c26a3a1 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/QuotaSetTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/QuotaSetTest.java
@@ -20,11 +20,11 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.QuotaSet;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -54,11 +54,12 @@ public class QuotaSetTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/RateLimitTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/RateLimitTest.java
index 24553a5..ef2e98a 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/RateLimitTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/RateLimitTest.java
@@ -20,13 +20,15 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.Limits.RateLimit;
 import com.woorea.openstack.nova.model.Limits.RateLimit.LimitEntry;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -57,9 +59,10 @@ public class RateLimitTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/RebootTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/RebootTest.java
index 1a9ea77..494b088 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/RebootTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/RebootTest.java
@@ -20,11 +20,12 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.ServerAction.Reboot;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -41,11 +42,12 @@ public class RebootTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/RebuildTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/RebuildTest.java
index 1fb9e86..b3fb845 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/RebuildTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/RebuildTest.java
@@ -20,14 +20,15 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.PersonalityFile;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.ServerAction.Rebuild;
+
 import java.util.List;
 import java.util.Map;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -60,11 +61,12 @@ public class RebuildTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/RescueResponseTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/RescueResponseTest.java
index 519e2a3..3cbee04 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/RescueResponseTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/RescueResponseTest.java
@@ -20,11 +20,12 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.ServerAction.RescueResponse;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -39,9 +40,10 @@ public class RescueResponseTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/RescueTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/RescueTest.java
index ea14bd2..6c68207 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/RescueTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/RescueTest.java
@@ -20,11 +20,12 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.ServerAction.Rescue;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -41,11 +42,12 @@ public class RescueTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/ResizeTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/ResizeTest.java
index 05aafd1..520b9fb 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/ResizeTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/ResizeTest.java
@@ -20,11 +20,12 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.ServerAction.Resize;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -42,11 +43,12 @@ public class ResizeTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/ResourceTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/ResourceTest.java
index b075071..e48cb62 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/ResourceTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/ResourceTest.java
@@ -20,11 +20,12 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.Host.ResourceWrapper.Resource;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -43,9 +44,10 @@ public class ResourceTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/ResourceWrapperTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/ResourceWrapperTest.java
index b9ab596..3616551 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/ResourceWrapperTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/ResourceWrapperTest.java
@@ -20,12 +20,13 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.Host.ResourceWrapper;
 import com.woorea.openstack.nova.model.Host.ResourceWrapper.Resource;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -46,9 +47,10 @@ public class ResourceWrapperTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/RestoreTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/RestoreTest.java
index 1b78aac..c601a3f 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/RestoreTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/RestoreTest.java
@@ -20,12 +20,12 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.ServerAction.Restore;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
-import org.junit.Assert;
+
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.skyscreamer.jsonassert.JSONCompareMode;
@@ -39,11 +39,12 @@ public class RestoreTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/ResumeTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/ResumeTest.java
index e8b1ff3..db84968 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/ResumeTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/ResumeTest.java
@@ -20,12 +20,12 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.ServerAction.Resume;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
-import org.junit.Assert;
+
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.skyscreamer.jsonassert.JSONCompareMode;
@@ -39,11 +39,12 @@ public class ResumeTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/RevertResizeTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/RevertResizeTest.java
index b3d6d36..9aca582 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/RevertResizeTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/RevertResizeTest.java
@@ -20,12 +20,12 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.ServerAction.RevertResize;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
-import org.junit.Assert;
+
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.skyscreamer.jsonassert.JSONCompareMode;
@@ -39,11 +39,12 @@ public class RevertResizeTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/RuleTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/RuleTest.java
index 0ec78dc..65ecb6c 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/RuleTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/RuleTest.java
@@ -20,13 +20,14 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.SecurityGroup.Rule;
 import com.woorea.openstack.nova.model.SecurityGroup.Rule.Group;
 import com.woorea.openstack.nova.model.SecurityGroup.Rule.IpRange;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -55,11 +56,12 @@ public class RuleTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/SecurityGroupForCreateTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/SecurityGroupForCreateTest.java
index 71460b4..0c995d1 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/SecurityGroupForCreateTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/SecurityGroupForCreateTest.java
@@ -20,11 +20,11 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.SecurityGroupForCreate;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -42,11 +42,12 @@ public class SecurityGroupForCreateTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/SecurityGroupRuleForCreateTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/SecurityGroupRuleForCreateTest.java
index ae1dbac..fc5cf69 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/SecurityGroupRuleForCreateTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/SecurityGroupRuleForCreateTest.java
@@ -20,11 +20,11 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.SecurityGroupRuleForCreate;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -46,11 +46,12 @@ public class SecurityGroupRuleForCreateTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/SecurityGroupTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/SecurityGroupTest.java
index 5bcc32a..b68e503 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/SecurityGroupTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/SecurityGroupTest.java
@@ -20,11 +20,12 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.ServerForCreate.SecurityGroup;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -39,9 +40,10 @@ public class SecurityGroupTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/SecurityGroupsTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/SecurityGroupsTest.java
index f3446f2..2ee2faa 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/SecurityGroupsTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/SecurityGroupsTest.java
@@ -20,13 +20,13 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.SecurityGroup;
-import com.woorea.openstack.nova.model.SecurityGroups;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -127,9 +127,10 @@ public class SecurityGroupsTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/ServerForCreateTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/ServerForCreateTest.java
index 2653f02..7b5d165 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/ServerForCreateTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/ServerForCreateTest.java
@@ -20,16 +20,15 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.NetworkForCreate;
-import com.woorea.openstack.nova.model.PersonalityFile;
-import com.woorea.openstack.nova.model.ServerForCreate;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.ServerForCreate.SecurityGroup;
+
 import java.util.List;
 import java.util.Map;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -81,11 +80,12 @@ public class ServerForCreateTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/ServerTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/ServerTest.java
index 3aa4833..27ba42d 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/ServerTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/ServerTest.java
@@ -20,19 +20,16 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.Flavor;
-import com.woorea.openstack.nova.model.Image;
-import com.woorea.openstack.nova.model.Link;
-import com.woorea.openstack.nova.model.SecurityGroup;
-import com.woorea.openstack.nova.model.Server;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.Server.Addresses;
 import com.woorea.openstack.nova.model.Server.Fault;
+
 import java.util.List;
 import java.util.Map;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -266,11 +263,12 @@ public class ServerTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/ServerUsageTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/ServerUsageTest.java
index 4b7f683..cfec1f7 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/ServerUsageTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/ServerUsageTest.java
@@ -20,11 +20,12 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.SimpleTenantUsage.ServerUsage;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -50,9 +51,10 @@ public class ServerUsageTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/ServersTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/ServersTest.java
index 7f45acc..ecd5394 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/ServersTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/ServersTest.java
@@ -20,13 +20,13 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.Server;
-import com.woorea.openstack.nova.model.Servers;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -487,9 +487,10 @@ public class ServersTest {
     }
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/SimpleTenantUsageTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/SimpleTenantUsageTest.java
index 8303e33..da2208f 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/SimpleTenantUsageTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/SimpleTenantUsageTest.java
@@ -20,14 +20,15 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.SimpleTenantUsage;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.SimpleTenantUsage.ServerUsage;
+
 import java.math.BigDecimal;
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -77,11 +78,12 @@ public class SimpleTenantUsageTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/SimpleTenantUsagesTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/SimpleTenantUsagesTest.java
index 523a9ab..ee4598c 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/SimpleTenantUsagesTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/SimpleTenantUsagesTest.java
@@ -20,13 +20,13 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.SimpleTenantUsage;
-import com.woorea.openstack.nova.model.SimpleTenantUsages;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -111,9 +111,10 @@ public class SimpleTenantUsagesTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/SnapshotForCreateTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/SnapshotForCreateTest.java
index edcca0f..e894375 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/SnapshotForCreateTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/SnapshotForCreateTest.java
@@ -20,11 +20,11 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.SnapshotForCreate;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -44,11 +44,12 @@ public class SnapshotForCreateTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/SnapshotTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/SnapshotTest.java
index d62f730..23e152c 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/SnapshotTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/SnapshotTest.java
@@ -20,11 +20,11 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.Snapshot;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -47,11 +47,12 @@ public class SnapshotTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/SnapshotsTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/SnapshotsTest.java
index 9bf525b..c4e56b5 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/SnapshotsTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/SnapshotsTest.java
@@ -20,13 +20,13 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.Snapshot;
-import com.woorea.openstack.nova.model.Snapshots;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -57,9 +57,10 @@ public class SnapshotsTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/StartTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/StartTest.java
index c96b74a..3b433a4 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/StartTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/StartTest.java
@@ -20,12 +20,12 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.ServerAction.Start;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
-import org.junit.Assert;
+
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.skyscreamer.jsonassert.JSONCompareMode;
@@ -39,11 +39,12 @@ public class StartTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/StopTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/StopTest.java
index 2abb35e..b9989b8 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/StopTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/StopTest.java
@@ -20,12 +20,12 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.ServerAction.Stop;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
-import org.junit.Assert;
+
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.skyscreamer.jsonassert.JSONCompareMode;
@@ -39,11 +39,12 @@ public class StopTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/SuspendTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/SuspendTest.java
index bcbb0da..b885ffe 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/SuspendTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/SuspendTest.java
@@ -20,12 +20,12 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.ServerAction.Suspend;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
-import org.junit.Assert;
+
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.skyscreamer.jsonassert.JSONCompareMode;
@@ -39,11 +39,12 @@ public class SuspendTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/UnlockTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/UnlockTest.java
index 43ad515..e6f8a05 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/UnlockTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/UnlockTest.java
@@ -20,12 +20,12 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.ServerAction.Unlock;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
-import org.junit.Assert;
+
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.skyscreamer.jsonassert.JSONCompareMode;
@@ -39,11 +39,12 @@ public class UnlockTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/UnpauseTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/UnpauseTest.java
index f180b96..924eb2a 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/UnpauseTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/UnpauseTest.java
@@ -20,12 +20,12 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.ServerAction.Unpause;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
-import org.junit.Assert;
+
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.skyscreamer.jsonassert.JSONCompareMode;
@@ -39,11 +39,12 @@ public class UnpauseTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/UnrescueTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/UnrescueTest.java
index 6e92807..2945ee5 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/UnrescueTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/UnrescueTest.java
@@ -20,12 +20,12 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.ServerAction.Unrescue;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
-import org.junit.Assert;
+
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.skyscreamer.jsonassert.JSONCompareMode;
@@ -39,11 +39,12 @@ public class UnrescueTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/VncConsoleTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/VncConsoleTest.java
index 8582bca..36cf35a 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/VncConsoleTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/VncConsoleTest.java
@@ -20,11 +20,12 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.ServerAction.VncConsole;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -42,11 +43,12 @@ public class VncConsoleTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeAttachmentTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeAttachmentTest.java
index c51efe7..b051d52 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeAttachmentTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeAttachmentTest.java
@@ -20,11 +20,11 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.VolumeAttachment;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -44,11 +44,12 @@ public class VolumeAttachmentTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeAttachmentsTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeAttachmentsTest.java
index b84389b..f409aa2 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeAttachmentsTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeAttachmentsTest.java
@@ -20,13 +20,13 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.VolumeAttachment;
-import com.woorea.openstack.nova.model.VolumeAttachments;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -51,9 +51,10 @@ public class VolumeAttachmentsTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeForCreateTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeForCreateTest.java
index 5caf86d..7654cef 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeForCreateTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeForCreateTest.java
@@ -20,12 +20,13 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.VolumeForCreate;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.Map;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -50,11 +51,12 @@ public class VolumeForCreateTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeForImageCreateTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeForImageCreateTest.java
index eae93e5..98a3e1a 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeForImageCreateTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeForImageCreateTest.java
@@ -20,11 +20,11 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.VolumeForImageCreate;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -46,11 +46,12 @@ public class VolumeForImageCreateTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeTest.java
index 7a8d058..bf1a7e1 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeTest.java
@@ -20,13 +20,14 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.Volume;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
 import java.util.Map;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -62,11 +63,12 @@ public class VolumeTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeTypeTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeTypeTest.java
index b485dbb..9033b9e 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeTypeTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeTypeTest.java
@@ -20,12 +20,11 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.VolumeType;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
-import org.junit.Assert;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.skyscreamer.jsonassert.JSONCompareMode;
@@ -39,11 +38,12 @@ public class VolumeTypeTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeTypesTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeTypesTest.java
index 903b67d..73f84b2 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeTypesTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeTypesTest.java
@@ -20,13 +20,13 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.VolumeType;
-import com.woorea.openstack.nova.model.VolumeTypes;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -41,9 +41,10 @@ public class VolumeTypesTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumesTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumesTest.java
index 4c2d5b1..6729cc4 100644 (file)
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumesTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumesTest.java
@@ -20,13 +20,13 @@
 
 package com.woorea.openstack.nova.model;
 
-import com.woorea.openstack.nova.model.Volume;
-import com.woorea.openstack.nova.model.Volumes;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -83,9 +83,10 @@ public class VolumesTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/openstack-client-connectors/http-connector/pom.xml b/openstack-client-connectors/http-connector/pom.xml
index 095cf6d..e359300 100644 (file)
--- a/openstack-client-connectors/http-connector/pom.xml
+++ b/openstack-client-connectors/http-connector/pom.xml
@@ -20,11 +20,6 @@
                <groupId>org.apache.httpcomponents</groupId>
                <artifactId>httpcore</artifactId>
        </dependency>
-       <dependency>
-               <groupId>org.codehaus.jackson</groupId>
-               <artifactId>jackson-mapper-asl</artifactId>
-               <version>1.9.13</version>
-       </dependency>
        <dependency>
                <groupId>log4j</groupId>
                <artifactId>log4j</artifactId>

diff --git a/openstack-client-connectors/http-connector/src/main/java/com/woorea/openstack/connector/HttpClientConnector.java b/openstack-client-connectors/http-connector/src/main/java/com/woorea/openstack/connector/HttpClientConnector.java
index 02d851e..85ac96c 100644 (file)
--- a/openstack-client-connectors/http-connector/src/main/java/com/woorea/openstack/connector/HttpClientConnector.java
+++ b/openstack-client-connectors/http-connector/src/main/java/com/woorea/openstack/connector/HttpClientConnector.java
@@ -2,7 +2,7 @@
  * ONAP-SO
  * ============LICENSE_START==========================================
  * ===================================================================
- * Copyright � 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
  * ===================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,13 +47,13 @@ import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.JsonProcessingException;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonRootName;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.base.client.OpenStackClientConnector;
 import com.woorea.openstack.base.client.OpenStackConnectException;
 import com.woorea.openstack.base.client.OpenStackRequest;
@@ -70,19 +70,19 @@ public class HttpClientConnector implements OpenStackClientConnector {
     static {
         DEFAULT_MAPPER = new ObjectMapper();
 
-        DEFAULT_MAPPER.setSerializationInclusion(Inclusion.NON_NULL);
-        DEFAULT_MAPPER.disable(SerializationConfig.Feature.INDENT_OUTPUT);
-        DEFAULT_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
-        DEFAULT_MAPPER.disable(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES);
+        DEFAULT_MAPPER.setSerializationInclusion(Include.NON_NULL);
+        DEFAULT_MAPPER.disable(SerializationFeature.INDENT_OUTPUT);
+        DEFAULT_MAPPER.enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        DEFAULT_MAPPER.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
 
         WRAPPED_MAPPER = new ObjectMapper();
 
-        WRAPPED_MAPPER.setSerializationInclusion(Inclusion.NON_NULL);
-        WRAPPED_MAPPER.disable(SerializationConfig.Feature.INDENT_OUTPUT);
-        WRAPPED_MAPPER.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
-        WRAPPED_MAPPER.enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE);
-        WRAPPED_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
-        WRAPPED_MAPPER.disable(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES);
+        WRAPPED_MAPPER.setSerializationInclusion(Include.NON_NULL);
+        WRAPPED_MAPPER.disable(SerializationFeature.INDENT_OUTPUT);
+        WRAPPED_MAPPER.enable(SerializationFeature.WRAP_ROOT_VALUE);
+        WRAPPED_MAPPER.enable(DeserializationFeature.UNWRAP_ROOT_VALUE);
+        WRAPPED_MAPPER.enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        WRAPPED_MAPPER.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
     }
     
     protected static <T> ObjectMapper getObjectMapper (Class<T> type) {

diff --git a/openstack-client-connectors/http-connector/src/main/java/com/woorea/openstack/connector/HttpClientResponse.java b/openstack-client-connectors/http-connector/src/main/java/com/woorea/openstack/connector/HttpClientResponse.java
index 108861a..711d4e5 100644 (file)
--- a/openstack-client-connectors/http-connector/src/main/java/com/woorea/openstack/connector/HttpClientResponse.java
+++ b/openstack-client-connectors/http-connector/src/main/java/com/woorea/openstack/connector/HttpClientResponse.java
@@ -17,7 +17,7 @@
 /*
  * ============LICENSE_START==========================================
  * ===================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
  * ===================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,8 +42,8 @@ package com.woorea.openstack.connector;
 import org.apache.http.Header;
 import org.apache.http.HttpResponse;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.map.ObjectMapper;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.woorea.openstack.base.client.OpenStackResponse;
 
 import java.io.ByteArrayInputStream;

diff --git a/openstack-client-connectors/jersey-connector/pom.xml b/openstack-client-connectors/jersey-connector/pom.xml
index 2c995cd..e942e8d 100644 (file)
--- a/openstack-client-connectors/jersey-connector/pom.xml
+++ b/openstack-client-connectors/jersey-connector/pom.xml
@@ -15,11 +15,6 @@
        <artifactId>jersey-client</artifactId>
        <version>1.17.1</version>
   </dependency>
-  <dependency>
-       <groupId>org.codehaus.jackson</groupId>
-       <artifactId>jackson-jaxrs</artifactId>
-       <version>1.9.12</version>
-  </dependency>
   <dependency>
     <groupId>junit</groupId>
     <artifactId>junit</artifactId>

diff --git a/openstack-client-connectors/jersey-connector/src/main/java/com/woorea/openstack/connector/JerseyConnector.java b/openstack-client-connectors/jersey-connector/src/main/java/com/woorea/openstack/connector/JerseyConnector.java
index ea22970..770b4d8 100644 (file)
--- a/openstack-client-connectors/jersey-connector/src/main/java/com/woorea/openstack/connector/JerseyConnector.java
+++ b/openstack-client-connectors/jersey-connector/src/main/java/com/woorea/openstack/connector/JerseyConnector.java
@@ -24,13 +24,12 @@ import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.ext.ContextResolver;
 import javax.ws.rs.ext.Provider;
 
-import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonRootName;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
-
+import com.fasterxml.jackson.annotation.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
 import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.ClientResponse;
 import com.sun.jersey.api.client.UniformInterfaceException;
@@ -96,20 +95,20 @@ public class JerseyConnector implements OpenStackClientConnector {
         static ObjectMapper WRAPPED_MAPPER;
         static {
             DEFAULT_MAPPER = new ObjectMapper();
-            DEFAULT_MAPPER.setSerializationInclusion(Inclusion.NON_NULL);
-            DEFAULT_MAPPER.enable(SerializationConfig.Feature.INDENT_OUTPUT);
-            DEFAULT_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
-            DEFAULT_MAPPER.disable(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES);
-            DEFAULT_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
+            DEFAULT_MAPPER.setSerializationInclusion(Include.NON_NULL);
+            DEFAULT_MAPPER.enable(SerializationFeature.INDENT_OUTPUT);
+            DEFAULT_MAPPER.enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+            DEFAULT_MAPPER.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+            DEFAULT_MAPPER.enable(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
 
             WRAPPED_MAPPER = new ObjectMapper();
-            WRAPPED_MAPPER.setSerializationInclusion(Inclusion.NON_NULL);
-            WRAPPED_MAPPER.enable(SerializationConfig.Feature.INDENT_OUTPUT);
-            WRAPPED_MAPPER.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
-            WRAPPED_MAPPER.enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE);
-            WRAPPED_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
-            WRAPPED_MAPPER.disable(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES);
-            WRAPPED_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
+            WRAPPED_MAPPER.setSerializationInclusion(Include.NON_NULL);
+            WRAPPED_MAPPER.enable(SerializationFeature.INDENT_OUTPUT);
+            WRAPPED_MAPPER.enable(SerializationFeature.WRAP_ROOT_VALUE);
+            WRAPPED_MAPPER.enable(DeserializationFeature.UNWRAP_ROOT_VALUE);
+            WRAPPED_MAPPER.enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+            WRAPPED_MAPPER.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+            WRAPPED_MAPPER.enable(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
         }
         
         @Override

diff --git a/openstack-client-connectors/jersey2-connector/src/main/java/com/woorea/openstack/connector/OpenStack.java b/openstack-client-connectors/jersey2-connector/src/main/java/com/woorea/openstack/connector/OpenStack.java
index 22ba5e4..eeedfd0 100644 (file)
--- a/openstack-client-connectors/jersey2-connector/src/main/java/com/woorea/openstack/connector/OpenStack.java
+++ b/openstack-client-connectors/jersey2-connector/src/main/java/com/woorea/openstack/connector/OpenStack.java
@@ -25,14 +25,15 @@ import javax.ws.rs.client.ClientRequestContext;
 import javax.ws.rs.client.ClientRequestFilter;
 import javax.ws.rs.ext.ContextResolver;
 
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonRootName;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
 import org.glassfish.jersey.SslConfigurator;
 import org.glassfish.jersey.jackson.JacksonFeature;
 
+import com.fasterxml.jackson.annotation.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 public class OpenStack {
 
     public static Client CLIENT;
@@ -84,23 +85,23 @@ public class OpenStack {
             CLIENT = ClientBuilder.newBuilder().sslContext(sslConfig.createSSLContext()).build();
             
             DEFAULT_MAPPER = new ObjectMapper();
-            
-            DEFAULT_MAPPER.setSerializationInclusion(Inclusion.NON_NULL);
-            DEFAULT_MAPPER.enable(SerializationConfig.Feature.INDENT_OUTPUT);
-            DEFAULT_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
-            DEFAULT_MAPPER.disable(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES);
-            DEFAULT_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
-            
+
+            DEFAULT_MAPPER.setSerializationInclusion(Include.NON_NULL);
+            DEFAULT_MAPPER.enable(SerializationFeature.INDENT_OUTPUT);
+            DEFAULT_MAPPER.enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+            DEFAULT_MAPPER.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+            DEFAULT_MAPPER.enable(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
+
             WRAPPED_MAPPER = new ObjectMapper();
-            
-            WRAPPED_MAPPER.setSerializationInclusion(Inclusion.NON_NULL);
-            WRAPPED_MAPPER.enable(SerializationConfig.Feature.INDENT_OUTPUT);
-            WRAPPED_MAPPER.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
-            WRAPPED_MAPPER.enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE);
-            WRAPPED_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
-            WRAPPED_MAPPER.disable(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES);
-            WRAPPED_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
-            
+
+            WRAPPED_MAPPER.setSerializationInclusion(Include.NON_NULL);
+            WRAPPED_MAPPER.enable(SerializationFeature.INDENT_OUTPUT);
+            WRAPPED_MAPPER.enable(SerializationFeature.WRAP_ROOT_VALUE);
+            WRAPPED_MAPPER.enable(DeserializationFeature.UNWRAP_ROOT_VALUE);
+            WRAPPED_MAPPER.enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+            WRAPPED_MAPPER.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+            WRAPPED_MAPPER.enable(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
+
             CLIENT.register(new JacksonFeature()).register(new ContextResolver<ObjectMapper>() {
 
                 @Override

diff --git a/openstack-client-connectors/resteasy-connector/pom.xml b/openstack-client-connectors/resteasy-connector/pom.xml
index 9955571..8bfe105 100644 (file)
--- a/openstack-client-connectors/resteasy-connector/pom.xml
+++ b/openstack-client-connectors/resteasy-connector/pom.xml
@@ -16,11 +16,6 @@
                        <!-- replaced with 3.5.0.Final <version>2.3.2.Final</version> -->
                        <version>3.5.1.Final</version><!-- 3.5.0 changed to 3.5.1 for the CLM policy threat issue resolution -->
        </dependency>
-       <dependency>
-               <groupId>org.codehaus.jackson</groupId>
-               <artifactId>jackson-jaxrs</artifactId>
-               <version>1.9.4</version>
-       </dependency>
        <!-- replaced with httpclient and httpcore
        <dependency>
                <groupId>commons-httpclient</groupId>

diff --git a/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java b/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java
index 1f9c0de..b804e69 100644 (file)
--- a/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java
+++ b/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java
@@ -26,17 +26,17 @@ import javax.ws.rs.ext.ContextResolver;
 // bwj: changed the HttpStatus package
 //import org.apache.commons.httpclient.HttpStatus;
 import org.apache.http.HttpStatus;
-import org.codehaus.jackson.jaxrs.JacksonJsonProvider;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonRootName;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
 import org.jboss.resteasy.client.ClientRequest;
 import org.jboss.resteasy.client.ClientResponse;
 import org.jboss.resteasy.plugins.providers.InputStreamProvider;
 import org.jboss.resteasy.spi.ResteasyProviderFactory;
 
+import com.fasterxml.jackson.annotation.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
 import com.woorea.openstack.base.client.OpenStackClientConnector;
 import com.woorea.openstack.base.client.OpenStackRequest;
 import com.woorea.openstack.base.client.OpenStackResponse;
@@ -79,21 +79,21 @@ public class RESTEasyConnector implements OpenStackClientConnector {
     static {
         DEFAULT_MAPPER = new ObjectMapper();
 
-        DEFAULT_MAPPER.setSerializationInclusion(Inclusion.NON_NULL);
-        DEFAULT_MAPPER.enable(SerializationConfig.Feature.INDENT_OUTPUT);
-        DEFAULT_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
-        DEFAULT_MAPPER.disable(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES);
-        DEFAULT_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
+        DEFAULT_MAPPER.setSerializationInclusion(Include.NON_NULL);
+        DEFAULT_MAPPER.enable(SerializationFeature.INDENT_OUTPUT);
+        DEFAULT_MAPPER.enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        DEFAULT_MAPPER.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+        DEFAULT_MAPPER.enable(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
 
         WRAPPED_MAPPER = new ObjectMapper();
 
-        WRAPPED_MAPPER.setSerializationInclusion(Inclusion.NON_NULL);
-        WRAPPED_MAPPER.enable(SerializationConfig.Feature.INDENT_OUTPUT);
-        WRAPPED_MAPPER.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
-        WRAPPED_MAPPER.enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE);
-        WRAPPED_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
-        WRAPPED_MAPPER.disable(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES);
-        WRAPPED_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
+        WRAPPED_MAPPER.setSerializationInclusion(Include.NON_NULL);
+        WRAPPED_MAPPER.enable(SerializationFeature.INDENT_OUTPUT);
+        WRAPPED_MAPPER.enable(SerializationFeature.WRAP_ROOT_VALUE);
+        WRAPPED_MAPPER.enable(DeserializationFeature.UNWRAP_ROOT_VALUE);
+        WRAPPED_MAPPER.enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        WRAPPED_MAPPER.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+        WRAPPED_MAPPER.enable(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
 
         providerFactory = new OpenStackProviderFactory();
     }

diff --git a/pom.xml b/pom.xml
index ba123f8..98cb204 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -64,6 +64,13 @@
        </licenses>
        <inceptionYear>2012</inceptionYear>
        <repositories>
+               <repository>
+                       <id>ecomp-staging</id>
+                       <url>https://nexus.onap.org/content/repositories/staging/</url>
+                       <snapshots>
+                               <enabled>false</enabled>
+                       </snapshots>
+               </repository>
                <repository>
                        <id>ecomp-public</id>
                        <url>https://nexus.onap.org/content/repositories/public/</url>
@@ -153,9 +160,34 @@
        </dependencyManagement>
        <dependencies>
                <dependency>
-                       <groupId>org.codehaus.jackson</groupId>
-                       <artifactId>jackson-mapper-asl</artifactId>
-                       <version>1.9.13</version>
+                       <groupId>com.fasterxml.jackson.core</groupId>
+                       <artifactId>jackson-core</artifactId>
+                       <version>2.8.10</version>
+               </dependency>
+               <dependency>
+                       <groupId>com.fasterxml.jackson.module</groupId>
+                       <artifactId>jackson-module-jaxb-annotations</artifactId>
+                       <version>2.4.0</version>
+               </dependency>
+               <dependency>
+                       <groupId>com.fasterxml.jackson.core</groupId>
+                       <artifactId>jackson-databind</artifactId>
+                       <version>2.8.10</version>
+               </dependency>
+               <dependency>
+                       <groupId>com.fasterxml.jackson.core</groupId>
+                       <artifactId>jackson-annotations</artifactId>
+                       <version>2.8.10</version>
+               </dependency>
+               <dependency>
+                       <groupId>com.fasterxml.jackson.jaxrs</groupId>
+                       <artifactId>jackson-jaxrs-base</artifactId>
+                       <version>2.9.2</version>
+               </dependency>
+               <dependency>
+                       <groupId>com.fasterxml.jackson.jaxrs</groupId>
+                       <artifactId>jackson-jaxrs-json-provider</artifactId>
+                       <version>2.9.2</version>
                </dependency>
        </dependencies>
        <reporting>

diff --git a/quantum-client/src/main/java/com/woorea/openstack/quantum/api/query/AbsOpenStackCmd.java b/quantum-client/src/main/java/com/woorea/openstack/quantum/api/query/AbsOpenStackCmd.java
index 1ba1bb6..900a3d2 100644 (file)
--- a/quantum-client/src/main/java/com/woorea/openstack/quantum/api/query/AbsOpenStackCmd.java
+++ b/quantum-client/src/main/java/com/woorea/openstack/quantum/api/query/AbsOpenStackCmd.java
@@ -20,8 +20,7 @@ import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.woorea.openstack.base.client.OpenStackRequest;
 
 public class AbsOpenStackCmd<T> extends OpenStackRequest<T> {

diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/GatewayInfo.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/GatewayInfo.java
index 852e1c3..9ef68ff 100644 (file)
--- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/GatewayInfo.java
+++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/GatewayInfo.java
@@ -17,9 +17,10 @@
 package com.woorea.openstack.quantum.model;
 
 import java.util.List;
-import java.io.Serializable;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.io.Serializable;
 
 public class GatewayInfo implements Serializable {
 

diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Network.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Network.java
index f9e9c07..95fb6a4 100644 (file)
--- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Network.java
+++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Network.java
@@ -23,10 +23,10 @@ package com.woorea.openstack.quantum.model;
 import java.io.Serializable;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 /**
  * Network Extension supporting both Provider networks and Multi-Provider networks.

diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/NetworkForCreate.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/NetworkForCreate.java
index d5f3393..7aecfdd 100644 (file)
--- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/NetworkForCreate.java
+++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/NetworkForCreate.java
@@ -16,7 +16,7 @@
 
 package com.woorea.openstack.quantum.model;
 
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 /**
  * @deprecated

diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Networks.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Networks.java
index 9bf53f2..3bf24c3 100644 (file)
--- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Networks.java
+++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Networks.java
@@ -19,7 +19,8 @@ package com.woorea.openstack.quantum.model;
 import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
-import org.codehaus.jackson.annotate.JsonProperty;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Networks implements Iterable<Network>, Serializable{
     

diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/NeutronError.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/NeutronError.java
index 91e998e..9335737 100644 (file)
--- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/NeutronError.java
+++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/NeutronError.java
@@ -17,7 +17,7 @@
 /*
  * ============LICENSE_START==========================================
  * ===================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
  * ===================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@ package com.woorea.openstack.quantum.model;
 
 import java.io.Serializable;
 
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("NeutronError")
 public class NeutronError implements Serializable {

diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Port.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Port.java
index 2e17e68..9f32f29 100644 (file)
--- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Port.java
+++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Port.java
@@ -20,11 +20,11 @@ import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.annotate.JsonUnwrapped;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonUnwrapped;
 
 @SuppressWarnings("serial")
 @JsonRootName("port")

diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/PortForCreate.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/PortForCreate.java
index 8c335d0..8b50f91 100644 (file)
--- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/PortForCreate.java
+++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/PortForCreate.java
@@ -16,7 +16,7 @@
 
 package com.woorea.openstack.quantum.model;
 
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 /**
  * @deprecated Please use {@link Port} directly.

diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Ports.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Ports.java
index a274135..eeb4c64 100644 (file)
--- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Ports.java
+++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Ports.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 @SuppressWarnings("serial")
 public class Ports implements Iterable<Port>, Serializable {

diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Router.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Router.java
index cea0891..722bb0d 100644 (file)
--- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Router.java
+++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Router.java
@@ -17,10 +17,11 @@
 package com.woorea.openstack.quantum.model;
 
 import java.util.List;
-import java.io.Serializable;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+
+import java.io.Serializable;
 
 @JsonRootName("router")
 public class Router implements Serializable {

diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/RouterForAddInterface.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/RouterForAddInterface.java
index a8b65b5..04d99cb 100644 (file)
--- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/RouterForAddInterface.java
+++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/RouterForAddInterface.java
@@ -18,7 +18,7 @@ package com.woorea.openstack.quantum.model;
 
 import java.io.Serializable;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class RouterForAddInterface implements Serializable {
 

diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/RouterForCreate.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/RouterForCreate.java
index d717658..c524ef5 100644 (file)
--- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/RouterForCreate.java
+++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/RouterForCreate.java
@@ -17,10 +17,11 @@
 package com.woorea.openstack.quantum.model;
 
 import java.util.List;
-import java.io.Serializable;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+
+import java.io.Serializable;
 
 @JsonRootName("router")
 public class RouterForCreate implements Serializable {

diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/RouterInterface.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/RouterInterface.java
index e668cf9..42cca03 100644 (file)
--- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/RouterInterface.java
+++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/RouterInterface.java
@@ -18,8 +18,7 @@ package com.woorea.openstack.quantum.model;
 
 import java.io.Serializable;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class RouterInterface implements Serializable {
 

diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Routers.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Routers.java
index aefd735..370b77d 100644 (file)
--- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Routers.java
+++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Routers.java
@@ -19,7 +19,8 @@ package com.woorea.openstack.quantum.model;
 import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
-import org.codehaus.jackson.annotate.JsonProperty;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Routers implements Iterable<Router>, Serializable{
     

diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Segment.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Segment.java
index 66ee379..b5279cd 100644 (file)
--- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Segment.java
+++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Segment.java
@@ -17,7 +17,7 @@
 /*
  * ============LICENSE_START==========================================
  * ===================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
  * ===================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,8 +41,8 @@ package com.woorea.openstack.quantum.model;
 
 import java.io.Serializable;
 
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 @SuppressWarnings("serial")
 @JsonIgnoreProperties(ignoreUnknown = true)

diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Subnet.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Subnet.java
index 6a9fcb4..90ee325 100644 (file)
--- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Subnet.java
+++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Subnet.java
@@ -19,12 +19,12 @@ package com.woorea.openstack.quantum.model;
 import java.io.Serializable;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonCreator;
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.annotate.JsonValue;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonValue;
 
 @SuppressWarnings("serial")
 @JsonRootName("subnet")

diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/SubnetForCreate.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/SubnetForCreate.java
index acecb73..34820aa 100644 (file)
--- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/SubnetForCreate.java
+++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/SubnetForCreate.java
@@ -16,8 +16,8 @@
 
 package com.woorea.openstack.quantum.model;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 /**
  * Please use {@link Subnet} directly.

diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Subnets.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Subnets.java
index 8e9778f..0faef86 100644 (file)
--- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Subnets.java
+++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Subnets.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Subnets implements Serializable, Iterable<Subnet> {
     

diff --git a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/BindingTest.java b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/BindingTest.java
index b99c167..0fe28bc 100644 (file)
--- a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/BindingTest.java
+++ b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/BindingTest.java
@@ -20,12 +20,14 @@
 
 package com.woorea.openstack.quantum.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.quantum.model.Port.Binding;
+
 import java.util.Map;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -50,9 +52,10 @@ public class BindingTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/GatewayInfoTest.java b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/GatewayInfoTest.java
index 3e8c37f..92e8692 100644 (file)
--- a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/GatewayInfoTest.java
+++ b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/GatewayInfoTest.java
@@ -20,11 +20,11 @@
 
 package com.woorea.openstack.quantum.model;
 
-import com.woorea.openstack.quantum.model.GatewayInfo;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -39,9 +39,10 @@ public class GatewayInfoTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/HostRouteTest.java b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/HostRouteTest.java
index bfa7280..063014e 100644 (file)
--- a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/HostRouteTest.java
+++ b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/HostRouteTest.java
@@ -20,11 +20,11 @@
 
 package com.woorea.openstack.quantum.model;
 
-import com.woorea.openstack.quantum.model.HostRoute;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -40,9 +40,10 @@ public class HostRouteTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/IpTest.java b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/IpTest.java
index 79fbff5..799a0f5 100644 (file)
--- a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/IpTest.java
+++ b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/IpTest.java
@@ -20,11 +20,12 @@
 
 package com.woorea.openstack.quantum.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.quantum.model.Port.Ip;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -40,9 +41,10 @@ public class IpTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/IpVersionTest.java b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/IpVersionTest.java
index b2a8604..b58aed5 100644 (file)
--- a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/IpVersionTest.java
+++ b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/IpVersionTest.java
@@ -20,12 +20,12 @@
 
 package com.woorea.openstack.quantum.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.quantum.model.Subnet.IpVersion;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
-import org.junit.Assert;
+
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.skyscreamer.jsonassert.JSONCompareMode;
@@ -37,9 +37,10 @@ public class IpVersionTest {
     private static final String JSON_FULL = "4";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/NetworkTest.java b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/NetworkTest.java
index b9d5b37..7a2b2c1 100644 (file)
--- a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/NetworkTest.java
+++ b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/NetworkTest.java
@@ -20,13 +20,13 @@
 
 package com.woorea.openstack.quantum.model;
 
-import com.woorea.openstack.quantum.model.Network;
-import com.woorea.openstack.quantum.model.Segment;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -59,11 +59,12 @@ public class NetworkTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/NetworksTest.java b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/NetworksTest.java
index dd39cf5..9b4dc3b 100644 (file)
--- a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/NetworksTest.java
+++ b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/NetworksTest.java
@@ -20,13 +20,13 @@
 
 package com.woorea.openstack.quantum.model;
 
-import com.woorea.openstack.quantum.model.Network;
-import com.woorea.openstack.quantum.model.Networks;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -77,9 +77,10 @@ public class NetworksTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/NeutronErrorTest.java b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/NeutronErrorTest.java
index a0031ee..e2dc7f5 100644 (file)
--- a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/NeutronErrorTest.java
+++ b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/NeutronErrorTest.java
@@ -20,11 +20,11 @@
 
 package com.woorea.openstack.quantum.model;
 
-import com.woorea.openstack.quantum.model.NeutronError;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -43,11 +43,12 @@ public class NeutronErrorTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/PoolTest.java b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/PoolTest.java
index c2cf38e..ce7574b 100644 (file)
--- a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/PoolTest.java
+++ b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/PoolTest.java
@@ -20,11 +20,11 @@
 
 package com.woorea.openstack.quantum.model;
 
-import com.woorea.openstack.quantum.model.Pool;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -40,9 +40,10 @@ public class PoolTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/PortTest.java b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/PortTest.java
index 756753d..b8a7a34 100644 (file)
--- a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/PortTest.java
+++ b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/PortTest.java
@@ -20,14 +20,15 @@
 
 package com.woorea.openstack.quantum.model;
 
-import com.woorea.openstack.quantum.model.Port;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.quantum.model.Port.Binding;
 import com.woorea.openstack.quantum.model.Port.Ip;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -69,11 +70,12 @@ public class PortTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/PortsTest.java b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/PortsTest.java
index 860ea7c..62e5c3b 100644 (file)
--- a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/PortsTest.java
+++ b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/PortsTest.java
@@ -20,13 +20,13 @@
 
 package com.woorea.openstack.quantum.model;
 
-import com.woorea.openstack.quantum.model.Port;
-import com.woorea.openstack.quantum.model.Ports;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -95,9 +95,10 @@ public class PortsTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/RouterForAddInterfaceTest.java b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/RouterForAddInterfaceTest.java
index 148637f..270b7a2 100644 (file)
--- a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/RouterForAddInterfaceTest.java
+++ b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/RouterForAddInterfaceTest.java
@@ -20,11 +20,11 @@
 
 package com.woorea.openstack.quantum.model;
 
-import com.woorea.openstack.quantum.model.RouterForAddInterface;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -40,9 +40,10 @@ public class RouterForAddInterfaceTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/RouterForCreateTest.java b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/RouterForCreateTest.java
index f7df840..b84e639 100644 (file)
--- a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/RouterForCreateTest.java
+++ b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/RouterForCreateTest.java
@@ -20,14 +20,13 @@
 
 package com.woorea.openstack.quantum.model;
 
-import com.woorea.openstack.quantum.model.GatewayInfo;
-import com.woorea.openstack.quantum.model.HostRoute;
-import com.woorea.openstack.quantum.model.RouterForCreate;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -58,11 +57,12 @@ public class RouterForCreateTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/RouterInterfaceTest.java b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/RouterInterfaceTest.java
index 24713b7..ee4e08b 100644 (file)
--- a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/RouterInterfaceTest.java
+++ b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/RouterInterfaceTest.java
@@ -20,12 +20,11 @@
 
 package com.woorea.openstack.quantum.model;
 
-import com.woorea.openstack.quantum.model.RouterInterface;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
-import org.junit.Assert;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.skyscreamer.jsonassert.JSONCompareMode;
@@ -42,9 +41,10 @@ public class RouterInterfaceTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/RouterTest.java b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/RouterTest.java
index 2ad549c..b75cac8 100644 (file)
--- a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/RouterTest.java
+++ b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/RouterTest.java
@@ -20,14 +20,13 @@
 
 package com.woorea.openstack.quantum.model;
 
-import com.woorea.openstack.quantum.model.GatewayInfo;
-import com.woorea.openstack.quantum.model.HostRoute;
-import com.woorea.openstack.quantum.model.Router;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -58,11 +57,12 @@ public class RouterTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/RoutersTest.java b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/RoutersTest.java
index ad955c8..168dffc 100644 (file)
--- a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/RoutersTest.java
+++ b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/RoutersTest.java
@@ -20,13 +20,13 @@
 
 package com.woorea.openstack.quantum.model;
 
-import com.woorea.openstack.quantum.model.Router;
-import com.woorea.openstack.quantum.model.Routers;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -73,9 +73,10 @@ public class RoutersTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/SegmentTest.java b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/SegmentTest.java
index 9bc7fd7..992d5ab 100644 (file)
--- a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/SegmentTest.java
+++ b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/SegmentTest.java
@@ -20,11 +20,11 @@
 
 package com.woorea.openstack.quantum.model;
 
-import com.woorea.openstack.quantum.model.Segment;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -41,9 +41,10 @@ public class SegmentTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/SubnetTest.java b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/SubnetTest.java
index 5e1c7e1..9bdd37c 100644 (file)
--- a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/SubnetTest.java
+++ b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/SubnetTest.java
@@ -20,14 +20,14 @@
 
 package com.woorea.openstack.quantum.model;
 
-import com.woorea.openstack.quantum.model.Pool;
-import com.woorea.openstack.quantum.model.Subnet;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.quantum.model.Subnet.IpVersion;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -59,11 +59,12 @@ public class SubnetTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(SerializationFeature.WRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/SubnetsTest.java b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/SubnetsTest.java
index d01d3f6..710f694 100644 (file)
--- a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/SubnetsTest.java
+++ b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/SubnetsTest.java
@@ -20,13 +20,13 @@
 
 package com.woorea.openstack.quantum.model;
 
-import com.woorea.openstack.quantum.model.Subnet;
-import com.woorea.openstack.quantum.model.Subnets;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.List;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -75,9 +75,10 @@ public class SubnetsTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/swift-model/src/main/java/com/woorea/openstack/swift/model/Container.java b/swift-model/src/main/java/com/woorea/openstack/swift/model/Container.java
index eb359f3..5efe9a7 100644 (file)
--- a/swift-model/src/main/java/com/woorea/openstack/swift/model/Container.java
+++ b/swift-model/src/main/java/com/woorea/openstack/swift/model/Container.java
@@ -18,7 +18,7 @@ package com.woorea.openstack.swift.model;
 
 import java.io.Serializable;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Container implements Serializable {
     

diff --git a/swift-model/src/main/java/com/woorea/openstack/swift/model/Object.java b/swift-model/src/main/java/com/woorea/openstack/swift/model/Object.java
index 1c7d1e5..cfc3eba 100644 (file)
--- a/swift-model/src/main/java/com/woorea/openstack/swift/model/Object.java
+++ b/swift-model/src/main/java/com/woorea/openstack/swift/model/Object.java
@@ -19,8 +19,7 @@ package com.woorea.openstack.swift.model;
 import java.io.Serializable;
 import java.util.Calendar;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Object implements Serializable {
     

diff --git a/swift-model/src/test/java/com/woorea/openstack/swift/model/ContainerTest.java b/swift-model/src/test/java/com/woorea/openstack/swift/model/ContainerTest.java
index 2500ebf..41d7f6e 100644 (file)
--- a/swift-model/src/test/java/com/woorea/openstack/swift/model/ContainerTest.java
+++ b/swift-model/src/test/java/com/woorea/openstack/swift/model/ContainerTest.java
@@ -20,11 +20,11 @@
 
 package com.woorea.openstack.swift.model;
 
-import com.woorea.openstack.swift.model.Container;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -41,9 +41,10 @@ public class ContainerTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {

diff --git a/swift-model/src/test/java/com/woorea/openstack/swift/model/ObjectTest.java b/swift-model/src/test/java/com/woorea/openstack/swift/model/ObjectTest.java
index 4cefadb..28d909a 100644 (file)
--- a/swift-model/src/test/java/com/woorea/openstack/swift/model/ObjectTest.java
+++ b/swift-model/src/test/java/com/woorea/openstack/swift/model/ObjectTest.java
@@ -20,11 +20,13 @@
 
 package com.woorea.openstack.swift.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 import java.util.Calendar;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -44,9 +46,10 @@ public class ObjectTest {
         + "}";
 
     private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Inclusion.NON_NULL)
-        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
-        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        .setSerializationInclusion(Include.NON_NULL)
+        .enable(SerializationFeature.INDENT_OUTPUT)
+        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {