1 files changed, 13 insertions, 4 deletions
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/IdNameSql.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/IdNameSql.java
index 8d2cabcc..1ef28a26 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/IdNameSql.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/IdNameSql.java
@@ -62,13 +62,25 @@ import org.onap.portalsdk.analytics.system.ConnectionUtils;
 import org.onap.portalsdk.analytics.system.Globals;
 import org.onap.portalsdk.analytics.util.AppConstants;
 import org.onap.portalsdk.analytics.util.DataSet;
+import org.onap.portalsdk.analytics.util.RemDbInfo;
 import org.onap.portalsdk.analytics.util.Utils;
 import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
+@Component
 public class IdNameSql extends IdNameList {
     
 	private static final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(IdNameSql.class);
     
+	private static RemDbInfo remDbInfo;
+	
+	@SuppressWarnings("static-access")
+	@Autowired
+    public void setRemDbInfo(RemDbInfo remDbInfo) {
+		this.remDbInfo = remDbInfo;
+	}
+
 	protected int dataSize = -1;
 	
 	protected int dataSizeUsedInPopup = -1;
@@ -202,7 +214,6 @@ public class IdNameSql extends IdNameList {
 		 String dbType = Globals.getDBType();
 		if (!isNull(dbInfo) && (!dbInfo.equals(AppConstants.DB_LOCAL))) {
 			try {
-			 org.onap.portalsdk.analytics.util.RemDbInfo remDbInfo = new org.onap.portalsdk.analytics.util.RemDbInfo();
 			 dbType = remDbInfo.getDBType(dbInfo);	
 			} catch (Exception ex) {
 		           throw new RaptorException(ex);		    	
@@ -242,9 +253,7 @@ public class IdNameSql extends IdNameList {
 	        	
 	        }
 	        if(searchString!=null && searchString.length()>0 && !searchString.equals("%")) {
-		        if(pageNo == -2){
-					query.append(" WHERE ");
-				}
+		        if(pageNo == -2) query.append(" WHERE ");
 		        else query.append(" and ");
 	            query.append("name like '"+ searchString +"'");
 	        }