AT&T 1712 and 1802 release code

[so.git] / adapters / mso-catalog-db-adapter / src / main / java / org / openecomp / mso / adapters / catalogdb / catalogrest / CatalogQuery.java

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 6c7d584..10d76f1 100644 (file)
--- 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
+}