1 files changed, 40 insertions, 45 deletions
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/ToscaAnalyzerService.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/ToscaAnalyzerService.java
index e4d75c1296..34f5a905fd 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/ToscaAnalyzerService.java
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/ToscaAnalyzerService.java
@@ -17,7 +17,7 @@
 package org.openecomp.sdc.tosca.services;
 
 import org.openecomp.sdc.tosca.datatypes.ToscaElementTypes;
-import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel;
+import org.openecomp.sdc.tosca.datatypes.ToscaFlatData;
 import org.onap.sdc.tosca.datatypes.model.CapabilityDefinition;
 import org.onap.sdc.tosca.datatypes.model.DefinitionOfDataType;
 import org.onap.sdc.tosca.datatypes.model.InterfaceDefinitionType;
@@ -33,67 +33,62 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-public interface ToscaAnalyzerService {
+import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel;
 
-  /*
-      node template with type equal to node type or derived from node type
-       */
-  Map<String, NodeTemplate> getNodeTemplatesByType(ServiceTemplate serviceTemplate, String nodeType,
-                                                   ToscaServiceModel toscaServiceModel);
+public interface ToscaAnalyzerService {
 
-  Optional<NodeType> fetchNodeType(String nodeTypeKey, Collection<ServiceTemplate> serviceTemplates);
+    /*
+        node template with type equal to node type or derived from node type
+         */
+    Map<String, NodeTemplate> getNodeTemplatesByType(ServiceTemplate serviceTemplate, String nodeType,
+                                                            ToscaServiceModel toscaServiceModel);
 
-  boolean isTypeOf(NodeTemplate nodeTemplate, String nodeType, ServiceTemplate serviceTemplate,
-                   ToscaServiceModel toscaServiceModel);
+    Optional<NodeType> fetchNodeType(String nodeTypeKey, Collection<ServiceTemplate> serviceTemplates);
 
-  List<RequirementAssignment> getRequirements(NodeTemplate nodeTemplate, String requirementId);
+    boolean isTypeOf(NodeTemplate nodeTemplate, String nodeType, ServiceTemplate serviceTemplate,
+                            ToscaServiceModel toscaServiceModel);
 
-  Optional<NodeTemplate> getNodeTemplateById(ServiceTemplate serviceTemplate,
-                                             String nodeTemplateId);
+    boolean isTypeOf(InterfaceDefinitionType interfaceDefinition, String interfaceType, ServiceTemplate serviceTemplate,
+                            ToscaServiceModel toscaServiceModel);
 
-  Optional<String> getSubstituteServiceTemplateName(String substituteNodeTemplateId,
-                                                    NodeTemplate substitutableNodeTemplate);
+    boolean isTypeOf(DefinitionOfDataType parameterDefinition, String dataType, ServiceTemplate serviceTemplate,
+                            ToscaServiceModel toscaServiceModel);
 
-  Map<String, NodeTemplate> getSubstitutableNodeTemplates(ServiceTemplate serviceTemplate);
+    List<RequirementAssignment> getRequirements(NodeTemplate nodeTemplate, String requirementId);
 
-  Optional<Map.Entry<String, NodeTemplate>> getSubstitutionMappedNodeTemplateByExposedReq(
-      String substituteServiceTemplateFileName, ServiceTemplate substituteServiceTemplate,
-      String requirementId);
+    Optional<NodeTemplate> getNodeTemplateById(ServiceTemplate serviceTemplate, String nodeTemplateId);
 
-  /*
-      match only for the input which is not null
-       */
-  boolean isDesiredRequirementAssignment(RequirementAssignment requirementAssignment,
-                                         String capability, String node, String relationship);
+    Optional<String> getSubstituteServiceTemplateName(String substituteNodeTemplateId,
+                                                             NodeTemplate substitutableNodeTemplate);
 
-  Object getFlatEntity(ToscaElementTypes elementType, String type, ServiceTemplate serviceTemplate,
-                       ToscaServiceModel toscaModel);
+    Map<String, NodeTemplate> getSubstitutableNodeTemplates(ServiceTemplate serviceTemplate);
 
-  boolean isSubstitutableNodeTemplate(NodeTemplate nodeTemplate);
+    Optional<Map.Entry<String, NodeTemplate>> getSubstitutionMappedNodeTemplateByExposedReq(String substituteServiceTemplateFileName,
+                                                                                                   ServiceTemplate substituteServiceTemplate,
+                                                                                                   String requirementId);
 
-  NodeType createInitSubstitutionNodeType(ServiceTemplate substitutionServiceTemplate,
-                                          String nodeTypeDerivedFromValue);
+    /*
+        match only for the input which is not null
+         */
+    boolean isDesiredRequirementAssignment(RequirementAssignment requirementAssignment, String capability, String node,
+                                                  String relationship);
 
-  boolean isRequirementExistInNodeTemplate(NodeTemplate nodeTemplate,
-                                           String requirementId,
-                                           RequirementAssignment requirementAssignment);
+    ToscaFlatData getFlatEntity(ToscaElementTypes elementType, String type, ServiceTemplate serviceTemplate,
+                                       ToscaServiceModel toscaModel);
 
-  Map<String, PropertyDefinition> manageSubstitutionNodeTypeProperties(
-      ServiceTemplate substitutionServiceTemplate);
+    boolean isSubstitutableNodeTemplate(NodeTemplate nodeTemplate);
 
-  Map<String, CapabilityDefinition> calculateExposedCapabilities(
-      Map<String, CapabilityDefinition> nodeTypeCapabilitiesDefinition,
-      Map<String, Map<String, RequirementAssignment>> fullFilledRequirementsDefinitionMap);
+    NodeType createInitSubstitutionNodeType(ServiceTemplate substitutionServiceTemplate,
+                                                   String nodeTypeDerivedFromValue);
 
-  List<Map<String, RequirementDefinition>> calculateExposedRequirements(
-      List<Map<String, RequirementDefinition>> nodeTypeRequirementsDefinitionList,
-      Map<String, RequirementAssignment> nodeTemplateRequirementsAssignment);
+    boolean isRequirementExistInNodeTemplate(NodeTemplate nodeTemplate, String requirementId,
+                                                    RequirementAssignment requirementAssignment);
 
-  boolean isTypeOf(InterfaceDefinitionType interfaceDefinition, String interfaceType,
-                   ServiceTemplate
-                       serviceTemplate, ToscaServiceModel toscaServiceModel);
+    Map<String, PropertyDefinition> manageSubstitutionNodeTypeProperties(ServiceTemplate substitutionServiceTemplate);
 
-  boolean isTypeOf(DefinitionOfDataType parameterDefinition, String dataType, ServiceTemplate
-      serviceTemplate, ToscaServiceModel toscaServiceModel);
+    Map<String, CapabilityDefinition> calculateExposedCapabilities(Map<String, CapabilityDefinition> nodeTypeCapabilitiesDefinition,
+                                                                          Map<String, Map<String, RequirementAssignment>> fullFilledRequirementsDefinitionMap);
 
+    List<Map<String, RequirementDefinition>> calculateExposedRequirements(List<Map<String, RequirementDefinition>> nodeTypeRequirementsDefinitionList,
+                                                                                 Map<String, RequirementAssignment> nodeTemplateRequirementsAssignment);
 }