appc-dg-common sonar fixes part 2

[appc.git] / appc-dg / appc-dg-shared / appc-dg-common / src / main / java / org / onap / appc / dg / common / impl / Constants.java

diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/onap/appc/dg/common/impl/Constants.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/onap/appc/dg/common/impl/Constants.java
index 9009f3c..1e62dcc 100644 (file)
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/onap/appc/dg/common/impl/Constants.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/onap/appc/dg/common/impl/Constants.java
@@ -52,12 +52,31 @@ class Constants {
     public static final String CVAAS_FILE_NAME = "cvaas-file-name";
     public static final String CVAAS_FILE_CONTENT = "cvaas-file-content";
 
+    // DG Resolver Constants
+    public static final String IN_PARAM_VNF_TYPE = "vnfType";
+    public static final String IN_PARAM_VNFC_TYPE = "vnfcType";
+    public static final String IN_PARAM_ACTION = "action";
+    public static final String IN_PARAM_API_VERSION = "api-ver";
+
+    public static final String OUT_PARAM_DG_NAME = "dg_name";
+    public static final String OUT_PARAM_DG_VERSION = "dg_version";
+    public static final String OUT_PARAM_DG_MODULE = "dg_module";
+
+    public static final String TABLE_NAME = "VNFC_DG_MAPPING";
+    public static final String TABLE_COLUMN_VNF_TYPE = "VNF_TYPE";
+    public static final String TABLE_COLUMN_VNFC_TYPE = "VNFC_TYPE";
+    public static final String TABLE_COLUMN_ACTION = "ACTION";
+    public static final String TABLE_COLUMN_API_VERSION = "API_VERSION";
+    public static final String TABLE_COLUMN_DG_NAME = "DG_NAME";
+    public static final String TABLE_COLUMN_DG_VERSION = "DG_VERSION";
+    public static final String TABLE_COLUMN_DG_MODULE = "DG_MODULE";
+
     enum LegacyAttributes {
-        Action("org.onap.appc.action"),
+        ACTION("org.onap.appc.action"),
         VMID("org.onap.appc.vmid"),
-        IdentityURL("org.onap.appc.identity.url"),
-        TenantID("org.onap.appc.tenant.id"),
-        SkipHypervisorCheck("org.onap.appc.skiphypervisorcheck");
+        IDENTITY_URL("org.onap.appc.identity.url"),
+        TENANT_ID("org.onap.appc.tenant.id"),
+        SKIP_HYPERVISOR_CHECK("org.onap.appc.skiphypervisorcheck");
 
         private String value;
 
@@ -70,15 +89,13 @@ class Constants {
         }
     }
 
-    ;
-
     enum LCMAttributes {
-        Action("input.action"),
-        Payload("input.payload"),
+        ACTION("input.action"),
+        PAYLOAD("input.payload"),
         VMID("vm-id"),
-        IdentityURL("identity-url"),
-        TenantID("tenant.id"),
-        SkipHypervisorCheck("skip-hypervisor-check");
+        IDENTITY_URL("identity-url"),
+        TENANT_ID("tenant.id"),
+        SKIP_HYPERVISOR_CHECK("skip-hypervisor-check");
 
         private String value;
 
@@ -90,25 +107,4 @@ class Constants {
             return value;
         }
     }
-
-    ;
-
-    // DG Resolver Constants
-    public static final String IN_PARAM_VNF_TYPE = "vnfType";
-    public static final String IN_PARAM_VNFC_TYPE = "vnfcType";
-    public static final String IN_PARAM_ACTION = "action";
-    public static final String IN_PARAM_API_VERSION = "api-ver";
-
-    public static final String OUT_PARAM_DG_NAME = "dg_name";
-    public static final String OUT_PARAM_DG_VERSION = "dg_version";
-    public static final String OUT_PARAM_DG_MODULE = "dg_module";
-
-    public static final String TABLE_NAME = "VNFC_DG_MAPPING";
-    public static final String TABLE_COLUMN_VNF_TYPE = "VNF_TYPE";
-    public static final String TABLE_COLUMN_VNFC_TYPE = "VNFC_TYPE";
-    public static final String TABLE_COLUMN_ACTION = "ACTION";
-    public static final String TABLE_COLUMN_API_VERSION = "API_VERSION";
-    public static final String TABLE_COLUMN_DG_NAME = "DG_NAME";
-    public static final String TABLE_COLUMN_DG_VERSION = "DG_VERSION";
-    public static final String TABLE_COLUMN_DG_MODULE = "DG_MODULE";
 }