From becadde04b85e4d4c7df4a7e957fcff8aa8448a8 Mon Sep 17 00:00:00 2001 From: subhash kumar singh Date: Mon, 15 Jan 2018 12:12:09 +0000 Subject: Improve test case for catalog database Improve test case for catalog database. Change-Id: I9938ca12edf2927368a79bffc21b199651f77879 Issue-ID: SO-360 Signed-off-by: subhash kumar singh --- .../main/java/org/openecomp/mso/db/catalog/CatalogDatabase.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'mso-catalog-db/src/main/java') 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 926c48302f..e7491b7ec7 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 @@ -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); -- cgit 1.2.3-korg