1 files changed, 25 insertions, 26 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 cdde98dd36..7ac188b027 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
@@ -219,29 +219,29 @@ public class CatalogDatabase implements Closeable {
      * @param version
      * @return HeatTemplate object or null if none found
      */
-    public HeatTemplate getHeatTemplate (String templateName, String version) {
+    public HeatTemplate getHeatTemplate(String templateName, String version) {
 
-        long startTime = System.currentTimeMillis ();
-        LOGGER.debug ("Catalog database - get Heat template with name " + templateName
+        long startTime = System.currentTimeMillis();
+        LOGGER.debug("Catalog database - get Heat template with name " + templateName
                                       + " and version "
                                       + version);
 
         String hql = "FROM HeatTemplate WHERE templateName = :template_name AND version = :version";
-        Query query = getSession ().createQuery (hql);
-        query.setParameter ("template_name", templateName);
-        query.setParameter ("version", version);
+        Query query = getSession().createQuery(hql);
+        query.setParameter("template_name", templateName);
+        query.setParameter("version", version);
 
         @SuppressWarnings("unchecked")
-        List <HeatTemplate> resultList = query.list ();
+        List <HeatTemplate> resultList = query.list();
 
         // See if something came back.
-        if (resultList.isEmpty ()) {
-            LOGGER.recordMetricEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully. No template found.", "CatalogDB", "getHeatTemplate", null);
+        if (resultList.isEmpty()) {
+            LOGGER.recordMetricEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully. No template found.", "CatalogDB", "getHeatTemplate", null);
             return null;
         }
         // Name + Version is unique, so should only be one element
-        LOGGER.recordMetricEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully", "CatalogDB", "getHeatTemplate", null);
-        return resultList.get (0);
+        LOGGER.recordMetricEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully", "CatalogDB", "getHeatTemplate", null);
+        return resultList.get(0);
     }
 
     /**
@@ -266,10 +266,10 @@ public class CatalogDatabase implements Closeable {
      *
      * @param artifactUuid
      * @return HeatTemplate object or null if none found
-     */    
+     */
     public HeatTemplate getHeatTemplateByArtifactUuidRegularQuery(String artifactUuid) {
-       long startTime = System.currentTimeMillis ();
-        LOGGER.debug ("Catalog database - get Heat template (regular query) with artifactUuid " + artifactUuid);
+        long startTime = System.currentTimeMillis();
+        LOGGER.debug("Catalog database - get Heat template (regular query) with artifactUuid " + artifactUuid);
 
         String hql = "FROM HeatTemplate WHERE artifactUuid = :artifactUuidValue";
         HashMap<String, String> variables = new HashMap<>();
@@ -277,9 +277,9 @@ public class CatalogDatabase implements Closeable {
         HeatTemplate template = (HeatTemplate) this.executeQuerySingleRow(hql, variables, true);
 
         if (template == null) {
-        	LOGGER.recordMetricEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "NotFound", "CatalogDB", "getHeatTemplateByArtifactUuidRegularQuery", null);
+            LOGGER.recordMetricEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "NotFound", "CatalogDB", "getHeatTemplateByArtifactUuidRegularQuery", null);
         } else {
-        	LOGGER.recordMetricEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully", "CatalogDB", "getHeatTemplateByArtifactUuidRegularQuery", null);
+            LOGGER.recordMetricEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully", "CatalogDB", "getHeatTemplateByArtifactUuidRegularQuery", null);
         }
         return template;
     }
@@ -314,19 +314,18 @@ public class CatalogDatabase implements Closeable {
      * @return HeatEnvironment object or null if none found
      */    
     public HeatEnvironment getHeatEnvironmentByArtifactUuid(String artifactUuid) {
-        long startTime = System.currentTimeMillis ();
-        LOGGER.debug ("Catalog database - get Heat Environment with artifactUuid " + artifactUuid);
+        long startTime = System.currentTimeMillis();
+        LOGGER.debug("Catalog database - get Heat Environment with artifactUuid " + artifactUuid);
 
         String hql = "FROM HeatEnvironment WHERE artifactUuid = :artifactUuidValue";
         Query query = getSession().createQuery(hql);
-        query.setParameter ("artifactUuidValue", artifactUuid);
+        query.setParameter("artifactUuidValue", artifactUuid);
         HeatEnvironment environment = null;
         try {
-        	environment = (HeatEnvironment) query.uniqueResult ();
+            environment = (HeatEnvironment) query.uniqueResult();
         } catch (org.hibernate.NonUniqueResultException nure) {
         	LOGGER.debug("Non Unique Result Exception - the Catalog Database does not match a unique row for Envt - data integrity error: artifactUuid='" + artifactUuid +"'", nure);
         	LOGGER.error(MessageEnum.GENERAL_EXCEPTION, " non unique result for heatEnvironment artifactUuid=" + artifactUuid, "", "", MsoLogger.ErrorCode.DataError, "Non unique result for artifactUuid==" + artifactUuid);
-        	environment = null;
         } catch (org.hibernate.HibernateException he) {
         	LOGGER.debug("Hibernate Exception - while searching for envt: artifactUuid='" + artifactUuid + "' " + he.getMessage());
         	LOGGER.error(MessageEnum.GENERAL_EXCEPTION, " Hibernate exception searching envt for artifactUuid=" + artifactUuid, "", "", MsoLogger.ErrorCode.DataError, "Hibernate exception searching envt for artifactUuid=" + artifactUuid);
@@ -352,11 +351,11 @@ public class CatalogDatabase implements Closeable {
      */
     public Service getServiceByInvariantUUID (String modelInvariantUUID) {
 
-        long startTime = System.currentTimeMillis ();
-        LOGGER.debug ("Catalog database - get service with Invariant UUID " + modelInvariantUUID);
+        long startTime = System.currentTimeMillis();
+        LOGGER.debug("Catalog database - get service with Invariant UUID " + modelInvariantUUID);
 
         String hql = "FROM Service WHERE modelInvariantUUID = :model_invariant_uuid";
-        Query query = getSession ().createQuery (hql);
+        Query query = getSession().createQuery(hql);
         query.setParameter ("model_invariant_uuid", modelInvariantUUID);
 
         @SuppressWarnings("unchecked")
@@ -4880,7 +4879,7 @@ public class CatalogDatabase implements Closeable {
     }
     
     public < E > E executeQuerySingleRow(String hql, HashMap<String, String> variables, boolean retry) {
-        long startTime = System.currentTimeMillis ();
+        long startTime = System.currentTimeMillis();
         LOGGER.debug("Catalog database - executeQuery: " + hql + (retry ? ", retry=true" : ", retry=false"));
         Query query = getSession().createQuery(hql);
 
@@ -4895,7 +4894,7 @@ public class CatalogDatabase implements Closeable {
 
         E theObject = null;
         try {
-        	theObject = (E) query.uniqueResult ();
+            theObject = (E) query.uniqueResult();
         } catch (org.hibernate.NonUniqueResultException nure) {
         	LOGGER.debug("Non Unique Result Exception - the Catalog Database does not match a unique row");
         	LOGGER.error(MessageEnum.GENERAL_EXCEPTION, " non unique result for " + hql, "", "", MsoLogger.ErrorCode.DataError, "Non unique result for " + hql );