Fix PropertyConvertor initialization (use spring) 50/101650/2
authortalig <talig@amdocs.com>
Thu, 13 Feb 2020 07:02:47 +0000 (09:02 +0200)
committerOren Kleks <oren.kleks@amdocs.com>
Thu, 13 Feb 2020 12:50:04 +0000 (12:50 +0000)
commit8fea9935b3dd4a020bcfdd7cea3125b8f90edad0
tree74666c95ec852ebf3f40111cc25bc9f3c7d47c0d
parentf70e2b5f66493822b512767d504ae26275cb16a2
Fix PropertyConvertor initialization (use spring)

refactor static InterfacesOperationsToscaUtil to be non-static
InterfacesOperationsConverter (as it uses PropertyConvertor),

move logic from static ToscaExportUtils to ToscaExportHandler
(as it uses PropertyConvertor)

Change-Id: I917351ca59ee1e792c7b0850d6a8b246b71b4b03
Issue-ID: SDC-2765
Signed-off-by: talig <talig@amdocs.com>
25 files changed:
catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InterfaceOperationBusinessLogic.java
catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceBusinessLogic.java
catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/PropertyDataValueMergeBusinessLogic.java
catalog-be/src/main/java/org/openecomp/sdc/be/components/utils/InterfaceOperationUtils.java
catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ServiceConsumptionServlet.java
catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CapabilityRequirementConverter.java
catalog-be/src/main/java/org/openecomp/sdc/be/tosca/GroupExportParserImpl.java
catalog-be/src/main/java/org/openecomp/sdc/be/tosca/InterfacesOperationsConverter.java [moved from catalog-be/src/main/java/org/openecomp/sdc/be/tosca/utils/InterfacesOperationsToscaUtil.java with 92% similarity]
catalog-be/src/main/java/org/openecomp/sdc/be/tosca/PolicyExportParserImpl.java
catalog-be/src/main/java/org/openecomp/sdc/be/tosca/PropertyConvertor.java
catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java
catalog-be/src/main/java/org/openecomp/sdc/be/tosca/utils/InputConverter.java
catalog-be/src/main/java/org/openecomp/sdc/be/tosca/utils/ToscaExportUtils.java [deleted file]
catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/utils/PropertiesUtilsTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/property/PropertyDataValueMergeBusinessLogicTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/tosca/CapabilityRequirementConverterTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/tosca/GroupExportParserImplTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/tosca/InputAnnotationConvertToToscaTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/tosca/PolicyExportParserImplTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/tosca/PropertyConvertorTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/tosca/ToscaExportHandlerTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/tosca/ToscaExportUtilsTest.java [deleted file]
catalog-be/src/test/java/org/openecomp/sdc/be/tosca/utils/InterfacesOperationsConverterTest.java [moved from catalog-be/src/test/java/org/openecomp/sdc/be/tosca/utils/InterfacesOperationsToscaUtilTest.java with 93% similarity]
common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinition.java
common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinitionTest.java