aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/CatalogDbAdapterRest.java (renamed from adapters/mso-catalog-db-adapter/src/main/java/org.openecomp.mso/adapters/catalogdb/CatalogDbAdapterRest.java)44
-rw-r--r--asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/VfResourceInstaller.java3
-rw-r--r--status-control/src/main/java/org/openecomp/mso/HealthCheckUtils.java4
3 files changed, 24 insertions, 27 deletions
diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org.openecomp.mso/adapters/catalogdb/CatalogDbAdapterRest.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/CatalogDbAdapterRest.java
index 729aaa0..210e5e7 100644
--- a/adapters/mso-catalog-db-adapter/src/main/java/org.openecomp.mso/adapters/catalogdb/CatalogDbAdapterRest.java
+++ b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/CatalogDbAdapterRest.java
@@ -124,37 +124,37 @@ public class CatalogDbAdapterRest {
String uuid = "";
List<VnfResource> ret;
- try {
+ try (CatalogDatabase db = new CatalogDatabase()) {
if (vnfUuid != null && !vnfUuid.equals("")) {
uuid = vnfUuid;
LOGGER.debug ("Query serviceVnfs getAllVnfsByVnfModelCustomizationUuid vnfModelCustomizationUuid: " + uuid);
- ret = (new CatalogDatabase ()).getAllVnfsByVnfModelCustomizationUuid(uuid);
+ ret = db.getAllVnfsByVnfModelCustomizationUuid(uuid);
}
else if (smUuid != null && !smUuid.equals("")) {
uuid = smUuid;
LOGGER.debug ("Query serviceVnfs getAllVnfsByServiceModelUuid serviceModelUuid: " + uuid);
- ret = (new CatalogDatabase ()).getAllVnfsByServiceModelUuid(uuid);
+ ret = db.getAllVnfsByServiceModelUuid(uuid);
}
else if (smiUuid != null && !smiUuid.equals("")) {
uuid = smiUuid;
if (smVer != null && !smVer.equals("")) {
LOGGER.debug ("Query serviceVnfs getAllNetworksByServiceModelInvariantUuid serviceModelInvariantUuid: " + uuid+ " serviceModelVersion: "+ smVer);
- ret = (new CatalogDatabase ()).getAllVnfsByServiceModelInvariantUuid(uuid, smVer);
+ ret = db.getAllVnfsByServiceModelInvariantUuid(uuid, smVer);
}
else {
LOGGER.debug ("Query serviceVnfs getAllNetworksByServiceModelInvariantUuid serviceModelUuid: " + uuid);
- ret = (new CatalogDatabase ()).getAllVnfsByServiceModelInvariantUuid(uuid);
+ ret = db.getAllVnfsByServiceModelInvariantUuid(uuid);
}
}
else if (smName != null && !smName.equals("")) {
if (smVer != null && !smVer.equals("")) {
LOGGER.debug ("Query serviceVnfs getAllVnfsByServiceName serviceModelInvariantName: " + smName+ " serviceModelVersion: "+ smVer);
- ret = (new CatalogDatabase ()).getAllVnfsByServiceName(smName, smVer);
+ ret = db.getAllVnfsByServiceName(smName, smVer);
}
else {
LOGGER.debug ("Query serviceVnfs getAllVnfsByServiceName serviceModelName: " + smName);
- ret = (new CatalogDatabase ()).getAllVnfsByServiceName(smName);
+ ret = db.getAllVnfsByServiceName(smName);
}
}
else {
@@ -203,31 +203,31 @@ public class CatalogDbAdapterRest {
String uuid = "";
List<NetworkResourceCustomization> ret;
- try {
+ try (CatalogDatabase db = new CatalogDatabase()) {
if (nUuid != null && !nUuid.equals("")) {
uuid = nUuid;
LOGGER.debug ("Query serviceNetworks getAllNetworksByNetworkModelCustomizationUuid networkModelCustomizationUuid: " + uuid);
- ret = (new CatalogDatabase ()).getAllNetworksByNetworkModelCustomizationUuid(uuid);
+ ret = db.getAllNetworksByNetworkModelCustomizationUuid(uuid);
}
else if (smUuid != null && !smUuid.equals("")) {
uuid = smUuid;
LOGGER.debug ("Query serviceNetworks getAllNetworksByServiceModelUuid serviceModelUuid: " + uuid);
- ret = (new CatalogDatabase ()).getAllNetworksByServiceModelUuid(uuid);
+ ret = db.getAllNetworksByServiceModelUuid(uuid);
}
else if (nType != null && !nType.equals("")) {
uuid = nType;
LOGGER.debug ("Query serviceNetworks getAllNetworksByNetworkType serviceModelUuid: " + uuid);
- ret = (new CatalogDatabase ()).getAllNetworksByNetworkType(uuid);
+ ret = db.getAllNetworksByNetworkType(uuid);
}
else if (smiUuid != null && !smiUuid.equals("")) {
uuid = smiUuid;
if (smVer != null && !smVer.equals("")) {
LOGGER.debug ("Query serviceNetworks getAllNetworksByServiceModelInvariantUuid serviceModelInvariantUuid: " + uuid+ " serviceModelVersion: "+ smVer);
- ret = (new CatalogDatabase ()).getAllNetworksByServiceModelInvariantUuid(uuid, smVer);
+ ret = db.getAllNetworksByServiceModelInvariantUuid(uuid, smVer);
}
else {
LOGGER.debug ("Query serviceNetworks getAllNetworksByServiceModelInvariantUuid serviceModelUuid: " + uuid);
- ret = (new CatalogDatabase ()).getAllNetworksByServiceModelInvariantUuid(uuid);
+ ret = db.getAllNetworksByServiceModelInvariantUuid(uuid);
}
}
else {
@@ -274,22 +274,22 @@ public class CatalogDbAdapterRest {
String uuid = "";
ServiceMacroHolder ret;
- try {
+ try (CatalogDatabase db = new CatalogDatabase()) {
if (smUuid != null && !smUuid.equals("")) {
uuid = smUuid;
LOGGER.debug ("Query serviceMacroHolder getAllResourcesByServiceModelUuid serviceModelUuid: " + uuid);
- ret = (new CatalogDatabase ()).getAllResourcesByServiceModelUuid(uuid);
+ ret = db.getAllResourcesByServiceModelUuid(uuid);
}
else if (smiUuid != null && !smiUuid.equals("")) {
uuid = smiUuid;
if (smVer != null && !smVer.equals("")) {
LOGGER.debug ("Query serviceMacroHolder getAllResourcesByServiceModelInvariantUuid serviceModelInvariantUuid: " + uuid+ " serviceModelVersion: "+ smVer);
- ret = (new CatalogDatabase ()).getAllResourcesByServiceModelInvariantUuid(uuid, smVer);
+ ret = db.getAllResourcesByServiceModelInvariantUuid(uuid, smVer);
}
else {
LOGGER.debug ("Query serviceMacroHolder getAllResourcesByServiceModelInvariantUuid serviceModelUuid: " + uuid);
- ret = (new CatalogDatabase ()).getAllResourcesByServiceModelInvariantUuid(uuid);
+ ret = db.getAllResourcesByServiceModelInvariantUuid(uuid);
}
}
else {
@@ -337,28 +337,28 @@ public class CatalogDbAdapterRest {
String uuid = "";
List<AllottedResourceCustomization > ret;
- try {
+ try (CatalogDatabase db = new CatalogDatabase()) {
if (smUuid != null && !smUuid.equals("")) {
uuid = smUuid;
LOGGER.debug ("Query AllottedResourceCustomization getAllAllottedResourcesByServiceModelUuid serviceModelUuid: " + uuid);
- ret = (new CatalogDatabase ()).getAllAllottedResourcesByServiceModelUuid(uuid);
+ ret = db.getAllAllottedResourcesByServiceModelUuid(uuid);
}
else if (smiUuid != null && !smiUuid.equals("")) {
uuid = smiUuid;
if (smVer != null && !smVer.equals("")) {
LOGGER.debug ("Query AllottedResourceCustomization getAllAllottedResourcesByServiceModelInvariantUuid serviceModelInvariantUuid: " + uuid+ " serviceModelVersion: "+ smVer);
- ret = (new CatalogDatabase ()).getAllAllottedResourcesByServiceModelInvariantUuid(uuid, smVer);
+ ret = db.getAllAllottedResourcesByServiceModelInvariantUuid(uuid, smVer);
}
else {
LOGGER.debug ("Query AllottedResourceCustomization getAllAllottedResourcesByServiceModelInvariantUuid serviceModelUuid: " + uuid);
- ret = (new CatalogDatabase ()).getAllAllottedResourcesByServiceModelInvariantUuid(uuid);
+ ret = db.getAllAllottedResourcesByServiceModelInvariantUuid(uuid);
}
}
else if (aUuid != null && !aUuid.equals("")) {
uuid = aUuid;
LOGGER.debug ("Query AllottedResourceCustomization getAllAllottedResourcesByArModelCustomizationUuid serviceModelUuid: " + uuid);
- ret = (new CatalogDatabase ()).getAllAllottedResourcesByArModelCustomizationUuid(uuid);
+ ret = db.getAllAllottedResourcesByArModelCustomizationUuid(uuid);
}
else {
throw(new Exception("no matching parameters"));
diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/VfResourceInstaller.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/VfResourceInstaller.java
index 114f6f2..e2ed1a3 100644
--- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/VfResourceInstaller.java
+++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/VfResourceInstaller.java
@@ -69,11 +69,10 @@ public class VfResourceInstaller implements IVfResourceInstaller {
public boolean isResourceAlreadyDeployed(VfResourceStructure vfResourceStruct)
throws ArtifactInstallerException {
- CatalogDatabase db = new CatalogDatabase();
boolean status = false;
VfResourceStructure vfResourceStructure = (VfResourceStructure)vfResourceStruct;
- try {
+ try(CatalogDatabase db = new CatalogDatabase()) {
String resourceType = vfResourceStruct.getResourceInstance().getResourceType();
String category = vfResourceStruct.getResourceInstance().getCategory();
diff --git a/status-control/src/main/java/org/openecomp/mso/HealthCheckUtils.java b/status-control/src/main/java/org/openecomp/mso/HealthCheckUtils.java
index e0e712c..cd8cc7f 100644
--- a/status-control/src/main/java/org/openecomp/mso/HealthCheckUtils.java
+++ b/status-control/src/main/java/org/openecomp/mso/HealthCheckUtils.java
@@ -62,10 +62,8 @@ public class HealthCheckUtils {
public enum NodeType {APIH, RA, BPMN};
public boolean catalogDBCheck (MsoLogger subMsoLogger, long startTime) {
- try {
- CatalogDatabase catalogDB = new CatalogDatabase ();
+ try(CatalogDatabase catalogDB = new CatalogDatabase ()) {
catalogDB.healthCheck ();
- catalogDB.close();
} catch (Exception e) {
subMsoLogger.error(MessageEnum.GENERAL_EXCEPTION, "", "HealthCheck", MsoLogger.ErrorCode.DataError, "Failed to check catalog database", e);
subMsoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.ERROR, MsoLogger.ResponseCode.DBAccessError, "Exception during healthcheck");