From 156ca46de6c9eaac3c943d2676eaa73f02dd422d Mon Sep 17 00:00:00 2001 From: Bartosz Gardziejewski Date: Wed, 17 Jul 2019 11:10:21 +0200 Subject: fixing warnings from checkstyle in common-be Issue-ID: SDC-2454 Signed-off-by: Bartosz Gardziejewski Change-Id: I1ee7d055f865eef209e621ec45eba33eef69736f --- .../org/openecomp/sdc/be/components/impl/GroupTypeImportManager.java | 2 +- .../org/openecomp/sdc/be/components/impl/PolicyTypeImportManager.java | 2 +- .../org/openecomp/sdc/be/components/impl/ResourceImportManager.java | 4 ++-- .../main/java/org/openecomp/sdc/be/servlets/TypesUploadEndpoint.java | 2 +- .../org/openecomp/sdc/be/components/ResourceImportManagerTest.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'catalog-be/src') 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 buildAnnotationFromFieldMap(String typeName, Map 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); diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/ResourceImportManagerTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/ResourceImportManagerTest.java index 02b2e74f7f..bcb993c372 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/ResourceImportManagerTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/ResourceImportManagerTest.java @@ -355,7 +355,7 @@ public class ResourceImportManagerTest { } private void testSetConstantMetaData(Resource resource) { - assertEquals(resource.getVersion(), TypeUtils.FIRST_CERTIFIED_VERSION_VERSION); + assertEquals(resource.getVersion(), TypeUtils.getFirstCertifiedVersionVersion()); assertSame(resource.getLifecycleState(), ImportUtils.Constants.NORMATIVE_TYPE_LIFE_CYCLE); assertEquals((boolean) resource.isHighestVersion(), ImportUtils.Constants.NORMATIVE_TYPE_HIGHEST_VERSION); assertEquals(resource.getVendorName(), ImportUtils.Constants.VENDOR_NAME); -- cgit 1.2.3-korg