From 0411615fe4f55fe3463da2576de376c7478fcfb2 Mon Sep 17 00:00:00 2001 From: MichaelMorris Date: Fri, 26 Aug 2022 11:00:03 +0100 Subject: Support TOSCA functions in sub properties Change-Id: Ibfd95c928bbb10089cfc9749ae4e7b05270e3d68 Issue-ID: SDC-4151 Signed-off-by: MichaelMorris --- .../datatypes/elements/PropertyDataDefinition.java | 3 ++ .../elements/SubPropertyToscaFunction.java | 32 ++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/SubPropertyToscaFunction.java (limited to 'common-be/src') diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinition.java index adfef9c426..8297ef1984 100644 --- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinition.java +++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinition.java @@ -24,6 +24,7 @@ import static org.apache.commons.collections.CollectionUtils.isNotEmpty; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -67,6 +68,7 @@ public class PropertyDataDefinition extends ToscaDataDefinition { @Deprecated private ToscaGetFunctionDataDefinition toscaGetFunction; private ToscaFunction toscaFunction; + private Collection subPropertyToscaFunctions; private String inputPath; private String status; @@ -126,6 +128,7 @@ public class PropertyDataDefinition extends ToscaDataDefinition { this.setToscaFunction(propertyDataDefinition.getToscaFunction()); this.parentPropertyType = propertyDataDefinition.getParentPropertyType(); this.subPropertyInputPath = propertyDataDefinition.getSubPropertyInputPath(); + this.subPropertyToscaFunctions = propertyDataDefinition.getSubPropertyToscaFunctions(); if (isNotEmpty(propertyDataDefinition.annotations)) { this.setAnnotations(propertyDataDefinition.annotations); } diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/SubPropertyToscaFunction.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/SubPropertyToscaFunction.java new file mode 100644 index 0000000000..15170c0e6a --- /dev/null +++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/SubPropertyToscaFunction.java @@ -0,0 +1,32 @@ +/* + * - + * ============LICENSE_START======================================================= + * Copyright (C) 2022 Nordix Foundation. + * ================================================================================ + * 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. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.openecomp.sdc.be.datatypes.elements; + +import java.util.List; +import lombok.Data; + +@Data +public class SubPropertyToscaFunction { + private ToscaFunction toscaFunction; + private List subPropertyPath; + +} -- cgit 1.2.3-korg