summaryrefslogtreecommitdiffstats
path: root/catalog-be/src/main
diff options
context:
space:
mode:
authorBartosz Gardziejewski <bartosz.gardziejewski@nokia.com>2019-07-17 11:10:21 +0200
committerTomasz Golabek <tomasz.golabek@nokia.com>2019-07-25 13:20:42 +0000
commit156ca46de6c9eaac3c943d2676eaa73f02dd422d (patch)
tree36df1a9c620975888c2e0b0cc6abf725f28800d9 /catalog-be/src/main
parentb0006affdc87ac6ebcfa9bea717ea52c0967952f (diff)
fixing warnings from checkstyle in common-be
Issue-ID: SDC-2454 Signed-off-by: Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com> Change-Id: I1ee7d055f865eef209e621ec45eba33eef69736f
Diffstat (limited to 'catalog-be/src/main')
-rw-r--r--catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/GroupTypeImportManager.java2
-rw-r--r--catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/PolicyTypeImportManager.java2
-rw-r--r--catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceImportManager.java4
-rw-r--r--catalog-be/src/main/java/org/openecomp/sdc/be/servlets/TypesUploadEndpoint.java2
4 files changed, 5 insertions, 5 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/GroupTypeImportManager.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/GroupTypeImportManager.java
index 0be6ed9c3a..24cbb3e3a4 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/GroupTypeImportManager.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/GroupTypeImportManager.java
@@ -137,7 +137,7 @@ public class GroupTypeImportManager {
groupType.setHighestVersion(true);
- groupType.setVersion(TypeUtils.FIRST_CERTIFIED_VERSION_VERSION);
+ groupType.setVersion(TypeUtils.getFirstCertifiedVersionVersion());
}
return groupType;
}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/PolicyTypeImportManager.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/PolicyTypeImportManager.java
index d0dc9fe7c0..090d3b2d3c 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/PolicyTypeImportManager.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/PolicyTypeImportManager.java
@@ -145,7 +145,7 @@ public class PolicyTypeImportManager {
policyType.setHighestVersion(true);
- policyType.setVersion(TypeUtils.FIRST_CERTIFIED_VERSION_VERSION);
+ policyType.setVersion(TypeUtils.getFirstCertifiedVersionVersion());
}
return policyType;
}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceImportManager.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceImportManager.java
index 8dbf1ceff4..7d1729bcff 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceImportManager.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceImportManager.java
@@ -800,7 +800,7 @@ public class ResourceImportManager {
private void auditErrorImport(UploadResourceInfo resourceMetaData, User user, ResponseFormat errorResponseWrapper, boolean isNormative) {
String version, lifeCycleState;
if (isNormative) {
- version = TypeUtils.FIRST_CERTIFIED_VERSION_VERSION;
+ version = TypeUtils.getFirstCertifiedVersionVersion();
lifeCycleState = LifecycleStateEnum.CERTIFIED.name();
}
else {
@@ -861,7 +861,7 @@ public class ResourceImportManager {
String version;
LifecycleStateEnum state;
if (shouldBeCertified) {
- version = TypeUtils.FIRST_CERTIFIED_VERSION_VERSION;
+ version = TypeUtils.getFirstCertifiedVersionVersion();
state = ImportUtils.Constants.NORMATIVE_TYPE_LIFE_CYCLE;
}
else {
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/TypesUploadEndpoint.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/TypesUploadEndpoint.java
index 083549ce08..0d0aa4e72d 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/TypesUploadEndpoint.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/TypesUploadEndpoint.java
@@ -113,7 +113,7 @@ public class TypesUploadEndpoint {
private static <T extends ToscaDataDefinition> T buildAnnotationFromFieldMap(String typeName, Map<String, Object> toscaJson) {
AnnotationTypeDefinition annotationType = new AnnotationTypeDefinition();
- annotationType.setVersion(TypeUtils.FIRST_CERTIFIED_VERSION_VERSION);
+ annotationType.setVersion(TypeUtils.getFirstCertifiedVersionVersion());
annotationType.setHighestVersion(true);
annotationType.setType(typeName);
TypeUtils.setField(toscaJson, TypeUtils.ToscaTagNamesEnum.DESCRIPTION, annotationType::setDescription);