diff options
Diffstat (limited to 'src/main/java/org/onap')
| -rw-r--r-- | src/main/java/org/onap/clamp/clds/config/LegacyOperationalPolicyController.java (renamed from src/main/java/org/onap/clamp/clds/config/LegacyOperationalPolicy.java) | 4 | ||||
| -rw-r--r-- | src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/org/onap/clamp/clds/config/LegacyOperationalPolicy.java b/src/main/java/org/onap/clamp/clds/config/LegacyOperationalPolicyController.java index 7d4b5f8fe..69e94a35a 100644 --- a/src/main/java/org/onap/clamp/clds/config/LegacyOperationalPolicy.java +++ b/src/main/java/org/onap/clamp/clds/config/LegacyOperationalPolicyController.java @@ -32,12 +32,12 @@ import org.springframework.context.annotation.Profile; @Configuration @Profile("legacy-operational-policy") -public class LegacyOperationalPolicy { +public class LegacyOperationalPolicyController { @Autowired PolicyModelsService policyModelService; - public static final String OPERATIONAL_POLICY_LEGACY = "onap.policies.operational.legacy"; + public static final String OPERATIONAL_POLICY_LEGACY = "onap.policies.controlloop.Operational"; @PostConstruct public void init() { diff --git a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java index 18ee84f77..1e721ce24 100644 --- a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java +++ b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java @@ -50,6 +50,7 @@ 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.config.LegacyOperationalPolicyController; import org.onap.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport; import org.onap.clamp.dao.model.jsontype.StringJsonUserType; import org.onap.clamp.loop.Loop; @@ -228,7 +229,8 @@ public class OperationalPolicy extends Policy implements Serializable { } public Boolean isLegacy() { - return (this.getPolicyModel() != null) && this.getPolicyModel().getPolicyModelType().contains("legacy"); + return (this.getPolicyModel() != null) && this.getPolicyModel().getPolicyModelType().contains( + LegacyOperationalPolicyController.OPERATIONAL_POLICY_LEGACY); } /** |