Upgrade version of aai-common 05/73805/1
authorMichael Arrastia <MArrasti@amdocs.com>
Wed, 28 Nov 2018 17:27:31 +0000 (17:27 +0000)
committerMichael Arrastia <MArrasti@amdocs.com>
Wed, 28 Nov 2018 17:27:31 +0000 (17:27 +0000)
commitd894ec51a86cfb4d711d3c053d8aa46759584456
treec60a1680d735c5c76bc1e9ec625be6140d4b7667
parent9eb82afe62f6891d1e140fd9003e1ceb7df119ee
Upgrade version of aai-common

* Configure Spike with schema ingestion beans.
* Update OXMModelLoader and EdgeRulesLoader to make use of schema
  ingestion beans. Here there is an acknowledged awkward marrying of
  bean creation and static method use.
* Update tests to mock schema ingestion beans and organise test
  resources.

Change-Id: I1f043aa5852dbd2737a804ebc282a12afb9fb39f
Issue-ID: AAI-1951
Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>
46 files changed:
.gitignore
pom.xml
src/main/java/org/onap/aai/spike/SchemaIngestConfiguration.java [new file with mode: 0644]
src/main/java/org/onap/aai/spike/SpikeApplication.java
src/main/java/org/onap/aai/spike/schema/EdgePropsConfiguration.java [new file with mode: 0644]
src/main/java/org/onap/aai/spike/schema/EdgeRulesLoader.java
src/main/java/org/onap/aai/spike/schema/OXMModelLoader.java
src/main/java/org/onap/aai/spike/schema/OxmConfigTranslator.java
src/main/java/org/onap/aai/spike/util/SchemaIngestPropertiesReader.java [deleted file]
src/main/resources/application.properties
src/test/java/org/onap/aai/spike/OXMModelLoaderSetup.java [new file with mode: 0644]
src/test/java/org/onap/aai/spike/event/envelope/EventEnvelopeParserTest.java
src/test/java/org/onap/aai/spike/event/envelope/EventEnvelopeTest.java
src/test/java/org/onap/aai/spike/event/incoming/GizmoGraphEventTest.java
src/test/java/org/onap/aai/spike/event/incoming/OffsetManagerTest.java
src/test/java/org/onap/aai/spike/event/outgoing/SpikeGraphEventTest.java
src/test/java/org/onap/aai/spike/schema/EdgeRulesLoaderTest.java
src/test/java/org/onap/aai/spike/schema/GraphEventTransformerTest.java
src/test/java/org/onap/aai/spike/schema/OxmModelLoaderTest.java
src/test/resources/event/spike-event.json
src/test/resources/model/edge_properties_v10.json [deleted file]
src/test/resources/model/edge_properties_v11.json [deleted file]
src/test/resources/model/edge_properties_v12.json [deleted file]
src/test/resources/model/edge_properties_v2.json [deleted file]
src/test/resources/model/edge_properties_v7.json [deleted file]
src/test/resources/model/edge_properties_v8.json [deleted file]
src/test/resources/model/edge_properties_v9.json [deleted file]
src/test/resources/multi-oxm/v11/aai_oxm_v11.xml [moved from src/test/resources/oxm-reader/multiple-oxm/aai_oxm_v11.xml with 100% similarity]
src/test/resources/multi-oxm/v12/aai_oxm_v12.xml [moved from src/test/resources/oxm-reader/multiple-oxm/aai_oxm_v12.xml with 100% similarity]
src/test/resources/multi-oxm/v13/aai_oxm_a_v13.xml [moved from src/test/resources/oxm-reader/multiple-oxm/aai_oxm_a_v13.xml with 100% similarity]
src/test/resources/multi-oxm/v13/aai_oxm_b_v13.xml [moved from src/test/resources/oxm-reader/multiple-oxm/aai_oxm_b_v13.xml with 100% similarity]
src/test/resources/oxm-reader/oxm/aai_oxm_v10.xml [deleted file]
src/test/resources/oxm-reader/oxm/aai_oxm_v11.xml [deleted file]
src/test/resources/oxm-reader/oxm/aai_oxm_v12.xml [deleted file]
src/test/resources/oxm-reader/oxm/aai_oxm_v13.xml [deleted file]
src/test/resources/oxm-reader/oxm/aai_oxm_v8.xml [deleted file]
src/test/resources/oxm-reader/oxm/aai_oxm_v9.xml [deleted file]
src/test/resources/oxm-reader/schemaIngest-multiple-oxm.properties [deleted file]
src/test/resources/rules/v11/DbEdgeRules_test_one_v11.json [moved from src/test/resources/rules/DbEdgeRules_test_one_v11.json with 100% similarity]
src/test/resources/rules/v11/DbEdgeRules_test_two_v11.json [moved from src/test/resources/rules/DbEdgeRules_test_two_v11.json with 100% similarity]
src/test/resources/rules/v11/DbEdgeRules_v11.json [moved from src/test/resources/rules/DbEdgeRules_v11.json with 100% similarity]
src/test/resources/rules/v12/DbEdgeRules_v12.json [moved from src/test/resources/rules/DbEdgeRules_v12.json with 100% similarity]
src/test/resources/rules/v13/DbEdgeRules_test_one_v13.json [moved from src/test/resources/rules/DbEdgeRules_test_one_v13.json with 100% similarity]
src/test/resources/rules/v13/DbEdgeRules_test_two_v13.json [moved from src/test/resources/rules/DbEdgeRules_test_two_v13.json with 100% similarity]
src/test/resources/rules/v13/DbEdgeRules_v13.json [moved from src/test/resources/rules/DbEdgeRules_v13.json with 100% similarity]
src/test/resources/schemaIngest.properties [deleted file]