Merge pull request #20 from Appdynamics/sql_config_map_issue

Fix ClassCastException in ColumnGenerator causing queries to silently fail

Author: sanketmehta28

src/main/java/com/appdynamics/extensions/sql/ColumnGenerator.java

@@ -9,37 +9,22 @@
 
 import com.appdynamics.extensions.util.AssertUtils;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Strings;
 import com.google.common.collect.Maps;
 
 import java.util.List;
 import java.util.Map;
 
-/**
- * Created by bhuvnesh.kumar on 10/5/17.
- */
 public class ColumnGenerator {
 
     public List<Column> getColumns(Map query) {
-        AssertUtils.assertNotNull(query.get("columns"),"Queries need to have columns configured.");
-
-        Map<String, Map<String, String>> filter = Maps.newLinkedHashMap();
-        filter = filterMap(query, "columns");
-        final ObjectMapper mapper = new ObjectMapper(); // jackson’s objectmapper
-        final Columns columns = mapper.convertValue(filter, Columns.class);
-        return columns.getColumns();
-    }
+        Object columnsObj = query.get("columns");
+        AssertUtils.assertNotNull(columnsObj, "Queries need to have columns configured.");
 
-    private Map<String, Map<String, String>> filterMap( Map<String, Map<String, String>> mapOfMaps, String filterKey) {
-        Map<String, Map<String, String>> filteredOnKeyMap = Maps.newLinkedHashMap();
+        Map<String, Object> wrapper = Maps.newLinkedHashMap();
+        wrapper.put("columns", columnsObj);
 
-        if (Strings.isNullOrEmpty(filterKey))
-            return filteredOnKeyMap;
-
-        if (mapOfMaps.containsKey(filterKey)) {
-            filteredOnKeyMap.put(filterKey,mapOfMaps.get(filterKey));
-        }
-
-        return filteredOnKeyMap;
+        final ObjectMapper mapper = new ObjectMapper();
+        final Columns columns = mapper.convertValue(wrapper, Columns.class);
+        return columns.getColumns();
     }
 }