aboutsummaryrefslogtreecommitdiffstats
path: root/mso-catalog-db/src/main/java
diff options
context:
space:
mode:
authorPraneta Paithankar <praneta.paithankar@intel.com>2018-06-11 04:42:03 -0700
committerPraneta Paithankar <praneta.paithankar@intel.com>2018-06-11 04:45:13 -0700
commita2c1fbdc59c7be3f8c818de371ae9d3d70f8ea9f (patch)
tree668fe4a104e6fef28cdbc20660c916f0ffcca457 /mso-catalog-db/src/main/java
parent9fc4e5d1d60396c23ccd0915a99d046d82665cc6 (diff)
Define constant instead of literal getVnfRecipe
Constant GET_VNF_RECIPE is defined and used instead of duplicating literal "getVnfRecipe". Issue-ID: SO-666 Change-Id: Ia82aa03dd6381c7d70942f718c35d39a36e6ea25 Signed-off-by: Praneta Paithankar <praneta.paithankar@intel.com>
Diffstat (limited to 'mso-catalog-db/src/main/java')
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/CatalogDatabase.java20
1 files changed, 11 insertions, 9 deletions
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/CatalogDatabase.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/CatalogDatabase.java
index 98f5329687..1ef1313158 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/CatalogDatabase.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/CatalogDatabase.java
@@ -96,7 +96,8 @@ public class CatalogDatabase implements Closeable {
private static final String VF_MODULE_MODEL_UUID = "vfModuleModelUUId";
private static final String NETWORK_SERVICE = "network service";
private static final String TEMPLATE_NAME = "template_name";
-
+ private static final String GET_VNF_RECIPE = "getVnfRecipe";
+
protected static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.GENERAL);
protected Session session = null;
@@ -124,6 +125,7 @@ public class CatalogDatabase implements Closeable {
return session;
}
+
/**
* Close an open Catalog Database session.
* This method should always be called when a client is finished using a
@@ -1122,14 +1124,14 @@ public class CatalogDatabase implements Closeable {
List <VnfRecipe> resultList = query.list();
if (resultList.isEmpty()) {
- LOGGER.recordMetricEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully. VNF recipe not found", "CatalogDB", "getVnfRecipe", null);
+ LOGGER.recordMetricEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully. VNF recipe not found", "CatalogDB", GET_VNF_RECIPE, null);
return null;
}
resultList.sort(new MavenLikeVersioningComparator());
Collections.reverse(resultList);
- LOGGER.recordMetricEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully", "CatalogDB", "getVnfRecipe", null);
+ LOGGER.recordMetricEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully", "CatalogDB", GET_VNF_RECIPE, null);
return resultList.get(0);
}
@@ -1157,14 +1159,14 @@ public class CatalogDatabase implements Closeable {
List <VnfRecipe> resultList = query.list();
if (resultList.isEmpty()) {
- LOGGER.recordMetricEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully. VNF recipe not found", "CatalogDB", "getVnfRecipe", null);
+ LOGGER.recordMetricEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully. VNF recipe not found", "CatalogDB", GET_VNF_RECIPE, null);
return null;
}
resultList.sort(new MavenLikeVersioningComparator());
Collections.reverse(resultList);
- LOGGER.recordMetricEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully", "CatalogDB", "getVnfRecipe", null);
+ LOGGER.recordMetricEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully", "CatalogDB", GET_VNF_RECIPE, null);
return resultList.get(0);
}
@@ -1190,14 +1192,14 @@ public class CatalogDatabase implements Closeable {
List <VnfRecipe> resultList = query.list();
if (resultList.isEmpty()) {
- LOGGER.recordMetricEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully. VNF recipe not found", "CatalogDB", "getVnfRecipe", null);
+ LOGGER.recordMetricEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully. VNF recipe not found", "CatalogDB", GET_VNF_RECIPE, null);
return null;
}
resultList.sort(new MavenLikeVersioningComparator());
Collections.reverse(resultList);
- LOGGER.recordMetricEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully", "CatalogDB", "getVnfRecipe", null);
+ LOGGER.recordMetricEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully", "CatalogDB", GET_VNF_RECIPE, null);
return resultList.get(0);
}
@@ -1238,11 +1240,11 @@ public class CatalogDatabase implements Closeable {
List <VnfRecipe> resultList = query.list();
if (resultList.isEmpty()) {
- LOGGER.recordMetricEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully. VNF recipe not found", "CatalogDB", "getVnfRecipe", null);
+ LOGGER.recordMetricEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully. VNF recipe not found", "CatalogDB", GET_VNF_RECIPE, null);
return null;
}
- LOGGER.recordMetricEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully", "CatalogDB", "getVnfRecipe", null);
+ LOGGER.recordMetricEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully", "CatalogDB", GET_VNF_RECIPE, null);
return resultList.get(0);
}