Support TOSCA functions in operation inputs
[sdc.git] / catalog-be / src / main / java / org / openecomp / sdc / be / tosca / PropertyConvertor.java
index b841436..bb89d99 100644 (file)
@@ -7,9 +7,9 @@
  * 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.
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.be.tosca;
 
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonParser;
+import com.google.gson.stream.JsonReader;
+import fj.data.Either;
 import java.io.StringReader;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
-
+import java.util.Objects;
+import java.util.function.Supplier;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.SchemaDefinition;
+import org.openecomp.sdc.be.datatypes.elements.ToscaFunctionType;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.DataTypeDefinition;
+import org.openecomp.sdc.be.model.PropertyConstraint;
 import org.openecomp.sdc.be.model.PropertyDefinition;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.tosca.ToscaPropertyType;
+import org.openecomp.sdc.be.model.tosca.ToscaType;
+import org.openecomp.sdc.be.model.tosca.constraints.EqualConstraint;
+import org.openecomp.sdc.be.model.tosca.constraints.GreaterOrEqualConstraint;
+import org.openecomp.sdc.be.model.tosca.constraints.GreaterThanConstraint;
+import org.openecomp.sdc.be.model.tosca.constraints.InRangeConstraint;
+import org.openecomp.sdc.be.model.tosca.constraints.LengthConstraint;
+import org.openecomp.sdc.be.model.tosca.constraints.LessOrEqualConstraint;
+import org.openecomp.sdc.be.model.tosca.constraints.LessThanConstraint;
+import org.openecomp.sdc.be.model.tosca.constraints.MaxLengthConstraint;
+import org.openecomp.sdc.be.model.tosca.constraints.MinLengthConstraint;
+import org.openecomp.sdc.be.model.tosca.constraints.PatternConstraint;
+import org.openecomp.sdc.be.model.tosca.constraints.ValidValuesConstraint;
+import org.openecomp.sdc.be.model.tosca.constraints.exception.ConstraintValueDoNotMatchPropertyTypeException;
+import org.openecomp.sdc.be.model.tosca.converters.DataTypePropertyConverter;
 import org.openecomp.sdc.be.model.tosca.converters.ToscaMapValueConverter;
+import org.openecomp.sdc.be.model.tosca.converters.ToscaValueBaseConverter;
 import org.openecomp.sdc.be.model.tosca.converters.ToscaValueConverter;
-import org.openecomp.sdc.be.tosca.model.EntrySchema;
 import org.openecomp.sdc.be.tosca.model.ToscaNodeType;
 import org.openecomp.sdc.be.tosca.model.ToscaProperty;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.be.tosca.model.ToscaPropertyConstraint;
+import org.openecomp.sdc.be.tosca.model.ToscaPropertyConstraintEqual;
+import org.openecomp.sdc.be.tosca.model.ToscaPropertyConstraintGreaterOrEqual;
+import org.openecomp.sdc.be.tosca.model.ToscaPropertyConstraintGreaterThan;
+import org.openecomp.sdc.be.tosca.model.ToscaPropertyConstraintInRange;
+import org.openecomp.sdc.be.tosca.model.ToscaPropertyConstraintLength;
+import org.openecomp.sdc.be.tosca.model.ToscaPropertyConstraintLessOrEqual;
+import org.openecomp.sdc.be.tosca.model.ToscaPropertyConstraintLessThan;
+import org.openecomp.sdc.be.tosca.model.ToscaPropertyConstraintMaxLength;
+import org.openecomp.sdc.be.tosca.model.ToscaPropertyConstraintMinLength;
+import org.openecomp.sdc.be.tosca.model.ToscaPropertyConstraintPattern;
+import org.openecomp.sdc.be.tosca.model.ToscaPropertyConstraintValidValues;
+import org.openecomp.sdc.be.tosca.model.ToscaSchemaDefinition;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+import org.openecomp.sdc.tosca.datatypes.ToscaFunctions;
+import org.springframework.stereotype.Service;
+import org.yaml.snakeyaml.Yaml;
 
-import com.google.gson.Gson;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import com.google.gson.JsonSyntaxException;
-import com.google.gson.stream.JsonReader;
+@Service
+public class PropertyConvertor {
 
-import fj.data.Either;
+    private static final Logger log = Logger.getLogger(PropertyConvertor.class);
 
-public class PropertyConvertor {
-       private static PropertyConvertor instance;
-       private JsonParser jsonParser = new JsonParser();
-       private static Logger log = LoggerFactory.getLogger(PropertyConvertor.class.getName());
-       Gson gson = new Gson();
-       protected PropertyConvertor() {
-
-       }
-
-       public static synchronized PropertyConvertor getInstance() {
-               if (instance == null) {
-                       instance = new PropertyConvertor();
-               }
-               return instance;
-       }
-
-       public Either<ToscaNodeType, ToscaError> convertProperties(Component component, ToscaNodeType toscaNodeType, Map<String, DataTypeDefinition> dataTypes) {
-
-               if (component instanceof Resource) {
-                       Resource resource = (Resource) component;
-                       List<PropertyDefinition> props = resource.getProperties();
-                       if (props != null) {
-                               Map<String, ToscaProperty> properties = new HashMap<>();
-
-                               // take only the properties of this resource
-                               props.stream().filter(p -> p.getOwnerId() == null || p.getOwnerId().equals(component.getUniqueId())).forEach(property -> {
-                                       ToscaProperty prop = convertProperty(dataTypes, property, false);
-
-                                       properties.put(property.getName(), prop);
-                               });
-                               if (!properties.isEmpty()) {
-                                       toscaNodeType.setProperties(properties);
-                               }
-                       }
-               }
-               return Either.left(toscaNodeType);
-       }
-
-       public ToscaProperty convertProperty(Map<String, DataTypeDefinition> dataTypes, PropertyDefinition property, boolean isCapabiltyProperty) {
-               ToscaProperty prop = new ToscaProperty();
-
-               String innerType = null;
-               SchemaDefinition schema = property.getSchema();
-               if (schema != null && schema.getProperty() != null && schema.getProperty().getType() != null && !schema.getProperty().getType().isEmpty()) {
-                       innerType = schema.getProperty().getType();
-                       EntrySchema eschema = new EntrySchema();
-                       eschema.setType(innerType);
-                       eschema.setDescription(schema.getProperty().getDescription());
-                       prop.setEntry_schema(eschema);
-               }
-               log.trace("try to convert property {} from type {} with default value [{}]", property.getName(), property.getType(), property.getDefaultValue());
-               prop.setDefaultp(convertToToscaObject(property.getType(), property.getName(), property.getDefaultValue(), innerType, dataTypes));
-               prop.setType(property.getType());
-               prop.setDescription(property.getDescription());
-               if (isCapabiltyProperty) {
-                       prop.setStatus(property.getStatus());
-                       prop.setRequired(property.isRequired());
-               }
-               return prop;
-       }
-
-       public Object convertToToscaObject(String propertyType, String propertyName, String value, String innerType, Map<String, DataTypeDefinition> dataTypes) {
-               log.trace("try to convert propertyType {} , value [{}], innerType {}", propertyType, value, innerType);
-               if (value == null) {
-                       value = getDataTypeDefaultValue(propertyName, dataTypes.get(propertyType));
-                       if(StringUtils.isEmpty(value)){
-                               return null;
-                       }
-
-               }
-               try {
-                       ToscaMapValueConverter mapConverterInst = ToscaMapValueConverter.getInstance();
-                       ToscaValueConverter innerConverter = null;
-                       Boolean isScalar = true;
-       
-                       ToscaPropertyType type = ToscaPropertyType.isValidType(propertyType);
-                       if (type == null) {
-                               log.trace("isn't prederfined type, get from all data types");
-                               DataTypeDefinition dataTypeDefinition = dataTypes.get(propertyType);
-                               if (innerType == null) {
-                                       innerType = propertyType;
-                               }
-       
-                               if ((type = mapConverterInst.isScalarType(dataTypeDefinition)) != null) {
-                                       log.trace("This is scalar type. get suitable converter for type {}", type);
-                                       innerConverter = type.getValueConverter();
-                               } else {
-                                       isScalar = false;
-                               }
-                       } else {
-                               ToscaPropertyType typeIfScalar = ToscaPropertyType.getTypeIfScalar(type.getType());
-                               if (typeIfScalar == null) {
-                                       isScalar = false;
-                               }
-       
-                               innerConverter = type.getValueConverter();
-                               if (ToscaPropertyType.STRING.equals(type) && value.startsWith("/")) {
-                                       return innerConverter.convertToToscaValue(value, innerType, dataTypes);
-                               }
-                       }
-                       JsonElement jsonElement = null;
-               
-                       StringReader reader = new StringReader(value);
-                       JsonReader jsonReader = new JsonReader(reader);
-                       jsonReader.setLenient(true);
-
-                       jsonElement = jsonParser.parse(jsonReader);
-
-                       if (value.equals("")) {
-                               return value;
-                       }
-
-                       if (jsonElement.isJsonPrimitive() && isScalar) {
-                               log.trace("It's well defined type. convert it");
-                               ToscaValueConverter converter = type.getValueConverter();
-                               return converter.convertToToscaValue(value, innerType, dataTypes);
-                       } else {
-                               log.trace("It's data type or inputs in primitive type. convert as map");
-                               Object convertedValue;
-                               if (innerConverter != null && (ToscaPropertyType.MAP.equals(type) || ToscaPropertyType.LIST.equals(type))) {
-                                       convertedValue = innerConverter.convertToToscaValue(value, innerType, dataTypes);
-                               } else {
-                                       if (isScalar) {
-                                               // complex json for scalar type
-                                               convertedValue = mapConverterInst.handleComplexJsonValue(jsonElement);
-                                       } else {
-                                               if (innerConverter != null) {
-                                                       convertedValue = innerConverter.convertToToscaValue(value, innerType, dataTypes);
-                                               } else {
-                                                       convertedValue = mapConverterInst.convertDataTypeToToscaObject(innerType, dataTypes, innerConverter, isScalar, jsonElement);
-                                               }
-                                       }
-                               }
-                               return convertedValue;
-                       }
-
-               } catch (Exception e) {
-                       log.debug("convertToToscaValue failed to parse json value :", e);
-                       return null;
-               }
-
-       }
-
-       private String getDataTypeDefaultValue(String propertyName, DataTypeDefinition dataTypeDefinition) {
-               
-               String delaultValue = null;
-               JsonObject asJsonObjectIn = new JsonObject();
-               Map<String, PropertyDefinition> allParentsProps = new HashMap<>();
-               while (dataTypeDefinition != null) {
-
-                       List<PropertyDefinition> currentParentsProps = dataTypeDefinition.getProperties();
-                       if (currentParentsProps != null) {
-                               currentParentsProps.stream().forEach(p -> allParentsProps.put(p.getName(), p));
-                       }
-
-                       dataTypeDefinition = dataTypeDefinition.getDerivedFrom();
-               }
-               for (Entry<String, PropertyDefinition> entry : allParentsProps.entrySet()) {
-                       String propName = entry.getKey();
-                       PropertyDefinition propertyDefinition = entry.getValue();
-                       JsonElement elementValue = asJsonObjectIn.get(propName);
-                       if(elementValue == null && propertyDefinition.getDefaultValue() != null){
-                               JsonReader jsonReader = new JsonReader(new StringReader(propertyDefinition.getDefaultValue()));
-                               jsonReader.setLenient(true);
-                               elementValue = jsonParser.parse(jsonReader);
-                               asJsonObjectIn.add(propName, elementValue);
-                       }
-               }
-               if(!asJsonObjectIn.isJsonNull()){
-                       delaultValue = gson.toJson(asJsonObjectIn);
-               }
-               return delaultValue;
-       }
+    public Either<ToscaNodeType, ToscaError> convertProperties(Component component, ToscaNodeType toscaNodeType,
+                                                               Map<String, DataTypeDefinition> dataTypes) {
+        if (component instanceof Resource) {
+            Resource resource = (Resource) component;
+            List<PropertyDefinition> props = resource.getProperties();
+            if (props != null) {
+                Map<String, ToscaProperty> properties = new HashMap<>();
+                // take only the properties of this resource
+                props.stream().filter(p -> p.getOwnerId() == null || p.getOwnerId().equals(component.getUniqueId())).forEach(property ->
+                    properties.put(property.getName(), convertProperty(dataTypes, property, PropertyType.PROPERTY))
+                );
+                if (!properties.isEmpty()) {
+                    toscaNodeType.setProperties(properties);
+                }
+            }
+        }
+        return Either.left(toscaNodeType);
+    }
+
+    public ToscaProperty convertProperty(Map<String, DataTypeDefinition> dataTypes, PropertyDefinition property, PropertyType propertyType) {
+        ToscaProperty prop = new ToscaProperty();
+        log.trace("try to convert property {} from type {} with default value [{}]", property.getName(), property.getType(),
+            property.getDefaultValue());
+        SchemaDefinition schema = property.getSchema();
+        if (schema != null && schema.getProperty() != null && schema.getProperty().getType() != null && !schema.getProperty().getType().isEmpty()) {
+            final ToscaSchemaDefinition toscaSchemaDefinition = new ToscaSchemaDefinition();
+            toscaSchemaDefinition.setType(schema.getProperty().getType());
+            toscaSchemaDefinition.setDescription(schema.getProperty().getDescription());
+            prop.setEntry_schema(toscaSchemaDefinition);
+        }
+        String defaultValue = property.getDefaultValue();
+        if (Objects.isNull(defaultValue)) {
+            defaultValue = property.getValue();
+        }
+        Object convertedObj = convertToToscaObject(property, defaultValue, dataTypes, false);
+        if (convertedObj != null) {
+            prop.setDefaultp(convertedObj);
+        }
+        prop.setType(property.getType());
+        prop.setDescription(property.getDescription());
+        prop.setRequired(property.isRequired());
+        if (propertyType.equals(PropertyType.CAPABILITY)) {
+            prop.setStatus(property.getStatus());
+        }
+        prop.setMetadata(property.getMetadata());
+
+        if (CollectionUtils.isNotEmpty(property.getConstraints())) {
+            try {
+                prop.setConstraints(convertConstraints(property.getConstraints(), property.getType(), property.getSchemaType()));
+            } catch (ConstraintValueDoNotMatchPropertyTypeException e) {
+                log.error(e.getMessage());
+            }
+        }
+        return prop;
+    }
+
+    private List<ToscaPropertyConstraint> convertConstraints(List<PropertyConstraint> constraints, String propertyType, String schemaType)
+        throws ConstraintValueDoNotMatchPropertyTypeException {
+        List<ToscaPropertyConstraint> convertedConstraints = new ArrayList<>();
+        for (PropertyConstraint constraint : constraints) {
+            if (constraint instanceof EqualConstraint) {
+                EqualConstraint equalConstraint = ((EqualConstraint) constraint);
+
+                if (doesTypeNeedConvertingToIntOrFloat(propertyType)) {
+                    equalConstraint.changeConstraintValueTypeTo(propertyType);
+                }
+
+                ToscaPropertyConstraintEqual prop = new ToscaPropertyConstraintEqual(equalConstraint.getEqual());
+                convertedConstraints.add(prop);
+            }
+            if (constraint instanceof GreaterThanConstraint) {
+                GreaterThanConstraint greaterThanConstraint = ((GreaterThanConstraint) constraint);
+
+                if (doesTypeNeedConvertingToIntOrFloat(propertyType)) {
+                    greaterThanConstraint.changeConstraintValueTypeTo(propertyType);
+                }
+
+                ToscaPropertyConstraintGreaterThan prop = new ToscaPropertyConstraintGreaterThan(greaterThanConstraint.getGreaterThan());
+                convertedConstraints.add(prop);
+            }
+            if (constraint instanceof GreaterOrEqualConstraint) {
+                GreaterOrEqualConstraint greaterOrEqualConstraint = ((GreaterOrEqualConstraint) constraint);
+
+                if (doesTypeNeedConvertingToIntOrFloat(propertyType)) {
+                    greaterOrEqualConstraint.changeConstraintValueTypeTo(propertyType);
+                }
+
+                ToscaPropertyConstraintGreaterOrEqual prop = new ToscaPropertyConstraintGreaterOrEqual(greaterOrEqualConstraint.getGreaterOrEqual());
+                convertedConstraints.add(prop);
+            }
+            if (constraint instanceof LessThanConstraint) {
+                LessThanConstraint lessThanConstraint = ((LessThanConstraint) constraint);
+
+                if (doesTypeNeedConvertingToIntOrFloat(propertyType)) {
+                    lessThanConstraint.changeConstraintValueTypeTo(propertyType);
+                }
+
+                ToscaPropertyConstraintLessThan prop = new ToscaPropertyConstraintLessThan(lessThanConstraint.getLessThan());
+                convertedConstraints.add(prop);
+            }
+            if (constraint instanceof LessOrEqualConstraint) {
+                LessOrEqualConstraint lessOrEqualConstraint = ((LessOrEqualConstraint) constraint);
+
+                if (doesTypeNeedConvertingToIntOrFloat(propertyType)) {
+                    lessOrEqualConstraint.changeConstraintValueTypeTo(propertyType);
+                }
+
+                ToscaPropertyConstraintLessOrEqual prop = new ToscaPropertyConstraintLessOrEqual(lessOrEqualConstraint.getLessOrEqual());
+                convertedConstraints.add(prop);
+            }
+            if (constraint instanceof InRangeConstraint) {
+                InRangeConstraint inRangeConstraint = (InRangeConstraint) constraint;
+
+                if (doesTypeNeedConvertingToIntOrFloat(propertyType)) {
+                    inRangeConstraint.changeConstraintValueTypeTo(propertyType);
+                }
+
+                convertedConstraints.add(new ToscaPropertyConstraintInRange(inRangeConstraint.getInRange()));
+            }
+            if (constraint instanceof ValidValuesConstraint) {
+                ValidValuesConstraint validValues = ((ValidValuesConstraint) constraint);
+
+                if (isTypeMapOrList(propertyType) && doesTypeNeedConvertingToIntOrFloat(schemaType)) {
+                    validValues.changeConstraintValueTypeTo(schemaType);
+                } else if (doesTypeNeedConvertingToIntOrFloat(propertyType)) {
+                    validValues.changeConstraintValueTypeTo(propertyType);
+                }
+
+                List prop = validValues.getValidValues();
+                convertedConstraints.add(new ToscaPropertyConstraintValidValues(prop));
+            }
+            if (constraint instanceof LengthConstraint) {
+                convertedConstraints.add(new ToscaPropertyConstraintLength(((LengthConstraint) constraint).getLength()));
+            }
+            if (constraint instanceof MinLengthConstraint) {
+                convertedConstraints.add(new ToscaPropertyConstraintMinLength(((MinLengthConstraint) constraint).getMinLength()));
+            }
+            if (constraint instanceof MaxLengthConstraint) {
+                convertedConstraints.add(new ToscaPropertyConstraintMaxLength(((MaxLengthConstraint) constraint).getMaxLength()));
+            }
+            if (constraint instanceof PatternConstraint) {
+                convertedConstraints.add(new ToscaPropertyConstraintPattern(((PatternConstraint) constraint).getPattern()));
+            }
+        }
+        return convertedConstraints;
+    }
+
+    private boolean doesTypeNeedConvertingToIntOrFloat(String propertyType) {
+        return ToscaType.INTEGER.getType().equals(propertyType) || ToscaType.FLOAT.getType().equals(propertyType);
+    }
+
+    private boolean isTypeMapOrList (String type) {
+        return ToscaType.MAP.getType().equals(type) || ToscaType.LIST.getType().equals(type);
+    }
+
+    public Object convertToToscaObject(PropertyDataDefinition property, String value, Map<String, DataTypeDefinition> dataTypes,
+                                       boolean preserveEmptyValue) {
+        String propertyType = property.getType();
+        String innerType = property.getSchemaType();
+        log.trace("try to convert propertyType {} , value [{}], innerType {}", propertyType, value, innerType);
+        if (StringUtils.isEmpty(value)) {
+            value = DataTypePropertyConverter.getInstance().getDataTypePropertiesDefaultValuesRec(propertyType, dataTypes);
+            if (StringUtils.isEmpty(value)) {
+                return null;
+            }
+        }
+        if (property.isToscaFunction() && property.getToscaFunction().getType() == ToscaFunctionType.YAML) {
+            return new Yaml().load(property.getValue());
+        }
+        try {
+            ToscaMapValueConverter mapConverterInst = ToscaMapValueConverter.getInstance();
+            ToscaValueConverter innerConverter = null;
+            boolean isScalar = true;
+            ToscaPropertyType type = ToscaPropertyType.isValidType(propertyType);
+            if (type == null) {
+                log.trace("isn't prederfined type, get from all data types");
+                DataTypeDefinition dataTypeDefinition = dataTypes.get(propertyType);
+                if (innerType == null) {
+                    innerType = propertyType;
+                }
+                if ((type = mapConverterInst.isScalarType(dataTypeDefinition)) != null) {
+                    log.trace("This is scalar type. get suitable converter for type {}", type);
+                    innerConverter = type.getValueConverter();
+                } else {
+                    isScalar = false;
+                }
+            } else {
+                ToscaPropertyType typeIfScalar = ToscaPropertyType.getTypeIfScalar(type.getType());
+                if (typeIfScalar == null) {
+                    isScalar = false;
+                }
+                innerConverter = type.getValueConverter();
+                if (ToscaPropertyType.STRING == type && valueStartsWithNonJsonChar(value)) {
+                    return innerConverter.convertToToscaValue(value, innerType, dataTypes);
+                }
+            }
+            JsonElement jsonElement = null;
+            StringReader reader = new StringReader(value);
+            JsonReader jsonReader = new JsonReader(reader);
+            jsonReader.setLenient(true);
+            jsonElement = JsonParser.parseReader(jsonReader);
+            if (value.equals("")) {
+                return value;
+            }
+            if (jsonElement.isJsonPrimitive() && isScalar) {
+                log.trace("It's well defined type. convert it");
+                ToscaValueConverter converter = type.getValueConverter();
+                return converter.convertToToscaValue(value, innerType, dataTypes);
+            }
+            log.trace("It's data type or inputs in primitive type. convert as map");
+            if (jsonElement.isJsonObject()) {
+                JsonObject jsonObj = jsonElement.getAsJsonObject();
+                // check if value is a get_input function
+                if (jsonObj.entrySet().size() == 1 && jsonObj.has(ToscaFunctions.GET_INPUT.getFunctionName())) {
+                    Object obj = mapConverterInst.handleComplexJsonValue(jsonElement);
+                    log.debug("It's get_input function. obj={}", obj);
+                    return obj;
+                }
+            }
+            Object convertedValue;
+            if (innerConverter != null && (ToscaPropertyType.MAP == type || ToscaPropertyType.LIST == type)) {
+                convertedValue = innerConverter.convertToToscaValue(value, innerType, dataTypes);
+            } else if (isScalar) {
+                // complex json for scalar type
+                convertedValue = mapConverterInst.handleComplexJsonValue(jsonElement);
+            } else if (innerConverter != null) {
+                convertedValue = innerConverter.convertToToscaValue(value, innerType, dataTypes);
+            } else {
+                convertedValue = mapConverterInst
+                    .convertDataTypeToToscaObject(innerType, dataTypes, innerConverter, isScalar, jsonElement, preserveEmptyValue,
+                        property.isToscaFunction());
+            }
+            return convertedValue;
+
+        } catch (JsonParseException e) {
+            log.trace("{} not parsable as JSON. Convert as YAML instead", value);
+            return new Yaml().load(value);
+        } catch (Exception e) {
+            log.debug("convertToToscaValue failed to parse json value :", e);
+            return null;
+        }
+    }
+
+    private boolean valueStartsWithNonJsonChar(String value) {
+        return value.startsWith("/") || value.startsWith(":");
+    }
+
+    public void convertAndAddValue(Map<String, DataTypeDefinition> dataTypes, Map<String, Object> props, PropertyDataDefinition prop,
+                                   Supplier<String> supplier) {
+        Object convertedValue = convertValue(dataTypes, prop, supplier);
+        if (!ToscaValueBaseConverter.isEmptyObjectValue(convertedValue)) {
+            props.put(prop.getName(), convertedValue);
+        }
+    }
+
+    private <T extends PropertyDataDefinition> Object convertValue(Map<String, DataTypeDefinition> dataTypes, T input, Supplier<String> supplier) {
+        return convertToToscaObject(input, supplier.get(), dataTypes, false);
+    }
 
+    public enum PropertyType {CAPABILITY, INPUT, PROPERTY}
 }