summaryrefslogtreecommitdiffstats
path: root/heat-model
diff options
context:
space:
mode:
Diffstat (limited to 'heat-model')
-rw-r--r--heat-model/src/main/java/com/woorea/openstack/heat/model/CreateStackParam.java3
-rw-r--r--heat-model/src/main/java/com/woorea/openstack/heat/model/Explanation.java6
-rw-r--r--heat-model/src/main/java/com/woorea/openstack/heat/model/Link.java2
-rw-r--r--heat-model/src/main/java/com/woorea/openstack/heat/model/Resource.java4
-rw-r--r--heat-model/src/main/java/com/woorea/openstack/heat/model/Resources.java6
-rw-r--r--heat-model/src/main/java/com/woorea/openstack/heat/model/Stack.java12
-rw-r--r--heat-model/src/main/java/com/woorea/openstack/heat/model/Stacks.java4
-rw-r--r--heat-model/src/main/java/com/woorea/openstack/heat/model/UpdateStackParam.java6
-rw-r--r--heat-model/src/test/java/com/woorea/openstack/heat/model/CreateStackParamTest.java18
-rw-r--r--heat-model/src/test/java/com/woorea/openstack/heat/model/ErrorTest.java20
-rw-r--r--heat-model/src/test/java/com/woorea/openstack/heat/model/ExplanationTest.java17
-rw-r--r--heat-model/src/test/java/com/woorea/openstack/heat/model/LinkTest.java17
-rw-r--r--heat-model/src/test/java/com/woorea/openstack/heat/model/OutputTest.java16
-rw-r--r--heat-model/src/test/java/com/woorea/openstack/heat/model/ResourceTest.java19
-rw-r--r--heat-model/src/test/java/com/woorea/openstack/heat/model/ResourcesTest.java19
-rw-r--r--heat-model/src/test/java/com/woorea/openstack/heat/model/StackTest.java23
-rw-r--r--heat-model/src/test/java/com/woorea/openstack/heat/model/StacksTest.java19
-rw-r--r--heat-model/src/test/java/com/woorea/openstack/heat/model/UpdateStackParamTest.java18
18 files changed, 121 insertions, 108 deletions
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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 {