aboutsummaryrefslogtreecommitdiffstats
path: root/cloudify-client/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'cloudify-client/src/main')
-rw-r--r--cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Blueprint.java7
-rw-r--r--cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Deployment.java22
-rw-r--r--cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/DeploymentOutputs.java9
-rw-r--r--cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Metadata.java27
-rw-r--r--cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Pagination.java51
5 files changed, 75 insertions, 41 deletions
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Blueprint.java b/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Blueprint.java
index a33c5206f2..468195909f 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Blueprint.java
+++ b/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Blueprint.java
@@ -57,10 +57,6 @@ public class Blueprint implements Serializable {
@JsonProperty("updated_at")
private Date updatedAt;
- // ObjectMapper instance to parse Json stack outputs
- @JsonIgnore
- private static ObjectMapper mapper = new ObjectMapper();
-
public Date getCreatedAt() {
return createdAt;
}
@@ -124,6 +120,9 @@ public class Blueprint implements Serializable {
*/
public <T> T getMapValue (Map<String,Object> map, String key, Class<T> type)
{
+
+ ObjectMapper mapper = new ObjectMapper();
+
if (map.containsKey(key)) {
try {
String s = mapper.writeValueAsString(map.get(key));
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Deployment.java b/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Deployment.java
index 453dd3f692..515e8a0be1 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Deployment.java
+++ b/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Deployment.java
@@ -78,10 +78,22 @@ public class Deployment implements Serializable {
@JsonProperty("workflows")
private List<Workflow> workflows;
- // ObjectMapper instance to parse Json object outputs
- @JsonIgnore
- private static ObjectMapper mapper = new ObjectMapper();
-
+ public List<Object> getPolicyTriggers() {
+ return policyTriggers;
+ }
+
+ public void setPolicyTriggers(List<Object> policyTriggers) {
+ this.policyTriggers = policyTriggers;
+ }
+
+ public List<Object> getPolicyTypes() {
+ return policyTypes;
+ }
+
+ public void setPolicyTypes(List<Object> policyTypes) {
+ this.policyTypes = policyTypes;
+ }
+
public String getBlueprintId() {
return blueprintId;
}
@@ -320,6 +332,8 @@ public class Deployment implements Serializable {
*/
public <T> T getMapValue (Map<String,Object> map, String key, Class<T> type)
{
+
+ ObjectMapper mapper = new ObjectMapper();
if (map.containsKey(key)) {
try {
String s = mapper.writeValueAsString(map.get(key));
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/DeploymentOutputs.java b/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/DeploymentOutputs.java
index 11fe7faae0..26d2ae20bc 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/DeploymentOutputs.java
+++ b/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/DeploymentOutputs.java
@@ -41,12 +41,6 @@ public class DeploymentOutputs implements Serializable {
@JsonProperty("outputs")
private Map<String, Object> outputs = null;
-
- // ObjectMapper instance to parse Json object outputs
- @JsonIgnore
- private static ObjectMapper mapper = new ObjectMapper();
-
-
public Map<String, Object> getOutputs() {
return this.outputs;
}
@@ -67,6 +61,9 @@ public class DeploymentOutputs implements Serializable {
*/
public <T> T getMapValue (Map<String,Object> map, String key, Class<T> type)
{
+
+ ObjectMapper mapper = new ObjectMapper();
+
if (map.containsKey(key)) {
try {
String s = mapper.writeValueAsString(map.get(key));
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Metadata.java b/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Metadata.java
index d44e92b1bc..31e3b0dbe3 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Metadata.java
+++ b/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Metadata.java
@@ -54,31 +54,4 @@ public class Metadata implements Serializable {
this.pagination = pagination;
}
- public class Pagination {
- @JsonProperty("total")
- private int total;
- @JsonProperty("offset")
- private int offset;
- @JsonProperty("size")
- private int size;
-
- public int getTotal() {
- return total;
- }
- public void setTotal(int total) {
- this.total = total;
- }
- public int getOffset() {
- return offset;
- }
- public void setOffset(int offset) {
- this.offset = offset;
- }
- public int getSize() {
- return size;
- }
- public void setSize(int size) {
- this.size = size;
- }
- }
}
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Pagination.java b/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Pagination.java
new file mode 100644
index 0000000000..a79f053ca2
--- /dev/null
+++ b/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Pagination.java
@@ -0,0 +1,51 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.mso.cloudify.v3.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class Pagination {
+ @JsonProperty("total")
+ private int total;
+ @JsonProperty("offset")
+ private int offset;
+ @JsonProperty("size")
+ private int size;
+
+ public int getTotal() {
+ return total;
+ }
+ public void setTotal(int total) {
+ this.total = total;
+ }
+ public int getOffset() {
+ return offset;
+ }
+ public void setOffset(int offset) {
+ this.offset = offset;
+ }
+ public int getSize() {
+ return size;
+ }
+ public void setSize(int size) {
+ this.size = size;
+ }
+} \ No newline at end of file