Changed identifiers to concept identifiers 66/116566/5
authorliamfallon <liam.fallon@est.tech>
Mon, 4 Jan 2021 12:15:18 +0000 (12:15 +0000)
committerliamfallon <liam.fallon@est.tech>
Wed, 6 Jan 2021 14:20:06 +0000 (14:20 +0000)
commitf2b0318f53abf9f2345a5cdca74f3dd635aa9b60
tree0a5d64add719e43596f95b9415db04257c037988
parent8ad3f95cdcec48b8315a5febfd4ec07bae7aabba
Changed identifiers to concept identifiers

The policy models tosca classes ToscaPolicyIdentifier and
ToscaPolicyIdentifierOptVersion can be used to identify any TOSCA
concept, not just TOSCA policies so they are renamed to
ToscaConceptIdentifier and ToscaCinceptIdentifierOptVersion
respectively.

The class ToscaPolicyTypeIdentifier is redundant and is replaced by
ToscaConceptIdentifier.

Issue-ID: POLICY-2900
Change-Id: Id0a37c42ea4e74f07b47e1694c4f8291c35879c9
Signed-off-by: liamfallon <liam.fallon@est.tech>
33 files changed:
models-pap/src/main/java/org/onap/policy/models/pap/concepts/PapPolicyIdentifier.java [new file with mode: 0644]
models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpDeployPolicies.java
models-pap/src/main/java/org/onap/policy/models/pap/concepts/PolicyStatus.java
models-pap/src/test/java/org/onap/policy/models/pap/concepts/PapPolicyIdentifierTest.java [new file with mode: 0644]
models-pap/src/test/java/org/onap/policy/models/pap/concepts/PdpDeployPoliciesTest.java [new file with mode: 0644]
models-pap/src/test/java/org/onap/policy/models/pap/concepts/PolicyStatusTest.java
models-pap/src/test/java/org/onap/policy/models/pap/concepts/TestModels.java
models-pap/src/test/resources/json/PapPoliciesList.json [new file with mode: 0644]
models-pap/src/test/resources/json/PapPolicyIdentifier.json [new file with mode: 0644]
models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/DeploymentSubGroup.java
models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpGroupFilter.java
models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpStatus.java
models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpSubGroup.java
models-pdp/src/main/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdpSubGroup.java
models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/DeploymentSubGroupTest.java
models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/PdpGroupFilterTest.java
models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/PdpGroupTest.java
models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/PdpGroupsTest.java
models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/PdpStatusTest.java
models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/PdpSubGroupTest.java
models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/provider/PdpProviderTest.java
models-provider/src/main/java/org/onap/policy/models/provider/impl/DatabasePolicyModelsProviderImpl.java
models-provider/src/test/java/org/onap/policy/models/provider/impl/DatabasePolicyModelsProviderTest.java
models-sim/policy-models-sim-pdp/src/main/java/org/onap/policy/models/sim/pdp/handler/PdpMessageHandler.java
models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaConceptIdentifier.java [moved from models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyIdentifier.java with 83% similarity]
models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaConceptIdentifierOptVersion.java [moved from models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyIdentifierOptVersion.java with 70% similarity]
models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicy.java
models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyTypeIdentifier.java [deleted file]
models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaServiceTemplate.java
models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaConceptIdentifierOptVersionTest.java [moved from models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyIdentifierOptVersionTest.java with 66% similarity]
models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyConceptIdentifierTest.java [moved from models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyTypeIdentifierTest.java with 70% similarity]
models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyTest.java
models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyTypeConceptIdentifierTest.java [moved from models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyIdentifierTest.java with 70% similarity]