summaryrefslogtreecommitdiffstats
path: root/catalog-model/src
diff options
context:
space:
mode:
Diffstat (limited to 'catalog-model/src')
-rw-r--r--catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/PropertyOperation.java4
-rw-r--r--catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/AnnotationTypeOperationsTest.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/PropertyOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/PropertyOperation.java
index 22e7d02ce7..6772163b7f 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/PropertyOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/PropertyOperation.java
@@ -1346,7 +1346,7 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
List<String> rule = new ArrayList<>();
rule.add(componentInstanceId);
for (int i = 0; i < size - 1; i++) {
- rule.add(PropertyRule.RULE_ANY_MATCH);
+ rule.add(PropertyRule.getRuleAnyMatch());
}
PropertyRule propertyRule = new PropertyRule(rule, value);
rules.add(propertyRule);
@@ -1379,7 +1379,7 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
}
String secondToken = rule.getToken(2);
- if (secondToken != null && (secondToken.equals(PropertyRule.FORCE_ALL) || secondToken.equals(PropertyRule.ALL))) {
+ if (secondToken != null && (secondToken.equals(PropertyRule.getForceAll()) || secondToken.equals(PropertyRule.getALL()))) {
propertyRule = rule;
break;
}
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/AnnotationTypeOperationsTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/AnnotationTypeOperationsTest.java
index 4030071548..df164b9d31 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/AnnotationTypeOperationsTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/AnnotationTypeOperationsTest.java
@@ -202,7 +202,7 @@ public class AnnotationTypeOperationsTest extends ModelTestBase {
initialAnnotationDefinition = buildAnnotationDefinition(DESCRIPTION,
TYPE,
prop1);
- initialAnnotationDefinition.setVersion(TypeUtils.FIRST_CERTIFIED_VERSION_VERSION);
+ initialAnnotationDefinition.setVersion(TypeUtils.getFirstCertifiedVersionVersion());
}
private AnnotationTypeDefinition buildAnnotationDefinition(String description, String type, PropertyDefinition ... properties) {