Load type mappings from a group configuration file 55/77455/2
authormark.j.leonard <mark.j.leonard@gmail.com>
Mon, 28 Jan 2019 11:42:54 +0000 (11:42 +0000)
committermark.j.leonard <mark.j.leonard@gmail.com>
Wed, 30 Jan 2019 14:05:06 +0000 (14:05 +0000)
commit7fcc74469c941c1834cd02b54ff5ca88a53bf83b
tree3d9c130fb098cb996d2c8db4a8b9f57501c393b6
parent6833fb0a9a3f8c26688ad5c323eb266827b707c2
Load type mappings from a group configuration file

Change the filter-types.properties file: re-implement to use JSON
content. Remove the System Property that defines the location of the
file and add this to the Spring application properties.

Initialise the type-to-model mappings using the key=value pairs from
this JSON content.

Refactor existing Junit tests to remove duplicated resource loading
code.

Change-Id: Idb2e962fe5cae39b70cc8cf16053d0a253f4fac0
Issue-ID: AAI-2121
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
20 files changed:
pom.xml
src/main/bin/start.sh
src/main/java/org/onap/aai/babel/parser/ArtifactGeneratorToscaParser.java
src/main/java/org/onap/aai/babel/xml/generator/api/AaiArtifactGenerator.java
src/main/java/org/onap/aai/babel/xml/generator/data/GroupConfiguration.java [new file with mode: 0644]
src/main/java/org/onap/aai/babel/xml/generator/data/WidgetConfigurationUtil.java
src/main/java/org/onap/aai/babel/xml/generator/model/Model.java
src/main/java/org/onap/aai/babel/xml/generator/model/Widget.java
src/main/resources/application.properties
src/test/java/org/onap/aai/babel/parser/TestArtifactGeneratorToscaParser.java
src/test/java/org/onap/aai/babel/parser/TestToscaParser.java
src/test/java/org/onap/aai/babel/service/CsarToXmlConverterTest.java
src/test/java/org/onap/aai/babel/service/TestGenerateArtifactsServiceImpl.java
src/test/java/org/onap/aai/babel/util/ArtifactTestUtils.java
src/test/java/org/onap/aai/babel/util/Resources.java [new file with mode: 0644]
src/test/java/org/onap/aai/babel/xml/generator/model/TestModel.java
src/test/java/org/onap/aai/babel/xml/generator/model/TestVfModule.java
src/test/java/org/onap/aai/babel/xml/generator/model/TestWidget.java
src/test/resources/filter-types.properties [deleted file]
src/test/resources/tosca-mappings.json [new file with mode: 0644]