Changes for checkstyle 8.32 64/109364/1
authorliamfallon <liam.fallon@est.tech>
Fri, 19 Jun 2020 16:04:51 +0000 (17:04 +0100)
committerliamfallon <liam.fallon@est.tech>
Fri, 19 Jun 2020 16:05:05 +0000 (17:05 +0100)
Issue-ID: POLICY-2188
Change-Id: I56bbf3aa3bd9e1ef433cc93ad2be0c54d141a2a5
Signed-off-by: liamfallon <liam.fallon@est.tech>
556 files changed:
auth/cli-codegen/src/main/java/org/onap/policy/apex/auth/clicodegen/CgStringRenderer.java
auth/cli-codegen/src/main/java/org/onap/policy/apex/auth/clicodegen/CodeGeneratorCliEditor.java
auth/cli-codegen/src/main/java/org/onap/policy/apex/auth/clicodegen/EventDeclarationBuilder.java
auth/cli-codegen/src/test/java/org/onap/policy/apex/auth/clicodegen/CodeGeneratorCliEditorTest.java
auth/cli-codegen/src/test/java/org/onap/policy/apex/auth/clicodegen/SupportGenerationTester.java
auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/ApexModelHandler.java
auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineCommand.java
auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineEditorLoop.java
auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineParameters.java
auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/KeywordNode.java
auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/tosca/ApexCliToscaEditorMain.java
auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/CommandLineCommandTest.java
auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/CommandLineEditorEventsContextTest.java
auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/CommandLineEditorOptionsTest.java
auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/ContextAlbumsTest.java
auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/FileMacroTest.java
auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/LogicBlockTest.java
client/client-deployment/src/main/java/org/onap/policy/apex/client/deployment/rest/ApexDeploymentRestMain.java
client/client-deployment/src/main/java/org/onap/policy/apex/client/deployment/rest/ApexDeploymentRestParameterParser.java
client/client-deployment/src/test/java/org/onap/policy/apex/client/deployment/rest/DeploymentRestMainTest.java
client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditorMain.java
client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditorParameterParser.java
client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditorParameters.java
client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/ApexEditorRestResource.java
client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/KeyInfoHandler.java
client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/PolicyHandler.java
client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/RestSession.java
client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/RestSessionHandler.java
client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/RestUtils.java
client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/TaskHandler.java
client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanEvent.java
client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanPolicy.java
client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanState.java
client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanTask.java
client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/ApexEditorStartupTest.java
client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/ExceptionsTest.java
client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/RestInterfaceTest.java
client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/handling/ApexEditorRestResourceTest.java
client/client-full/src/main/java/org/onap/policy/apex/client/full/rest/ApexServicesRestMain.java
client/client-full/src/main/java/org/onap/policy/apex/client/full/rest/ApexServicesRestParameterParser.java
client/client-full/src/test/java/org/onap/policy/apex/client/full/rest/ServicesRestMainTest.java
client/client-monitoring/src/main/java/org/onap/policy/apex/client/monitoring/rest/ApexMonitoringRestMain.java
client/client-monitoring/src/main/java/org/onap/policy/apex/client/monitoring/rest/ApexMonitoringRestParameterParser.java
client/client-monitoring/src/main/java/org/onap/policy/apex/client/monitoring/rest/ApexMonitoringRestResource.java
client/client-monitoring/src/main/java/org/onap/policy/apex/client/monitoring/rest/ParameterCheck.java
client/client-monitoring/src/test/java/org/onap/policy/apex/client/monitoring/rest/MonitoringRestMainTest.java
client/client-monitoring/src/test/java/org/onap/policy/apex/client/monitoring/rest/ParameterCheckTest.java
client/client-monitoring/src/test/java/org/onap/policy/apex/client/monitoring/rest/RestResourceTest.java
context/context-management/src/main/java/org/onap/policy/apex/context/ContextAlbum.java
context/context-management/src/main/java/org/onap/policy/apex/context/Persistor.java
context/context-management/src/main/java/org/onap/policy/apex/context/impl/ContextAlbumImpl.java
context/context-management/src/main/java/org/onap/policy/apex/context/impl/distribution/DistributorFlushTimerTask.java
context/context-management/src/main/java/org/onap/policy/apex/context/impl/distribution/jvmlocal/JvmLocalDistributor.java
context/context-management/src/main/java/org/onap/policy/apex/context/impl/locking/AbstractLockManager.java
context/context-management/src/main/java/org/onap/policy/apex/context/impl/locking/jvmlocal/JvmLocalLockManager.java
context/context-management/src/main/java/org/onap/policy/apex/context/impl/persistence/ephemeral/EphemeralPersistor.java
context/context-management/src/main/java/org/onap/policy/apex/context/impl/schema/AbstractSchemaHelper.java
context/context-management/src/main/java/org/onap/policy/apex/context/impl/schema/java/JavaSchemaHelper.java
context/context-management/src/main/java/org/onap/policy/apex/context/impl/schema/java/JavaSchemaHelperJsonAdapterParameters.java
context/context-management/src/main/java/org/onap/policy/apex/context/parameters/SchemaParameters.java
context/context-management/src/test/java/org/onap/policy/apex/context/ContextExceptionTest.java
context/context-management/src/test/java/org/onap/policy/apex/context/impl/ContextAlbumImplTest.java
context/context-management/src/test/java/org/onap/policy/apex/context/impl/DummyContextAlbumImpl.java
context/context-management/src/test/java/org/onap/policy/apex/context/impl/schema/java/JavaSchemaHelperParametersTest.java
context/context-management/src/test/java/org/onap/policy/apex/context/impl/schema/java/JavaSchemaHelperTest.java
context/context-management/src/test/java/org/onap/policy/apex/context/impl/schema/java/SupportBadJsonAdapter.java
context/context-management/src/test/java/org/onap/policy/apex/context/impl/schema/java/SupportJsonAdapter.java
context/context-management/src/test/java/org/onap/policy/apex/context/impl/schema/java/SupportJsonDeserializer.java
context/context-management/src/test/java/org/onap/policy/apex/context/impl/schema/java/SupportJsonSerializer.java
core/core-deployment/src/main/java/org/onap/policy/apex/core/deployment/BatchDeployer.java
core/core-deployment/src/main/java/org/onap/policy/apex/core/deployment/DeploymentClient.java
core/core-deployment/src/main/java/org/onap/policy/apex/core/deployment/EngineServiceFacade.java
core/core-deployment/src/main/java/org/onap/policy/apex/core/deployment/PeriodicEventManager.java
core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/ApexDeploymentExceptionTest.java
core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/BatchDeployerTest.java
core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/DeploymentClientTest.java
core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/DummyDeploymentClient.java
core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/EngineServiceFacadeTest.java
core/core-engine/src/main/java/org/onap/policy/apex/core/engine/TaskParameters.java
core/core-engine/src/main/java/org/onap/policy/apex/core/engine/engine/impl/StateMachineHandler.java
core/core-engine/src/main/java/org/onap/policy/apex/core/engine/event/EnEvent.java
core/core-engine/src/main/java/org/onap/policy/apex/core/engine/event/EnField.java
core/core-engine/src/main/java/org/onap/policy/apex/core/engine/executor/Executor.java
core/core-engine/src/main/java/org/onap/policy/apex/core/engine/executor/StateExecutor.java
core/core-engine/src/main/java/org/onap/policy/apex/core/engine/executor/StateFinalizerExecutor.java
core/core-engine/src/main/java/org/onap/policy/apex/core/engine/executor/StateMachineExecutor.java
core/core-engine/src/main/java/org/onap/policy/apex/core/engine/executor/StateOutput.java
core/core-engine/src/main/java/org/onap/policy/apex/core/engine/executor/TaskSelectExecutor.java
core/core-engine/src/main/java/org/onap/policy/apex/core/engine/executor/context/AxStateFacade.java
core/core-engine/src/main/java/org/onap/policy/apex/core/engine/executor/context/StateFinalizerExecutionContext.java
core/core-engine/src/main/java/org/onap/policy/apex/core/engine/executor/context/TaskExecutionContext.java
core/core-engine/src/main/java/org/onap/policy/apex/core/engine/executor/context/TaskSelectionExecutionContext.java
core/core-engine/src/main/java/org/onap/policy/apex/core/engine/executor/impl/ExecutorFactoryImpl.java
core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/ApexEngineImplTest.java
core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/DummySlowEnEventListener.java
core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/DummySmExecutor.java
core/core-engine/src/test/java/org/onap/policy/apex/core/engine/event/DummyAxKey.java
core/core-engine/src/test/java/org/onap/policy/apex/core/engine/event/EnEventTest.java
core/core-engine/src/test/java/org/onap/policy/apex/core/engine/event/EnExceptionTest.java
core/core-engine/src/test/java/org/onap/policy/apex/core/engine/executor/DummyStateFinalizerExecutor.java
core/core-engine/src/test/java/org/onap/policy/apex/core/engine/executor/DummyTaskSelectExecutor.java
core/core-engine/src/test/java/org/onap/policy/apex/core/engine/executor/StateFinalizerExecutorTest.java
core/core-engine/src/test/java/org/onap/policy/apex/core/engine/executor/StateMachineExecutorTest.java
core/core-engine/src/test/java/org/onap/policy/apex/core/engine/executor/TaskExecutorTest.java
core/core-engine/src/test/java/org/onap/policy/apex/core/engine/executor/TaskSelectExecutorTest.java
core/core-engine/src/test/java/org/onap/policy/apex/core/engine/executor/context/AxStateFacadeTest.java
core/core-engine/src/test/java/org/onap/policy/apex/core/engine/executor/context/AxTaskFacadeTest.java
core/core-engine/src/test/java/org/onap/policy/apex/core/engine/executor/context/DummyContextAlbum.java
core/core-engine/src/test/java/org/onap/policy/apex/core/engine/executor/context/StateFinalizerExecutionContextTest.java
core/core-engine/src/test/java/org/onap/policy/apex/core/engine/executor/context/TaskSelectionExecutionContextTest.java
core/core-engine/src/test/java/org/onap/policy/apex/core/engine/executor/exception/StateMachineRuntimeExceptionTest.java
core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/java/classes/ClassUtils.java
core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/java/compile/singleclass/SingleClassBuilder.java
core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/java/compile/singleclass/SingleClassByteCodeFileObject.java
core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/java/compile/singleclass/SingleClassCompilationUnit.java
core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/java/compile/singleclass/SingleFileManager.java
core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/MessageHolder.java
core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/MessagingServiceFactory.java
core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/impl/ws/client/InternalMessageBusClient.java
core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/impl/ws/client/MessagingClient.java
core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/impl/ws/client/WebSocketClientImpl.java
core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/impl/ws/messageblock/MessageBlock.java
core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/impl/ws/messageblock/MessageBlockHandler.java
core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/impl/ws/messageblock/RawMessageBlock.java
core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/impl/ws/server/InternalMessageBusServer.java
core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/impl/ws/server/MessageServerImpl.java
core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/impl/ws/server/WebSocketServerImpl.java
core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/stringmessaging/WsStringMessageClient.java
core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/stringmessaging/WsStringMessageServer.java
core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/util/MessagingUtils.java
core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/xml/XPathReader.java
core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/java/classes/ClassUtilsTest.java
core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/messaging/DummyMessageListener.java
core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/messaging/EndToEndStringMessagingTest.java
core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/messaging/MessagingUtilsTest.java
core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/threading/ThreadingTest.java
core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/Message.java
core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/EngineServiceInfoResponse.java
core/core-protocols/src/test/java/org/onap/policy/apex/core/protocols/DummyMessage.java
core/core-protocols/src/test/java/org/onap/policy/apex/core/protocols/engdep/EngDepActionTest.java
core/core-protocols/src/test/java/org/onap/policy/apex/core/protocols/engdep/messages/EngineServiceInfoResponseTest.java
core/core-protocols/src/test/java/org/onap/policy/apex/core/protocols/engdep/messages/GetEngineStatusTest.java
core/core-protocols/src/test/java/org/onap/policy/apex/core/protocols/engdep/messages/ResponseTest.java
core/core-protocols/src/test/java/org/onap/policy/apex/core/protocols/engdep/messages/UpdateModelTest.java
examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/AadmUseCaseTest.java
examples/examples-adaptive/src/main/java/org/onap/policy/apex/examples/adaptive/model/java/AnomalyDetectionPolicyDecideTaskSelectionLogic.java
examples/examples-adaptive/src/main/java/org/onap/policy/apex/examples/adaptive/model/java/AutoLearnPolicyDecideTaskSelectionLogic.java
examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionConceptTest.java
examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionTslUseCaseTest.java
examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AutoLearnTslUseCaseTest.java
examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/TestApexActionListener.java
examples/examples-grpc/src/test/java/org/onap/policy/apex/examples/grpc/GrpcTestDummyGrpcServer.java
examples/examples-grpc/src/test/java/org/onap/policy/apex/examples/grpc/TestApexGrpcExample.java
examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpLogicTest.java
examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpModelCliTest.java
examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpUseCaseTest.java
examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/TestSaleAuthListener.java
examples/examples-onap-bbs/src/main/java/org/onap/policy/apex/examples/bbs/WebClient.java
examples/examples-onap-bbs/src/test/java/org/onap/policy/apex/examples/bbs/WebClientTest.java
examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/AppcResponseCreator.java
examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/OnapVCpeSimEndpoint.java
examples/examples-servlet/src/main/java/org/onap/policy/apex/examples/servlet/ApexServletListener.java
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConcept.java
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetterImpl.java
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfo.java
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInformation.java
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUse.java
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxModel.java
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKey.java
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/dao/ApexDao.java
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/dao/converters/Uuid2String.java
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/dao/impl/DefaultApexDao.java
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelFileWriter.java
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelReader.java
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelSaver.java
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelStringWriter.java
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelWriter.java
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexSchemaGenerator.java
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/KeyInfoMarshalFilter.java
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/service/ModelService.java
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/test/TestApexModel.java
model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/xml/AxReferenceKeyAdapter.java
model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetterImplTest.java
model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfoTest.java
model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyTest.java
model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUseTest.java
model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKeyTest.java
model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/DummyEntity.java
model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/ExceptionsTest.java
model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/ValidationTest.java
model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/dao/DaoMiscTest.java
model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/dao/EntityTest.java
model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelExceptionTest.java
model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelFileWriterTest.java
model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelReaderTest.java
model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelSaverTest.java
model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelStringWriterTest.java
model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelWriterTest.java
model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexSchemaGeneratorTest.java
model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/DummyApexBasicModelCreator.java
model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/DummyAxModelWithReferences.java
model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexBasicModelConceptsTester.java
model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator1.java
model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportConceptGetterTester.java
model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/xml/AxReferenceKeyAdapterTest.java
model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbums.java
model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchema.java
model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchemas.java
model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextAlbumsTest.java
model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextModelTest.java
model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextSchemasTest.java
model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ContextComparisonTest.java
model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/TestApexContextModelCreator.java
model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineModel.java
model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineStats.java
model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineModelTest.java
model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/DummyTestApexEngineModelCreator.java
model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvent.java
model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEventModel.java
model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvents.java
model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxField.java
model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventModelTest.java
model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventsTest.java
model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/FieldTest.java
model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexApiResult.java
model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexModelFactory.java
model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ApexModelImpl.java
model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextAlbumFacade.java
model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextSchemaFacade.java
model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/EventFacade.java
model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/KeyInformationFacade.java
model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelFacade.java
model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelHandlerFacade.java
model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/PolicyFacade.java
model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/TaskFacade.java
model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexApiResultTest.java
model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java
model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ModelFacadeTest.java
model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ModelHandlerFacadeTest.java
model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogic.java
model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicies.java
model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicy.java
model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicyModel.java
model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxState.java
model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateFinalizerLogic.java
model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateOutput.java
model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateParamsBuilder.java
model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTaskReference.java
model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTree.java
model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTask.java
model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskLogic.java
model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskParameter.java
model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskSelectionLogic.java
model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTasks.java
model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalyser.java
model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalysisResult.java
model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelSplitter.java
model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/DummyLogicReader.java
model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/ExceptionsTest.java
model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/LogicTest.java
model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PoliciesTest.java
model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PolicyModelTest.java
model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateOutputTest.java
model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTaskReferenceTest.java
model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTest.java
model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TaskParameterTest.java
model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TasksTest.java
model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalyserTest.java
model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReaderTest.java
model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparerTest.java
model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelSplitterTest.java
model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/SupportApexPolicyModelCreator.java
model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/utils/SupportPolicyModelValidator.java
model/utilities/src/main/java/org/onap/policy/apex/model/utilities/DirectoryUtils.java
model/utilities/src/main/java/org/onap/policy/apex/model/utilities/json/JsonHandler.java
model/utilities/src/test/java/org/onap/policy/apex/model/utilities/CollectionUtilitiesTest.java
model/utilities/src/test/java/org/onap/policy/apex/model/utilities/DirectoryUtilsTest.java
model/utilities/src/test/java/org/onap/policy/apex/model/utilities/KeyedMapComparerTest.java
model/utilities/src/test/java/org/onap/policy/apex/model/utilities/TextFileUtilsTest.java
model/utilities/src/test/java/org/onap/policy/apex/model/utilities/TreeMapUtilsTest.java
model/utilities/src/test/java/org/onap/policy/apex/model/utilities/json/JsonHandlerTest.java
plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/HazelcastContextDistributor.java
plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanContextDistributor.java
plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanManager.java
plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockFacade.java
plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockManager.java
plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorReentrantReadWriteLock.java
plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/HazelcastLock.java
plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/HazelcastLockManager.java
plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroBytesObjectMapper.java
plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroDirectObjectMapper.java
plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroEnumObjectMapper.java
plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroNullableMapper.java
plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroObjectMapperFactory.java
plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelper.java
plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaKeyTranslationUtilities.java
plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaAaiTest.java
plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaArrayTest.java
plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaEnumTest.java
plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaFixedTest.java
plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaMapTest.java
plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaRecordTest.java
plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/HealthCheckSchemaTest.java
plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src/main/java/org/onap/policy/apex/plugins/event/carrier/jms/ApexJmsConsumer.java
plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src/main/java/org/onap/policy/apex/plugins/event/carrier/jms/ApexJmsProducer.java
plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/main/java/org/onap/policy/apex/plugins/event/carrier/kafka/ApexKafkaConsumer.java
plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/main/java/org/onap/policy/apex/plugins/event/carrier/kafka/ApexKafkaProducer.java
plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/main/java/org/onap/policy/apex/plugins/event/carrier/kafka/KafkaCarrierTechnologyParameters.java
plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/test/java/org/onap/policy/apex/plugins/event/carrier/kafka/KafkaCarrierTechnologyParametersTest.java
plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/main/java/org/onap/policy/apex/plugins/event/carrier/restclient/ApexRestClientConsumer.java
plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/main/java/org/onap/policy/apex/plugins/event/carrier/restclient/ApexRestClientProducer.java
plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/main/java/org/onap/policy/apex/plugins/event/carrier/restclient/RestClientCarrierTechnologyParameters.java
plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/test/java/org/onap/policy/apex/plugins/event/carrier/restclient/ApexRestClientConusmerTest.java
plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/test/java/org/onap/policy/apex/plugins/event/carrier/restclient/ApexRestClientProducerTest.java
plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/test/java/org/onap/policy/apex/plugins/event/carrier/restclient/RestClientCarrierTechnologyParametersTest.java
plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/test/java/org/onap/policy/apex/plugins/event/carrier/restclient/SupportApexEventReceiver.java
plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorConsumer.java
plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorProducer.java
plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/RestRequestorCarrierTechnologyParameters.java
plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestTest.java
plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorConsumerTest.java
plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/RestRequestorCarrierTechnologyParametersTest.java
plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/RestRequestorTest.java
plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/SupportRestRequestorEndpoint.java
plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/main/java/org/onap/policy/apex/plugins/event/carrier/restserver/AccessControlFilter.java
plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/main/java/org/onap/policy/apex/plugins/event/carrier/restserver/ApexRestServerConsumer.java
plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/main/java/org/onap/policy/apex/plugins/event/carrier/restserver/ApexRestServerProducer.java
plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/test/java/org/onap/policy/apex/plugins/event/carrier/restserver/SupportApexEventReceiver.java
plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/main/java/org/onap/policy/apex/plugins/event/carrier/websocket/ApexWebSocketConsumer.java
plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/main/java/org/onap/policy/apex/plugins/event/carrier/websocket/ApexWebSocketProducer.java
plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/src/main/java/org/onap/policy/apex/plugins/event/protocol/jms/Apex2JmsObjectEventConverter.java
plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/src/main/java/org/onap/policy/apex/plugins/event/protocol/jms/Apex2JmsTextEventConverter.java
plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/java/org/onap/policy/apex/plugins/event/protocol/xml/Apex2XmlEventConverter.java
plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/test/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlEventHandlerTest.java
plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/test/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlTaggedEventConsumerTest.java
plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/src/main/java/org/onap/policy/apex/plugins/event/protocol/yaml/Apex2YamlEventConverter.java
plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/src/test/java/org/onap/policy/apex/plugins/event/protocol/yaml/YamlEventProtocolTest.java
plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/src/test/java/org/onap/policy/apex/plugins/event/protocol/yaml/YamlPluginStabilityTest.java
plugins/plugins-executor/plugins-executor-java/src/main/java/org/onap/policy/apex/plugins/executor/java/JavaStateFinalizerExecutor.java
plugins/plugins-executor/plugins-executor-java/src/main/java/org/onap/policy/apex/plugins/executor/java/JavaTaskExecutor.java
plugins/plugins-executor/plugins-executor-java/src/main/java/org/onap/policy/apex/plugins/executor/java/JavaTaskSelectExecutor.java
plugins/plugins-executor/plugins-executor-java/src/test/java/org/onap/policy/apex/plugins/executor/java/JavaStateFinalizerExecutorTest.java
plugins/plugins-executor/plugins-executor-java/src/test/java/org/onap/policy/apex/plugins/executor/java/JavaTaskExecutorTest.java
plugins/plugins-executor/plugins-executor-java/src/test/java/org/onap/policy/apex/plugins/executor/java/JavaTaskSelectExecutorTest.java
plugins/plugins-executor/plugins-executor-javascript/src/main/java/org/onap/policy/apex/plugins/executor/javascript/JavascriptExecutor.java
plugins/plugins-executor/plugins-executor-javascript/src/main/java/org/onap/policy/apex/plugins/executor/javascript/JavascriptStateFinalizerExecutor.java
plugins/plugins-executor/plugins-executor-javascript/src/main/java/org/onap/policy/apex/plugins/executor/javascript/JavascriptTaskExecutor.java
plugins/plugins-executor/plugins-executor-javascript/src/main/java/org/onap/policy/apex/plugins/executor/javascript/JavascriptTaskSelectExecutor.java
plugins/plugins-executor/plugins-executor-javascript/src/test/java/org/onap/policy/apex/plugins/executor/javascript/JavascriptExecutorFullApexTest.java
plugins/plugins-executor/plugins-executor-javascript/src/test/java/org/onap/policy/apex/plugins/executor/javascript/JavascriptExecutorTest.java
plugins/plugins-executor/plugins-executor-javascript/src/test/java/org/onap/policy/apex/plugins/executor/javascript/JavascriptStateFinalizerExecutorTest.java
plugins/plugins-executor/plugins-executor-javascript/src/test/java/org/onap/policy/apex/plugins/executor/javascript/JavascriptTaskExecutorTest.java
plugins/plugins-executor/plugins-executor-javascript/src/test/java/org/onap/policy/apex/plugins/executor/javascript/JavascriptTaskSelectExecutorTest.java
plugins/plugins-executor/plugins-executor-jruby/src/main/java/org/onap/policy/apex/plugins/executor/jruby/JrubyStateFinalizerExecutor.java
plugins/plugins-executor/plugins-executor-jruby/src/main/java/org/onap/policy/apex/plugins/executor/jruby/JrubyTaskExecutor.java
plugins/plugins-executor/plugins-executor-jruby/src/main/java/org/onap/policy/apex/plugins/executor/jruby/JrubyTaskSelectExecutor.java
plugins/plugins-executor/plugins-executor-jruby/src/test/java/org/onap/policy/apex/plugins/executor/jruby/JrubyStateFinalizerExecutorTest.java
plugins/plugins-executor/plugins-executor-jruby/src/test/java/org/onap/policy/apex/plugins/executor/jruby/JrubyTaskExecutorTest.java
plugins/plugins-executor/plugins-executor-jruby/src/test/java/org/onap/policy/apex/plugins/executor/jruby/JrubyTaskSelectExecutorTest.java
plugins/plugins-executor/plugins-executor-mvel/src/main/java/org/onap/policy/apex/plugins/executor/mvel/MvelStateFinalizerExecutor.java
plugins/plugins-executor/plugins-executor-mvel/src/main/java/org/onap/policy/apex/plugins/executor/mvel/MvelTaskExecutor.java
plugins/plugins-executor/plugins-executor-mvel/src/main/java/org/onap/policy/apex/plugins/executor/mvel/MvelTaskSelectExecutor.java
plugins/plugins-executor/plugins-executor-mvel/src/test/java/org/onap/policy/apex/plugins/executor/mvel/MvelStateFinalizerExecutorTest.java
plugins/plugins-executor/plugins-executor-mvel/src/test/java/org/onap/policy/apex/plugins/executor/mvel/MvelTaskExecutorTest.java
plugins/plugins-executor/plugins-executor-mvel/src/test/java/org/onap/policy/apex/plugins/executor/mvel/MvelTaskSelectExecutorTest.java
plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/test/java/org/onap/policy/apex/plugins/persistence/jpa/eclipselink/EclipselinkApexDaoTest.java
plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/test/java/org/onap/policy/apex/plugins/persistence/jpa/eclipselink/entities/ArtifactKeyTestEntity.java
plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/test/java/org/onap/policy/apex/plugins/persistence/jpa/eclipselink/entities/ReferenceKeyTestEntity.java
pom.xml
services/services-engine/src/main/java/org/onap/policy/apex/service/engine/engdep/EngDepMessageListener.java
services/services-engine/src/main/java/org/onap/policy/apex/service/engine/engdep/EngDepMessagingService.java
services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/ApexEvent.java
services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/ApexEventConverter.java
services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/ApexEventProducer.java
services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/ApexPeriodicEventGenerator.java
services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/ApexPluginsEventProducer.java
services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/SynchronousEventCache.java
services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/apexprotocolplugin/Apex2ApexEventConverter.java
services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/enevent/ApexEvent2EnEventConverter.java
services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/eventrequestor/EventRequestorConsumer.java
services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/eventrequestor/EventRequestorProducer.java
services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/filecarrierplugin/FileCarrierTechnologyParameters.java
services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/filecarrierplugin/consumer/ApexFileEventConsumer.java
services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/filecarrierplugin/consumer/CharacterDelimitedTextBlockReader.java
services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/filecarrierplugin/consumer/HeaderDelimitedTextBlockReader.java
services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/filecarrierplugin/consumer/TextBlockReaderFactory.java
services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/filecarrierplugin/producer/ApexFileEventProducer.java
services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/jsonprotocolplugin/Apex2JsonEventConverter.java
services/services-engine/src/main/java/org/onap/policy/apex/service/engine/main/ApexActivator.java
services/services-engine/src/main/java/org/onap/policy/apex/service/engine/main/ApexCommandLineArguments.java
services/services-engine/src/main/java/org/onap/policy/apex/service/engine/main/ApexEventMarshaller.java
services/services-engine/src/main/java/org/onap/policy/apex/service/engine/main/ApexEventUnmarshaller.java
services/services-engine/src/main/java/org/onap/policy/apex/service/engine/main/ApexMain.java
services/services-engine/src/main/java/org/onap/policy/apex/service/engine/runtime/impl/EngineWorker.java
services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/ApexParameterHandler.java
services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/ApexParameters.java
services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/carriertechnology/CarrierTechnologyParametersJsonAdapter.java
services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/carriertechnology/RestPluginCarrierTechnologyParameters.java
services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/engineservice/EngineServiceParameters.java
services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/eventhandler/EventHandlerParameters.java
services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/eventprotocol/EventProtocolParametersJsonAdapter.java
services/services-engine/src/test/java/org/onap/policy/apex/service/engine/engdep/DummyEngineService.java
services/services-engine/src/test/java/org/onap/policy/apex/service/engine/engdep/EngDepMessageListenerTest.java
services/services-engine/src/test/java/org/onap/policy/apex/service/engine/engdep/EngDepMessagingServiceTest.java
services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/JsonEventHandlerForPojoTest.java
services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/JsonEventHandlerTest.java
services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/JsonTaggedEventConsumerTest.java
services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/PluginFactoriesTest.java
services/services-engine/src/test/java/org/onap/policy/apex/service/engine/main/ApexMainTest.java
services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/ParameterTests.java
services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/SyncParameterTests.java
services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/DummyStateFinalizerExecutor.java
services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/DummyTaskExecutor.java
services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/DummyTaskSelectExecutor.java
services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/SuperDooperCarrierTechnologyParameters.java
services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/SuperDooperEventProducer.java
services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/SuperTokenDelimitedEventConverter.java
services/services-engine/src/test/java/org/onap/policy/apex/service/engine/runtime/impl/EngineServiceImplTest.java
services/services-engine/src/test/java/org/onap/policy/apex/service/engine/runtime/impl/EngineWorkerTest.java
services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/ApexStarterActivator.java
services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/ApexStarterCommandLineArguments.java
services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/comm/PdpStatusPublisher.java
services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/parameters/ApexStarterParameterHandler.java
services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/parameters/ToscaPolicyTypeIdentifierParameters.java
services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/rest/ApexStarterRestServer.java
services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/rest/HealthCheckRestControllerV1.java
services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/TestApexStarterConstants.java
services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/comm/TestListenerUtils.java
services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/exception/TestExceptions.java
services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/parameters/TestApexStarterParameterGroup.java
services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/parameters/TestApexStarterParameterHandler.java
services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/parameters/dummyclasses/DummyStateFinalizerExecutor.java
services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/parameters/dummyclasses/DummyTaskExecutor.java
services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/parameters/dummyclasses/DummyTaskSelectExecutor.java
services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/rest/CommonApexStarterRestServer.java
services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/rest/TestHealthCheckRestControllerV1.java
testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextBooleanItem.java
testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextByteItem.java
testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDateItem.java
testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDateLocaleItem.java
testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDateTzItem.java
testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDoubleItem.java
testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextFloatItem.java
testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextIntItem.java
testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextLongItem.java
testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextLongObjectItem.java
testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextStringItem.java
testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextTreeMapItem.java
testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextTreeSetItem.java
testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestExternalContextItem.java
testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestGlobalContextItem.java
testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestPolicyContextItem.java
testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/model/EvalDomainModelFactory.java
testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/model/SampleDomainModelFactory.java
testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/model/java/DefaultTaskLogic.java
testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/testclasses/PingTestClass.java
testsuites/integration/integration-common/src/test/java/org/onap/policy/apex/testsuites/integration/common/model/SampleDomainModelSaverTest.java
testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/TestConcurrentContext.java
testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/distribution/ContextInstantiation.java
testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/distribution/ContextUpdate.java
testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/distribution/HazelcastContextDistributorTest.java
testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/distribution/InfinispanContextDistributorTest.java
testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/distribution/SequentialContextInstantiation.java
testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/entities/ArtifactKeyTestEntity.java
testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/entities/ReferenceKeyTestEntity.java
testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/NoLockAlbumModifier.java
testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/ReadLockAlbumModifier.java
testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/WriteLockAlbumModifier.java
testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/locking/ConcurrentContext.java
testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/locking/ConcurrentContextJvm.java
testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/locking/ConcurrentContextJvmThread.java
testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/locking/ConcurrentContextThread.java
testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/ConfigrationProvider.java
testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/ConfigrationProviderImpl.java
testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/Constants.java
testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/IntegrationThreadFactory.java
testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/ZooKeeperServerServiceProvider.java
testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/testsuites/integration/executor/engine/TestApexActionListener.java
testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/testsuites/integration/executor/engine/TestApexEngine.java
testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/testsuites/integration/executor/engine/TestApexEngineJRuby.java
testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/testsuites/integration/executor/engine/TestApexEngineJava.java
testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/testsuites/integration/executor/engine/TestApexEngineJavascript.java
testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/testsuites/integration/executor/engine/TestApexEngineJython.java
testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/testsuites/integration/executor/engine/TestApexEngineMvel.java
testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/testsuites/integration/executor/event/TestEventInstantiation.java
testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/testsuites/integration/executor/handling/TestApexModelExport.java
testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/testsuites/integration/executor/handling/TestApexSamplePolicyDbWrite.java
testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/testsuites/integration/executor/handling/TestApexSamplePolicyModel.java
testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/testsuites/integration/executor/handling/TestContextUpdateDifferentModels.java
testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/testsuites/integration/executor/handling/TestContextUpdateModel.java
testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/events/EventGenerator.java
testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/events/syncasync/AsyncEventMimoTest.java
testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/events/syncasync/AsyncEventMisoTest.java
testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/events/syncasync/AsyncEventSimoTest.java
testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/events/syncasync/AsyncEventSisoTest.java
testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/events/syncasync/BaseEventTest.java
testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/events/syncasync/SyncEventMimoTest.java
testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/events/syncasync/SyncEventSisoTest.java
testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/file/TestFile2File.java
testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/file/TestFile2FileFiltered.java
testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/file/TestFile2FileIgnore.java
testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/jms/JmsEventProducer.java
testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/jms/JmsEventSubscriber.java
testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/jms/TestContext.java
testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/jms/TestInitialContextFactory.java
testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/jms/TestJms2Jms.java
testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/kafka/KafkaEventProducer.java
testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/kafka/KafkaEventSubscriber.java
testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/kafka/TestKafka2Kafka.java
testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/kafka/TestKafkaXmlEventProducer.java
testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/restclient/TestExecutionPropertyRest.java
testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/restclient/TestFile2Rest.java
testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/restclient/TestRest2File.java
testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/restserver/TestRestServer.java
testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/context/EventAlbumContextTest.java
testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/engdep/EngDepMessagingTest.java
testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/engdep/EngineTestServer.java
testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/engine/ApexServiceModelUpdateTest.java
testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/engine/ApexServiceTest.java
testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/executionproperties/DummyApexEventConsumer.java
testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/executionproperties/DummyApexEventProducer.java
testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/executionproperties/DummyCarrierTechnologyParameters.java
testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/executionproperties/RunTestEvent.java
testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/executionproperties/TestExecutionProperties.java
testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/taskparameters/TestTaskParameters.java
testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventBatch.java
testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventBatchStats.java
testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGenerator.java
testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorEndpoint.java
testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorParameterHandler.java
testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorStats.java
testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/events/InputEvent.java
testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventBatchStatsTest.java
testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorEndpointTest.java
testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorParametersHandlerTest.java
testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorParametersTest.java
testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorStatsTest.java
testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorTest.java
testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/events/InputEventTest.java
tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/SchemaUtils.java
tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2cli/Model2Cli.java
tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2cli/Model2CliMain.java
tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2event/Model2EventMain.java
tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2event/Model2JsonEventSchema.java
tools/model-generator/src/test/java/org/onap/policy/apex/tools/model/generator/SchemaUtilsTest.java
tools/model-generator/src/test/java/org/onap/policy/apex/tools/model/generator/model2cli/Model2CliTest.java
tools/model-generator/src/test/java/org/onap/policy/apex/tools/model/generator/model2event/Model2EventTest.java
tools/simple-wsclient/src/main/java/org/onap/policy/apex/tools/simple/wsclient/SimpleConsole.java
tools/simple-wsclient/src/main/java/org/onap/policy/apex/tools/simple/wsclient/SimpleEcho.java
tools/simple-wsclient/src/main/java/org/onap/policy/apex/tools/simple/wsclient/WsClientMain.java
tools/simple-wsclient/src/test/java/org/onap/policy/apex/tools/simple/wsclient/WsClientTest.java
tools/tools-common/src/main/java/org/onap/policy/apex/tools/common/CliParser.java
tools/tools-common/src/main/java/org/onap/policy/apex/tools/common/Console.java
tools/tools-common/src/main/java/org/onap/policy/apex/tools/common/OutputFile.java
tools/tools-common/src/test/java/org/onap/policy/apex/tools/common/OutputFileTest.java
tools/tools-common/src/test/java/org/onap/policy/apex/tools/common/docs/ExampleCliParserTest.java

index fb9a8c6..53acc9c 100644 (file)
@@ -77,7 +77,6 @@ import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.VERSION;
 import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.WRITABLE;
 
 import java.util.List;
-
 import org.stringtemplate.v4.ST;
 import org.stringtemplate.v4.STGroupFile;
 
index e1f84e4..83aef2d 100644 (file)
@@ -35,7 +35,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-
 import org.junit.Test;
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
index 9d91f8f..3e010d0 100644 (file)
@@ -28,9 +28,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
-
 import org.junit.Test;
-import org.onap.policy.apex.auth.clicodegen.CodeGeneratorCliEditor;
 import org.stringtemplate.v4.STGroup;
 import org.stringtemplate.v4.STGroupFile;
 
index 67d247e..6814eab 100644 (file)
@@ -25,7 +25,6 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Properties;
 import java.util.SortedMap;
-
 import org.onap.policy.apex.model.modelapi.ApexApiResult;
 import org.onap.policy.apex.model.modelapi.ApexApiResult.Result;
 import org.onap.policy.apex.model.modelapi.ApexModel;
index d882b1a..cfe2077 100644 (file)
@@ -39,7 +39,6 @@ import java.util.List;
 import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.TreeMap;
-
 import org.apache.commons.lang3.tuple.MutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 import org.onap.policy.apex.model.modelapi.ApexApiResult;
@@ -208,9 +207,8 @@ public class CommandLineEditorLoop {
                     executionStatus.setRight(executionStatus.getRight() + 1);
                 }
             }
-        }
-        // Print any error messages from command parsing and finding
-        catch (final CommandLineException e) {
+        } catch (final CommandLineException e) {
+            // Print any error messages from command parsing and finding
             writer.println(e.getMessage());
             executionStatus.setRight(executionStatus.getRight() + 1);
             LOGGER.debug(COMMAND_LINE_ERROR, e);
@@ -254,9 +252,8 @@ public class CommandLineEditorLoop {
                 } else {
                     logicBlock.append(logicLine + "\n");
                 }
-            }
-            // Print any error messages from command parsing and finding
-            catch (final CommandLineException e) {
+            } catch (final CommandLineException e) {
+                // Print any error messages from command parsing and finding
                 writer.println(e.getMessage());
                 executionStatus.setRight(executionStatus.getRight() + 1);
                 LOGGER.debug(COMMAND_LINE_ERROR, e);
index 27af953..9f0672b 100644 (file)
@@ -28,10 +28,8 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-
 import lombok.Getter;
 import lombok.Setter;
-
 import org.onap.policy.apex.auth.clieditor.utils.CliUtils;
 import org.onap.policy.common.utils.resources.ResourceUtils;
 
index 4fe67b3..a2b15f5 100644 (file)
@@ -27,7 +27,6 @@ import java.util.NavigableMap;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
-
 import org.onap.policy.common.utils.validation.Assertions;
 
 /**
index 8d4fd8b..f5d6d31 100644 (file)
@@ -65,7 +65,7 @@ public class ApexCliToscaEditorMain {
 
         String policyModelFilePath = null;
         try {
-            final File tempModelFile = File.createTempFile("policyModel",".json");
+            final File tempModelFile = File.createTempFile("policyModel", ".json");
             policyModelFilePath = tempModelFile.getAbsolutePath();
         } catch (IOException e) {
             LOGGER.error("Cannot create the policy model temp file.", e);
index 020e272..5c541e1 100644 (file)
  * SPDX-License-Identifier: Apache-2.0
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.policy.apex.auth.clieditor;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.util.List;
-
 import org.junit.Before;
 import org.junit.Test;
 
@@ -43,7 +46,9 @@ public class CommandLineCommandTest {
         assertTrue(commandLineCommand.isSystemCommand());
         assertEquals("testDescription", commandLineCommand.getDescription());
         assertEquals("TestName", commandLineCommand.getName());
-        assertEquals("CLICommand [name=TestName,keywordlist=[], argumentList=[], apiMethod=, systemCommand=true, description=testDescription]",commandLineCommand.toString());
+        assertEquals(
+            "CLICommand [name=TestName,keywordlist=[], argumentList=[], apiMethod=, systemCommand=true,"
+            + " description=testDescription]", commandLineCommand.toString());
     }
 
     @Test(expected = CommandLineException.class)
@@ -72,27 +77,26 @@ public class CommandLineCommandTest {
     @Test
     public void testValidApiMethodName() {
         commandLineCommand.setApiMethod("Java.Get");
-        assertEquals("Get",commandLineCommand.getApiMethodName());
+        assertEquals("Get", commandLineCommand.getApiMethodName());
     }
 
     @Test
     public void testGetHelp() {
         List<String> keywordList = commandLineCommand.getKeywordlist();
         List<CommandLineArgument> argumentList = commandLineCommand.getArgumentList();
-        assertEquals("{}: ",commandLineCommand.getHelp());
+        assertEquals("{}: ", commandLineCommand.getHelp());
         keywordList.add("TestKeyword");
         argumentList.add(new CommandLineArgument("TestArgument"));
         argumentList.add(null);
-        assertEquals("TestKeyword {}: \n" + 
-                "      TestArgument: (M) ",commandLineCommand.getHelp());
+        assertEquals("TestKeyword {}: \n" + "\tTestArgument: (M) ", commandLineCommand.getHelp());
     }
 
     @Test
     public void testCompareTo() {
-        assertEquals(0,commandLineCommand.compareTo(commandLineCommand));
+        assertEquals(0, commandLineCommand.compareTo(commandLineCommand));
         CommandLineCommand otherCommand = new CommandLineCommand();
         otherCommand.setSystemCommand(true);
-        assertEquals(6,commandLineCommand.compareTo(otherCommand));
+        assertEquals(6, commandLineCommand.compareTo(otherCommand));
         otherCommand.getArgumentList().add(new CommandLineArgument("testArgument"));
         assertEquals(-609496833, commandLineCommand.compareTo(otherCommand));
     }
@@ -123,10 +127,11 @@ public class CommandLineCommandTest {
 
     @Test
     public void testEquals() {
-        CommandLineCommand otherCommand = new CommandLineCommand();
         assertFalse(commandLineCommand.equals(new Object()));
         assertTrue(commandLineCommand.equals(commandLineCommand));
         assertFalse(commandLineCommand.equals(null));
+
+        CommandLineCommand otherCommand = new CommandLineCommand();
         assertTrue(commandLineCommand.equals(otherCommand));
         otherCommand.getKeywordlist().add("TestKeyword");
         assertFalse(commandLineCommand.equals(otherCommand));
index a5362a8..509a57c 100644 (file)
@@ -29,7 +29,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintStream;
-
 import org.junit.Test;
 import org.onap.policy.apex.model.basicmodel.handling.ApexModelException;
 import org.onap.policy.common.utils.resources.TextFileUtils;
index 21f1e19..f82453b 100644 (file)
@@ -27,7 +27,6 @@ import static org.junit.Assert.assertTrue;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
index f458a9f..44bdc79 100644 (file)
@@ -28,7 +28,6 @@ import java.io.File;
 import java.io.IOException;
 import java.net.URL;
 import java.nio.file.Paths;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
index 8f6f193..caaa129 100644 (file)
@@ -25,7 +25,6 @@ import static org.junit.Assert.assertTrue;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
index 6ba8d83..093c352 100644 (file)
@@ -22,7 +22,6 @@
 package org.onap.policy.apex.client.deployment.rest;
 
 import java.io.PrintStream;
-
 import org.slf4j.ext.XLogger;
 import org.slf4j.ext.XLoggerFactory;
 
@@ -135,8 +134,7 @@ public class ApexDeploymentRestMain {
             String message = REST_ENDPOINT_PREFIX + this.toString() + ") failed at with error: " + e.getMessage();
             outStream.println(message);
             LOGGER.warn(message, e);
-        }
-        finally {
+        } finally {
             if (apexDeploymentRest != null) {
                 apexDeploymentRest.shutdown();
                 apexDeploymentRest = null;
index d56e05d..1249bdd 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.apex.client.deployment.rest;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Arrays;
-
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.HelpFormatter;
index 558cbad..3f72882 100644 (file)
@@ -22,7 +22,6 @@
 package org.onap.policy.apex.client.editor.rest;
 
 import java.io.PrintStream;
-
 import org.slf4j.ext.XLogger;
 import org.slf4j.ext.XLoggerFactory;
 
@@ -140,8 +139,7 @@ public class ApexEditorMain {
             String message = REST_ENDPOINT_PREFIX + this.toString() + ") failed at with error: " + e.getMessage();
             outStream.println(message);
             LOGGER.warn(message, e);
-        }
-        finally {
+        } finally {
             if (apexEditor != null) {
                 apexEditor.shutdown();
                 apexEditor = null;
index d67c6b1..ef89945 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.apex.client.editor.rest;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Arrays;
-
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.HelpFormatter;
index 51dcf09..9c3a3de 100644 (file)
@@ -22,7 +22,6 @@
 package org.onap.policy.apex.client.editor.rest.handling;
 
 import java.io.IOException;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
@@ -33,7 +32,6 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
-
 import org.onap.policy.apex.model.modelapi.ApexApiResult;
 import org.onap.policy.apex.model.modelapi.ApexApiResult.Result;
 import org.onap.policy.common.utils.resources.TextFileUtils;
index f4ff4cd..ddf1db3 100644 (file)
@@ -53,8 +53,7 @@ public class KeyInfoHandler implements RestCommandHandler {
 
         if (RestCommandType.KEY_INFO.equals(commandType) && RestCommand.LIST.equals(command)) {
             return listKeyInformation(session, name, version);
-        }
-        else {
+        } else {
             return getUnsupportedCommandResultMessage(session, commandType, command);
         }
     }
index ee61644..7de16b0 100644 (file)
@@ -21,7 +21,6 @@
 package org.onap.policy.apex.client.editor.rest.handling;
 
 import java.util.Map;
-
 import org.onap.policy.apex.client.editor.rest.handling.bean.BeanKeyRef;
 import org.onap.policy.apex.client.editor.rest.handling.bean.BeanLogic;
 import org.onap.policy.apex.client.editor.rest.handling.bean.BeanPolicy;
index 3e616ef..46d57fd 100644 (file)
@@ -93,8 +93,7 @@ public class RestSession {
     public void finishSession(boolean commitFlag) {
         if (commitFlag) {
             commitChanges();
-        }
-        else {
+        } else {
             discardChanges();
         }
     }
index b717944..c6cfca8 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.apex.client.editor.rest.handling;
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.concurrent.atomic.AtomicInteger;
-
 import org.onap.policy.apex.model.modelapi.ApexApiResult;
 import org.onap.policy.apex.model.modelapi.ApexApiResult.Result;
 import org.slf4j.ext.XLogger;
index 738f33c..55a07a3 100644 (file)
@@ -26,19 +26,16 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonNull;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
-
 import java.io.StringReader;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.TreeMap;
-
 import javax.ws.rs.core.MediaType;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
 import javax.xml.transform.stream.StreamSource;
-
 import org.eclipse.persistence.jaxb.MarshallerProperties;
 import org.onap.policy.apex.client.editor.rest.handling.bean.BeanBase;
 import org.onap.policy.apex.model.basicmodel.concepts.AxConcept;
index 2b90282..87f5fca 100644 (file)
@@ -21,7 +21,6 @@
 package org.onap.policy.apex.client.editor.rest.handling;
 
 import java.util.Map.Entry;
-
 import org.onap.policy.apex.client.editor.rest.handling.bean.BeanField;
 import org.onap.policy.apex.client.editor.rest.handling.bean.BeanKeyRef;
 import org.onap.policy.apex.client.editor.rest.handling.bean.BeanLogic;
index ac1c605..fdf1e80 100644 (file)
@@ -29,7 +29,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.util.concurrent.TimeUnit;
-
 import org.junit.Test;
 import org.onap.policy.apex.client.editor.rest.ApexEditorMain.EditorState;
 
index c95a04a..a1d0a7b 100644 (file)
@@ -30,14 +30,12 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.concurrent.TimeUnit;
-
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.Invocation.Builder;
 import javax.ws.rs.client.WebTarget;
 import javax.xml.bind.JAXBException;
-
 import org.eclipse.persistence.jpa.jpql.Assert;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
index 346376d..642628f 100644 (file)
@@ -25,11 +25,9 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import java.io.IOException;
-
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.core.Application;
 import javax.ws.rs.core.MediaType;
-
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.test.JerseyTest;
 import org.junit.Test;
index 856aa6b..8343189 100644 (file)
@@ -22,7 +22,6 @@
 package org.onap.policy.apex.client.full.rest;
 
 import java.io.PrintStream;
-
 import org.slf4j.ext.XLogger;
 import org.slf4j.ext.XLoggerFactory;
 
@@ -141,8 +140,7 @@ public class ApexServicesRestMain {
             String message = REST_ENDPOINT_PREFIX + this.toString() + ") failed at with error: " + e.getMessage();
             outStream.println(message);
             LOGGER.warn(message, e);
-        }
-        finally {
+        } finally {
             if (apexServices != null) {
                 apexServices.shutdown();
                 apexServices = null;
index 5812ebd..6535379 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.apex.client.full.rest;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Arrays;
-
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.HelpFormatter;
index abc30ce..6b95314 100644 (file)
@@ -22,7 +22,6 @@
 package org.onap.policy.apex.client.monitoring.rest;
 
 import java.io.PrintStream;
-
 import org.slf4j.ext.XLogger;
 import org.slf4j.ext.XLoggerFactory;
 
@@ -135,8 +134,7 @@ public class ApexMonitoringRestMain {
             String message = REST_ENDPOINT_PREFIX + this.toString() + ") failed at with error: " + e.getMessage();
             outStream.println(message);
             LOGGER.warn(message, e);
-        }
-        finally {
+        } finally {
             if (apexMonitoringRest != null) {
                 apexMonitoringRest.shutdown();
                 apexMonitoringRest = null;
index a72fbe0..5902ef0 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.apex.client.monitoring.rest;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Arrays;
-
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.HelpFormatter;
index c5c4b12..dd9d8b2 100644 (file)
@@ -23,14 +23,12 @@ package org.onap.policy.apex.client.monitoring.rest;
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
-
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -38,7 +36,6 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-
 import org.onap.policy.apex.core.deployment.ApexDeploymentException;
 import org.onap.policy.apex.core.deployment.EngineServiceFacade;
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
index 34bacb9..7037313 100644 (file)
@@ -21,7 +21,6 @@
 package org.onap.policy.apex.client.monitoring.rest;
 
 import java.util.Map;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.slf4j.ext.XLogger;
 import org.slf4j.ext.XLoggerFactory;
@@ -169,8 +168,7 @@ public final class ParameterCheck {
 
         try {
             return new AxArtifactKey(axArtifactKeyArray[1]);
-        }
-        catch (Exception apEx) {
+        } catch (Exception apEx) {
             LOGGER.trace("invalid artifact key ID {}", axArtifactKeyArray[1], apEx);
             return null;
         }
index d9775bf..358b953 100644 (file)
@@ -21,7 +21,6 @@
 package org.onap.policy.apex.context;
 
 import java.util.Map;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxConcept;
 import org.onap.policy.apex.model.contextmodel.concepts.AxContextAlbum;
index d3218a3..13d3865 100644 (file)
@@ -21,7 +21,6 @@
 package org.onap.policy.apex.context;
 
 import java.util.Set;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
 import org.onap.policy.apex.model.contextmodel.concepts.AxContextSchema;
index 9d44cd3..eb2383c 100644 (file)
@@ -27,7 +27,6 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-
 import org.onap.policy.apex.context.ContextAlbum;
 import org.onap.policy.apex.context.ContextException;
 import org.onap.policy.apex.context.ContextRuntimeException;
index e0de4a3..e68f081 100644 (file)
@@ -22,7 +22,6 @@ package org.onap.policy.apex.context.impl.distribution;
 
 import java.util.Timer;
 import java.util.TimerTask;
-
 import org.onap.policy.apex.context.ContextException;
 import org.onap.policy.apex.context.Distributor;
 import org.onap.policy.apex.context.parameters.ContextParameterConstants;
index cafc96c..ff61bc0 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.apex.context.impl.distribution.jvmlocal;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-
 import org.onap.policy.apex.context.impl.distribution.AbstractDistributor;
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.slf4j.ext.XLogger;
index 7a7b237..a2bd45c 100644 (file)
@@ -24,7 +24,6 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.locks.ReadWriteLock;
-
 import org.onap.policy.apex.context.ContextException;
 import org.onap.policy.apex.context.LockManager;
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
index 444a085..201f55e 100644 (file)
@@ -22,7 +22,6 @@ package org.onap.policy.apex.context.impl.locking.jvmlocal;
 
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
-
 import org.onap.policy.apex.context.ContextException;
 import org.onap.policy.apex.context.impl.locking.AbstractLockManager;
 
index 96567f0..32f0266 100644 (file)
@@ -22,7 +22,6 @@ package org.onap.policy.apex.context.impl.persistence.ephemeral;
 
 import java.util.Set;
 import java.util.TreeSet;
-
 import org.onap.policy.apex.context.ContextException;
 import org.onap.policy.apex.context.Persistor;
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
index 260482c..44ec222 100644 (file)
@@ -22,7 +22,6 @@
 package org.onap.policy.apex.context.impl.schema;
 
 import java.lang.reflect.Constructor;
-
 import org.apache.commons.lang3.NotImplementedException;
 import org.onap.policy.apex.context.ContextRuntimeException;
 import org.onap.policy.apex.context.SchemaHelper;
index 9694468..43288f4 100644 (file)
@@ -24,11 +24,9 @@ package org.onap.policy.apex.context.impl.schema.java;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonElement;
-
 import java.lang.reflect.Constructor;
 import java.util.HashMap;
 import java.util.Map;
-
 import org.onap.policy.apex.context.ContextRuntimeException;
 import org.onap.policy.apex.context.impl.schema.AbstractSchemaHelper;
 import org.onap.policy.apex.context.parameters.ContextParameterConstants;
@@ -55,15 +53,15 @@ public class JavaSchemaHelper extends AbstractSchemaHelper {
     private static final Map<String, Class<?>> BUILT_IN_MAP = new HashMap<>();
 
     static {
-        BUILT_IN_MAP.put("int",    Integer  .TYPE);
-        BUILT_IN_MAP.put("long",   Long     .TYPE);
-        BUILT_IN_MAP.put("double", Double   .TYPE);
-        BUILT_IN_MAP.put("float",  Float    .TYPE);
-        BUILT_IN_MAP.put("bool",   Boolean  .TYPE);
+        BUILT_IN_MAP.put("int",    Integer.TYPE);
+        BUILT_IN_MAP.put("long",   Long.TYPE);
+        BUILT_IN_MAP.put("double", Double.TYPE);
+        BUILT_IN_MAP.put("float",  Float.TYPE);
+        BUILT_IN_MAP.put("bool",   Boolean.TYPE);
         BUILT_IN_MAP.put("char",   Character.TYPE);
-        BUILT_IN_MAP.put("byte",   Byte     .TYPE);
-        BUILT_IN_MAP.put("void",   Void     .TYPE);
-        BUILT_IN_MAP.put("short",  Short    .TYPE);
+        BUILT_IN_MAP.put("byte",   Byte.TYPE);
+        BUILT_IN_MAP.put("void",   Void.TYPE);
+        BUILT_IN_MAP.put("short",  Short.TYPE);
     }
     // @formatter:on
 
index 5b0608c..49f2cbd 100644 (file)
@@ -22,7 +22,6 @@ package org.onap.policy.apex.context.impl.schema.java;
 
 import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonSerializer;
-
 import org.onap.policy.common.parameters.GroupValidationResult;
 import org.onap.policy.common.parameters.ParameterGroup;
 import org.onap.policy.common.parameters.ValidationStatus;
@@ -160,8 +159,7 @@ public class JavaSchemaHelperJsonAdapterParameters implements ParameterGroup {
             if (!JsonDeserializer.class.isAssignableFrom(adaptorClazz)) {
                 if (errorMessage == null) {
                     errorMessage = "class is not a JsonDeserializer";
-                }
-                else {
+                } else {
                     errorMessage = "class is not a JsonSerializer or JsonDeserializer";
                 }
             }
index fb17137..3f5c26e 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.apex.context.parameters;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.TreeMap;
-
 import org.onap.policy.apex.context.impl.schema.java.JavaSchemaHelperParameters;
 import org.onap.policy.common.parameters.GroupValidationResult;
 import org.onap.policy.common.parameters.ParameterGroup;
index f080c1f..20398eb 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.apex.context.impl;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
-
 import org.apache.commons.lang3.NotImplementedException;
 import org.onap.policy.apex.context.ContextAlbum;
 import org.onap.policy.apex.context.ContextException;
index 8cac363..d9304d1 100644 (file)
@@ -27,10 +27,8 @@ import static org.junit.Assert.fail;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
 import com.google.gson.JsonPrimitive;
-
 import java.math.BigDecimal;
 import java.time.Instant;
-
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
index 0b95b89..43accac 100644 (file)
@@ -23,9 +23,7 @@ package org.onap.policy.apex.context.impl.schema.java;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
-
 import java.lang.reflect.Type;
-
 import org.onap.policy.common.parameters.ParameterRuntimeException;
 import org.slf4j.ext.XLogger;
 import org.slf4j.ext.XLoggerFactory;
index 90b1519..6ec19fc 100644 (file)
@@ -22,7 +22,6 @@ package org.onap.policy.apex.core.deployment;
 
 import java.io.PrintStream;
 import java.util.Arrays;
-
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
 import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel;
 import org.slf4j.ext.XLogger;
index 900e0a2..9033ff4 100644 (file)
@@ -150,8 +150,7 @@ public class DeploymentClient implements Runnable {
     private InetAddress getLocalAddress() {
         try {
             return MessagingUtils.getLocalHostLanAddress();
-        }
-        catch (UnknownHostException e) {
+        } catch (UnknownHostException e) {
             LOGGER.debug("engine<-->deployment client failed to find the localhost address - continuing ...", e);
             return null;
         }
index f984853..9dfcf4d 100644 (file)
@@ -25,7 +25,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.net.URL;
 import java.util.concurrent.TimeUnit;
-
 import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities;
 import org.onap.policy.apex.core.protocols.Message;
 import org.onap.policy.apex.core.protocols.engdep.messages.EngineServiceInfoResponse;
index 09d5e8e..3856400 100644 (file)
@@ -22,7 +22,6 @@ package org.onap.policy.apex.core.deployment;
 
 import java.io.PrintStream;
 import java.util.Arrays;
-
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.slf4j.ext.XLogger;
index e0610df..5871204 100644 (file)
@@ -28,7 +28,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.PrintStream;
-
 import org.junit.Test;
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
 import org.onap.policy.apex.model.basicmodel.handling.ApexModelException;
index f51b233..ddbcf21 100644 (file)
@@ -32,7 +32,6 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
index 4eda2ee..4432a38 100644 (file)
@@ -29,7 +29,6 @@ import java.util.List;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
-
 import org.onap.policy.apex.core.protocols.Message;
 import org.onap.policy.apex.core.protocols.engdep.messages.EngineServiceInfoResponse;
 import org.onap.policy.apex.core.protocols.engdep.messages.GetEngineInfo;
index 64474f0..2bb3dc1 100644 (file)
@@ -22,7 +22,6 @@ package org.onap.policy.apex.core.engine;
 
 import lombok.Getter;
 import lombok.Setter;
-
 import org.onap.policy.common.parameters.BeanValidator;
 import org.onap.policy.common.parameters.ValidationResult;
 import org.onap.policy.common.parameters.annotations.NotBlank;
index c1007b1..32f86e4 100644 (file)
@@ -21,7 +21,6 @@
 package org.onap.policy.apex.core.engine.engine.impl;
 
 import java.util.HashMap;
-
 import org.onap.policy.apex.core.engine.context.ApexInternalContext;
 import org.onap.policy.apex.core.engine.event.EnEvent;
 import org.onap.policy.apex.core.engine.executor.ExecutorFactory;
index 9a5acbf..2f9627d 100644 (file)
@@ -30,10 +30,8 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.Random;
 import java.util.Set;
-
 import lombok.Getter;
 import lombok.Setter;
-
 import org.onap.policy.apex.core.engine.monitoring.EventMonitor;
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxConcept;
index e7d4643..63a45fe 100644 (file)
@@ -21,7 +21,6 @@
 package org.onap.policy.apex.core.engine.event;
 
 import java.io.Serializable;
-
 import org.onap.policy.apex.context.ContextRuntimeException;
 import org.onap.policy.apex.context.SchemaHelper;
 import org.onap.policy.apex.context.impl.schema.SchemaHelperFactory;
index cb0cfab..7ebed1d 100644 (file)
@@ -22,7 +22,6 @@
 package org.onap.policy.apex.core.engine.executor;
 
 import java.util.Properties;
-
 import org.onap.policy.apex.core.engine.ExecutorParameters;
 import org.onap.policy.apex.core.engine.executor.exception.StateMachineException;
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
index 1926539..b04c354 100644 (file)
@@ -26,7 +26,6 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.TreeMap;
-
 import org.onap.policy.apex.context.ContextException;
 import org.onap.policy.apex.core.engine.ExecutorParameters;
 import org.onap.policy.apex.core.engine.context.ApexInternalContext;
index b13db03..5f99518 100644 (file)
@@ -25,9 +25,7 @@ import static org.onap.policy.common.utils.validation.Assertions.argumentOfClass
 
 import java.util.Map;
 import java.util.Properties;
-
 import lombok.NonNull;
-
 import org.onap.policy.apex.context.ContextException;
 import org.onap.policy.apex.core.engine.ExecutorParameters;
 import org.onap.policy.apex.core.engine.context.ApexInternalContext;
index 73ace3d..67a3e6d 100644 (file)
@@ -24,7 +24,6 @@ package org.onap.policy.apex.core.engine.executor;
 import java.util.Map;
 import java.util.Properties;
 import java.util.TreeMap;
-
 import org.onap.policy.apex.context.ContextException;
 import org.onap.policy.apex.core.engine.ExecutorParameters;
 import org.onap.policy.apex.core.engine.context.ApexInternalContext;
index 40de843..9c3c6f8 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.apex.core.engine.executor;
 
 import java.util.Map;
 import java.util.Map.Entry;
-
 import org.onap.policy.apex.core.engine.event.EnEvent;
 import org.onap.policy.apex.core.engine.executor.exception.StateMachineException;
 import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
index 3f360ea..fa75db6 100644 (file)
@@ -24,9 +24,7 @@ package org.onap.policy.apex.core.engine.executor;
 import static org.onap.policy.common.utils.validation.Assertions.argumentNotNull;
 
 import java.util.Properties;
-
 import lombok.NonNull;
-
 import org.onap.policy.apex.context.ContextException;
 import org.onap.policy.apex.core.engine.ExecutorParameters;
 import org.onap.policy.apex.core.engine.context.ApexInternalContext;
index bb8e362..f433eed 100644 (file)
@@ -24,7 +24,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.service.ModelService;
 import org.onap.policy.apex.model.policymodel.concepts.AxState;
index 26753a8..55d629d 100644 (file)
@@ -27,10 +27,8 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 import java.util.TreeMap;
-
 import lombok.Getter;
 import lombok.Setter;
-
 import org.onap.policy.apex.context.ContextAlbum;
 import org.onap.policy.apex.context.ContextRuntimeException;
 import org.onap.policy.apex.core.engine.context.ApexInternalContext;
index 0b99c43..9d5087e 100644 (file)
@@ -28,10 +28,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.TreeMap;
-
 import lombok.Getter;
 import lombok.Setter;
-
 import org.onap.policy.apex.context.ContextAlbum;
 import org.onap.policy.apex.context.ContextRuntimeException;
 import org.onap.policy.apex.core.engine.context.ApexInternalContext;
index 7cfb634..2006d65 100644 (file)
@@ -26,10 +26,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.TreeMap;
-
 import lombok.Getter;
 import lombok.Setter;
-
 import org.onap.policy.apex.context.ContextAlbum;
 import org.onap.policy.apex.context.ContextRuntimeException;
 import org.onap.policy.apex.core.engine.context.ApexInternalContext;
index 809dc73..e37d074 100644 (file)
@@ -24,7 +24,6 @@ package org.onap.policy.apex.core.engine.executor.impl;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.TreeMap;
-
 import org.onap.policy.apex.core.engine.EngineParameterConstants;
 import org.onap.policy.apex.core.engine.EngineParameters;
 import org.onap.policy.apex.core.engine.ExecutorParameters;
index f91b58b..b066e45 100644 (file)
@@ -34,7 +34,6 @@ import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.concurrent.TimeUnit;
-
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
index 178e16a..47b8562 100644 (file)
@@ -40,8 +40,7 @@ public class DummySlowEnEventListener implements EnEventListener {
     public void onEnEvent(EnEvent enEvent) throws ApexException {
         try {
             Thread.sleep(waitTime);
-        }
-        catch (InterruptedException ie) {
+        } catch (InterruptedException ie) {
             //Do nothing
         }
     }
index 9fa9015..18d3214 100644 (file)
@@ -22,7 +22,6 @@
 package org.onap.policy.apex.core.engine.engine.impl;
 
 import java.util.Properties;
-
 import org.onap.policy.apex.core.engine.event.EnEvent;
 import org.onap.policy.apex.core.engine.executor.ExecutorFactory;
 import org.onap.policy.apex.core.engine.executor.StateMachineExecutor;
@@ -53,8 +52,7 @@ public class DummySmExecutor extends StateMachineExecutor {
     public void prepare() throws StateMachineException {
         if (prepareWorks) {
             prepareWorks = false;
-        }
-        else {
+        } else {
             prepareWorks = true;
             throw new StateMachineException("dummy state machine executor exception");
         }
@@ -75,8 +73,7 @@ public class DummySmExecutor extends StateMachineExecutor {
     public void cleanUp() throws StateMachineException {
         if (cleanupWorks) {
             cleanupWorks = false;
-        }
-        else {
+        } else {
             cleanupWorks = true;
             throw new StateMachineException("dummy state machine executor exception");
         }
index cef1c7b..eafa7f4 100644 (file)
@@ -21,7 +21,6 @@
 package org.onap.policy.apex.core.engine.event;
 
 import java.util.List;
-
 import org.apache.commons.lang3.NotImplementedException;
 import org.onap.policy.apex.model.basicmodel.concepts.AxConcept;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
index 4fd9367..e3d0b32 100644 (file)
@@ -29,7 +29,6 @@ import static org.junit.Assert.fail;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
index 58a025b..5a011b2 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.apex.core.engine.executor;
 
 import java.util.Map;
 import java.util.Properties;
-
 import org.onap.policy.apex.context.ContextException;
 import org.onap.policy.apex.core.engine.executor.exception.StateMachineException;
 
index 9f9713c..02a32d4 100644 (file)
@@ -22,7 +22,6 @@
 package org.onap.policy.apex.core.engine.executor;
 
 import java.util.Properties;
-
 import org.onap.policy.apex.context.ContextException;
 import org.onap.policy.apex.core.engine.event.EnEvent;
 import org.onap.policy.apex.core.engine.executor.exception.StateMachineException;
index 9dd5cad..156e64b 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.apex.core.engine.executor.context;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
-
 import org.apache.commons.lang3.NotImplementedException;
 import org.onap.policy.apex.context.ContextAlbum;
 import org.onap.policy.apex.context.ContextException;
index 6da92d5..aa3adf4 100644 (file)
@@ -32,7 +32,6 @@ import java.util.Set;
 import java.util.TreeSet;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
-
 import org.slf4j.ext.XLogger;
 import org.slf4j.ext.XLoggerFactory;
 
@@ -129,9 +128,8 @@ public abstract class ClassUtils {
                 // Directories may contain ".class" files
                 if (urlFile.isDirectory()) {
                     classNameSet.addAll(processDir(urlFile, url.getFile()));
-                }
-                // JARs are processed as well
-                else if (url.getFile().endsWith(".jar")) {
+                } else if (url.getFile().endsWith(".jar")) {
+                    // JARs are processed as well
                     classNameSet.addAll(processJar(urlFile));
                 }
                 // It's a resource or some other non-executable thing
index 7695e29..5cc3f21 100644 (file)
@@ -23,13 +23,11 @@ package org.onap.policy.apex.core.infrastructure.java.compile.singleclass;
 
 import java.util.Arrays;
 import java.util.List;
-
 import javax.tools.Diagnostic;
 import javax.tools.DiagnosticCollector;
 import javax.tools.JavaCompiler;
 import javax.tools.JavaFileObject;
 import javax.tools.ToolProvider;
-
 import org.onap.policy.apex.core.infrastructure.java.JavaHandlingException;
 import org.slf4j.ext.XLogger;
 import org.slf4j.ext.XLoggerFactory;
index b38b32f..9721258 100644 (file)
@@ -22,7 +22,6 @@ package org.onap.policy.apex.core.infrastructure.messaging;
 
 import java.net.InetSocketAddress;
 import java.net.URI;
-
 import org.onap.policy.apex.core.infrastructure.messaging.impl.ws.client.MessagingClient;
 import org.onap.policy.apex.core.infrastructure.messaging.impl.ws.server.MessageServerImpl;
 
index 17391fb..ad0dbb5 100644 (file)
@@ -22,7 +22,6 @@ package org.onap.policy.apex.core.infrastructure.messaging.impl.ws.client;
 
 import java.net.URI;
 import java.nio.ByteBuffer;
-
 import org.onap.policy.apex.core.infrastructure.messaging.MessageListener;
 import org.onap.policy.apex.core.infrastructure.messaging.impl.ws.RawMessageHandler;
 import org.onap.policy.apex.core.infrastructure.messaging.impl.ws.messageblock.MessageBlockHandler;
index 003a8ef..5d45c47 100644 (file)
@@ -21,7 +21,6 @@
 package org.onap.policy.apex.core.infrastructure.messaging.impl.ws.client;
 
 import java.net.URI;
-
 import org.java_websocket.WebSocket;
 import org.onap.policy.apex.core.infrastructure.messaging.MessageHolder;
 import org.onap.policy.apex.core.infrastructure.messaging.MessagingService;
@@ -119,9 +118,8 @@ public class MessagingClient<M> extends InternalMessageBusClient<M> implements M
                 default:
                     break;
             }
-        }
+        } while (timeoutMsCounter > 0);
         // While the timeout value has not expired
-        while (timeoutMsCounter > 0);
 
         // We have timed out
         return false;
index 1fbd651..18cdccc 100644 (file)
@@ -22,7 +22,6 @@ package org.onap.policy.apex.core.infrastructure.messaging.impl.ws.server;
 
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
-
 import org.java_websocket.WebSocket;
 import org.onap.policy.apex.core.infrastructure.messaging.MessageListener;
 import org.onap.policy.apex.core.infrastructure.messaging.MessagingService;
index 5b2167e..27ba46c 100644 (file)
@@ -25,7 +25,6 @@ import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.util.Collection;
 import java.util.concurrent.atomic.AtomicBoolean;
-
 import org.java_websocket.WebSocket;
 import org.onap.policy.apex.core.infrastructure.messaging.MessageHolder;
 import org.onap.policy.apex.core.infrastructure.messaging.util.MessagingUtils;
index 968ec97..edf9ec0 100644 (file)
@@ -22,9 +22,7 @@
 package org.onap.policy.apex.core.infrastructure.messaging.stringmessaging;
 
 import com.google.common.eventbus.Subscribe;
-
 import java.net.URI;
-
 import org.onap.policy.apex.core.infrastructure.messaging.MessageListener;
 import org.onap.policy.apex.core.infrastructure.messaging.MessagingException;
 import org.onap.policy.apex.core.infrastructure.messaging.MessagingService;
index 6b1dc67..55b2e36 100644 (file)
 package org.onap.policy.apex.core.infrastructure.messaging.stringmessaging;
 
 import com.google.common.eventbus.Subscribe;
-
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
-
 import org.onap.policy.apex.core.infrastructure.messaging.MessageListener;
 import org.onap.policy.apex.core.infrastructure.messaging.MessagingException;
 import org.onap.policy.apex.core.infrastructure.messaging.MessagingService;
index a9c57f3..53b8a79 100644 (file)
@@ -22,7 +22,6 @@
 package org.onap.policy.apex.core.infrastructure.xml;
 
 import java.io.InputStream;
-
 import javax.xml.XMLConstants;
 import javax.xml.namespace.QName;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -30,7 +29,6 @@ import javax.xml.xpath.XPath;
 import javax.xml.xpath.XPathExpression;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
-
 import org.slf4j.ext.XLogger;
 import org.slf4j.ext.XLoggerFactory;
 import org.w3c.dom.Document;
index 4e69f44..060dcce 100644 (file)
  * SPDX-License-Identifier: Apache-2.0
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.policy.apex.core.infrastructure.java.classes;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Set;
 import java.util.TreeSet;
-
 import org.junit.Test;
 import org.mockito.Mockito;
 
@@ -41,28 +42,29 @@ public class ClassUtilsTest {
 
     @Test
     public void testProcessFileName() {
-        assertEquals("testing.txt",ClassUtils.processFileName("testing.txt"));
+        assertEquals("testing.txt", ClassUtils.processFileName("testing.txt"));
         assertNull(ClassUtils.processFileName(null));
-        assertEquals("",ClassUtils.processFileName("/classes/"));
+        assertEquals("", ClassUtils.processFileName("/classes/"));
     }
 
     @Test
     public void testProcessDir() throws Exception {
         File mockFile = Mockito.mock(File.class);
-        File mockChildFile = Mockito.mock(File.class);
         Mockito.when(mockFile.isDirectory()).thenReturn(false);
-        assertEquals(new TreeSet<>(),ClassUtils.processDir(mockFile, "Here"));
-        assertEquals(new TreeSet<>(),ClassUtils.processDir(null, "Test"));
+        assertEquals(new TreeSet<>(), ClassUtils.processDir(mockFile, "Here"));
+        assertEquals(new TreeSet<>(), ClassUtils.processDir(null, "Test"));
         Mockito.when(mockFile.isDirectory()).thenReturn(true);
+
+        File mockChildFile = Mockito.mock(File.class);
         File[] files = {mockChildFile};
         Mockito.when(mockFile.listFiles()).thenReturn(files);
         Mockito.when(mockChildFile.getName()).thenReturn("test.class");
         Mockito.when(mockChildFile.getAbsolutePath()).thenReturn("/test/");
-        assertEquals(Set.of(".test."),ClassUtils.processDir(mockFile, "Here"));
+        assertEquals(Set.of(".test."), ClassUtils.processDir(mockFile, "Here"));
         Mockito.when(mockChildFile.getName()).thenReturn("test.class");
-        assertEquals(Set.of(".test."),ClassUtils.processDir(mockFile, "Here"));
+        assertEquals(Set.of(".test."), ClassUtils.processDir(mockFile, "Here"));
         Mockito.when(mockChildFile.getName()).thenReturn("$test.class");
-        assertEquals(new TreeSet<>(),ClassUtils.processDir(mockFile, "Here"));
+        assertEquals(new TreeSet<>(), ClassUtils.processDir(mockFile, "Here"));
     }
 
 }
index f853017..d9bd93c 100644 (file)
@@ -21,7 +21,6 @@
 package org.onap.policy.apex.core.infrastructure.messaging;
 
 import com.google.common.eventbus.Subscribe;
-
 import org.onap.policy.apex.core.infrastructure.messaging.impl.ws.messageblock.MessageBlock;
 import org.slf4j.ext.XLogger;
 import org.slf4j.ext.XLoggerFactory;
index 35d3485..e5375b7 100644 (file)
@@ -26,7 +26,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import java.util.concurrent.TimeUnit;
-
 import org.junit.Test;
 import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WsStringMessageClient;
 import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WsStringMessageListener;
index 9eaaeee..a3c7ea4 100644 (file)
@@ -17,6 +17,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.policy.apex.core.infrastructure.messaging;
 
 import static org.junit.Assert.assertEquals;
@@ -26,7 +27,6 @@ import static org.junit.Assert.assertTrue;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
-
 import org.junit.Test;
 import org.onap.policy.apex.core.infrastructure.messaging.util.MessagingUtils;
 
index ba6d4c6..35ad938 100644 (file)
 
 package org.onap.policy.apex.core.infrastructure.threading;
 
-import static org.awaitility.Awaitility.await;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
-
 import org.junit.Test;
 import org.slf4j.ext.XLogger;
 import org.slf4j.ext.XLoggerFactory;
index 0df23d3..8c0c986 100644 (file)
@@ -22,7 +22,6 @@ package org.onap.policy.apex.core.protocols.engdep.messages;
 
 import java.util.Arrays;
 import java.util.Collection;
-
 import org.onap.policy.apex.core.protocols.Message;
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 
@@ -104,8 +103,7 @@ public class EngineServiceInfoResponse extends Response {
     public void setEngineKeyArray(final Collection<AxArtifactKey> engineKeyCollection) {
         if (engineKeyCollection != null) {
             engineKeyArray = engineKeyCollection.toArray(new AxArtifactKey[engineKeyCollection.size()]);
-        }
-        else {
+        } else {
             engineKeyArray = null;
         }
     }
index 735c20e..aeeb43d 100644 (file)
@@ -20,7 +20,6 @@
 
 package org.onap.policy.apex.core.protocols;
 
-import org.onap.policy.apex.core.protocols.Action;
 import org.onap.policy.apex.core.protocols.Message;
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 
index 1602dac..0b75bb5 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.apex.core.protocols.engdep;
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
-import org.onap.policy.apex.core.protocols.engdep.EngDepAction;
 
 /**
  * Test the Eng Dep Action class.
index 72d671f..c240704 100644 (file)
@@ -28,7 +28,6 @@ import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.junit.Test;
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 
@@ -76,7 +75,7 @@ public class EngineServiceInfoResponseTest {
         
         assertTrue(response.equals(response));
         assertFalse(response.equals(null));
-        assertFalse(response.equals((Object)new StartEngine(new AxArtifactKey())));
+        assertFalse(response.equals((Object) new StartEngine(new AxArtifactKey())));
 
         response = new EngineServiceInfoResponse(null, false, null);
         EngineServiceInfoResponse otherResponse = new EngineServiceInfoResponse(null, false, null);
index 62cb591..a2a1e6a 100644 (file)
@@ -24,9 +24,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import java.net.UnknownHostException;
-
 import org.junit.Test;
-import org.onap.policy.apex.core.protocols.engdep.messages.GetEngineStatus;
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.slf4j.ext.XLogger;
 import org.slf4j.ext.XLoggerFactory;
index 447ceea..2c1f658 100644 (file)
@@ -25,10 +25,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.net.UnknownHostException;
-
 import org.junit.Test;
-import org.onap.policy.apex.core.protocols.engdep.messages.Response;
-import org.onap.policy.apex.core.protocols.engdep.messages.UpdateModel;
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.slf4j.ext.XLogger;
 import org.slf4j.ext.XLoggerFactory;
index b14d168..9f954b5 100644 (file)
@@ -25,9 +25,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import java.net.UnknownHostException;
-
 import org.junit.Test;
-import org.onap.policy.apex.core.protocols.engdep.messages.UpdateModel;
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.slf4j.ext.XLogger;
 import org.slf4j.ext.XLoggerFactory;
index 97f0aea..8e05aff 100644 (file)
@@ -26,7 +26,6 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
index 99dd28d..6c19981 100644 (file)
@@ -26,13 +26,11 @@ import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.commons.math3.distribution.TDistribution;
 import org.apache.commons.math3.util.FastMath;
 import org.onap.policy.apex.core.engine.executor.context.TaskSelectionExecutionContext;
 import org.onap.policy.apex.examples.adaptive.concepts.AnomalyDetection;
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
-import org.slf4j.Logger;
 
 /**
  * The Class AnomalyDetectionPolicyDecideTaskSelectionLogic.
index ef697b0..c0aa620 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.apex.examples.adaptive.model.java;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Random;
-
 import org.onap.policy.apex.context.ContextException;
 import org.onap.policy.apex.core.engine.executor.context.TaskSelectionExecutionContext;
 import org.onap.policy.apex.examples.adaptive.concepts.AutoLearn;
index 6235882..f1c8d7d 100644 (file)
 
 package org.onap.policy.apex.examples.adaptive;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.util.LinkedList;
 import java.util.List;
-
 import org.junit.Test;
 import org.onap.policy.apex.examples.adaptive.concepts.AnomalyDetection;
 
 public class AnomalyDetectionConceptTest {
 
     @Test
-    public void testToString(){
+    public void testToString() {
         AnomalyDetection anomalyDetection = new AnomalyDetection();
         List<Double> newAnomalyScores = new LinkedList<>();
         newAnomalyScores.add((double) 55);
@@ -39,13 +41,14 @@ public class AnomalyDetectionConceptTest {
         anomalyDetection.setFrequency(55);
         assertEquals(newAnomalyScores, anomalyDetection.getAnomalyScores());
         assertTrue(anomalyDetection.checkSetAnomalyScores());
-        assertEquals(55,anomalyDetection.getFrequency());
-        assertEquals(true,anomalyDetection.getFirstRound());
-        assertEquals("AnomalyDetection [firstRound=true, frequency=55, anomalyScores=[55.0], frequencyForecasted=null]", anomalyDetection.toString());
+        assertEquals(55, anomalyDetection.getFrequency());
+        assertEquals(true, anomalyDetection.getFirstRound());
+        assertEquals("AnomalyDetection [firstRound=true, frequency=55, anomalyScores=[55.0], frequencyForecasted=null]",
+            anomalyDetection.toString());
     }
 
     @Test
-    public void testHashCode(){
+    public void testHashCode() {
         AnomalyDetection detection = new AnomalyDetection();
         AnomalyDetection compareDetection = new AnomalyDetection();
         assertEquals(detection.hashCode(), compareDetection.hashCode());
@@ -99,13 +102,13 @@ public class AnomalyDetectionConceptTest {
     }
 
     @Test
-    public void testCheckSets(){
+    public void testCheckSets() {
         AnomalyDetection anomalyDetection = new AnomalyDetection();
         assertFalse(anomalyDetection.checkSetAnomalyScores());
         List<Double> anomalyScores = new LinkedList<>();
         anomalyDetection.setAnomalyScores(anomalyScores);
         assertFalse(anomalyDetection.checkSetAnomalyScores());
-        anomalyScores.add((double)2);
+        anomalyScores.add((double) 2);
         anomalyDetection.setAnomalyScores(anomalyScores);
         assertTrue(anomalyDetection.checkSetAnomalyScores());
         anomalyDetection.unsetAnomalyScores();
@@ -115,7 +118,7 @@ public class AnomalyDetectionConceptTest {
         List<Double> frequencyForecasted = new LinkedList<>();
         anomalyDetection.setFrequencyForecasted(frequencyForecasted);
         assertFalse(anomalyDetection.checkSetFrequencyForecasted());
-        frequencyForecasted.add((double)2);
+        frequencyForecasted.add((double) 2);
         anomalyDetection.setFrequencyForecasted(frequencyForecasted);
         assertTrue(anomalyDetection.checkSetFrequencyForecasted());
         anomalyDetection.unsetFrequencyForecasted();
index b06908d..702b050 100644 (file)
@@ -26,7 +26,6 @@ import static org.awaitility.Awaitility.await;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
-
 import org.onap.policy.apex.core.engine.engine.EnEventListener;
 import org.onap.policy.apex.core.engine.event.EnEvent;
 
index c8e38bc..da9b8e3 100644 (file)
@@ -22,16 +22,13 @@ package org.onap.policy.apex.examples.grpc;
 
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.util.JsonFormat;
-
 import io.grpc.Server;
 import io.grpc.netty.NettyServerBuilder;
 import io.grpc.stub.StreamObserver;
-
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-
 import org.onap.ccsdk.cds.controllerblueprints.processing.api.BluePrintProcessingServiceGrpc.BluePrintProcessingServiceImplBase;
 import org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceInput;
 import org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceOutput;
index 05d6e4c..35c21d6 100644 (file)
@@ -26,11 +26,9 @@ import static org.junit.Assert.assertEquals;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.concurrent.TimeUnit;
-
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.core.Response;
-
 import org.junit.Test;
 import org.onap.policy.apex.auth.clieditor.ApexCommandLineEditorMain;
 import org.onap.policy.apex.service.engine.main.ApexMain;
index c470e93..b3c35a3 100644 (file)
@@ -28,7 +28,6 @@ import static org.junit.Assert.assertTrue;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Map.Entry;
-
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
index fb4103c..c495bd3 100644 (file)
@@ -27,12 +27,10 @@ import static org.junit.Assert.assertTrue;
 
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
-
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
index 44c4306..1281c51 100644 (file)
@@ -26,7 +26,6 @@ import static org.awaitility.Awaitility.await;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
-
 import org.onap.policy.apex.core.engine.engine.EnEventListener;
 import org.onap.policy.apex.core.engine.event.EnEvent;
 
index 884708d..f3ea159 100644 (file)
@@ -43,7 +43,6 @@ import javax.xml.transform.stream.StreamResult;
 import javax.xml.xpath.XPath;
 import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathFactory;
-
 import org.onap.policy.apex.model.basicmodel.concepts.ApexRuntimeException;
 import org.onap.policy.common.utils.network.NetworkUtil;
 import org.slf4j.ext.XLogger;
index ba1481c..5fb74a3 100644 (file)
@@ -28,9 +28,7 @@ import static org.mockito.Mockito.when;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-
 import javax.net.ssl.HttpsURLConnection;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
index 63ca3cd..afbc3f2 100644 (file)
@@ -23,12 +23,10 @@ package org.onap.policy.apex.domains.onap.vcpe;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-
 import java.time.Instant;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.BlockingQueue;
-
 import org.onap.policy.appclcm.AppcLcmBody;
 import org.onap.policy.appclcm.AppcLcmDmaapWrapper;
 import org.onap.policy.appclcm.AppcLcmInput;
index f228ccd..c275df1 100644 (file)
@@ -28,7 +28,6 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
-
 import java.io.IOException;
 import java.time.Instant;
 import java.util.Map;
@@ -37,14 +36,12 @@ import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
-
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Response;
-
 import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities;
 import org.onap.policy.common.utils.resources.TextFileUtils;
 import org.onap.policy.controlloop.util.Serialization;
@@ -243,8 +240,7 @@ public class OnapVCpeSimEndpoint {
                 return Response.status(200).entity(appcResponse).build();
             }
             timeLeft -= 100;
-        }
-        while (timeLeft > 0);
+        } while (timeLeft > 0);
 
         return Response.status(200).build();
     }
index 859d1b0..80ef735 100644 (file)
@@ -22,11 +22,9 @@ package org.onap.policy.apex.examples.servlet;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 import javax.servlet.annotation.WebListener;
-
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
 import org.onap.policy.apex.model.basicmodel.concepts.ApexRuntimeException;
 import org.onap.policy.apex.service.engine.main.ApexMain;
index 3f2affb..8bbc652 100644 (file)
@@ -23,9 +23,7 @@ package org.onap.policy.apex.model.basicmodel.concepts;
 
 import java.io.Serializable;
 import java.util.List;
-
 import javax.xml.bind.annotation.XmlType;
-
 import org.onap.policy.common.utils.validation.Assertions;
 
 /**
index 34c704c..175cded 100644 (file)
@@ -24,7 +24,6 @@ package org.onap.policy.apex.model.basicmodel.concepts;
 import java.util.NavigableMap;
 import java.util.Set;
 import java.util.TreeSet;
-
 import org.onap.policy.common.utils.validation.Assertions;
 
 /**
@@ -78,8 +77,7 @@ public class AxConceptGetterImpl<C> implements AxConceptGetter<C> {
                 break;
             }
             foundKey = nextkey;
-        }
-        while (true);
+        } while (true);
 
         return conceptMap.get(foundKey);
     }
@@ -138,8 +136,7 @@ public class AxConceptGetterImpl<C> implements AxConceptGetter<C> {
                 break;
             }
             returnSet.add(conceptMap.get(foundKey));
-        }
-        while (true);
+        } while (true);
 
         return returnSet;
     }
index 35010bf..fc8c0cd 100644 (file)
@@ -24,7 +24,6 @@ package org.onap.policy.apex.model.basicmodel.concepts;
 import java.util.List;
 import java.util.Random;
 import java.util.UUID;
-
 import javax.persistence.Column;
 import javax.persistence.Convert;
 import javax.persistence.EmbeddedId;
@@ -36,7 +35,6 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
 import org.apache.commons.lang3.StringUtils;
 import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult.ValidationResult;
 import org.onap.policy.apex.model.basicmodel.dao.converters.CDataConditioner;
index 977cfcf..fc876d8 100644 (file)
@@ -29,7 +29,6 @@ import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
 import java.util.UUID;
-
 import javax.persistence.CascadeType;
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
@@ -42,7 +41,6 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult.ValidationResult;
 import org.onap.policy.common.utils.validation.Assertions;
 
index 8eed845..fe78646 100644 (file)
@@ -22,7 +22,6 @@
 package org.onap.policy.apex.model.basicmodel.concepts;
 
 import java.util.List;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult.ValidationResult;
 import org.onap.policy.common.utils.validation.Assertions;
 
index e54b880..9c71638 100644 (file)
@@ -24,7 +24,6 @@ package org.onap.policy.apex.model.basicmodel.concepts;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
-
 import javax.persistence.CascadeType;
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
@@ -40,7 +39,6 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult.ValidationResult;
 import org.onap.policy.apex.model.basicmodel.handling.KeyInfoMarshalFilter;
 import org.onap.policy.apex.model.basicmodel.service.ModelService;
@@ -212,9 +210,8 @@ public class AxModel extends AxConcept {
                 result = validateArtifactKeyInModel((AxArtifactKey) axKey, artifactKeySet, result);
             } else if (axKey instanceof AxReferenceKey) {
                 result = validateReferenceKeyInModel((AxReferenceKey) axKey, referenceKeySet, result);
-            }
-            // It must be an AxKeyUse, nothing else is legal
-            else {
+            } else {
+                // It must be an AxKeyUse, nothing else is legal
                 usedKeySet.add((AxKeyUse) axKey);
             }
         }
index 32fb76c..4b9d647 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.apex.model.basicmodel.concepts;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.persistence.Column;
 import javax.persistence.Embeddable;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -31,7 +30,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult.ValidationResult;
 import org.onap.policy.common.utils.validation.Assertions;
 
index 655e9a9..b846460 100644 (file)
@@ -22,7 +22,6 @@ package org.onap.policy.apex.model.basicmodel.dao;
 
 import java.util.Collection;
 import java.util.List;
-
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxConcept;
index 37943ff..f5fffdb 100644 (file)
@@ -21,7 +21,6 @@
 package org.onap.policy.apex.model.basicmodel.dao.converters;
 
 import java.util.UUID;
-
 import javax.persistence.AttributeConverter;
 import javax.persistence.Converter;
 import javax.xml.bind.annotation.adapters.XmlAdapter;
@@ -42,8 +41,7 @@ public class Uuid2String extends XmlAdapter<String, UUID> implements AttributeCo
         String returnString;
         if (uuid == null) {
             returnString = "";
-        }
-        else {
+        } else {
             returnString = uuid.toString();
         }
         return returnString;
index b8a9792..39e8b0d 100644 (file)
@@ -24,11 +24,9 @@ package org.onap.policy.apex.model.basicmodel.dao.impl;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.Persistence;
-
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
 import org.onap.policy.apex.model.basicmodel.concepts.ApexRuntimeException;
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
index aead4cb..04dd2a3 100644 (file)
@@ -22,7 +22,6 @@ package org.onap.policy.apex.model.basicmodel.handling;
 
 import java.io.File;
 import java.io.FileOutputStream;
-
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
 import org.onap.policy.apex.model.basicmodel.concepts.AxModel;
 import org.slf4j.ext.XLogger;
index b593b3e..39eacce 100644 (file)
@@ -28,7 +28,6 @@ import java.io.InputStreamReader;
 import java.io.StringReader;
 import java.net.URL;
 import java.util.regex.Pattern;
-
 import javax.xml.XMLConstants;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBElement;
@@ -37,7 +36,6 @@ import javax.xml.bind.Unmarshaller;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
-
 import org.eclipse.persistence.jaxb.JAXBContextFactory;
 import org.eclipse.persistence.jaxb.MarshallerProperties;
 import org.eclipse.persistence.oxm.MediaType;
index 50e8bb5..8217bad 100644 (file)
@@ -22,7 +22,6 @@
 package org.onap.policy.apex.model.basicmodel.handling;
 
 import java.io.File;
-
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
 import org.onap.policy.apex.model.basicmodel.concepts.AxModel;
 import org.onap.policy.common.utils.validation.Assertions;
index 91e58d6..f1725d8 100644 (file)
@@ -22,7 +22,6 @@
 package org.onap.policy.apex.model.basicmodel.handling;
 
 import java.io.ByteArrayOutputStream;
-
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
 import org.onap.policy.apex.model.basicmodel.concepts.AxConcept;
 import org.onap.policy.common.utils.validation.Assertions;
index 8d6c01e..0dab08d 100644 (file)
@@ -26,7 +26,6 @@ import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.util.Set;
 import java.util.TreeSet;
-
 import javax.xml.XMLConstants;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
@@ -40,7 +39,6 @@ import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
-
 import org.eclipse.persistence.jaxb.JAXBContextFactory;
 import org.eclipse.persistence.jaxb.MarshallerProperties;
 import org.eclipse.persistence.oxm.MediaType;
index a793a60..230a8ab 100644 (file)
@@ -24,13 +24,11 @@ import java.io.File;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.io.StringWriter;
-
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.SchemaOutputResolver;
 import javax.xml.transform.Result;
 import javax.xml.transform.stream.StreamResult;
-
 import org.slf4j.ext.XLogger;
 import org.slf4j.ext.XLoggerFactory;
 
index 41cf4df..cfc385d 100644 (file)
@@ -89,7 +89,7 @@ public class KeyInfoMarshalFilter extends XmlAdapter<AxKeyInformation, AxKeyInfo
      */
     @Override
     public AxKeyInformation marshal(AxKeyInformation val) throws Exception {
-        if (val == null || val.getKeyInfoMap() == null || val.getKeyInfoMap().isEmpty() || filterList.isEmpty() ) {
+        if (val == null || val.getKeyInfoMap() == null || val.getKeyInfoMap().isEmpty() || filterList.isEmpty()) {
             return val;
         }
         //create a new keyinfo clone to avoid removing keyinfo entries from the original model
index 251d92a..c6eb0e0 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.apex.model.basicmodel.service;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-
 import org.onap.policy.apex.model.basicmodel.concepts.ApexRuntimeException;
 import org.onap.policy.apex.model.basicmodel.concepts.AxConcept;
 
index 6bab169..bf63e6d 100644 (file)
@@ -24,7 +24,6 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.net.URL;
-
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
 import org.onap.policy.apex.model.basicmodel.concepts.AxModel;
 import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult;
index c70e51a..d8580be 100644 (file)
 package org.onap.policy.apex.model.basicmodel.xml;
 
 import java.io.Serializable;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.XmlAdapter;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
 
 /**
index b00e7db..37d3a9d 100644 (file)
@@ -28,7 +28,6 @@ import static org.junit.Assert.fail;
 import java.util.NavigableMap;
 import java.util.TreeMap;
 import java.util.TreeSet;
-
 import org.junit.Test;
 
 /**
@@ -47,10 +46,9 @@ public class AxConceptGetterImplTest {
         assertNull(getter.get(keyA));
         
         try {
-            getter.get((String)null);
+            getter.get((String) null);
             fail("test should throw an exception here");
-        }
-        catch (Exception getException) {
+        } catch (Exception getException) {
             assertEquals("conceptKeyName may not be null", getException.getMessage());
         }
 
@@ -72,15 +70,14 @@ public class AxConceptGetterImplTest {
         assertEquals(keyW002, getter.get("W"));
 
         try {
-            getter.get((String)null, "0.0.1");
+            getter.get((String) null, "0.0.1");
             fail("test should throw an exception here");
-        }
-        catch (Exception getException) {
+        } catch (Exception getException) {
             assertEquals("conceptKeyName may not be null", getException.getMessage());
         }
 
         assertEquals(keyW002, getter.get("W", "0.0.2"));
-        assertEquals(keyW002, getter.get("W", (String)null));
+        assertEquals(keyW002, getter.get("W", (String) null));
         
         assertEquals(new TreeSet<AxArtifactKey>(keyMap.values()), getter.getAll(null));
         assertEquals(new TreeSet<AxArtifactKey>(keyMap.values()), getter.getAll(null, null));
index ee14a06..0278f16 100644 (file)
@@ -28,11 +28,8 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import java.util.UUID;
-
 import org.junit.Test;
-import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
-import org.onap.policy.apex.model.basicmodel.concepts.AxKeyInfo;
-import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult;
+
 
 public class AxKeyInfoTest {
 
@@ -66,7 +63,7 @@ public class AxKeyInfoTest {
         assertTrue(testKeyInfo.equals(testKeyInfo));
         assertTrue(testKeyInfo.equals(clonedReferenceKey));
         assertFalse(testKeyInfo.equals(null));
-        assertFalse(testKeyInfo.equals((Object)new AxArtifactKey()));
+        assertFalse(testKeyInfo.equals((Object) new AxArtifactKey()));
         assertFalse(testKeyInfo.equals(new AxKeyInfo(new AxArtifactKey())));
         assertFalse(testKeyInfo.equals(new AxKeyInfo(key, UUID.randomUUID(), "Some Description")));
         assertFalse(testKeyInfo.equals(new AxKeyInfo(key, uuid, "Some Description")));
index 5929337..1467b77 100644 (file)
@@ -125,9 +125,9 @@ public class AxKeyTest {
         assertTrue(nullKey0.isNullKey());
         AxArtifactKey nullKey1 = new AxArtifactKey();
         assertTrue(nullKey1.isNullKey());
-        AxArtifactKey nullKey2 = new AxArtifactKey(AxKey.NULL_KEY_NAME,AxKey.NULL_KEY_VERSION);
+        AxArtifactKey nullKey2 = new AxArtifactKey(AxKey.NULL_KEY_NAME, AxKey.NULL_KEY_VERSION);
         assertTrue(nullKey2.isNullKey());
-        AxArtifactKey notnullKey = new AxArtifactKey("Blah",AxKey.NULL_KEY_VERSION);
+        AxArtifactKey notnullKey = new AxArtifactKey("Blah", AxKey.NULL_KEY_VERSION);
         assertFalse(notnullKey.isNullKey());
 
     }
index 061df61..55c444d 100644 (file)
@@ -28,11 +28,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
-import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKey.Compatibility;
-import org.onap.policy.apex.model.basicmodel.concepts.AxKeyUse;
-import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
-import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult;
 
 public class AxKeyUseTest {
 
@@ -68,7 +64,7 @@ public class AxKeyUseTest {
         
         assertTrue(keyUse.equals(keyUse));
         assertTrue(keyUse.equals(clonedKeyUse));
-        assertFalse(keyUse.equals((Object)"Hello"));
+        assertFalse(keyUse.equals((Object) "Hello"));
         assertTrue(keyUse.equals(new AxKeyUse(key)));
         
         assertEquals(0, keyUse.compareTo(keyUse));
index 2745b95..27973b5 100644 (file)
@@ -29,12 +29,8 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.lang.reflect.Field;
-
 import org.junit.Test;
-import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
-import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
-import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
-import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult;
+
 
 public class AxReferenceKeyTest {
 
@@ -93,7 +89,7 @@ public class AxReferenceKeyTest {
 
         assertTrue(testReferenceKey.equals(testReferenceKey));
         assertTrue(testReferenceKey.equals(clonedReferenceKey));
-        assertFalse(testReferenceKey.equals((Object)"Hello"));
+        assertFalse(testReferenceKey.equals((Object) "Hello"));
         assertFalse(testReferenceKey.equals(new AxReferenceKey("PKN", "0.0.2", "PLN", "LN")));
         assertFalse(testReferenceKey.equals(new AxReferenceKey("NPKN", "0.0.2", "PLN", "LN")));
         assertFalse(testReferenceKey.equals(new AxReferenceKey("NPKN", "0.0.1", "PLN", "LN")));
index ff2bf93..2407dab 100644 (file)
@@ -23,13 +23,11 @@ package org.onap.policy.apex.model.basicmodel.concepts;
 
 import java.util.Arrays;
 import java.util.List;
-
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
 import org.onap.policy.apex.model.basicmodel.xml.AxReferenceKeyAdapter;
 
 @Entity
index 0c62a03..ff87bc2 100644 (file)
@@ -24,12 +24,8 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import java.io.IOException;
-
 import org.junit.Test;
-import org.onap.policy.apex.model.basicmodel.concepts.ApexConceptException;
-import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
-import org.onap.policy.apex.model.basicmodel.concepts.ApexRuntimeException;
-import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
+
 
 public class ExceptionsTest {
 
index f2f99a8..21ae9b6 100644 (file)
@@ -26,10 +26,6 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
-import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
-import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
-import org.onap.policy.apex.model.basicmodel.concepts.AxValidationMessage;
-import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult;
 import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult.ValidationResult;
 
 public class ValidationTest {
index 197c4b2..2b4cd5c 100644 (file)
@@ -25,7 +25,6 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
 
 import java.util.Properties;
-
 import org.junit.Test;
 import org.onap.policy.apex.model.basicmodel.dao.converters.CDataConditioner;
 import org.onap.policy.apex.model.basicmodel.dao.converters.Uuid2String;
index 36b18d7..2c68c39 100644 (file)
@@ -31,7 +31,6 @@ import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.UUID;
-
 import org.junit.Test;
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
index c74f33c..2571ea6 100644 (file)
@@ -24,9 +24,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import java.io.IOException;
-
 import org.junit.Test;
-import org.onap.policy.apex.model.basicmodel.handling.ApexModelException;
 
 public class ApexModelExceptionTest {
 
index 7c0ccc7..d6ff31e 100644 (file)
@@ -25,11 +25,9 @@ import static org.junit.Assert.fail;
 
 import java.io.File;
 import java.io.IOException;
-
 import org.junit.Test;
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
 import org.onap.policy.apex.model.basicmodel.concepts.AxModel;
-import org.onap.policy.apex.model.basicmodel.handling.ApexModelFileWriter;
 
 public class ApexModelFileWriterTest {
 
@@ -82,16 +80,14 @@ public class ApexModelFileWriterTest {
         try {
             modelFileWriter.apexModelWriteJsonFile(model, AxModel.class, jsonTempFile.getAbsolutePath());
             fail("this test should throw an exception here");
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             assertTrue(e.getMessage().contains("could not create directory "));
         }
 
         try {
             modelFileWriter.apexModelWriteXmlFile(model, AxModel.class, jsonTempFile.getAbsolutePath());
             fail("this test should throw an exception here");
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             assertTrue(e.getMessage().contains("could not create directory "));
         }
 
@@ -108,16 +104,14 @@ public class ApexModelFileWriterTest {
         try {
             modelFileWriter.apexModelWriteJsonFile(model, AxModel.class, jsonTempFile.getAbsolutePath());
             fail("this test should throw an exception here");
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             assertTrue(e.getMessage().contains("error processing file "));
         }
 
         try {
             modelFileWriter.apexModelWriteXmlFile(model, AxModel.class, jsonTempFile.getAbsolutePath());
             fail("this test should throw an exception here");
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             assertTrue(e.getMessage().contains("error processing file "));
         }
 
index d560f62..7f2f813 100644 (file)
@@ -33,20 +33,16 @@ import java.io.FileInputStream;
 import java.io.FileReader;
 import java.io.IOException;
 import java.lang.reflect.Field;
-
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.PropertyException;
 import javax.xml.bind.Unmarshaller;
 import javax.xml.transform.stream.StreamSource;
-
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
 import org.onap.policy.apex.model.basicmodel.concepts.AxModel;
-import org.onap.policy.apex.model.basicmodel.handling.ApexModelReader;
-import org.onap.policy.apex.model.basicmodel.handling.ApexModelWriter;
 
 public class ApexModelReaderTest {
     @Mock
@@ -81,8 +77,7 @@ public class ApexModelReaderTest {
         try {
             modelReader.read(baisInvalid);
             fail("test should throw an exceptino here");
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             assertTrue(e.getMessage().startsWith("Apex concept validation failed"));
         }
         
@@ -107,8 +102,7 @@ public class ApexModelReaderTest {
         try {
             modelReader.read(baisDummy);
             fail("test should throw an exception here");
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             assertEquals("format of input for Apex concept is neither JSON nor XML", e.getMessage());
         }
         
@@ -116,8 +110,7 @@ public class ApexModelReaderTest {
             ByteArrayInputStream nullBais = null;
             modelReader.read(nullBais);
             fail("test should throw an exception here");
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             assertEquals("concept stream may not be null", e.getMessage());
         }
         
@@ -125,8 +118,7 @@ public class ApexModelReaderTest {
             FileInputStream fis = new FileInputStream(new File("somewhere/over/the/rainbow"));
             modelReader.read(fis);
             fail("test should throw an exception here");
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             assertTrue(e.getMessage().contains("rainbow"));
         }
         
@@ -136,11 +128,9 @@ public class ApexModelReaderTest {
             br.close();
             modelReader.read(br);
             fail("test should throw an exception here");
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             assertEquals("Unable to read Apex concept ", e.getMessage());
-        }
-        finally {
+        } finally {
             tempFile.delete();
         }
         
@@ -150,11 +140,9 @@ public class ApexModelReaderTest {
         try {
             modelReader.setSchema(tempFile.getCanonicalPath());
             fail("test should throw an exception here");
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             assertEquals("Unable to load schema", e.getMessage());
-        }
-        finally {
+        } finally {
             tempFile.delete();
         }
         
@@ -178,7 +166,7 @@ public class ApexModelReaderTest {
 
         try {
             Mockito.doThrow(new JAXBException("Exception marshalling to JSON")).when(unmarshallerMock)
-                .unmarshal((StreamSource)Mockito.anyObject(), Mockito.anyObject());
+                .unmarshal((StreamSource) Mockito.anyObject(), Mockito.anyObject());
 
             modelReader.read("{Hello}");
             fail("Test should throw an exception here");
index 6564091..21be883 100644 (file)
@@ -24,11 +24,9 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-
 import org.junit.Test;
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
 import org.onap.policy.apex.model.basicmodel.concepts.AxModel;
-import org.onap.policy.apex.model.basicmodel.handling.ApexModelSaver;
 
 public class ApexModelSaverTest {
 
index 22271dd..cad4e05 100644 (file)
@@ -26,12 +26,10 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.io.IOException;
-
 import org.junit.Test;
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKeyInfo;
 import org.onap.policy.apex.model.basicmodel.concepts.AxModel;
-import org.onap.policy.apex.model.basicmodel.handling.ApexModelStringWriter;
 
 public class ApexModelStringWriterTest {
 
@@ -61,32 +59,28 @@ public class ApexModelStringWriterTest {
         try {
             stringWriter.writeString(null, AxKeyInfo.class, true);
             fail("test should thrown an exception here");
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             assertEquals("concept may not be null", e.getMessage());
         }
         
         try {
             stringWriter.writeString(null, AxKeyInfo.class, false);
             fail("test should thrown an exception here");
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             assertEquals("concept may not be null", e.getMessage());
         }
         
         try {
             stringWriter.writeJsonString(null, AxKeyInfo.class);
             fail("test should thrown an exception here");
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             assertEquals("error writing JSON string", e.getMessage());
         }
         
         try {
             stringWriter.writeXmlString(null, AxKeyInfo.class);
             fail("test should thrown an exception here");
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             assertEquals("error writing XML string", e.getMessage());
         }
         
index d25e191..1b8461c 100644 (file)
@@ -29,18 +29,15 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.Writer;
 import java.lang.reflect.Field;
-
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.PropertyException;
-
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
 import org.onap.policy.apex.model.basicmodel.concepts.AxModel;
-import org.onap.policy.apex.model.basicmodel.handling.ApexModelWriter;
 import org.w3c.dom.Document;
 
 public class ApexModelWriterTest {
@@ -159,7 +156,7 @@ public class ApexModelWriterTest {
             AxModel model = new DummyApexBasicModelCreator().getModel();
 
             Mockito.doThrow(new JAXBException("Exception marshalling to JSON")).when(marshallerMock)
-                .marshal((AxModel)Mockito.anyObject(), (Writer)Mockito.anyObject());
+                .marshal((AxModel) Mockito.anyObject(), (Writer) Mockito.anyObject());
 
             modelWriter.write(model, baos);
             fail("Test should throw an exception here");
@@ -192,7 +189,7 @@ public class ApexModelWriterTest {
             AxModel model = new DummyApexBasicModelCreator().getModel();
 
             Mockito.doThrow(new JAXBException("Exception marshalling to JSON")).when(marshallerMock)
-                .marshal((AxModel)Mockito.anyObject(), (Document)Mockito.anyObject());
+                .marshal((AxModel) Mockito.anyObject(), (Document) Mockito.anyObject());
 
             modelWriter.write(model, baos);
             fail("Test should throw an exception here");
index d04d3a4..353722b 100644 (file)
@@ -21,7 +21,6 @@
 package org.onap.policy.apex.model.basicmodel.handling;
 
 import java.util.UUID;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKeyInfo;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKeyInformation;
index e0fe603..887755d 100644 (file)
@@ -22,7 +22,6 @@ package org.onap.policy.apex.model.basicmodel.handling;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxModel;
@@ -56,7 +55,7 @@ public class DummyAxModelWithReferences extends AxModel {
         List<AxKey> keys = super.getKeys();
         
         for (AxKey key: keys) {
-            AxArtifactKey akey = (AxArtifactKey)key;
+            AxArtifactKey akey = (AxArtifactKey) key;
             AxReferenceKey keyRef = new AxReferenceKey(akey, akey.getName());
             extrakeyList.add(keyRef);
         }
index af0ef5f..c666dd6 100644 (file)
@@ -29,7 +29,6 @@ import static org.junit.Assert.assertTrue;
 
 import java.util.List;
 import java.util.Set;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
@@ -74,7 +73,7 @@ public class SupportApexBasicModelConceptsTester {
         assertTrue(model.equals(model));
         assertTrue(model.equals(clonedModel));
         assertFalse(model.equals(null));
-        assertFalse(model.equals((Object)"Hello"));
+        assertFalse(model.equals((Object) "Hello"));
         clonedModel.getKey().setVersion("0.0.2");
         assertFalse(model.equals(clonedModel));
         clonedModel.getKey().setVersion("0.0.1");
@@ -96,7 +95,7 @@ public class SupportApexBasicModelConceptsTester {
         final AxKeyInformation clonedKeyI = new AxKeyInformation(keyI);
 
         assertFalse(keyI.equals(null));
-        assertFalse(keyI.equals((Object)new AxArtifactKey()));
+        assertFalse(keyI.equals((Object) new AxArtifactKey()));
         assertTrue(keyI.equals(clonedKeyI));
 
         clonedKeyI.setKey(new AxArtifactKey());
index 123125b..9ad34a3 100644 (file)
@@ -21,7 +21,6 @@
 package org.onap.policy.apex.model.basicmodel.handling;
 
 import java.util.UUID;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKeyInfo;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKeyInformation;
index bed65c6..2120b98 100644 (file)
@@ -28,14 +28,11 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.UUID;
-
 import org.junit.Test;
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKeyInfo;
 import org.onap.policy.apex.model.basicmodel.concepts.AxModel;
-import org.onap.policy.apex.model.basicmodel.handling.ApexModelFileWriter;
-import org.onap.policy.apex.model.basicmodel.handling.ApexModelReader;
 
 public class SupportConceptGetterTester {
 
index 2befe33..12a67c8 100644 (file)
@@ -25,7 +25,6 @@ import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
-import org.onap.policy.apex.model.basicmodel.xml.AxReferenceKeyAdapter;
 
 public class AxReferenceKeyAdapterTest {
 
@@ -38,6 +37,6 @@ public class AxReferenceKeyAdapterTest {
         
         String rkeyString = arka.marshal(rkey);
         assertEquals("LN", rkeyString);
-        assertEquals(rkey.getLocalName(),arka.unmarshal(rkeyString).getLocalName());
+        assertEquals(rkey.getLocalName(), arka.unmarshal(rkeyString).getLocalName());
     }
 }
index cbd923b..a28fbf6 100644 (file)
@@ -27,7 +27,6 @@ import java.util.Map.Entry;
 import java.util.NavigableMap;
 import java.util.Set;
 import java.util.TreeMap;
-
 import javax.persistence.CascadeType;
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
@@ -40,7 +39,6 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxConcept;
 import org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter;
index 1762960..4ddfb71 100644 (file)
@@ -22,7 +22,6 @@
 package org.onap.policy.apex.model.contextmodel.concepts;
 
 import java.util.List;
-
 import javax.persistence.Column;
 import javax.persistence.Convert;
 import javax.persistence.EmbeddedId;
@@ -34,7 +33,6 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxConcept;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
index 5bd0c1f..a0f0314 100644 (file)
@@ -27,7 +27,6 @@ import java.util.Map.Entry;
 import java.util.NavigableMap;
 import java.util.Set;
 import java.util.TreeMap;
-
 import javax.persistence.CascadeType;
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
@@ -40,7 +39,6 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxConcept;
 import org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter;
index d0d994a..597aa39 100644 (file)
@@ -32,8 +32,6 @@ import org.junit.Test;
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult;
 import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult.ValidationResult;
-import org.onap.policy.apex.model.contextmodel.concepts.AxContextAlbum;
-import org.onap.policy.apex.model.contextmodel.concepts.AxContextAlbums;
 
 /**
  * Context album tests.
@@ -126,7 +124,7 @@ public class ContextAlbumsTest {
         assertTrue(album.equals(album));
         assertTrue(album.equals(clonedAlbum));
         assertFalse(album.equals(null));
-        assertFalse(album.equals((Object)"Hello"));
+        assertFalse(album.equals((Object) "Hello"));
         assertFalse(album.equals(new AxContextAlbum(new AxArtifactKey(), "Scope", false, AxArtifactKey.getNullKey())));
         assertFalse(album.equals(new AxContextAlbum(newKey, "Scope", false, AxArtifactKey.getNullKey())));
         assertFalse(album.equals(new AxContextAlbum(newKey, "NewAlbumScope", false, AxArtifactKey.getNullKey())));
@@ -193,7 +191,7 @@ public class ContextAlbumsTest {
         assertTrue(albums.equals(albums));
         assertTrue(albums.equals(clonedAlbums));
         assertFalse(albums.equals(null));
-        assertFalse(albums.equals((Object)"Hello"));
+        assertFalse(albums.equals((Object) "Hello"));
         assertFalse(albums.equals(new AxContextAlbums(new AxArtifactKey())));
 
         assertEquals(0, albums.compareTo(albums));
index d2a4bc5..cac922c 100644 (file)
@@ -30,9 +30,6 @@ import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKeyInformation;
-import org.onap.policy.apex.model.contextmodel.concepts.AxContextAlbums;
-import org.onap.policy.apex.model.contextmodel.concepts.AxContextModel;
-import org.onap.policy.apex.model.contextmodel.concepts.AxContextSchemas;
 
 /**
  * Context model tests.
@@ -67,7 +64,7 @@ public class ContextModelTest {
 
         assertTrue(model.equals(model));
         assertTrue(model.equals(clonedModel));
-        assertFalse(model.equals((Object)"Hello"));
+        assertFalse(model.equals((Object) "Hello"));
         assertFalse(model.equals(new AxContextModel(new AxArtifactKey())));
         assertFalse(model.equals(new AxContextModel(new AxArtifactKey(), new AxContextSchemas(), new AxContextAlbums(),
                         new AxKeyInformation())));
index 73f4c30..d72806a 100644 (file)
@@ -31,8 +31,6 @@ import org.junit.Test;
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult;
 import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult.ValidationResult;
-import org.onap.policy.apex.model.contextmodel.concepts.AxContextSchema;
-import org.onap.policy.apex.model.contextmodel.concepts.AxContextSchemas;
 
 /**
  * Context schema tests.
index 81609ca..53e43a8 100644 (file)
@@ -29,7 +29,6 @@ import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.contextmodel.concepts.AxContextAlbum;
 import org.onap.policy.apex.model.contextmodel.concepts.AxContextModel;
 import org.onap.policy.apex.model.contextmodel.concepts.AxContextSchema;
-import org.onap.policy.apex.model.contextmodel.handling.ContextComparer;
 import org.onap.policy.apex.model.utilities.comparison.KeyedMapDifference;
 
 /**
index 4e8d8d5..3fe7e3a 100644 (file)
@@ -21,7 +21,6 @@
 package org.onap.policy.apex.model.contextmodel.handling;
 
 import java.util.UUID;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKeyInfo;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKeyInformation;
index 79c5d89..3524f12 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.apex.model.enginemodel.concepts;
 
 import java.text.SimpleDateFormat;
 import java.util.List;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Enumerated;
@@ -35,7 +34,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxConcept;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
index db6209a..9165259 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.apex.model.enginemodel.concepts;
 
 import java.text.SimpleDateFormat;
 import java.util.List;
-
 import javax.persistence.Column;
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
@@ -34,9 +33,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-
 import lombok.Getter;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxConcept;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
index fe834b4..d0694ec 100644 (file)
@@ -116,7 +116,7 @@ public class EngineModelTest {
 
         assertTrue(model.equals(model));
         assertTrue(model.equals(clonedModel));
-        assertFalse(model.equals((Object)"Hello"));
+        assertFalse(model.equals((Object) "Hello"));
         assertFalse(model.equals(new AxEngineModel(new AxArtifactKey())));
         assertFalse(model.equals(new AxEngineModel(new AxArtifactKey(), new AxContextSchemas(schemasKey),
                 new AxKeyInformation(keyInfoKey), new AxContextAlbums(albumKey), AxEngineState.READY, stats)));
index fa79f89..9e7d99b 100644 (file)
@@ -21,7 +21,6 @@
 package org.onap.policy.apex.model.enginemodel.handling;
 
 import java.util.UUID;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKeyInfo;
 import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
index 5a7550c..26e21ae 100644 (file)
@@ -28,7 +28,6 @@ import java.util.Set;
 import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.TreeSet;
-
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.EmbeddedId;
@@ -41,7 +40,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxConcept;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
index 6c8ce15..f4938dc 100644 (file)
@@ -22,7 +22,6 @@
 package org.onap.policy.apex.model.eventmodel.concepts;
 
 import java.util.List;
-
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
@@ -34,7 +33,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxConcept;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
index 3d0d9b7..2df7dee 100644 (file)
@@ -27,7 +27,6 @@ import java.util.Map.Entry;
 import java.util.NavigableMap;
 import java.util.Set;
 import java.util.TreeMap;
-
 import javax.persistence.CascadeType;
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
@@ -40,7 +39,6 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxConcept;
 import org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter;
index c3f9d33..a1d6a8b 100644 (file)
@@ -22,7 +22,6 @@
 package org.onap.policy.apex.model.eventmodel.concepts;
 
 import java.util.List;
-
 import javax.persistence.AttributeOverride;
 import javax.persistence.AttributeOverrides;
 import javax.persistence.Column;
@@ -38,7 +37,6 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxConcept;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
index 99d3772..3ae5ac2 100644 (file)
@@ -31,8 +31,6 @@ import org.junit.Test;
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKeyInformation;
 import org.onap.policy.apex.model.contextmodel.concepts.AxContextSchemas;
-import org.onap.policy.apex.model.eventmodel.concepts.AxEventModel;
-import org.onap.policy.apex.model.eventmodel.concepts.AxEvents;
 
 /**
  * Test event models.
@@ -65,7 +63,7 @@ public class EventModelTest {
 
         assertTrue(model.equals(model));
         assertTrue(model.equals(clonedModel));
-        assertFalse(model.equals((Object)"Hello"));
+        assertFalse(model.equals((Object) "Hello"));
         assertFalse(model.equals(new AxEventModel(new AxArtifactKey())));
         assertFalse(model.equals(new AxEventModel(modelKey, new AxContextSchemas(), new AxKeyInformation(keyInfoKey),
                 new AxEvents(eventsKey))));
index b9b643e..a82be12 100644 (file)
@@ -29,16 +29,12 @@ import static org.junit.Assert.assertTrue;
 
 import java.util.TreeMap;
 import java.util.TreeSet;
-
 import org.junit.Test;
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult;
 import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult.ValidationResult;
-import org.onap.policy.apex.model.eventmodel.concepts.AxEvent;
-import org.onap.policy.apex.model.eventmodel.concepts.AxEvents;
-import org.onap.policy.apex.model.eventmodel.concepts.AxField;
 
 /**
  * Test events.
@@ -195,7 +191,7 @@ public class EventsTest {
         assertTrue(event.equals(event));
         assertTrue(event.equals(clonedEvent));
         assertFalse(event.equals(null));
-        assertFalse(event.equals((Object)"Hello"));
+        assertFalse(event.equals((Object) "Hello"));
         assertFalse(
                 event.equals(new AxEvent(AxArtifactKey.getNullKey(), "namespace", "source", "target", parameterMap)));
         assertFalse(event.equals(new AxEvent(eventKey, "namespace1", "source", "target", parameterMap)));
@@ -278,7 +274,7 @@ public class EventsTest {
         assertTrue(events.equals(events));
         assertTrue(events.equals(clonedEvents));
         assertFalse(events.equals(null));
-        assertFalse(events.equals((Object)"Hello"));
+        assertFalse(events.equals((Object) "Hello"));
         assertFalse(events.equals(new AxEvents(new AxArtifactKey())));
 
         assertEquals(0, events.compareTo(events));
index fe3c9e6..a2587b5 100644 (file)
@@ -32,9 +32,6 @@ import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult;
 import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult.ValidationResult;
-import org.onap.policy.apex.model.eventmodel.concepts.AxField;
-import org.onap.policy.apex.model.eventmodel.concepts.AxInputField;
-import org.onap.policy.apex.model.eventmodel.concepts.AxOutputField;
 
 /**
  * Test fields.
@@ -118,7 +115,7 @@ public class FieldTest {
         assertTrue(field.equals(field));
         assertTrue(field.equals(clonedField));
         assertFalse(field.equals(null));
-        assertFalse(field.equals((Object)"Hello"));
+        assertFalse(field.equals((Object) "Hello"));
         assertFalse(field.equals(new AxField(AxReferenceKey.getNullKey(), AxArtifactKey.getNullKey(), false)));
         assertFalse(field.equals(new AxField(fieldKey, AxArtifactKey.getNullKey(), false)));
         assertFalse(field.equals(new AxField(fieldKey, schemaKey, false)));
index 65bd84a..7d69ff5 100644 (file)
@@ -24,7 +24,6 @@ import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
index cdbe623..655bd6a 100644 (file)
@@ -23,7 +23,6 @@
 package org.onap.policy.apex.model.modelapi.impl;
 
 import java.util.Properties;
-
 import org.onap.policy.apex.model.basicmodel.dao.DaoParameters;
 import org.onap.policy.apex.model.modelapi.ApexApiResult;
 import org.onap.policy.apex.model.modelapi.ApexModel;
index dfc29b3..826fb92 100644 (file)
@@ -24,7 +24,6 @@ package org.onap.policy.apex.model.modelapi.impl;
 
 import java.util.Properties;
 import java.util.Set;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult;
 import org.onap.policy.apex.model.basicmodel.handling.ApexModelStringWriter;
index 8b479eb..00156c5 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.apex.model.modelapi.impl;
 
 import java.util.Properties;
 import java.util.Set;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult;
 import org.onap.policy.apex.model.basicmodel.handling.ApexModelStringWriter;
index 8df43f9..0a75840 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.apex.model.modelapi.impl;
 
 import java.util.Properties;
 import java.util.Set;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult;
index 7cbcfc7..82fc86a 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.apex.model.modelapi.impl;
 import java.util.Properties;
 import java.util.Set;
 import java.util.UUID;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKeyInfo;
 import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult;
index cba7201..2adf990 100644 (file)
@@ -22,7 +22,6 @@
 package org.onap.policy.apex.model.modelapi.impl;
 
 import java.util.Properties;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.handling.ApexModelStringWriter;
 import org.onap.policy.apex.model.modelapi.ApexApiResult;
@@ -193,12 +192,12 @@ public class ModelFacade {
      */
     public ApexApiResult deleteModel() {
         // @formatter:off
-        apexModel.getPolicyModel().getSchemas()       .getSchemasMap() .clear();
-        apexModel.getPolicyModel().getEvents()        .getEventMap()   .clear();
-        apexModel.getPolicyModel().getAlbums()        .getAlbumsMap()  .clear();
-        apexModel.getPolicyModel().getTasks()         .getTaskMap()    .clear();
-        apexModel.getPolicyModel().getPolicies()      .getPolicyMap()  .clear();
-        apexModel.getPolicyModel().getKeyInformation().getKeyInfoMap() .clear();
+        apexModel.getPolicyModel().getSchemas().getSchemasMap().clear();
+        apexModel.getPolicyModel().getEvents().getEventMap().clear();
+        apexModel.getPolicyModel().getAlbums().getAlbumsMap().clear();
+        apexModel.getPolicyModel().getTasks().getTaskMap().clear();
+        apexModel.getPolicyModel().getPolicies().getPolicyMap().clear();
+        apexModel.getPolicyModel().getKeyInformation().getKeyInfoMap().clear();
         // @formatter:on
 
         apexModel.setPolicyModel(new AxPolicyModel());
index 8acf3fc..5e5d39c 100644 (file)
@@ -33,7 +33,6 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Properties;
 import java.util.Set;
-
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
 import org.onap.policy.apex.model.basicmodel.concepts.ApexRuntimeException;
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
@@ -198,9 +197,8 @@ public class ModelHandlerFacade {
                     return new ApexApiResult(ApexApiResult.Result.FAILED, "no policy model with name " + modelName
                             + " and version " + modelVersion + FOUND_IN_DATABASE);
                 }
-            }
-            // Fishing expedition
-            else {
+            } else {
+                // Fishing expedition
                 return searchInDatabase(modelName, apexDao, apexModel);
             }
         } catch (ApexException | ApexRuntimeException e) {
index b600b15..0c0a516 100644 (file)
@@ -26,7 +26,6 @@ import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.Set;
 import java.util.TreeSet;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
index 3632e76..a6f4a87 100644 (file)
@@ -24,7 +24,6 @@ package org.onap.policy.apex.model.modelapi.impl;
 import java.util.Properties;
 import java.util.Set;
 import java.util.TreeSet;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
index 43a9fa4..3c2af18 100644 (file)
@@ -27,7 +27,6 @@ import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 import java.util.Arrays;
-
 import org.junit.Test;
 import org.onap.policy.apex.model.modelapi.ApexApiResult.Result;
 
index e6d948f..f8d7fd6 100644 (file)
@@ -32,7 +32,6 @@ import java.io.IOException;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.util.UUID;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
index d5b8456..ac8f260 100644 (file)
@@ -26,7 +26,6 @@ import static org.junit.Assert.fail;
 
 import java.util.Properties;
 import java.util.UUID;
-
 import org.junit.Test;
 import org.onap.policy.apex.model.modelapi.impl.ModelFacade;
 
index cfbf1be..a34b4f4 100644 (file)
@@ -28,7 +28,6 @@ import static org.junit.Assert.fail;
 import java.io.File;
 import java.io.IOException;
 import java.util.Properties;
-
 import org.junit.Test;
 import org.onap.policy.apex.model.basicmodel.dao.DaoParameters;
 import org.onap.policy.apex.model.modelapi.impl.ModelHandlerFacade;
index f7680a7..64aeb37 100644 (file)
@@ -22,7 +22,6 @@
 package org.onap.policy.apex.model.policymodel.concepts;
 
 import java.util.List;
-
 import javax.persistence.Column;
 import javax.persistence.Convert;
 import javax.persistence.EmbeddedId;
@@ -36,7 +35,6 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxConcept;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
index d6a7efb..f3e89a4 100644 (file)
@@ -27,7 +27,6 @@ import java.util.Map.Entry;
 import java.util.NavigableMap;
 import java.util.Set;
 import java.util.TreeMap;
-
 import javax.persistence.CascadeType;
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
@@ -40,7 +39,6 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxConcept;
 import org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter;
index 8157d91..502ec3a 100644 (file)
@@ -27,7 +27,6 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
-
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.EmbeddedId;
@@ -41,7 +40,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxConcept;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
index 3ad08a1..7b7dba8 100644 (file)
@@ -140,7 +140,7 @@ public class AxPolicyModel extends AxModel {
     @OneToOne(cascade = CascadeType.ALL)
     @JoinColumns({@JoinColumn(name = "albumsName", referencedColumnName = "name"),
             @JoinColumn(name = "albumsVersion", referencedColumnName = "version")})
-    @XmlElement(name = "albums", required = false )
+    @XmlElement(name = "albums", required = false)
     @XmlJavaTypeAdapter(EmptyAlbumsAdapter.class)
     private AxContextAlbums albums;
 
index f94cb2e..713e4de 100644 (file)
@@ -28,7 +28,6 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
-
 import javax.persistence.AttributeOverride;
 import javax.persistence.AttributeOverrides;
 import javax.persistence.CascadeType;
@@ -49,7 +48,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxConcept;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
index d8ab0ce..0b5d975 100644 (file)
@@ -28,7 +28,6 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
 
 /**
index 34c8f2f..87caf03 100644 (file)
@@ -22,7 +22,6 @@
 package org.onap.policy.apex.model.policymodel.concepts;
 
 import java.util.List;
-
 import javax.persistence.AttributeOverride;
 import javax.persistence.AttributeOverrides;
 import javax.persistence.Column;
@@ -35,7 +34,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxConcept;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
index 3f5e4e8..6ef6e0b 100644 (file)
@@ -22,7 +22,6 @@ package org.onap.policy.apex.model.policymodel.concepts;
 
 import java.util.Map;
 import java.util.Set;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
 
index 748abdb..a3cb9e6 100644 (file)
@@ -22,7 +22,6 @@
 package org.onap.policy.apex.model.policymodel.concepts;
 
 import java.util.List;
-
 import javax.persistence.AttributeOverride;
 import javax.persistence.AttributeOverrides;
 import javax.persistence.Column;
@@ -36,7 +35,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxConcept;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
index e3120db..cd21742 100644 (file)
@@ -26,7 +26,6 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
 import org.onap.policy.common.utils.validation.Assertions;
 
index 31545b3..a0aa705 100644 (file)
@@ -27,7 +27,6 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
-
 import javax.persistence.CascadeType;
 import javax.persistence.CollectionTable;
 import javax.persistence.ElementCollection;
@@ -43,7 +42,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxConcept;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
index 30f37ff..70b19ec 100644 (file)
@@ -28,7 +28,6 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
 
index 95b8ff0..47c62e6 100644 (file)
@@ -22,7 +22,6 @@
 package org.onap.policy.apex.model.policymodel.concepts;
 
 import java.util.List;
-
 import javax.persistence.Column;
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
@@ -32,7 +31,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxConcept;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
index 32d8ef3..5d6441a 100644 (file)
@@ -28,7 +28,6 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
 
 /**
index b53159c..4d9dd20 100644 (file)
@@ -27,7 +27,6 @@ import java.util.Map.Entry;
 import java.util.NavigableMap;
 import java.util.Set;
 import java.util.TreeMap;
-
 import javax.persistence.CascadeType;
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
@@ -40,7 +39,6 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxConcept;
 import org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter;
index d40e66e..4d076cf 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.apex.model.policymodel.handling;
 
 import java.util.Map.Entry;
 import java.util.Set;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
 import org.onap.policy.apex.model.contextmodel.concepts.AxContextAlbum;
index a5fbc09..7da262c 100644 (file)
@@ -25,7 +25,6 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
 import org.onap.policy.apex.model.contextmodel.concepts.AxContextAlbum;
index b11158c..1f1c27a 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.apex.model.policymodel.handling;
 import java.util.Collection;
 import java.util.Set;
 import java.util.TreeSet;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult;
 import org.onap.policy.apex.model.basicmodel.handling.ApexModelException;
index 422f923..42f2fc7 100644 (file)
@@ -20,7 +20,6 @@
 
 package org.onap.policy.apex.model.policymodel.concepts;
 
-import org.onap.policy.apex.model.policymodel.concepts.AxLogic;
 import org.onap.policy.apex.model.policymodel.concepts.AxLogicReader;
 
 public class DummyLogicReader implements AxLogicReader {
index 70c79a1..0afb48b 100644 (file)
@@ -24,10 +24,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import java.io.IOException;
-
 import org.junit.Test;
-import org.onap.policy.apex.model.policymodel.concepts.PolicyException;
-import org.onap.policy.apex.model.policymodel.concepts.PolicyRuntimeException;
 
 /**
  * Test model exceptions.
index f9f4248..d3d5334 100644 (file)
@@ -33,10 +33,6 @@ import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult;
 import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult.ValidationResult;
-import org.onap.policy.apex.model.policymodel.concepts.AxLogic;
-import org.onap.policy.apex.model.policymodel.concepts.AxStateFinalizerLogic;
-import org.onap.policy.apex.model.policymodel.concepts.AxTaskLogic;
-import org.onap.policy.apex.model.policymodel.concepts.AxTaskSelectionLogic;
 
 /**
  * Test apex logic.
@@ -163,7 +159,7 @@ public class LogicTest {
         assertTrue(logic.equals(logic));
         assertTrue(logic.equals(clonedLogic));
         assertFalse(logic.equals(null));
-        assertFalse(logic.equals((Object)"Hello"));
+        assertFalse(logic.equals((Object) "Hello"));
         assertFalse(logic.equals(new AxLogic(AxReferenceKey.getNullKey(), "LogicFlavour", "Logic")));
         assertFalse(logic.equals(new AxLogic(logicKey, "AnotherLogicFlavour", "Logic")));
         assertFalse(logic.equals(new AxLogic(logicKey, "LogicFlavour", "AnotherLogic")));
index 1974413..28121fc 100644 (file)
@@ -30,18 +30,12 @@ import static org.junit.Assert.fail;
 
 import java.util.Map;
 import java.util.TreeMap;
-
 import org.junit.Test;
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult;
 import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult.ValidationResult;
-import org.onap.policy.apex.model.policymodel.concepts.AxPolicies;
-import org.onap.policy.apex.model.policymodel.concepts.AxPolicy;
-import org.onap.policy.apex.model.policymodel.concepts.AxState;
-import org.onap.policy.apex.model.policymodel.concepts.AxStateOutput;
-import org.onap.policy.apex.model.policymodel.concepts.AxStateTree;
 import org.onap.policy.apex.model.policymodel.handling.SupportApexPolicyModelCreator;
 
 /**
@@ -241,7 +235,7 @@ public class PoliciesTest {
         assertTrue(policy.equals(policy));
         assertTrue(policy.equals(clonedPolicy));
         assertFalse(policy.equals(null));
-        assertFalse(policy.equals((Object)"Hello"));
+        assertFalse(policy.equals((Object) "Hello"));
         assertFalse(policy.equals(
                         new AxPolicy(AxArtifactKey.getNullKey(), savedTemplate, savedStateMap, savedFirstState)));
         assertFalse(policy.equals(new AxPolicy(savedPolicyKey, "SomeTemplate", savedStateMap, savedFirstState)));
@@ -325,7 +319,7 @@ public class PoliciesTest {
         assertTrue(policies.equals(policies));
         assertTrue(policies.equals(clonedPolicies));
         assertFalse(policies.equals(null));
-        assertFalse(policies.equals((Object)"Hello"));
+        assertFalse(policies.equals((Object) "Hello"));
         assertFalse(policies.equals(new AxPolicies(new AxArtifactKey())));
 
         assertEquals(0, policies.compareTo(policies));
index d2c6b1b..820f2d1 100644 (file)
@@ -40,13 +40,6 @@ import org.onap.policy.apex.model.eventmodel.concepts.AxEvents;
 import org.onap.policy.apex.model.eventmodel.concepts.AxField;
 import org.onap.policy.apex.model.eventmodel.concepts.AxInputField;
 import org.onap.policy.apex.model.eventmodel.concepts.AxOutputField;
-import org.onap.policy.apex.model.policymodel.concepts.AxPolicies;
-import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel;
-import org.onap.policy.apex.model.policymodel.concepts.AxStateOutput;
-import org.onap.policy.apex.model.policymodel.concepts.AxStateTaskOutputType;
-import org.onap.policy.apex.model.policymodel.concepts.AxStateTaskReference;
-import org.onap.policy.apex.model.policymodel.concepts.AxTaskSelectionLogic;
-import org.onap.policy.apex.model.policymodel.concepts.AxTasks;
 import org.onap.policy.apex.model.policymodel.handling.SupportApexPolicyModelCreator;
 
 /**
@@ -90,7 +83,7 @@ public class PolicyModelTest {
 
         assertTrue(model.equals(model));
         assertTrue(model.equals(clonedModel));
-        assertFalse(model.equals((Object)"Hello"));
+        assertFalse(model.equals((Object) "Hello"));
         assertFalse(model.equals(new AxPolicyModel(new AxArtifactKey())));
         assertFalse(model.equals(new AxPolicyModel(AxArtifactKey.getNullKey(), new AxContextSchemas(schemasKey),
                         new AxKeyInformation(keyInfoKey), new AxEvents(eventsKey), new AxContextAlbums(albumsKey),
index 7d1826b..307a746 100644 (file)
@@ -33,7 +33,6 @@ import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult;
 import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult.ValidationResult;
-import org.onap.policy.apex.model.policymodel.concepts.AxStateOutput;
 
 /**
  * Test state outputs.
@@ -120,7 +119,7 @@ public class StateOutputTest {
         assertTrue(so.equals(so));
         assertTrue(so.equals(clonedPar));
         assertFalse(so.equals(null));
-        assertFalse(so.equals((Object)"Hello"));
+        assertFalse(so.equals((Object) "Hello"));
         assertFalse(so.equals(new AxStateOutput(AxReferenceKey.getNullKey(), eKey, nsKey)));
         assertFalse(so.equals(new AxStateOutput(soKey, new AxArtifactKey(), nsKey)));
         assertFalse(so.equals(new AxStateOutput(soKey, eKey, new AxReferenceKey())));
index b37d490..87e8961 100644 (file)
@@ -33,8 +33,6 @@ import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult;
 import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult.ValidationResult;
-import org.onap.policy.apex.model.policymodel.concepts.AxStateTaskOutputType;
-import org.onap.policy.apex.model.policymodel.concepts.AxStateTaskReference;
 
 /**
  * Test state task references.
@@ -136,7 +134,7 @@ public class StateTaskReferenceTest {
         assertTrue(stRef.equals(stRef));
         assertTrue(stRef.equals(clonedStRef));
         assertFalse(stRef.equals(null));
-        assertFalse(stRef.equals((Object)"Hello"));
+        assertFalse(stRef.equals((Object) "Hello"));
         assertFalse(stRef.equals(
                         new AxStateTaskReference(AxReferenceKey.getNullKey(), AxStateTaskOutputType.LOGIC, soKey)));
         assertFalse(stRef.equals(new AxStateTaskReference(stRefKey, AxStateTaskOutputType.DIRECT, soKey)));
index 1f71e9e..adcc040 100644 (file)
@@ -30,7 +30,6 @@ import static org.junit.Assert.fail;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
-
 import org.junit.Test;
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
@@ -429,7 +428,7 @@ public class StateTest {
         assertTrue(state.equals(state));
         assertTrue(state.equals(clonedState));
         assertFalse(state.equals(null));
-        assertFalse(state.equals((Object)"Hello"));
+        assertFalse(state.equals((Object) "Hello"));
         assertFalse(state.equals(new AxState(new AxStateParamsBuilder().key(new AxReferenceKey()).trigger(triggerKey)
                         .stateOutputs(soMap).contextAlbumReferenceSet(ctxtSet).taskSelectionLogic(tsl)
                         .stateFinalizerLogicMap(sflMap).defaultTask(defTaskKey).taskReferenceMap(trMap))));
index fe05972..0fc08d4 100644 (file)
@@ -33,7 +33,6 @@ import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult;
 import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult.ValidationResult;
-import org.onap.policy.apex.model.policymodel.concepts.AxTaskParameter;
 
 /**
  * Test task parameters.
@@ -100,7 +99,7 @@ public class TaskParameterTest {
         assertTrue(par.equals(par));
         assertTrue(par.equals(clonedPar));
         assertFalse(par.equals(null));
-        assertFalse(par.equals((Object)"Hello"));
+        assertFalse(par.equals((Object) "Hello"));
         assertFalse(par.equals(new AxTaskParameter(AxReferenceKey.getNullKey(), "DefaultValue")));
         assertFalse(par.equals(new AxTaskParameter(parKey, "OtherDefaultValue")));
         assertTrue(par.equals(new AxTaskParameter(parKey, "DefaultValue")));
index 1041d42..9089e18 100644 (file)
@@ -29,7 +29,6 @@ import static org.junit.Assert.assertTrue;
 
 import java.util.TreeMap;
 import java.util.TreeSet;
-
 import org.junit.Test;
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
@@ -38,10 +37,6 @@ import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult.Validat
 import org.onap.policy.apex.model.eventmodel.concepts.AxField;
 import org.onap.policy.apex.model.eventmodel.concepts.AxInputField;
 import org.onap.policy.apex.model.eventmodel.concepts.AxOutputField;
-import org.onap.policy.apex.model.policymodel.concepts.AxTask;
-import org.onap.policy.apex.model.policymodel.concepts.AxTaskLogic;
-import org.onap.policy.apex.model.policymodel.concepts.AxTaskParameter;
-import org.onap.policy.apex.model.policymodel.concepts.AxTasks;
 
 /**
  * Test policy tasks.
@@ -229,7 +224,7 @@ public class TasksTest {
         assertTrue(task.equals(task));
         assertTrue(task.equals(clonedTask));
         assertFalse(task.equals(null));
-        assertFalse(task.equals((Object)"Hello"));
+        assertFalse(task.equals((Object) "Hello"));
         assertFalse(task.equals(new AxTask(new AxArtifactKey(), ifMap, ofMap, tpMap, ctxtSet, tl)));
         assertFalse(task.equals(new AxTask(taskKey, ifEmptyMap, ofMap, tpMap, ctxtSet, tl)));
         assertFalse(task.equals(new AxTask(taskKey, ifMap, ofEmptyMap, tpMap, ctxtSet, tl)));
@@ -312,7 +307,7 @@ public class TasksTest {
         assertTrue(tasks.equals(tasks));
         assertTrue(tasks.equals(clonedTasks));
         assertFalse(tasks.equals(null));
-        assertFalse(tasks.equals((Object)"Hello"));
+        assertFalse(tasks.equals((Object) "Hello"));
         assertFalse(tasks.equals(new AxTasks(new AxArtifactKey())));
 
         assertEquals(0, tasks.compareTo(tasks));
index d4ab6bd..046f5af 100644 (file)
@@ -25,8 +25,6 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel;
-import org.onap.policy.apex.model.policymodel.handling.PolicyAnalyser;
-import org.onap.policy.apex.model.policymodel.handling.PolicyAnalysisResult;
 
 public class PolicyAnalyserTest {
     @Test
index 23f9d38..ebb6d97 100644 (file)
@@ -28,7 +28,6 @@ import org.junit.Test;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
 import org.onap.policy.apex.model.policymodel.concepts.AxLogic;
-import org.onap.policy.apex.model.policymodel.handling.PolicyLogicReader;
 
 /**
  * Logic reader for policy tests.
index cfebf19..f9514ae 100644 (file)
@@ -27,7 +27,6 @@ import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 import java.util.UUID;
-
 import org.junit.Test;
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKeyInfo;
index c20a407..5dbdc0f 100644 (file)
@@ -27,12 +27,10 @@ import static org.junit.Assert.fail;
 
 import java.util.Set;
 import java.util.TreeSet;
-
 import org.junit.Test;
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.handling.ApexModelException;
 import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel;
-import org.onap.policy.apex.model.policymodel.handling.PolicyModelSplitter;
 
 public class PolicyModelSplitterTest {
     @Test
index b2c49b6..3fca397 100644 (file)
@@ -21,7 +21,6 @@
 package org.onap.policy.apex.model.policymodel.handling;
 
 import java.util.UUID;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKeyInfo;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKeyInformation;
index 1c0d933..daff1ef 100644 (file)
@@ -22,7 +22,6 @@ package org.onap.policy.apex.model.policymodel.utils;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult;
 import org.onap.policy.apex.model.basicmodel.handling.ApexModelException;
 import org.onap.policy.apex.model.basicmodel.handling.ApexModelReader;
index 9ec5f59..bc0551c 100644 (file)
@@ -22,7 +22,6 @@ package org.onap.policy.apex.model.utilities.json;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
index 22c630b..2512133 100644 (file)
@@ -24,9 +24,7 @@ import static org.junit.Assert.assertEquals;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.junit.Test;
-import org.onap.policy.apex.model.utilities.CollectionUtils;
 
 public class CollectionUtilitiesTest {
 
index c1d255c..0e9c71c 100644 (file)
@@ -25,7 +25,6 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.util.Arrays;
-
 import org.junit.Test;
 import org.onap.policy.common.utils.resources.TextFileUtils;
 
index fb32d93..fb993b1 100644 (file)
@@ -26,7 +26,6 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import java.util.TreeMap;
-
 import org.junit.Test;
 import org.onap.policy.apex.model.utilities.comparison.KeyedMapComparer;
 import org.onap.policy.apex.model.utilities.comparison.KeyedMapDifference;
index 62f3694..1d6f29f 100644 (file)
@@ -26,7 +26,6 @@ import static org.junit.Assert.assertEquals;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-
 import org.junit.Test;
 import org.onap.policy.common.utils.resources.TextFileUtils;
 
index 791a4dc..7da3f9c 100644 (file)
@@ -25,9 +25,7 @@ import static org.junit.Assert.assertEquals;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.TreeMap;
-
 import org.junit.Test;
-import org.onap.policy.apex.model.utilities.TreeMapUtils;
 
 /**
  * Test the tree map utilities.
index 5242a4a..ae5d53e 100644 (file)
@@ -23,12 +23,10 @@ package org.onap.policy.apex.model.utilities.json;
 import static org.junit.Assert.assertEquals;
 
 import com.google.gson.GsonBuilder;
-
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
-
 import org.junit.Test;
 
 public class JsonHandlerTest {
index 4ab0ca5..c2e1ce4 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.apex.plugins.context.locking.curator;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReadWriteLock;
-
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.CuratorFrameworkFactory;
 import org.apache.curator.framework.state.ConnectionState;
@@ -84,7 +83,7 @@ public class CuratorLockManager extends AbstractLockManager {
             throw new ContextException(message);
         }
 
-        final CuratorLockManagerParameters curatorLockPars = (CuratorLockManagerParameters)lockParameters;
+        final CuratorLockManagerParameters curatorLockPars = (CuratorLockManagerParameters) lockParameters;
 
         // Check if the curator address has been set
         curatorZookeeperAddress = curatorLockPars.getZookeeperAddress();
index bc427b9..194856f 100644 (file)
@@ -24,11 +24,9 @@ package org.onap.policy.apex.plugins.context.schema.avro;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonElement;
-
 import java.io.ByteArrayOutputStream;
 import java.util.LinkedHashSet;
 import java.util.Set;
-
 import org.apache.avro.Schema;
 import org.apache.avro.Schema.Field;
 import org.apache.avro.Schema.Type;
index f70a3c1..d7460ec 100644 (file)
@@ -22,7 +22,6 @@
 package org.onap.policy.apex.plugins.event.carrier.jms;
 
 import java.util.Properties;
-
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
 import javax.jms.Message;
@@ -31,7 +30,6 @@ import javax.jms.MessageListener;
 import javax.jms.Session;
 import javax.jms.Topic;
 import javax.naming.InitialContext;
-
 import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities;
 import org.onap.policy.apex.service.engine.event.ApexEventException;
 import org.onap.policy.apex.service.engine.event.ApexEventReceiver;
index 393ea73..4e5c7a3 100644 (file)
@@ -25,7 +25,6 @@ import java.io.Serializable;
 import java.util.EnumMap;
 import java.util.Map;
 import java.util.Properties;
-
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
 import javax.jms.Message;
@@ -33,7 +32,6 @@ import javax.jms.MessageProducer;
 import javax.jms.Session;
 import javax.jms.Topic;
 import javax.naming.InitialContext;
-
 import org.onap.policy.apex.service.engine.event.ApexEventException;
 import org.onap.policy.apex.service.engine.event.ApexEventProducer;
 import org.onap.policy.apex.service.engine.event.ApexEventRuntimeException;
index 9d9acf6..b37455d 100644 (file)
@@ -25,10 +25,8 @@ import java.time.Duration;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Properties;
-
 import lombok.Getter;
 import lombok.Setter;
-
 import org.apache.commons.lang3.StringUtils;
 import org.apache.kafka.clients.producer.internals.DefaultPartitioner;
 import org.onap.policy.apex.service.parameters.carriertechnology.CarrierTechnologyParameters;
@@ -305,13 +303,11 @@ public class KafkaCarrierTechnologyParameters extends CarrierTechnologyParameter
         if (!returnKafkaProperties.containsKey(property)) {
             // Not found, so add it
             returnKafkaProperties.setProperty(property, value.toString());
-        }
-        else {
+        } else {
             // Found, only overwrite if the property does not have the default value
             if (value == null) {
                 returnKafkaProperties.setProperty(property, defaultValue.toString());
-            }
-            else if (!value.toString().contentEquals(defaultValue.toString())) {
+            } else if (!value.toString().contentEquals(defaultValue.toString())) {
                 returnKafkaProperties.setProperty(property, value.toString());
             }
         }
index a3d273d..452ecf8 100644 (file)
@@ -24,11 +24,9 @@ package org.onap.policy.apex.plugins.event.carrier.restclient;
 import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.core.Response;
-
 import org.apache.commons.lang3.StringUtils;
 import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities;
 import org.onap.policy.apex.service.engine.event.ApexEventException;
index cf35000..d777d2c 100644 (file)
@@ -24,12 +24,10 @@ package org.onap.policy.apex.plugins.event.carrier.restclient;
 import java.util.Optional;
 import java.util.Properties;
 import java.util.Set;
-
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.core.Response;
-
 import org.onap.policy.apex.service.engine.event.ApexEventException;
 import org.onap.policy.apex.service.engine.event.ApexEventRuntimeException;
 import org.onap.policy.apex.service.engine.event.ApexPluginsEventProducer;
index 80f8fa6..aa951b8 100644 (file)
@@ -36,13 +36,11 @@ import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.Invocation.Builder;
 import javax.ws.rs.core.Response;
-
 import org.apache.commons.lang3.StringUtils;
 import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities;
 import org.onap.policy.apex.service.engine.event.ApexEventException;
index 1e81059..2a36006 100644 (file)
@@ -26,17 +26,14 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import com.google.gson.Gson;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
-
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.core.Response;
-
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
index 9503716..39d0023 100644 (file)
@@ -171,8 +171,7 @@ public class ApexRestServerConsumer extends ApexPluginsEventConsumer {
         // Wait until the event is in the cache of events sent to apex
         do {
             ThreadUtilities.sleep(REST_SERVER_CONSUMER_WAIT_SLEEP_TIME);
-        }
-        while (!synchronousEventCache.existsEventToApex(executionId));
+        } while (!synchronousEventCache.existsEventToApex(executionId));
 
         // Now wait for the reply or for the event to time put
         do {
@@ -188,8 +187,7 @@ public class ApexRestServerConsumer extends ApexPluginsEventConsumer {
                 // Return the event as a response to the call
                 return Response.status(Response.Status.OK.getStatusCode()).entity(responseEvent.toString()).build();
             }
-        }
-        while (synchronousEventCache.existsEventToApex(executionId));
+        } while (synchronousEventCache.existsEventToApex(executionId));
 
         // The event timed out
         final String errorMessage = "processing of event on event consumer " + name + " timed out, event=" + event;
index cea4900..44f010c 100644 (file)
@@ -26,7 +26,6 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map.Entry;
-
 import javax.xml.XMLConstants;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBElement;
@@ -36,7 +35,6 @@ import javax.xml.bind.Unmarshaller;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
-
 import org.onap.policy.apex.plugins.event.protocol.xml.jaxb.ObjectFactory;
 import org.onap.policy.apex.plugins.event.protocol.xml.jaxb.XMLApexEvent;
 import org.onap.policy.apex.plugins.event.protocol.xml.jaxb.XMLApexEventData;
index 65a6305..3d620eb 100644 (file)
@@ -29,7 +29,6 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -269,8 +268,7 @@ public class YamlEventProtocolTest {
             textBlock = reader.readTextBlock();
 
             eventList.addAll(converter.toApexEvent(eventName, textBlock.getText()));
-        }
-        while (!textBlock.isEndOfText());
+        } while (!textBlock.isEndOfText());
 
         fileInputStream.close();
 
index 7eaaa04..922f64f 100644 (file)
@@ -24,7 +24,6 @@ package org.onap.policy.apex.plugins.executor.java;
 import java.lang.reflect.Method;
 import java.util.Map;
 import java.util.Properties;
-
 import org.onap.policy.apex.context.ContextException;
 import org.onap.policy.apex.core.engine.executor.StateFinalizerExecutor;
 import org.onap.policy.apex.core.engine.executor.context.StateFinalizerExecutionContext;
index 61ab677..2ccddcf 100644 (file)
@@ -24,7 +24,6 @@ package org.onap.policy.apex.plugins.executor.java;
 import java.lang.reflect.Method;
 import java.util.Map;
 import java.util.Properties;
-
 import org.onap.policy.apex.context.ContextException;
 import org.onap.policy.apex.core.engine.executor.TaskExecutor;
 import org.onap.policy.apex.core.engine.executor.context.TaskExecutionContext;
index 244a80a..ee830ca 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.apex.plugins.executor.java;
 
 import java.lang.reflect.Method;
 import java.util.Properties;
-
 import org.onap.policy.apex.context.ContextException;
 import org.onap.policy.apex.core.engine.event.EnEvent;
 import org.onap.policy.apex.core.engine.executor.TaskSelectExecutor;
index f70bf58..0eecd5d 100644 (file)
@@ -25,12 +25,10 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
-
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.Setter;
-
 import org.apache.commons.lang3.StringUtils;
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.Script;
index 1ba79ce..7f1e475 100644 (file)
@@ -26,7 +26,6 @@ import static org.onap.policy.common.utils.validation.Assertions.argumentNotNull
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Properties;
-
 import org.mvel2.MVEL;
 import org.onap.policy.apex.context.ContextException;
 import org.onap.policy.apex.core.engine.event.EnEvent;
index dad167d..f1561c2 100644 (file)
@@ -22,12 +22,10 @@ package org.onap.policy.apex.plugins.persistence.jpa.eclipselink.entities;
 
 import java.util.Arrays;
 import java.util.List;
-
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.xml.bind.annotation.XmlElement;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxConcept;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
index ba85722..afeeb84 100644 (file)
@@ -22,13 +22,11 @@ package org.onap.policy.apex.plugins.persistence.jpa.eclipselink.entities;
 
 import java.util.Arrays;
 import java.util.List;
-
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxConcept;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
diff --git a/pom.xml b/pom.xml
index afb8911..3f2e4d7 100644 (file)
--- a/pom.xml
+++ b/pom.xml
                             </execution>
                         </executions>
                     </plugin>
-
-                    <plugin>
-                        <artifactId>maven-checkstyle-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>onap-java-style</id>
-                                <goals>
-                                    <goal>check</goal>
-                                </goals>
-                                <phase>process-sources</phase>
-                                <configuration>
-                                    <!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
-                                        with minor changes -->
-                                    <configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
-                                    <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory -->
-                                    <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
-                                    <includeResources>true</includeResources>
-                                    <includeTestSourceDirectory>true</includeTestSourceDirectory>
-                                    <includeTestResources>true</includeTestResources>
-                                    <excludes>
-                                    </excludes>
-                                    <consoleOutput>true</consoleOutput>
-                                    <failOnViolation>true</failOnViolation>
-                                    <violationSeverity>warning</violationSeverity>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.onap.oparent</groupId>
-                                <artifactId>checkstyle</artifactId>
-                                <version>${oparent.version}</version>
-                                <scope>compile</scope>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
                 </plugins>
             </build>
 
index 57c547b..113d71c 100644 (file)
@@ -412,8 +412,7 @@ public class EngDepMessageListener implements MessageListener<Message>, Runnable
     private InetAddress getLocalAddress() {
         try {
             return MessagingUtils.getLocalHostLanAddress();
-        }
-        catch (UnknownHostException e) {
+        } catch (UnknownHostException e) {
             LOGGER.debug("failed to find the localhost address - continuing ...", e);
             return null;
         }
index d46a58d..91c1fb1 100644 (file)
@@ -21,7 +21,6 @@
 package org.onap.policy.apex.service.engine.engdep;
 
 import java.net.InetSocketAddress;
-
 import org.onap.policy.apex.core.infrastructure.messaging.MessagingService;
 import org.onap.policy.apex.core.infrastructure.messaging.MessagingServiceFactory;
 import org.onap.policy.apex.core.infrastructure.messaging.util.MessagingUtils;
index 7828960..2364d0c 100644 (file)
@@ -25,11 +25,9 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.atomic.AtomicLong;
-
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.ToString;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
index 1d64768..bd6e451 100644 (file)
@@ -21,7 +21,6 @@
 package org.onap.policy.apex.service.engine.event;
 
 import java.util.Properties;
-
 import org.onap.policy.apex.service.parameters.eventhandler.EventHandlerParameters;
 import org.onap.policy.apex.service.parameters.eventhandler.EventHandlerPeeredMode;
 
index 198e701..dabe1fd 100644 (file)
@@ -24,7 +24,6 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Timer;
 import java.util.TimerTask;
-
 import org.onap.policy.apex.service.engine.runtime.EngineServiceEventInterface;
 import org.slf4j.ext.XLogger;
 import org.slf4j.ext.XLoggerFactory;
index e126335..ebfd71f 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.apex.service.engine.event;
 import java.util.EnumMap;
 import java.util.Map;
 import java.util.Properties;
-
 import org.onap.policy.apex.service.parameters.eventhandler.EventHandlerPeeredMode;
 
 public abstract class ApexPluginsEventProducer implements ApexEventProducer {
index 0fbb009..1a48637 100644 (file)
@@ -26,7 +26,6 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
-
 import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities;
 import org.onap.policy.apex.service.parameters.eventhandler.EventHandlerPeeredMode;
 import org.slf4j.ext.XLogger;
index 64b4aa8..6e4c6d5 100644 (file)
@@ -22,7 +22,6 @@ package org.onap.policy.apex.service.engine.event.impl.apexprotocolplugin;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.onap.policy.apex.service.engine.event.ApexEvent;
 import org.onap.policy.apex.service.engine.event.ApexEventException;
 import org.onap.policy.apex.service.engine.event.ApexEventList;
index 1448661..1cca52a 100644 (file)
@@ -22,7 +22,6 @@ package org.onap.policy.apex.service.engine.event.impl.enevent;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.onap.policy.apex.core.engine.engine.ApexEngine;
 import org.onap.policy.apex.core.engine.event.EnEvent;
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
index 4581b17..f5ceff4 100644 (file)
@@ -26,7 +26,6 @@ import java.util.Properties;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
-
 import org.onap.policy.apex.core.infrastructure.threading.ApplicationThreadFactory;
 import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities;
 import org.onap.policy.apex.service.engine.event.ApexEventConsumer;
index b08b7ec..b1abeb5 100644 (file)
@@ -24,7 +24,6 @@ package org.onap.policy.apex.service.engine.event.impl.eventrequestor;
 import java.util.EnumMap;
 import java.util.Map;
 import java.util.Properties;
-
 import org.onap.policy.apex.service.engine.event.ApexEventConsumer;
 import org.onap.policy.apex.service.engine.event.ApexEventException;
 import org.onap.policy.apex.service.engine.event.ApexEventProducer;
index 91551e5..5071824 100644 (file)
@@ -21,7 +21,6 @@
 package org.onap.policy.apex.service.engine.event.impl.filecarrierplugin;
 
 import java.io.File;
-
 import org.onap.policy.apex.service.engine.event.impl.filecarrierplugin.consumer.ApexFileEventConsumer;
 import org.onap.policy.apex.service.engine.event.impl.filecarrierplugin.producer.ApexFileEventProducer;
 import org.onap.policy.apex.service.parameters.carriertechnology.CarrierTechnologyParameters;
@@ -235,9 +234,8 @@ public class FileCarrierTechnologyParameters extends CarrierTechnologyParameters
         // Check if the file exists, the file should be a regular file and should be readable
         if (theFile.exists()) {
             validateExistingFile(result, absoluteFileName, theFile);
-        }
-        // The path to the file should exist and should be writable
-        else {
+        } else {
+            // The path to the file should exist and should be writable
             validateNewFileParent(result, absoluteFileName, theFile);
         }
     }
@@ -253,8 +251,7 @@ public class FileCarrierTechnologyParameters extends CarrierTechnologyParameters
         // Check that the file is a regular file
         if (!theFile.isFile()) {
             result.setResult(FILE_NAME_TOKEN, ValidationStatus.INVALID, "is not a plain file");
-        }
-        else {
+        } else {
             fileName = absoluteFileName;
 
             if (!theFile.canRead()) {
@@ -274,12 +271,10 @@ public class FileCarrierTechnologyParameters extends CarrierTechnologyParameters
         // Check that the parent of the file is a directory
         if (!theFile.getParentFile().exists()) {
             result.setResult(FILE_NAME_TOKEN, ValidationStatus.INVALID, "parent of file does not exist");
-        }
-        // Check that the parent of the file is a directory
-        else if (!theFile.getParentFile().isDirectory()) {
+        } else if (!theFile.getParentFile().isDirectory()) {
+            // Check that the parent of the file is a directory
             result.setResult(FILE_NAME_TOKEN, ValidationStatus.INVALID, "parent of file is not directory");
-        }
-        else {
+        } else {
             fileName = absoluteFileName;
 
             if (!theFile.getParentFile().canRead()) {
index 7366528..04de6b1 100644 (file)
@@ -27,7 +27,6 @@ import java.util.EnumMap;
 import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.atomic.AtomicLong;
-
 import org.onap.policy.apex.core.infrastructure.threading.ApplicationThreadFactory;
 import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities;
 import org.onap.policy.apex.service.engine.event.ApexEventConsumer;
@@ -198,8 +197,7 @@ public class ApexFileEventConsumer implements ApexEventConsumer, Runnable {
                 if (textBlock.getText() != null) {
                     eventReceiver.receiveEvent(getNextExecutionId(), new Properties(), textBlock.getText());
                 }
-            }
-            while (!textBlock.isEndOfText());
+            } while (!textBlock.isEndOfText());
         } catch (final Exception e) {
             LOGGER.warn("\"" + consumerName + "\" failed to read event from file: \""
                             + fileCarrierTechnologyParameters.getFileName() + "\"", e);
index eecd47c..5531d97 100644 (file)
@@ -26,7 +26,6 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.Queue;
 import java.util.concurrent.LinkedBlockingQueue;
-
 import org.onap.policy.apex.core.infrastructure.threading.ApplicationThreadFactory;
 import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities;
 import org.onap.policy.apex.service.parameters.eventprotocol.EventProtocolTextTokenDelimitedParameters;
index e482666..fb57a2d 100644 (file)
@@ -21,7 +21,6 @@
 package org.onap.policy.apex.service.engine.event.impl.filecarrierplugin.consumer;
 
 import java.io.InputStream;
-
 import org.onap.policy.apex.service.engine.event.ApexEventException;
 import org.onap.policy.apex.service.parameters.eventprotocol.EventProtocolParameters;
 import org.onap.policy.apex.service.parameters.eventprotocol.EventProtocolTextCharDelimitedParameters;
index b0dac33..da5ee02 100644 (file)
@@ -25,7 +25,6 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.util.Properties;
-
 import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities;
 import org.onap.policy.apex.service.engine.event.ApexEventException;
 import org.onap.policy.apex.service.engine.event.ApexEventRuntimeException;
index ad05080..459a2c4 100644 (file)
@@ -26,11 +26,9 @@ import com.google.gson.GsonBuilder;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.internal.LinkedTreeMap;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-
 import org.onap.policy.apex.context.SchemaHelper;
 import org.onap.policy.apex.context.impl.schema.SchemaHelperFactory;
 import org.onap.policy.apex.model.basicmodel.service.ModelService;
index fddbcb7..9b4176a 100644 (file)
@@ -27,10 +27,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.stream.Stream;
-
 import lombok.Getter;
 import lombok.Setter;
-
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
 import org.onap.policy.apex.model.basicmodel.handling.ApexModelException;
 import org.onap.policy.apex.model.basicmodel.service.ModelService;
index e05e02c..eee77c9 100644 (file)
@@ -25,7 +25,6 @@ import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.net.URL;
 import java.util.Arrays;
-
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.HelpFormatter;
@@ -293,8 +292,7 @@ public class ApexCommandLineArguments {
 
         if (!ParameterValidationUtils.validateStringParameter(relativeFileRootValue)) {
             relativeFileRootValue = System.getProperty("user.dir");
-        }
-        else if (!(new File(relativeFileRootValue).isAbsolute())) {
+        } else if (!(new File(relativeFileRootValue).isAbsolute())) {
             relativeFileRootValue = System.getProperty("user.dir") + File.separator + relativeFileRootValue;
         }
 
index 7c0c17d..b071d53 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.apex.service.engine.main;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
-
 import org.onap.policy.apex.core.infrastructure.threading.ApplicationThreadFactory;
 import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities;
 import org.onap.policy.apex.service.engine.event.ApexEvent;
index 2c1c900..8c2aee1 100644 (file)
@@ -26,9 +26,7 @@ import java.util.Properties;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
-
 import lombok.NonNull;
-
 import org.onap.policy.apex.core.infrastructure.threading.ApplicationThreadFactory;
 import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities;
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
index cea70ce..0e38230 100644 (file)
@@ -105,7 +105,7 @@ public class ApexMain {
      */
     public ApexMain(Map<ToscaPolicyIdentifier, String[]> policyArgumentsMap) throws ApexException {
         apexParametersMap = new LinkedHashMap<>();
-        for ( Entry<ToscaPolicyIdentifier, String[]> policyArgsEntry: policyArgumentsMap.entrySet()) {
+        for (Entry<ToscaPolicyIdentifier, String[]> policyArgsEntry: policyArgumentsMap.entrySet()) {
             try {
                 apexParametersMap.put(policyArgsEntry.getKey(), populateApexParameters(policyArgsEntry.getValue()));
             } catch (ApexException e) {
index 4da605d..b686d3e 100644 (file)
@@ -25,7 +25,6 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
-
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.util.ArrayList;
@@ -35,9 +34,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.BlockingQueue;
-
 import lombok.Setter;
-
 import org.onap.policy.apex.context.ContextException;
 import org.onap.policy.apex.context.ContextRuntimeException;
 import org.onap.policy.apex.context.SchemaHelper;
index 553ed18..02d3973 100644 (file)
@@ -70,11 +70,11 @@ public class ApexParameterHandler {
             // Register the adapters for our carrier technologies and event protocols with GSON
             // @formatter:off
             final Gson gson = new GsonBuilder()
-                            .registerTypeAdapter(EngineParameters           .class, 
+                            .registerTypeAdapter(EngineParameters.class, 
                                             new EngineServiceParametersJsonAdapter())
                             .registerTypeAdapter(CarrierTechnologyParameters.class, 
                                             new CarrierTechnologyParametersJsonAdapter())
-                            .registerTypeAdapter(EventProtocolParameters    .class, 
+                            .registerTypeAdapter(EventProtocolParameters.class, 
                                             new EventProtocolParametersJsonAdapter())
                             .create();
             // @formatter:on
index 07cf781..692d5ae 100644 (file)
@@ -27,7 +27,6 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
-
 import org.onap.policy.apex.service.parameters.engineservice.EngineServiceParameters;
 import org.onap.policy.apex.service.parameters.eventhandler.EventHandlerParameters;
 import org.onap.policy.apex.service.parameters.eventhandler.EventHandlerPeeredMode;
index b7f2fb8..46e7f84 100644 (file)
@@ -28,11 +28,9 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
-
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.Map;
-
 import org.onap.policy.apex.service.engine.event.impl.eventrequestor.EventRequestorCarrierTechnologyParameters;
 import org.onap.policy.apex.service.engine.event.impl.filecarrierplugin.FileCarrierTechnologyParameters;
 import org.onap.policy.common.parameters.ParameterRuntimeException;
index 707dcb1..9a33119 100644 (file)
@@ -27,13 +27,10 @@ import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
-
 import javax.ws.rs.core.MultivaluedHashMap;
 import javax.ws.rs.core.MultivaluedMap;
-
 import lombok.Getter;
 import lombok.Setter;
-
 import org.apache.commons.lang3.StringUtils;
 import org.onap.policy.common.parameters.GroupValidationResult;
 import org.onap.policy.common.parameters.ValidationStatus;
index 9d4566b..52dcd3d 100644 (file)
@@ -21,7 +21,6 @@
 package org.onap.policy.apex.service.parameters.engineservice;
 
 import java.io.File;
-
 import org.onap.policy.apex.core.engine.EngineParameters;
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
@@ -355,9 +354,8 @@ public class EngineServiceParameters implements ParameterGroup {
         // Check that the file exists
         if (!policyModelFile.exists()) {
             result.setResult(POLICY_MODEL_FILE_NAME, ValidationStatus.INVALID, "not found");
-        }
-        // Check that the file is a regular file
-        else if (!policyModelFile.isFile()) {
+        } else if (!policyModelFile.isFile()) {
+            // Check that the file is a regular file
             result.setResult(POLICY_MODEL_FILE_NAME, ValidationStatus.INVALID, "is not a plain file");
         } else {
             // OK, we found the file and it's OK, so reset the file name
index e140a80..72eb58b 100644 (file)
@@ -22,7 +22,6 @@ package org.onap.policy.apex.service.parameters.eventhandler;
 
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
-
 import org.onap.policy.apex.service.parameters.ApexParameterConstants;
 import org.onap.policy.apex.service.parameters.carriertechnology.CarrierTechnologyParameters;
 import org.onap.policy.apex.service.parameters.eventprotocol.EventProtocolParameters;
index 5a1b165..ce1860e 100644 (file)
@@ -28,11 +28,9 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
-
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.Map;
-
 import org.onap.policy.apex.service.engine.event.impl.apexprotocolplugin.ApexEventProtocolParameters;
 import org.onap.policy.apex.service.engine.event.impl.jsonprotocolplugin.JsonEventProtocolParameters;
 import org.onap.policy.common.parameters.ParameterRuntimeException;
index f917fcf..52d4a7d 100644 (file)
@@ -24,7 +24,6 @@ package org.onap.policy.apex.service.engine.engdep;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-
 import org.apache.commons.lang3.NotImplementedException;
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
index 9f5329e..d31a9fa 100644 (file)
@@ -73,8 +73,6 @@ public class EngDepMessageListenerTest {
     public void testMessageListener() throws ApexException {
         DummyEngineService dummyEngineService = new DummyEngineService();
         EngDepMessageListener listener = new EngDepMessageListener(dummyEngineService);
-        BlockingQueue<?> messageQueue
-            = (BlockingQueue<?>) Whitebox.getInternalState(listener, "messageQueue");
         listener.startProcessorThread();
 
         try {
@@ -87,6 +85,7 @@ public class EngDepMessageListenerTest {
         List<Message> messageList = new ArrayList<>();
         messageList.add(new StartEngine(new AxArtifactKey("Start:0.0.1")));
         listener.onMessage(new MessageBlock<>(messageList, webSocketMock));
+        BlockingQueue<?> messageQueue = (BlockingQueue<?>) Whitebox.getInternalState(listener, "messageQueue");
         await().until(messageQueue::isEmpty);
         assertEquals("Start:0.0.1", dummyEngineService.getStartEngineKey().getId());
 
index f313f1f..52d8981 100644 (file)
@@ -28,7 +28,6 @@ import static org.junit.Assert.assertTrue;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-
 import org.junit.Test;
 import org.onap.policy.apex.service.engine.event.impl.filecarrierplugin.consumer.CharacterDelimitedTextBlockReader;
 import org.onap.policy.apex.service.engine.event.impl.filecarrierplugin.consumer.TextBlock;
index d67087a..3055dae 100644 (file)
@@ -23,12 +23,10 @@ package org.onap.policy.apex.service.engine.event;
 import static org.junit.Assert.assertNotNull;
 
 import java.util.Map.Entry;
-
 import org.junit.Test;
 import org.onap.policy.apex.service.engine.event.impl.EventConsumerFactory;
 import org.onap.policy.apex.service.engine.event.impl.EventProducerFactory;
 import org.onap.policy.apex.service.engine.main.ApexCommandLineArguments;
-
 import org.onap.policy.apex.service.parameters.ApexParameterHandler;
 import org.onap.policy.apex.service.parameters.ApexParameters;
 import org.onap.policy.apex.service.parameters.eventhandler.EventHandlerParameters;
index 4b05c52..0a34b11 100644 (file)
@@ -31,7 +31,6 @@ import java.io.PrintStream;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
-
 import org.junit.After;
 import org.junit.Test;
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
index 3da9816..cbd9ee0 100644 (file)
@@ -27,7 +27,6 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.util.Arrays;
-
 import org.junit.Test;
 import org.onap.policy.apex.service.engine.event.impl.filecarrierplugin.consumer.ApexFileEventConsumer;
 import org.onap.policy.apex.service.engine.event.impl.filecarrierplugin.producer.ApexFileEventProducer;
index b32ba14..be2c22c 100644 (file)
@@ -26,7 +26,6 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.util.Arrays;
-
 import org.junit.Test;
 import org.onap.policy.apex.service.engine.main.ApexCommandLineArguments;
 import org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperCarrierTechnologyParameters;
index 3e5ed14..ec06ce9 100644 (file)
@@ -22,7 +22,6 @@ package org.onap.policy.apex.service.engine.parameters.dummyclasses;
 
 import java.util.Map;
 import java.util.Properties;
-
 import org.onap.policy.apex.context.ContextException;
 import org.onap.policy.apex.core.engine.executor.StateFinalizerExecutor;
 import org.onap.policy.apex.core.engine.executor.exception.StateMachineException;
index a4312bf..fb2dea5 100644 (file)
@@ -22,7 +22,6 @@ package org.onap.policy.apex.service.engine.parameters.dummyclasses;
 
 import java.util.Map;
 import java.util.Properties;
-
 import org.onap.policy.apex.context.ContextException;
 import org.onap.policy.apex.core.engine.event.EnEvent;
 import org.onap.policy.apex.core.engine.executor.TaskExecutor;
index 42fd6e1..6805a3d 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.apex.service.engine.parameters.dummyclasses;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Properties;
-
 import org.onap.policy.apex.service.parameters.carriertechnology.CarrierTechnologyParameters;
 import org.onap.policy.common.parameters.GroupValidationResult;
 import org.onap.policy.common.parameters.ValidationStatus;
index 8e1dfce..367bf5c 100644 (file)
@@ -22,7 +22,6 @@
 package org.onap.policy.apex.service.engine.parameters.dummyclasses;
 
 import java.util.Properties;
-
 import org.onap.policy.apex.service.engine.event.ApexEventException;
 import org.onap.policy.apex.service.engine.event.ApexEventProducer;
 import org.onap.policy.apex.service.engine.event.PeeredReference;
index f973b00..067a6b1 100644 (file)
@@ -32,7 +32,6 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
-
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
index ec2f5b3..364221f 100644 (file)
@@ -54,7 +54,7 @@ public class ApexStarterActivator {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ApexStarterActivator.class);
     private final ApexStarterParameterGroup apexStarterParameterGroup;
-    private List<TopicSink> topicSinks;// topics to which apex-pdp sends pdp status
+    private List<TopicSink> topicSinks; // topics to which apex-pdp sends pdp status
     private List<TopicSource> topicSources; // topics to which apex-pdp listens to for messages from pap.
     private static final String[] MSG_TYPE_NAMES = { "messageName" };
 
index 9a61084..6c1b645 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.apex.services.onappf.comm;
 import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
-
 import org.onap.policy.apex.services.onappf.handler.PdpMessageHandler;
 import org.onap.policy.common.endpoints.event.comm.TopicSink;
 import org.onap.policy.common.endpoints.event.comm.client.TopicSinkClient;
index 03a8d6e..05ae8fd 100644 (file)
@@ -21,7 +21,6 @@
 package org.onap.policy.apex.services.onappf.parameters;
 
 import java.io.File;
-
 import org.onap.policy.apex.services.onappf.ApexStarterCommandLineArguments;
 import org.onap.policy.apex.services.onappf.exception.ApexStarterException;
 import org.onap.policy.common.parameters.GroupValidationResult;
index fe3b067..e13fa09 100644 (file)
@@ -24,7 +24,6 @@ package org.onap.policy.apex.services.onappf.rest;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
-
 import org.onap.policy.common.capabilities.Startable;
 import org.onap.policy.common.endpoints.http.server.HttpServletServer;
 import org.onap.policy.common.endpoints.http.server.HttpServletServerFactoryInstance;
index b58a3db..1573f1d 100644 (file)
@@ -30,15 +30,12 @@ import io.swagger.annotations.Info;
 import io.swagger.annotations.SecurityDefinition;
 import io.swagger.annotations.SwaggerDefinition;
 import io.swagger.annotations.Tag;
-
 import java.net.HttpURLConnection;
-
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-
 import org.onap.policy.common.endpoints.report.HealthCheckReport;
 
 /**
index 21d0137..19af43f 100644 (file)
@@ -43,7 +43,7 @@ public class TestListenerUtils {
      *
      * @return PdpUpdate message
      */
-    public static PdpUpdate createPdpUpdateMsg(final PdpStatus pdpStatus, List<ToscaPolicy> toscaPolicies ) {
+    public static PdpUpdate createPdpUpdateMsg(final PdpStatus pdpStatus, List<ToscaPolicy> toscaPolicies) {
         final PdpUpdate pdpUpdateMsg = new PdpUpdate();
         pdpUpdateMsg.setDescription("dummy pdp status for test");
         pdpUpdateMsg.setPdpGroup("pdpGroup");
index 3a05e72..7ccb850 100644 (file)
@@ -21,8 +21,6 @@
 package org.onap.policy.apex.services.onappf.exception;
 
 import org.junit.Test;
-import org.onap.policy.apex.services.onappf.exception.ApexStarterException;
-import org.onap.policy.apex.services.onappf.exception.ApexStarterRunTimeException;
 import org.onap.policy.common.utils.test.ExceptionsTester;
 
 /**
index e96b136..00b6cce 100644 (file)
@@ -25,7 +25,6 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Map;
-
 import org.junit.Test;
 import org.onap.policy.common.endpoints.parameters.RestServerParameters;
 import org.onap.policy.common.endpoints.parameters.TopicParameterGroup;
index 67ffcf2..4b79dc5 100644 (file)
@@ -25,12 +25,9 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.io.FileNotFoundException;
-
 import org.junit.Test;
 import org.onap.policy.apex.services.onappf.ApexStarterCommandLineArguments;
 import org.onap.policy.apex.services.onappf.exception.ApexStarterException;
-import org.onap.policy.apex.services.onappf.parameters.ApexStarterParameterGroup;
-import org.onap.policy.apex.services.onappf.parameters.ApexStarterParameterHandler;
 import org.onap.policy.common.utils.coder.CoderException;
 
 /**
index 6f2474a..c23da64 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.apex.services.onappf.parameters.dummyclasses;
 
 import java.util.Map;
 import java.util.Properties;
-
 import org.onap.policy.apex.context.ContextException;
 import org.onap.policy.apex.core.engine.executor.StateFinalizerExecutor;
 import org.onap.policy.apex.core.engine.executor.exception.StateMachineException;
index 387479b..d89fd2e 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.apex.services.onappf.parameters.dummyclasses;
 
 import java.util.Map;
 import java.util.Properties;
-
 import org.onap.policy.apex.context.ContextException;
 import org.onap.policy.apex.core.engine.event.EnEvent;
 import org.onap.policy.apex.core.engine.executor.TaskExecutor;
index 006cad0..bf5bf48 100644 (file)
@@ -28,7 +28,6 @@ import java.security.SecureRandom;
 import java.util.Map;
 import java.util.Properties;
 import java.util.function.Function;
-
 import javax.net.ssl.SSLContext;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
@@ -36,7 +35,6 @@ import javax.ws.rs.client.Invocation;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-
 import org.glassfish.jersey.client.ClientProperties;
 import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
 import org.junit.After;
index 05829e4..7aec4ae 100644 (file)
@@ -27,7 +27,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
-
 import org.onap.policy.apex.model.basicmodel.concepts.ApexRuntimeException;
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKeyInformation;
index f93f914..19c3d33 100644 (file)
@@ -23,12 +23,10 @@ package org.onap.policy.apex.testsuites.integration.context.entities;
 
 import java.util.Arrays;
 import java.util.List;
-
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.xml.bind.annotation.XmlElement;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxConcept;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
index 1ca64c4..b325648 100644 (file)
@@ -23,13 +23,11 @@ package org.onap.policy.apex.testsuites.integration.context.entities;
 
 import java.util.Arrays;
 import java.util.List;
-
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxConcept;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
index 0a9f4cf..21a40d8 100644 (file)
@@ -22,7 +22,6 @@
 package org.onap.policy.apex.testsuites.integration.context.locking;
 
 import com.google.gson.Gson;
-
 import java.net.InetAddress;
 import java.net.NetworkInterface;
 import java.net.SocketException;
@@ -36,7 +35,6 @@ import java.util.TreeSet;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
-
 import org.onap.policy.apex.context.ContextAlbum;
 import org.onap.policy.apex.context.Distributor;
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
index 6d6ea6a..b8717f0 100644 (file)
@@ -22,7 +22,6 @@
 package org.onap.policy.apex.testsuites.integration.context.locking;
 
 import com.google.gson.Gson;
-
 import java.io.BufferedReader;
 import java.io.Closeable;
 import java.io.InputStream;
@@ -30,7 +29,6 @@ import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map.Entry;
-
 import org.onap.policy.apex.testsuites.integration.context.utils.ConfigrationProvider;
 import org.onap.policy.common.parameters.ParameterGroup;
 import org.onap.policy.common.parameters.ParameterService;
index 0217071..4e7636c 100644 (file)
@@ -25,7 +25,6 @@ import static org.junit.Assert.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
-
 import org.apache.commons.lang3.StringUtils;
 import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities;
 import org.onap.policy.apex.service.engine.main.ApexMain;
@@ -58,8 +57,7 @@ public class BaseEventTest {
             }
 
             ThreadUtilities.sleep(100);
-        }
-        while (TIME_OUT_IN_MS >= System.currentTimeMillis() - startWaitTime);
+        } while (TIME_OUT_IN_MS >= System.currentTimeMillis() - startWaitTime);
     }
 
     private int getEventCount(final String expectedFileName) throws IOException {
index b547cc4..876981f 100644 (file)
@@ -30,7 +30,6 @@ import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.Map;
 import java.util.Properties;
-
 import javax.naming.Binding;
 import javax.naming.Context;
 import javax.naming.Name;
@@ -38,7 +37,6 @@ import javax.naming.NameClassPair;
 import javax.naming.NameParser;
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
-
 import org.apache.activemq.command.ActiveMQTopic;
 import org.onap.policy.apex.model.basicmodel.concepts.ApexRuntimeException;
 
index 68ca879..6da35d5 100644 (file)
 package org.onap.policy.apex.testsuites.integration.uservice.adapt.kafka;
 
 import com.salesforce.kafka.test.junit4.SharedKafkaTestResource;
-
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.Properties;
-
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.clients.consumer.ConsumerRecords;
 import org.apache.kafka.clients.consumer.KafkaConsumer;
index e433771..e3d64d2 100644 (file)
@@ -25,16 +25,13 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import com.google.gson.Gson;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.util.Map;
-
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.core.Response;
-
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
index 4f6ef29..d21c3aa 100644 (file)
@@ -26,19 +26,16 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import com.google.gson.Gson;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
-
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.core.Response;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.onap.policy.apex.core.infrastructure.messaging.MessagingException;
index abf0c99..95d3ad8 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.apex.testsuites.performance.benchmark.eventgenerator;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
-
 import org.onap.policy.apex.testsuites.performance.benchmark.eventgenerator.events.InputEvent;
 import org.onap.policy.apex.testsuites.performance.benchmark.eventgenerator.events.OutputEvent;
 
@@ -74,8 +73,7 @@ public class EventBatch {
         for (InputEvent inputEvent : inputEventMap.values()) {
             if (first) {
                 first = false;
-            }
-            else {
+            } else {
                 jsonBuilder.append(",\n");
             }
             jsonBuilder.append(inputEvent.asJson());
index 6073297..930e2af 100644 (file)
@@ -71,7 +71,7 @@ public class EventBatchStats {
 
         calcutateStats(eventBatchStatsList);
 
-        this.batchSize = (int)(eventsNotSent + eventsSent);
+        this.batchSize = (int) (eventsNotSent + eventsSent);
     }
 
     /**
@@ -157,8 +157,7 @@ public class EventBatchStats {
             eventsNotReceived++;
             return null;
 
-        }
-        else {
+        } else {
             eventsReceived++;
         }
 
index 3d5adfc..1b35587 100644 (file)
@@ -22,9 +22,7 @@
 package org.onap.policy.apex.testsuites.performance.benchmark.eventgenerator;
 
 import com.google.gson.Gson;
-
 import java.util.concurrent.ConcurrentHashMap;
-
 import java.util.concurrent.atomic.AtomicReference;
 import javax.inject.Inject;
 import javax.inject.Provider;
@@ -32,7 +30,6 @@ import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.core.Response;
-
 import org.glassfish.grizzly.http.server.Request;
 import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities;
 import org.onap.policy.apex.testsuites.performance.benchmark.eventgenerator.events.OutputEvent;
index 2e70b7b..9a099b5 100644 (file)
@@ -28,9 +28,6 @@ import static org.junit.Assert.fail;
 
 import org.apache.commons.cli.ParseException;
 import org.junit.Test;
-import org.onap.policy.apex.testsuites.performance.benchmark.eventgenerator.EventGenerator;
-import org.onap.policy.apex.testsuites.performance.benchmark.eventgenerator.EventGeneratorParameterHandler;
-import org.onap.policy.apex.testsuites.performance.benchmark.eventgenerator.EventGeneratorParameters;
 
 /**
  * Test event generator parameters.
index a40bcb5..f8854b8 100644 (file)
@@ -25,7 +25,6 @@ import static org.junit.Assert.assertNotNull;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
-
 import org.junit.Test;
 
 /**
@@ -36,7 +35,7 @@ public class EventGeneratorStatsTest {
     @Test
     public void testEventGeneratorStats() {
         Map<Integer, EventBatch> batchMap = new LinkedHashMap<>();
-        EventGeneratorStats egs = new EventGeneratorStats(batchMap );
+        EventGeneratorStats egs = new EventGeneratorStats(batchMap);
         assertNotNull(egs);
 
         assertEquals(-1, egs.getTotalStats().getBatchNumber());
index dcbafba..97b9508 100644 (file)
@@ -26,13 +26,11 @@ import static org.junit.Assert.assertTrue;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.PrintStream;
-
 import org.junit.Test;
 import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities;
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
 import org.onap.policy.apex.service.engine.main.ApexMain;
-import org.onap.policy.apex.testsuites.performance.benchmark.eventgenerator.EventGenerator;
-import org.onap.policy.apex.testsuites.performance.benchmark.eventgenerator.EventGeneratorParameters;
+
 
 /**
  * This class tests the event generator.
index 82b4cca..6a3a8cc 100644 (file)
@@ -55,7 +55,7 @@ public class InputEventTest {
         assertEquals("A Slogan", ie.getTestSlogan());
 
         ie.setTestTemperature(123.45);
-        assertEquals((Double)123.45, (Double)ie.getTestTemperature());
+        assertEquals((Double) 123.45, (Double) ie.getTestTemperature());
 
         ie.setTestTimestamp(1234567879);
         assertEquals(1234567879, ie.getTestTimestamp());
index 0a119cd..9d0e83c 100644 (file)
@@ -25,7 +25,6 @@ import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.avro.AvroRuntimeException;
 import org.apache.avro.Schema;
 import org.apache.avro.Schema.Field;
index d9616fd..321f649 100644 (file)
@@ -30,7 +30,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Properties;
-
 import org.apache.commons.lang3.Validate;
 import org.onap.policy.apex.auth.clicodegen.CodeGenCliEditorBuilder;
 import org.onap.policy.apex.auth.clicodegen.CodeGeneratorCliEditor;
index 1fd96b9..f9ae2b3 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.apex.tools.model.generator.model2cli;
 import java.io.PrintStream;
 import java.io.PrintWriter;
 import java.io.StringWriter;
-
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.HelpFormatter;
 import org.onap.policy.apex.tools.common.CliOptions;
index ca49b53..3ccf3b1 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.apex.tools.model.generator.model2event;
 import java.io.PrintStream;
 import java.io.PrintWriter;
 import java.io.StringWriter;
-
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.HelpFormatter;
 import org.onap.policy.apex.context.parameters.SchemaParameters;
index c3214d3..3d6519a 100644 (file)
@@ -29,7 +29,6 @@ import java.io.IOException;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.avro.Schema;
 import org.apache.avro.Schema.Field;
 import org.junit.BeforeClass;
index edad2eb..9931c12 100644 (file)
@@ -27,7 +27,6 @@ import java.io.PrintStream;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.channels.NotYetConnectedException;
-
 import org.apache.commons.lang3.Validate;
 import org.java_websocket.client.WebSocketClient;
 import org.java_websocket.framing.CloseFrame;
index 659dd77..672594c 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.apex.tools.simple.wsclient;
 import java.io.PrintStream;
 import java.net.URI;
 import java.net.URISyntaxException;
-
 import org.apache.commons.lang3.Validate;
 import org.java_websocket.client.WebSocketClient;
 import org.java_websocket.framing.CloseFrame;
index 29a5de0..9b0674d 100644 (file)
@@ -26,7 +26,6 @@ import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.net.URISyntaxException;
 import java.nio.channels.NotYetConnectedException;
-
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.lang3.Validate;
index dfaafbd..67ef7d7 100644 (file)
@@ -28,7 +28,6 @@ package org.onap.policy.apex.tools.common;
 ////
 
 import java.util.Scanner;
-
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.DefaultParser;
index 1b4ef06..5c79fa4 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.apex.tools.common;
 import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.text.StrBuilder;
 import org.slf4j.ext.XLoggerFactory;
index 5b38686..0aa85df 100644 (file)
@@ -30,8 +30,6 @@ import java.io.OutputStream;
 import java.io.Writer;
 import java.nio.file.FileSystems;
 import java.nio.file.Path;
-
-import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
index 36c64e5..abc01b5 100644 (file)
  * SPDX-License-Identifier: Apache-2.0
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.policy.apex.tools.common;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 import java.io.File;
 import java.nio.file.FileSystems;
 import java.nio.file.Path;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -36,15 +38,15 @@ public class OutputFileTest {
     File file = fp.toFile();
 
     @Before
-    public void setUp() {
-        if (file.exists()){
+    public void beforeSetUp() {
+        if (file.exists()) {
             file.delete();
         }
     }
 
     @Test
     public void testToWriter() {
-        OutputFile testFile = new OutputFile(testFileName,false);
+        OutputFile testFile = new OutputFile(testFileName, false);
         testFile.validate();
         file.setReadable(false);
         file.setWritable(false);
@@ -55,19 +57,19 @@ public class OutputFileTest {
 
     @Test
     public void testValidate() {
-        OutputFile testFile = new OutputFile(testFileName,true);
+        OutputFile testFile = new OutputFile(testFileName, true);
         assertNull(testFile.validate());
         file.setReadable(false);
         file.setWritable(false);
         assertNotNull(testFile.validate());
         OutputFile testFile2 = new OutputFile(testFileName);
         assertNotNull(testFile2.validate());
-        assertEquals("file already exists",testFile2.validate());
+        assertEquals("file already exists", testFile2.validate());
     }
 
     @Test
     public void testToOutputStream() {
-        OutputFile testFile = new OutputFile(testFileName,true);
+        OutputFile testFile = new OutputFile(testFileName, true);
         assertNotNull(testFile.toOutputStream());
         file.setReadable(false);
         file.setWritable(false);
@@ -76,7 +78,7 @@ public class OutputFileTest {
 
     @After
     public void testDown() {
-        if (file.exists()){
+        if (file.exists()) {
             file.delete();
         }
     }
index 723ad87..797c7c1 100644 (file)
@@ -32,12 +32,10 @@ package org.onap.policy.apex.tools.common.docs;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.HelpFormatter;
 import org.junit.Test;
-
 //tag::import[]
 import org.onap.policy.apex.tools.common.CliOptions;
 import org.onap.policy.apex.tools.common.CliParser;
 //end::import[]
-
 import org.slf4j.ext.XLogger;
 import org.slf4j.ext.XLoggerFactory;