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>

36 files changed, 236 insertions, 212 deletions

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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 {