Changes for Checkstyle 8.32 26/109326/1
authorliamfallon <liam.fallon@est.tech>
Thu, 18 Jun 2020 21:36:23 +0000 (22:36 +0100)
committerliamfallon <liam.fallon@est.tech>
Thu, 18 Jun 2020 21:43:11 +0000 (22:43 +0100)
Issue-ID: POLICY-2188
Change-Id: I6db16763c1d2d80ff934302081a8dfc16afa7d9a
Signed-off-by: liamfallon <liam.fallon@est.tech>
230 files changed:
models-base/src/main/java/org/onap/policy/models/base/PfConcept.java
models-base/src/main/java/org/onap/policy/models/base/PfConceptContainer.java
models-base/src/main/java/org/onap/policy/models/base/PfConceptFilter.java
models-base/src/main/java/org/onap/policy/models/base/PfConceptGetterImpl.java
models-base/src/main/java/org/onap/policy/models/base/PfKeyImpl.java
models-base/src/main/java/org/onap/policy/models/base/PfModel.java
models-base/src/main/java/org/onap/policy/models/base/PfModelException.java
models-base/src/main/java/org/onap/policy/models/base/PfModelRuntimeException.java
models-base/src/main/java/org/onap/policy/models/base/PfModelService.java
models-base/src/main/java/org/onap/policy/models/base/PfReferenceKey.java
models-base/src/main/java/org/onap/policy/models/base/PfValidationResult.java
models-base/src/test/java/org/onap/policy/models/base/ExceptionsTest.java
models-base/src/test/java/org/onap/policy/models/base/PfConceptContainerTest.java
models-base/src/test/java/org/onap/policy/models/base/PfConceptFilterTest.java
models-base/src/test/java/org/onap/policy/models/base/PfConceptGetterImplTest.java
models-base/src/test/java/org/onap/policy/models/base/PfKeyImplTest.java
models-base/src/test/java/org/onap/policy/models/base/PfModelExceptionInfoTest.java
models-base/src/test/java/org/onap/policy/models/base/PfObjectFilterTest.java
models-base/src/test/java/org/onap/policy/models/base/PfReferenceKeyTest.java
models-base/src/test/java/org/onap/policy/models/base/PfTimestampKeyTest.java
models-base/src/test/java/org/onap/policy/models/base/PfUtilsTest.java
models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyAuthorativeConcept.java
models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyBadPfConcept.java
models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyBadPfConceptContainer.java
models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfConceptContainer.java
models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfConceptKeySub.java
models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfConceptSub.java
models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfKey.java
models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfNameVersion.java
models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfObject.java
models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfObjectFilter.java
models-dao/src/main/java/org/onap/policy/models/dao/PfDaoFactory.java
models-dao/src/main/java/org/onap/policy/models/dao/converters/Uuid2String.java
models-dao/src/main/java/org/onap/policy/models/dao/impl/DefaultPfDao.java
models-dao/src/test/java/org/onap/policy/models/dao/DummyConceptEntity.java
models-dao/src/test/java/org/onap/policy/models/dao/DummyReferenceEntity.java
models-dao/src/test/java/org/onap/policy/models/dao/DummyTimestampEntity.java
models-dao/src/test/java/org/onap/policy/models/dao/converters/Uuid2StringConditionerTest.java
models-decisions/src/main/java/org/onap/policy/models/decisions/concepts/DecisionException.java
models-decisions/src/main/java/org/onap/policy/models/decisions/concepts/DecisionResponse.java
models-decisions/src/main/java/org/onap/policy/models/decisions/serialization/DecisionRequestMessageBodyHandler.java
models-decisions/src/main/java/org/onap/policy/models/decisions/serialization/DecisionResponseMessageBodyHandler.java
models-decisions/src/test/java/org/onap/policy/models/decisions/concepts/TestModels.java
models-errors/src/main/java/org/onap/policy/models/errors/concepts/ErrorResponse.java
models-errors/src/test/java/org/onap/policy/models/errors/concepts/ErrorResponseTest.java
models-errors/src/test/java/org/onap/policy/models/errors/concepts/ErrorResponseUtilsTest.java
models-errors/src/test/java/org/onap/policy/models/errors/concepts/TestModels.java
models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiCustomQueryOperationTest.java
models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/impl/HttpOperator.java
models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/impl/TypedOperator.java
models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/BidirectionalTopicOperatorTest.java
models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/OperationPartialTest.java
models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/parameters/HttpPollingActorParamsTest.java
models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/parameters/HttpPollingParamsTest.java
models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/CommonHeader.java
models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/Request.java
models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/Response.java
models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/ResponseStatus.java
models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/util/Serialization.java
models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/CommonHeaderTest.java
models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/RequestTest.java
models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/ResponseTest.java
models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/util/SerializationTest.java
models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/AppcLcmCommonHeader.java
models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/AppcLcmDmaapWrapper.java
models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/AppcLcmInput.java
models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/AppcLcmOutput.java
models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/AppcLcmResponseStatus.java
models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/util/Serialization.java
models-interactions/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/util/SerializationTest.java
models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/CdsResponse.java
models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopResponse.java
models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopEvent.java
models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopNotification.java
models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/util/Serialization.java
models-interactions/model-impl/rest/src/test/java/org/onap/policy/rest/RestTest.java
models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/Resource.java
models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/ResourceInstance.java
models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ResourceInstanceTest.java
models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ResourceTest.java
models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ServiceInstanceTest.java
models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ServiceTest.java
models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealNetworkInfo.java
models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealRequest.java
models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealRequestHeaderInfo.java
models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealRequestInfo.java
models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealServiceInfo.java
models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVfModuleInfo.java
models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVfModuleParameter.java
models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVfModuleParametersInfo.java
models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVfModuleRequestInput.java
models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVnfInfo.java
models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncManager.java
models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncRequest.java
models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncResponse.java
models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncResponseNetworkInfo.java
models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncResponseOutput.java
models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncResponseServiceInfo.java
models-interactions/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/SdncRequestTest.java
models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciCommonHeader.java
models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciRequest.java
models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciResponse.java
models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciWrapper.java
models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/Status.java
models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/util/Serialization.java
models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciCommonHeaderTest.java
models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/SdnrTest.java
models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/util/SerializationTest.java
models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoResponseWrapper.java
models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoAsyncRequestStatusTest.java
models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestDetailsTest.java
models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestTest.java
models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoResponseWrapperTest.java
models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcHealActionVmInfo.java
models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcHealAdditionalParams.java
models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcManager.java
models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcRequest.java
models-interactions/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcHealAdditionalParamsTest.java
models-interactions/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcRequestTest.java
models-interactions/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcResponseDescriptorTest.java
models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/compiler/ControlLoopCompiler.java
models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/guard/compiler/ControlLoopGuardCompiler.java
models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/ControlLoop.java
models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/Policy.java
models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/builder/impl/ControlLoopPolicyBuilderImpl.java
models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/builder/impl/ResultsImpl.java
models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/guard/Constraint.java
models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/guard/GuardPolicy.java
models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/guard/builder/impl/ControlLoopGuardBuilderImpl.java
models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/compiler/ControlLoopCompilerTest.java
models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyBuilderTest.java
models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyTest.java
models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopTest.java
models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/guard/ConstraintTest.java
models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/guard/GuardPolicyTest.java
models-pap/src/test/java/org/onap/policy/models/pap/concepts/TestModels.java
models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpGroupFilter.java
models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpStatus.java
models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/Pdps.java
models-pdp/src/main/java/org/onap/policy/models/pdp/persistence/provider/PdpProvider.java
models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/ModelsTest.java
models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/PdpStatusTest.java
models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdpGroupTest.java
models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdpStatisticsTest.java
models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdpSubGroupTest.java
models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/provider/PdpProviderTest.java
models-provider/src/main/java/org/onap/policy/models/provider/PolicyModelsProviderParameters.java
models-provider/src/main/java/org/onap/policy/models/provider/impl/DatabasePolicyModelsProviderImpl.java
models-provider/src/main/java/org/onap/policy/models/provider/impl/DummyPolicyModelsProviderImpl.java
models-provider/src/test/java/org/onap/policy/models/provider/PolicyModelsProviderFactoryTest.java
models-provider/src/test/java/org/onap/policy/models/provider/TestPojos.java
models-provider/src/test/java/org/onap/policy/models/provider/impl/DatabasePolicyModelsProviderTest.java
models-provider/src/test/java/org/onap/policy/models/provider/impl/DummyPolicyModelsProviderSubImpl.java
models-provider/src/test/java/org/onap/policy/models/provider/impl/DummyPolicyModelsProviderTest.java
models-provider/src/test/java/org/onap/policy/models/provider/impl/PolicyLegacyOperationalPersistenceTest.java
models-provider/src/test/java/org/onap/policy/models/provider/impl/PolicyToscaPersistenceTest.java
models-provider/src/test/java/org/onap/policy/models/provider/impl/PolicyTypePersistenceTest.java
models-provider/src/test/java/org/onap/policy/models/provider/revisionhierarchy/HierarchyFetchTest.java
models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/parameters/DmaapSimParameterHandler.java
models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/parameters/RestServerParameters.java
models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/provider/TopicData.java
models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/rest/BaseRestControllerV1.java
models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/rest/CambriaMessageBodyHandler.java
models-sim/models-sim-dmaap/src/test/java/org/onap/policy/models/sim/dmaap/provider/TopicDataTest.java
models-sim/policy-models-sim-pdp/src/main/java/org/onap/policy/models/sim/pdp/PdpSimulatorActivator.java
models-sim/policy-models-sim-pdp/src/main/java/org/onap/policy/models/sim/pdp/PdpSimulatorCommandLineArguments.java
models-sim/policy-models-sim-pdp/src/main/java/org/onap/policy/models/sim/pdp/comm/PdpStatusPublisher.java
models-sim/policy-models-sim-pdp/src/main/java/org/onap/policy/models/sim/pdp/parameters/ToscaPolicyTypeIdentifierParameters.java
models-sim/policy-models-sim-pdp/src/test/java/org/onap/policy/models/sim/pdp/parameters/TestPdpSimulatorParameterGroup.java
models-sim/policy-models-sim-pdp/src/test/java/org/onap/policy/models/sim/pdp/parameters/TestPdpSimulatorParameterHandler.java
models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaEntity.java
models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyFilter.java
models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyType.java
models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyTypeFilter.java
models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/provider/AuthorativeToscaProvider.java
models-tosca/src/main/java/org/onap/policy/models/tosca/legacy/mapping/LegacyOperationalPolicyMapper.java
models-tosca/src/main/java/org/onap/policy/models/tosca/legacy/provider/LegacyProvider.java
models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaConstraint.java
models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaConstraintLogical.java
models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaConstraintValidValues.java
models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaDataType.java
models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaDataTypes.java
models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaEntityType.java
models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaEntrySchema.java
models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaPolicies.java
models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaPolicy.java
models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaPolicyType.java
models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaPolicyTypes.java
models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaProperty.java
models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaServiceTemplate.java
models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaServiceTemplates.java
models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaTopologyTemplate.java
models-tosca/src/main/java/org/onap/policy/models/tosca/simple/provider/SimpleToscaProvider.java
models-tosca/src/main/java/org/onap/policy/models/tosca/simple/provider/SimpleToscaServiceTemplateProvider.java
models-tosca/src/main/java/org/onap/policy/models/tosca/utils/ToscaServiceTemplateUtils.java
models-tosca/src/main/java/org/onap/policy/models/tosca/utils/ToscaUtils.java
models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/PojosTest.java
models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyFilterTest.java
models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyTest.java
models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyTypeFilterTest.java
models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyTypeTest.java
models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/provider/AuthorativeToscaProviderPolicyTest.java
models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/provider/AuthorativeToscaProviderPolicyTypeTest.java
models-tosca/src/test/java/org/onap/policy/models/tosca/legacy/concepts/TestPojos.java
models-tosca/src/test/java/org/onap/policy/models/tosca/legacy/mapping/LegacyOperationalPolicyMapperTest.java
models-tosca/src/test/java/org/onap/policy/models/tosca/legacy/provider/LegacyProvider4LegacyOperationalTest.java
models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaConstraintLogicalTest.java
models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaConstraintTest.java
models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaDataTypeTest.java
models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaDataTypesTest.java
models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaEntrySchemaTest.java
models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaModelTest.java
models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaPoliciesTest.java
models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaPolicyTest.java
models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaPolicyTypeTest.java
models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaPolicyTypesTest.java
models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaPropertyTest.java
models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaServiceTemplateTest.java
models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaServiceTemplatesTest.java
models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaTimeIntervalTest.java
models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaTopologyTemplateTest.java
models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaTriggerTest.java
models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/TestPojos.java
models-tosca/src/test/java/org/onap/policy/models/tosca/simple/provider/SimpleToscaProviderTest.java
models-tosca/src/test/java/org/onap/policy/models/tosca/simple/provider/SimpleToscaServiceTemplateProviderTest.java
models-tosca/src/test/java/org/onap/policy/models/tosca/simple/serialization/MonitoringPolicySerializationTest.java
models-tosca/src/test/java/org/onap/policy/models/tosca/simple/serialization/MonitoringPolicyTypeSerializationTest.java
models-tosca/src/test/java/org/onap/policy/models/tosca/simple/serialization/OptimizationPolicyTypeSerializationTest.java
models-tosca/src/test/java/org/onap/policy/models/tosca/utils/ToscaServiceTemplateUtilsTest.java
pom.xml

index 97522c4..144d6e6 100644 (file)
@@ -33,7 +33,6 @@ import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
 import java.util.function.Function;
-
 import javax.persistence.CascadeType;
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
@@ -43,11 +42,9 @@ import javax.persistence.ManyToMany;
 import javax.persistence.MappedSuperclass;
 import javax.persistence.Table;
 import javax.ws.rs.core.Response;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NonNull;
-
 import org.apache.commons.lang3.StringUtils;
 import org.onap.policy.models.base.PfValidationResult.ValidationResult;
 
index 8a9fbc4..8cebcdb 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.models.base;
 
 import java.util.List;
 import java.util.stream.Collectors;
-
 import lombok.Builder;
 import lombok.Data;
 import lombok.NonNull;
@@ -60,8 +59,7 @@ public class PfConceptFilter implements PfObjectFilter<PfConcept> {
 
         if (LATEST_VERSION.equals(version)) {
             return this.latestVersionFilter(returnList);
-        }
-        else {
+        } else  {
             return returnList;
         }
     }
index 033a7dd..7a3e055 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.models.base;
 import java.util.NavigableMap;
 import java.util.Set;
 import java.util.TreeSet;
-
 import org.onap.policy.common.utils.validation.Assertions;
 
 /**
@@ -70,8 +69,7 @@ public class PfConceptGetterImpl<C> implements PfConceptGetter<C> {
                 break;
             }
             foundKey = nextkey;
-        }
-        while (true);
+        } while (true);
 
         return conceptMap.get(foundKey);
     }
@@ -121,8 +119,7 @@ public class PfConceptGetterImpl<C> implements PfConceptGetter<C> {
                 break;
             }
             returnSet.add(conceptMap.get(foundKey));
-        }
-        while (true);
+        } while (true);
 
         return returnSet;
     }
index 61028f9..81066c3 100644 (file)
@@ -23,11 +23,9 @@ package org.onap.policy.models.base;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.ToString;
-
 import org.onap.policy.common.utils.validation.Assertions;
 import org.onap.policy.models.base.PfValidationResult.ValidationResult;
 
index 83ae71c..340f4e3 100644 (file)
@@ -24,17 +24,14 @@ package org.onap.policy.models.base;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
-
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
 import javax.persistence.Inheritance;
 import javax.persistence.InheritanceType;
 import javax.persistence.Table;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NonNull;
-
 import org.onap.policy.common.utils.validation.Assertions;
 import org.onap.policy.models.base.PfValidationResult.ValidationResult;
 
@@ -134,9 +131,8 @@ public abstract class PfModel extends PfConcept {
                 result = validateArtifactKeyInModel((PfConceptKey) pfKey, artifactKeySet, result);
             } else if (pfKey instanceof PfReferenceKey) {
                 result = validateReferenceKeyInModel((PfReferenceKey) pfKey, referenceKeySet, result);
-            }
-            // It must be a PfKeyUse, nothing else is legal
-            else {
+            } else {
+                // It must be a PfKeyUse, nothing else is legal
                 usedKeySet.add((PfKeyUse) pfKey);
             }
         }
index 46c5bd3..c25fd17 100644 (file)
 package org.onap.policy.models.base;
 
 import javax.ws.rs.core.Response;
-
 import lombok.Getter;
 import lombok.ToString;
-
 import org.onap.policy.models.errors.concepts.ErrorResponse;
 import org.onap.policy.models.errors.concepts.ErrorResponseInfo;
 import org.onap.policy.models.errors.concepts.ErrorResponseUtils;
index 4724128..5c317d1 100644 (file)
 package org.onap.policy.models.base;
 
 import javax.ws.rs.core.Response;
-
 import lombok.Getter;
 import lombok.ToString;
-
 import org.onap.policy.models.errors.concepts.ErrorResponse;
 import org.onap.policy.models.errors.concepts.ErrorResponseInfo;
 import org.onap.policy.models.errors.concepts.ErrorResponseUtils;
index 134b621..1f4b8f6 100644 (file)
@@ -22,9 +22,7 @@ package org.onap.policy.models.base;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-
 import javax.ws.rs.core.Response;
-
 import lombok.NonNull;
 
 /**
index a5ae6c5..7984e42 100644 (file)
@@ -23,14 +23,11 @@ package org.onap.policy.models.base;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.persistence.Column;
 import javax.persistence.Embeddable;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NonNull;
-
 import org.onap.policy.common.utils.validation.Assertions;
 import org.onap.policy.models.base.PfValidationResult.ValidationResult;
 
index af9e61e..112f6a2 100644 (file)
@@ -25,9 +25,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import java.io.IOException;
-
 import javax.ws.rs.core.Response;
-
 import org.junit.Test;
 import org.onap.policy.models.errors.concepts.ErrorResponse;
 
index e28fa4c..3ae3ba8 100644 (file)
@@ -33,7 +33,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
-
 import org.junit.Test;
 import org.onap.policy.models.base.testconcepts.DummyAuthorativeConcept;
 import org.onap.policy.models.base.testconcepts.DummyBadPfConceptContainer;
index b373e41..54b5f3f 100644 (file)
@@ -71,7 +71,7 @@ public class PfConceptGetterImplTest {
         assertThatThrownBy(() -> getter.get((String) null, VERSION001)).hasMessage("conceptKeyName may not be null");
 
         assertEquals(keyW002, getter.get("W", VERSION002));
-        assertEquals(keyW002, getter.get("W", (String)null));
+        assertEquals(keyW002, getter.get("W", (String) null));
 
         assertEquals(new TreeSet<PfConceptKey>(keyMap.values()), getter.getAll(null));
         assertEquals(new TreeSet<PfConceptKey>(keyMap.values()), getter.getAll(null, null));
index 4210bc6..c756d1e 100644 (file)
@@ -29,12 +29,10 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import java.lang.reflect.Field;
-
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-
 import org.junit.Test;
 import org.onap.policy.models.base.PfKey.Compatibility;
 import org.onap.policy.models.base.testconcepts.DummyPfKey;
index b418234..9b0855f 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.models.base;
 import static org.junit.Assert.assertEquals;
 
 import javax.ws.rs.core.Response;
-
 import org.junit.Test;
 import org.onap.policy.models.errors.concepts.ErrorResponseInfo;
 
index d1ba3a4..d6985e9 100644 (file)
@@ -31,7 +31,6 @@ import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import org.junit.Test;
-
 import org.onap.policy.models.base.testconcepts.DummyPfObject;
 import org.onap.policy.models.base.testconcepts.DummyPfObjectFilter;
 
index ba36b9e..dd5c205 100644 (file)
@@ -29,7 +29,6 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import java.lang.reflect.Field;
-
 import org.junit.Test;
 
 public class PfReferenceKeyTest {
index 1495fca..180e8b7 100644 (file)
@@ -26,7 +26,6 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-
 import org.junit.Test;
 
 public class PfTimestampKeyTest {
index a66aba2..8659b4c 100644 (file)
@@ -71,15 +71,15 @@ public class PfUtilsTest {
 
     @Test
     public void testMapMap() {
-        Map<String,String> resultMap = PfUtils.mapMap(null, item -> {
+        Map<String, String> resultMap = PfUtils.mapMap(null, item -> {
             throw new RuntimeException("should not be invoked");
         });
         assertNull(resultMap);
 
-        Map<String,String> origMap = new TreeMap<>();
+        Map<String, String> origMap = new TreeMap<>();
         origMap.put("key2A", "xyz2");
         origMap.put("key2B", "pdq2");
-        Map<String,String> newMap = PfUtils.mapMap(origMap, text -> text + "X");
+        Map<String, String> newMap = PfUtils.mapMap(origMap, text -> text + "X");
 
         assertEquals("{key2A=xyz2X, key2B=pdq2X}", newMap.toString());
 
index c328a01..498b78a 100644 (file)
@@ -21,9 +21,7 @@
 package org.onap.policy.models.base.testconcepts;
 
 import java.util.Map;
-
 import lombok.NonNull;
-
 import org.onap.policy.models.base.PfConceptContainer;
 import org.onap.policy.models.base.PfConceptKey;
 
index 45de69e..56fb595 100644 (file)
@@ -21,9 +21,7 @@
 package org.onap.policy.models.base.testconcepts;
 
 import java.util.Map;
-
 import lombok.NonNull;
-
 import org.onap.policy.models.base.PfConceptContainer;
 import org.onap.policy.models.base.PfConceptKey;
 
index 893dc53..8352697 100644 (file)
@@ -22,9 +22,7 @@
 package org.onap.policy.models.base.testconcepts;
 
 import javax.ws.rs.core.Response;
-
 import lombok.NonNull;
-
 import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.base.PfModelRuntimeException;
 
index 12875ea..2c3fd18 100644 (file)
@@ -21,9 +21,7 @@
 package org.onap.policy.models.base.testconcepts;
 
 import javax.ws.rs.core.Response;
-
 import lombok.NonNull;
-
 import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.base.PfModelRuntimeException;
 
index ed2fb98..81ebb6e 100644 (file)
@@ -23,9 +23,7 @@ package org.onap.policy.models.base.testconcepts;
 
 import java.util.Arrays;
 import java.util.List;
-
 import lombok.NonNull;
-
 import org.onap.policy.models.base.PfConcept;
 import org.onap.policy.models.base.PfKey;
 import org.onap.policy.models.base.PfValidationResult;
index fcf4f77..53009dd 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.models.base.testconcepts;
 import lombok.Data;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
-
 import org.apache.commons.lang3.ObjectUtils;
 import org.onap.policy.models.base.PfNameVersion;
 
index d7d1784..177a7f3 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.models.dao;
 
 import java.lang.reflect.InvocationTargetException;
 import javax.ws.rs.core.Response;
-
 import org.onap.policy.common.utils.validation.Assertions;
 import org.onap.policy.models.base.PfModelException;
 import org.slf4j.Logger;
index 369b5a1..965a71c 100644 (file)
@@ -21,7 +21,6 @@
 package org.onap.policy.models.dao.converters;
 
 import java.util.UUID;
-
 import javax.persistence.AttributeConverter;
 import javax.persistence.Converter;
 import javax.xml.bind.annotation.adapters.XmlAdapter;
index 0b32b51..092b14a 100644 (file)
@@ -26,13 +26,11 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.Persistence;
 import javax.persistence.TypedQuery;
 import javax.ws.rs.core.Response;
-
 import org.onap.policy.models.base.PfConcept;
 import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.base.PfModelException;
index c61a585..6656515 100644 (file)
@@ -24,16 +24,13 @@ package org.onap.policy.models.dao;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
-
 import javax.persistence.Column;
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NonNull;
-
 import org.onap.policy.common.utils.validation.Assertions;
 import org.onap.policy.models.base.PfConcept;
 import org.onap.policy.models.base.PfConceptKey;
index 41ead40..ee755b4 100644 (file)
@@ -23,16 +23,13 @@ package org.onap.policy.models.dao;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.persistence.Column;
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NonNull;
-
 import org.onap.policy.common.utils.validation.Assertions;
 import org.onap.policy.models.base.PfConcept;
 import org.onap.policy.models.base.PfKey;
index 0dee8b4..18d87ae 100644 (file)
@@ -22,16 +22,13 @@ package org.onap.policy.models.dao;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.persistence.Column;
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NonNull;
-
 import org.onap.policy.models.base.PfConcept;
 import org.onap.policy.models.base.PfKey;
 import org.onap.policy.models.base.PfTimestampKey;
index b9246b5..f5be10b 100644 (file)
 package org.onap.policy.models.decisions.concepts;
 
 import javax.ws.rs.core.Response;
-
 import lombok.Getter;
 import lombok.ToString;
-
 import org.onap.policy.models.errors.concepts.ErrorResponse;
 import org.onap.policy.models.errors.concepts.ErrorResponseInfo;
 import org.onap.policy.models.errors.concepts.ErrorResponseUtils;
index 81d35d6..5ae9fd9 100644 (file)
@@ -25,7 +25,6 @@ import com.openpojo.validation.Validator;
 import com.openpojo.validation.ValidatorBuilder;
 import com.openpojo.validation.test.impl.GetterTester;
 import com.openpojo.validation.test.impl.SetterTester;
-
 import org.junit.Test;
 import org.onap.policy.common.utils.test.ToStringTester;
 
index 88960f8..1f1fc0e 100644 (file)
 package org.onap.policy.models.errors.concepts;
 
 import com.google.gson.annotations.SerializedName;
-
 import java.io.Serializable;
 import java.util.List;
-
 import javax.ws.rs.core.Response;
-
 import lombok.Data;
 
 /**
index ff2baa9..1373cce 100644 (file)
@@ -24,9 +24,7 @@ import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.junit.Assert.assertEquals;
 
 import java.util.Arrays;
-
 import javax.ws.rs.core.Response;
-
 import org.junit.Test;
 import org.onap.policy.common.utils.coder.StandardCoder;
 import org.slf4j.Logger;
index 9ff7574..054aaa5 100644 (file)
@@ -25,7 +25,6 @@ import com.openpojo.validation.Validator;
 import com.openpojo.validation.ValidatorBuilder;
 import com.openpojo.validation.test.impl.GetterTester;
 import com.openpojo.validation.test.impl.SetterTester;
-
 import org.junit.Test;
 import org.onap.policy.common.utils.test.ToStringTester;
 
index abfd2eb..c6e273d 100644 (file)
@@ -212,7 +212,7 @@ public class AaiCustomQueryOperationTest extends BasicAaiOperation<Map<String, S
         verify(webAsync).put(requestCaptor.capture(), any(InvocationCallback.class));
 
         String reqText = requestCaptor.getValue().getEntity();
-        Map<String,String> reqMap = coder.decode(reqText, Map.class);
+        Map<String, String> reqMap = coder.decode(reqText, Map.class);
 
         // sort the request fields so they match the order in cq.json
         Map<String, String> request = new TreeMap<>(reqMap);
index f731a2c..4918dd7 100644 (file)
@@ -32,7 +32,7 @@ import org.onap.policy.controlloop.actorserviceprovider.parameters.ParameterVali
 /**
  * Operator that uses HTTP. The operator's parameters must be an {@link HttpParams}.
  */
-public class HttpOperator extends TypedOperator<HttpConfig,HttpOperation<?>> {
+public class HttpOperator extends TypedOperator<HttpConfig, HttpOperation<?>> {
 
     /**
      * Constructs the object.
index 5561a97..9377769 100644 (file)
@@ -24,7 +24,6 @@ import java.util.Map;
 import lombok.Getter;
 import org.onap.policy.controlloop.actorserviceprovider.Operation;
 import org.onap.policy.controlloop.actorserviceprovider.parameters.ControlLoopOperationParams;
-import org.onap.policy.controlloop.actorserviceprovider.parameters.HttpParams;
 
 /**
  * Operator with typed parameter information.
index 29f507e..ff59176 100644 (file)
@@ -107,7 +107,7 @@ public class BidirectionalTopicOperatorTest {
         AtomicReference<BidirectionalTopicConfig> configRef = new AtomicReference<>();
 
         // @formatter:off
-        OperationMaker<BidirectionalTopicConfig, BidirectionalTopicOperation<?,?>> maker =
+        OperationMaker<BidirectionalTopicConfig, BidirectionalTopicOperation<?, ?>> maker =
             (params, config) -> {
                 paramsRef.set(params);
                 configRef.set(config);
@@ -150,7 +150,7 @@ public class BidirectionalTopicOperatorTest {
         }
 
         @Override
-        public BidirectionalTopicOperation<?,?> buildOperation(ControlLoopOperationParams params) {
+        public BidirectionalTopicOperation<?, ?> buildOperation(ControlLoopOperationParams params) {
             return null;
         }
     }
index e3fef83..42a8717 100644 (file)
@@ -77,7 +77,7 @@ public class HttpPollingParamsTest {
     }
 
     private void testValidateField(String fieldName, String expected,
-                    Function<HttpPollingParamsBuilder<?,?>, HttpPollingParamsBuilder<?,?>> makeInvalid) {
+                    Function<HttpPollingParamsBuilder<?, ?>, HttpPollingParamsBuilder<?, ?>> makeInvalid) {
 
         // original params should be valid
         ValidationResult result = params.validate(CONTAINER);
index 30d4fcb..008c769 100644 (file)
@@ -29,12 +29,10 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
-
 import java.lang.reflect.Type;
 import java.time.Instant;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index 11da28a..54f9782 100644 (file)
@@ -29,7 +29,6 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
-
 import java.lang.reflect.Type;
 import java.time.Instant;
 
index 0b94e85..5992ce2 100644 (file)
@@ -29,12 +29,10 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
-
 import java.lang.reflect.Type;
 import java.time.Instant;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
-
 import org.onap.policy.controlloop.ControlLoopNotificationType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
index 21a9716..8c241c8 100644 (file)
@@ -29,7 +29,6 @@ import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.DefaultValue;
@@ -145,55 +144,55 @@ public class RestTest {
         RestManager mgr = new RestManager();
 
         Pair<Integer, String> result = mgr.get(getUri, null, null, null);
-        assertEquals((Integer)200, result.first);
+        assertEquals((Integer) 200, result.first);
         assertTrue(result.second != null);
         assertTrue(result.second.length() > 0);
         assertEquals("GOT: " + EXPECT_STRING, result.second);
 
         result = mgr.delete(deleteUri, null, null, null, null, null);
-        assertEquals((Integer)200, result.first);
+        assertEquals((Integer) 200, result.first);
         assertTrue(result.second != null);
         assertTrue(result.second.length() > 0);
         assertEquals("DELETE: " + EXPECT_STRING, result.second);
 
         result = mgr.delete(deleteUri, null, null, null);
-        assertEquals((Integer)200, result.first);
+        assertEquals((Integer) 200, result.first);
         assertTrue(result.second != null);
         assertTrue(result.second.length() > 0);
         assertEquals("DELETE: " + EXPECT_STRING, result.second);
 
         result = mgr.put(putUri, null, null, null, MediaType.TEXT_PLAIN, PAYLOAD);
-        assertEquals((Integer)200, result.first);
+        assertEquals((Integer) 200, result.first);
         assertTrue(result.second != null);
         assertTrue(result.second.length() > 0);
         assertEquals("PUT: " + PAYLOAD + EXPECT_STRING, result.second);
 
         result = mgr.put(putUriBlank, null, null, null, MediaType.TEXT_PLAIN, PAYLOAD);
-        assertEquals((Integer)200, result.first);
+        assertEquals((Integer) 200, result.first);
         assertTrue(result.second != null);
         assertTrue(result.second.length() > 0);
         assertEquals("PUT: " + PAYLOAD + RETURN_STRING, result.second);
 
         result = mgr.post(postUri, null, null, null, MediaType.TEXT_PLAIN, PAYLOAD);
-        assertEquals((Integer)200, result.first);
+        assertEquals((Integer) 200, result.first);
         assertTrue(result.second != null);
         assertTrue(result.second.length() > 0);
         assertEquals("POST: " + PAYLOAD + EXPECT_STRING, result.second);
 
         result = mgr.post(postUriBlank, null, null, null, MediaType.TEXT_PLAIN, PAYLOAD);
-        assertEquals((Integer)200, result.first);
+        assertEquals((Integer) 200, result.first);
         assertTrue(result.second != null);
         assertTrue(result.second.length() > 0);
         assertEquals("POST: " + PAYLOAD + RETURN_STRING, result.second);
 
         result = mgr.patch(patchUri, null, null, null, PAYLOAD);
-        assertEquals((Integer)200, result.first);
+        assertEquals((Integer) 200, result.first);
         assertTrue(result.second != null);
         assertTrue(result.second.length() > 0);
         assertEquals("PATCH: " + PAYLOAD + EXPECT_STRING, result.second);
 
         result = mgr.patch(patchUriBlank, null, null, null, PAYLOAD);
-        assertEquals((Integer)200, result.first);
+        assertEquals((Integer) 200, result.first);
         assertTrue(result.second != null);
         assertTrue(result.second.length() > 0);
         assertEquals("PATCH: " + PAYLOAD + RETURN_STRING, result.second);
@@ -204,49 +203,49 @@ public class RestTest {
         RestManager mgr = new RestManager();
 
         Pair<Integer, String> result = mgr.get(getUri, "", null, null);
-        assertEquals((Integer)200, result.first);
+        assertEquals((Integer) 200, result.first);
         assertTrue(result.second != null);
         assertTrue(result.second.length() > 0);
         assertEquals("GOT: " + EXPECT_STRING, result.second);
 
         result = mgr.delete(deleteUri, "", null, null, null, null);
-        assertEquals((Integer)200, result.first);
+        assertEquals((Integer) 200, result.first);
         assertTrue(result.second != null);
         assertTrue(result.second.length() > 0);
         assertEquals("DELETE: " + EXPECT_STRING, result.second);
 
         result = mgr.put(putUri, "", null, null, MediaType.TEXT_PLAIN, PAYLOAD);
-        assertEquals((Integer)200, result.first);
+        assertEquals((Integer) 200, result.first);
         assertTrue(result.second != null);
         assertTrue(result.second.length() > 0);
         assertEquals("PUT: " + PAYLOAD + EXPECT_STRING, result.second);
 
         result = mgr.put(putUriBlank, "", null, null, MediaType.TEXT_PLAIN, PAYLOAD);
-        assertEquals((Integer)200, result.first);
+        assertEquals((Integer) 200, result.first);
         assertTrue(result.second != null);
         assertTrue(result.second.length() > 0);
         assertEquals("PUT: " + PAYLOAD + RETURN_STRING, result.second);
 
         result = mgr.post(postUri, "", null, null, MediaType.TEXT_PLAIN, PAYLOAD);
-        assertEquals((Integer)200, result.first);
+        assertEquals((Integer) 200, result.first);
         assertTrue(result.second != null);
         assertTrue(result.second.length() > 0);
         assertEquals("POST: " + PAYLOAD + EXPECT_STRING, result.second);
 
         result = mgr.post(postUriBlank, "", null, null, MediaType.TEXT_PLAIN, PAYLOAD);
-        assertEquals((Integer)200, result.first);
+        assertEquals((Integer) 200, result.first);
         assertTrue(result.second != null);
         assertTrue(result.second.length() > 0);
         assertEquals("POST: " + PAYLOAD + RETURN_STRING, result.second);
 
         result = mgr.patch(patchUri, "", null, null, PAYLOAD);
-        assertEquals((Integer)200, result.first);
+        assertEquals((Integer) 200, result.first);
         assertTrue(result.second != null);
         assertTrue(result.second.length() > 0);
         assertEquals("PATCH: " + PAYLOAD + EXPECT_STRING, result.second);
 
         result = mgr.patch(patchUriBlank, "", null, null, PAYLOAD);
-        assertEquals((Integer)200, result.first);
+        assertEquals((Integer) 200, result.first);
         assertTrue(result.second != null);
         assertTrue(result.second.length() > 0);
         assertEquals("PATCH: " + PAYLOAD + RETURN_STRING, result.second);
@@ -257,49 +256,49 @@ public class RestTest {
         RestManager mgr = new RestManager();
 
         Pair<Integer, String> result = mgr.get(getUri, "user", null, null);
-        assertEquals((Integer)200, result.first);
+        assertEquals((Integer) 200, result.first);
         assertTrue(result.second != null);
         assertTrue(result.second.length() > 0);
         assertEquals("GOT: " + EXPECT_STRING, result.second);
 
         result = mgr.delete(deleteUri, "user", null, null, null, null);
-        assertEquals((Integer)200, result.first);
+        assertEquals((Integer) 200, result.first);
         assertTrue(result.second != null);
         assertTrue(result.second.length() > 0);
         assertEquals("DELETE: " + EXPECT_STRING, result.second);
 
         result = mgr.put(putUri, "user", null, null, MediaType.TEXT_PLAIN, PAYLOAD);
-        assertEquals((Integer)200, result.first);
+        assertEquals((Integer) 200, result.first);
         assertTrue(result.second != null);
         assertTrue(result.second.length() > 0);
         assertEquals("PUT: " + PAYLOAD + EXPECT_STRING, result.second);
 
         result = mgr.put(putUriBlank, "user", null, null, MediaType.TEXT_PLAIN, PAYLOAD);
-        assertEquals((Integer)200, result.first);
+        assertEquals((Integer) 200, result.first);
         assertTrue(result.second != null);
         assertTrue(result.second.length() > 0);
         assertEquals("PUT: " + PAYLOAD + RETURN_STRING, result.second);
 
         result = mgr.post(postUri, "user", null, null, MediaType.TEXT_PLAIN, PAYLOAD);
-        assertEquals((Integer)200, result.first);
+        assertEquals((Integer) 200, result.first);
         assertTrue(result.second != null);
         assertTrue(result.second.length() > 0);
         assertEquals("POST: " + PAYLOAD + EXPECT_STRING, result.second);
 
         result = mgr.post(postUriBlank, "user", null, null, MediaType.TEXT_PLAIN, PAYLOAD);
-        assertEquals((Integer)200, result.first);
+        assertEquals((Integer) 200, result.first);
         assertTrue(result.second != null);
         assertTrue(result.second.length() > 0);
         assertEquals("POST: " + PAYLOAD + RETURN_STRING, result.second);
 
         result = mgr.patch(patchUri, "user", null, null, PAYLOAD);
-        assertEquals((Integer)200, result.first);
+        assertEquals((Integer) 200, result.first);
         assertTrue(result.second != null);
         assertTrue(result.second.length() > 0);
         assertEquals("PATCH: " + PAYLOAD + EXPECT_STRING, result.second);
 
         result = mgr.patch(patchUriBlank, "user", null, null, PAYLOAD);
-        assertEquals((Integer)200, result.first);
+        assertEquals((Integer) 200, result.first);
         assertTrue(result.second != null);
         assertTrue(result.second.length() > 0);
         assertEquals("PATCH: " + PAYLOAD + RETURN_STRING, result.second);
@@ -310,19 +309,19 @@ public class RestTest {
         RestManager mgr = new RestManager();
 
         Pair<Integer, String> result = mgr.get(baseUri + "RestTest/GetHello/", null, null, null);
-        assertEquals((Integer)404, result.first);
+        assertEquals((Integer) 404, result.first);
 
         result = mgr.delete(baseUri + "RestTest/DeleteHello/", null, null, null, null, null);
-        assertEquals((Integer)404, result.first);
+        assertEquals((Integer) 404, result.first);
 
         result = mgr.put(baseUri + "RestTest/PutHello/", null, null, null, MediaType.TEXT_PLAIN, PAYLOAD);
-        assertEquals((Integer)404, result.first);
+        assertEquals((Integer) 404, result.first);
 
         result = mgr.post(baseUri + "RestTest/PostHello/", null, null, null, MediaType.TEXT_PLAIN, PAYLOAD);
-        assertEquals((Integer)404, result.first);
+        assertEquals((Integer) 404, result.first);
 
         result = mgr.patch(baseUri + "RestTest/PatchHello/", null, null, null, PAYLOAD);
-        assertEquals((Integer)404, result.first);
+        assertEquals((Integer) 404, result.first);
     }
 
     @Test
@@ -330,33 +329,33 @@ public class RestTest {
         RestManager mgr = new RestManager();
 
         Pair<Integer, String> result = mgr.get(baseUri + "RestTest/GetHello/" + NAME_PARAM, null, null, null);
-        assertEquals((Integer)200, result.first);
+        assertEquals((Integer) 200, result.first);
         assertTrue(result.second != null);
         assertTrue(result.second.length() > 0);
         assertEquals("GOT: " + RETURN_STRING + NAME_PARAM + " aged 90", result.second);
 
         result = mgr.delete(baseUri + "RestTest/DeleteHello/" + NAME_PARAM, null, null, null, null, null);
-        assertEquals((Integer)200, result.first);
+        assertEquals((Integer) 200, result.first);
         assertTrue(result.second != null);
         assertTrue(result.second.length() > 0);
         assertEquals("DELETE: " + RETURN_STRING + NAME_PARAM + " aged 90", result.second);
 
         result = mgr.put(baseUri + "RestTest/PutHello/" + NAME_PARAM, null, null, null, MediaType.TEXT_PLAIN, PAYLOAD);
-        assertEquals((Integer)200, result.first);
+        assertEquals((Integer) 200, result.first);
         assertTrue(result.second != null);
         assertTrue(result.second.length() > 0);
         assertEquals("PUT: " + PAYLOAD + RETURN_STRING + NAME_PARAM + " aged 90", result.second);
 
         result = mgr.post(baseUri + "RestTest/PostHello/" + NAME_PARAM, null, null,
             null, MediaType.TEXT_PLAIN, PAYLOAD);
-        assertEquals((Integer)200, result.first);
+        assertEquals((Integer) 200, result.first);
         assertTrue(result.second != null);
         assertTrue(result.second.length() > 0);
         assertEquals("POST: " + PAYLOAD + RETURN_STRING + NAME_PARAM + " aged 90", result.second);
 
         result = mgr.patch(baseUri + "RestTest/PatchHello/" + NAME_PARAM, null, null,
             null, PAYLOAD);
-        assertEquals((Integer)200, result.first);
+        assertEquals((Integer) 200, result.first);
         assertTrue(result.second != null);
         assertTrue(result.second.length() > 0);
         assertEquals("PATCH: " + PAYLOAD + RETURN_STRING + NAME_PARAM + " aged 90", result.second);
@@ -367,19 +366,19 @@ public class RestTest {
         RestManager mgr = new RestManager();
 
         Pair<Integer, String> result = mgr.get(baseUri + "NonExistant/URL/", null, null, null);
-        assertEquals((Integer)404, result.first);
+        assertEquals((Integer) 404, result.first);
 
         result = mgr.delete(baseUri + "NonExistant/URL/", null, null, null, null, null);
-        assertEquals((Integer)404, result.first);
+        assertEquals((Integer) 404, result.first);
 
         result = mgr.put(baseUri + "NonExistant/URL/", null, null, null, MediaType.TEXT_PLAIN, PAYLOAD);
-        assertEquals((Integer)404, result.first);
+        assertEquals((Integer) 404, result.first);
 
         result = mgr.post(baseUri + "NonExistant/URL/", null, null, null, MediaType.TEXT_PLAIN, PAYLOAD);
-        assertEquals((Integer)404, result.first);
+        assertEquals((Integer) 404, result.first);
 
         result = mgr.patch(baseUri + "NonExistant/URL/", null, null, null, PAYLOAD);
-        assertEquals((Integer)404, result.first);
+        assertEquals((Integer) 404, result.first);
     }
 
     @Test
@@ -387,35 +386,35 @@ public class RestTest {
         RestManager mgr = new RestManager();
 
         Pair<Integer, String> result = mgr.get(deleteUri, null, null, null);
-        assertEquals((Integer)405, result.first);
+        assertEquals((Integer) 405, result.first);
 
         result = mgr.delete(getUri, null, null, null, null, null);
-        assertEquals((Integer)405, result.first);
+        assertEquals((Integer) 405, result.first);
 
         result = mgr.delete(getUri, null, null, null);
-        assertEquals((Integer)405, result.first);
+        assertEquals((Integer) 405, result.first);
 
         result = mgr.put(getUri, null, null, null, MediaType.TEXT_PLAIN, PAYLOAD);
-        assertEquals((Integer)405, result.first);
+        assertEquals((Integer) 405, result.first);
 
         result = mgr.post(getUri, null, null, null, MediaType.TEXT_PLAIN, PAYLOAD);
-        assertEquals((Integer)405, result.first);
+        assertEquals((Integer) 405, result.first);
 
         result = mgr.patch(getUri, null, null, null, PAYLOAD);
-        assertEquals((Integer)405, result.first);
+        assertEquals((Integer) 405, result.first);
     }
 
     @GET
     @Path("/GetHello/{name}")
     @Produces(MediaType.TEXT_PLAIN)
-    public String getIt( @PathParam("name") String name, @DefaultValue("90") @QueryParam("age") String age) {
+    public String getIt(@PathParam("name") String name, @DefaultValue("90") @QueryParam("age") String age) {
         return "GOT: " + RETURN_STRING + name + " aged " + age;
     }
 
     @DELETE
     @Path("/DeleteHello/{name}")
     @Produces(MediaType.TEXT_PLAIN)
-    public String deleteIt( @PathParam("name") String name, @DefaultValue("90") @QueryParam("age") String age) {
+    public String deleteIt(@PathParam("name") String name, @DefaultValue("90") @QueryParam("age") String age) {
         return "DELETE: " + RETURN_STRING + name + " aged " + age;
     }
 
@@ -434,7 +433,7 @@ public class RestTest {
     @PUT
     @Path("/PutBlank")
     @Produces(MediaType.TEXT_PLAIN)
-    public String putIt( String payload) {
+    public String putIt(String payload) {
         return "PUT: " + payload + RETURN_STRING;
     }
 
@@ -453,7 +452,7 @@ public class RestTest {
     @POST
     @Path("/PostBlank")
     @Produces(MediaType.TEXT_PLAIN)
-    public String postBlank( String payload) {
+    public String postBlank(String payload) {
         return "POST: " + payload + RETURN_STRING;
     }
 
@@ -479,7 +478,7 @@ public class RestTest {
     @Patch
     @Path("/PatchBlank")
     @Produces(MERGE_PATCH_PLUS_JSON)
-    public String patchBlank( String payload) {
+    public String patchBlank(String payload) {
         return "PATCH: " + payload + RETURN_STRING;
     }
 }
index 73efbb0..d791362 100644 (file)
@@ -25,7 +25,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.UUID;
-
 import org.junit.Test;
 
 public class ServiceTest {
index fa18cb2..65b6559 100644 (file)
 package org.onap.policy.sdnc;
 
 import com.google.gson.JsonSyntaxException;
-
 import java.util.HashMap;
 import java.util.Map;
-
 import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure;
 import org.onap.policy.common.endpoints.utils.NetLoggerUtil;
 import org.onap.policy.common.endpoints.utils.NetLoggerUtil.EventType;
 import org.onap.policy.rest.RestManager;
 import org.onap.policy.rest.RestManager.Pair;
 import org.onap.policy.sdnc.util.Serialization;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index cdbe9dc..909e5d8 100644 (file)
@@ -23,7 +23,6 @@
 package org.onap.policy.sdnr;
 
 import com.google.gson.annotations.SerializedName;
-
 import java.io.Serializable;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
index 7640242..429b131 100644 (file)
@@ -31,10 +31,8 @@ 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.time.Instant;
-
 import org.onap.policy.sdnr.PciRequest;
 import org.onap.policy.sdnr.PciResponse;
 
index 4cbda52..bd5fad4 100644 (file)
@@ -27,10 +27,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.sdnr.util.Serialization;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index 14382f0..17f8a58 100644 (file)
 package org.onap.policy.vfc;
 
 import com.google.gson.JsonSyntaxException;
-
 import java.util.HashMap;
 import java.util.Map;
-
 import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure;
 import org.onap.policy.common.endpoints.utils.NetLoggerUtil;
 import org.onap.policy.common.endpoints.utils.NetLoggerUtil.EventType;
index a66264e..acaad20 100644 (file)
@@ -41,7 +41,7 @@ public class VfcHealAdditionalParamsTest {
         assertEquals(action, additionalParams.getAction());
 
         VfcHealActionVmInfo actionInfo = new VfcHealActionVmInfo();
-        additionalParams.setActionInfo(actionInfo );
+        additionalParams.setActionInfo(actionInfo);
         assertEquals(actionInfo, additionalParams.getActionInfo());
 
         assertNotEquals(0, additionalParams.hashCode());
index 67720cc..ec222e9 100644 (file)
@@ -27,7 +27,6 @@ import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 
 import java.util.UUID;
-
 import org.junit.Test;
 
 public class VfcRequestTest {
index e726576..0bfc906 100644 (file)
@@ -200,7 +200,7 @@ public class ControlLoopCompiler implements Serializable {
         //
         // They really shouldn't have any policies attached.
         //
-        if ((policy.getPolicies() != null || policy.getPolicies().isEmpty()) && callback != null ) {
+        if ((policy.getPolicies() != null || policy.getPolicies().isEmpty()) && callback != null) {
             callback.onWarning("Open Loop policy contains policies. The policies will never be invoked.");
         }
     }
@@ -299,7 +299,7 @@ public class ControlLoopCompiler implements Serializable {
         if (LOGGER.isDebugEnabled()) {
             LOGGER.info("Trigger Node {}", node);
         }
-        if (graph.inDegreeOf(node) > 0 ) {
+        if (graph.inDegreeOf(node) > 0) {
             //
             // Really should NEVER get here unless someone messed up the code above.
             //
@@ -353,10 +353,10 @@ public class ControlLoopCompiler implements Serializable {
         if (! isRecipeOk(operPolicy, callback)) {
             isOk = false;
         }
-        if (! isTargetOk(operPolicy, callback) ) {
+        if (! isTargetOk(operPolicy, callback)) {
             isOk = false;
         }
-        if (! arePolicyResultsOk(operPolicy, callback) ) {
+        if (! arePolicyResultsOk(operPolicy, callback)) {
             isOk = false;
         }
         return isOk;
@@ -434,19 +434,19 @@ public class ControlLoopCompiler implements Serializable {
         // Check that policy results are connected to either default final * or another policy
         //
         boolean isOk = isSuccessPolicyResultOk(operPolicy, callback);
-        if (! isFailurePolicyResultOk(operPolicy, callback) ) {
+        if (! isFailurePolicyResultOk(operPolicy, callback)) {
             isOk = false;
         }
-        if (! isFailureRetriesPolicyResultOk(operPolicy, callback) ) {
+        if (! isFailureRetriesPolicyResultOk(operPolicy, callback)) {
             isOk = false;
         }
-        if (! isFailureTimeoutPolicyResultOk(operPolicy, callback) ) {
+        if (! isFailureTimeoutPolicyResultOk(operPolicy, callback)) {
             isOk = false;
         }
-        if (! isFailureExceptionPolicyResultOk(operPolicy, callback) ) {
+        if (! isFailureExceptionPolicyResultOk(operPolicy, callback)) {
             isOk = false;
         }
-        if (! isFailureGuardPolicyResultOk(operPolicy, callback) ) {
+        if (! isFailureGuardPolicyResultOk(operPolicy, callback)) {
             isOk = false;
         }
         return isOk;
index 435963a..6f49f6a 100644 (file)
 package org.onap.policy.controlloop.guard.compiler;
 
 import java.io.InputStream;
-
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-
 import org.onap.policy.controlloop.compiler.CompilerException;
 import org.onap.policy.controlloop.compiler.ControlLoopCompilerCallback;
 import org.onap.policy.controlloop.policy.guard.Constraint;
index 95494d8..256f8be 100644 (file)
@@ -24,7 +24,6 @@ package org.onap.policy.controlloop.policy;
 import java.io.Serializable;
 import java.util.LinkedList;
 import java.util.List;
-
 import org.onap.aai.domain.yang.Pnf;
 import org.onap.policy.sdc.Resource;
 import org.onap.policy.sdc.Service;
index 728733d..7a64f2f 100644 (file)
@@ -336,7 +336,7 @@ public class Policy implements Serializable {
     }
 
     private boolean equalsMayBeNull(final Object obj1, final Object obj2) {
-        if ( obj1 == null ) {
+        if (obj1 == null) {
             return obj2 == null;
         }
         return obj1.equals(obj2);
index 47f6f14..c4b2cd4 100644 (file)
 package org.onap.policy.controlloop.policy.builder.impl;
 
 import com.google.common.base.Strings;
-
 import java.util.LinkedList;
 import java.util.UUID;
-
 import org.onap.aai.domain.yang.Pnf;
 import org.onap.policy.controlloop.compiler.CompilerException;
 import org.onap.policy.controlloop.compiler.ControlLoopCompiler;
index b16ecbb..ab87b16 100644 (file)
@@ -29,7 +29,7 @@ import java.util.Map;
 public class Constraint {
 
     private Integer freqLimitPerTarget;
-    private Map<String,String> timeWindow;
+    private Map<String, String> timeWindow;
     private Map<String, String> activeTimeRange;
     private Integer minVnfCount;
     private Integer maxVnfCount;
index 55b96e1..5ad052b 100644 (file)
@@ -179,7 +179,7 @@ public class GuardPolicy {
     }
 
     private boolean equalsMayBeNull(final Object obj1, final Object obj2) {
-        if ( obj1 == null ) {
+        if (obj1 == null) {
             return obj2 == null;
         }
         return obj1.equals(obj2);
index 70d23bc..50f5086 100644 (file)
@@ -22,7 +22,6 @@
 package org.onap.policy.controlloop.policy.guard.builder.impl;
 
 import java.util.LinkedList;
-
 import org.onap.policy.controlloop.compiler.CompilerException;
 import org.onap.policy.controlloop.compiler.ControlLoopCompilerCallback;
 import org.onap.policy.controlloop.guard.compiler.ControlLoopGuardCompiler;
@@ -105,7 +104,7 @@ public class ControlLoopGuardBuilderImpl implements ControlLoopGuardBuilder {
         if (constraints == null) {
             throw new BuilderException("Constraint much not be null");
         }
-        if (!addLimitConstraints(id,constraints)) {
+        if (!addLimitConstraints(id, constraints)) {
             throw new BuilderException(NO_EXISTING_GUARD_POLICY_MATCHING_THE_ID + id);
         }
         return this;
index 98c00eb..71d67f0 100644 (file)
@@ -31,7 +31,6 @@ import java.io.FileInputStream;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.junit.Test;
 import org.onap.policy.controlloop.policy.ControlLoopPolicy;
 import org.onap.policy.controlloop.policy.FinalResult;
index 43428c6..71a80db 100644 (file)
@@ -26,7 +26,6 @@ import static org.junit.Assert.assertNotNull;
 
 import java.io.FileInputStream;
 import java.io.InputStreamReader;
-
 import org.junit.Test;
 import org.onap.policy.common.utils.coder.YamlJsonTranslator;
 import org.slf4j.Logger;
index c0131f5..f247baa 100644 (file)
@@ -27,10 +27,8 @@ import static org.junit.Assert.assertTrue;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.junit.Ignore;
 import org.junit.Test;
-
 import org.onap.aai.domain.yang.Pnf;
 import org.onap.policy.common.utils.io.Serializer;
 import org.onap.policy.sdc.Resource;
index 83a58ee..ae41a5c 100644 (file)
@@ -25,7 +25,6 @@ import com.openpojo.validation.Validator;
 import com.openpojo.validation.ValidatorBuilder;
 import com.openpojo.validation.test.impl.GetterTester;
 import com.openpojo.validation.test.impl.SetterTester;
-
 import org.junit.Test;
 import org.onap.policy.common.utils.test.ToStringTester;
 
index 8f647a4..313482d 100644 (file)
@@ -23,11 +23,9 @@ package org.onap.policy.models.pdp.concepts;
 
 import java.util.List;
 import java.util.stream.Collectors;
-
 import lombok.Builder;
 import lombok.Data;
 import lombok.NonNull;
-
 import org.apache.commons.lang3.ObjectUtils;
 import org.onap.policy.models.base.PfObjectFilter;
 import org.onap.policy.models.pdp.enums.PdpState;
index 5b1566d..6207bbe 100644 (file)
@@ -23,11 +23,9 @@ package org.onap.policy.models.pdp.concepts;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
-
 import org.onap.policy.models.base.PfUtils;
 import org.onap.policy.models.pdp.enums.PdpHealthStatus;
 import org.onap.policy.models.pdp.enums.PdpMessageType;
index 14ecd7c..3d74cb6 100644 (file)
@@ -21,7 +21,6 @@
 package org.onap.policy.models.pdp.concepts;
 
 import java.util.List;
-
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
index 9dafc41..7ea7cd3 100644 (file)
@@ -23,11 +23,8 @@ package org.onap.policy.models.pdp.persistence.provider;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.ws.rs.core.Response;
-
 import lombok.NonNull;
-
 import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.base.PfKey;
 import org.onap.policy.models.base.PfModelException;
index dbe163e..95af265 100644 (file)
@@ -27,7 +27,6 @@ import com.openpojo.validation.Validator;
 import com.openpojo.validation.ValidatorBuilder;
 import com.openpojo.validation.test.impl.GetterTester;
 import com.openpojo.validation.test.impl.SetterTester;
-
 import org.junit.Test;
 import org.onap.policy.common.utils.test.ToStringTester;
 
index 68af3d3..79f15b9 100644 (file)
@@ -27,7 +27,6 @@ import static org.onap.policy.models.pdp.concepts.PdpMessageUtils.removeVariable
 
 import java.util.Arrays;
 import java.util.Collections;
-
 import org.junit.Test;
 import org.onap.policy.models.pdp.enums.PdpHealthStatus;
 import org.onap.policy.models.pdp.enums.PdpState;
index bd11915..1daadcf 100644 (file)
@@ -32,7 +32,6 @@ import static org.junit.Assert.assertTrue;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
-
 import org.junit.Test;
 import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.base.PfReferenceKey;
index edef297..b8d8d99 100644 (file)
@@ -29,7 +29,6 @@ import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
 import java.util.Date;
-
 import org.junit.Test;
 import org.onap.policy.models.base.PfTimestampKey;
 import org.onap.policy.models.base.PfValidationResult;
index 6b3f151..7f8752d 100644 (file)
@@ -32,7 +32,6 @@ import static org.junit.Assert.assertTrue;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
-
 import org.junit.Test;
 import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.base.PfReferenceKey;
index c4a7a3d..7dc5d3a 100644 (file)
@@ -88,7 +88,7 @@ public class PdpProviderTest {
         jdbcProperties.setProperty(PersistenceUnitProperties.JDBC_DRIVER, "org.h2.Driver");
         jdbcProperties.setProperty(PersistenceUnitProperties.JDBC_URL, "jdbc:h2:mem:testdb");
 
-        daoParameters.setJdbcProperties(jdbcProperties );
+        daoParameters.setJdbcProperties(jdbcProperties);
 
         pfDao = new PfDaoFactory().createPfDao(daoParameters);
         pfDao.init(daoParameters);
index fa4d663..bcf9ec1 100644 (file)
@@ -22,7 +22,6 @@
 package org.onap.policy.models.provider;
 
 import lombok.Data;
-
 import org.onap.policy.common.parameters.GroupValidationResult;
 import org.onap.policy.common.parameters.ParameterGroup;
 import org.onap.policy.common.parameters.ValidationStatus;
index f8ff4f3..7d28b61 100644 (file)
@@ -25,11 +25,8 @@ import java.util.Base64;
 import java.util.Date;
 import java.util.List;
 import java.util.Properties;
-
 import javax.ws.rs.core.Response;
-
 import lombok.NonNull;
-
 import org.eclipse.persistence.config.PersistenceUnitProperties;
 import org.onap.policy.models.base.PfModelException;
 import org.onap.policy.models.base.PfModelRuntimeException;
index aece188..465685c 100644 (file)
@@ -24,9 +24,7 @@ package org.onap.policy.models.provider.impl;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-
 import javax.ws.rs.core.Response;
-
 import org.onap.policy.common.utils.coder.StandardCoder;
 import org.onap.policy.common.utils.resources.ResourceUtils;
 import org.onap.policy.models.base.PfModelException;
index bdbf5b3..79fce30 100644 (file)
@@ -24,7 +24,6 @@ package org.onap.policy.models.provider;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import lombok.ToString;
-
 import org.junit.Test;
 
 /**
@@ -42,33 +41,33 @@ public class PolicyModelsProviderFactoryTest {
         // @formatter:off
         assertThatThrownBy(() -> {
             factory.createPolicyModelsProvider(null);
-        })  .hasMessageMatching("^parameters is marked .*on.*ull but is null$");
+        }).hasMessageMatching("^parameters is marked .*on.*ull but is null$");
 
         assertThatThrownBy(() -> {
             PolicyModelsProviderParameters pars = new PolicyModelsProviderParameters();
             pars.setImplementation(null);
             factory.createPolicyModelsProvider(pars);
-        })  .hasMessage("could not find implementation of the \"PolicyModelsProvider\" interface \"null\"");
+        }).hasMessage("could not find implementation of the \"PolicyModelsProvider\" interface \"null\"");
 
         assertThatThrownBy(() -> {
             PolicyModelsProviderParameters pars = new PolicyModelsProviderParameters();
             pars.setImplementation("com.acmecorp.RoadRunner");
             factory.createPolicyModelsProvider(pars);
-        })  .hasMessage("could not find implementation of the \"PolicyModelsProvider\" "
+        }).hasMessage("could not find implementation of the \"PolicyModelsProvider\" "
                 + "interface \"com.acmecorp.RoadRunner\"");
 
         assertThatThrownBy(() -> {
             PolicyModelsProviderParameters pars = new PolicyModelsProviderParameters();
             pars.setImplementation("java.lang.String");
             factory.createPolicyModelsProvider(pars);
-        })  .hasMessage(
+        }).hasMessage(
                 "the class \"java.lang.String\" is not an implementation of the \"PolicyModelsProvider\" interface");
 
         assertThatThrownBy(() -> {
             PolicyModelsProviderParameters pars = new PolicyModelsProviderParameters();
             pars.setImplementation("org.onap.policy.models.provider.impl.DummyBadProviderImpl");
             factory.createPolicyModelsProvider(pars);
-        })  .hasMessage("could not create an instance of PolicyModelsProvider "
+        }).hasMessage("could not create an instance of PolicyModelsProvider "
                 + "\"org.onap.policy.models.provider.impl.DummyBadProviderImpl\"");
         // @formatter:on
     }
index 67b314c..9ffe35c 100644 (file)
@@ -27,7 +27,6 @@ import com.openpojo.validation.rule.impl.GetterMustExistRule;
 import com.openpojo.validation.rule.impl.SetterMustExistRule;
 import com.openpojo.validation.test.impl.GetterTester;
 import com.openpojo.validation.test.impl.SetterTester;
-
 import org.junit.Test;
 
 /**
index 797b1ac..83c18f9 100644 (file)
@@ -21,7 +21,6 @@
 package org.onap.policy.models.provider.impl;
 
 import lombok.NonNull;
-
 import org.onap.policy.models.provider.PolicyModelsProviderParameters;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
 
index 2e2e3da..484922e 100644 (file)
@@ -29,7 +29,6 @@ import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
 import java.util.Date;
-
 import org.junit.Test;
 import org.onap.policy.models.pdp.concepts.Pdp;
 import org.onap.policy.models.pdp.concepts.PdpGroupFilter;
index 210c900..d6f0d85 100644 (file)
@@ -32,9 +32,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-
 import lombok.NonNull;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
index 8001d53..a808105 100644 (file)
@@ -29,7 +29,6 @@ import java.util.Base64;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
index 8fb2cff..41451eb 100644 (file)
@@ -22,7 +22,6 @@
 package org.onap.policy.models.sim.dmaap.parameters;
 
 import lombok.Getter;
-
 import org.onap.policy.common.parameters.ParameterGroupImpl;
 import org.onap.policy.common.parameters.annotations.Min;
 import org.onap.policy.common.parameters.annotations.NotBlank;
index 2737f45..5da2adc 100644 (file)
@@ -112,8 +112,7 @@ public class TopicData {
 
         do {
             result = group2data.computeIfAbsent(consumerGroup, maker).read(maxRead, waitMs);
-        }
-        while (result == ConsumerGroupData.UNREADABLE_LIST);
+        } while (result == ConsumerGroupData.UNREADABLE_LIST);
 
         // @formatter:on
 
index bcde4b5..ed8909b 100644 (file)
@@ -28,7 +28,6 @@ import io.swagger.annotations.SwaggerDefinition;
 import io.swagger.annotations.Tag;
 import java.net.HttpURLConnection;
 import java.util.UUID;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
index dbd9422..b468e34 100644 (file)
@@ -121,8 +121,7 @@ public class CambriaMessageBodyHandler implements MessageBodyReader<Object> {
             if ((chr = reader.read()) < 0) {
                 return false;
             }
-        }
-        while (Character.isWhitespace(chr));
+        } while (Character.isWhitespace(chr));
 
         // push the last character back onto the reader
         reader.reset();
index 02131dd..b731a6f 100644 (file)
@@ -185,7 +185,7 @@ public class TopicDataTest {
 
         coder = mock(Coder.class);
         when(coder.encode(any())).thenThrow(new CoderException(EXPECTED_EXCEPTION));
-        assertNull(data.convertMessageToString(new TreeMap<String,Object>(), coder));
+        assertNull(data.convertMessageToString(new TreeMap<String, Object>(), coder));
     }
 
     @Test
index 7c52163..430b896 100644 (file)
@@ -52,7 +52,7 @@ public class PdpSimulatorActivator {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(PdpSimulatorActivator.class);
     private final PdpSimulatorParameterGroup pdpSimulatorParameterGroup;
-    private List<TopicSink> topicSinks;// topics to which pdp sends pdp status
+    private List<TopicSink> topicSinks; // topics to which pdp sends pdp status
     private List<TopicSource> topicSources; // topics to which pdp listens to for messages from pap.
     private static final String[] MSG_TYPE_NAMES = { "messageName" };
 
index 2076df6..327f762 100644 (file)
@@ -26,14 +26,12 @@ 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;
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
-
 import org.onap.policy.common.utils.resources.ResourceUtils;
 import org.onap.policy.models.sim.pdp.exception.PdpSimulatorException;
 import org.onap.policy.models.sim.pdp.exception.PdpSimulatorRunTimeException;
index 33c9df7..b64967f 100644 (file)
@@ -23,7 +23,6 @@ package org.onap.policy.models.sim.pdp.comm;
 import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
-
 import org.onap.policy.common.endpoints.event.comm.TopicSink;
 import org.onap.policy.common.endpoints.event.comm.client.TopicSinkClient;
 import org.onap.policy.models.pdp.concepts.PdpStatus;
index df24f3e..524fd57 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.TopicParameterGroup;
 import org.onap.policy.common.parameters.GroupValidationResult;
index 0a8fa27..e588a59 100644 (file)
@@ -28,13 +28,10 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-
 import javax.ws.rs.core.Response;
-
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.NonNull;
-
 import org.onap.policy.models.base.PfModelRuntimeException;
 import org.onap.policy.models.base.PfNameVersion;
 
index 012f7de..33170db 100644 (file)
@@ -23,11 +23,9 @@ package org.onap.policy.models.tosca.authorative.concepts;
 
 import java.util.List;
 import java.util.stream.Collectors;
-
 import lombok.Builder;
 import lombok.Data;
 import lombok.NonNull;
-
 import org.onap.policy.models.base.PfObjectFilter;
 
 /**
@@ -70,8 +68,7 @@ public class ToscaPolicyFilter implements PfObjectFilter<ToscaPolicy> {
 
         if (LATEST_VERSION.equals(version)) {
             return this.latestVersionFilter(returnList);
-        }
-        else {
+        } else  {
             return returnList;
         }
     }
index 3a3b147..f948eda 100644 (file)
@@ -26,7 +26,6 @@ package org.onap.policy.models.tosca.authorative.concepts;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Map.Entry;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
index c721929..da6c561 100644 (file)
@@ -22,11 +22,9 @@ package org.onap.policy.models.tosca.authorative.concepts;
 
 import java.util.List;
 import java.util.stream.Collectors;
-
 import lombok.Builder;
 import lombok.Data;
 import lombok.NonNull;
-
 import org.onap.policy.models.base.PfObjectFilter;
 
 /**
@@ -58,8 +56,7 @@ public class ToscaPolicyTypeFilter implements PfObjectFilter<ToscaPolicyType> {
 
         if (LATEST_VERSION.equals(version)) {
             return this.latestVersionFilter(returnList);
-        }
-        else {
+        } else  {
             return returnList;
         }
     }
index fbc3b9b..c1d46bf 100644 (file)
@@ -25,12 +25,9 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
-
 import lombok.NonNull;
-
 import org.apache.commons.collections4.CollectionUtils;
 import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.base.PfModelException;
index 881a5fa..ffa6f8b 100644 (file)
@@ -23,9 +23,7 @@ package org.onap.policy.models.tosca.legacy.mapping;
 
 import java.util.HashMap;
 import java.util.Map;
-
 import javax.ws.rs.core.Response;
-
 import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.base.PfModelRuntimeException;
 import org.onap.policy.models.tosca.legacy.concepts.LegacyOperationalPolicy;
index 44c086d..4d03f05 100644 (file)
 package org.onap.policy.models.tosca.legacy.provider;
 
 import java.util.Map;
-
 import javax.ws.rs.core.Response;
-
 import lombok.NonNull;
-
 import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.base.PfModelException;
 import org.onap.policy.models.base.PfModelRuntimeException;
index 7c236e0..4dfbae7 100644 (file)
 package org.onap.policy.models.tosca.simple.concepts;
 
 import java.io.Serializable;
-
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-
 import org.onap.policy.models.base.PfAuthorative;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaConstraint;
 
index b987751..cd62164 100644 (file)
 package org.onap.policy.models.tosca.simple.concepts;
 
 import javax.persistence.Column;
-
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.ToString;
-
 import org.apache.commons.lang3.ObjectUtils;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaConstraint;
 
@@ -112,20 +110,16 @@ public class JpaToscaConstraintLogical extends JpaToscaConstraint {
         if (toscaConstraint.getEqual() != null) {
             operation = JpaToscaConstraintOperation.EQ;
             compareTo = toscaConstraint.getEqual();
-        }
-        else if (toscaConstraint.getGreaterThan() != null) {
+        } else  if (toscaConstraint.getGreaterThan() != null) {
             operation = JpaToscaConstraintOperation.GT;
             compareTo = toscaConstraint.getGreaterThan();
-        }
-        else if (toscaConstraint.getGreaterOrEqual() != null) {
+        } else  if (toscaConstraint.getGreaterOrEqual() != null) {
             operation = JpaToscaConstraintOperation.GE;
             compareTo = toscaConstraint.getGreaterOrEqual();
-        }
-        else if (toscaConstraint.getLessThan() != null) {
+        } else  if (toscaConstraint.getLessThan() != null) {
             operation = JpaToscaConstraintOperation.LT;
             compareTo = toscaConstraint.getLessThan();
-        }
-        else if (toscaConstraint.getLessOrEqual() != null) {
+        } else  if (toscaConstraint.getLessOrEqual() != null) {
             operation = JpaToscaConstraintOperation.LE;
             compareTo = toscaConstraint.getLessOrEqual();
         }
index a96ae46..8f10aca 100644 (file)
@@ -23,14 +23,11 @@ package org.onap.policy.models.tosca.simple.concepts;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.persistence.ElementCollection;
-
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.ToString;
-
 import org.onap.policy.models.base.PfUtils;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaConstraint;
 
index 23411ad..4e4cb8e 100644 (file)
@@ -31,18 +31,15 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
-
 import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
 import javax.persistence.Inheritance;
 import javax.persistence.InheritanceType;
 import javax.persistence.Lob;
 import javax.persistence.Table;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NonNull;
-
 import org.apache.commons.collections4.CollectionUtils;
 import org.onap.policy.models.base.PfAuthorative;
 import org.onap.policy.models.base.PfConcept;
index 94659e7..afcb874 100644 (file)
@@ -24,17 +24,14 @@ package org.onap.policy.models.tosca.simple.concepts;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
-
 import javax.persistence.Entity;
 import javax.persistence.Inheritance;
 import javax.persistence.InheritanceType;
 import javax.persistence.Table;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NonNull;
 import lombok.ToString;
-
 import org.onap.policy.models.base.PfConceptContainer;
 import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.base.PfValidationResult;
index 6544e72..76d2ff9 100644 (file)
@@ -26,18 +26,15 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.TreeMap;
-
 import javax.persistence.AttributeOverride;
 import javax.persistence.AttributeOverrides;
 import javax.persistence.Column;
 import javax.persistence.ElementCollection;
 import javax.persistence.EmbeddedId;
 import javax.persistence.MappedSuperclass;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NonNull;
-
 import org.apache.commons.lang3.ObjectUtils;
 import org.onap.policy.common.utils.validation.ParameterValidationUtils;
 import org.onap.policy.models.base.PfAuthorative;
index b432486..b697d51 100644 (file)
@@ -26,15 +26,12 @@ package org.onap.policy.models.tosca.simple.concepts;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.persistence.Column;
 import javax.persistence.ElementCollection;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.NonNull;
-
 import org.apache.commons.lang3.ObjectUtils;
 import org.onap.policy.common.utils.validation.Assertions;
 import org.onap.policy.models.base.PfAuthorative;
index 74b925b..f1f8e5d 100644 (file)
@@ -24,17 +24,14 @@ package org.onap.policy.models.tosca.simple.concepts;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
-
 import javax.persistence.Entity;
 import javax.persistence.Inheritance;
 import javax.persistence.InheritanceType;
 import javax.persistence.Table;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NonNull;
 import lombok.ToString;
-
 import org.onap.policy.models.base.PfAuthorative;
 import org.onap.policy.models.base.PfConceptContainer;
 import org.onap.policy.models.base.PfConceptKey;
index a7650c5..689d035 100644 (file)
@@ -28,7 +28,6 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-
 import javax.persistence.AttributeOverride;
 import javax.persistence.AttributeOverrides;
 import javax.persistence.Column;
@@ -39,11 +38,9 @@ import javax.persistence.InheritanceType;
 import javax.persistence.Lob;
 import javax.persistence.Table;
 import javax.ws.rs.core.Response;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NonNull;
-
 import org.onap.policy.common.utils.coder.CoderException;
 import org.onap.policy.common.utils.coder.StandardCoder;
 import org.onap.policy.common.utils.validation.ParameterValidationUtils;
index 423620d..93bfd2a 100644 (file)
@@ -31,18 +31,15 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
-
 import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
 import javax.persistence.Inheritance;
 import javax.persistence.InheritanceType;
 import javax.persistence.Lob;
 import javax.persistence.Table;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NonNull;
-
 import org.apache.commons.collections4.CollectionUtils;
 import org.onap.policy.models.base.PfAuthorative;
 import org.onap.policy.models.base.PfConcept;
index 00a6d6b..ee2c82b 100644 (file)
@@ -24,17 +24,14 @@ package org.onap.policy.models.tosca.simple.concepts;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
-
 import javax.persistence.Entity;
 import javax.persistence.Inheritance;
 import javax.persistence.InheritanceType;
 import javax.persistence.Table;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NonNull;
 import lombok.ToString;
-
 import org.onap.policy.models.base.PfConceptContainer;
 import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.base.PfValidationResult;
index a2127f3..25d2266 100644 (file)
@@ -28,7 +28,6 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-
 import javax.persistence.Column;
 import javax.persistence.ElementCollection;
 import javax.persistence.EmbeddedId;
@@ -36,11 +35,9 @@ import javax.persistence.Entity;
 import javax.persistence.Inheritance;
 import javax.persistence.InheritanceType;
 import javax.persistence.Table;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NonNull;
-
 import org.apache.commons.lang3.ObjectUtils;
 import org.onap.policy.models.base.PfAuthorative;
 import org.onap.policy.models.base.PfConcept;
index e2e27f0..f1a6a39 100644 (file)
 package org.onap.policy.models.tosca.simple.concepts;
 
 import com.google.gson.annotations.SerializedName;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -39,11 +37,9 @@ import javax.persistence.JoinColumn;
 import javax.persistence.JoinColumns;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NonNull;
-
 import org.apache.commons.lang3.ObjectUtils;
 import org.onap.policy.common.utils.validation.ParameterValidationUtils;
 import org.onap.policy.models.base.PfAuthorative;
index 08624f6..23c81b6 100644 (file)
@@ -23,15 +23,12 @@ package org.onap.policy.models.tosca.simple.concepts;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
-
 import javax.persistence.Entity;
 import javax.persistence.Inheritance;
 import javax.persistence.InheritanceType;
 import javax.persistence.Table;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import org.onap.policy.models.base.PfConceptContainer;
 import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
index 1766087..6072054 100644 (file)
@@ -22,7 +22,6 @@
 package org.onap.policy.models.tosca.simple.concepts;
 
 import java.util.List;
-
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.EmbeddedId;
@@ -34,11 +33,9 @@ import javax.persistence.JoinColumn;
 import javax.persistence.JoinColumns;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NonNull;
-
 import org.apache.commons.lang3.ObjectUtils;
 import org.onap.policy.models.base.PfAuthorative;
 import org.onap.policy.models.base.PfConcept;
index f12f988..8ac9e80 100644 (file)
@@ -23,11 +23,8 @@ package org.onap.policy.models.tosca.simple.provider;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-
 import javax.ws.rs.core.Response;
-
 import lombok.NonNull;
-
 import org.apache.commons.collections4.CollectionUtils;
 import org.onap.policy.models.base.PfConcept;
 import org.onap.policy.models.base.PfConceptFilter;
index 34a7e2c..b0b7863 100644 (file)
@@ -21,9 +21,7 @@
 package org.onap.policy.models.tosca.simple.provider;
 
 import javax.ws.rs.core.Response.Status;
-
 import lombok.NonNull;
-
 import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.base.PfModelException;
 import org.onap.policy.models.dao.PfDao;
index 6f21c19..d988b7b 100644 (file)
@@ -22,11 +22,8 @@ package org.onap.policy.models.tosca.utils;
 
 import java.util.Map;
 import java.util.Map.Entry;
-
 import javax.ws.rs.core.Response;
-
 import lombok.NonNull;
-
 import org.onap.policy.models.base.PfConceptContainer;
 import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.base.PfModelRuntimeException;
index 772fb9e..6cf6cc5 100644 (file)
@@ -24,11 +24,8 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.function.Function;
-
 import javax.ws.rs.core.Response;
-
 import lombok.NonNull;
-
 import org.apache.commons.collections4.CollectionUtils;
 import org.onap.policy.models.base.PfConcept;
 import org.onap.policy.models.base.PfConceptContainer;
index 07c7461..c9f162a 100644 (file)
@@ -30,7 +30,6 @@ import com.openpojo.validation.rule.impl.GetterMustExistRule;
 import com.openpojo.validation.rule.impl.SetterMustExistRule;
 import com.openpojo.validation.test.impl.GetterTester;
 import com.openpojo.validation.test.impl.SetterTester;
-
 import org.junit.Test;
 import org.onap.policy.common.utils.test.ToStringTester;
 
index 933221c..dd19c6c 100644 (file)
@@ -28,12 +28,10 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import com.google.gson.GsonBuilder;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.onap.policy.common.utils.coder.CoderException;
index 6304091..82f100e 100644 (file)
@@ -27,12 +27,10 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import com.google.gson.GsonBuilder;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.onap.policy.common.utils.coder.CoderException;
index 22b9ab0..66ed700 100644 (file)
@@ -27,11 +27,9 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import com.google.gson.GsonBuilder;
-
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Properties;
-
 import org.apache.commons.lang3.ObjectUtils;
 import org.eclipse.persistence.config.PersistenceUnitProperties;
 import org.junit.After;
index b0209b0..df2cac3 100644 (file)
@@ -29,7 +29,6 @@ import com.openpojo.validation.rule.impl.GetterMustExistRule;
 import com.openpojo.validation.rule.impl.SetterMustExistRule;
 import com.openpojo.validation.test.impl.GetterTester;
 import com.openpojo.validation.test.impl.SetterTester;
-
 import org.junit.Test;
 import org.onap.policy.common.utils.test.ToStringTester;
 
index c1fcf5d..c2f372f 100644 (file)
@@ -31,7 +31,6 @@ import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.junit.Test;
 import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.base.PfKey;
index 9a8b29d..910db36 100644 (file)
@@ -32,7 +32,6 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
-
 import org.junit.Test;
 import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.base.PfValidationResult;
index 79fa086..d897344 100644 (file)
@@ -29,7 +29,6 @@ import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.junit.Test;
 import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.base.PfValidationResult;
index 3e85691..51a5d3c 100644 (file)
@@ -29,7 +29,6 @@ import static org.junit.Assert.assertTrue;
 
 import java.util.Map;
 import java.util.TreeMap;
-
 import org.junit.Test;
 import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.base.PfModelService;
index 968aa95..47e3433 100644 (file)
@@ -32,7 +32,6 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
-
 import org.junit.Test;
 import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.base.PfValidationResult;
index aeba9bb..c4cb61c 100644 (file)
@@ -31,7 +31,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.junit.Test;
 import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.base.PfKey;
index a7ca3cc..34cc504 100644 (file)
@@ -32,7 +32,6 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.junit.Test;
 import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.base.PfKey;
index f62adbb..bbd407a 100644 (file)
@@ -32,7 +32,6 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
-
 import org.junit.Test;
 import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.base.PfValidationResult;
index 49e508a..f06d4ff 100644 (file)
@@ -31,7 +31,6 @@ import static org.junit.Assert.assertTrue;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.TreeMap;
-
 import org.junit.Test;
 import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.base.PfReferenceKey;
index 5cbec00..c7a87e5 100644 (file)
@@ -30,7 +30,6 @@ import static org.junit.Assert.assertTrue;
 
 import java.util.Map;
 import java.util.TreeMap;
-
 import org.junit.Test;
 import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.base.PfReferenceKey;
index 596640f..a019a97 100644 (file)
@@ -29,7 +29,6 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
-
 import org.junit.Test;
 import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
index ca4cac8..10e9388 100644 (file)
@@ -28,7 +28,6 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-
 import org.junit.Test;
 import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.base.PfReferenceKey;
index a7a754f..62f9694 100644 (file)
@@ -29,7 +29,6 @@ import static org.junit.Assert.assertTrue;
 
 import java.time.Duration;
 import java.util.Date;
-
 import org.junit.Test;
 import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.base.PfReferenceKey;
index 444a0d1..9e8edc7 100644 (file)
@@ -29,7 +29,6 @@ import com.openpojo.validation.ValidatorBuilder;
 import com.openpojo.validation.rule.impl.GetterMustExistRule;
 import com.openpojo.validation.test.impl.GetterTester;
 import com.openpojo.validation.test.impl.SetterTester;
-
 import org.junit.Test;
 import org.onap.policy.common.utils.test.ToStringTester;
 
index e216bea..92c0f82 100644 (file)
@@ -27,7 +27,6 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
 import java.util.Properties;
-
 import org.eclipse.persistence.config.PersistenceUnitProperties;
 import org.junit.After;
 import org.junit.Before;
index 318eaee..aa48b0a 100644 (file)
@@ -29,9 +29,7 @@ import static org.junit.Assert.fail;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-
 import java.util.Map;
-
 import org.junit.Test;
 import org.onap.policy.common.utils.coder.CoderException;
 import org.onap.policy.common.utils.coder.StandardCoder;
index f9a0143..c3fc8a3 100644 (file)
@@ -24,7 +24,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.Assert.assertEquals;
 
 import java.util.Iterator;
-
 import org.junit.Test;
 import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.tosca.simple.concepts.JpaToscaDataType;
diff --git a/pom.xml b/pom.xml
index 767dc2d..d46aff3 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2018 Ericsson. All rights reserved.
-   Copyright (C) 2019 Nordix Foundation.
+   Copyright (C) 2019-2020 Nordix Foundation.
    Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
    Modifications Copyright (C) 2020 Bell Canada.
   ================================================================================
     </dependencyManagement>
 
     <build>
-        <plugins>
-            <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 -->
-                            <sourceDirectories>${project.build.sourceDirectory}</sourceDirectories>
-                            <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>
         <pluginManagement>
             <plugins>
                 <plugin>