X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=adapters%2Fmso-catalog-db-adapter%2Fsrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fmso%2Fadapters%2Fcatalogdb%2Fcatalogrest%2FCatalogQuery.java;h=10d76f145b2cfabb67aa1d3722223a965ace75dd;hb=b6dc38501f3b746426b42d9de4cc883d894149e8;hp=6c7d584f6dcc8577dc01a6b6d801ad0772d3b838;hpb=1a0e37a9eccb9cd9d8e604a50fbd008ae7d9222b;p=so.git

diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/CatalogQuery.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/CatalogQuery.java
index 6c7d584f6d..10d76f145b 100644
--- a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/CatalogQuery.java
+++ b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/CatalogQuery.java
@@ -21,7 +21,7 @@
 package org.openecomp.mso.adapters.catalogdb.catalogrest;
 
 import org.openecomp.mso.logger.MsoLogger;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 import java.util.Map;
 import java.util.regex.Matcher;
@@ -46,21 +46,21 @@ public abstract class CatalogQuery {
 	}
 
 	protected String setTemplate(String template, Map<String, String> valueMap) {
-		LOGGER.debug ("CatalogQuery setTemplate");
+		LOGGER.debug("CatalogQuery setTemplate");
 		StringBuffer result = new StringBuffer();
 
 		String pattern = "<.*>";
 		Pattern r = Pattern.compile(pattern);
 		Matcher m = r.matcher(template);
 
-		LOGGER.debug ("CatalogQuery template:"+ template);
-		while(m.find()) {
-			String key = template.substring(m.start()+1, m.end()-1);
-			LOGGER.debug ("CatalogQuery key:"+ key+ " contains key? "+ valueMap.containsKey(key));
-	         m.appendReplacement(result, valueMap.containsKey(key)? valueMap.get(key): "\"TBD\"");
+		LOGGER.debug("CatalogQuery template:" + template);
+		while (m.find()) {
+			String key = template.substring(m.start() + 1, m.end() - 1);
+			LOGGER.debug("CatalogQuery key:" + key + " contains key? " + valueMap.containsKey(key));
+			m.appendReplacement(result, valueMap.getOrDefault(key, "\"TBD\""));
 		}
 		m.appendTail(result);
-                LOGGER.debug ("CatalogQuery return:"+ result.toString());
+		LOGGER.debug("CatalogQuery return:" + result.toString());
 		return result.toString();
 	}
 
@@ -86,7 +86,7 @@ public abstract class CatalogQuery {
 		case "v1": return smartToJSON();
 		case "v2": return JSON2(isArray, !IS_EMBED);
 		default:
-			return ("invalid version: "+ version);
+			return "invalid version: "+ version;
 		}
 	}
-}
\ No newline at end of file
+}