string map instead of object map #528

opencb · Feb 24, 2020 · 306d6c5 · 306d6c5
1 parent 781e09a
commit 306d6c5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 45 deletions.
diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/api/queries/AbstractQuery.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/api/queries/AbstractQuery.java
@@ -104,43 +104,6 @@ private Map<String, Class<?>> loadPropertiesMap() {
         return internalPropertiesMap;
     }
 
-//    @Deprecated
-//    public static <T> T of(Map<String, String> map, Class<T> clazz)
-//            throws NoSuchFieldException, IllegalAccessException, InstantiationException, InvocationTargetException {
-//        T query = clazz.newInstance();
-//        for (Map.Entry<String, String> entry : map.entrySet()) {
-//            String fieldName = entry.getKey();
-//            String value = entry.getValue();
-//            Field field = clazz.getField(fieldName);
-////            Method method = clazz.getMethod("set" + fieldName);
-//            if (fieldName.equals("region")) {
-////                method.invoke(Region.parseRegions()); ....
-//                List<Region> regions = Region.parseRegions(value);
-//                BeanUtils.setProperty(query, fieldName, regions);
-//            } else {
-//                switch (field.getType().toString()) {
-//                    case "Boolean":
-//                        Boolean bool = Boolean.parseBoolean(value);
-////                    method.invoke(bool);
-//                        BeanUtils.setProperty(query, fieldName, bool);
-//                        break;
-//                    case "Integer":
-//                        Integer intValue = Integer.parseInt(value);
-//                        BeanUtils.setProperty(query, fieldName, intValue);
-//                        break;
-//                    case "List":
-//                        List<String> valuesArray = Arrays.asList(value);
-//                        BeanUtils.setProperty(query, fieldName, valuesArray);
-//                        break;
-//                    default:
-//                        BeanUtils.setProperty(query, fieldName, value);
-//                        break;
-//                }
-//            }
-//        }
-//        return query;
-//    }
-
     /**
      * Checks if values for query are legal, e.g. >= 0 and <= MAX Checks the following parameters:
      *

diff --git a/cellbase-core/src/test/java/org/opencb/cellbase/core/GeneQueryTest.java b/cellbase-core/src/test/java/org/opencb/cellbase/core/GeneQueryTest.java
@@ -21,8 +21,7 @@
 import org.opencb.biodata.models.core.Region;
 import org.opencb.cellbase.core.api.queries.GeneQuery;
 
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 import static org.junit.Assert.*;
 
@@ -44,7 +43,6 @@ public void testQuery() {
         paramMap.put("annotationDrugsGene", "x,y");
         paramMap.put("xxx", "");
 
-//        geneQuery.updateParams(paramMap);
         geneQuery = new GeneQuery(paramMap);
         assertEquals("1", geneQuery.getIds().get(0));
 
@@ -114,4 +112,5 @@ public void testCount() {
         geneQuery.updateParams(paramMap);
         assertFalse(geneQuery.getCount());
     }
+
 }
diff --git a/cellbase-server/src/main/java/org/opencb/cellbase/server/rest/GenericRestWSServer.java b/cellbase-server/src/main/java/org/opencb/cellbase/server/rest/GenericRestWSServer.java
@@ -70,7 +70,7 @@ public class GenericRestWSServer implements IWSServer {
     protected Query query;
     protected QueryOptions queryOptions;
     protected ObjectMap params;
-    protected Map<String, Object> uriParams;
+    protected Map<String, String> uriParams;
     protected UriInfo uriInfo;
     protected HttpServletRequest httpServletRequest;
     protected ObjectMapper jsonObjectMapper;
@@ -173,8 +173,8 @@ private void checkVersion() throws VersionException {
         }
     }
 
-    public Map<String, Object> convertMultiToMap(MultivaluedMap<String, String> m) {
-        Map<String, Object> map = new HashMap<String, Object>();
+    public Map<String, String> convertMultiToMap(MultivaluedMap<String, String> m) {
+        Map<String, String> map = new HashMap<String, String>();
         if (m == null) {
             return map;
         }

diff --git a/cellbase-server/src/main/java/org/opencb/cellbase/server/rest/feature/GeneWSServer.java b/cellbase-server/src/main/java/org/opencb/cellbase/server/rest/feature/GeneWSServer.java
@@ -307,8 +307,7 @@ public Response getAggregationStats(@DefaultValue("") @QueryParam("fields")
                     required = false, defaultValue = "0", dataType = "java.util.List", paramType = "query")
     })
     public Response getAll() throws CellbaseException {
-        GeneQuery geneQuery = new GeneQuery();
-        geneQuery.updateParams(uriParams);
+        GeneQuery geneQuery = new GeneQuery(uriParams);
         CellBaseDataResult<Gene> queryResults = geneManager.search(geneQuery);
         return createOkResponse(queryResults);
     }