diff options
| -rw-r--r-- | auth/cli-codegen/pom.xml | 2 | ||||
| -rw-r--r-- | auth/cli-editor/pom.xml | 2 | ||||
| -rw-r--r-- | context/context-management/pom.xml | 2 | ||||
| -rw-r--r-- | core/core-engine/pom.xml | 2 | ||||
| -rw-r--r-- | core/core-protocols/pom.xml | 2 | ||||
| -rw-r--r-- | examples/examples-aadm/pom.xml | 2 | ||||
| -rw-r--r-- | examples/examples-adaptive/pom.xml | 2 | ||||
| -rw-r--r-- | examples/examples-myfirstpolicy/pom.xml | 2 | ||||
| -rw-r--r-- | examples/examples-pcvs/pom.xml | 2 | ||||
| -rw-r--r-- | model/basic-model/pom.xml | 83 | ||||
| -rw-r--r-- | model/basic-model/src/main/resources/doc/JDBCPropertiesExamples.txt | 35 | ||||
| -rw-r--r-- | model/basic-model/src/test/resources/logback-test.xml | 70 | ||||
| -rw-r--r-- | model/context-model/pom.xml | 40 | ||||
| -rw-r--r-- | model/engine-model/pom.xml | 45 | ||||
| -rw-r--r-- | model/engine-model/src/test/resources/logback-test.xml | 70 | ||||
| -rw-r--r-- | model/event-model/pom.xml | 40 | ||||
| -rw-r--r-- | model/event-model/src/test/resources/logback-test.xml | 74 | ||||
| -rw-r--r-- | model/model-api/pom.xml | 43 | ||||
| -rw-r--r-- | model/model-api/src/test/resources/logback-test.xml | 74 | ||||
| -rw-r--r-- | model/policy-model/pom.xml | 54 | ||||
| -rw-r--r-- | model/policy-model/src/test/resources/logback-test.xml | 74 | ||||
| -rw-r--r-- | model/pom.xml | 40 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexConceptException.java (renamed from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexConceptException.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexException.java (renamed from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexException.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexRuntimeException.java (renamed from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexRuntimeException.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxArtifactKey.java (renamed from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxArtifactKey.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConcept.java (renamed from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConcept.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetter.java (renamed from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetter.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetterImpl.java (renamed from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetterImpl.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKey.java (renamed from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKey.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfo.java (renamed from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfo.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInformation.java (renamed from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInformation.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUse.java (renamed from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUse.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxModel.java (renamed from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxModel.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKey.java (renamed from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKey.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxToscaPolicyProcessingStatus.java (renamed from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxToscaPolicyProcessingStatus.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationMessage.java (renamed from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationMessage.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationResult.java (renamed from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationResult.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/package-info.java (renamed from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/package-info.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCreator.java (renamed from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCreator.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCustomGsonMapAdapter.java (renamed from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCustomGsonMapAdapter.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCustomGsonRefereceKeyAdapter.java (renamed from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCustomGsonRefereceKeyAdapter.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelException.java (renamed from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelException.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelFileWriter.java (renamed from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelFileWriter.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelReader.java (renamed from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelReader.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelSaver.java (renamed from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelSaver.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelStringWriter.java (renamed from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelStringWriter.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelWriter.java (renamed from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelWriter.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/package-info.java (renamed from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/package-info.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/basicmodel/package-info.java (renamed from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/package-info.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/basicmodel/service/ModelService.java (renamed from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/service/ModelService.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/basicmodel/service/package-info.java (renamed from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/service/package-info.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/basicmodel/test/TestApexModel.java (renamed from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/test/TestApexModel.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/basicmodel/test/TestApexModelCreator.java (renamed from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/test/TestApexModelCreator.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/basicmodel/test/package-info.java (renamed from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/test/package-info.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbum.java (renamed from model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbum.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbums.java (renamed from model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbums.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextModel.java (renamed from model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextModel.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchema.java (renamed from model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchema.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchemas.java (renamed from model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchemas.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/package-info.java (renamed from model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/package-info.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/contextmodel/handling/ContextComparer.java (renamed from model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/handling/ContextComparer.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/contextmodel/handling/package-info.java (renamed from model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/handling/package-info.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineModel.java (renamed from model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineModel.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineState.java (renamed from model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineState.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineStats.java (renamed from model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineStats.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/package-info.java (renamed from model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/package-info.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvent.java (renamed from model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvent.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEventModel.java (renamed from model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEventModel.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvents.java (renamed from model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvents.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxField.java (renamed from model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxField.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxInputField.java (renamed from model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxInputField.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxOutputField.java (renamed from model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxOutputField.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/package-info.java (renamed from model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/package-info.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/modelapi/ApexApiResult.java (renamed from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexApiResult.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/modelapi/ApexEditorApi.java (renamed from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexEditorApi.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/modelapi/ApexModel.java (renamed from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexModel.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/modelapi/ApexModelFactory.java (renamed from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexModelFactory.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/modelapi/impl/ApexModelImpl.java (renamed from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ApexModelImpl.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextAlbum.java (renamed from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextAlbum.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextAlbumFacade.java (renamed from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextAlbumFacade.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextSchemaFacade.java (renamed from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextSchemaFacade.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/modelapi/impl/CreatePolicyStateTaskRef.java (renamed from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/CreatePolicyStateTaskRef.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/modelapi/impl/EventFacade.java (renamed from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/EventFacade.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/modelapi/impl/KeyInformationFacade.java (renamed from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/KeyInformationFacade.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelFacade.java (renamed from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelFacade.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelHandlerFacade.java (renamed from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelHandlerFacade.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/modelapi/impl/PolicyFacade.java (renamed from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/PolicyFacade.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/modelapi/impl/TaskFacade.java (renamed from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/TaskFacade.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/modelapi/impl/package-info.java (renamed from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/package-info.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/modelapi/package-info.java (renamed from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/package-info.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogic.java (renamed from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogic.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogicReader.java (renamed from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogicReader.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicies.java (renamed from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicies.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicy.java (renamed from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicy.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicyModel.java (renamed from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicyModel.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxState.java (renamed from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxState.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateFinalizerLogic.java (renamed from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateFinalizerLogic.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateOutput.java (renamed from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateOutput.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateParamsBuilder.java (renamed from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateParamsBuilder.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTaskOutputType.java (renamed from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTaskOutputType.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTaskReference.java (renamed from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTaskReference.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTree.java (renamed from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTree.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTask.java (renamed from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTask.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskLogic.java (renamed from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskLogic.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskParameter.java (renamed from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskParameter.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskSelectionLogic.java (renamed from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskSelectionLogic.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTasks.java (renamed from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTasks.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/PolicyException.java (renamed from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/PolicyException.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/PolicyRuntimeException.java (renamed from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/PolicyRuntimeException.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/package-info.java (renamed from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/package-info.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalyser.java (renamed from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalyser.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalysisResult.java (renamed from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalysisResult.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyComparer.java (renamed from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyComparer.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java (renamed from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparer.java (renamed from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparer.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelMerger.java (renamed from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelMerger.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelSplitter.java (renamed from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelSplitter.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/policymodel/handling/package-info.java (renamed from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/package-info.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/utilities/CollectionUtils.java (renamed from model/utilities/src/main/java/org/onap/policy/apex/model/utilities/CollectionUtils.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/utilities/DirectoryDeleteShutdownHook.java (renamed from model/utilities/src/main/java/org/onap/policy/apex/model/utilities/DirectoryDeleteShutdownHook.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/utilities/DirectoryUtils.java (renamed from model/utilities/src/main/java/org/onap/policy/apex/model/utilities/DirectoryUtils.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/utilities/TreeMapUtils.java (renamed from model/utilities/src/main/java/org/onap/policy/apex/model/utilities/TreeMapUtils.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyComparer.java (renamed from model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyComparer.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyDifference.java (renamed from model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyDifference.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapComparer.java (renamed from model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapComparer.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapDifference.java (renamed from model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapDifference.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/utilities/comparison/package-info.java (renamed from model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/package-info.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/utilities/json/JsonHandler.java (renamed from model/utilities/src/main/java/org/onap/policy/apex/model/utilities/json/JsonHandler.java) | 0 | ||||
| -rwxr-xr-x | model/src/main/java/org/onap/policy/apex/model/utilities/json/package-info.java (renamed from model/utilities/src/main/java/org/onap/policy/apex/model/utilities/json/package-info.java) | 0 | ||||
| -rw-r--r-- | model/src/main/java/org/onap/policy/apex/model/utilities/package-info.java (renamed from model/utilities/src/main/java/org/onap/policy/apex/model/utilities/package-info.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetterImplTest.java (renamed from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetterImplTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfoTest.java (renamed from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfoTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyTest.java (renamed from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUseTest.java (renamed from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUseTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKeyTest.java (renamed from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKeyTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/DummyEntity.java (renamed from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/DummyEntity.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/ExceptionsTest.java (renamed from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/ExceptionsTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/ValidationTest.java (renamed from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/ValidationTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelExceptionTest.java (renamed from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelExceptionTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelFileWriterTest.java (renamed from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelFileWriterTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelReaderTest.java (renamed from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelReaderTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelSaverTest.java (renamed from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelSaverTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelStringWriterTest.java (renamed from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelStringWriterTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelWriterTest.java (renamed from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelWriterTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/DummyApexBasicModelCreator.java (renamed from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/DummyApexBasicModelCreator.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/DummyAxModelWithReferences.java (renamed from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/DummyAxModelWithReferences.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexBasicModelConceptsTest.java (renamed from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexBasicModelConceptsTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexBasicModelTest.java (renamed from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexBasicModelTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator0.java (renamed from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator0.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator1.java (renamed from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator1.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator2.java (renamed from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator2.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportBasicModelTest.java (renamed from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportBasicModelTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportConceptGetterTest.java (renamed from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportConceptGetterTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/basicmodel/service/ModelServiceTest.java (renamed from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/service/ModelServiceTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextAlbumsTest.java (renamed from model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextAlbumsTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextModelTest.java (renamed from model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextModelTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextSchemasTest.java (renamed from model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextSchemasTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ApexContextModelTest.java (renamed from model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ApexContextModelTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ContextComparisonTest.java (renamed from model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ContextComparisonTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/TestApexContextModelCreator.java (renamed from model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/TestApexContextModelCreator.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/TestContextComparisonFactory.java (renamed from model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/TestContextComparisonFactory.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineModelTest.java (renamed from model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineModelTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineStatsTest.java (renamed from model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineStatsTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/ApexEngineModelTest.java (renamed from model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/ApexEngineModelTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/DummyTestApexEngineModelCreator.java (renamed from model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/DummyTestApexEngineModelCreator.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventModelTest.java (renamed from model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventModelTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventsTest.java (renamed from model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventsTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/FieldTest.java (renamed from model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/FieldTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/ApexEventModelTest.java (renamed from model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/ApexEventModelTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/DummyTestApexEventModelCreator.java (renamed from model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/DummyTestApexEventModelCreator.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/modelapi/ApexApiResultTest.java (renamed from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexApiResultTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextAlbumTest.java (renamed from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextAlbumTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextSchemaTest.java (renamed from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextSchemaTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiEventTest.java (renamed from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiEventTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiKeyInfoTest.java (renamed from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiKeyInfoTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiPolicyTest.java (renamed from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiPolicyTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiTaskTest.java (renamed from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiTaskTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java (renamed from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/modelapi/ModelFacadeTest.java (renamed from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ModelFacadeTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/modelapi/ModelHandlerFacadeTest.java (renamed from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ModelHandlerFacadeTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/modelapi/RealModelTest.java (renamed from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/RealModelTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/DummyLogicReader.java (renamed from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/DummyLogicReader.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/ExceptionsTest.java (renamed from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/ExceptionsTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/LogicTest.java (renamed from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/LogicTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PoliciesTest.java (renamed from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PoliciesTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PolicyModelTest.java (renamed from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PolicyModelTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateOutputTest.java (renamed from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateOutputTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTaskReferenceTest.java (renamed from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTaskReferenceTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTest.java (renamed from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TaskParameterTest.java (renamed from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TaskParameterTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TasksTest.java (renamed from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TasksTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/policymodel/handling/ApexPolicyModelTest.java (renamed from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/ApexPolicyModelTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalyserTest.java (renamed from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalyserTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReaderTest.java (renamed from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReaderTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparerTest.java (renamed from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparerTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelMergerTest.java (renamed from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelMergerTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelSplitterTest.java (renamed from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelSplitterTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/policymodel/handling/SupportApexPolicyModelCreator.java (renamed from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/SupportApexPolicyModelCreator.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/policymodel/utils/SupportPolicyModelValidator.java (renamed from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/utils/SupportPolicyModelValidator.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/utilities/CollectionUtilitiesTest.java (renamed from model/utilities/src/test/java/org/onap/policy/apex/model/utilities/CollectionUtilitiesTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/utilities/DirectoryUtilsTest.java (renamed from model/utilities/src/test/java/org/onap/policy/apex/model/utilities/DirectoryUtilsTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/utilities/KeyComparerTest.java (renamed from model/utilities/src/test/java/org/onap/policy/apex/model/utilities/KeyComparerTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/utilities/KeyedMapComparerTest.java (renamed from model/utilities/src/test/java/org/onap/policy/apex/model/utilities/KeyedMapComparerTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/utilities/TextFileUtilsTest.java (renamed from model/utilities/src/test/java/org/onap/policy/apex/model/utilities/TextFileUtilsTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/utilities/TreeMapUtilsTest.java (renamed from model/utilities/src/test/java/org/onap/policy/apex/model/utilities/TreeMapUtilsTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/java/org/onap/policy/apex/model/utilities/json/JsonHandlerTest.java (renamed from model/utilities/src/test/java/org/onap/policy/apex/model/utilities/json/JsonHandlerTest.java) | 0 | ||||
| -rw-r--r-- | model/src/test/resources/checkFiles/PolicyModelComparisonDifferentTerseKeys.txt (renamed from model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonDifferentTerseKeys.txt) | 0 | ||||
| -rw-r--r-- | model/src/test/resources/checkFiles/PolicyModelComparisonDifferentTerseValues.txt (renamed from model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonDifferentTerseValues.txt) | 0 | ||||
| -rw-r--r-- | model/src/test/resources/checkFiles/PolicyModelComparisonDifferentVerboseKeys.txt (renamed from model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonDifferentVerboseKeys.txt) | 0 | ||||
| -rw-r--r-- | model/src/test/resources/checkFiles/PolicyModelComparisonDifferentVerboseValues.txt (renamed from model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonDifferentVerboseValues.txt) | 0 | ||||
| -rw-r--r-- | model/src/test/resources/checkFiles/PolicyModelComparisonIdenticalTerse.txt (renamed from model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonIdenticalTerse.txt) | 0 | ||||
| -rw-r--r-- | model/src/test/resources/checkFiles/PolicyModelComparisonIdenticalVerboseKeys.txt (renamed from model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonIdenticalVerboseKeys.txt) | 0 | ||||
| -rw-r--r-- | model/src/test/resources/checkFiles/PolicyModelComparisonIdenticalVerboseValues.txt (renamed from model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonIdenticalVerboseValues.txt) | 0 | ||||
| -rw-r--r-- | model/src/test/resources/logback-test.xml (renamed from model/context-model/src/test/resources/logback-test.xml) | 0 | ||||
| -rw-r--r-- | model/src/test/resources/models/PolicyModel.json (renamed from model/model-api/src/test/resources/models/PolicyModel.json) | 0 | ||||
| -rw-r--r-- | model/src/test/resources/models/PolicyModel.junk (renamed from model/model-api/src/test/resources/models/PolicyModel.junk) | 0 | ||||
| -rw-r--r-- | model/src/test/resources/models/RealPolicyModel.json (renamed from model/model-api/src/test/resources/models/RealPolicyModel.json) | 0 | ||||
| -rw-r--r-- | model/src/test/resources/path/to/apex/logic/funkylogic/LogicParentLogicParentLocalNameLogicInstanceName.funkylogic (renamed from model/policy-model/src/test/resources/path/to/apex/logic/funkylogic/LogicParentLogicParentLocalNameLogicInstanceName.funkylogic) | 0 | ||||
| -rw-r--r-- | model/src/test/resources/testdir/testfile.xml (renamed from model/utilities/src/test/resources/testdir/testfile.xml) | 0 | ||||
| -rw-r--r-- | model/utilities/pom.xml | 49 | ||||
| -rw-r--r-- | plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml | 3 | ||||
| -rw-r--r-- | services/services-engine/pom.xml | 2 | ||||
| -rw-r--r-- | testsuites/integration/integration-common/pom.xml | 2 | ||||
| -rw-r--r-- | tools/model-generator/pom.xml | 4 |
225 files changed, 43 insertions, 777 deletions
diff --git a/auth/cli-codegen/pom.xml b/auth/cli-codegen/pom.xml index 491749158..2773a7729 100644 --- a/auth/cli-codegen/pom.xml +++ b/auth/cli-codegen/pom.xml @@ -39,7 +39,7 @@ </dependency> <dependency> <groupId>org.onap.policy.apex-pdp.model</groupId> - <artifactId>model-api</artifactId> + <artifactId>model</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> diff --git a/auth/cli-editor/pom.xml b/auth/cli-editor/pom.xml index fd8404be2..e01025bbd 100644 --- a/auth/cli-editor/pom.xml +++ b/auth/cli-editor/pom.xml @@ -38,7 +38,7 @@ </dependency> <dependency> <groupId>org.onap.policy.apex-pdp.model</groupId> - <artifactId>model-api</artifactId> + <artifactId>model</artifactId> <version>${project.version}</version> </dependency> <dependency> diff --git a/context/context-management/pom.xml b/context/context-management/pom.xml index 0c6495a5e..0a026eae0 100644 --- a/context/context-management/pom.xml +++ b/context/context-management/pom.xml @@ -36,7 +36,7 @@ </dependency> <dependency> <groupId>org.onap.policy.apex-pdp.model</groupId> - <artifactId>context-model</artifactId> + <artifactId>model</artifactId> <version>${project.version}</version> </dependency> <dependency> diff --git a/core/core-engine/pom.xml b/core/core-engine/pom.xml index 890b33c9b..597da2991 100644 --- a/core/core-engine/pom.xml +++ b/core/core-engine/pom.xml @@ -36,7 +36,7 @@ </dependency> <dependency> <groupId>org.onap.policy.apex-pdp.model</groupId> - <artifactId>policy-model</artifactId> + <artifactId>model</artifactId> <version>${project.version}</version> </dependency> <dependency> diff --git a/core/core-protocols/pom.xml b/core/core-protocols/pom.xml index 631edf1a1..2110acede 100644 --- a/core/core-protocols/pom.xml +++ b/core/core-protocols/pom.xml @@ -32,7 +32,7 @@ <dependencies> <dependency> <groupId>org.onap.policy.apex-pdp.model</groupId> - <artifactId>basic-model</artifactId> + <artifactId>model</artifactId> <version>${project.version}</version> </dependency> </dependencies> diff --git a/examples/examples-aadm/pom.xml b/examples/examples-aadm/pom.xml index 3447c4d86..5e8ba05f9 100644 --- a/examples/examples-aadm/pom.xml +++ b/examples/examples-aadm/pom.xml @@ -32,7 +32,7 @@ <dependencies> <dependency> <groupId>org.onap.policy.apex-pdp.model</groupId> - <artifactId>policy-model</artifactId> + <artifactId>model</artifactId> <version>${project.version}</version> </dependency> <dependency> diff --git a/examples/examples-adaptive/pom.xml b/examples/examples-adaptive/pom.xml index f8bee8745..158710a52 100644 --- a/examples/examples-adaptive/pom.xml +++ b/examples/examples-adaptive/pom.xml @@ -32,7 +32,7 @@ <dependencies> <dependency> <groupId>org.onap.policy.apex-pdp.model</groupId> - <artifactId>policy-model</artifactId> + <artifactId>model</artifactId> <version>${project.version}</version> </dependency> <dependency> diff --git a/examples/examples-myfirstpolicy/pom.xml b/examples/examples-myfirstpolicy/pom.xml index ea13297dd..68dc69a86 100644 --- a/examples/examples-myfirstpolicy/pom.xml +++ b/examples/examples-myfirstpolicy/pom.xml @@ -43,7 +43,7 @@ <dependencies> <dependency> <groupId>org.onap.policy.apex-pdp.model</groupId> - <artifactId>policy-model</artifactId> + <artifactId>model</artifactId> <version>${project.version}</version> </dependency> <dependency> diff --git a/examples/examples-pcvs/pom.xml b/examples/examples-pcvs/pom.xml index 191e68779..b3af036ba 100644 --- a/examples/examples-pcvs/pom.xml +++ b/examples/examples-pcvs/pom.xml @@ -44,7 +44,7 @@ </dependency> <dependency> <groupId>org.onap.policy.apex-pdp.model</groupId> - <artifactId>policy-model</artifactId> + <artifactId>model</artifactId> <version>${project.version}</version> </dependency> <dependency> diff --git a/model/basic-model/pom.xml b/model/basic-model/pom.xml deleted file mode 100644 index 45d9978cf..000000000 --- a/model/basic-model/pom.xml +++ /dev/null @@ -1,83 +0,0 @@ -<!-- - ============LICENSE_START======================================================= - Copyright (c) 2020,2022 Nordix Foundation. - ================================================================================ - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - SPDX-License-Identifier: Apache-2.0 - ============LICENSE_END========================================================= ---> - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.onap.policy.apex-pdp.model</groupId> - <artifactId>model</artifactId> - <version>2.7.1-SNAPSHOT</version> - </parent> - - <artifactId>basic-model</artifactId> - <name>${project.artifactId}</name> - <description>Basic Models used and model handling in Apex</description> - <properties> - <sonar.exclusions> - **/package-info.java, - **/TestApexModel.java, - **/TestApexModelCreator.java - </sonar.exclusions> - </properties> - - <dependencies> - <dependency> - <groupId>org.onap.policy.common</groupId> - <artifactId>utils</artifactId> - <exclusions> - <exclusion> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.onap.policy.apex-pdp.model</groupId> - <artifactId>utilities</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>${version.javax.bind}</version> - </dependency> - <dependency> - <groupId>org.glassfish.jaxb</groupId> - <artifactId>jaxb-runtime</artifactId> - <version>${version.javax.bind}</version> - </dependency> - <dependency> - <groupId>org.glassfish</groupId> - <artifactId>javax.json</artifactId> - <version>${version.javax.json}</version> - </dependency> - <dependency> - <groupId>javax.json</groupId> - <artifactId>javax.json-api</artifactId> - <version>${version.javax.json}</version> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <scope>test</scope> - </dependency> - </dependencies> -</project>
\ No newline at end of file diff --git a/model/basic-model/src/main/resources/doc/JDBCPropertiesExamples.txt b/model/basic-model/src/main/resources/doc/JDBCPropertiesExamples.txt deleted file mode 100644 index 6e105a68d..000000000 --- a/model/basic-model/src/main/resources/doc/JDBCPropertiesExamples.txt +++ /dev/null @@ -1,35 +0,0 @@ -#------------------------------------------------------------------------------- -# ============LICENSE_START======================================================= -# Copyright (C) 2016-2018 Ericsson. All rights reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= -#------------------------------------------------------------------------------- - -Properties jdbcProperties = new Properties(); -jdbcProperties.put("javax.persistence.jdbc.url", "jdbc:postgresql://localhost:5432/apex_test"); -jdbcProperties.put("eclipselink.ddl-generation", "drop-and-create-tables"); - -Properties jdbcProperties = new Properties(); -jdbcProperties.put("javax.persistence.jdbc.url", "jdbc:postgresql://localhost:5432/apex_test"); -jdbcProperties.put("hibernate.hbm2ddl.auto", "create-drop"); - -Properties jdbcProperties = new Properties(); -jdbcProperties.put("javax.persistence.jdbc.url", "jdbc:postgresql://localhost:5432/apex"); -jdbcProperties.put("eclipselink.ddl-generation", "create-or-extend-tables"); - -Properties jdbcProperties = new Properties(); -jdbcProperties.put("javax.persistence.jdbc.url", "jdbc:postgresql://localhost:5432/apex"); -jdbcProperties.put("hibernate.hbm2ddl.auto", "update"); diff --git a/model/basic-model/src/test/resources/logback-test.xml b/model/basic-model/src/test/resources/logback-test.xml deleted file mode 100644 index c52f2ded6..000000000 --- a/model/basic-model/src/test/resources/logback-test.xml +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ============LICENSE_START======================================================= - Copyright (C) 2016-2018 Ericsson. All rights reserved. - ================================================================================ - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - SPDX-License-Identifier: Apache-2.0 - ============LICENSE_END========================================================= ---> - -<configuration> - - <contextName>Apex</contextName> - <statusListener class="ch.qos.logback.core.status.OnConsoleStatusListener" /> - <property name="LOG_DIR" value="${java.io.tmpdir}/apex_logging/" /> - - <!-- USE FOR STD OUT ONLY --> - <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> - <encoder> - <Pattern>%d %contextName [%t] %level %logger{36} - %msg%n</Pattern> - </encoder> - </appender> - - <root level="INFO"> - <appender-ref ref="STDOUT" /> - </root> - - <logger name="org.infinispan" level="INFO" additivity="false"> - <appender-ref ref="STDOUT" /> - </logger> - - <logger name="org.apache.zookeeper.ClientCnxn" level="OFF" additivity="false"> - <appender-ref ref="STDOUT" /> - </logger> - - <appender name="FILE" class="ch.qos.logback.core.FileAppender"> - <file>${LOG_DIR}/apex.log</file> - <encoder> - <pattern>%d %-5relative [procId=${processId}] [%thread] %-5level - %logger{26} - %msg %n %ex{full}</pattern> - </encoder> - </appender> - - <appender name="CTXT_FILE" class="ch.qos.logback.core.FileAppender"> - <file>${LOG_DIR}/apex_ctxt.log</file> - <encoder> - <pattern>%d %-5relative [procId=${processId}] [%thread] %-5level - %logger{26} - %msg %n %ex{full}</pattern> - </encoder> - </appender> - - <logger name="org.onap.policy.apex.core.context.impl.monitoring" level="INFO" additivity="false"> - <appender-ref ref="CTXT_FILE" /> - </logger> - - <logger name="org.onap.policy.apex.core.context" level="INFO" additivity="false"> - <appender-ref ref="STDOUT" /> - </logger> -</configuration> diff --git a/model/context-model/pom.xml b/model/context-model/pom.xml deleted file mode 100644 index f20808186..000000000 --- a/model/context-model/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ -<!-- - ============LICENSE_START======================================================= - Copyright (C) 2016-2018 Ericsson. All rights reserved. - Modifications Copyright (C) 2022 Nordix Foundation. - ================================================================================ - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - SPDX-License-Identifier: Apache-2.0 - ============LICENSE_END========================================================= ---> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.policy.apex-pdp.model</groupId> - <artifactId>model</artifactId> - <version>2.7.1-SNAPSHOT</version> - </parent> - - <artifactId>context-model</artifactId> - <name>${project.artifactId}</name> - <description>Context Models used in Apex</description> - - <dependencies> - <dependency> - <groupId>org.onap.policy.apex-pdp.model</groupId> - <artifactId>basic-model</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> -</project> diff --git a/model/engine-model/pom.xml b/model/engine-model/pom.xml deleted file mode 100644 index 9db1b2053..000000000 --- a/model/engine-model/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ -<!-- - ============LICENSE_START======================================================= - Copyright (C) 2018 Ericsson. All rights reserved. - Modifications Copyright (C) 2022 Bell Canada. - Modifications Copyright (C) 2022 Nordix Foundation. - ================================================================================ - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - SPDX-License-Identifier: Apache-2.0 - ============LICENSE_END========================================================= ---> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.policy.apex-pdp.model</groupId> - <artifactId>model</artifactId> - <version>2.7.1-SNAPSHOT</version> - </parent> - - <artifactId>engine-model</artifactId> - <name>${project.artifactId}</name> - <description>Engine Models used in Apex</description> - - <dependencies> - <dependency> - <groupId>org.onap.policy.apex-pdp.model</groupId> - <artifactId>policy-model</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>io.prometheus</groupId> - <artifactId>simpleclient</artifactId> - </dependency> - </dependencies> -</project> diff --git a/model/engine-model/src/test/resources/logback-test.xml b/model/engine-model/src/test/resources/logback-test.xml deleted file mode 100644 index c52f2ded6..000000000 --- a/model/engine-model/src/test/resources/logback-test.xml +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ============LICENSE_START======================================================= - Copyright (C) 2016-2018 Ericsson. All rights reserved. - ================================================================================ - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - SPDX-License-Identifier: Apache-2.0 - ============LICENSE_END========================================================= ---> - -<configuration> - - <contextName>Apex</contextName> - <statusListener class="ch.qos.logback.core.status.OnConsoleStatusListener" /> - <property name="LOG_DIR" value="${java.io.tmpdir}/apex_logging/" /> - - <!-- USE FOR STD OUT ONLY --> - <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> - <encoder> - <Pattern>%d %contextName [%t] %level %logger{36} - %msg%n</Pattern> - </encoder> - </appender> - - <root level="INFO"> - <appender-ref ref="STDOUT" /> - </root> - - <logger name="org.infinispan" level="INFO" additivity="false"> - <appender-ref ref="STDOUT" /> - </logger> - - <logger name="org.apache.zookeeper.ClientCnxn" level="OFF" additivity="false"> - <appender-ref ref="STDOUT" /> - </logger> - - <appender name="FILE" class="ch.qos.logback.core.FileAppender"> - <file>${LOG_DIR}/apex.log</file> - <encoder> - <pattern>%d %-5relative [procId=${processId}] [%thread] %-5level - %logger{26} - %msg %n %ex{full}</pattern> - </encoder> - </appender> - - <appender name="CTXT_FILE" class="ch.qos.logback.core.FileAppender"> - <file>${LOG_DIR}/apex_ctxt.log</file> - <encoder> - <pattern>%d %-5relative [procId=${processId}] [%thread] %-5level - %logger{26} - %msg %n %ex{full}</pattern> - </encoder> - </appender> - - <logger name="org.onap.policy.apex.core.context.impl.monitoring" level="INFO" additivity="false"> - <appender-ref ref="CTXT_FILE" /> - </logger> - - <logger name="org.onap.policy.apex.core.context" level="INFO" additivity="false"> - <appender-ref ref="STDOUT" /> - </logger> -</configuration> diff --git a/model/event-model/pom.xml b/model/event-model/pom.xml deleted file mode 100644 index 813ebb8bb..000000000 --- a/model/event-model/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ -<!-- - ============LICENSE_START======================================================= - Copyright (C) 2018 Ericsson. All rights reserved. - Modifications Copyright (C) 2022 Nordix Foundation. - ================================================================================ - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - SPDX-License-Identifier: Apache-2.0 - ============LICENSE_END========================================================= ---> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.policy.apex-pdp.model</groupId> - <artifactId>model</artifactId> - <version>2.7.1-SNAPSHOT</version> - </parent> - - <artifactId>event-model</artifactId> - <name>${project.artifactId}</name> - <description>Event Models used in Apex</description> - - <dependencies> - <dependency> - <groupId>org.onap.policy.apex-pdp.model</groupId> - <artifactId>context-model</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> -</project> diff --git a/model/event-model/src/test/resources/logback-test.xml b/model/event-model/src/test/resources/logback-test.xml deleted file mode 100644 index 2aff4c2e9..000000000 --- a/model/event-model/src/test/resources/logback-test.xml +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ============LICENSE_START======================================================= - Copyright (C) 2016-2018 Ericsson. All rights reserved. - ================================================================================ - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - SPDX-License-Identifier: Apache-2.0 - ============LICENSE_END========================================================= ---> - -<configuration> - - <contextName>Apex</contextName> - <statusListener class="ch.qos.logback.core.status.OnConsoleStatusListener" /> - <property name="LOG_DIR" value="${java.io.tmpdir}/apex_logging/" /> - - <!-- USE FOR STD OUT ONLY --> - <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> - <encoder> - <Pattern>%d %contextName [%t] %level %logger{36} - %msg%n</Pattern> - </encoder> - </appender> - - <root level="INFO"> - <appender-ref ref="STDOUT" /> - </root> - - <logger name="org.infinispan" level="INFO" additivity="false"> - <appender-ref ref="STDOUT" /> - </logger> - - <logger name="org.apache.zookeeper.ClientCnxn" level="OFF" additivity="false"> - <appender-ref ref="STDOUT" /> - </logger> - - <logger name="org.onap.policy.apex.core" level="INFO" additivity="false"> - <appender-ref ref="STDOUT" /> - </logger> - - <appender name="FILE" class="ch.qos.logback.core.FileAppender"> - <file>${LOG_DIR}/apex.log</file> - <encoder> - <pattern>%d %-5relative [procId=${processId}] [%thread] %-5level - %logger{26} - %msg %n %ex{full}</pattern> - </encoder> - </appender> - - <appender name="CTXT_FILE" class="ch.qos.logback.core.FileAppender"> - <file>${LOG_DIR}/apex_ctxt.log</file> - <encoder> - <pattern>%d %-5relative [procId=${processId}] [%thread] %-5level - %logger{26} - %msg %n %ex{full}</pattern> - </encoder> - </appender> - - <logger name="org.onap.policy.apex.core.context.impl.monitoring" level="INFO" additivity="false"> - <appender-ref ref="CTXT_FILE" /> - </logger> - - <logger name="org.onap.policy.apex.core.context" level="INFO" additivity="false"> - <appender-ref ref="STDOUT" /> - </logger> -</configuration> diff --git a/model/model-api/pom.xml b/model/model-api/pom.xml deleted file mode 100644 index 98c727ef5..000000000 --- a/model/model-api/pom.xml +++ /dev/null @@ -1,43 +0,0 @@ -<!-- - ============LICENSE_START======================================================= - Copyright (C) 2018 Ericsson. All rights reserved. - ================================================================================ - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - SPDX-License-Identifier: Apache-2.0 - ============LICENSE_END========================================================= ---> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.policy.apex-pdp.model</groupId> - <artifactId>model</artifactId> - <version>2.7.1-SNAPSHOT</version> - </parent> - - <artifactId>model-api</artifactId> - <name>${project.artifactId}</name> - <description>APIs for editing Apex models</description> - - <dependencies> - <dependency> - <groupId>org.onap.policy.common</groupId> - <artifactId>utils</artifactId> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>policy-model</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> -</project> diff --git a/model/model-api/src/test/resources/logback-test.xml b/model/model-api/src/test/resources/logback-test.xml deleted file mode 100644 index 2aff4c2e9..000000000 --- a/model/model-api/src/test/resources/logback-test.xml +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ============LICENSE_START======================================================= - Copyright (C) 2016-2018 Ericsson. All rights reserved. - ================================================================================ - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - SPDX-License-Identifier: Apache-2.0 - ============LICENSE_END========================================================= ---> - -<configuration> - - <contextName>Apex</contextName> - <statusListener class="ch.qos.logback.core.status.OnConsoleStatusListener" /> - <property name="LOG_DIR" value="${java.io.tmpdir}/apex_logging/" /> - - <!-- USE FOR STD OUT ONLY --> - <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> - <encoder> - <Pattern>%d %contextName [%t] %level %logger{36} - %msg%n</Pattern> - </encoder> - </appender> - - <root level="INFO"> - <appender-ref ref="STDOUT" /> - </root> - - <logger name="org.infinispan" level="INFO" additivity="false"> - <appender-ref ref="STDOUT" /> - </logger> - - <logger name="org.apache.zookeeper.ClientCnxn" level="OFF" additivity="false"> - <appender-ref ref="STDOUT" /> - </logger> - - <logger name="org.onap.policy.apex.core" level="INFO" additivity="false"> - <appender-ref ref="STDOUT" /> - </logger> - - <appender name="FILE" class="ch.qos.logback.core.FileAppender"> - <file>${LOG_DIR}/apex.log</file> - <encoder> - <pattern>%d %-5relative [procId=${processId}] [%thread] %-5level - %logger{26} - %msg %n %ex{full}</pattern> - </encoder> - </appender> - - <appender name="CTXT_FILE" class="ch.qos.logback.core.FileAppender"> - <file>${LOG_DIR}/apex_ctxt.log</file> - <encoder> - <pattern>%d %-5relative [procId=${processId}] [%thread] %-5level - %logger{26} - %msg %n %ex{full}</pattern> - </encoder> - </appender> - - <logger name="org.onap.policy.apex.core.context.impl.monitoring" level="INFO" additivity="false"> - <appender-ref ref="CTXT_FILE" /> - </logger> - - <logger name="org.onap.policy.apex.core.context" level="INFO" additivity="false"> - <appender-ref ref="STDOUT" /> - </logger> -</configuration> diff --git a/model/policy-model/pom.xml b/model/policy-model/pom.xml deleted file mode 100644 index cde0fa83c..000000000 --- a/model/policy-model/pom.xml +++ /dev/null @@ -1,54 +0,0 @@ -<!-- - ============LICENSE_START======================================================= - Copyright (C) 2018 Ericsson. All rights reserved. - Modifications Copyright (C) 2022 Nordix Foundation. - ================================================================================ - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - SPDX-License-Identifier: Apache-2.0 - ============LICENSE_END========================================================= ---> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.policy.apex-pdp.model</groupId> - <artifactId>model</artifactId> - <version>2.7.1-SNAPSHOT</version> - </parent> - - <artifactId>policy-model</artifactId> - <name>${project.artifactId}</name> - <description>Policy Models used in Apex</description> - - <dependencies> - <dependency> - <groupId>org.onap.policy.common</groupId> - <artifactId>utils</artifactId> - </dependency> - <dependency> - <groupId>org.onap.policy.apex-pdp.model</groupId> - <artifactId>context-model</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.onap.policy.apex-pdp.model</groupId> - <artifactId>event-model</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.assertj</groupId> - <artifactId>assertj-core</artifactId> - <scope>test</scope> - </dependency> - </dependencies> -</project> diff --git a/model/policy-model/src/test/resources/logback-test.xml b/model/policy-model/src/test/resources/logback-test.xml deleted file mode 100644 index 2aff4c2e9..000000000 --- a/model/policy-model/src/test/resources/logback-test.xml +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ============LICENSE_START======================================================= - Copyright (C) 2016-2018 Ericsson. All rights reserved. - ================================================================================ - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - SPDX-License-Identifier: Apache-2.0 - ============LICENSE_END========================================================= ---> - -<configuration> - - <contextName>Apex</contextName> - <statusListener class="ch.qos.logback.core.status.OnConsoleStatusListener" /> - <property name="LOG_DIR" value="${java.io.tmpdir}/apex_logging/" /> - - <!-- USE FOR STD OUT ONLY --> - <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> - <encoder> - <Pattern>%d %contextName [%t] %level %logger{36} - %msg%n</Pattern> - </encoder> - </appender> - - <root level="INFO"> - <appender-ref ref="STDOUT" /> - </root> - - <logger name="org.infinispan" level="INFO" additivity="false"> - <appender-ref ref="STDOUT" /> - </logger> - - <logger name="org.apache.zookeeper.ClientCnxn" level="OFF" additivity="false"> - <appender-ref ref="STDOUT" /> - </logger> - - <logger name="org.onap.policy.apex.core" level="INFO" additivity="false"> - <appender-ref ref="STDOUT" /> - </logger> - - <appender name="FILE" class="ch.qos.logback.core.FileAppender"> - <file>${LOG_DIR}/apex.log</file> - <encoder> - <pattern>%d %-5relative [procId=${processId}] [%thread] %-5level - %logger{26} - %msg %n %ex{full}</pattern> - </encoder> - </appender> - - <appender name="CTXT_FILE" class="ch.qos.logback.core.FileAppender"> - <file>${LOG_DIR}/apex_ctxt.log</file> - <encoder> - <pattern>%d %-5relative [procId=${processId}] [%thread] %-5level - %logger{26} - %msg %n %ex{full}</pattern> - </encoder> - </appender> - - <logger name="org.onap.policy.apex.core.context.impl.monitoring" level="INFO" additivity="false"> - <appender-ref ref="CTXT_FILE" /> - </logger> - - <logger name="org.onap.policy.apex.core.context" level="INFO" additivity="false"> - <appender-ref ref="STDOUT" /> - </logger> -</configuration> diff --git a/model/pom.xml b/model/pom.xml index f358e5907..a21ae66ae 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -27,23 +27,41 @@ <groupId>org.onap.policy.apex-pdp.model</groupId> <artifactId>model</artifactId> - <packaging>pom</packaging> <name>${project.artifactId}</name> <description>The model for Apex, it comtains definitions of all Apex concepts and also has handling for Apex models.</description> - <modules> - <module>utilities</module> - <module>basic-model</module> - <module>context-model</module> - <module>event-model</module> - <module>policy-model</module> - <module>engine-model</module> - <module>model-api</module> - </modules> - <dependencies> <dependency> + <groupId>org.onap.policy.common</groupId> + <artifactId>utils</artifactId> + <exclusions> + <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>io.prometheus</groupId> + <artifactId>simpleclient</artifactId> + </dependency> + <dependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4-runtime</artifactId> + <version>4.8-1</version> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> <scope>test</scope> diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexConceptException.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexConceptException.java index d62818dc8..d62818dc8 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexConceptException.java +++ b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexConceptException.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexException.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexException.java index 2eca2f783..2eca2f783 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexException.java +++ b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexException.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexRuntimeException.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexRuntimeException.java index b4240ad0f..b4240ad0f 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexRuntimeException.java +++ b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexRuntimeException.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxArtifactKey.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxArtifactKey.java index 1efe83db8..1efe83db8 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxArtifactKey.java +++ b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxArtifactKey.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConcept.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConcept.java index 37fe30b33..37fe30b33 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConcept.java +++ b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConcept.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetter.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetter.java index 0284de48a..0284de48a 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetter.java +++ b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetter.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetterImpl.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetterImpl.java index 9c907da9c..9c907da9c 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetterImpl.java +++ b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetterImpl.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKey.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKey.java index 1b6f0148f..1b6f0148f 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKey.java +++ b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKey.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfo.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfo.java index bd3b18ec9..bd3b18ec9 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfo.java +++ b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfo.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInformation.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInformation.java index 439b2960f..439b2960f 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInformation.java +++ b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInformation.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUse.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUse.java index eb701e5b3..eb701e5b3 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUse.java +++ b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUse.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxModel.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxModel.java index ce52b147f..ce52b147f 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxModel.java +++ b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxModel.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKey.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKey.java index b37bc47e4..b37bc47e4 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKey.java +++ b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKey.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxToscaPolicyProcessingStatus.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxToscaPolicyProcessingStatus.java index 43c7e7866..43c7e7866 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxToscaPolicyProcessingStatus.java +++ b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxToscaPolicyProcessingStatus.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationMessage.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationMessage.java index 9e245c07b..9e245c07b 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationMessage.java +++ b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationMessage.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationResult.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationResult.java index 10ccb30aa..10ccb30aa 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationResult.java +++ b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationResult.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/package-info.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/package-info.java index 347e46a0f..347e46a0f 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/package-info.java +++ b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/package-info.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCreator.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCreator.java index a33e1bf1a..a33e1bf1a 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCreator.java +++ b/model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCreator.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCustomGsonMapAdapter.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCustomGsonMapAdapter.java index cb67590f7..cb67590f7 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCustomGsonMapAdapter.java +++ b/model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCustomGsonMapAdapter.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCustomGsonRefereceKeyAdapter.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCustomGsonRefereceKeyAdapter.java index d731c8689..d731c8689 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCustomGsonRefereceKeyAdapter.java +++ b/model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCustomGsonRefereceKeyAdapter.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelException.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelException.java index 17eb2639d..17eb2639d 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelException.java +++ b/model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelException.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelFileWriter.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelFileWriter.java index 54b5651cc..54b5651cc 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelFileWriter.java +++ b/model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelFileWriter.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelReader.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelReader.java index a9bd2fe60..a9bd2fe60 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelReader.java +++ b/model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelReader.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelSaver.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelSaver.java index 79d69bdd5..79d69bdd5 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelSaver.java +++ b/model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelSaver.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelStringWriter.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelStringWriter.java index a9df23afc..a9df23afc 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelStringWriter.java +++ b/model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelStringWriter.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelWriter.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelWriter.java index 349622697..349622697 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelWriter.java +++ b/model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelWriter.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/package-info.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/package-info.java index 3d6dab3b2..3d6dab3b2 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/package-info.java +++ b/model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/package-info.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/package-info.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/package-info.java index 8ad405e25..8ad405e25 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/package-info.java +++ b/model/src/main/java/org/onap/policy/apex/model/basicmodel/package-info.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/service/ModelService.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/service/ModelService.java index c6eb0e011..c6eb0e011 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/service/ModelService.java +++ b/model/src/main/java/org/onap/policy/apex/model/basicmodel/service/ModelService.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/service/package-info.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/service/package-info.java index a27e45d1a..a27e45d1a 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/service/package-info.java +++ b/model/src/main/java/org/onap/policy/apex/model/basicmodel/service/package-info.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/test/TestApexModel.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/test/TestApexModel.java index 9dde47d05..9dde47d05 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/test/TestApexModel.java +++ b/model/src/main/java/org/onap/policy/apex/model/basicmodel/test/TestApexModel.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/test/TestApexModelCreator.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/test/TestApexModelCreator.java index 65441a33c..65441a33c 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/test/TestApexModelCreator.java +++ b/model/src/main/java/org/onap/policy/apex/model/basicmodel/test/TestApexModelCreator.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/test/package-info.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/test/package-info.java index 9bbdd1cce..9bbdd1cce 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/test/package-info.java +++ b/model/src/main/java/org/onap/policy/apex/model/basicmodel/test/package-info.java diff --git a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbum.java b/model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbum.java index db64f8847..db64f8847 100644 --- a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbum.java +++ b/model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbum.java diff --git a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbums.java b/model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbums.java index 54e3ce44b..54e3ce44b 100644 --- a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbums.java +++ b/model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbums.java diff --git a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextModel.java b/model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextModel.java index 1effe8079..1effe8079 100644 --- a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextModel.java +++ b/model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextModel.java diff --git a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchema.java b/model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchema.java index 61434ca67..61434ca67 100644 --- a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchema.java +++ b/model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchema.java diff --git a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchemas.java b/model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchemas.java index 5b79a3dcb..5b79a3dcb 100644 --- a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchemas.java +++ b/model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchemas.java diff --git a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/package-info.java b/model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/package-info.java index a7aa3a5ad..a7aa3a5ad 100644 --- a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/package-info.java +++ b/model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/package-info.java diff --git a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/handling/ContextComparer.java b/model/src/main/java/org/onap/policy/apex/model/contextmodel/handling/ContextComparer.java index 7a5ebfd22..7a5ebfd22 100644 --- a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/handling/ContextComparer.java +++ b/model/src/main/java/org/onap/policy/apex/model/contextmodel/handling/ContextComparer.java diff --git a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/handling/package-info.java b/model/src/main/java/org/onap/policy/apex/model/contextmodel/handling/package-info.java index ec1fa893f..ec1fa893f 100644 --- a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/handling/package-info.java +++ b/model/src/main/java/org/onap/policy/apex/model/contextmodel/handling/package-info.java diff --git a/model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineModel.java b/model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineModel.java index 1a590a411..1a590a411 100644 --- a/model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineModel.java +++ b/model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineModel.java diff --git a/model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineState.java b/model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineState.java index 24c564b96..24c564b96 100644 --- a/model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineState.java +++ b/model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineState.java diff --git a/model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineStats.java b/model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineStats.java index 1420d1e0d..1420d1e0d 100644 --- a/model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineStats.java +++ b/model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineStats.java diff --git a/model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/package-info.java b/model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/package-info.java index 4557af7db..4557af7db 100644 --- a/model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/package-info.java +++ b/model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/package-info.java diff --git a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvent.java b/model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvent.java index a4c0e9db1..a4c0e9db1 100644 --- a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvent.java +++ b/model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvent.java diff --git a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEventModel.java b/model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEventModel.java index b91712c9d..b91712c9d 100644 --- a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEventModel.java +++ b/model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEventModel.java diff --git a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvents.java b/model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvents.java index aac1562de..aac1562de 100644 --- a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvents.java +++ b/model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvents.java diff --git a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxField.java b/model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxField.java index 26511c9d1..26511c9d1 100644 --- a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxField.java +++ b/model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxField.java diff --git a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxInputField.java b/model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxInputField.java index 6155c7186..6155c7186 100644 --- a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxInputField.java +++ b/model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxInputField.java diff --git a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxOutputField.java b/model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxOutputField.java index 7f3437617..7f3437617 100644 --- a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxOutputField.java +++ b/model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxOutputField.java diff --git a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/package-info.java b/model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/package-info.java index 414d22d0e..414d22d0e 100644 --- a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/package-info.java +++ b/model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/package-info.java diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexApiResult.java b/model/src/main/java/org/onap/policy/apex/model/modelapi/ApexApiResult.java index 83e3b5370..83e3b5370 100644 --- a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexApiResult.java +++ b/model/src/main/java/org/onap/policy/apex/model/modelapi/ApexApiResult.java diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexEditorApi.java b/model/src/main/java/org/onap/policy/apex/model/modelapi/ApexEditorApi.java index 8974d1fa8..8974d1fa8 100644 --- a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexEditorApi.java +++ b/model/src/main/java/org/onap/policy/apex/model/modelapi/ApexEditorApi.java diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexModel.java b/model/src/main/java/org/onap/policy/apex/model/modelapi/ApexModel.java index 3c6e4c063..3c6e4c063 100644 --- a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexModel.java +++ b/model/src/main/java/org/onap/policy/apex/model/modelapi/ApexModel.java diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexModelFactory.java b/model/src/main/java/org/onap/policy/apex/model/modelapi/ApexModelFactory.java index 908f562d2..908f562d2 100644 --- a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexModelFactory.java +++ b/model/src/main/java/org/onap/policy/apex/model/modelapi/ApexModelFactory.java diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ApexModelImpl.java b/model/src/main/java/org/onap/policy/apex/model/modelapi/impl/ApexModelImpl.java index 54b94d0e7..54b94d0e7 100644 --- a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ApexModelImpl.java +++ b/model/src/main/java/org/onap/policy/apex/model/modelapi/impl/ApexModelImpl.java diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextAlbum.java b/model/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextAlbum.java index 5a42ed14e..5a42ed14e 100644 --- a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextAlbum.java +++ b/model/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextAlbum.java diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextAlbumFacade.java b/model/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextAlbumFacade.java index d29f32ea0..d29f32ea0 100644 --- a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextAlbumFacade.java +++ b/model/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextAlbumFacade.java diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextSchemaFacade.java b/model/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextSchemaFacade.java index 83bca5a01..83bca5a01 100644 --- a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextSchemaFacade.java +++ b/model/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextSchemaFacade.java diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/CreatePolicyStateTaskRef.java b/model/src/main/java/org/onap/policy/apex/model/modelapi/impl/CreatePolicyStateTaskRef.java index a6e4c334e..a6e4c334e 100644 --- a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/CreatePolicyStateTaskRef.java +++ b/model/src/main/java/org/onap/policy/apex/model/modelapi/impl/CreatePolicyStateTaskRef.java diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/EventFacade.java b/model/src/main/java/org/onap/policy/apex/model/modelapi/impl/EventFacade.java index 336f27b5d..336f27b5d 100644 --- a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/EventFacade.java +++ b/model/src/main/java/org/onap/policy/apex/model/modelapi/impl/EventFacade.java diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/KeyInformationFacade.java b/model/src/main/java/org/onap/policy/apex/model/modelapi/impl/KeyInformationFacade.java index 6875a4c20..6875a4c20 100644 --- a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/KeyInformationFacade.java +++ b/model/src/main/java/org/onap/policy/apex/model/modelapi/impl/KeyInformationFacade.java diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelFacade.java b/model/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelFacade.java index 1030a5bf5..1030a5bf5 100644 --- a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelFacade.java +++ b/model/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelFacade.java diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelHandlerFacade.java b/model/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelHandlerFacade.java index fecf92e1f..fecf92e1f 100644 --- a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelHandlerFacade.java +++ b/model/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelHandlerFacade.java diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/PolicyFacade.java b/model/src/main/java/org/onap/policy/apex/model/modelapi/impl/PolicyFacade.java index 408f0913f..408f0913f 100644 --- a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/PolicyFacade.java +++ b/model/src/main/java/org/onap/policy/apex/model/modelapi/impl/PolicyFacade.java diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/TaskFacade.java b/model/src/main/java/org/onap/policy/apex/model/modelapi/impl/TaskFacade.java index 6a2ded3e2..6a2ded3e2 100644 --- a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/TaskFacade.java +++ b/model/src/main/java/org/onap/policy/apex/model/modelapi/impl/TaskFacade.java diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/package-info.java b/model/src/main/java/org/onap/policy/apex/model/modelapi/impl/package-info.java index f31542044..f31542044 100644 --- a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/package-info.java +++ b/model/src/main/java/org/onap/policy/apex/model/modelapi/impl/package-info.java diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/package-info.java b/model/src/main/java/org/onap/policy/apex/model/modelapi/package-info.java index 97e8db4ea..97e8db4ea 100644 --- a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/package-info.java +++ b/model/src/main/java/org/onap/policy/apex/model/modelapi/package-info.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogic.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogic.java index 0564d5854..0564d5854 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogic.java +++ b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogic.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogicReader.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogicReader.java index 7532f9f34..7532f9f34 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogicReader.java +++ b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogicReader.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicies.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicies.java index bb30f46cf..bb30f46cf 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicies.java +++ b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicies.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicy.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicy.java index a47afe4d6..a47afe4d6 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicy.java +++ b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicy.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicyModel.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicyModel.java index e119536fb..e119536fb 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicyModel.java +++ b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicyModel.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxState.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxState.java index ae8efbff4..ae8efbff4 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxState.java +++ b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxState.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateFinalizerLogic.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateFinalizerLogic.java index 31ffedea8..31ffedea8 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateFinalizerLogic.java +++ b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateFinalizerLogic.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateOutput.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateOutput.java index 7d4695290..7d4695290 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateOutput.java +++ b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateOutput.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateParamsBuilder.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateParamsBuilder.java index 6ef6e0b0a..6ef6e0b0a 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateParamsBuilder.java +++ b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateParamsBuilder.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTaskOutputType.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTaskOutputType.java index 171747c0c..171747c0c 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTaskOutputType.java +++ b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTaskOutputType.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTaskReference.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTaskReference.java index 748eca92d..748eca92d 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTaskReference.java +++ b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTaskReference.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTree.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTree.java index a27e1af1e..a27e1af1e 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTree.java +++ b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTree.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTask.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTask.java index c8b6baf4b..c8b6baf4b 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTask.java +++ b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTask.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskLogic.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskLogic.java index 8665d9e3e..8665d9e3e 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskLogic.java +++ b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskLogic.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskParameter.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskParameter.java index a468ec499..a468ec499 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskParameter.java +++ b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskParameter.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskSelectionLogic.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskSelectionLogic.java index b9cfd802d..b9cfd802d 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskSelectionLogic.java +++ b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskSelectionLogic.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTasks.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTasks.java index f9ccafd54..f9ccafd54 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTasks.java +++ b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTasks.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/PolicyException.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/PolicyException.java index 271e0c2af..271e0c2af 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/PolicyException.java +++ b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/PolicyException.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/PolicyRuntimeException.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/PolicyRuntimeException.java index 7ad293187..7ad293187 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/PolicyRuntimeException.java +++ b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/PolicyRuntimeException.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/package-info.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/package-info.java index acf0e8221..acf0e8221 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/package-info.java +++ b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/package-info.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalyser.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalyser.java index 6731caf30..6731caf30 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalyser.java +++ b/model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalyser.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalysisResult.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalysisResult.java index 96bdc57d0..96bdc57d0 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalysisResult.java +++ b/model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalysisResult.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyComparer.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyComparer.java index 5a947c596..5a947c596 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyComparer.java +++ b/model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyComparer.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java index f70068454..f70068454 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java +++ b/model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparer.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparer.java index f3bbdcbcf..f3bbdcbcf 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparer.java +++ b/model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparer.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelMerger.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelMerger.java index ae0dda814..ae0dda814 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelMerger.java +++ b/model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelMerger.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelSplitter.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelSplitter.java index 1f1c27a83..1f1c27a83 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelSplitter.java +++ b/model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelSplitter.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/package-info.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/handling/package-info.java index f84befd26..f84befd26 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/package-info.java +++ b/model/src/main/java/org/onap/policy/apex/model/policymodel/handling/package-info.java diff --git a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/CollectionUtils.java b/model/src/main/java/org/onap/policy/apex/model/utilities/CollectionUtils.java index 9636ea7ce..9636ea7ce 100644 --- a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/CollectionUtils.java +++ b/model/src/main/java/org/onap/policy/apex/model/utilities/CollectionUtils.java diff --git a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/DirectoryDeleteShutdownHook.java b/model/src/main/java/org/onap/policy/apex/model/utilities/DirectoryDeleteShutdownHook.java index 21c417c4d..21c417c4d 100644 --- a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/DirectoryDeleteShutdownHook.java +++ b/model/src/main/java/org/onap/policy/apex/model/utilities/DirectoryDeleteShutdownHook.java diff --git a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/DirectoryUtils.java b/model/src/main/java/org/onap/policy/apex/model/utilities/DirectoryUtils.java index b0e8332b1..b0e8332b1 100644 --- a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/DirectoryUtils.java +++ b/model/src/main/java/org/onap/policy/apex/model/utilities/DirectoryUtils.java diff --git a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/TreeMapUtils.java b/model/src/main/java/org/onap/policy/apex/model/utilities/TreeMapUtils.java index d8bb469cf..d8bb469cf 100644 --- a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/TreeMapUtils.java +++ b/model/src/main/java/org/onap/policy/apex/model/utilities/TreeMapUtils.java diff --git a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyComparer.java b/model/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyComparer.java index f4d628405..f4d628405 100644 --- a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyComparer.java +++ b/model/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyComparer.java diff --git a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyDifference.java b/model/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyDifference.java index a0395cf16..a0395cf16 100644 --- a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyDifference.java +++ b/model/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyDifference.java diff --git a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapComparer.java b/model/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapComparer.java index 9943690fa..9943690fa 100644 --- a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapComparer.java +++ b/model/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapComparer.java diff --git a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapDifference.java b/model/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapDifference.java index e10854926..e10854926 100644 --- a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapDifference.java +++ b/model/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapDifference.java diff --git a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/package-info.java b/model/src/main/java/org/onap/policy/apex/model/utilities/comparison/package-info.java index f0488eacd..f0488eacd 100644 --- a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/package-info.java +++ b/model/src/main/java/org/onap/policy/apex/model/utilities/comparison/package-info.java diff --git a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/json/JsonHandler.java b/model/src/main/java/org/onap/policy/apex/model/utilities/json/JsonHandler.java index 66e389fa2..66e389fa2 100644 --- a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/json/JsonHandler.java +++ b/model/src/main/java/org/onap/policy/apex/model/utilities/json/JsonHandler.java diff --git a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/json/package-info.java b/model/src/main/java/org/onap/policy/apex/model/utilities/json/package-info.java index f9d1304d7..f9d1304d7 100755 --- a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/json/package-info.java +++ b/model/src/main/java/org/onap/policy/apex/model/utilities/json/package-info.java diff --git a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/package-info.java b/model/src/main/java/org/onap/policy/apex/model/utilities/package-info.java index 446d009ba..446d009ba 100644 --- a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/package-info.java +++ b/model/src/main/java/org/onap/policy/apex/model/utilities/package-info.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetterImplTest.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetterImplTest.java index 44a9de49e..44a9de49e 100644 --- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetterImplTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetterImplTest.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfoTest.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfoTest.java index 0c7edee28..0c7edee28 100644 --- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfoTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfoTest.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyTest.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyTest.java index 010f4b8a3..010f4b8a3 100644 --- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyTest.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUseTest.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUseTest.java index 5346b6b21..5346b6b21 100644 --- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUseTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUseTest.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKeyTest.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKeyTest.java index 515587558..515587558 100644 --- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKeyTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKeyTest.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/DummyEntity.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/DummyEntity.java index 2b16e89ed..2b16e89ed 100644 --- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/DummyEntity.java +++ b/model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/DummyEntity.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/ExceptionsTest.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/ExceptionsTest.java index ff87bc2d0..ff87bc2d0 100644 --- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/ExceptionsTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/ExceptionsTest.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/ValidationTest.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/ValidationTest.java index 21ae9b65c..21ae9b65c 100644 --- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/ValidationTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/ValidationTest.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelExceptionTest.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelExceptionTest.java index 2571ea65b..2571ea65b 100644 --- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelExceptionTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelExceptionTest.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelFileWriterTest.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelFileWriterTest.java index 0f8f956ab..0f8f956ab 100644 --- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelFileWriterTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelFileWriterTest.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelReaderTest.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelReaderTest.java index 1152771ea..1152771ea 100644 --- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelReaderTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelReaderTest.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelSaverTest.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelSaverTest.java index c95106aa8..c95106aa8 100644 --- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelSaverTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelSaverTest.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelStringWriterTest.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelStringWriterTest.java index 13e72d3e2..13e72d3e2 100644 --- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelStringWriterTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelStringWriterTest.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelWriterTest.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelWriterTest.java index 063855976..063855976 100644 --- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelWriterTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelWriterTest.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/DummyApexBasicModelCreator.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/DummyApexBasicModelCreator.java index 353722b2d..353722b2d 100644 --- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/DummyApexBasicModelCreator.java +++ b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/DummyApexBasicModelCreator.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/DummyAxModelWithReferences.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/DummyAxModelWithReferences.java index 887755d03..887755d03 100644 --- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/DummyAxModelWithReferences.java +++ b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/DummyAxModelWithReferences.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexBasicModelConceptsTest.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexBasicModelConceptsTest.java index 905a27f38..905a27f38 100644 --- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexBasicModelConceptsTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexBasicModelConceptsTest.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexBasicModelTest.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexBasicModelTest.java index 68f755886..68f755886 100644 --- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexBasicModelTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexBasicModelTest.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator0.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator0.java index e835bc0fc..e835bc0fc 100644 --- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator0.java +++ b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator0.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator1.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator1.java index 9ad34a38c..9ad34a38c 100644 --- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator1.java +++ b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator1.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator2.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator2.java index 0ab7aab7f..0ab7aab7f 100644 --- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator2.java +++ b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator2.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportBasicModelTest.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportBasicModelTest.java index d55a9da29..d55a9da29 100644 --- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportBasicModelTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportBasicModelTest.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportConceptGetterTest.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportConceptGetterTest.java index 1783fc00f..1783fc00f 100644 --- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportConceptGetterTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportConceptGetterTest.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/service/ModelServiceTest.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/service/ModelServiceTest.java index 746e10607..746e10607 100644 --- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/service/ModelServiceTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/basicmodel/service/ModelServiceTest.java diff --git a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextAlbumsTest.java b/model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextAlbumsTest.java index 44161b329..44161b329 100644 --- a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextAlbumsTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextAlbumsTest.java diff --git a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextModelTest.java b/model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextModelTest.java index b148ef6be..b148ef6be 100644 --- a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextModelTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextModelTest.java diff --git a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextSchemasTest.java b/model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextSchemasTest.java index 52cca14bf..52cca14bf 100644 --- a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextSchemasTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextSchemasTest.java diff --git a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ApexContextModelTest.java b/model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ApexContextModelTest.java index 998469bac..998469bac 100644 --- a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ApexContextModelTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ApexContextModelTest.java diff --git a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ContextComparisonTest.java b/model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ContextComparisonTest.java index 483bc3661..483bc3661 100644 --- a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ContextComparisonTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ContextComparisonTest.java diff --git a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/TestApexContextModelCreator.java b/model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/TestApexContextModelCreator.java index 3fe7e3aa2..3fe7e3aa2 100644 --- a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/TestApexContextModelCreator.java +++ b/model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/TestApexContextModelCreator.java diff --git a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/TestContextComparisonFactory.java b/model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/TestContextComparisonFactory.java index f7c7a1345..f7c7a1345 100644 --- a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/TestContextComparisonFactory.java +++ b/model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/TestContextComparisonFactory.java diff --git a/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineModelTest.java b/model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineModelTest.java index c23687bb1..c23687bb1 100644 --- a/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineModelTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineModelTest.java diff --git a/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineStatsTest.java b/model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineStatsTest.java index 3eca27c08..3eca27c08 100644 --- a/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineStatsTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineStatsTest.java diff --git a/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/ApexEngineModelTest.java b/model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/ApexEngineModelTest.java index e7fdd2d93..e7fdd2d93 100644 --- a/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/ApexEngineModelTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/ApexEngineModelTest.java diff --git a/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/DummyTestApexEngineModelCreator.java b/model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/DummyTestApexEngineModelCreator.java index 9e7d99b72..9e7d99b72 100644 --- a/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/DummyTestApexEngineModelCreator.java +++ b/model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/DummyTestApexEngineModelCreator.java diff --git a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventModelTest.java b/model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventModelTest.java index cdc5fecf6..cdc5fecf6 100644 --- a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventModelTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventModelTest.java diff --git a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventsTest.java b/model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventsTest.java index 7062fcb3c..7062fcb3c 100644 --- a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventsTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventsTest.java diff --git a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/FieldTest.java b/model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/FieldTest.java index 6ec46dbd5..6ec46dbd5 100644 --- a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/FieldTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/FieldTest.java diff --git a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/ApexEventModelTest.java b/model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/ApexEventModelTest.java index 21b97c454..21b97c454 100644 --- a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/ApexEventModelTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/ApexEventModelTest.java diff --git a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/DummyTestApexEventModelCreator.java b/model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/DummyTestApexEventModelCreator.java index 11685a6b4..11685a6b4 100644 --- a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/DummyTestApexEventModelCreator.java +++ b/model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/DummyTestApexEventModelCreator.java diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexApiResultTest.java b/model/src/test/java/org/onap/policy/apex/model/modelapi/ApexApiResultTest.java index 3c2af18ea..3c2af18ea 100644 --- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexApiResultTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/modelapi/ApexApiResultTest.java diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextAlbumTest.java b/model/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextAlbumTest.java index 5ce6b6760..5ce6b6760 100644 --- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextAlbumTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextAlbumTest.java diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextSchemaTest.java b/model/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextSchemaTest.java index 20310a29e..20310a29e 100644 --- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextSchemaTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextSchemaTest.java diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiEventTest.java b/model/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiEventTest.java index ac9265e84..ac9265e84 100644 --- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiEventTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiEventTest.java diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiKeyInfoTest.java b/model/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiKeyInfoTest.java index 2519b8cb2..2519b8cb2 100644 --- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiKeyInfoTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiKeyInfoTest.java diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiPolicyTest.java b/model/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiPolicyTest.java index 0a4d72214..0a4d72214 100644 --- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiPolicyTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiPolicyTest.java diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiTaskTest.java b/model/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiTaskTest.java index 15e53f925..15e53f925 100644 --- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiTaskTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiTaskTest.java diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java b/model/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java index f28d0e634..f28d0e634 100644 --- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ModelFacadeTest.java b/model/src/test/java/org/onap/policy/apex/model/modelapi/ModelFacadeTest.java index d3b32b923..d3b32b923 100644 --- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ModelFacadeTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/modelapi/ModelFacadeTest.java diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ModelHandlerFacadeTest.java b/model/src/test/java/org/onap/policy/apex/model/modelapi/ModelHandlerFacadeTest.java index 5bbc95992..5bbc95992 100644 --- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ModelHandlerFacadeTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/modelapi/ModelHandlerFacadeTest.java diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/RealModelTest.java b/model/src/test/java/org/onap/policy/apex/model/modelapi/RealModelTest.java index 2a29f5297..2a29f5297 100644 --- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/RealModelTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/modelapi/RealModelTest.java diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/DummyLogicReader.java b/model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/DummyLogicReader.java index 007288343..007288343 100644 --- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/DummyLogicReader.java +++ b/model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/DummyLogicReader.java diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/ExceptionsTest.java b/model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/ExceptionsTest.java index 0afb48b3c..0afb48b3c 100644 --- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/ExceptionsTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/ExceptionsTest.java diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/LogicTest.java b/model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/LogicTest.java index fbfc7c4a0..fbfc7c4a0 100644 --- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/LogicTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/LogicTest.java diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PoliciesTest.java b/model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PoliciesTest.java index 526f5a628..526f5a628 100644 --- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PoliciesTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PoliciesTest.java diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PolicyModelTest.java b/model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PolicyModelTest.java index b699b5d48..b699b5d48 100644 --- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PolicyModelTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PolicyModelTest.java diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateOutputTest.java b/model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateOutputTest.java index 049783a7f..049783a7f 100644 --- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateOutputTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateOutputTest.java diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTaskReferenceTest.java b/model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTaskReferenceTest.java index 568c47f61..568c47f61 100644 --- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTaskReferenceTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTaskReferenceTest.java diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTest.java b/model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTest.java index 7fbe78078..7fbe78078 100644 --- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTest.java diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TaskParameterTest.java b/model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TaskParameterTest.java index 4255b495d..4255b495d 100644 --- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TaskParameterTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TaskParameterTest.java diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TasksTest.java b/model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TasksTest.java index 9c7866c85..9c7866c85 100644 --- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TasksTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TasksTest.java diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/ApexPolicyModelTest.java b/model/src/test/java/org/onap/policy/apex/model/policymodel/handling/ApexPolicyModelTest.java index 48e4f87f9..48e4f87f9 100644 --- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/ApexPolicyModelTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/policymodel/handling/ApexPolicyModelTest.java diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalyserTest.java b/model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalyserTest.java index b1e2d5cbd..b1e2d5cbd 100644 --- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalyserTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalyserTest.java diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReaderTest.java b/model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReaderTest.java index a2cbe7415..a2cbe7415 100644 --- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReaderTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReaderTest.java diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparerTest.java b/model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparerTest.java index 691880d6b..691880d6b 100644 --- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparerTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparerTest.java diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelMergerTest.java b/model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelMergerTest.java index 2bdf7499f..2bdf7499f 100644 --- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelMergerTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelMergerTest.java diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelSplitterTest.java b/model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelSplitterTest.java index 902206d51..902206d51 100644 --- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelSplitterTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelSplitterTest.java diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/SupportApexPolicyModelCreator.java b/model/src/test/java/org/onap/policy/apex/model/policymodel/handling/SupportApexPolicyModelCreator.java index 85040221a..85040221a 100644 --- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/SupportApexPolicyModelCreator.java +++ b/model/src/test/java/org/onap/policy/apex/model/policymodel/handling/SupportApexPolicyModelCreator.java diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/utils/SupportPolicyModelValidator.java b/model/src/test/java/org/onap/policy/apex/model/policymodel/utils/SupportPolicyModelValidator.java index daff1efa7..daff1efa7 100644 --- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/utils/SupportPolicyModelValidator.java +++ b/model/src/test/java/org/onap/policy/apex/model/policymodel/utils/SupportPolicyModelValidator.java diff --git a/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/CollectionUtilitiesTest.java b/model/src/test/java/org/onap/policy/apex/model/utilities/CollectionUtilitiesTest.java index 2512133e7..2512133e7 100644 --- a/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/CollectionUtilitiesTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/utilities/CollectionUtilitiesTest.java diff --git a/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/DirectoryUtilsTest.java b/model/src/test/java/org/onap/policy/apex/model/utilities/DirectoryUtilsTest.java index 69c2d4763..69c2d4763 100644 --- a/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/DirectoryUtilsTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/utilities/DirectoryUtilsTest.java diff --git a/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/KeyComparerTest.java b/model/src/test/java/org/onap/policy/apex/model/utilities/KeyComparerTest.java index 20780b271..20780b271 100644 --- a/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/KeyComparerTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/utilities/KeyComparerTest.java diff --git a/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/KeyedMapComparerTest.java b/model/src/test/java/org/onap/policy/apex/model/utilities/KeyedMapComparerTest.java index b4e88e20d..b4e88e20d 100644 --- a/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/KeyedMapComparerTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/utilities/KeyedMapComparerTest.java diff --git a/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/TextFileUtilsTest.java b/model/src/test/java/org/onap/policy/apex/model/utilities/TextFileUtilsTest.java index 1d6f29fe5..1d6f29fe5 100644 --- a/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/TextFileUtilsTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/utilities/TextFileUtilsTest.java diff --git a/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/TreeMapUtilsTest.java b/model/src/test/java/org/onap/policy/apex/model/utilities/TreeMapUtilsTest.java index c3a36b7b9..c3a36b7b9 100644 --- a/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/TreeMapUtilsTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/utilities/TreeMapUtilsTest.java diff --git a/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/json/JsonHandlerTest.java b/model/src/test/java/org/onap/policy/apex/model/utilities/json/JsonHandlerTest.java index ae5d53ec3..ae5d53ec3 100644 --- a/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/json/JsonHandlerTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/utilities/json/JsonHandlerTest.java diff --git a/model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonDifferentTerseKeys.txt b/model/src/test/resources/checkFiles/PolicyModelComparisonDifferentTerseKeys.txt index 4d00394b7..4d00394b7 100644 --- a/model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonDifferentTerseKeys.txt +++ b/model/src/test/resources/checkFiles/PolicyModelComparisonDifferentTerseKeys.txt diff --git a/model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonDifferentTerseValues.txt b/model/src/test/resources/checkFiles/PolicyModelComparisonDifferentTerseValues.txt index 82fecd990..82fecd990 100644 --- a/model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonDifferentTerseValues.txt +++ b/model/src/test/resources/checkFiles/PolicyModelComparisonDifferentTerseValues.txt diff --git a/model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonDifferentVerboseKeys.txt b/model/src/test/resources/checkFiles/PolicyModelComparisonDifferentVerboseKeys.txt index 38623c32a..38623c32a 100644 --- a/model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonDifferentVerboseKeys.txt +++ b/model/src/test/resources/checkFiles/PolicyModelComparisonDifferentVerboseKeys.txt diff --git a/model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonDifferentVerboseValues.txt b/model/src/test/resources/checkFiles/PolicyModelComparisonDifferentVerboseValues.txt index 53cadd979..53cadd979 100644 --- a/model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonDifferentVerboseValues.txt +++ b/model/src/test/resources/checkFiles/PolicyModelComparisonDifferentVerboseValues.txt diff --git a/model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonIdenticalTerse.txt b/model/src/test/resources/checkFiles/PolicyModelComparisonIdenticalTerse.txt index b9c0decdd..b9c0decdd 100644 --- a/model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonIdenticalTerse.txt +++ b/model/src/test/resources/checkFiles/PolicyModelComparisonIdenticalTerse.txt diff --git a/model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonIdenticalVerboseKeys.txt b/model/src/test/resources/checkFiles/PolicyModelComparisonIdenticalVerboseKeys.txt index 17862e1b1..17862e1b1 100644 --- a/model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonIdenticalVerboseKeys.txt +++ b/model/src/test/resources/checkFiles/PolicyModelComparisonIdenticalVerboseKeys.txt diff --git a/model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonIdenticalVerboseValues.txt b/model/src/test/resources/checkFiles/PolicyModelComparisonIdenticalVerboseValues.txt index 4e07c5360..4e07c5360 100644 --- a/model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonIdenticalVerboseValues.txt +++ b/model/src/test/resources/checkFiles/PolicyModelComparisonIdenticalVerboseValues.txt diff --git a/model/context-model/src/test/resources/logback-test.xml b/model/src/test/resources/logback-test.xml index af4993550..af4993550 100644 --- a/model/context-model/src/test/resources/logback-test.xml +++ b/model/src/test/resources/logback-test.xml diff --git a/model/model-api/src/test/resources/models/PolicyModel.json b/model/src/test/resources/models/PolicyModel.json index fbb91bb0b..fbb91bb0b 100644 --- a/model/model-api/src/test/resources/models/PolicyModel.json +++ b/model/src/test/resources/models/PolicyModel.json diff --git a/model/model-api/src/test/resources/models/PolicyModel.junk b/model/src/test/resources/models/PolicyModel.junk index 613a36ad8..613a36ad8 100644 --- a/model/model-api/src/test/resources/models/PolicyModel.junk +++ b/model/src/test/resources/models/PolicyModel.junk diff --git a/model/model-api/src/test/resources/models/RealPolicyModel.json b/model/src/test/resources/models/RealPolicyModel.json index f084747f2..f084747f2 100644 --- a/model/model-api/src/test/resources/models/RealPolicyModel.json +++ b/model/src/test/resources/models/RealPolicyModel.json diff --git a/model/policy-model/src/test/resources/path/to/apex/logic/funkylogic/LogicParentLogicParentLocalNameLogicInstanceName.funkylogic b/model/src/test/resources/path/to/apex/logic/funkylogic/LogicParentLogicParentLocalNameLogicInstanceName.funkylogic index 7ccf3da88..7ccf3da88 100644 --- a/model/policy-model/src/test/resources/path/to/apex/logic/funkylogic/LogicParentLogicParentLocalNameLogicInstanceName.funkylogic +++ b/model/src/test/resources/path/to/apex/logic/funkylogic/LogicParentLogicParentLocalNameLogicInstanceName.funkylogic diff --git a/model/utilities/src/test/resources/testdir/testfile.xml b/model/src/test/resources/testdir/testfile.xml index ddffc5822..ddffc5822 100644 --- a/model/utilities/src/test/resources/testdir/testfile.xml +++ b/model/src/test/resources/testdir/testfile.xml diff --git a/model/utilities/pom.xml b/model/utilities/pom.xml deleted file mode 100644 index 05c08523c..000000000 --- a/model/utilities/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ -<!-- - ============LICENSE_START======================================================= - Copyright (C) 2018 Ericsson. All rights reserved. - Modifications Copyright (C) 2020 Nordix Foundation. - ================================================================================ - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - SPDX-License-Identifier: Apache-2.0 - ============LICENSE_END========================================================= ---> -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.policy.apex-pdp.model</groupId> - <artifactId>model</artifactId> - <version>2.7.1-SNAPSHOT</version> - </parent> - <artifactId>utilities</artifactId> - - - <dependencies> - <dependency> - <groupId>org.onap.policy.common</groupId> - <artifactId>utils</artifactId> - </dependency> - <dependency> - <groupId>org.antlr</groupId> - <artifactId>antlr4-runtime</artifactId> - <version>4.8-1</version> - </dependency> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - </dependency> - </dependencies> -</project> diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml index 137f75f23..01105f85d 100644 --- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml +++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml @@ -44,9 +44,8 @@ </dependency> <dependency> <groupId>org.onap.policy.apex-pdp.model</groupId> - <artifactId>policy-model</artifactId> + <artifactId>model</artifactId> <version>${project.version}</version> - <scope>test</scope> </dependency> </dependencies> </project> diff --git a/services/services-engine/pom.xml b/services/services-engine/pom.xml index bd527c69d..e31b09aa7 100644 --- a/services/services-engine/pom.xml +++ b/services/services-engine/pom.xml @@ -107,4 +107,4 @@ </resource> </resources> </build> -</project>
\ No newline at end of file +</project> diff --git a/testsuites/integration/integration-common/pom.xml b/testsuites/integration/integration-common/pom.xml index ad438d7ae..54736f8b1 100644 --- a/testsuites/integration/integration-common/pom.xml +++ b/testsuites/integration/integration-common/pom.xml @@ -40,7 +40,7 @@ </dependency> <dependency> <groupId>org.onap.policy.apex-pdp.model</groupId> - <artifactId>policy-model</artifactId> + <artifactId>model</artifactId> <version>${project.version}</version> </dependency> <dependency> diff --git a/tools/model-generator/pom.xml b/tools/model-generator/pom.xml index 951bd7614..3e3db953b 100644 --- a/tools/model-generator/pom.xml +++ b/tools/model-generator/pom.xml @@ -38,7 +38,7 @@ </dependency> <dependency> <groupId>org.onap.policy.apex-pdp.model</groupId> - <artifactId>model-api</artifactId> + <artifactId>model</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -179,4 +179,4 @@ </build> </profile> </profiles> -</project>
\ No newline at end of file +</project> |