1 files changed, 96 insertions, 58 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/csar/ToscaFunctionYamlParsingHandler.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/csar/ToscaFunctionYamlParsingHandler.java
index 6bc74a69df..2a7af62a0c 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/csar/ToscaFunctionYamlParsingHandler.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/csar/ToscaFunctionYamlParsingHandler.java
@@ -27,6 +27,7 @@ import java.util.Optional;
 import java.util.stream.Stream;
 import org.openecomp.sdc.be.datatypes.elements.CustomYamlFunction;
 import org.openecomp.sdc.be.datatypes.elements.ToscaConcatFunction;
+import org.openecomp.sdc.be.datatypes.elements.ToscaCustomFunction;
 import org.openecomp.sdc.be.datatypes.elements.ToscaFunction;
 import org.openecomp.sdc.be.datatypes.elements.ToscaFunctionParameter;
 import org.openecomp.sdc.be.datatypes.elements.ToscaFunctionType;
@@ -38,6 +39,63 @@ import org.openecomp.sdc.be.datatypes.tosca.ToscaGetFunctionType;
 @org.springframework.stereotype.Component
 public class ToscaFunctionYamlParsingHandler {
 
+    private static Optional<ToscaFunction> handleGetPropertyFunction(Map<String, Object> toscaFunctionPropertyValueMap, String functionType,
+                                                                     ToscaFunctionType toscaFunctionType) {
+        final ToscaGetFunctionDataDefinition toscaGetFunction = new ToscaGetFunctionDataDefinition();
+        toscaGetFunction.setFunctionType(
+            toscaFunctionType == ToscaFunctionType.GET_PROPERTY ? ToscaGetFunctionType.GET_PROPERTY : ToscaGetFunctionType.GET_ATTRIBUTE
+        );
+        final Object functionValueObj = toscaFunctionPropertyValueMap.get(functionType);
+        if (!(functionValueObj instanceof List)) {
+            return Optional.empty();
+        }
+        final List<String> functionParameters;
+        try {
+            functionParameters = (List<String>) functionValueObj;
+        } catch (final ClassCastException ignored) {
+            return Optional.empty();
+        }
+        if (functionParameters.size() < 2) {
+            return Optional.empty();
+        }
+        final String propertySourceType = functionParameters.get(0);
+        final PropertySource propertySource = PropertySource.findType(propertySourceType).orElse(null);
+        if (propertySource == PropertySource.SELF) {
+            toscaGetFunction.setPropertySource(propertySource);
+        } else {
+            toscaGetFunction.setPropertySource(PropertySource.INSTANCE);
+            toscaGetFunction.setSourceName(propertySourceType);
+        }
+        toscaGetFunction.setPropertyPathFromSource(functionParameters.subList(1, functionParameters.size()));
+        final String propertyName = toscaGetFunction.getPropertyPathFromSource().get(toscaGetFunction.getPropertyPathFromSource().size() - 1);
+        toscaGetFunction.setPropertyName(propertyName);
+        return Optional.of(toscaGetFunction);
+    }
+
+    private static Optional<ToscaFunction> handleGetInputFunction(Map<String, Object> toscaFunctionPropertyValueMap, String functionType) {
+        final ToscaGetFunctionDataDefinition toscaGetFunction = new ToscaGetFunctionDataDefinition();
+        toscaGetFunction.setFunctionType(ToscaGetFunctionType.GET_INPUT);
+        toscaGetFunction.setPropertySource(PropertySource.SELF);
+        final Object functionValueObj = toscaFunctionPropertyValueMap.get(functionType);
+        if (!(functionValueObj instanceof List) && !(functionValueObj instanceof String)) {
+            return Optional.empty();
+        }
+        if (functionValueObj instanceof String) {
+            toscaGetFunction.setPropertyPathFromSource(List.of((String) functionValueObj));
+        } else {
+            final List<String> functionParameters;
+            try {
+                functionParameters = (List<String>) functionValueObj;
+            } catch (final ClassCastException ignored) {
+                return Optional.empty();
+            }
+            toscaGetFunction.setPropertyPathFromSource(functionParameters);
+        }
+        final String propertyName = toscaGetFunction.getPropertyPathFromSource().get(toscaGetFunction.getPropertyPathFromSource().size() - 1);
+        toscaGetFunction.setPropertyName(propertyName);
+        return Optional.of(toscaGetFunction);
+    }
+
     /**
      * Builds a {@link ToscaFunction} based on the property value. It will build the object with the maximum information available in the property
      * value, as not all the necessary information can be extracted from it. It will only parse values from supported functions in
@@ -51,7 +109,8 @@ public class ToscaFunctionYamlParsingHandler {
             return Optional.empty();
         }
         final String functionType = toscaFunctionPropertyValueMap.keySet().iterator().next();
-        final ToscaFunctionType toscaFunctionType = ToscaFunctionType.findType(functionType).orElse(null);
+        final ToscaFunctionType toscaFunctionType =
+            ToscaFunctionType.findType(functionType).orElse(functionType.startsWith("$") ? ToscaFunctionType.CUSTOM : null);
         if (toscaFunctionType == null) {
             return Optional.empty();
         }
@@ -65,11 +124,43 @@ public class ToscaFunctionYamlParsingHandler {
             }
             case CONCAT:
                 return handleConcatFunction(toscaFunctionPropertyValueMap, functionType);
+            case CUSTOM:
+                return handleCustomFunction(toscaFunctionPropertyValueMap, functionType);
             default:
                 return Optional.empty();
         }
     }
 
+    private Optional<ToscaFunction> handleCustomFunction(Map<String, Object> toscaFunctionPropertyValueMap, String functionType) {
+        final ToscaCustomFunction toscaCustomFunction = new ToscaCustomFunction();
+        toscaCustomFunction.setName(functionType.substring(1));
+        final Object functionValueObj = toscaFunctionPropertyValueMap.get(functionType);
+        if (!(functionValueObj instanceof List)) {
+            return Optional.empty();
+        }
+        final List<Object> functionParameters = (List<Object>) functionValueObj;
+        functionParameters.forEach(parameter -> {
+            if (parameter instanceof String) {
+                final var stringParameter = new ToscaStringParameter();
+                stringParameter.setValue((String) parameter);
+                toscaCustomFunction.addParameter(stringParameter);
+                return;
+            }
+            if (isPropertyValueToscaFunction(parameter)) {
+                buildToscaFunctionBasedOnPropertyValue((Map<String, Object>) parameter).ifPresent(toscaFunction -> {
+                    if (toscaFunction instanceof ToscaFunctionParameter) {
+                        toscaCustomFunction.addParameter((ToscaFunctionParameter) toscaFunction);
+                    }
+                });
+                return;
+            }
+            final var customYamlFunction = new CustomYamlFunction();
+            customYamlFunction.setYamlValue(parameter);
+            toscaCustomFunction.addParameter(customYamlFunction);
+        });
+        return Optional.of(toscaCustomFunction);
+    }
+
     /**
      * Checks if the property value is a supported TOSCA function.
      *
@@ -82,6 +173,10 @@ public class ToscaFunctionYamlParsingHandler {
             if (propValueMap.keySet().size() > 1) {
                 return false;
             }
+            if (propValueMap.keySet().stream().anyMatch(keyValue -> keyValue.startsWith("$"))) {
+                return true;
+            }
+
             return Stream.of(ToscaFunctionType.GET_INPUT, ToscaFunctionType.GET_PROPERTY, ToscaFunctionType.GET_ATTRIBUTE, ToscaFunctionType.CONCAT)
                 .anyMatch(type -> propValueMap.containsKey(type.getName()));
         }
@@ -120,61 +215,4 @@ public class ToscaFunctionYamlParsingHandler {
         return Optional.of(toscaConcatFunction);
     }
 
-    private static Optional<ToscaFunction> handleGetPropertyFunction(Map<String, Object> toscaFunctionPropertyValueMap, String functionType,
-                                                                     ToscaFunctionType toscaFunctionType) {
-        final ToscaGetFunctionDataDefinition toscaGetFunction = new ToscaGetFunctionDataDefinition();
-        toscaGetFunction.setFunctionType(
-            toscaFunctionType == ToscaFunctionType.GET_PROPERTY ? ToscaGetFunctionType.GET_PROPERTY : ToscaGetFunctionType.GET_ATTRIBUTE
-        );
-        final Object functionValueObj = toscaFunctionPropertyValueMap.get(functionType);
-        if (!(functionValueObj instanceof List)) {
-            return Optional.empty();
-        }
-        final List<String> functionParameters;
-        try {
-            functionParameters = (List<String>) functionValueObj;
-        } catch (final ClassCastException ignored) {
-            return Optional.empty();
-        }
-        if (functionParameters.size() < 2) {
-            return Optional.empty();
-        }
-        final String propertySourceType = functionParameters.get(0);
-        final PropertySource propertySource = PropertySource.findType(propertySourceType).orElse(null);
-        if (propertySource == PropertySource.SELF) {
-            toscaGetFunction.setPropertySource(propertySource);
-        } else {
-            toscaGetFunction.setPropertySource(PropertySource.INSTANCE);
-            toscaGetFunction.setSourceName(propertySourceType);
-        }
-        toscaGetFunction.setPropertyPathFromSource(functionParameters.subList(1, functionParameters.size()));
-        final String propertyName = toscaGetFunction.getPropertyPathFromSource().get(toscaGetFunction.getPropertyPathFromSource().size() - 1);
-        toscaGetFunction.setPropertyName(propertyName);
-        return Optional.of(toscaGetFunction);
-    }
-
-    private static Optional<ToscaFunction> handleGetInputFunction(Map<String, Object> toscaFunctionPropertyValueMap, String functionType) {
-        final ToscaGetFunctionDataDefinition toscaGetFunction = new ToscaGetFunctionDataDefinition();
-        toscaGetFunction.setFunctionType(ToscaGetFunctionType.GET_INPUT);
-        toscaGetFunction.setPropertySource(PropertySource.SELF);
-        final Object functionValueObj = toscaFunctionPropertyValueMap.get(functionType);
-        if (!(functionValueObj instanceof List) && !(functionValueObj instanceof String)) {
-            return Optional.empty();
-        }
-        if (functionValueObj instanceof String) {
-            toscaGetFunction.setPropertyPathFromSource(List.of((String) functionValueObj));
-        } else {
-            final List<String> functionParameters;
-            try {
-                functionParameters = (List<String>) functionValueObj;
-            } catch (final ClassCastException ignored) {
-                return Optional.empty();
-            }
-            toscaGetFunction.setPropertyPathFromSource(functionParameters);
-        }
-        final String propertyName = toscaGetFunction.getPropertyPathFromSource().get(toscaGetFunction.getPropertyPathFromSource().size() - 1);
-        toscaGetFunction.setPropertyName(propertyName);
-        return Optional.of(toscaGetFunction);
-    }
-
 }