gerrit.onap Code Review - policy/apex-pdp.git/commit

Code Review / policy / apex-pdp.git / commit

author	liamfallon <liam.fallon@est.tech>
	Mon, 7 Feb 2022 17:56:44 +0000 (17:56 +0000)
committer	liamfallon <liam.fallon@est.tech>
	Tue, 8 Feb 2022 18:39:03 +0000 (18:39 +0000)
commit	59b90519eda3b95b0cfc49b6349a591c7d0c78e2
tree	810e07f7d5cf270582264c40245372f597c713a2	tree \| snapshot
parent	def44b294fa00bb5470e977eef9a05e5087035f0	commit \| diff

Remove JAXB and XML, use GSON for JSON

This review converst apex-pdp to use GSON for JSON handling. In order to
preserve backward compatibility with the JAXB format of JSON, custom
handling of maps was required. Therefore, the policy-common
StandardCoder could not be used.

There are a lot of small changes, removing annotations from concepts and
tweaking of test data. However, this cleans up the code base so it is
worth doing.

Issue-ID: POLICY-1820
Change-Id: I213fa64f6d7f3f1df8d10f111d9fbedbe80f9fe0
Signed-off-by: liamfallon <liam.fallon@est.tech>

160 files changed:

auth/cli-codegen/src/test/java/org/onap/policy/apex/auth/clicodegen/CodeGeneratorCliEditorTest.java		diff \| blob \| history
auth/cli-codegen/src/test/java/org/onap/policy/apex/auth/clicodegen/SupportGenerationTest.java		diff \| blob \| history
auth/cli-codegen/src/test/resources/models/TestPolicyModel.json		diff \| blob \| history
auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/ApexModelHandler.java		diff \| blob \| history
auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/CommandLineEditorOptionsTest.java		diff \| blob \| history
auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/CommandLineEditorScriptingTest.java		diff \| blob \| history
auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/ContextAlbumsTest.java		diff \| blob \| history
auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/FileMacroTest.java		diff \| blob \| history
auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/LogicBlockTest.java		diff \| blob \| history
auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/tosca/ApexCliToscaEditorTest.java		diff \| blob \| history
auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/utils/CliUtilsTest.java		diff \| blob \| history
auth/cli-editor/src/test/resources/compare/AvroSchemaModel_Compare.json		diff \| blob \| history
auth/cli-editor/src/test/resources/compare/ContextAlbumsModel_Compare.json		diff \| blob \| history
auth/cli-editor/src/test/resources/compare/FLBPolicyModel_Compare.json		diff \| blob \| history
auth/cli-editor/src/test/resources/compare/FLBPolicyModel_noAlbums_Compare.json		diff \| blob \| history
auth/cli-editor/src/test/resources/compare/FileMacroModel_Compare.json		diff \| blob \| history
auth/cli-editor/src/test/resources/compare/LogicBlockModel_Compare.json		diff \| blob \| history
auth/cli-editor/src/test/resources/tosca/ToscaPolicyOutput_compare_1.json	[moved from auth/cli-editor/src/test/resources/tosca/ToscaPolicyOutput_compare.json with 99% similarity]	diff \| blob \| history
auth/cli-editor/src/test/resources/tosca/ToscaPolicyOutput_compare_2.json	[new file with mode: 0644]	blob
core/core-engine/src/main/java/org/onap/policy/apex/core/engine/EngineParameters.java		diff \| blob \| history
examples/examples-aadm/src/main/java/org/onap/policy/apex/examples/aadm/model/AadmDomainModelSaver.java		diff \| blob \| history
examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/AadmModelTest.java		diff \| blob \| history
examples/examples-adaptive/src/main/java/org/onap/policy/apex/examples/adaptive/model/AdaptiveDomainModelSaver.java		diff \| blob \| history
examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionModelTest.java		diff \| blob \| history
examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AutoLearnModelTest.java		diff \| blob \| history
examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpModelTest.java		diff \| blob \| history
examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/OnapVCpeSimEndpoint.java		diff \| blob \| history
model/basic-model/pom.xml		diff \| blob \| history
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxArtifactKey.java		diff \| blob \| history
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConcept.java		diff \| blob \| history
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfo.java		diff \| blob \| history
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInformation.java		diff \| blob \| history
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxModel.java		diff \| blob \| history
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKey.java		diff \| blob \| history
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/package-info.java		diff \| blob \| history
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCustomGsonMapAdapter.java	[new file with mode: 0644]	blob
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCustomGsonRefereceKeyAdapter.java	[new file with mode: 0644]	blob
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelFileWriter.java		diff \| blob \| history
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelReader.java		diff \| blob \| history
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelSaver.java		diff \| blob \| history
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelStringWriter.java		diff \| blob \| history
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelWriter.java		diff \| blob \| history
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexSchemaGenerator.java	[deleted file]	blob \| history
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/KeyInfoMarshalFilter.java	[deleted file]	blob \| history
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/package-info.java		diff \| blob \| history
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/package-info.java		diff \| blob \| history
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/test/TestApexModel.java		diff \| blob \| history
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/xml/AxReferenceKeyAdapter.java	[deleted file]	blob \| history
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/xml/package-info.java	[deleted file]	blob \| history
model/basic-model/src/main/resources/xml/example.xsd	[deleted file]	blob \| history
model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/DummyEntity.java		diff \| blob \| history
model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelFileWriterTest.java		diff \| blob \| history
model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelReaderTest.java		diff \| blob \| history
model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelSaverTest.java		diff \| blob \| history
model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelStringWriterTest.java		diff \| blob \| history
model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelWriterTest.java		diff \| blob \| history
model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexSchemaGeneratorTest.java	[deleted file]	blob \| history
model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexBasicModelTest.java		diff \| blob \| history
model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportBasicModelTest.java		diff \| blob \| history
model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportConceptGetterTest.java		diff \| blob \| history
model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/xml/AxReferenceKeyAdapterTest.java	[deleted file]	blob \| history
model/context-model/pom.xml		diff \| blob \| history
model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbum.java		diff \| blob \| history
model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbums.java		diff \| blob \| history
model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextModel.java		diff \| blob \| history
model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchema.java		diff \| blob \| history
model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchemas.java		diff \| blob \| history
model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ApexContextModelTest.java		diff \| blob \| history
model/context-model/src/test/resources/json/ContextModel.json	[deleted file]	blob \| history
model/engine-model/pom.xml		diff \| blob \| history
model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineModel.java		diff \| blob \| history
model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineState.java		diff \| blob \| history
model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineStats.java		diff \| blob \| history
model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/package-info.java		diff \| blob \| history
model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/ApexEngineModelTest.java		diff \| blob \| history
model/event-model/pom.xml		diff \| blob \| history
model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvent.java		diff \| blob \| history
model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEventModel.java		diff \| blob \| history
model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvents.java		diff \| blob \| history
model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxField.java		diff \| blob \| history
model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxInputField.java		diff \| blob \| history
model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxOutputField.java		diff \| blob \| history
model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/package-info.java		diff \| blob \| history
model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventsTest.java		diff \| blob \| history
model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/ApexEventModelTest.java		diff \| blob \| history
model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexApiResult.java		diff \| blob \| history
model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexModel.java		diff \| blob \| history
model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexModelFactory.java		diff \| blob \| history
model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ApexModelImpl.java		diff \| blob \| history
model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextAlbumFacade.java		diff \| blob \| history
model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextSchemaFacade.java		diff \| blob \| history
model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/EventFacade.java		diff \| blob \| history
model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/KeyInformationFacade.java		diff \| blob \| history
model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelFacade.java		diff \| blob \| history
model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelHandlerFacade.java		diff \| blob \| history
model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/PolicyFacade.java		diff \| blob \| history
model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/TaskFacade.java		diff \| blob \| history
model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextAlbumTest.java		diff \| blob \| history
model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextSchemaTest.java		diff \| blob \| history
model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiEventTest.java		diff \| blob \| history
model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiKeyInfoTest.java		diff \| blob \| history
model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiPolicyTest.java		diff \| blob \| history
model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiTaskTest.java		diff \| blob \| history
model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java		diff \| blob \| history
model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ModelFacadeTest.java		diff \| blob \| history
model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ModelHandlerFacadeTest.java		diff \| blob \| history
model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/RealModelTest.java	[new file with mode: 0644]	blob
model/model-api/src/test/resources/models/PolicyModel.json		diff \| blob \| history
model/model-api/src/test/resources/models/PolicyModel.xml	[deleted file]	blob \| history
model/model-api/src/test/resources/models/RealPolicyModel.json	[new file with mode: 0644]	blob
model/policy-model/pom.xml		diff \| blob \| history
model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogic.java		diff \| blob \| history
model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicies.java		diff \| blob \| history
model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicy.java		diff \| blob \| history
model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicyModel.java		diff \| blob \| history
model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxState.java		diff \| blob \| history
model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateFinalizerLogic.java		diff \| blob \| history
model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateOutput.java		diff \| blob \| history
model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTaskOutputType.java		diff \| blob \| history
model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTaskReference.java		diff \| blob \| history
model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTask.java		diff \| blob \| history
model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskLogic.java		diff \| blob \| history
model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskParameter.java		diff \| blob \| history
model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskSelectionLogic.java		diff \| blob \| history
model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTasks.java		diff \| blob \| history
model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/package-info.java		diff \| blob \| history
model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/EmptyAlbumsAdapter.java	[deleted file]	blob \| history
model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PoliciesTest.java		diff \| blob \| history
model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTest.java		diff \| blob \| history
model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TasksTest.java		diff \| blob \| history
model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/ApexPolicyModelTest.java		diff \| blob \| history
plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/pom.xml	[deleted file]	blob \| history
plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/java/org/onap/policy/apex/plugins/event/protocol/xml/Apex2XmlEventConverter.java	[deleted file]	blob \| history
plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlEventProtocolParameters.java	[deleted file]	blob \| history
plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/java/org/onap/policy/apex/plugins/event/protocol/xml/package-info.java	[deleted file]	blob \| history
plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/resources/xml/apex-event.xjb	[deleted file]	blob \| history
plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/resources/xml/apex-event.xsd	[deleted file]	blob \| history
plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/test/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlEventGenerator.java	[deleted file]	blob \| history
plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/test/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlEventHandlerTest.java	[deleted file]	blob \| history
plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/test/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlEventProtocolParametersTest.java	[deleted file]	blob \| history
plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/test/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlTaggedEventConsumerTest.java	[deleted file]	blob \| history
plugins/plugins-event/plugins-event-protocol/pom.xml		diff \| blob \| history
services/services-engine/src/main/java/org/onap/policy/apex/service/engine/runtime/impl/EngineWorker.java		diff \| blob \| history
services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/ApexParameterHandler.java		diff \| blob \| history
services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/JsonEventHandlerForPojoTest.java		diff \| blob \| history
services/services-engine/src/test/java/org/onap/policy/apex/service/engine/runtime/impl/EngineServiceImplTest.java		diff \| blob \| history
services/services-engine/src/test/java/org/onap/policy/apex/service/engine/runtime/impl/EngineWorkerTest.java		diff \| blob \| history
services/services-engine/src/test/resources/policymodels/PojoEventModel.json		diff \| blob \| history
services/services-engine/src/test/resources/policymodels/SmallModel.json		diff \| blob \| history
services/services-engine/src/test/resources/policymodels/SmallModelDifferent.json		diff \| blob \| history
testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/model/SampleDomainModelSaver.java		diff \| blob \| history
testsuites/integration/integration-common/src/main/resources/examples/models/JMS/JMSTestModel.json		diff \| blob \| history
testsuites/integration/integration-common/src/test/java/org/onap/policy/apex/testsuites/integration/common/model/SampleDomainModelSaverTest.java		diff \| blob \| history
testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/testsuites/integration/executor/handling/TestApexSamplePolicyCreateModelFiles.java		diff \| blob \| history
testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/testsuites/integration/executor/handling/TestApexSamplePolicyModel.java		diff \| blob \| history
tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2cli/Model2Cli.java		diff \| blob \| history
tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2event/Model2JsonEventSchema.java		diff \| blob \| history
tools/model-generator/src/test/java/org/onap/policy/apex/tools/model/generator/model2cli/Model2CliTest.java		diff \| blob \| history
tools/model-generator/src/test/resources/ExecutionPropertiesRestTestPolicyModel.json		diff \| blob \| history
tools/model-generator/src/test/resources/SmallModel.json		diff \| blob \| history

This repo will hold the next generation Apex PDP engine (Casablanca)

RSS Atom