aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/org/onap/clamp/controlloop/models/tosca/authorative/concepts/ControlLoopToscaServiceTemplate.java27
-rw-r--r--src/main/java/org/onap/clamp/controlloop/models/tosca/authorative/concepts/ControlLoopToscaTopologyTemplate.java27
-rw-r--r--src/main/java/org/onap/policy/clamp/authorization/AuthorizationController.java (renamed from src/main/java/org/onap/clamp/authorization/AuthorizationController.java)10
-rw-r--r--src/main/java/org/onap/policy/clamp/authorization/CldsUser.java (renamed from src/main/java/org/onap/clamp/authorization/CldsUser.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/authorization/SecureServicePermission.java (renamed from src/main/java/org/onap/clamp/authorization/SecureServicePermission.java)4
-rw-r--r--src/main/java/org/onap/policy/clamp/authorization/SecureServicePermissionDeserializer.java (renamed from src/main/java/org/onap/clamp/authorization/SecureServicePermissionDeserializer.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/authorization/UserService.java (renamed from src/main/java/org/onap/clamp/authorization/UserService.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/Application.java (renamed from src/main/java/org/onap/clamp/clds/Application.java)14
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/ClampInUserAuditorAware.java (renamed from src/main/java/org/onap/clamp/clds/ClampInUserAuditorAware.java)4
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/ClampServlet.java (renamed from src/main/java/org/onap/clamp/clds/ClampServlet.java)26
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/TomcatEmbeddedServletContainerFactoryRedirection.java (renamed from src/main/java/org/onap/clamp/clds/TomcatEmbeddedServletContainerFactoryRedirection.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/client/CdsServices.java (renamed from src/main/java/org/onap/clamp/clds/client/CdsServices.java)12
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/client/DcaeInventoryServices.java (renamed from src/main/java/org/onap/clamp/clds/client/DcaeInventoryServices.java)12
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/client/PolicyEngineServices.java (renamed from src/main/java/org/onap/clamp/clds/client/PolicyEngineServices.java)54
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/config/AafConfiguration.java (renamed from src/main/java/org/onap/clamp/clds/config/AafConfiguration.java)5
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/config/CamelConfiguration.java (renamed from src/main/java/org/onap/clamp/clds/config/CamelConfiguration.java)8
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/config/ClampProperties.java (renamed from src/main/java/org/onap/clamp/clds/config/ClampProperties.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/config/CldsUserJsonDecoder.java (renamed from src/main/java/org/onap/clamp/clds/config/CldsUserJsonDecoder.java)8
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/config/DefaultDictionaryElements.java (renamed from src/main/java/org/onap/clamp/clds/config/DefaultDictionaryElements.java)8
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/config/DefaultUserConfiguration.java (renamed from src/main/java/org/onap/clamp/clds/config/DefaultUserConfiguration.java)8
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/config/SslConfig.java (renamed from src/main/java/org/onap/clamp/clds/config/SslConfig.java)7
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/config/SystemPropertiesLoader.java (renamed from src/main/java/org/onap/clamp/clds/config/SystemPropertiesLoader.java)5
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/config/sdc/SdcControllersConfiguration.java (renamed from src/main/java/org/onap/clamp/clds/config/sdc/SdcControllersConfiguration.java)8
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/config/sdc/SdcSingleControllerConfiguration.java (renamed from src/main/java/org/onap/clamp/clds/config/sdc/SdcSingleControllerConfiguration.java)6
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/config/spring/CldsConfiguration.java (renamed from src/main/java/org/onap/clamp/clds/config/spring/CldsConfiguration.java)4
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/config/spring/SdcControllerConfiguration.java (renamed from src/main/java/org/onap/clamp/clds/config/spring/SdcControllerConfiguration.java)17
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/exception/CldsConfigException.java (renamed from src/main/java/org/onap/clamp/clds/exception/CldsConfigException.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/exception/CldsUsersException.java (renamed from src/main/java/org/onap/clamp/clds/exception/CldsUsersException.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/exception/NotAuthorizedException.java (renamed from src/main/java/org/onap/clamp/clds/exception/NotAuthorizedException.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/exception/cds/CdsParametersException.java (renamed from src/main/java/org/onap/clamp/clds/exception/cds/CdsParametersException.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/exception/dcae/DcaeDeploymentException.java (renamed from src/main/java/org/onap/clamp/clds/exception/dcae/DcaeDeploymentException.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/BlueprintParserException.java (renamed from src/main/java/org/onap/clamp/clds/exception/sdc/controller/BlueprintParserException.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/CsarHandlerException.java (renamed from src/main/java/org/onap/clamp/clds/exception/sdc/controller/CsarHandlerException.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcArtifactInstallerException.java (renamed from src/main/java/org/onap/clamp/clds/exception/sdc/controller/SdcArtifactInstallerException.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcControllerException.java (renamed from src/main/java/org/onap/clamp/clds/exception/sdc/controller/SdcControllerException.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcDownloadException.java (renamed from src/main/java/org/onap/clamp/clds/exception/sdc/controller/SdcDownloadException.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcParametersException.java (renamed from src/main/java/org/onap/clamp/clds/exception/sdc/controller/SdcParametersException.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/filter/ClampCadiFilter.java (renamed from src/main/java/org/onap/clamp/clds/filter/ClampCadiFilter.java)4
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/model/ClampInformation.java (renamed from src/main/java/org/onap/clamp/clds/model/ClampInformation.java)4
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/model/CldsHealthCheck.java (renamed from src/main/java/org/onap/clamp/clds/model/CldsHealthCheck.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/model/cds/CdsBpWorkFlowListResponse.java (renamed from src/main/java/org/onap/clamp/clds/model/cds/CdsBpWorkFlowListResponse.java)3
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryCache.java (renamed from src/main/java/org/onap/clamp/clds/model/dcae/DcaeInventoryCache.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponse.java (renamed from src/main/java/org/onap/clamp/clds/model/dcae/DcaeInventoryResponse.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeLinks.java (renamed from src/main/java/org/onap/clamp/clds/model/dcae/DcaeLinks.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeOperationStatusResponse.java (renamed from src/main/java/org/onap/clamp/clds/model/dcae/DcaeOperationStatusResponse.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/sdc/controller/DistributionStatusMessage.java (renamed from src/main/java/org/onap/clamp/clds/sdc/controller/DistributionStatusMessage.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/sdc/controller/SdcSingleController.java (renamed from src/main/java/org/onap/clamp/clds/sdc/controller/SdcSingleController.java)79
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/sdc/controller/SdcSingleControllerStatus.java (renamed from src/main/java/org/onap/clamp/clds/sdc/controller/SdcSingleControllerStatus.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintArtifact.java (renamed from src/main/java/org/onap/clamp/clds/sdc/controller/installer/BlueprintArtifact.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintMicroService.java (renamed from src/main/java/org/onap/clamp/clds/sdc/controller/installer/BlueprintMicroService.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintParser.java (renamed from src/main/java/org/onap/clamp/clds/sdc/controller/installer/BlueprintParser.java)6
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/ChainGenerator.java (renamed from src/main/java/org/onap/clamp/clds/sdc/controller/installer/ChainGenerator.java)3
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/CsarHandler.java (renamed from src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarHandler.java)8
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/service/CldsHealthcheckService.java (renamed from src/main/java/org/onap/clamp/clds/service/CldsHealthcheckService.java)10
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/tosca/JsonEditorSchemaConstants.java (renamed from src/main/java/org/onap/clamp/clds/tosca/JsonEditorSchemaConstants.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/tosca/ToscaSchemaConstants.java (renamed from src/main/java/org/onap/clamp/clds/tosca/ToscaSchemaConstants.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/tosca/ToscaYamlToJsonConvertor.java (renamed from src/main/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertor.java)10
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/tosca/update/ToscaConverterWithDictionarySupport.java (renamed from src/main/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupport.java)14
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/tosca/update/UnknownComponentException.java (renamed from src/main/java/org/onap/clamp/clds/tosca/update/UnknownComponentException.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ArrayField.java (renamed from src/main/java/org/onap/clamp/clds/tosca/update/elements/ArrayField.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/Constraint.java (renamed from src/main/java/org/onap/clamp/clds/tosca/update/elements/Constraint.java)4
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ToscaElement.java (renamed from src/main/java/org/onap/clamp/clds/tosca/update/elements/ToscaElement.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ToscaElementProperty.java (renamed from src/main/java/org/onap/clamp/clds/tosca/update/elements/ToscaElementProperty.java)4
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataExecutor.java (renamed from src/main/java/org/onap/clamp/clds/tosca/update/execution/ToscaMetadataExecutor.java)10
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataProcess.java (renamed from src/main/java/org/onap/clamp/clds/tosca/update/execution/ToscaMetadataProcess.java)4
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/cds/ToscaMetadataCdsProcess.java (renamed from src/main/java/org/onap/clamp/clds/tosca/update/execution/cds/ToscaMetadataCdsProcess.java)17
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/target/ToscaMetadataTargetProcess.java (renamed from src/main/java/org/onap/clamp/clds/tosca/update/execution/target/ToscaMetadataTargetProcess.java)8
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/ToscaConverterToJsonSchema.java (renamed from src/main/java/org/onap/clamp/clds/tosca/update/parser/ToscaConverterToJsonSchema.java)23
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/ToscaElementParser.java (renamed from src/main/java/org/onap/clamp/clds/tosca/update/parser/ToscaElementParser.java)6
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParser.java (renamed from src/main/java/org/onap/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParser.java)6
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParserWithDictionarySupport.java (renamed from src/main/java/org/onap/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParserWithDictionarySupport.java)40
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplate.java (renamed from src/main/java/org/onap/clamp/clds/tosca/update/templates/JsonTemplate.java)5
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplateField.java (renamed from src/main/java/org/onap/clamp/clds/tosca/update/templates/JsonTemplateField.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplateManager.java (renamed from src/main/java/org/onap/clamp/clds/tosca/update/templates/JsonTemplateManager.java)28
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/util/ClampVersioning.java (renamed from src/main/java/org/onap/clamp/clds/util/ClampVersioning.java)3
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/util/CryptoUtils.java (renamed from src/main/java/org/onap/clamp/clds/util/CryptoUtils.java)4
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/util/JsonUtils.java (renamed from src/main/java/org/onap/clamp/clds/util/JsonUtils.java)12
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/util/LogMessages.java (renamed from src/main/java/org/onap/clamp/clds/util/LogMessages.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/util/LoggingUtils.java (renamed from src/main/java/org/onap/clamp/clds/util/LoggingUtils.java)8
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/util/OnapLogConstants.java (renamed from src/main/java/org/onap/clamp/clds/util/OnapLogConstants.java)24
-rw-r--r--src/main/java/org/onap/policy/clamp/clds/util/ResourceFileUtils.java (renamed from src/main/java/org/onap/clamp/clds/util/ResourceFileUtils.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/configuration/ClampGsonDataFormat.java (renamed from src/main/java/org/onap/clamp/configuration/ClampGsonDataFormat.java)6
-rw-r--r--src/main/java/org/onap/policy/clamp/dao/model/gson/converter/InstantDeserializer.java (renamed from src/main/java/org/onap/clamp/dao/model/gson/converter/InstantDeserializer.java)3
-rw-r--r--src/main/java/org/onap/policy/clamp/dao/model/gson/converter/InstantSerializer.java (renamed from src/main/java/org/onap/clamp/dao/model/gson/converter/InstantSerializer.java)3
-rw-r--r--src/main/java/org/onap/policy/clamp/dao/model/jsontype/JsonStringSqlTypeDescriptor.java (renamed from src/main/java/org/onap/clamp/dao/model/jsontype/JsonStringSqlTypeDescriptor.java)3
-rw-r--r--src/main/java/org/onap/policy/clamp/dao/model/jsontype/JsonTypeDescriptor.java (renamed from src/main/java/org/onap/clamp/dao/model/jsontype/JsonTypeDescriptor.java)6
-rw-r--r--src/main/java/org/onap/policy/clamp/dao/model/jsontype/StringJsonUserType.java (renamed from src/main/java/org/onap/clamp/dao/model/jsontype/StringJsonUserType.java)3
-rw-r--r--src/main/java/org/onap/policy/clamp/flow/log/FlowLogOperation.java (renamed from src/main/java/org/onap/clamp/flow/log/FlowLogOperation.java)6
-rw-r--r--src/main/java/org/onap/policy/clamp/loop/CsarInstaller.java (renamed from src/main/java/org/onap/clamp/loop/CsarInstaller.java)65
-rw-r--r--src/main/java/org/onap/policy/clamp/loop/Loop.java (renamed from src/main/java/org/onap/clamp/loop/Loop.java)34
-rw-r--r--src/main/java/org/onap/policy/clamp/loop/LoopController.java (renamed from src/main/java/org/onap/clamp/loop/LoopController.java)14
-rw-r--r--src/main/java/org/onap/policy/clamp/loop/LoopService.java (renamed from src/main/java/org/onap/clamp/loop/LoopService.java)18
-rw-r--r--src/main/java/org/onap/policy/clamp/loop/LoopState.java (renamed from src/main/java/org/onap/clamp/loop/LoopState.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/loop/LoopsRepository.java (renamed from src/main/java/org/onap/clamp/loop/LoopsRepository.java)3
-rw-r--r--src/main/java/org/onap/policy/clamp/loop/cds/CdsDataInstaller.java (renamed from src/main/java/org/onap/clamp/loop/cds/CdsDataInstaller.java)15
-rw-r--r--src/main/java/org/onap/policy/clamp/loop/common/AuditEntity.java (renamed from src/main/java/org/onap/clamp/loop/common/AuditEntity.java)8
-rw-r--r--src/main/java/org/onap/policy/clamp/loop/components/external/DcaeComponent.java (renamed from src/main/java/org/onap/clamp/loop/components/external/DcaeComponent.java)59
-rw-r--r--src/main/java/org/onap/policy/clamp/loop/components/external/ExternalComponent.java (renamed from src/main/java/org/onap/clamp/loop/components/external/ExternalComponent.java)3
-rw-r--r--src/main/java/org/onap/policy/clamp/loop/components/external/ExternalComponentState.java (renamed from src/main/java/org/onap/clamp/loop/components/external/ExternalComponentState.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/loop/components/external/PolicyComponent.java (renamed from src/main/java/org/onap/clamp/loop/components/external/PolicyComponent.java)31
-rw-r--r--src/main/java/org/onap/policy/clamp/loop/deploy/DcaeDeployParameters.java (renamed from src/main/java/org/onap/clamp/loop/deploy/DcaeDeployParameters.java)28
-rw-r--r--src/main/java/org/onap/policy/clamp/loop/log/LogType.java (renamed from src/main/java/org/onap/clamp/loop/log/LogType.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/loop/log/LoopLog.java (renamed from src/main/java/org/onap/clamp/loop/log/LoopLog.java)7
-rw-r--r--src/main/java/org/onap/policy/clamp/loop/log/LoopLogRepository.java (renamed from src/main/java/org/onap/clamp/loop/log/LoopLogRepository.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/loop/log/LoopLogService.java (renamed from src/main/java/org/onap/clamp/loop/log/LoopLogService.java)4
-rw-r--r--src/main/java/org/onap/policy/clamp/loop/service/CsarServiceInstaller.java (renamed from src/main/java/org/onap/clamp/loop/service/CsarServiceInstaller.java)8
-rw-r--r--src/main/java/org/onap/policy/clamp/loop/service/Service.java (renamed from src/main/java/org/onap/clamp/loop/service/Service.java)13
-rw-r--r--src/main/java/org/onap/policy/clamp/loop/service/ServicesRepository.java (renamed from src/main/java/org/onap/clamp/loop/service/ServicesRepository.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/loop/template/LoopElementModel.java (renamed from src/main/java/org/onap/clamp/loop/template/LoopElementModel.java)25
-rw-r--r--src/main/java/org/onap/policy/clamp/loop/template/LoopElementModelsRepository.java (renamed from src/main/java/org/onap/clamp/loop/template/LoopElementModelsRepository.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/loop/template/LoopTemplate.java (renamed from src/main/java/org/onap/clamp/loop/template/LoopTemplate.java)8
-rw-r--r--src/main/java/org/onap/policy/clamp/loop/template/LoopTemplateLoopElementModel.java (renamed from src/main/java/org/onap/clamp/loop/template/LoopTemplateLoopElementModel.java)4
-rw-r--r--src/main/java/org/onap/policy/clamp/loop/template/LoopTemplateLoopElementModelId.java (renamed from src/main/java/org/onap/clamp/loop/template/LoopTemplateLoopElementModelId.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/loop/template/LoopTemplatesRepository.java (renamed from src/main/java/org/onap/clamp/loop/template/LoopTemplatesRepository.java)3
-rw-r--r--src/main/java/org/onap/policy/clamp/loop/template/LoopTemplatesService.java (renamed from src/main/java/org/onap/clamp/loop/template/LoopTemplatesService.java)4
-rw-r--r--src/main/java/org/onap/policy/clamp/loop/template/LoopType.java (renamed from src/main/java/org/onap/clamp/loop/template/LoopType.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/loop/template/LoopTypeConvertor.java (renamed from src/main/java/org/onap/clamp/loop/template/LoopTypeConvertor.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/loop/template/PolicyModel.java (renamed from src/main/java/org/onap/clamp/loop/template/PolicyModel.java)8
-rw-r--r--src/main/java/org/onap/policy/clamp/loop/template/PolicyModelId.java (renamed from src/main/java/org/onap/clamp/loop/template/PolicyModelId.java)3
-rw-r--r--src/main/java/org/onap/policy/clamp/loop/template/PolicyModelsRepository.java (renamed from src/main/java/org/onap/clamp/loop/template/PolicyModelsRepository.java)3
-rw-r--r--src/main/java/org/onap/policy/clamp/loop/template/PolicyModelsService.java (renamed from src/main/java/org/onap/clamp/loop/template/PolicyModelsService.java)18
-rw-r--r--src/main/java/org/onap/policy/clamp/policy/Policy.java (renamed from src/main/java/org/onap/clamp/policy/Policy.java)14
-rw-r--r--src/main/java/org/onap/policy/clamp/policy/PolicyService.java (renamed from src/main/java/org/onap/clamp/policy/PolicyService.java)5
-rw-r--r--src/main/java/org/onap/policy/clamp/policy/downloader/PolicyEngineController.java (renamed from src/main/java/org/onap/clamp/policy/downloader/PolicyEngineController.java)8
-rw-r--r--src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicy.java (renamed from src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicy.java)19
-rw-r--r--src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicyRepository.java (renamed from src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicyRepository.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicyService.java (renamed from src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicyService.java)8
-rw-r--r--src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicy.java (renamed from src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java)16
-rw-r--r--src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepository.java (renamed from src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepository.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java (renamed from src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java)16
-rw-r--r--src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyService.java (renamed from src/main/java/org/onap/clamp/policy/operational/OperationalPolicyService.java)10
-rw-r--r--src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroup.java (renamed from src/main/java/org/onap/clamp/policy/pdpgroup/PdpGroup.java)3
-rw-r--r--src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpSubgroup.java (renamed from src/main/java/org/onap/clamp/policy/pdpgroup/PdpSubgroup.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/policy/pdpgroup/PolicyModelKey.java (renamed from src/main/java/org/onap/clamp/policy/pdpgroup/PolicyModelKey.java)3
-rw-r--r--src/main/java/org/onap/policy/clamp/tosca/Dictionary.java (renamed from src/main/java/org/onap/clamp/tosca/Dictionary.java)4
-rw-r--r--src/main/java/org/onap/policy/clamp/tosca/DictionaryElement.java (renamed from src/main/java/org/onap/clamp/tosca/DictionaryElement.java)4
-rw-r--r--src/main/java/org/onap/policy/clamp/tosca/DictionaryElementsRepository.java (renamed from src/main/java/org/onap/clamp/tosca/DictionaryElementsRepository.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/tosca/DictionaryRepository.java (renamed from src/main/java/org/onap/clamp/tosca/DictionaryRepository.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/tosca/DictionaryService.java (renamed from src/main/java/org/onap/clamp/tosca/DictionaryService.java)2
-rw-r--r--src/main/java/org/onap/policy/clamp/util/PassDecoder.java (renamed from src/main/java/org/onap/clamp/util/PassDecoder.java)7
-rw-r--r--src/main/java/org/onap/policy/clamp/util/SemanticVersioning.java (renamed from src/main/java/org/onap/clamp/util/SemanticVersioning.java)2
141 files changed, 593 insertions, 659 deletions
diff --git a/src/main/java/org/onap/clamp/controlloop/models/tosca/authorative/concepts/ControlLoopToscaServiceTemplate.java b/src/main/java/org/onap/clamp/controlloop/models/tosca/authorative/concepts/ControlLoopToscaServiceTemplate.java
deleted file mode 100644
index 2b7ecf94f..000000000
--- a/src/main/java/org/onap/clamp/controlloop/models/tosca/authorative/concepts/ControlLoopToscaServiceTemplate.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.clamp.controlloop.models.tosca.authorative.concepts;
-
-import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
-
-public class ControlLoopToscaServiceTemplate extends ToscaServiceTemplate {
- //TODO More code to be added
-} \ No newline at end of file
diff --git a/src/main/java/org/onap/clamp/controlloop/models/tosca/authorative/concepts/ControlLoopToscaTopologyTemplate.java b/src/main/java/org/onap/clamp/controlloop/models/tosca/authorative/concepts/ControlLoopToscaTopologyTemplate.java
deleted file mode 100644
index 5f125fedd..000000000
--- a/src/main/java/org/onap/clamp/controlloop/models/tosca/authorative/concepts/ControlLoopToscaTopologyTemplate.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.clamp.controlloop.models.tosca.authorative.concepts;
-
-import org.onap.policy.models.tosca.authorative.concepts.ToscaTopologyTemplate;
-
-public class ControlLoopToscaTopologyTemplate extends ToscaTopologyTemplate {
- //TODO More code to be added
-} \ No newline at end of file
diff --git a/src/main/java/org/onap/clamp/authorization/AuthorizationController.java b/src/main/java/org/onap/policy/clamp/authorization/AuthorizationController.java
index f4da09a2e..f703e3363 100644
--- a/src/main/java/org/onap/clamp/authorization/AuthorizationController.java
+++ b/src/main/java/org/onap/policy/clamp/authorization/AuthorizationController.java
@@ -23,16 +23,16 @@
*
*/
-package org.onap.clamp.authorization;
+package org.onap.policy.clamp.authorization;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
import java.util.Date;
import org.apache.camel.Exchange;
-import org.onap.clamp.clds.config.ClampProperties;
-import org.onap.clamp.clds.exception.NotAuthorizedException;
-import org.onap.clamp.clds.model.ClampInformation;
-import org.onap.clamp.clds.util.LoggingUtils;
+import org.onap.policy.clamp.clds.config.ClampProperties;
+import org.onap.policy.clamp.clds.exception.NotAuthorizedException;
+import org.onap.policy.clamp.clds.model.ClampInformation;
+import org.onap.policy.clamp.clds.util.LoggingUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.GrantedAuthority;
diff --git a/src/main/java/org/onap/clamp/authorization/CldsUser.java b/src/main/java/org/onap/policy/clamp/authorization/CldsUser.java
index b50f50cb2..8f1e2bf67 100644
--- a/src/main/java/org/onap/clamp/authorization/CldsUser.java
+++ b/src/main/java/org/onap/policy/clamp/authorization/CldsUser.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.authorization;
+package org.onap.policy.clamp.authorization;
import java.util.Arrays;
diff --git a/src/main/java/org/onap/clamp/authorization/SecureServicePermission.java b/src/main/java/org/onap/policy/clamp/authorization/SecureServicePermission.java
index 374aab90c..41887a315 100644
--- a/src/main/java/org/onap/clamp/authorization/SecureServicePermission.java
+++ b/src/main/java/org/onap/policy/clamp/authorization/SecureServicePermission.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.authorization;
+package org.onap.policy.clamp.authorization;
/**
* Permission class that can be instantiated easily using constructor or factory
@@ -83,7 +83,7 @@ public class SecureServicePermission {
}
/**
- * Instantiate permission given type from concatenated string
+ * Instantiate permission given type from concatenated string.
*
* @param concatenatedString
* the string type|instance|action, less than 3 params can be
diff --git a/src/main/java/org/onap/clamp/authorization/SecureServicePermissionDeserializer.java b/src/main/java/org/onap/policy/clamp/authorization/SecureServicePermissionDeserializer.java
index 026ee802c..0b178c256 100644
--- a/src/main/java/org/onap/clamp/authorization/SecureServicePermissionDeserializer.java
+++ b/src/main/java/org/onap/policy/clamp/authorization/SecureServicePermissionDeserializer.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.authorization;
+package org.onap.policy.clamp.authorization;
import com.google.gson.Gson;
diff --git a/src/main/java/org/onap/clamp/authorization/UserService.java b/src/main/java/org/onap/policy/clamp/authorization/UserService.java
index b4f51c95b..c748a5a54 100644
--- a/src/main/java/org/onap/clamp/authorization/UserService.java
+++ b/src/main/java/org/onap/policy/clamp/authorization/UserService.java
@@ -20,7 +20,7 @@
* ===================================================================
*/
-package org.onap.clamp.authorization;
+package org.onap.policy.clamp.authorization;
import org.springframework.security.core.context.SecurityContext;
diff --git a/src/main/java/org/onap/clamp/clds/Application.java b/src/main/java/org/onap/policy/clamp/clds/Application.java
index e83ff3e76..79247ca63 100644
--- a/src/main/java/org/onap/clamp/clds/Application.java
+++ b/src/main/java/org/onap/policy/clamp/clds/Application.java
@@ -23,7 +23,7 @@
*
*/
-package org.onap.clamp.clds;
+package org.onap.policy.clamp.clds;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
@@ -36,9 +36,9 @@ import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import java.util.Enumeration;
import org.apache.catalina.connector.Connector;
-import org.onap.clamp.clds.util.ClampVersioning;
-import org.onap.clamp.clds.util.ResourceFileUtils;
-import org.onap.clamp.util.PassDecoder;
+import org.onap.policy.clamp.clds.util.ClampVersioning;
+import org.onap.policy.clamp.clds.util.ResourceFileUtils;
+import org.onap.policy.clamp.util.PassDecoder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
@@ -61,10 +61,10 @@ import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.transaction.annotation.EnableTransactionManagement;
-@ComponentScan(basePackages = { "org.onap.clamp" })
+@ComponentScan(basePackages = { "org.onap.policy.clamp" })
@SpringBootApplication(exclude = { SecurityAutoConfiguration.class, UserDetailsServiceAutoConfiguration.class })
-@EnableJpaRepositories(basePackages = { "org.onap.clamp" })
-@EntityScan(basePackages = { "org.onap.clamp" })
+@EnableJpaRepositories(basePackages = { "org.onap.policy.clamp" })
+@EntityScan(basePackages = { "org.onap.policy.clamp" })
@EnableTransactionManagement
@EnableConfigurationProperties
@EnableAsync
diff --git a/src/main/java/org/onap/clamp/clds/ClampInUserAuditorAware.java b/src/main/java/org/onap/policy/clamp/clds/ClampInUserAuditorAware.java
index 9351db23c..939cea49c 100644
--- a/src/main/java/org/onap/clamp/clds/ClampInUserAuditorAware.java
+++ b/src/main/java/org/onap/policy/clamp/clds/ClampInUserAuditorAware.java
@@ -21,10 +21,10 @@
*
*/
-package org.onap.clamp.clds;
+package org.onap.policy.clamp.clds;
import java.util.Optional;
-import org.onap.clamp.authorization.AuthorizationController;
+import org.onap.policy.clamp.authorization.AuthorizationController;
import org.springframework.data.domain.AuditorAware;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/org/onap/clamp/clds/ClampServlet.java b/src/main/java/org/onap/policy/clamp/clds/ClampServlet.java
index 5908201fd..801f59c31 100644
--- a/src/main/java/org/onap/clamp/clds/ClampServlet.java
+++ b/src/main/java/org/onap/policy/clamp/clds/ClampServlet.java
@@ -23,22 +23,21 @@
*
*/
-package org.onap.clamp.clds;
+package org.onap.policy.clamp.clds;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
-
import java.io.IOException;
import java.security.Principal;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
-
+import java.util.stream.Collectors;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-
import org.apache.camel.component.servlet.CamelHttpTransportServlet;
-import org.onap.clamp.authorization.SecureServicePermission;
+import org.onap.policy.clamp.authorization.SecureServicePermission;
import org.springframework.context.ApplicationContext;
import org.springframework.http.HttpStatus;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -69,16 +68,10 @@ public class ClampServlet extends CamelHttpTransportServlet {
private static List<SecureServicePermission> permissionList;
- private synchronized Class loadDynamicAuthenticationClass() {
- try {
- String authenticationObject = WebApplicationContextUtils.getWebApplicationContext(getServletContext())
- .getEnvironment().getProperty(AUTHENTICATION_CLASS);
- return Class.forName(authenticationObject);
- } catch (ClassNotFoundException e) {
- logger.error(
- "Exception caught when attempting to create associated class of config:" + AUTHENTICATION_CLASS, e);
- return Object.class;
- }
+ private synchronized List<String> loadDynamicAuthenticationClasses() {
+ return Arrays.stream(WebApplicationContextUtils.getWebApplicationContext(getServletContext())
+ .getEnvironment().getProperty(AUTHENTICATION_CLASS).split(",")).map(className -> className.trim())
+ .collect(Collectors.toList());
}
private synchronized List<SecureServicePermission> getPermissionList() {
@@ -115,7 +108,8 @@ public class ClampServlet extends CamelHttpTransportServlet {
@Override
protected void doService(HttpServletRequest request, HttpServletResponse response) {
Principal principal = request.getUserPrincipal();
- if (loadDynamicAuthenticationClass().isInstance(principal)) {
+ if (principal != null && loadDynamicAuthenticationClasses().stream()
+ .anyMatch(className -> className.equals(principal.getClass().getName()))) {
// When AAF is enabled, there is a need to provision the permissions to Spring
// system
List<GrantedAuthority> grantedAuths = new ArrayList<>();
diff --git a/src/main/java/org/onap/clamp/clds/TomcatEmbeddedServletContainerFactoryRedirection.java b/src/main/java/org/onap/policy/clamp/clds/TomcatEmbeddedServletContainerFactoryRedirection.java
index a0109a688..f66a09c41 100644
--- a/src/main/java/org/onap/clamp/clds/TomcatEmbeddedServletContainerFactoryRedirection.java
+++ b/src/main/java/org/onap/policy/clamp/clds/TomcatEmbeddedServletContainerFactoryRedirection.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds;
+package org.onap.policy.clamp.clds;
import org.apache.catalina.Context;
import org.apache.tomcat.util.descriptor.web.SecurityCollection;
diff --git a/src/main/java/org/onap/clamp/clds/client/CdsServices.java b/src/main/java/org/onap/policy/clamp/clds/client/CdsServices.java
index fd3b3539a..ff79ef413 100644
--- a/src/main/java/org/onap/clamp/clds/client/CdsServices.java
+++ b/src/main/java/org/onap/policy/clamp/clds/client/CdsServices.java
@@ -20,7 +20,7 @@
*
*/
-package org.onap.clamp.clds.client;
+package org.onap.policy.clamp.clds.client;
import static java.lang.Boolean.parseBoolean;
@@ -29,17 +29,15 @@ import com.att.eelf.configuration.EELFManager;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
-
import java.util.Date;
import java.util.Map;
-
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.builder.ExchangeBuilder;
-import org.onap.clamp.clds.exception.cds.CdsParametersException;
-import org.onap.clamp.clds.model.cds.CdsBpWorkFlowListResponse;
-import org.onap.clamp.clds.util.JsonUtils;
-import org.onap.clamp.clds.util.LoggingUtils;
+import org.onap.policy.clamp.clds.exception.cds.CdsParametersException;
+import org.onap.policy.clamp.clds.model.cds.CdsBpWorkFlowListResponse;
+import org.onap.policy.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.clds.util.LoggingUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/org/onap/clamp/clds/client/DcaeInventoryServices.java b/src/main/java/org/onap/policy/clamp/clds/client/DcaeInventoryServices.java
index b24bc99b2..fed061e7d 100644
--- a/src/main/java/org/onap/clamp/clds/client/DcaeInventoryServices.java
+++ b/src/main/java/org/onap/policy/clamp/clds/client/DcaeInventoryServices.java
@@ -22,14 +22,12 @@
*
*/
-package org.onap.clamp.clds.client;
+package org.onap.policy.clamp.clds.client;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
-
import java.io.IOException;
import java.util.Date;
-
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.builder.ExchangeBuilder;
@@ -37,10 +35,10 @@ import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
-import org.onap.clamp.clds.config.ClampProperties;
-import org.onap.clamp.clds.model.dcae.DcaeInventoryResponse;
-import org.onap.clamp.clds.util.JsonUtils;
-import org.onap.clamp.clds.util.LoggingUtils;
+import org.onap.policy.clamp.clds.config.ClampProperties;
+import org.onap.policy.clamp.clds.model.dcae.DcaeInventoryResponse;
+import org.onap.policy.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.clds.util.LoggingUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/org/onap/clamp/clds/client/PolicyEngineServices.java b/src/main/java/org/onap/policy/clamp/clds/client/PolicyEngineServices.java
index 260bd1e48..bc6a68286 100644
--- a/src/main/java/org/onap/clamp/clds/client/PolicyEngineServices.java
+++ b/src/main/java/org/onap/policy/clamp/clds/client/PolicyEngineServices.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds.client;
+package org.onap.policy.clamp.clds.client;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
@@ -34,13 +34,12 @@ import java.util.Map;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.builder.ExchangeBuilder;
-import org.onap.clamp.clds.config.ClampProperties;
-import org.onap.clamp.clds.sdc.controller.installer.BlueprintMicroService;
-import org.onap.clamp.clds.util.JsonUtils;
-import org.onap.clamp.loop.template.PolicyModel;
-import org.onap.clamp.loop.template.PolicyModelId;
-import org.onap.clamp.loop.template.PolicyModelsService;
-import org.onap.clamp.policy.pdpgroup.PdpGroup;
+import org.onap.policy.clamp.clds.config.ClampProperties;
+import org.onap.policy.clamp.clds.sdc.controller.installer.BlueprintMicroService;
+import org.onap.policy.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.loop.template.PolicyModel;
+import org.onap.policy.clamp.loop.template.PolicyModelsService;
+import org.onap.policy.clamp.policy.pdpgroup.PdpGroup;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.yaml.snakeyaml.DumperOptions;
@@ -87,20 +86,29 @@ public class PolicyEngineServices {
/**
* This method query Policy engine and create a PolicyModel object with type and version.
+ * If the policy already exist in the db it returns the existing one.
*
* @param policyType The policyType id
* @param policyVersion The policy version of that type
- * @return A PolicyModel created from policyEngine data
+ * @return A PolicyModel created from policyEngine data or null if nothing is found on policyEngine
*/
public PolicyModel createPolicyModelFromPolicyEngine(String policyType, String policyVersion) {
- if (!policyModelsService.existsById(
- new PolicyModelId(policyType, policyVersion))) {
- return policyModelsService.savePolicyModelInNewTransaction(
- new PolicyModel(policyType, this.downloadOnePolicy(policyType, policyVersion), policyVersion));
+ PolicyModel policyModelFound = policyModelsService.getPolicyModel(policyType, policyVersion);
+ if (policyModelFound == null) {
+ String policyTosca = this.downloadOnePolicy(policyType, policyVersion);
+ if (policyTosca != null && !policyTosca.isEmpty()) {
+ return policyModelsService.savePolicyModelInNewTransaction(
+ new PolicyModel(policyType, policyTosca, policyVersion));
+ } else {
+ logger.error("Policy not found in the Policy Engine, returning null: " + policyType
+ + "/" + policyVersion);
+ return null;
+ }
+ } else {
+ logger.info("Skipping policy model download as it exists already in the database " + policyType
+ + "/" + policyVersion);
+ return policyModelFound;
}
- logger.info("Skipping policy model download as it exists already in the database " + policyType
- + "/" + policyVersion);
- return null;
}
/**
@@ -158,10 +166,17 @@ public class PolicyEngineServices {
options.setPrettyFlow(true);
options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
Yaml yamlParser = new Yaml(options);
- return yamlParser.dump((Map<String, Object>) yamlParser.load(callCamelRoute(
+ String responseBody = callCamelRoute(
ExchangeBuilder.anExchange(camelContext).withProperty("policyModelName", policyType)
.withProperty("policyModelVersion", policyVersion).build(), "direct:get-policy-model",
- "Get one policy")));
+ "Get one policy");
+
+ if (responseBody == null || responseBody.isEmpty()) {
+ logger.warn("getPolicyModel returned by policy engine could not be decoded, as it's null or empty");
+ return null;
+ }
+
+ return yamlParser.dump((Map<String, Object>) yamlParser.load(responseBody));
}
/**
@@ -196,8 +211,7 @@ public class PolicyEngineServices {
Exchange exchangeResponse = camelContext.createProducerTemplate().send(camelFlow, exchange);
if (Integer.valueOf(200).equals(exchangeResponse.getIn().getHeader("CamelHttpResponseCode"))) {
return (String) exchangeResponse.getIn().getBody();
- }
- else {
+ } else {
logger.info(logMsg + " query " + retryInterval + "ms before retrying ...");
// wait for a while and try to connect to DCAE again
try {
diff --git a/src/main/java/org/onap/clamp/clds/config/AafConfiguration.java b/src/main/java/org/onap/policy/clamp/clds/config/AafConfiguration.java
index d9178cb9a..30ba6e6ae 100644
--- a/src/main/java/org/onap/clamp/clds/config/AafConfiguration.java
+++ b/src/main/java/org/onap/policy/clamp/clds/config/AafConfiguration.java
@@ -21,11 +21,10 @@
*
*/
-package org.onap.clamp.clds.config;
+package org.onap.policy.clamp.clds.config;
import javax.servlet.Filter;
-
-import org.onap.clamp.clds.filter.ClampCadiFilter;
+import org.onap.policy.clamp.clds.filter.ClampCadiFilter;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/org/onap/clamp/clds/config/CamelConfiguration.java b/src/main/java/org/onap/policy/clamp/clds/config/CamelConfiguration.java
index 36e11f64f..9431f40e8 100644
--- a/src/main/java/org/onap/clamp/clds/config/CamelConfiguration.java
+++ b/src/main/java/org/onap/policy/clamp/clds/config/CamelConfiguration.java
@@ -20,7 +20,7 @@
* ===================================================================
*/
-package org.onap.clamp.clds.config;
+package org.onap.policy.clamp.clds.config;
import java.io.IOException;
import java.net.URL;
@@ -45,9 +45,9 @@ import org.apache.http.conn.socket.PlainConnectionSocketFactory;
import org.apache.http.conn.ssl.SSLSocketFactory;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
-import org.onap.clamp.clds.util.ClampVersioning;
-import org.onap.clamp.clds.util.ResourceFileUtils;
-import org.onap.clamp.util.PassDecoder;
+import org.onap.policy.clamp.clds.util.ClampVersioning;
+import org.onap.policy.clamp.clds.util.ResourceFileUtils;
+import org.onap.policy.clamp.util.PassDecoder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/org/onap/clamp/clds/config/ClampProperties.java b/src/main/java/org/onap/policy/clamp/clds/config/ClampProperties.java
index 0b5c951bf..f11e16733 100644
--- a/src/main/java/org/onap/clamp/clds/config/ClampProperties.java
+++ b/src/main/java/org/onap/policy/clamp/clds/config/ClampProperties.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds.config;
+package org.onap.policy.clamp.clds.config;
import java.io.IOException;
import java.net.URL;
diff --git a/src/main/java/org/onap/clamp/clds/config/CldsUserJsonDecoder.java b/src/main/java/org/onap/policy/clamp/clds/config/CldsUserJsonDecoder.java
index a7ef10738..20d7143fb 100644
--- a/src/main/java/org/onap/clamp/clds/config/CldsUserJsonDecoder.java
+++ b/src/main/java/org/onap/policy/clamp/clds/config/CldsUserJsonDecoder.java
@@ -23,16 +23,16 @@
*
*/
-package org.onap.clamp.clds.config;
+package org.onap.policy.clamp.clds.config;
import com.google.gson.JsonParseException;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import org.apache.commons.io.IOUtils;
-import org.onap.clamp.authorization.CldsUser;
-import org.onap.clamp.clds.exception.CldsUsersException;
-import org.onap.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.authorization.CldsUser;
+import org.onap.policy.clamp.clds.exception.CldsUsersException;
+import org.onap.policy.clamp.clds.util.JsonUtils;
public class CldsUserJsonDecoder {
diff --git a/src/main/java/org/onap/clamp/clds/config/DefaultDictionaryElements.java b/src/main/java/org/onap/policy/clamp/clds/config/DefaultDictionaryElements.java
index 1c52e4100..27cf0b941 100644
--- a/src/main/java/org/onap/clamp/clds/config/DefaultDictionaryElements.java
+++ b/src/main/java/org/onap/policy/clamp/clds/config/DefaultDictionaryElements.java
@@ -21,12 +21,12 @@
*
*/
-package org.onap.clamp.clds.config;
+package org.onap.policy.clamp.clds.config;
import javax.annotation.PostConstruct;
-import org.onap.clamp.tosca.Dictionary;
-import org.onap.clamp.tosca.DictionaryElement;
-import org.onap.clamp.tosca.DictionaryService;
+import org.onap.policy.clamp.tosca.Dictionary;
+import org.onap.policy.clamp.tosca.DictionaryElement;
+import org.onap.policy.clamp.tosca.DictionaryService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;
diff --git a/src/main/java/org/onap/clamp/clds/config/DefaultUserConfiguration.java b/src/main/java/org/onap/policy/clamp/clds/config/DefaultUserConfiguration.java
index cfd5f990f..015868141 100644
--- a/src/main/java/org/onap/clamp/clds/config/DefaultUserConfiguration.java
+++ b/src/main/java/org/onap/policy/clamp/clds/config/DefaultUserConfiguration.java
@@ -23,14 +23,14 @@
*
*/
-package org.onap.clamp.clds.config;
+package org.onap.policy.clamp.clds.config;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
import java.io.IOException;
-import org.onap.clamp.authorization.CldsUser;
-import org.onap.clamp.clds.exception.CldsConfigException;
-import org.onap.clamp.clds.exception.CldsUsersException;
+import org.onap.policy.clamp.authorization.CldsUser;
+import org.onap.policy.clamp.clds.exception.CldsConfigException;
+import org.onap.policy.clamp.clds.exception.CldsUsersException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/org/onap/clamp/clds/config/SslConfig.java b/src/main/java/org/onap/policy/clamp/clds/config/SslConfig.java
index 6345f4b56..329cb4bed 100644
--- a/src/main/java/org/onap/clamp/clds/config/SslConfig.java
+++ b/src/main/java/org/onap/policy/clamp/clds/config/SslConfig.java
@@ -21,16 +21,15 @@
*
*/
-package org.onap.clamp.clds.config;
+package org.onap.policy.clamp.clds.config;
import java.io.IOException;
-import java.io.InputStream;
import java.security.KeyStore;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
import java.security.cert.CertificateException;
-import org.onap.clamp.clds.util.ResourceFileUtils;
-import org.onap.clamp.util.PassDecoder;
+import org.onap.policy.clamp.clds.util.ResourceFileUtils;
+import org.onap.policy.clamp.util.PassDecoder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.web.ServerProperties;
import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
diff --git a/src/main/java/org/onap/clamp/clds/config/SystemPropertiesLoader.java b/src/main/java/org/onap/policy/clamp/clds/config/SystemPropertiesLoader.java
index 7480beb8d..3e2e62b66 100644
--- a/src/main/java/org/onap/clamp/clds/config/SystemPropertiesLoader.java
+++ b/src/main/java/org/onap/policy/clamp/clds/config/SystemPropertiesLoader.java
@@ -21,15 +21,12 @@
*
*/
-package org.onap.clamp.clds.config;
+package org.onap.policy.clamp.clds.config;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
-
import java.util.Properties;
-
import javax.annotation.Resource;
-
import org.springframework.context.ApplicationListener;
import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/org/onap/clamp/clds/config/sdc/SdcControllersConfiguration.java b/src/main/java/org/onap/policy/clamp/clds/config/sdc/SdcControllersConfiguration.java
index ad2751bb8..4748edf6d 100644
--- a/src/main/java/org/onap/clamp/clds/config/sdc/SdcControllersConfiguration.java
+++ b/src/main/java/org/onap/policy/clamp/clds/config/sdc/SdcControllersConfiguration.java
@@ -23,7 +23,7 @@
*
*/
-package org.onap.clamp.clds.config.sdc;
+package org.onap.policy.clamp.clds.config.sdc;
import com.google.gson.JsonObject;
import java.io.IOException;
@@ -31,11 +31,9 @@ import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
-
import javax.annotation.PostConstruct;
-
-import org.onap.clamp.clds.exception.sdc.controller.SdcParametersException;
-import org.onap.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.clds.exception.sdc.controller.SdcParametersException;
+import org.onap.policy.clamp.clds.util.JsonUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.ApplicationContext;
diff --git a/src/main/java/org/onap/clamp/clds/config/sdc/SdcSingleControllerConfiguration.java b/src/main/java/org/onap/policy/clamp/clds/config/sdc/SdcSingleControllerConfiguration.java
index da90e6060..0bbbf19dc 100644
--- a/src/main/java/org/onap/clamp/clds/config/sdc/SdcSingleControllerConfiguration.java
+++ b/src/main/java/org/onap/policy/clamp/clds/config/sdc/SdcSingleControllerConfiguration.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds.config.sdc;
+package org.onap.policy.clamp.clds.config.sdc;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
@@ -32,8 +32,8 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import org.apache.commons.codec.DecoderException;
-import org.onap.clamp.clds.exception.sdc.controller.SdcParametersException;
-import org.onap.clamp.clds.util.CryptoUtils;
+import org.onap.policy.clamp.clds.exception.sdc.controller.SdcParametersException;
+import org.onap.policy.clamp.clds.util.CryptoUtils;
import org.onap.sdc.api.consumer.IConfiguration;
/**
diff --git a/src/main/java/org/onap/clamp/clds/config/spring/CldsConfiguration.java b/src/main/java/org/onap/policy/clamp/clds/config/spring/CldsConfiguration.java
index 14c08c800..72f09ce13 100644
--- a/src/main/java/org/onap/clamp/clds/config/spring/CldsConfiguration.java
+++ b/src/main/java/org/onap/policy/clamp/clds/config/spring/CldsConfiguration.java
@@ -21,9 +21,9 @@
*
*/
-package org.onap.clamp.clds.config.spring;
+package org.onap.policy.clamp.clds.config.spring;
-import org.onap.clamp.clds.config.ClampProperties;
+import org.onap.policy.clamp.clds.config.ClampProperties;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.PropertiesFactoryBean;
import org.springframework.context.ApplicationContext;
diff --git a/src/main/java/org/onap/clamp/clds/config/spring/SdcControllerConfiguration.java b/src/main/java/org/onap/policy/clamp/clds/config/spring/SdcControllerConfiguration.java
index eca45d66f..6005b0d39 100644
--- a/src/main/java/org/onap/clamp/clds/config/spring/SdcControllerConfiguration.java
+++ b/src/main/java/org/onap/policy/clamp/clds/config/spring/SdcControllerConfiguration.java
@@ -21,23 +21,20 @@
*
*/
-package org.onap.clamp.clds.config.spring;
+package org.onap.policy.clamp.clds.config.spring;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
-
import java.util.ArrayList;
import java.util.List;
-
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
-
-import org.onap.clamp.clds.config.ClampProperties;
-import org.onap.clamp.clds.config.sdc.SdcControllersConfiguration;
-import org.onap.clamp.clds.exception.sdc.controller.SdcControllerException;
-import org.onap.clamp.clds.sdc.controller.SdcSingleController;
-import org.onap.clamp.clds.sdc.controller.SdcSingleControllerStatus;
-import org.onap.clamp.loop.CsarInstaller;
+import org.onap.policy.clamp.clds.config.ClampProperties;
+import org.onap.policy.clamp.clds.config.sdc.SdcControllersConfiguration;
+import org.onap.policy.clamp.clds.exception.sdc.controller.SdcControllerException;
+import org.onap.policy.clamp.clds.sdc.controller.SdcSingleController;
+import org.onap.policy.clamp.clds.sdc.controller.SdcSingleControllerStatus;
+import org.onap.policy.clamp.loop.CsarInstaller;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Bean;
diff --git a/src/main/java/org/onap/clamp/clds/exception/CldsConfigException.java b/src/main/java/org/onap/policy/clamp/clds/exception/CldsConfigException.java
index 93d98151a..ef1ced0a3 100644
--- a/src/main/java/org/onap/clamp/clds/exception/CldsConfigException.java
+++ b/src/main/java/org/onap/policy/clamp/clds/exception/CldsConfigException.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds.exception;
+package org.onap.policy.clamp.clds.exception;
/**
* New exception to CldsUser errors.
diff --git a/src/main/java/org/onap/clamp/clds/exception/CldsUsersException.java b/src/main/java/org/onap/policy/clamp/clds/exception/CldsUsersException.java
index 270bfa1e2..4d4855b6f 100644
--- a/src/main/java/org/onap/clamp/clds/exception/CldsUsersException.java
+++ b/src/main/java/org/onap/policy/clamp/clds/exception/CldsUsersException.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds.exception;
+package org.onap.policy.clamp.clds.exception;
/**
* New exception to CldsUser errors.
diff --git a/src/main/java/org/onap/clamp/clds/exception/NotAuthorizedException.java b/src/main/java/org/onap/policy/clamp/clds/exception/NotAuthorizedException.java
index 1bdf18e7e..73c117932 100644
--- a/src/main/java/org/onap/clamp/clds/exception/NotAuthorizedException.java
+++ b/src/main/java/org/onap/policy/clamp/clds/exception/NotAuthorizedException.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds.exception;
+package org.onap.policy.clamp.clds.exception;
/**
* New exception to request errors.
diff --git a/src/main/java/org/onap/clamp/clds/exception/cds/CdsParametersException.java b/src/main/java/org/onap/policy/clamp/clds/exception/cds/CdsParametersException.java
index 73ce31f89..b4a013eb4 100644
--- a/src/main/java/org/onap/clamp/clds/exception/cds/CdsParametersException.java
+++ b/src/main/java/org/onap/policy/clamp/clds/exception/cds/CdsParametersException.java
@@ -20,7 +20,7 @@
*
*/
-package org.onap.clamp.clds.exception.cds;
+package org.onap.policy.clamp.clds.exception.cds;
/**
* Exception while parsing CDS response.
diff --git a/src/main/java/org/onap/clamp/clds/exception/dcae/DcaeDeploymentException.java b/src/main/java/org/onap/policy/clamp/clds/exception/dcae/DcaeDeploymentException.java
index e733da53d..78c2c6331 100644
--- a/src/main/java/org/onap/clamp/clds/exception/dcae/DcaeDeploymentException.java
+++ b/src/main/java/org/onap/policy/clamp/clds/exception/dcae/DcaeDeploymentException.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds.exception.dcae;
+package org.onap.policy.clamp.clds.exception.dcae;
/**
* New exception to capture DCAE communication errors.
diff --git a/src/main/java/org/onap/clamp/clds/exception/sdc/controller/BlueprintParserException.java b/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/BlueprintParserException.java
index 7257fd8a0..6939fdf06 100644
--- a/src/main/java/org/onap/clamp/clds/exception/sdc/controller/BlueprintParserException.java
+++ b/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/BlueprintParserException.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds.exception.sdc.controller;
+package org.onap.policy.clamp.clds.exception.sdc.controller;
/**
* Exception during blueprint parsing.
diff --git a/src/main/java/org/onap/clamp/clds/exception/sdc/controller/CsarHandlerException.java b/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/CsarHandlerException.java
index c3ebde1f8..e3f16f908 100644
--- a/src/main/java/org/onap/clamp/clds/exception/sdc/controller/CsarHandlerException.java
+++ b/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/CsarHandlerException.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds.exception.sdc.controller;
+package org.onap.policy.clamp.clds.exception.sdc.controller;
/**
* Exception during Csar operations.
diff --git a/src/main/java/org/onap/clamp/clds/exception/sdc/controller/SdcArtifactInstallerException.java b/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcArtifactInstallerException.java
index 523766af1..1202ec199 100644
--- a/src/main/java/org/onap/clamp/clds/exception/sdc/controller/SdcArtifactInstallerException.java
+++ b/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcArtifactInstallerException.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds.exception.sdc.controller;
+package org.onap.policy.clamp.clds.exception.sdc.controller;
/**
* Exception during SDC artifact installation.
diff --git a/src/main/java/org/onap/clamp/clds/exception/sdc/controller/SdcControllerException.java b/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcControllerException.java
index d73001d78..e391ee7e8 100644
--- a/src/main/java/org/onap/clamp/clds/exception/sdc/controller/SdcControllerException.java
+++ b/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcControllerException.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds.exception.sdc.controller;
+package org.onap.policy.clamp.clds.exception.sdc.controller;
/**
* Exception of the SDC controller.
diff --git a/src/main/java/org/onap/clamp/clds/exception/sdc/controller/SdcDownloadException.java b/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcDownloadException.java
index 6cd3fb88d..3c0240ef3 100644
--- a/src/main/java/org/onap/clamp/clds/exception/sdc/controller/SdcDownloadException.java
+++ b/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcDownloadException.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds.exception.sdc.controller;
+package org.onap.policy.clamp.clds.exception.sdc.controller;
/**
* Exception during download from SDC.
diff --git a/src/main/java/org/onap/clamp/clds/exception/sdc/controller/SdcParametersException.java b/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcParametersException.java
index bfe63cbfb..fe573882f 100644
--- a/src/main/java/org/onap/clamp/clds/exception/sdc/controller/SdcParametersException.java
+++ b/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcParametersException.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds.exception.sdc.controller;
+package org.onap.policy.clamp.clds.exception.sdc.controller;
/**
* Exception of the SDC controller.
diff --git a/src/main/java/org/onap/clamp/clds/filter/ClampCadiFilter.java b/src/main/java/org/onap/policy/clamp/clds/filter/ClampCadiFilter.java
index c673f544a..6fa8ecb2b 100644
--- a/src/main/java/org/onap/clamp/clds/filter/ClampCadiFilter.java
+++ b/src/main/java/org/onap/policy/clamp/clds/filter/ClampCadiFilter.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds.filter;
+package org.onap.policy.clamp.clds.filter;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
@@ -43,7 +43,7 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import org.onap.aaf.cadi.config.Config;
import org.onap.aaf.cadi.filter.CadiFilter;
-import org.onap.clamp.clds.util.ResourceFileUtils;
+import org.onap.policy.clamp.clds.util.ResourceFileUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.ApplicationContext;
diff --git a/src/main/java/org/onap/clamp/clds/model/ClampInformation.java b/src/main/java/org/onap/policy/clamp/clds/model/ClampInformation.java
index d73e94204..5708cb6ec 100644
--- a/src/main/java/org/onap/clamp/clds/model/ClampInformation.java
+++ b/src/main/java/org/onap/policy/clamp/clds/model/ClampInformation.java
@@ -21,12 +21,12 @@
*
*/
-package org.onap.clamp.clds.model;
+package org.onap.policy.clamp.clds.model;
import com.google.gson.annotations.Expose;
import java.util.ArrayList;
import java.util.List;
-import org.onap.clamp.clds.util.ClampVersioning;
+import org.onap.policy.clamp.clds.util.ClampVersioning;
public class ClampInformation {
@Expose
diff --git a/src/main/java/org/onap/clamp/clds/model/CldsHealthCheck.java b/src/main/java/org/onap/policy/clamp/clds/model/CldsHealthCheck.java
index 651997cd3..c814a628d 100644
--- a/src/main/java/org/onap/clamp/clds/model/CldsHealthCheck.java
+++ b/src/main/java/org/onap/policy/clamp/clds/model/CldsHealthCheck.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds.model;
+package org.onap.policy.clamp.clds.model;
import com.google.gson.annotations.Expose;
diff --git a/src/main/java/org/onap/clamp/clds/model/cds/CdsBpWorkFlowListResponse.java b/src/main/java/org/onap/policy/clamp/clds/model/cds/CdsBpWorkFlowListResponse.java
index 66025c479..a3b42524e 100644
--- a/src/main/java/org/onap/clamp/clds/model/cds/CdsBpWorkFlowListResponse.java
+++ b/src/main/java/org/onap/policy/clamp/clds/model/cds/CdsBpWorkFlowListResponse.java
@@ -20,10 +20,9 @@
*
*/
-package org.onap.clamp.clds.model.cds;
+package org.onap.policy.clamp.clds.model.cds;
import com.google.gson.annotations.Expose;
-
import java.util.LinkedList;
import java.util.List;
diff --git a/src/main/java/org/onap/clamp/clds/model/dcae/DcaeInventoryCache.java b/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryCache.java
index fc2ca5caa..a69d1a353 100644
--- a/src/main/java/org/onap/clamp/clds/model/dcae/DcaeInventoryCache.java
+++ b/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryCache.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds.model.dcae;
+package org.onap.policy.clamp.clds.model.dcae;
import java.util.Map;
import java.util.Set;
diff --git a/src/main/java/org/onap/clamp/clds/model/dcae/DcaeInventoryResponse.java b/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponse.java
index 67bd026d0..72ae61359 100644
--- a/src/main/java/org/onap/clamp/clds/model/dcae/DcaeInventoryResponse.java
+++ b/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponse.java
@@ -22,7 +22,7 @@
*
*/
-package org.onap.clamp.clds.model.dcae;
+package org.onap.policy.clamp.clds.model.dcae;
import com.google.gson.annotations.Expose;
diff --git a/src/main/java/org/onap/clamp/clds/model/dcae/DcaeLinks.java b/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeLinks.java
index 368e1b8e6..4d6e544da 100644
--- a/src/main/java/org/onap/clamp/clds/model/dcae/DcaeLinks.java
+++ b/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeLinks.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds.model.dcae;
+package org.onap.policy.clamp.clds.model.dcae;
import com.google.gson.annotations.Expose;
diff --git a/src/main/java/org/onap/clamp/clds/model/dcae/DcaeOperationStatusResponse.java b/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeOperationStatusResponse.java
index aee7d0613..9389a51fc 100644
--- a/src/main/java/org/onap/clamp/clds/model/dcae/DcaeOperationStatusResponse.java
+++ b/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeOperationStatusResponse.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds.model.dcae;
+package org.onap.policy.clamp.clds.model.dcae;
import com.google.gson.annotations.Expose;
diff --git a/src/main/java/org/onap/clamp/clds/sdc/controller/DistributionStatusMessage.java b/src/main/java/org/onap/policy/clamp/clds/sdc/controller/DistributionStatusMessage.java
index c80441fa6..ca46c6d31 100644
--- a/src/main/java/org/onap/clamp/clds/sdc/controller/DistributionStatusMessage.java
+++ b/src/main/java/org/onap/policy/clamp/clds/sdc/controller/DistributionStatusMessage.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds.sdc.controller;
+package org.onap.policy.clamp.clds.sdc.controller;
import org.onap.sdc.api.consumer.IDistributionStatusMessage;
import org.onap.sdc.utils.DistributionStatusEnum;
diff --git a/src/main/java/org/onap/clamp/clds/sdc/controller/SdcSingleController.java b/src/main/java/org/onap/policy/clamp/clds/sdc/controller/SdcSingleController.java
index fbb37d525..4ca6b1cf4 100644
--- a/src/main/java/org/onap/clamp/clds/sdc/controller/SdcSingleController.java
+++ b/src/main/java/org/onap/policy/clamp/clds/sdc/controller/SdcSingleController.java
@@ -22,27 +22,26 @@
*
*/
-package org.onap.clamp.clds.sdc.controller;
+package org.onap.policy.clamp.clds.sdc.controller;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
-
import java.util.Date;
import java.util.Map.Entry;
import java.util.concurrent.ThreadLocalRandom;
-
-import org.onap.clamp.clds.config.ClampProperties;
-import org.onap.clamp.clds.config.sdc.SdcSingleControllerConfiguration;
-import org.onap.clamp.clds.exception.sdc.controller.BlueprintParserException;
-import org.onap.clamp.clds.exception.sdc.controller.CsarHandlerException;
-import org.onap.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException;
-import org.onap.clamp.clds.exception.sdc.controller.SdcControllerException;
-import org.onap.clamp.clds.exception.sdc.controller.SdcDownloadException;
-import org.onap.clamp.clds.sdc.controller.installer.BlueprintArtifact;
-import org.onap.clamp.clds.sdc.controller.installer.CsarHandler;
-import org.onap.clamp.clds.util.LoggingUtils;
-import org.onap.clamp.loop.CsarInstaller;
+import org.onap.policy.clamp.clds.config.ClampProperties;
+import org.onap.policy.clamp.clds.config.sdc.SdcSingleControllerConfiguration;
+import org.onap.policy.clamp.clds.exception.sdc.controller.BlueprintParserException;
+import org.onap.policy.clamp.clds.exception.sdc.controller.CsarHandlerException;
+import org.onap.policy.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException;
+import org.onap.policy.clamp.clds.exception.sdc.controller.SdcControllerException;
+import org.onap.policy.clamp.clds.exception.sdc.controller.SdcDownloadException;
+import org.onap.policy.clamp.clds.sdc.controller.installer.BlueprintArtifact;
+import org.onap.policy.clamp.clds.sdc.controller.installer.CsarHandler;
+import org.onap.policy.clamp.clds.util.LoggingUtils;
+import org.onap.policy.clamp.loop.CsarInstaller;
import org.onap.sdc.api.IDistributionClient;
+import org.onap.sdc.api.consumer.IComponentDoneStatusMessage;
import org.onap.sdc.api.consumer.IDistributionStatusMessage;
import org.onap.sdc.api.consumer.INotificationCallback;
import org.onap.sdc.api.notification.IArtifactInfo;
@@ -160,7 +159,8 @@ public class SdcSingleController {
* @param distributionClient the distribution client
*/
public SdcSingleController(ClampProperties clampProp, CsarInstaller csarInstaller,
- SdcSingleControllerConfiguration sdcSingleConfig, IDistributionClient distributionClient) {
+ SdcSingleControllerConfiguration sdcSingleConfig,
+ IDistributionClient distributionClient) {
this.distributionClient = distributionClient;
isSdcClientAutoManaged = (distributionClient == null);
this.sdcConfig = sdcSingleConfig;
@@ -228,7 +228,8 @@ public class SdcSingleController {
}
private void sendAllNotificationForCsarHandler(INotificationData notificationData, CsarHandler csar,
- NotificationType notificationType, DistributionStatusEnum distributionStatus, String errorMessage) {
+ NotificationType notificationType,
+ DistributionStatusEnum distributionStatus, String errorMessage) {
if (csar != null) {
// Notify for the CSAR
this.sendSdcNotification(notificationType, csar.getArtifactElement().getArtifactURL(),
@@ -278,27 +279,33 @@ public class SdcSingleController {
sendAllNotificationForCsarHandler(notificationData, csar, NotificationType.DEPLOY,
DistributionStatusEnum.DEPLOY_OK, null);
}
+ this.sendComponentStatus(notificationData, DistributionStatusEnum.COMPONENT_DONE_OK, null);
} catch (SdcArtifactInstallerException | SdcToscaParserException e) {
logger.error("SdcArtifactInstallerException exception caught during the notification processing", e);
sendAllNotificationForCsarHandler(notificationData, csar, NotificationType.DEPLOY,
DistributionStatusEnum.DEPLOY_ERROR, e.getMessage());
+ this.sendComponentStatus(notificationData, DistributionStatusEnum.COMPONENT_DONE_ERROR, e.getMessage());
} catch (SdcDownloadException | CsarHandlerException e) {
logger.error("SdcDownloadException exception caught during the notification processing", e);
sendAllNotificationForCsarHandler(notificationData, csar, NotificationType.DOWNLOAD,
DistributionStatusEnum.DOWNLOAD_ERROR, e.getMessage());
+ this.sendComponentStatus(notificationData, DistributionStatusEnum.COMPONENT_DONE_ERROR, e.getMessage());
} catch (InterruptedException e) {
logger.error("Interrupt exception caught during the notification processing", e);
sendAllNotificationForCsarHandler(notificationData, csar, NotificationType.DEPLOY,
DistributionStatusEnum.DEPLOY_ERROR, e.getMessage());
+ this.sendComponentStatus(notificationData, DistributionStatusEnum.COMPONENT_DONE_ERROR, e.getMessage());
Thread.currentThread().interrupt();
} catch (BlueprintParserException e) {
logger.error("BlueprintParser exception caught during the notification processing", e);
sendAllNotificationForCsarHandler(notificationData, csar, NotificationType.DEPLOY,
DistributionStatusEnum.DEPLOY_ERROR, e.getMessage());
+ this.sendComponentStatus(notificationData, DistributionStatusEnum.COMPONENT_DONE_ERROR, e.getMessage());
} catch (RuntimeException e) {
logger.error("Unexpected exception caught during the notification processing", e);
sendAllNotificationForCsarHandler(notificationData, csar, NotificationType.DEPLOY,
DistributionStatusEnum.DEPLOY_ERROR, e.getMessage());
+ this.sendComponentStatus(notificationData, DistributionStatusEnum.COMPONENT_DONE_ERROR, e.getMessage());
} finally {
this.changeControllerStatus(SdcSingleControllerStatus.IDLE);
}
@@ -341,7 +348,8 @@ public class SdcSingleController {
}
private void sendSdcNotification(NotificationType notificationType, String artifactUrl, String consumerId,
- String distributionId, DistributionStatusEnum status, String errorReason, long timestamp) {
+ String distributionId, DistributionStatusEnum status, String errorReason,
+ long timestamp) {
String event = "Sending " + notificationType.name() + "(" + status.name() + ")"
+ " notification to SDC for artifact:" + artifactUrl;
if (errorReason != null) {
@@ -370,6 +378,43 @@ public class SdcSingleController {
logger.info("SDC Notification sent successfully(" + action + ")");
}
+ private void sendComponentStatus(INotificationData notificationData, DistributionStatusEnum status,
+ String errorReason) {
+ try {
+ IComponentDoneStatusMessage message = new IComponentDoneStatusMessage() {
+
+ @Override public String getDistributionID() {
+ return notificationData.getDistributionID();
+ }
+
+ @Override public String getConsumerID() {
+ return sdcConfig.getConsumerID();
+ }
+
+ @Override public long getTimestamp() {
+ return System.currentTimeMillis();
+ }
+
+ @Override public DistributionStatusEnum getStatus() {
+ return status;
+ }
+
+ @Override public String getComponentName() {
+ return sdcConfig.getUser();
+ }
+ };
+
+ if (errorReason != null) {
+ this.distributionClient.sendComponentDoneStatus(message, errorReason);
+ } else {
+ this.distributionClient.sendComponentDoneStatus(message);
+ }
+ } catch (RuntimeException e) {
+ logger.warn("Unable to send the SDC Notification (" + status.name() + ") due to an exception", e);
+ }
+ logger.info("SDC Notification sent successfully(" + status.name() + ")");
+ }
+
private void sendDownloadStatus(IDistributionStatusMessage message, String errorReason) {
if (errorReason != null) {
this.distributionClient.sendDownloadStatus(message, errorReason);
diff --git a/src/main/java/org/onap/clamp/clds/sdc/controller/SdcSingleControllerStatus.java b/src/main/java/org/onap/policy/clamp/clds/sdc/controller/SdcSingleControllerStatus.java
index a50e340e3..fe269c486 100644
--- a/src/main/java/org/onap/clamp/clds/sdc/controller/SdcSingleControllerStatus.java
+++ b/src/main/java/org/onap/policy/clamp/clds/sdc/controller/SdcSingleControllerStatus.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds.sdc.controller;
+package org.onap.policy.clamp.clds.sdc.controller;
public enum SdcSingleControllerStatus {
STOPPED, IDLE, BUSY
diff --git a/src/main/java/org/onap/clamp/clds/sdc/controller/installer/BlueprintArtifact.java b/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintArtifact.java
index 35bc909dc..df81cfb0c 100644
--- a/src/main/java/org/onap/clamp/clds/sdc/controller/installer/BlueprintArtifact.java
+++ b/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintArtifact.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds.sdc.controller.installer;
+package org.onap.policy.clamp.clds.sdc.controller.installer;
import org.onap.sdc.api.notification.IResourceInstance;
diff --git a/src/main/java/org/onap/clamp/clds/sdc/controller/installer/BlueprintMicroService.java b/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintMicroService.java
index e00ce9430..519a24f46 100644
--- a/src/main/java/org/onap/clamp/clds/sdc/controller/installer/BlueprintMicroService.java
+++ b/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintMicroService.java
@@ -22,7 +22,7 @@
*
*/
-package org.onap.clamp.clds.sdc.controller.installer;
+package org.onap.policy.clamp.clds.sdc.controller.installer;
import java.util.Objects;
diff --git a/src/main/java/org/onap/clamp/clds/sdc/controller/installer/BlueprintParser.java b/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintParser.java
index 5d5027d29..ada47992a 100644
--- a/src/main/java/org/onap/clamp/clds/sdc/controller/installer/BlueprintParser.java
+++ b/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintParser.java
@@ -22,7 +22,7 @@
*
*/
-package org.onap.clamp.clds.sdc.controller.installer;
+package org.onap.policy.clamp.clds.sdc.controller.installer;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
@@ -30,7 +30,6 @@ import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
-
import java.util.AbstractMap;
import java.util.Collections;
import java.util.HashSet;
@@ -38,9 +37,8 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
-
import org.json.JSONObject;
-import org.onap.clamp.clds.exception.sdc.controller.BlueprintParserException;
+import org.onap.policy.clamp.clds.exception.sdc.controller.BlueprintParserException;
import org.yaml.snakeyaml.Yaml;
public class BlueprintParser {
diff --git a/src/main/java/org/onap/clamp/clds/sdc/controller/installer/ChainGenerator.java b/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/ChainGenerator.java
index 2bd259c2b..10e7a56a4 100644
--- a/src/main/java/org/onap/clamp/clds/sdc/controller/installer/ChainGenerator.java
+++ b/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/ChainGenerator.java
@@ -21,13 +21,12 @@
*
*/
-package org.onap.clamp.clds.sdc.controller.installer;
+package org.onap.policy.clamp.clds.sdc.controller.installer;
import java.util.LinkedList;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
-
import org.springframework.stereotype.Component;
@Component
diff --git a/src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarHandler.java b/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/CsarHandler.java
index 471415a37..436e594ce 100644
--- a/src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarHandler.java
+++ b/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/CsarHandler.java
@@ -21,11 +21,10 @@
*
*/
-package org.onap.clamp.clds.sdc.controller.installer;
+package org.onap.policy.clamp.clds.sdc.controller.installer;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
-
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -40,11 +39,10 @@ import java.util.Map;
import java.util.Optional;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
-
import org.apache.commons.io.IOUtils;
import org.codehaus.plexus.util.StringUtils;
-import org.onap.clamp.clds.exception.sdc.controller.CsarHandlerException;
-import org.onap.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException;
+import org.onap.policy.clamp.clds.exception.sdc.controller.CsarHandlerException;
+import org.onap.policy.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException;
import org.onap.sdc.api.notification.IArtifactInfo;
import org.onap.sdc.api.notification.INotificationData;
import org.onap.sdc.api.notification.IResourceInstance;
diff --git a/src/main/java/org/onap/clamp/clds/service/CldsHealthcheckService.java b/src/main/java/org/onap/policy/clamp/clds/service/CldsHealthcheckService.java
index 3fceace55..02481494a 100644
--- a/src/main/java/org/onap/clamp/clds/service/CldsHealthcheckService.java
+++ b/src/main/java/org/onap/policy/clamp/clds/service/CldsHealthcheckService.java
@@ -20,13 +20,13 @@
* ===================================================================
*/
-package org.onap.clamp.clds.service;
+package org.onap.policy.clamp.clds.service;
import java.util.Date;
-import org.onap.clamp.clds.model.CldsHealthCheck;
-import org.onap.clamp.clds.util.LoggingUtils;
-import org.onap.clamp.clds.util.OnapLogConstants;
-import org.onap.clamp.loop.LoopController;
+import org.onap.policy.clamp.clds.model.CldsHealthCheck;
+import org.onap.policy.clamp.clds.util.LoggingUtils;
+import org.onap.policy.clamp.clds.util.OnapLogConstants;
+import org.onap.policy.clamp.loop.LoopController;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.event.Level;
diff --git a/src/main/java/org/onap/clamp/clds/tosca/JsonEditorSchemaConstants.java b/src/main/java/org/onap/policy/clamp/clds/tosca/JsonEditorSchemaConstants.java
index e3c661698..32f328079 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/JsonEditorSchemaConstants.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/JsonEditorSchemaConstants.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds.tosca;
+package org.onap.policy.clamp.clds.tosca;
public class JsonEditorSchemaConstants {
diff --git a/src/main/java/org/onap/clamp/clds/tosca/ToscaSchemaConstants.java b/src/main/java/org/onap/policy/clamp/clds/tosca/ToscaSchemaConstants.java
index d00c431c8..c2b5d5963 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/ToscaSchemaConstants.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/ToscaSchemaConstants.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds.tosca;
+package org.onap.policy.clamp.clds.tosca;
public class ToscaSchemaConstants {
diff --git a/src/main/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertor.java b/src/main/java/org/onap/policy/clamp/clds/tosca/ToscaYamlToJsonConvertor.java
index 45bb87ed8..d6b0a031f 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertor.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/ToscaYamlToJsonConvertor.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds.tosca;
+package org.onap.policy.clamp.clds.tosca;
import com.google.gson.Gson;
import com.google.gson.JsonElement;
@@ -37,10 +37,10 @@ import java.util.Optional;
import java.util.stream.Collectors;
import org.json.JSONArray;
import org.json.JSONObject;
-import org.onap.clamp.clds.config.ClampProperties;
-import org.onap.clamp.tosca.Dictionary;
-import org.onap.clamp.tosca.DictionaryElement;
-import org.onap.clamp.tosca.DictionaryService;
+import org.onap.policy.clamp.clds.config.ClampProperties;
+import org.onap.policy.clamp.tosca.Dictionary;
+import org.onap.policy.clamp.tosca.DictionaryElement;
+import org.onap.policy.clamp.tosca.DictionaryService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.yaml.snakeyaml.Yaml;
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupport.java b/src/main/java/org/onap/policy/clamp/clds/tosca/update/ToscaConverterWithDictionarySupport.java
index 5832986a1..3505c8b86 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupport.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/update/ToscaConverterWithDictionarySupport.java
@@ -21,18 +21,18 @@
*
*/
-package org.onap.clamp.clds.tosca.update;
+package org.onap.policy.clamp.clds.tosca.update;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
import com.google.gson.JsonObject;
import java.io.IOException;
-import org.onap.clamp.clds.config.ClampProperties;
-import org.onap.clamp.clds.tosca.update.parser.metadata.ToscaMetadataParser;
-import org.onap.clamp.clds.tosca.update.parser.metadata.ToscaMetadataParserWithDictionarySupport;
-import org.onap.clamp.clds.tosca.update.templates.JsonTemplateManager;
-import org.onap.clamp.clds.util.JsonUtils;
-import org.onap.clamp.loop.service.Service;
+import org.onap.policy.clamp.clds.config.ClampProperties;
+import org.onap.policy.clamp.clds.tosca.update.parser.metadata.ToscaMetadataParser;
+import org.onap.policy.clamp.clds.tosca.update.parser.metadata.ToscaMetadataParserWithDictionarySupport;
+import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplateManager;
+import org.onap.policy.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.loop.service.Service;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/UnknownComponentException.java b/src/main/java/org/onap/policy/clamp/clds/tosca/update/UnknownComponentException.java
index e30f9158b..fb684b57b 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/UnknownComponentException.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/update/UnknownComponentException.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds.tosca.update;
+package org.onap.policy.clamp.clds.tosca.update;
public class UnknownComponentException extends Exception {
public UnknownComponentException(String nameEntry) {
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/elements/ArrayField.java b/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ArrayField.java
index 83f792f3f..9834c78e7 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/elements/ArrayField.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ArrayField.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds.tosca.update.elements;
+package org.onap.policy.clamp.clds.tosca.update.elements;
import com.google.gson.JsonArray;
import java.util.ArrayList;
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/elements/Constraint.java b/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/Constraint.java
index d6bd355e3..b41042abe 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/elements/Constraint.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/Constraint.java
@@ -21,14 +21,14 @@
*
*/
-package org.onap.clamp.clds.tosca.update.elements;
+package org.onap.policy.clamp.clds.tosca.update.elements;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.Map.Entry;
-import org.onap.clamp.clds.tosca.update.templates.JsonTemplate;
+import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplate;
public class Constraint {
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/elements/ToscaElement.java b/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ToscaElement.java
index 9035a5806..0c531e9d0 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/elements/ToscaElement.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ToscaElement.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds.tosca.update.elements;
+package org.onap.policy.clamp.clds.tosca.update.elements;
import java.util.ArrayList;
import java.util.LinkedHashMap;
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/elements/ToscaElementProperty.java b/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ToscaElementProperty.java
index c5ab5a18e..4db8b0356 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/elements/ToscaElementProperty.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ToscaElementProperty.java
@@ -21,13 +21,13 @@
*
*/
-package org.onap.clamp.clds.tosca.update.elements;
+package org.onap.policy.clamp.clds.tosca.update.elements;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import java.util.ArrayList;
import java.util.LinkedHashMap;
-import org.onap.clamp.clds.tosca.update.templates.JsonTemplate;
+import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplate;
public class ToscaElementProperty {
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/execution/ToscaMetadataExecutor.java b/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataExecutor.java
index 885e755bd..e18af7188 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/execution/ToscaMetadataExecutor.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataExecutor.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds.tosca.update.execution;
+package org.onap.policy.clamp.clds.tosca.update.execution;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
@@ -29,10 +29,10 @@ import com.google.gson.JsonObject;
import java.util.HashMap;
import java.util.Map;
import javax.annotation.PostConstruct;
-import org.onap.clamp.clds.tosca.update.execution.cds.ToscaMetadataCdsProcess;
-import org.onap.clamp.clds.tosca.update.execution.target.ToscaMetadataTargetProcess;
-import org.onap.clamp.loop.service.Service;
-import org.onap.clamp.tosca.DictionaryService;
+import org.onap.policy.clamp.clds.tosca.update.execution.cds.ToscaMetadataCdsProcess;
+import org.onap.policy.clamp.clds.tosca.update.execution.target.ToscaMetadataTargetProcess;
+import org.onap.policy.clamp.loop.service.Service;
+import org.onap.policy.clamp.tosca.DictionaryService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/execution/ToscaMetadataProcess.java b/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataProcess.java
index 214eadb03..a1275229d 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/execution/ToscaMetadataProcess.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataProcess.java
@@ -21,10 +21,10 @@
*
*/
-package org.onap.clamp.clds.tosca.update.execution;
+package org.onap.policy.clamp.clds.tosca.update.execution;
import com.google.gson.JsonObject;
-import org.onap.clamp.loop.service.Service;
+import org.onap.policy.clamp.loop.service.Service;
/**
* This code is the interface that must be implemented to have a tosca process.
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/execution/cds/ToscaMetadataCdsProcess.java b/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/cds/ToscaMetadataCdsProcess.java
index 39fa25a2b..bd3a1cb13 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/execution/cds/ToscaMetadataCdsProcess.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/cds/ToscaMetadataCdsProcess.java
@@ -21,18 +21,18 @@
*
*/
-package org.onap.clamp.clds.tosca.update.execution.cds;
-
-import static org.onap.clamp.clds.tosca.ToscaSchemaConstants.TYPE;
-import static org.onap.clamp.clds.tosca.ToscaSchemaConstants.TYPE_LIST;
+package org.onap.policy.clamp.clds.tosca.update.execution.cds;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import java.util.Map;
import java.util.Set;
-import org.onap.clamp.clds.tosca.update.execution.ToscaMetadataProcess;
-import org.onap.clamp.loop.service.Service;
+import org.onap.policy.clamp.clds.tosca.ToscaSchemaConstants;
+import org.onap.policy.clamp.clds.tosca.ToscaSchemaConstants;
+import org.onap.policy.clamp.clds.tosca.update.execution.ToscaMetadataProcess;
+import org.onap.policy.clamp.loop.service.Service;
+
/**
* This class is there to add the JsonObject for CDS in the json Schema according to what is found in the Tosca model.
@@ -193,12 +193,13 @@ public class ToscaMetadataCdsProcess extends ToscaMetadataProcess {
if (key.equalsIgnoreCase(workFlowName + "-properties")) {
addDefaultValueForData(entry.getValue().getAsJsonObject().get("properties")
.getAsJsonObject(), defaultValue, workFlowName);
- } else if ("object".equalsIgnoreCase(inputProperty.get(TYPE).getAsString())) {
+ } else if ("object".equalsIgnoreCase(inputProperty.get(ToscaSchemaConstants.TYPE).getAsString())) {
JsonObject object = new JsonObject();
addDefaultValueForData(entry.getValue().getAsJsonObject().get("properties")
.getAsJsonObject(), object, workFlowName);
defaultValue.add(entry.getKey(), object);
- } else if (TYPE_LIST.equalsIgnoreCase(inputProperty.get(TYPE).getAsString())) {
+ } else if (ToscaSchemaConstants.TYPE_LIST.equalsIgnoreCase(inputProperty.get(ToscaSchemaConstants.TYPE)
+ .getAsString())) {
defaultValue.add(entry.getKey(), handleListType(entry.getValue().getAsJsonObject(), workFlowName));
} else {
defaultValue.addProperty(entry.getKey(), "");
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/execution/target/ToscaMetadataTargetProcess.java b/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/target/ToscaMetadataTargetProcess.java
index 8b8fa1784..f4ca9909b 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/execution/target/ToscaMetadataTargetProcess.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/target/ToscaMetadataTargetProcess.java
@@ -21,12 +21,12 @@
*
*/
-package org.onap.clamp.clds.tosca.update.execution.target;
+package org.onap.policy.clamp.clds.tosca.update.execution.target;
import com.google.gson.JsonObject;
-import org.onap.clamp.clds.tosca.update.execution.ToscaMetadataProcess;
-import org.onap.clamp.loop.service.Service;
-import org.onap.clamp.policy.operational.OperationalPolicyRepresentationBuilder;
+import org.onap.policy.clamp.clds.tosca.update.execution.ToscaMetadataProcess;
+import org.onap.policy.clamp.loop.service.Service;
+import org.onap.policy.clamp.policy.operational.OperationalPolicyRepresentationBuilder;
/**
* This class is there to add the JsonObject for CDS in the json Schema according to what is found in the Tosca model.
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/parser/ToscaConverterToJsonSchema.java b/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/ToscaConverterToJsonSchema.java
index 9721e33d9..c7cc7e7fa 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/parser/ToscaConverterToJsonSchema.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/ToscaConverterToJsonSchema.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds.tosca.update.parser;
+package org.onap.policy.clamp.clds.tosca.update.parser;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
@@ -29,11 +29,11 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.Map.Entry;
-import org.onap.clamp.clds.tosca.update.elements.ToscaElement;
-import org.onap.clamp.clds.tosca.update.elements.ToscaElementProperty;
-import org.onap.clamp.clds.tosca.update.parser.metadata.ToscaMetadataParser;
-import org.onap.clamp.clds.tosca.update.templates.JsonTemplate;
-import org.onap.clamp.loop.service.Service;
+import org.onap.policy.clamp.clds.tosca.update.elements.ToscaElement;
+import org.onap.policy.clamp.clds.tosca.update.elements.ToscaElementProperty;
+import org.onap.policy.clamp.clds.tosca.update.parser.metadata.ToscaMetadataParser;
+import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplate;
+import org.onap.policy.clamp.loop.service.Service;
public class ToscaConverterToJsonSchema {
private LinkedHashMap<String, ToscaElement> components;
@@ -145,8 +145,7 @@ public class ToscaConverterToJsonSchema {
if (getToscaElement((String) property.getValue().getItems().get("type")) != null) {
jsonSchema.add(property.getValue().getName(),
this.getJsonSchemaOfToscaElement((String) property.getValue().getItems().get("type")));
- }
- else {
+ } else {
jsonSchema.add(property.getValue().getName(), this.complexParse(property.getValue()));
}
}
@@ -176,8 +175,7 @@ public class ToscaConverterToJsonSchema {
String typeProperty = (String) toscaElementProperty.getItems().get("type");
if (typeProperty.toLowerCase().equals("list") || typeProperty.toLowerCase().equals("map")) {
currentPropertyJsonTemplate = templates.get("object");
- }
- else {
+ } else {
String propertyType = (String) toscaElementProperty.getItems().get("type");
currentPropertyJsonTemplate = templates.get(propertyType.toLowerCase());
}
@@ -264,9 +262,8 @@ public class ToscaConverterToJsonSchema {
break;
}
- }
- // Native cases
- else if (toscaElementProperty.getItems().get("type").equals("list")) {
+ } else if (toscaElementProperty.getItems().get("type").equals("list")) {
+ // Native cases
JsonObject itemContainer = new JsonObject();
String valueInEntrySchema =
this.extractSpecificFieldFromMap(toscaElementProperty, "entry_schema");
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/parser/ToscaElementParser.java b/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/ToscaElementParser.java
index 090fcfcfa..a3dd9c3e1 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/parser/ToscaElementParser.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/ToscaElementParser.java
@@ -21,12 +21,12 @@
*
*/
-package org.onap.clamp.clds.tosca.update.parser;
+package org.onap.policy.clamp.clds.tosca.update.parser;
import java.util.LinkedHashMap;
import java.util.Map.Entry;
-import org.onap.clamp.clds.tosca.update.elements.ToscaElement;
-import org.onap.clamp.clds.tosca.update.elements.ToscaElementProperty;
+import org.onap.policy.clamp.clds.tosca.update.elements.ToscaElement;
+import org.onap.policy.clamp.clds.tosca.update.elements.ToscaElementProperty;
import org.yaml.snakeyaml.Yaml;
public class ToscaElementParser {
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParser.java b/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParser.java
index f4a48139e..b2568b79f 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParser.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParser.java
@@ -21,11 +21,11 @@
*
*/
-package org.onap.clamp.clds.tosca.update.parser.metadata;
+package org.onap.policy.clamp.clds.tosca.update.parser.metadata;
import com.google.gson.JsonObject;
-import org.onap.clamp.clds.tosca.update.elements.ToscaElementProperty;
-import org.onap.clamp.loop.service.Service;
+import org.onap.policy.clamp.clds.tosca.update.elements.ToscaElementProperty;
+import org.onap.policy.clamp.loop.service.Service;
public interface ToscaMetadataParser {
JsonObject processAllMetadataElement(ToscaElementProperty toscaElementProperty, Service serviceModel);
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParserWithDictionarySupport.java b/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParserWithDictionarySupport.java
index 33e084279..049018ae0 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParserWithDictionarySupport.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParserWithDictionarySupport.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds.tosca.update.parser.metadata;
+package org.onap.policy.clamp.clds.tosca.update.parser.metadata;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
@@ -29,13 +29,13 @@ import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Optional;
-import org.onap.clamp.clds.tosca.JsonEditorSchemaConstants;
-import org.onap.clamp.clds.tosca.ToscaSchemaConstants;
-import org.onap.clamp.clds.tosca.update.elements.ToscaElementProperty;
-import org.onap.clamp.clds.tosca.update.execution.ToscaMetadataExecutor;
-import org.onap.clamp.loop.service.Service;
-import org.onap.clamp.tosca.DictionaryElement;
-import org.onap.clamp.tosca.DictionaryService;
+import org.onap.policy.clamp.clds.tosca.JsonEditorSchemaConstants;
+import org.onap.policy.clamp.clds.tosca.ToscaSchemaConstants;
+import org.onap.policy.clamp.clds.tosca.update.elements.ToscaElementProperty;
+import org.onap.policy.clamp.clds.tosca.update.execution.ToscaMetadataExecutor;
+import org.onap.policy.clamp.loop.service.Service;
+import org.onap.policy.clamp.tosca.DictionaryElement;
+import org.onap.policy.clamp.tosca.DictionaryService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -58,8 +58,7 @@ public class ToscaMetadataParserWithDictionarySupport implements ToscaMetadataPa
if (dictionaryService != null) {
return parseMetadataPossibleValues(toscaElementProperty.getItems(), dictionaryService, serviceModel,
toscaMetadataExecutor);
- }
- else {
+ } else {
return null;
}
}
@@ -163,8 +162,7 @@ public class ToscaMetadataParserWithDictionarySupport implements ToscaMetadataPa
if (dictionaryFullNames.size() > 0) {
if (childObject.get(JsonEditorSchemaConstants.ENUM) != null) {
childObject.get(JsonEditorSchemaConstants.ENUM).getAsJsonArray().add(dictionaryFullNames);
- }
- else {
+ } else {
childObject.add(JsonEditorSchemaConstants.ENUM, dictionaryFullNames);
}
// Add Enum titles for generated translated values during JSON instance
@@ -173,17 +171,14 @@ public class ToscaMetadataParserWithDictionarySupport implements ToscaMetadataPa
enumTitles.add(JsonEditorSchemaConstants.ENUM_TITLES, dictionaryNames);
if (childObject.get(JsonEditorSchemaConstants.OPTIONS) != null) {
childObject.get(JsonEditorSchemaConstants.OPTIONS).getAsJsonArray().add(enumTitles);
- }
- else {
+ } else {
childObject.add(JsonEditorSchemaConstants.OPTIONS, enumTitles);
}
- }
- else {
+ } else {
if (childObject.get(JsonEditorSchemaConstants.ENUM) != null) {
childObject.get(JsonEditorSchemaConstants.ENUM).getAsJsonArray().add(dictionaryNames);
- }
- else {
+ } else {
childObject.add(JsonEditorSchemaConstants.ENUM, dictionaryNames);
}
}
@@ -196,8 +191,7 @@ public class ToscaMetadataParserWithDictionarySupport implements ToscaMetadataPa
dictionaryReference.length()).split("#");
if (dictionaryKeyArray.length > 1) {
processComplexDictionaryElements(dictionaryKeyArray, childObject, dictionaryService);
- }
- else {
+ } else {
processSimpleDictionaryElements(dictionaryKeyArray, childObject, dictionaryService);
}
}
@@ -206,11 +200,9 @@ public class ToscaMetadataParserWithDictionarySupport implements ToscaMetadataPa
String jsonType = null;
if (toscaType.equalsIgnoreCase(ToscaSchemaConstants.TYPE_INTEGER)) {
jsonType = JsonEditorSchemaConstants.TYPE_INTEGER;
- }
- else if (toscaType.equalsIgnoreCase(ToscaSchemaConstants.TYPE_LIST)) {
+ } else if (toscaType.equalsIgnoreCase(ToscaSchemaConstants.TYPE_LIST)) {
jsonType = JsonEditorSchemaConstants.TYPE_ARRAY;
- }
- else {
+ } else {
jsonType = JsonEditorSchemaConstants.TYPE_STRING;
}
return jsonType;
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/templates/JsonTemplate.java b/src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplate.java
index f64ba68cf..5c96f2c4a 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/templates/JsonTemplate.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplate.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds.tosca.update.templates;
+package org.onap.policy.clamp.clds.tosca.update.templates;
import com.google.gson.JsonObject;
import java.util.ArrayList;
@@ -197,8 +197,7 @@ public class JsonTemplate {
if (fieldStaticStatus(fieldName)) {
String defaultValue = (String) this.getSpecificField(fieldName).getValue();
jsonSchema.addProperty(fieldName, defaultValue);
- }
- else {
+ } else {
jsonSchema.addProperty(fieldName, value);
}
}
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/templates/JsonTemplateField.java b/src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplateField.java
index a1e15307c..d9fd11de2 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/templates/JsonTemplateField.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplateField.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds.tosca.update.templates;
+package org.onap.policy.clamp.clds.tosca.update.templates;
public class JsonTemplateField {
private String title;
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/templates/JsonTemplateManager.java b/src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplateManager.java
index 0b399ba0b..1813d0786 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/templates/JsonTemplateManager.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplateManager.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds.tosca.update.templates;
+package org.onap.policy.clamp.clds.tosca.update.templates;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
@@ -29,13 +29,13 @@ import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import org.onap.clamp.clds.tosca.update.UnknownComponentException;
-import org.onap.clamp.clds.tosca.update.elements.ToscaElement;
-import org.onap.clamp.clds.tosca.update.parser.ToscaConverterToJsonSchema;
-import org.onap.clamp.clds.tosca.update.parser.ToscaElementParser;
-import org.onap.clamp.clds.tosca.update.parser.metadata.ToscaMetadataParser;
-import org.onap.clamp.clds.util.JsonUtils;
-import org.onap.clamp.loop.service.Service;
+import org.onap.policy.clamp.clds.tosca.update.UnknownComponentException;
+import org.onap.policy.clamp.clds.tosca.update.elements.ToscaElement;
+import org.onap.policy.clamp.clds.tosca.update.parser.ToscaConverterToJsonSchema;
+import org.onap.policy.clamp.clds.tosca.update.parser.ToscaElementParser;
+import org.onap.policy.clamp.clds.tosca.update.parser.metadata.ToscaMetadataParser;
+import org.onap.policy.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.loop.service.Service;
public class JsonTemplateManager {
private LinkedHashMap<String, JsonTemplate> jsonSchemaTemplates;
@@ -52,8 +52,7 @@ public class JsonTemplateManager {
if (toscaYamlContent != null && !toscaYamlContent.isEmpty()) {
this.toscaElements = ToscaElementParser.searchAllToscaElements(toscaYamlContent, nativeToscaDatatypes);
this.jsonSchemaTemplates = initializeTemplates(jsonSchemaTemplates);
- }
- else {
+ } else {
toscaElements = null;
}
}
@@ -111,10 +110,9 @@ public class JsonTemplateManager {
if (operation
&& !this.jsonSchemaTemplates.get(nameTemplate).getJsonTemplateFields().contains(jsonTemplateField)) {
this.jsonSchemaTemplates.get(nameTemplate).addField(jsonTemplateField);
- }
- // Operation = false && field is present => remove Field
- else if (!operation
+ } else if (!operation
&& this.jsonSchemaTemplates.get(nameTemplate).getJsonTemplateFields().contains(jsonTemplateField)) {
+ // Operation = false && field is present => remove Field
this.jsonSchemaTemplates.get(nameTemplate).removeField(jsonTemplateField);
}
}
@@ -139,8 +137,8 @@ public class JsonTemplateManager {
* For a given policy type, get a corresponding JsonObject from the tosca model.
*
* @param policyType The policy type in the tosca
- * @param toscaMetadataParser The MetadataParser class that must be used if metadata section are encountered, if null
- * they will be skipped
+ * @param toscaMetadataParser The MetadataParser class that must be used if metadata section are encountered,
+ * if null they will be skipped
* @return an json object defining the equivalent json schema from the tosca for a given policy type
*/
public JsonObject getJsonSchemaForPolicyType(String policyType, ToscaMetadataParser toscaMetadataParser,
diff --git a/src/main/java/org/onap/clamp/clds/util/ClampVersioning.java b/src/main/java/org/onap/policy/clamp/clds/util/ClampVersioning.java
index ec0162cb1..0890615d9 100644
--- a/src/main/java/org/onap/clamp/clds/util/ClampVersioning.java
+++ b/src/main/java/org/onap/policy/clamp/clds/util/ClampVersioning.java
@@ -22,11 +22,10 @@
*
*/
-package org.onap.clamp.clds.util;
+package org.onap.policy.clamp.clds.util;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
-
import java.io.InputStream;
import java.util.Properties;
diff --git a/src/main/java/org/onap/clamp/clds/util/CryptoUtils.java b/src/main/java/org/onap/policy/clamp/clds/util/CryptoUtils.java
index 1ddf3a90a..01dd48763 100644
--- a/src/main/java/org/onap/clamp/clds/util/CryptoUtils.java
+++ b/src/main/java/org/onap/policy/clamp/clds/util/CryptoUtils.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds.util;
+package org.onap.policy.clamp.clds.util;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
@@ -80,7 +80,7 @@ public final class CryptoUtils {
/**
* Key to read in the key.properties file.
*/
- private static final String KEY_PARAM = "org.onap.clamp.encryption.aes.key";
+ private static final String KEY_PARAM = "org.onap.policy.clamp.encryption.aes.key";
private static final String PROPERTIES_FILE_NAME = "clds/key.properties";
/**
* The SecretKeySpec created from the Base 64 String key.
diff --git a/src/main/java/org/onap/clamp/clds/util/JsonUtils.java b/src/main/java/org/onap/policy/clamp/clds/util/JsonUtils.java
index 8024331f2..d57ce2095 100644
--- a/src/main/java/org/onap/clamp/clds/util/JsonUtils.java
+++ b/src/main/java/org/onap/policy/clamp/clds/util/JsonUtils.java
@@ -21,19 +21,17 @@
*
*/
-package org.onap.clamp.clds.util;
+package org.onap.policy.clamp.clds.util;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
-
import java.time.Instant;
-
-import org.onap.clamp.authorization.SecureServicePermission;
-import org.onap.clamp.authorization.SecureServicePermissionDeserializer;
-import org.onap.clamp.dao.model.gson.converter.InstantDeserializer;
-import org.onap.clamp.dao.model.gson.converter.InstantSerializer;
+import org.onap.policy.clamp.authorization.SecureServicePermission;
+import org.onap.policy.clamp.authorization.SecureServicePermissionDeserializer;
+import org.onap.policy.clamp.dao.model.gson.converter.InstantDeserializer;
+import org.onap.policy.clamp.dao.model.gson.converter.InstantSerializer;
/**
* This class is used to access the GSON with restricted type access.
diff --git a/src/main/java/org/onap/clamp/clds/util/LogMessages.java b/src/main/java/org/onap/policy/clamp/clds/util/LogMessages.java
index 7f4c8781f..676206e0f 100644
--- a/src/main/java/org/onap/clamp/clds/util/LogMessages.java
+++ b/src/main/java/org/onap/policy/clamp/clds/util/LogMessages.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds.util;
+package org.onap.policy.clamp.clds.util;
import com.att.eelf.i18n.EELFResolvableErrorEnum;
import com.att.eelf.i18n.EELFResourceManager;
diff --git a/src/main/java/org/onap/clamp/clds/util/LoggingUtils.java b/src/main/java/org/onap/policy/clamp/clds/util/LoggingUtils.java
index 0ac1a14fc..d7a158e73 100644
--- a/src/main/java/org/onap/clamp/clds/util/LoggingUtils.java
+++ b/src/main/java/org/onap/policy/clamp/clds/util/LoggingUtils.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds.util;
+package org.onap.policy.clamp.clds.util;
import java.net.HttpURLConnection;
import java.net.InetAddress;
@@ -39,7 +39,7 @@ import java.util.UUID;
import javax.net.ssl.HttpsURLConnection;
import javax.servlet.http.HttpServletRequest;
import javax.validation.constraints.NotNull;
-import org.onap.clamp.authorization.AuthorizationController;
+import org.onap.policy.clamp.authorization.AuthorizationController;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.MDC;
@@ -168,9 +168,9 @@ public class LoggingUtils {
return dateFormat;
}
- /*********************************************************************************************
+ /* *******************************************************************************************
* Method for ONAP Application Logging Specification v1.2
- ********************************************************************************************/
+ * *******************************************************************************************/
/**
* Report <tt>ENTERING</tt> marker.
diff --git a/src/main/java/org/onap/clamp/clds/util/OnapLogConstants.java b/src/main/java/org/onap/policy/clamp/clds/util/OnapLogConstants.java
index 8952e5df1..78b16f1a0 100644
--- a/src/main/java/org/onap/clamp/clds/util/OnapLogConstants.java
+++ b/src/main/java/org/onap/policy/clamp/clds/util/OnapLogConstants.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds.util;
+package org.onap.policy.clamp.clds.util;
import org.slf4j.Marker;
import org.slf4j.MarkerFactory;
@@ -190,10 +190,10 @@ public final class OnapLogConstants {
/** MDC reporting outcome description. */
public static final String RESPONSE_DESCRIPTION = "ResponseDesc";
- /** MDC reporting severity */
+ /** MDC reporting severity. */
public static final String RESPONSE_SEVERITY = "Severity";
- /** MDC reporting response status code */
+ /** MDC reporting response status code. */
public static final String RESPONSE_STATUS_CODE = "StatusCode";
/** MDC recording error code. */
@@ -267,20 +267,20 @@ public final class OnapLogConstants {
ASYNCHRONOUS("ASYNCHRONOUS", Markers.INVOKE_ASYNCHRONOUS);
/** Enum value. */
- private String mString;
+ private String enumValue;
/** Corresponding marker. */
- private Marker mMarker;
+ private Marker marker;
/**
* Construct enum.
*
- * @param s enum value.
- * @param m corresponding Marker.
+ * @param enumValue enum value.
+ * @param marker corresponding Marker.
*/
- InvocationMode(final String s, final Marker m) {
- this.mString = s;
- this.mMarker = m;
+ InvocationMode(final String enumValue, final Marker marker) {
+ this.enumValue = enumValue;
+ this.marker = marker;
}
/**
@@ -289,7 +289,7 @@ public final class OnapLogConstants {
* @return Marker.
*/
public Marker getMarker() {
- return this.mMarker;
+ return this.marker;
}
/**
@@ -297,7 +297,7 @@ public final class OnapLogConstants {
*/
@Override
public String toString() {
- return this.mString;
+ return this.enumValue;
}
}
diff --git a/src/main/java/org/onap/clamp/clds/util/ResourceFileUtils.java b/src/main/java/org/onap/policy/clamp/clds/util/ResourceFileUtils.java
index f858ed2b8..cd4700277 100644
--- a/src/main/java/org/onap/clamp/clds/util/ResourceFileUtils.java
+++ b/src/main/java/org/onap/policy/clamp/clds/util/ResourceFileUtils.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.clds.util;
+package org.onap.policy.clamp.clds.util;
import java.io.IOException;
import java.io.InputStream;
diff --git a/src/main/java/org/onap/clamp/configuration/ClampGsonDataFormat.java b/src/main/java/org/onap/policy/clamp/configuration/ClampGsonDataFormat.java
index ca5f37656..e5f12163e 100644
--- a/src/main/java/org/onap/clamp/configuration/ClampGsonDataFormat.java
+++ b/src/main/java/org/onap/policy/clamp/configuration/ClampGsonDataFormat.java
@@ -20,10 +20,9 @@
* ===================================================================
*/
-package org.onap.clamp.configuration;
+package org.onap.policy.clamp.configuration;
import com.google.gson.Gson;
-
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.InputStream;
@@ -32,13 +31,12 @@ import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.lang.reflect.Type;
import java.nio.charset.StandardCharsets;
-
import org.apache.camel.Exchange;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.DataFormatName;
import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.IOHelper;
-import org.onap.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.clds.util.JsonUtils;
public class ClampGsonDataFormat extends ServiceSupport implements DataFormat, DataFormatName {
private Gson gson;
diff --git a/src/main/java/org/onap/clamp/dao/model/gson/converter/InstantDeserializer.java b/src/main/java/org/onap/policy/clamp/dao/model/gson/converter/InstantDeserializer.java
index 2d63e55fa..db024e07a 100644
--- a/src/main/java/org/onap/clamp/dao/model/gson/converter/InstantDeserializer.java
+++ b/src/main/java/org/onap/policy/clamp/dao/model/gson/converter/InstantDeserializer.java
@@ -21,12 +21,11 @@
*
*/
-package org.onap.clamp.dao.model.gson.converter;
+package org.onap.policy.clamp.dao.model.gson.converter;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement;
-
import java.lang.reflect.Type;
import java.time.Instant;
import java.time.ZoneId;
diff --git a/src/main/java/org/onap/clamp/dao/model/gson/converter/InstantSerializer.java b/src/main/java/org/onap/policy/clamp/dao/model/gson/converter/InstantSerializer.java
index cdb439e46..7208a472c 100644
--- a/src/main/java/org/onap/clamp/dao/model/gson/converter/InstantSerializer.java
+++ b/src/main/java/org/onap/policy/clamp/dao/model/gson/converter/InstantSerializer.java
@@ -21,13 +21,12 @@
*
*/
-package org.onap.clamp.dao.model.gson.converter;
+package org.onap.policy.clamp.dao.model.gson.converter;
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.format.DateTimeFormatter;
diff --git a/src/main/java/org/onap/clamp/dao/model/jsontype/JsonStringSqlTypeDescriptor.java b/src/main/java/org/onap/policy/clamp/dao/model/jsontype/JsonStringSqlTypeDescriptor.java
index f5aba4e11..d3aaa32a9 100644
--- a/src/main/java/org/onap/clamp/dao/model/jsontype/JsonStringSqlTypeDescriptor.java
+++ b/src/main/java/org/onap/policy/clamp/dao/model/jsontype/JsonStringSqlTypeDescriptor.java
@@ -21,14 +21,13 @@
*
*/
-package org.onap.clamp.dao.model.jsontype;
+package org.onap.policy.clamp.dao.model.jsontype;
import java.sql.CallableStatement;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Types;
-
import org.hibernate.type.descriptor.ValueBinder;
import org.hibernate.type.descriptor.ValueExtractor;
import org.hibernate.type.descriptor.WrapperOptions;
diff --git a/src/main/java/org/onap/clamp/dao/model/jsontype/JsonTypeDescriptor.java b/src/main/java/org/onap/policy/clamp/dao/model/jsontype/JsonTypeDescriptor.java
index 518ec2d04..ed8464b14 100644
--- a/src/main/java/org/onap/clamp/dao/model/jsontype/JsonTypeDescriptor.java
+++ b/src/main/java/org/onap/policy/clamp/dao/model/jsontype/JsonTypeDescriptor.java
@@ -21,16 +21,14 @@
*
*/
-package org.onap.clamp.dao.model.jsontype;
+package org.onap.policy.clamp.dao.model.jsontype;
import com.google.gson.JsonObject;
-
import java.io.Serializable;
-
import org.hibernate.type.descriptor.WrapperOptions;
import org.hibernate.type.descriptor.java.AbstractTypeDescriptor;
import org.hibernate.type.descriptor.java.ImmutableMutabilityPlan;
-import org.onap.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.clds.util.JsonUtils;
public class JsonTypeDescriptor extends AbstractTypeDescriptor<JsonObject> {
diff --git a/src/main/java/org/onap/clamp/dao/model/jsontype/StringJsonUserType.java b/src/main/java/org/onap/policy/clamp/dao/model/jsontype/StringJsonUserType.java
index 621fa8dad..4a7b65bb4 100644
--- a/src/main/java/org/onap/clamp/dao/model/jsontype/StringJsonUserType.java
+++ b/src/main/java/org/onap/policy/clamp/dao/model/jsontype/StringJsonUserType.java
@@ -21,10 +21,9 @@
*
*/
-package org.onap.clamp.dao.model.jsontype;
+package org.onap.policy.clamp.dao.model.jsontype;
import com.google.gson.JsonObject;
-
import org.hibernate.type.AbstractSingleColumnStandardBasicType;
import org.hibernate.type.descriptor.java.JavaTypeDescriptor;
import org.hibernate.type.descriptor.sql.SqlTypeDescriptor;
diff --git a/src/main/java/org/onap/clamp/flow/log/FlowLogOperation.java b/src/main/java/org/onap/policy/clamp/flow/log/FlowLogOperation.java
index e31406b2c..d54b23b21 100644
--- a/src/main/java/org/onap/clamp/flow/log/FlowLogOperation.java
+++ b/src/main/java/org/onap/policy/clamp/flow/log/FlowLogOperation.java
@@ -21,12 +21,12 @@
*
*/
-package org.onap.clamp.flow.log;
+package org.onap.policy.clamp.flow.log;
import javax.servlet.http.HttpServletRequest;
import org.apache.camel.Exchange;
-import org.onap.clamp.clds.util.LoggingUtils;
-import org.onap.clamp.clds.util.OnapLogConstants;
+import org.onap.policy.clamp.clds.util.LoggingUtils;
+import org.onap.policy.clamp.clds.util.OnapLogConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.event.Level;
diff --git a/src/main/java/org/onap/clamp/loop/CsarInstaller.java b/src/main/java/org/onap/policy/clamp/loop/CsarInstaller.java
index 67c7ce5cf..753789a68 100644
--- a/src/main/java/org/onap/clamp/loop/CsarInstaller.java
+++ b/src/main/java/org/onap/policy/clamp/loop/CsarInstaller.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.loop;
+package org.onap.policy.clamp.loop;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
@@ -30,25 +30,24 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map.Entry;
import org.json.simple.parser.ParseException;
-import org.onap.clamp.clds.client.DcaeInventoryServices;
-import org.onap.clamp.clds.client.PolicyEngineServices;
-import org.onap.clamp.clds.exception.sdc.controller.BlueprintParserException;
-import org.onap.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException;
-import org.onap.clamp.clds.model.dcae.DcaeInventoryResponse;
-import org.onap.clamp.clds.sdc.controller.installer.BlueprintArtifact;
-import org.onap.clamp.clds.sdc.controller.installer.BlueprintMicroService;
-import org.onap.clamp.clds.sdc.controller.installer.BlueprintParser;
-import org.onap.clamp.clds.sdc.controller.installer.ChainGenerator;
-import org.onap.clamp.clds.sdc.controller.installer.CsarHandler;
-import org.onap.clamp.loop.cds.CdsDataInstaller;
-import org.onap.clamp.loop.service.CsarServiceInstaller;
-import org.onap.clamp.loop.service.Service;
-import org.onap.clamp.loop.template.LoopElementModel;
-import org.onap.clamp.loop.template.LoopTemplate;
-import org.onap.clamp.loop.template.LoopTemplatesRepository;
-import org.onap.clamp.loop.template.PolicyModel;
-import org.onap.clamp.loop.template.PolicyModelId;
-import org.onap.clamp.loop.template.PolicyModelsRepository;
+import org.onap.policy.clamp.clds.client.DcaeInventoryServices;
+import org.onap.policy.clamp.clds.client.PolicyEngineServices;
+import org.onap.policy.clamp.clds.exception.sdc.controller.BlueprintParserException;
+import org.onap.policy.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException;
+import org.onap.policy.clamp.clds.model.dcae.DcaeInventoryResponse;
+import org.onap.policy.clamp.clds.sdc.controller.installer.BlueprintArtifact;
+import org.onap.policy.clamp.clds.sdc.controller.installer.BlueprintMicroService;
+import org.onap.policy.clamp.clds.sdc.controller.installer.BlueprintParser;
+import org.onap.policy.clamp.clds.sdc.controller.installer.ChainGenerator;
+import org.onap.policy.clamp.clds.sdc.controller.installer.CsarHandler;
+import org.onap.policy.clamp.loop.cds.CdsDataInstaller;
+import org.onap.policy.clamp.loop.service.CsarServiceInstaller;
+import org.onap.policy.clamp.loop.service.Service;
+import org.onap.policy.clamp.loop.template.LoopElementModel;
+import org.onap.policy.clamp.loop.template.LoopTemplate;
+import org.onap.policy.clamp.loop.template.LoopTemplatesRepository;
+import org.onap.policy.clamp.loop.template.PolicyModel;
+import org.onap.policy.clamp.loop.template.PolicyModelsRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Component;
@@ -152,7 +151,8 @@ public class CsarInstaller {
private LoopTemplate createLoopTemplateFromBlueprint(CsarHandler csar, BlueprintArtifact blueprintArtifact,
Service service)
- throws IOException, ParseException, InterruptedException, BlueprintParserException {
+ throws IOException, ParseException, InterruptedException, BlueprintParserException,
+ SdcArtifactInstallerException {
LoopTemplate newLoopTemplate = new LoopTemplate();
newLoopTemplate.setBlueprint(blueprintArtifact.getDcaeBlueprint());
newLoopTemplate.setName(LoopTemplate.generateLoopTemplateName(csar.getSdcNotification().getServiceName(),
@@ -165,32 +165,35 @@ public class CsarInstaller {
microServicesChain = BlueprintParser.fallbackToOneMicroService();
}
newLoopTemplate.setModelService(service);
- newLoopTemplate.addLoopElementModels(createMicroServiceModels(microServicesChain));
+ newLoopTemplate.addLoopElementModels(createMicroServiceModels(blueprintArtifact, microServicesChain));
newLoopTemplate.setMaximumInstancesAllowed(0);
DcaeInventoryResponse dcaeResponse = queryDcaeToGetServiceTypeId(blueprintArtifact);
newLoopTemplate.setDcaeBlueprintId(dcaeResponse.getTypeId());
return newLoopTemplate;
}
- private HashSet<LoopElementModel> createMicroServiceModels(List<BlueprintMicroService> microServicesChain)
- throws InterruptedException {
+ private HashSet<LoopElementModel> createMicroServiceModels(BlueprintArtifact blueprintArtifact,
+ List<BlueprintMicroService> microServicesChain)
+ throws SdcArtifactInstallerException {
HashSet<LoopElementModel> newSet = new HashSet<>();
for (BlueprintMicroService microService : microServicesChain) {
LoopElementModel loopElementModel =
new LoopElementModel(microService.getModelType(), LoopElementModel.MICRO_SERVICE_TYPE,
null);
newSet.add(loopElementModel);
- loopElementModel.addPolicyModel(getPolicyModel(microService));
+ PolicyModel newPolicyModel = policyEngineServices.createPolicyModelFromPolicyEngine(microService);
+ if (newPolicyModel != null) {
+ loopElementModel.addPolicyModel(newPolicyModel);
+ } else {
+ throw new SdcArtifactInstallerException(
+ "Unable to find the policy specified in the blueprint " + blueprintArtifact
+ .getBlueprintArtifactName() + ") on the Policy Engine:"
+ + microService.getModelType() + "/" + microService.getModelVersion());
+ }
}
return newSet;
}
- private PolicyModel getPolicyModel(BlueprintMicroService microService) throws InterruptedException {
- return policyModelsRepository
- .findById(new PolicyModelId(microService.getModelType(), microService.getModelVersion()))
- .orElse(policyEngineServices.createPolicyModelFromPolicyEngine(microService));
- }
-
/**
* Get the service blueprint Id in the Dcae inventory using the SDC UUID.
*
diff --git a/src/main/java/org/onap/clamp/loop/Loop.java b/src/main/java/org/onap/policy/clamp/loop/Loop.java
index 36f74221e..99d8d1e69 100644
--- a/src/main/java/org/onap/clamp/loop/Loop.java
+++ b/src/main/java/org/onap/policy/clamp/loop/Loop.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.loop;
+package org.onap.policy.clamp.loop;
import com.google.gson.JsonObject;
import com.google.gson.annotations.Expose;
@@ -50,19 +50,19 @@ import org.hibernate.annotations.SortNatural;
import org.hibernate.annotations.Type;
import org.hibernate.annotations.TypeDef;
import org.hibernate.annotations.TypeDefs;
-import org.onap.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
-import org.onap.clamp.dao.model.jsontype.StringJsonUserType;
-import org.onap.clamp.loop.common.AuditEntity;
-import org.onap.clamp.loop.components.external.DcaeComponent;
-import org.onap.clamp.loop.components.external.ExternalComponent;
-import org.onap.clamp.loop.components.external.PolicyComponent;
-import org.onap.clamp.loop.deploy.DcaeDeployParameters;
-import org.onap.clamp.loop.log.LoopLog;
-import org.onap.clamp.loop.service.Service;
-import org.onap.clamp.loop.template.LoopElementModel;
-import org.onap.clamp.loop.template.LoopTemplate;
-import org.onap.clamp.policy.microservice.MicroServicePolicy;
-import org.onap.clamp.policy.operational.OperationalPolicy;
+import org.onap.policy.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
+import org.onap.policy.clamp.dao.model.jsontype.StringJsonUserType;
+import org.onap.policy.clamp.loop.common.AuditEntity;
+import org.onap.policy.clamp.loop.components.external.DcaeComponent;
+import org.onap.policy.clamp.loop.components.external.ExternalComponent;
+import org.onap.policy.clamp.loop.components.external.PolicyComponent;
+import org.onap.policy.clamp.loop.deploy.DcaeDeployParameters;
+import org.onap.policy.clamp.loop.log.LoopLog;
+import org.onap.policy.clamp.loop.service.Service;
+import org.onap.policy.clamp.loop.template.LoopElementModel;
+import org.onap.policy.clamp.loop.template.LoopTemplate;
+import org.onap.policy.clamp.policy.microservice.MicroServicePolicy;
+import org.onap.policy.clamp.policy.operational.OperationalPolicy;
@Entity
@Table(name = "loops")
@@ -162,8 +162,7 @@ public class Loop extends AuditEntity implements Serializable {
if (LoopElementModel.MICRO_SERVICE_TYPE.equals(element.getLoopElementModel().getLoopElementType())) {
this.addMicroServicePolicy((MicroServicePolicy) element.getLoopElementModel()
.createPolicyInstance(this, toscaConverter));
- }
- else if (LoopElementModel.OPERATIONAL_POLICY_TYPE
+ } else if (LoopElementModel.OPERATIONAL_POLICY_TYPE
.equals(element.getLoopElementModel().getLoopElementType())) {
this.addOperationalPolicy((OperationalPolicy) element.getLoopElementModel()
.createPolicyInstance(this, toscaConverter));
@@ -381,8 +380,7 @@ public class Loop extends AuditEntity implements Serializable {
if (other.name != null) {
return false;
}
- }
- else if (!name.equals(other.name)) {
+ } else if (!name.equals(other.name)) {
return false;
}
return true;
diff --git a/src/main/java/org/onap/clamp/loop/LoopController.java b/src/main/java/org/onap/policy/clamp/loop/LoopController.java
index 603726f56..98459c909 100644
--- a/src/main/java/org/onap/clamp/loop/LoopController.java
+++ b/src/main/java/org/onap/policy/clamp/loop/LoopController.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.loop;
+package org.onap.policy.clamp.loop;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
@@ -29,12 +29,12 @@ import com.google.gson.reflect.TypeToken;
import java.io.IOException;
import java.lang.reflect.Type;
import java.util.List;
-import org.onap.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
-import org.onap.clamp.clds.util.JsonUtils;
-import org.onap.clamp.policy.microservice.MicroServicePolicy;
-import org.onap.clamp.policy.microservice.MicroServicePolicyService;
-import org.onap.clamp.policy.operational.OperationalPolicy;
-import org.onap.clamp.policy.operational.OperationalPolicyService;
+import org.onap.policy.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
+import org.onap.policy.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.policy.microservice.MicroServicePolicy;
+import org.onap.policy.clamp.policy.microservice.MicroServicePolicyService;
+import org.onap.policy.clamp.policy.operational.OperationalPolicy;
+import org.onap.policy.clamp.policy.operational.OperationalPolicyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
diff --git a/src/main/java/org/onap/clamp/loop/LoopService.java b/src/main/java/org/onap/policy/clamp/loop/LoopService.java
index 5f0822816..975011669 100644
--- a/src/main/java/org/onap/clamp/loop/LoopService.java
+++ b/src/main/java/org/onap/policy/clamp/loop/LoopService.java
@@ -21,21 +21,21 @@
*
*/
-package org.onap.clamp.loop;
+package org.onap.policy.clamp.loop;
import com.google.gson.JsonObject;
import java.io.IOException;
import java.util.List;
import java.util.Set;
import javax.persistence.EntityNotFoundException;
-import org.onap.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
-import org.onap.clamp.loop.template.LoopTemplatesService;
-import org.onap.clamp.loop.template.PolicyModel;
-import org.onap.clamp.loop.template.PolicyModelsService;
-import org.onap.clamp.policy.microservice.MicroServicePolicy;
-import org.onap.clamp.policy.microservice.MicroServicePolicyService;
-import org.onap.clamp.policy.operational.OperationalPolicy;
-import org.onap.clamp.policy.operational.OperationalPolicyService;
+import org.onap.policy.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
+import org.onap.policy.clamp.loop.template.LoopTemplatesService;
+import org.onap.policy.clamp.loop.template.PolicyModel;
+import org.onap.policy.clamp.loop.template.PolicyModelsService;
+import org.onap.policy.clamp.policy.microservice.MicroServicePolicy;
+import org.onap.policy.clamp.policy.microservice.MicroServicePolicyService;
+import org.onap.policy.clamp.policy.operational.OperationalPolicy;
+import org.onap.policy.clamp.policy.operational.OperationalPolicyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/src/main/java/org/onap/clamp/loop/LoopState.java b/src/main/java/org/onap/policy/clamp/loop/LoopState.java
index 4707730ce..48d4487f0 100644
--- a/src/main/java/org/onap/clamp/loop/LoopState.java
+++ b/src/main/java/org/onap/policy/clamp/loop/LoopState.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.loop;
+package org.onap.policy.clamp.loop;
public enum LoopState {
DESIGN, SUBMITTED, DEPLOYED, RUNNING, STOPPED, IN_ERROR, WAITING;
diff --git a/src/main/java/org/onap/clamp/loop/LoopsRepository.java b/src/main/java/org/onap/policy/clamp/loop/LoopsRepository.java
index aaa49116f..7b92ed584 100644
--- a/src/main/java/org/onap/clamp/loop/LoopsRepository.java
+++ b/src/main/java/org/onap/policy/clamp/loop/LoopsRepository.java
@@ -21,10 +21,9 @@
*
*/
-package org.onap.clamp.loop;
+package org.onap.policy.clamp.loop;
import java.util.List;
-
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/org/onap/clamp/loop/cds/CdsDataInstaller.java b/src/main/java/org/onap/policy/clamp/loop/cds/CdsDataInstaller.java
index d18cae1d6..68adb3887 100644
--- a/src/main/java/org/onap/clamp/loop/cds/CdsDataInstaller.java
+++ b/src/main/java/org/onap/policy/clamp/loop/cds/CdsDataInstaller.java
@@ -22,16 +22,16 @@
*
*/
-package org.onap.clamp.loop.cds;
+package org.onap.policy.clamp.loop.cds;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
import com.google.gson.JsonObject;
-import org.onap.clamp.clds.client.CdsServices;
-import org.onap.clamp.clds.model.cds.CdsBpWorkFlowListResponse;
-import org.onap.clamp.clds.sdc.controller.installer.CsarHandler;
-import org.onap.clamp.loop.service.Service;
-import org.onap.clamp.loop.service.ServicesRepository;
+import org.onap.policy.clamp.clds.client.CdsServices;
+import org.onap.policy.clamp.clds.model.cds.CdsBpWorkFlowListResponse;
+import org.onap.policy.clamp.clds.sdc.controller.installer.CsarHandler;
+import org.onap.policy.clamp.loop.service.Service;
+import org.onap.policy.clamp.loop.service.ServicesRepository;
import org.onap.sdc.tosca.parser.enums.SdcTypes;
import org.onap.sdc.toscaparser.api.NodeTemplate;
import org.springframework.beans.factory.annotation.Autowired;
@@ -80,8 +80,7 @@ public class CdsDataInstaller {
resourcesPropByType.getAsJsonObject(nodeTemplate.getName())
.add(CONTROLLER_PROPERTIES, controllerProperties);
logger.info("Successfully installed the CDS data in Service");
- }
- else {
+ } else {
logger.warn("Skipping CDS data installation in Service, as sdnc_model_name and "
+ "sdnc_model_version are not provided in the CSAR");
}
diff --git a/src/main/java/org/onap/clamp/loop/common/AuditEntity.java b/src/main/java/org/onap/policy/clamp/loop/common/AuditEntity.java
index 7ce12ec6b..92c795e90 100644
--- a/src/main/java/org/onap/clamp/loop/common/AuditEntity.java
+++ b/src/main/java/org/onap/policy/clamp/loop/common/AuditEntity.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.loop.common;
+package org.onap.policy.clamp.loop.common;
import com.google.gson.annotations.Expose;
import java.time.Instant;
@@ -74,8 +74,7 @@ public class AuditEntity {
public void setCreatedDate(Instant createdDate) {
if (createdDate != null) {
this.createdDate = createdDate.truncatedTo(ChronoUnit.SECONDS);
- }
- else {
+ } else {
this.createdDate = null;
}
}
@@ -97,8 +96,7 @@ public class AuditEntity {
public void setUpdatedDate(Instant updatedDate) {
if (updatedDate != null) {
this.updatedDate = updatedDate.truncatedTo(ChronoUnit.SECONDS);
- }
- else {
+ } else {
this.updatedDate = null;
}
}
diff --git a/src/main/java/org/onap/clamp/loop/components/external/DcaeComponent.java b/src/main/java/org/onap/policy/clamp/loop/components/external/DcaeComponent.java
index 8b8547195..1b36aab55 100644
--- a/src/main/java/org/onap/clamp/loop/components/external/DcaeComponent.java
+++ b/src/main/java/org/onap/policy/clamp/loop/components/external/DcaeComponent.java
@@ -21,28 +21,26 @@
*
*/
-package org.onap.clamp.loop.components.external;
+package org.onap.policy.clamp.loop.components.external;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
import com.google.gson.JsonObject;
-
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.UUID;
-
import javax.persistence.Transient;
import org.apache.camel.Exchange;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
-import org.onap.clamp.clds.model.dcae.DcaeInventoryResponse;
-import org.onap.clamp.clds.model.dcae.DcaeOperationStatusResponse;
-import org.onap.clamp.clds.util.JsonUtils;
-import org.onap.clamp.loop.Loop;
-import org.onap.clamp.policy.microservice.MicroServicePolicy;
+import org.onap.policy.clamp.clds.model.dcae.DcaeInventoryResponse;
+import org.onap.policy.clamp.clds.model.dcae.DcaeOperationStatusResponse;
+import org.onap.policy.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.loop.Loop;
+import org.onap.policy.clamp.policy.microservice.MicroServicePolicy;
public class DcaeComponent extends ExternalComponent {
@@ -209,22 +207,37 @@ public class DcaeComponent extends ExternalComponent {
if (dcaeResponse == null) {
setState(BLUEPRINT_DEPLOYED);
- } else if (dcaeResponse.getOperationType().equals("install") && dcaeResponse.getStatus().equals("succeeded")) {
- setState(MICROSERVICE_INSTALLED_SUCCESSFULLY);
- } else if (dcaeResponse.getOperationType().equals("install") && dcaeResponse.getStatus().equals("processing")) {
- setState(PROCESSING_MICROSERVICE_INSTALLATION);
- } else if (dcaeResponse.getOperationType().equals("install") && dcaeResponse.getStatus().equals("failed")) {
- setState(MICROSERVICE_INSTALLATION_FAILED);
- } else if (dcaeResponse.getOperationType().equals("uninstall")
- && dcaeResponse.getStatus().equals("succeeded")) {
- setState(MICROSERVICE_UNINSTALLED_SUCCESSFULLY);
- } else if (dcaeResponse.getOperationType().equals("uninstall")
- && dcaeResponse.getStatus().equals("processing")) {
- setState(PROCESSING_MICROSERVICE_UNINSTALLATION);
- } else if (dcaeResponse.getOperationType().equals("uninstall") && dcaeResponse.getStatus().equals("failed")) {
- setState(MICROSERVICE_UNINSTALLATION_FAILED);
} else {
- setState(IN_ERROR);
+ if (dcaeResponse.getOperationType().equals("install") && dcaeResponse.getStatus().equals("succeeded")) {
+ setState(MICROSERVICE_INSTALLED_SUCCESSFULLY);
+ } else {
+ if (dcaeResponse.getOperationType().equals("install") && dcaeResponse.getStatus()
+ .equals("processing")) {
+ setState(PROCESSING_MICROSERVICE_INSTALLATION);
+ } else {
+ if (dcaeResponse.getOperationType().equals("install") && dcaeResponse.getStatus()
+ .equals("failed")) {
+ setState(MICROSERVICE_INSTALLATION_FAILED);
+ } else {
+ if (dcaeResponse.getOperationType().equals("uninstall")
+ && dcaeResponse.getStatus().equals("succeeded")) {
+ setState(MICROSERVICE_UNINSTALLED_SUCCESSFULLY);
+ } else {
+ if (dcaeResponse.getOperationType().equals("uninstall")
+ && dcaeResponse.getStatus().equals("processing")) {
+ setState(PROCESSING_MICROSERVICE_UNINSTALLATION);
+ } else {
+ if (dcaeResponse.getOperationType().equals("uninstall") && dcaeResponse.getStatus()
+ .equals("failed")) {
+ setState(MICROSERVICE_UNINSTALLATION_FAILED);
+ } else {
+ setState(IN_ERROR);
+ }
+ }
+ }
+ }
+ }
+ }
}
return this.getState();
}
diff --git a/src/main/java/org/onap/clamp/loop/components/external/ExternalComponent.java b/src/main/java/org/onap/policy/clamp/loop/components/external/ExternalComponent.java
index 2be707fe4..ce7efe494 100644
--- a/src/main/java/org/onap/clamp/loop/components/external/ExternalComponent.java
+++ b/src/main/java/org/onap/policy/clamp/loop/components/external/ExternalComponent.java
@@ -21,10 +21,9 @@
*
*/
-package org.onap.clamp.loop.components.external;
+package org.onap.policy.clamp.loop.components.external;
import com.google.gson.annotations.Expose;
-
import org.apache.camel.Exchange;
/**
diff --git a/src/main/java/org/onap/clamp/loop/components/external/ExternalComponentState.java b/src/main/java/org/onap/policy/clamp/loop/components/external/ExternalComponentState.java
index a57234af0..a57800025 100644
--- a/src/main/java/org/onap/clamp/loop/components/external/ExternalComponentState.java
+++ b/src/main/java/org/onap/policy/clamp/loop/components/external/ExternalComponentState.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.loop.components.external;
+package org.onap.policy.clamp.loop.components.external;
import com.google.gson.annotations.Expose;
diff --git a/src/main/java/org/onap/clamp/loop/components/external/PolicyComponent.java b/src/main/java/org/onap/policy/clamp/loop/components/external/PolicyComponent.java
index 4ea5b7118..648463d78 100644
--- a/src/main/java/org/onap/clamp/loop/components/external/PolicyComponent.java
+++ b/src/main/java/org/onap/policy/clamp/loop/components/external/PolicyComponent.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.loop.components.external;
+package org.onap.policy.clamp.loop.components.external;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
@@ -35,9 +35,9 @@ import java.util.Map;
import java.util.Map.Entry;
import javax.persistence.Transient;
import org.apache.camel.Exchange;
-import org.onap.clamp.loop.Loop;
-import org.onap.clamp.policy.microservice.MicroServicePolicy;
-import org.onap.clamp.policy.operational.OperationalPolicy;
+import org.onap.policy.clamp.loop.Loop;
+import org.onap.policy.clamp.policy.microservice.MicroServicePolicy;
+import org.onap.policy.clamp.policy.operational.OperationalPolicy;
public class PolicyComponent extends ExternalComponent {
@@ -75,7 +75,8 @@ public class PolicyComponent extends ExternalComponent {
/**
* Generates the Json that must be sent to policy to add all policies to Active
* PDP group.
- * @param loop the loop object
+ *
+ * @param loop the loop object
* @param action POST (to add policy to group) or DELETE (to delete policy from group)
* @return The json, payload to send
*/
@@ -113,13 +114,11 @@ public class PolicyComponent extends ExternalComponent {
if (pdpGroupMap.get(pdpGroup) == null) {
pdpSubGroupMap = new HashMap<>();
policyList = new LinkedList<>();
- }
- else {
+ } else {
pdpSubGroupMap = pdpGroupMap.get(pdpGroup);
if (pdpSubGroupMap.get(pdpSubGroup) == null) {
policyList = new LinkedList<>();
- }
- else {
+ } else {
policyList = (List<JsonObject>) pdpSubGroupMap.get(pdpSubGroup);
}
}
@@ -162,12 +161,14 @@ public class PolicyComponent extends ExternalComponent {
ExternalComponentState newState = NOT_SENT;
if (found && deployed) {
newState = SENT_AND_DEPLOYED;
- }
- else if (found) {
- newState = SENT;
- }
- else if (deployed) {
- newState = IN_ERROR;
+ } else {
+ if (found) {
+ newState = SENT;
+ } else {
+ if (deployed) {
+ newState = IN_ERROR;
+ }
+ }
}
return newState;
}
diff --git a/src/main/java/org/onap/clamp/loop/deploy/DcaeDeployParameters.java b/src/main/java/org/onap/policy/clamp/loop/deploy/DcaeDeployParameters.java
index 65506a479..9d56f23c4 100644
--- a/src/main/java/org/onap/clamp/loop/deploy/DcaeDeployParameters.java
+++ b/src/main/java/org/onap/policy/clamp/loop/deploy/DcaeDeployParameters.java
@@ -21,16 +21,16 @@
*
*/
-package org.onap.clamp.loop.deploy;
+package org.onap.policy.clamp.loop.deploy;
import com.google.gson.JsonObject;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
-import org.onap.clamp.clds.util.JsonUtils;
-import org.onap.clamp.loop.Loop;
-import org.onap.clamp.loop.components.external.DcaeComponent;
-import org.onap.clamp.policy.microservice.MicroServicePolicy;
+import org.onap.policy.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.loop.Loop;
+import org.onap.policy.clamp.loop.components.external.DcaeComponent;
+import org.onap.policy.clamp.policy.microservice.MicroServicePolicy;
import org.yaml.snakeyaml.Yaml;
/**
@@ -63,8 +63,7 @@ public class DcaeDeployParameters {
Object defaultValue = ((Map<String, Object>) elem.getValue()).get("default");
if (defaultValue != null) {
addPropertyToNode(deployJsonBody, elem.getKey(), defaultValue);
- }
- else {
+ } else {
deployJsonBody.addProperty(elem.getKey(), "");
}
});
@@ -75,17 +74,13 @@ public class DcaeDeployParameters {
private static void addPropertyToNode(JsonObject node, String key, Object value) {
if (value instanceof String) {
node.addProperty(key, (String) value);
- }
- else if (value instanceof Number) {
+ } else if (value instanceof Number) {
node.addProperty(key, (Number) value);
- }
- else if (value instanceof Boolean) {
+ } else if (value instanceof Boolean) {
node.addProperty(key, (Boolean) value);
- }
- else if (value instanceof Character) {
+ } else if (value instanceof Character) {
node.addProperty(key, (Character) value);
- }
- else {
+ } else {
node.addProperty(key, JsonUtils.GSON.toJson(value));
}
}
@@ -105,8 +100,7 @@ public class DcaeDeployParameters {
generateDcaeDeployParameter(loop.getLoopTemplate().getBlueprint(),
((MicroServicePolicy) loop.getMicroServicePolicies().toArray()[0]).getName()));
- }
- else {
+ } else {
LinkedHashMap<String, JsonObject> deploymentParamMap = init(loop);
for (Map.Entry<String, JsonObject> mapElement : deploymentParamMap.entrySet()) {
deployParamJson.add(mapElement.getKey(), mapElement.getValue());
diff --git a/src/main/java/org/onap/clamp/loop/log/LogType.java b/src/main/java/org/onap/policy/clamp/loop/log/LogType.java
index 13d9dccf8..50f6571d6 100644
--- a/src/main/java/org/onap/clamp/loop/log/LogType.java
+++ b/src/main/java/org/onap/policy/clamp/loop/log/LogType.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.loop.log;
+package org.onap.policy.clamp.loop.log;
public enum LogType {
INFO, WARNING, ERROR;
diff --git a/src/main/java/org/onap/clamp/loop/log/LoopLog.java b/src/main/java/org/onap/policy/clamp/loop/log/LoopLog.java
index e49598879..00f7e1f41 100644
--- a/src/main/java/org/onap/clamp/loop/log/LoopLog.java
+++ b/src/main/java/org/onap/policy/clamp/loop/log/LoopLog.java
@@ -21,14 +21,12 @@
*
*/
-package org.onap.clamp.loop.log;
+package org.onap.policy.clamp.loop.log;
import com.google.gson.annotations.Expose;
-
import java.io.Serializable;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EnumType;
@@ -40,8 +38,7 @@ import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
-
-import org.onap.clamp.loop.Loop;
+import org.onap.policy.clamp.loop.Loop;
/**
* This class holds the logs created by the Clamp Backend. The Instant is always
diff --git a/src/main/java/org/onap/clamp/loop/log/LoopLogRepository.java b/src/main/java/org/onap/policy/clamp/loop/log/LoopLogRepository.java
index 0b3c34ec0..df1f3919e 100644
--- a/src/main/java/org/onap/clamp/loop/log/LoopLogRepository.java
+++ b/src/main/java/org/onap/policy/clamp/loop/log/LoopLogRepository.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.loop.log;
+package org.onap.policy.clamp.loop.log;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/org/onap/clamp/loop/log/LoopLogService.java b/src/main/java/org/onap/policy/clamp/loop/log/LoopLogService.java
index d02d0b278..a2f133f2f 100644
--- a/src/main/java/org/onap/clamp/loop/log/LoopLogService.java
+++ b/src/main/java/org/onap/policy/clamp/loop/log/LoopLogService.java
@@ -21,9 +21,9 @@
*
*/
-package org.onap.clamp.loop.log;
+package org.onap.policy.clamp.loop.log;
-import org.onap.clamp.loop.Loop;
+import org.onap.policy.clamp.loop.Loop;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/src/main/java/org/onap/clamp/loop/service/CsarServiceInstaller.java b/src/main/java/org/onap/policy/clamp/loop/service/CsarServiceInstaller.java
index c43f2cb6d..1429d73c2 100644
--- a/src/main/java/org/onap/clamp/loop/service/CsarServiceInstaller.java
+++ b/src/main/java/org/onap/policy/clamp/loop/service/CsarServiceInstaller.java
@@ -22,15 +22,15 @@
*
*/
-package org.onap.clamp.loop.service;
+package org.onap.policy.clamp.loop.service;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
import com.google.gson.JsonObject;
import java.util.Map.Entry;
-import org.onap.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException;
-import org.onap.clamp.clds.sdc.controller.installer.CsarHandler;
-import org.onap.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException;
+import org.onap.policy.clamp.clds.sdc.controller.installer.CsarHandler;
+import org.onap.policy.clamp.clds.util.JsonUtils;
import org.onap.sdc.tosca.parser.api.IEntityDetails;
import org.onap.sdc.tosca.parser.elements.queries.EntityQuery;
import org.onap.sdc.tosca.parser.elements.queries.TopologyTemplateQuery;
diff --git a/src/main/java/org/onap/clamp/loop/service/Service.java b/src/main/java/org/onap/policy/clamp/loop/service/Service.java
index 338032a16..b7442abc5 100644
--- a/src/main/java/org/onap/clamp/loop/service/Service.java
+++ b/src/main/java/org/onap/policy/clamp/loop/service/Service.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.loop.service;
+package org.onap.policy.clamp.loop.service;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
@@ -36,8 +36,8 @@ import javax.persistence.Transient;
import org.hibernate.annotations.Type;
import org.hibernate.annotations.TypeDef;
import org.hibernate.annotations.TypeDefs;
-import org.onap.clamp.clds.util.JsonUtils;
-import org.onap.clamp.dao.model.jsontype.StringJsonUserType;
+import org.onap.policy.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.dao.model.jsontype.StringJsonUserType;
@Entity
@Table(name = "services")
@@ -158,9 +158,10 @@ public class Service implements Serializable {
if (other.serviceUuid != null) {
return false;
}
- }
- else if (!serviceUuid.equals(other.serviceUuid)) {
- return false;
+ } else {
+ if (!serviceUuid.equals(other.serviceUuid)) {
+ return false;
+ }
}
return true;
}
diff --git a/src/main/java/org/onap/clamp/loop/service/ServicesRepository.java b/src/main/java/org/onap/policy/clamp/loop/service/ServicesRepository.java
index fe5ba8ed0..62596a08e 100644
--- a/src/main/java/org/onap/clamp/loop/service/ServicesRepository.java
+++ b/src/main/java/org/onap/policy/clamp/loop/service/ServicesRepository.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.loop.service;
+package org.onap.policy.clamp.loop.service;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/org/onap/clamp/loop/template/LoopElementModel.java b/src/main/java/org/onap/policy/clamp/loop/template/LoopElementModel.java
index 70cdbe233..6eb3c7195 100644
--- a/src/main/java/org/onap/clamp/loop/template/LoopElementModel.java
+++ b/src/main/java/org/onap/policy/clamp/loop/template/LoopElementModel.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.loop.template;
+package org.onap.policy.clamp.loop.template;
import com.google.gson.annotations.Expose;
import java.io.Serializable;
@@ -40,12 +40,12 @@ import javax.persistence.ManyToMany;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import org.hibernate.annotations.SortNatural;
-import org.onap.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
-import org.onap.clamp.loop.Loop;
-import org.onap.clamp.loop.common.AuditEntity;
-import org.onap.clamp.policy.Policy;
-import org.onap.clamp.policy.microservice.MicroServicePolicy;
-import org.onap.clamp.policy.operational.OperationalPolicy;
+import org.onap.policy.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
+import org.onap.policy.clamp.loop.Loop;
+import org.onap.policy.clamp.loop.common.AuditEntity;
+import org.onap.policy.clamp.policy.Policy;
+import org.onap.policy.clamp.policy.microservice.MicroServicePolicy;
+import org.onap.policy.clamp.policy.operational.OperationalPolicy;
/**
* This class represents a micro service/operational/... model for a loop template.
@@ -212,7 +212,7 @@ public class LoopElementModel extends AuditEntity implements Serializable {
}
/**
- * @param shortName the shortName to set.
+ * * @param shortName the shortName to set.
*/
public void setShortName(String shortName) {
this.shortName = shortName;
@@ -255,11 +255,9 @@ public class LoopElementModel extends AuditEntity implements Serializable {
public Policy createPolicyInstance(Loop loop, ToscaConverterWithDictionarySupport toscaConverter) {
if (LoopElementModel.MICRO_SERVICE_TYPE.equals(this.getLoopElementType())) {
return new MicroServicePolicy(loop, loop.getModelService(), this, toscaConverter);
- }
- else if (LoopElementModel.OPERATIONAL_POLICY_TYPE.equals(this.getLoopElementType())) {
+ } else if (LoopElementModel.OPERATIONAL_POLICY_TYPE.equals(this.getLoopElementType())) {
return new OperationalPolicy(loop, loop.getModelService(), this, toscaConverter);
- }
- else {
+ } else {
return null;
}
}
@@ -288,8 +286,7 @@ public class LoopElementModel extends AuditEntity implements Serializable {
if (other.name != null) {
return false;
}
- }
- else if (!name.equals(other.name)) {
+ } else if (!name.equals(other.name)) {
return false;
}
return true;
diff --git a/src/main/java/org/onap/clamp/loop/template/LoopElementModelsRepository.java b/src/main/java/org/onap/policy/clamp/loop/template/LoopElementModelsRepository.java
index 27b82189c..d9b879d0f 100644
--- a/src/main/java/org/onap/clamp/loop/template/LoopElementModelsRepository.java
+++ b/src/main/java/org/onap/policy/clamp/loop/template/LoopElementModelsRepository.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.loop.template;
+package org.onap.policy.clamp.loop.template;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/org/onap/clamp/loop/template/LoopTemplate.java b/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplate.java
index 6f896f3d4..ab7367aaf 100644
--- a/src/main/java/org/onap/clamp/loop/template/LoopTemplate.java
+++ b/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplate.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.loop.template;
+package org.onap.policy.clamp.loop.template;
import com.google.gson.annotations.Expose;
import java.io.Serializable;
@@ -39,8 +39,8 @@ import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import org.hibernate.annotations.SortNatural;
-import org.onap.clamp.loop.common.AuditEntity;
-import org.onap.clamp.loop.service.Service;
+import org.onap.policy.clamp.loop.common.AuditEntity;
+import org.onap.policy.clamp.loop.service.Service;
@Entity
@Table(name = "loop_templates")
@@ -223,7 +223,7 @@ public class LoopTemplate extends AuditEntity implements Serializable {
* @param loopElementModel The loopElementModel to add
*/
public void addLoopElementModel(LoopElementModel loopElementModel) {
- this.addLoopElementModel(loopElementModel,this.loopElementModelsUsed.size());
+ this.addLoopElementModel(loopElementModel, this.loopElementModelsUsed.size());
}
/**
diff --git a/src/main/java/org/onap/clamp/loop/template/LoopTemplateLoopElementModel.java b/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplateLoopElementModel.java
index aca16bc04..c0b0c7d24 100644
--- a/src/main/java/org/onap/clamp/loop/template/LoopTemplateLoopElementModel.java
+++ b/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplateLoopElementModel.java
@@ -21,12 +21,10 @@
*
*/
-package org.onap.clamp.loop.template;
+package org.onap.policy.clamp.loop.template;
import com.google.gson.annotations.Expose;
-
import java.io.Serializable;
-
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.EmbeddedId;
diff --git a/src/main/java/org/onap/clamp/loop/template/LoopTemplateLoopElementModelId.java b/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplateLoopElementModelId.java
index cac5f088a..9da8272bd 100644
--- a/src/main/java/org/onap/clamp/loop/template/LoopTemplateLoopElementModelId.java
+++ b/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplateLoopElementModelId.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.loop.template;
+package org.onap.policy.clamp.loop.template;
import com.google.gson.annotations.Expose;
import java.io.Serializable;
diff --git a/src/main/java/org/onap/clamp/loop/template/LoopTemplatesRepository.java b/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplatesRepository.java
index 07f304de7..3993dee34 100644
--- a/src/main/java/org/onap/clamp/loop/template/LoopTemplatesRepository.java
+++ b/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplatesRepository.java
@@ -21,10 +21,9 @@
*
*/
-package org.onap.clamp.loop.template;
+package org.onap.policy.clamp.loop.template;
import java.util.List;
-
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/org/onap/clamp/loop/template/LoopTemplatesService.java b/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplatesService.java
index 29382137e..974cf3b5c 100644
--- a/src/main/java/org/onap/clamp/loop/template/LoopTemplatesService.java
+++ b/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplatesService.java
@@ -21,10 +21,10 @@
*
*/
-package org.onap.clamp.loop.template;
+package org.onap.policy.clamp.loop.template;
import java.util.List;
-import org.onap.clamp.clds.sdc.controller.installer.ChainGenerator;
+import org.onap.policy.clamp.clds.sdc.controller.installer.ChainGenerator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/src/main/java/org/onap/clamp/loop/template/LoopType.java b/src/main/java/org/onap/policy/clamp/loop/template/LoopType.java
index ccbc62a83..eacfecb5e 100644
--- a/src/main/java/org/onap/clamp/loop/template/LoopType.java
+++ b/src/main/java/org/onap/policy/clamp/loop/template/LoopType.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.loop.template;
+package org.onap.policy.clamp.loop.template;
/**
* Enums for AllowedLoopType in LoopTemplate enity.
diff --git a/src/main/java/org/onap/clamp/loop/template/LoopTypeConvertor.java b/src/main/java/org/onap/policy/clamp/loop/template/LoopTypeConvertor.java
index 0b05613cb..81ca18d57 100644
--- a/src/main/java/org/onap/clamp/loop/template/LoopTypeConvertor.java
+++ b/src/main/java/org/onap/policy/clamp/loop/template/LoopTypeConvertor.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.loop.template;
+package org.onap.policy.clamp.loop.template;
import java.util.stream.Stream;
import javax.persistence.AttributeConverter;
diff --git a/src/main/java/org/onap/clamp/loop/template/PolicyModel.java b/src/main/java/org/onap/policy/clamp/loop/template/PolicyModel.java
index 3f45d0551..2414377d7 100644
--- a/src/main/java/org/onap/clamp/loop/template/PolicyModel.java
+++ b/src/main/java/org/onap/policy/clamp/loop/template/PolicyModel.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.loop.template;
+package org.onap.policy.clamp.loop.template;
import com.google.gson.JsonObject;
import com.google.gson.annotations.Expose;
@@ -38,9 +38,9 @@ import javax.persistence.Table;
import org.hibernate.annotations.Type;
import org.hibernate.annotations.TypeDef;
import org.hibernate.annotations.TypeDefs;
-import org.onap.clamp.dao.model.jsontype.StringJsonUserType;
-import org.onap.clamp.loop.common.AuditEntity;
-import org.onap.clamp.util.SemanticVersioning;
+import org.onap.policy.clamp.dao.model.jsontype.StringJsonUserType;
+import org.onap.policy.clamp.loop.common.AuditEntity;
+import org.onap.policy.clamp.util.SemanticVersioning;
/**
* This class represents the policy model tosca revision that we can have to a
diff --git a/src/main/java/org/onap/clamp/loop/template/PolicyModelId.java b/src/main/java/org/onap/policy/clamp/loop/template/PolicyModelId.java
index c4dd1933b..2591bd174 100644
--- a/src/main/java/org/onap/clamp/loop/template/PolicyModelId.java
+++ b/src/main/java/org/onap/policy/clamp/loop/template/PolicyModelId.java
@@ -21,10 +21,9 @@
*
*/
-package org.onap.clamp.loop.template;
+package org.onap.policy.clamp.loop.template;
import com.google.gson.annotations.Expose;
-
import java.io.Serializable;
public class PolicyModelId implements Serializable {
diff --git a/src/main/java/org/onap/clamp/loop/template/PolicyModelsRepository.java b/src/main/java/org/onap/policy/clamp/loop/template/PolicyModelsRepository.java
index a76e386b5..6ff7e3d0c 100644
--- a/src/main/java/org/onap/clamp/loop/template/PolicyModelsRepository.java
+++ b/src/main/java/org/onap/policy/clamp/loop/template/PolicyModelsRepository.java
@@ -21,10 +21,9 @@
*
*/
-package org.onap.clamp.loop.template;
+package org.onap.policy.clamp.loop.template;
import java.util.List;
-
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/org/onap/clamp/loop/template/PolicyModelsService.java b/src/main/java/org/onap/policy/clamp/loop/template/PolicyModelsService.java
index a1b8f7cf2..8670ab73e 100644
--- a/src/main/java/org/onap/clamp/loop/template/PolicyModelsService.java
+++ b/src/main/java/org/onap/policy/clamp/loop/template/PolicyModelsService.java
@@ -21,17 +21,17 @@
*
*/
-package org.onap.clamp.loop.template;
+package org.onap.policy.clamp.loop.template;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.onap.clamp.clds.tosca.ToscaSchemaConstants;
-import org.onap.clamp.clds.tosca.ToscaYamlToJsonConvertor;
-import org.onap.clamp.policy.pdpgroup.PdpGroup;
-import org.onap.clamp.util.SemanticVersioning;
+import org.onap.policy.clamp.clds.tosca.ToscaSchemaConstants;
+import org.onap.policy.clamp.clds.tosca.ToscaYamlToJsonConvertor;
+import org.onap.policy.clamp.policy.pdpgroup.PdpGroup;
+import org.onap.policy.clamp.util.SemanticVersioning;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -100,7 +100,7 @@ public class PolicyModelsService {
public PolicyModel updatePolicyModelTosca(String policyModelType, String policyModelVersion,
String policyModelTosca) {
JsonObject jsonObject = toscaYamlToJsonConvertor.validateAndConvertToJson(policyModelTosca);
- PolicyModel thePolicyModel = getPolicyModelByType(policyModelType, policyModelVersion);
+ PolicyModel thePolicyModel = getPolicyModel(policyModelType, policyModelVersion);
thePolicyModel.setPolicyAcronym(toscaYamlToJsonConvertor.getValueFromMetadata(jsonObject,
ToscaSchemaConstants.METADATA_ACRONYM));
thePolicyModel.setPolicyModelTosca(policyModelTosca);
@@ -123,10 +123,6 @@ public class PolicyModelsService {
return policyModelsRepository.findByPolicyModelType(type);
}
- public PolicyModel getPolicyModelByType(String type, String version) {
- return policyModelsRepository.findById(new PolicyModelId(type, version)).orElse(null);
- }
-
/**
* Retrieves the Tosca model Yaml string.
*
@@ -146,7 +142,7 @@ public class PolicyModelsService {
*/
@Transactional(propagation = Propagation.REQUIRES_NEW)
public PolicyModel savePolicyModelInNewTransaction(PolicyModel policyModel) {
- return policyModelsRepository.saveAndFlush(policyModel);
+ return policyModelsRepository.saveAndFlush(policyModel);
}
/**
diff --git a/src/main/java/org/onap/clamp/policy/Policy.java b/src/main/java/org/onap/policy/clamp/policy/Policy.java
index d84f2c8a0..801183cab 100644
--- a/src/main/java/org/onap/clamp/policy/Policy.java
+++ b/src/main/java/org/onap/policy/clamp/policy/Policy.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.policy;
+package org.onap.policy.clamp.policy;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
@@ -43,12 +43,12 @@ import org.hibernate.annotations.Type;
import org.hibernate.annotations.TypeDef;
import org.hibernate.annotations.TypeDefs;
import org.json.JSONObject;
-import org.onap.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
-import org.onap.clamp.dao.model.jsontype.StringJsonUserType;
-import org.onap.clamp.loop.common.AuditEntity;
-import org.onap.clamp.loop.service.Service;
-import org.onap.clamp.loop.template.LoopElementModel;
-import org.onap.clamp.loop.template.PolicyModel;
+import org.onap.policy.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
+import org.onap.policy.clamp.dao.model.jsontype.StringJsonUserType;
+import org.onap.policy.clamp.loop.common.AuditEntity;
+import org.onap.policy.clamp.loop.service.Service;
+import org.onap.policy.clamp.loop.template.LoopElementModel;
+import org.onap.policy.clamp.loop.template.PolicyModel;
import org.yaml.snakeyaml.Yaml;
@MappedSuperclass
diff --git a/src/main/java/org/onap/clamp/policy/PolicyService.java b/src/main/java/org/onap/policy/clamp/policy/PolicyService.java
index ae15f86da..35ffa2443 100644
--- a/src/main/java/org/onap/clamp/policy/PolicyService.java
+++ b/src/main/java/org/onap/policy/clamp/policy/PolicyService.java
@@ -21,12 +21,11 @@
*
*/
-package org.onap.clamp.policy;
+package org.onap.policy.clamp.policy;
import java.util.List;
import java.util.Set;
-
-import org.onap.clamp.loop.Loop;
+import org.onap.policy.clamp.loop.Loop;
public interface PolicyService<T extends Policy> {
diff --git a/src/main/java/org/onap/clamp/policy/downloader/PolicyEngineController.java b/src/main/java/org/onap/policy/clamp/policy/downloader/PolicyEngineController.java
index 0c3f677a1..569678dc7 100644
--- a/src/main/java/org/onap/clamp/policy/downloader/PolicyEngineController.java
+++ b/src/main/java/org/onap/policy/clamp/policy/downloader/PolicyEngineController.java
@@ -21,16 +21,14 @@
*
*/
-package org.onap.clamp.policy.downloader;
+package org.onap.policy.clamp.policy.downloader;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
-
import java.time.Instant;
-
import org.json.simple.parser.ParseException;
-import org.onap.clamp.clds.client.PolicyEngineServices;
-import org.onap.clamp.loop.template.PolicyModelsRepository;
+import org.onap.policy.clamp.clds.client.PolicyEngineServices;
+import org.onap.policy.clamp.loop.template.PolicyModelsRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;
diff --git a/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicy.java b/src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicy.java
index 77627a31a..2e5db8e24 100644
--- a/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicy.java
+++ b/src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicy.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.policy.microservice;
+package org.onap.policy.clamp.policy.microservice;
import com.google.gson.JsonObject;
import com.google.gson.annotations.Expose;
@@ -37,13 +37,13 @@ import javax.persistence.Table;
import org.apache.commons.lang3.RandomStringUtils;
import org.hibernate.annotations.TypeDef;
import org.hibernate.annotations.TypeDefs;
-import org.onap.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
-import org.onap.clamp.dao.model.jsontype.StringJsonUserType;
-import org.onap.clamp.loop.Loop;
-import org.onap.clamp.loop.service.Service;
-import org.onap.clamp.loop.template.LoopElementModel;
-import org.onap.clamp.loop.template.PolicyModel;
-import org.onap.clamp.policy.Policy;
+import org.onap.policy.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
+import org.onap.policy.clamp.dao.model.jsontype.StringJsonUserType;
+import org.onap.policy.clamp.loop.Loop;
+import org.onap.policy.clamp.loop.service.Service;
+import org.onap.policy.clamp.loop.template.LoopElementModel;
+import org.onap.policy.clamp.loop.template.PolicyModel;
+import org.onap.policy.clamp.policy.Policy;
@Entity
@Table(name = "micro_service_policies")
@@ -267,8 +267,7 @@ public class MicroServicePolicy extends Policy implements Serializable {
if (other.name != null) {
return false;
}
- }
- else if (!name.equals(other.name)) {
+ } else if (!name.equals(other.name)) {
return false;
}
return true;
diff --git a/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicyRepository.java b/src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicyRepository.java
index 38b310ce8..2ce2c4f17 100644
--- a/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicyRepository.java
+++ b/src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicyRepository.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.policy.microservice;
+package org.onap.policy.clamp.policy.microservice;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicyService.java b/src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicyService.java
index 060e79a63..b9871049e 100644
--- a/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicyService.java
+++ b/src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicyService.java
@@ -21,14 +21,14 @@
*
*/
-package org.onap.clamp.policy.microservice;
+package org.onap.policy.clamp.policy.microservice;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
-import org.onap.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
-import org.onap.clamp.loop.Loop;
-import org.onap.clamp.policy.PolicyService;
+import org.onap.policy.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
+import org.onap.policy.clamp.loop.Loop;
+import org.onap.policy.clamp.policy.PolicyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java b/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicy.java
index 4b052427f..5b29f319c 100644
--- a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
+++ b/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicy.java
@@ -22,7 +22,7 @@
*
*/
-package org.onap.clamp.policy.operational;
+package org.onap.policy.clamp.policy.operational;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
@@ -41,13 +41,13 @@ import javax.persistence.Transient;
import org.apache.commons.lang3.RandomStringUtils;
import org.hibernate.annotations.TypeDef;
import org.hibernate.annotations.TypeDefs;
-import org.onap.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
-import org.onap.clamp.dao.model.jsontype.StringJsonUserType;
-import org.onap.clamp.loop.Loop;
-import org.onap.clamp.loop.service.Service;
-import org.onap.clamp.loop.template.LoopElementModel;
-import org.onap.clamp.loop.template.PolicyModel;
-import org.onap.clamp.policy.Policy;
+import org.onap.policy.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
+import org.onap.policy.clamp.dao.model.jsontype.StringJsonUserType;
+import org.onap.policy.clamp.loop.Loop;
+import org.onap.policy.clamp.loop.service.Service;
+import org.onap.policy.clamp.loop.template.LoopElementModel;
+import org.onap.policy.clamp.loop.template.PolicyModel;
+import org.onap.policy.clamp.policy.Policy;
@Entity
@Table(name = "operational_policies")
diff --git a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepository.java b/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepository.java
index c0a6e12cd..b0a33669a 100644
--- a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepository.java
+++ b/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepository.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.policy.operational;
+package org.onap.policy.clamp.policy.operational;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java b/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java
index 0381f0a2a..8a1bb1abf 100644
--- a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java
+++ b/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java
@@ -22,22 +22,20 @@
*
*/
-package org.onap.clamp.policy.operational;
+package org.onap.policy.clamp.policy.operational;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
-
import java.io.IOException;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
-
-import org.onap.clamp.clds.util.JsonUtils;
-import org.onap.clamp.clds.util.ResourceFileUtils;
-import org.onap.clamp.loop.service.Service;
+import org.onap.policy.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.clds.util.ResourceFileUtils;
+import org.onap.policy.clamp.loop.service.Service;
public class OperationalPolicyRepresentationBuilder {
@@ -57,7 +55,7 @@ public class OperationalPolicyRepresentationBuilder {
public static final String TYPE_ARRAY = "array";
private OperationalPolicyRepresentationBuilder() {
- throw new IllegalStateException("This is Utility class, not supposed to be initiated.");
+ throw new IllegalStateException("This is Utility class, not supposed to be initiated.");
}
/**
@@ -282,7 +280,7 @@ public class OperationalPolicyRepresentationBuilder {
jsonObject.add("artifact_version", createSchemaProperty(
"artifact version", STRING, artifactVersion, "True", null));
jsonObject.add("mode", createCdsInputProperty(
- "mode", STRING, "async" ,null));
+ "mode", STRING, "async", null));
jsonObject.add("data", createDataProperty(inputs, workFlowName));
return jsonObject;
}
@@ -308,7 +306,7 @@ public class OperationalPolicyRepresentationBuilder {
dataObj, workFlowName);
} else {
dataObj.add(entry.getKey(),
- createCdsInputProperty(key, inputProperty.get(TYPE).getAsString(),null,
+ createCdsInputProperty(key, inputProperty.get(TYPE).getAsString(), null,
entry.getValue().getAsJsonObject()));
}
}
diff --git a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyService.java b/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyService.java
index d5442e145..3f3f39b45 100644
--- a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyService.java
+++ b/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyService.java
@@ -21,17 +21,17 @@
*
*/
-package org.onap.clamp.policy.operational;
+package org.onap.policy.clamp.policy.operational;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
-import org.onap.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
-import org.onap.clamp.loop.Loop;
-import org.onap.clamp.loop.template.PolicyModelsRepository;
-import org.onap.clamp.policy.PolicyService;
+import org.onap.policy.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
+import org.onap.policy.clamp.loop.Loop;
+import org.onap.policy.clamp.loop.template.PolicyModelsRepository;
+import org.onap.policy.clamp.policy.PolicyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/src/main/java/org/onap/clamp/policy/pdpgroup/PdpGroup.java b/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroup.java
index a3cf4e053..9cbeec109 100644
--- a/src/main/java/org/onap/clamp/policy/pdpgroup/PdpGroup.java
+++ b/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroup.java
@@ -21,12 +21,11 @@
*
*/
-package org.onap.clamp.policy.pdpgroup;
+package org.onap.policy.clamp.policy.pdpgroup;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.google.gson.annotations.Expose;
-
import java.util.List;
/**
diff --git a/src/main/java/org/onap/clamp/policy/pdpgroup/PdpSubgroup.java b/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpSubgroup.java
index 28de79abf..890f90775 100644
--- a/src/main/java/org/onap/clamp/policy/pdpgroup/PdpSubgroup.java
+++ b/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpSubgroup.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.policy.pdpgroup;
+package org.onap.policy.clamp.policy.pdpgroup;
import com.google.gson.annotations.Expose;
import java.util.List;
diff --git a/src/main/java/org/onap/clamp/policy/pdpgroup/PolicyModelKey.java b/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PolicyModelKey.java
index 707b3bd2f..df92bfdf9 100644
--- a/src/main/java/org/onap/clamp/policy/pdpgroup/PolicyModelKey.java
+++ b/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PolicyModelKey.java
@@ -21,10 +21,9 @@
*
*/
-package org.onap.clamp.policy.pdpgroup;
+package org.onap.policy.clamp.policy.pdpgroup;
import com.google.gson.annotations.Expose;
-
import java.io.Serializable;
public class PolicyModelKey implements Serializable {
diff --git a/src/main/java/org/onap/clamp/tosca/Dictionary.java b/src/main/java/org/onap/policy/clamp/tosca/Dictionary.java
index cf514c4bd..4b01d6902 100644
--- a/src/main/java/org/onap/clamp/tosca/Dictionary.java
+++ b/src/main/java/org/onap/policy/clamp/tosca/Dictionary.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.tosca;
+package org.onap.policy.clamp.tosca;
import com.google.gson.annotations.Expose;
import java.io.Serializable;
@@ -36,7 +36,7 @@ import javax.persistence.JoinColumn;
import javax.persistence.JoinTable;
import javax.persistence.ManyToMany;
import javax.persistence.Table;
-import org.onap.clamp.loop.common.AuditEntity;
+import org.onap.policy.clamp.loop.common.AuditEntity;
/**
* Represents Dictionary.
diff --git a/src/main/java/org/onap/clamp/tosca/DictionaryElement.java b/src/main/java/org/onap/policy/clamp/tosca/DictionaryElement.java
index 43a3106f5..ecf4b876c 100644
--- a/src/main/java/org/onap/clamp/tosca/DictionaryElement.java
+++ b/src/main/java/org/onap/policy/clamp/tosca/DictionaryElement.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.tosca;
+package org.onap.policy.clamp.tosca;
import com.google.gson.annotations.Expose;
import java.io.Serializable;
@@ -33,7 +33,7 @@ import javax.persistence.FetchType;
import javax.persistence.Id;
import javax.persistence.ManyToMany;
import javax.persistence.Table;
-import org.onap.clamp.loop.common.AuditEntity;
+import org.onap.policy.clamp.loop.common.AuditEntity;
/**
* Represents a Dictionary Item.
diff --git a/src/main/java/org/onap/clamp/tosca/DictionaryElementsRepository.java b/src/main/java/org/onap/policy/clamp/tosca/DictionaryElementsRepository.java
index 43f6f1d40..0bc50fe1a 100644
--- a/src/main/java/org/onap/clamp/tosca/DictionaryElementsRepository.java
+++ b/src/main/java/org/onap/policy/clamp/tosca/DictionaryElementsRepository.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.tosca;
+package org.onap.policy.clamp.tosca;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/org/onap/clamp/tosca/DictionaryRepository.java b/src/main/java/org/onap/policy/clamp/tosca/DictionaryRepository.java
index ae8430d93..a2f417d17 100644
--- a/src/main/java/org/onap/clamp/tosca/DictionaryRepository.java
+++ b/src/main/java/org/onap/policy/clamp/tosca/DictionaryRepository.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.tosca;
+package org.onap.policy.clamp.tosca;
import java.util.List;
import org.springframework.data.jpa.repository.JpaRepository;
diff --git a/src/main/java/org/onap/clamp/tosca/DictionaryService.java b/src/main/java/org/onap/policy/clamp/tosca/DictionaryService.java
index 6172641a7..849d4baae 100644
--- a/src/main/java/org/onap/clamp/tosca/DictionaryService.java
+++ b/src/main/java/org/onap/policy/clamp/tosca/DictionaryService.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.tosca;
+package org.onap.policy.clamp.tosca;
import com.google.common.collect.Sets;
import java.util.List;
diff --git a/src/main/java/org/onap/clamp/util/PassDecoder.java b/src/main/java/org/onap/policy/clamp/util/PassDecoder.java
index b2e4ca2c5..f4b8ed4dc 100644
--- a/src/main/java/org/onap/clamp/util/PassDecoder.java
+++ b/src/main/java/org/onap/policy/clamp/util/PassDecoder.java
@@ -20,16 +20,13 @@
* ===================================================================
*/
-package org.onap.clamp.util;
+package org.onap.policy.clamp.util;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
-import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
-import java.io.InputStream;
import org.onap.aaf.cadi.Symm;
-import org.onap.clamp.clds.util.ResourceFileUtils;
+import org.onap.policy.clamp.clds.util.ResourceFileUtils;
/**
* PassDecoder for decrypting the truststore and keystore password.
diff --git a/src/main/java/org/onap/clamp/util/SemanticVersioning.java b/src/main/java/org/onap/policy/clamp/util/SemanticVersioning.java
index 8852e2a4f..58367193f 100644
--- a/src/main/java/org/onap/clamp/util/SemanticVersioning.java
+++ b/src/main/java/org/onap/policy/clamp/util/SemanticVersioning.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.util;
+package org.onap.policy.clamp.util;
/**
* This class is the base class for object that requires semantic versioning.