Merge remote branch 'vd/master'

clients/java/src/main/java/com/senseidb/search/client/json/BQLException.java → clients/java/src/main/java/com/senseidb/search/client/BQLException.java

@@ -1,4 +1,4 @@
-package com.senseidb.search.client.json;
+package com.senseidb.search.client;
 
 public class BQLException extends Exception {
   private static final long serialVersionUID = 1L;

clients/java/src/main/java/com/senseidb/search/client/json/ReflectionUtil.java → clients/java/src/main/java/com/senseidb/search/client/ReflectionUtil.java

@@ -1,4 +1,4 @@
-package com.senseidb.search.client.json;
+package com.senseidb.search.client;
 
 import java.lang.annotation.Annotation;
 import java.util.Arrays;

clients/java/src/main/java/com/senseidb/search/client/json/SenseiServiceProxy.java → clients/java/src/main/java/com/senseidb/search/client/SenseiServiceProxy.java

@@ -1,4 +1,4 @@
-package com.senseidb.search.client.json;
+package com.senseidb.search.client;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -21,8 +21,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.senseidb.search.client.json.req.SenseiClientRequest;
-import com.senseidb.search.client.json.res.SenseiResult;
+import com.senseidb.search.client.json.JsonDeserializer;
+import com.senseidb.search.client.json.JsonSerializer;
+import com.senseidb.search.client.req.SenseiClientRequest;
+import com.senseidb.search.client.res.SenseiResult;
 public class SenseiServiceProxy {
  // private static Logger LOG = LoggerFactory.getLogger(SenseiServiceProxy.class);
 
@@ -183,11 +185,12 @@ public String sendPostRaw(String urlStr, String requestStr,Map<String,String> he
           if (LOG.isDebugEnabled()){
             LOG.debug("The request is - " + requestStr);
           }*/
-          URL url = new URL(urlStr);
+
+           URL url = new URL(urlStr);
            conn = (HttpURLConnection) url.openConnection();
           conn.setDoOutput(true);
           conn.setRequestMethod("POST");
-          conn.setRequestProperty("Content-Type", "application/json; charset=utf-8");
+         // conn.setRequestProperty("Content-Type", "application/json; charset=utf-8");
 
           conn.setRequestProperty("Accept-Encoding", "gzip");
 

clients/java/src/main/java/com/senseidb/search/client/Test.java

@@ -0,0 +1,22 @@
+package com.senseidb.search.client;
+
+import org.json.JSONObject;
+
+import com.senseidb.search.client.json.JsonSerializer;
+import com.senseidb.search.client.req.Facet;
+import com.senseidb.search.client.req.Selection;
+import com.senseidb.search.client.req.SenseiClientRequest;
+
+public class Test {
+  public static void main(String[] args) throws Exception {
+    SenseiServiceProxy senseiServiceProxy = new SenseiServiceProxy("localhost", 8080);
+    //SenseiClientRequest clientRequest = SenseiClientRequest.builder().addFacet("account_id", Facet.builder().minHit(0).max(200).build()).build();
+    SenseiClientRequest clientRequest = SenseiClientRequest.builder().filter(Selection.terms("account_id", "1139")).paging(1000, 10).addFacet("account_id", Facet.builder().minHit(0).max(200).build()).build();
+
+
+    JSONObject json = (JSONObject) JsonSerializer.serialize(clientRequest);
+    JSONObject mapReduce = new JSONObject().put("function", "sensei.distinctCount").put("parameters", new JSONObject().put("column", "account_id"));
+    json.put("mapReduce", mapReduce);
+    System.out.println(new JSONObject(senseiServiceProxy.sendPostRaw(senseiServiceProxy.getSearchUrl(), json.toString())).toString(1));
+  }
+}

clients/java/src/main/java/com/senseidb/search/client/json/JsonDeserializer.java

@@ -12,6 +12,8 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import com.senseidb.search.client.ReflectionUtil;
+
 public class JsonDeserializer {
     public static <T> T deserialize(Class<T> cls, JSONObject jsonObject) {
         return deserialize(cls, jsonObject, true);

clients/java/src/main/java/com/senseidb/search/client/json/JsonSerializer.java

@@ -13,6 +13,8 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import com.senseidb.search.client.ReflectionUtil;
+
 public class JsonSerializer {
     public static Object serialize(Object object) {
         try {

clients/java/src/main/java/com/senseidb/search/client/json/req/Facet.java → clients/java/src/main/java/com/senseidb/search/client/req/Facet.java

@@ -1,4 +1,4 @@
-package com.senseidb.search.client.json.req;
+package com.senseidb.search.client.req;
 
 import java.util.HashMap;
 import java.util.Map;

clients/java/src/main/java/com/senseidb/search/client/json/req/FacetInit.java → clients/java/src/main/java/com/senseidb/search/client/req/FacetInit.java

@@ -1,4 +1,4 @@
-package com.senseidb.search.client.json.req;
+package com.senseidb.search.client.req;
 
 import java.util.Arrays;
 import java.util.List;

clients/java/src/main/java/com/senseidb/search/client/json/req/FacetType.java → clients/java/src/main/java/com/senseidb/search/client/req/FacetType.java

@@ -1,4 +1,4 @@
-package com.senseidb.search.client.json.req;
+package com.senseidb.search.client.req;
 
 public enum FacetType {
    type_int, type_long, type_double, type_float, type_short, type_string;

clients/java/src/main/java/com/senseidb/search/client/json/req/GroupBy.java → clients/java/src/main/java/com/senseidb/search/client/req/GroupBy.java

@@ -1,4 +1,4 @@
-package com.senseidb.search.client.json.req;
+package com.senseidb.search.client.req;
 
 import java.util.List;
 

clients/java/src/main/java/com/senseidb/search/client/json/req/MapReduce.java → clients/java/src/main/java/com/senseidb/search/client/req/MapReduce.java

@@ -1,4 +1,4 @@
-package com.senseidb.search.client.json.req;
+package com.senseidb.search.client.req;
 
 
 import java.util.Map;

clients/java/src/main/java/com/senseidb/search/client/req/Operator.java

@@ -0,0 +1,3 @@
+package com.senseidb.search.client.req;
+
+public enum Operator{and, or;}

clients/java/src/main/java/com/senseidb/search/client/json/req/Paging.java → clients/java/src/main/java/com/senseidb/search/client/req/Paging.java

@@ -1,4 +1,4 @@
-package com.senseidb.search.client.json.req;
+package com.senseidb.search.client.req;
 
 /**
  * Represents result pagination.

clients/java/src/main/java/com/senseidb/search/client/json/req/Path.java → clients/java/src/main/java/com/senseidb/search/client/req/Path.java

@@ -1,4 +1,4 @@
-package com.senseidb.search.client.json.req;
+package com.senseidb.search.client.req;
 
 public class Path extends Selection {
 

clients/java/src/main/java/com/senseidb/search/client/json/req/Range.java → clients/java/src/main/java/com/senseidb/search/client/req/Range.java

@@ -1,7 +1,7 @@
-package com.senseidb.search.client.json.req;
+package com.senseidb.search.client.req;
 
 import com.senseidb.search.client.json.JsonField;
-import com.senseidb.search.client.json.req.query.Query;
+import com.senseidb.search.client.req.query.Query;
 
 /**
  * <p>

clients/java/src/main/java/com/senseidb/search/client/json/req/RequestMetadata.java → clients/java/src/main/java/com/senseidb/search/client/req/RequestMetadata.java

@@ -1,4 +1,4 @@
-package com.senseidb.search.client.json.req;
+package com.senseidb.search.client.req;
 
 import java.util.List;
 

clients/java/src/main/java/com/senseidb/search/client/json/req/Selection.java → clients/java/src/main/java/com/senseidb/search/client/req/Selection.java

@@ -1,4 +1,4 @@
-package com.senseidb.search.client.json.req;
+package com.senseidb.search.client.req;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -7,8 +7,8 @@
 import org.json.JSONObject;
 
 import com.senseidb.search.client.json.CustomJsonHandler;
-import com.senseidb.search.client.json.req.filter.Filter;
-import com.senseidb.search.client.json.req.query.Query;
+import com.senseidb.search.client.req.filter.Filter;
+import com.senseidb.search.client.req.query.Query;
 
 @CustomJsonHandler(SelectionJsonHandler.class)
 public abstract class Selection extends Query {

clients/java/src/main/java/com/senseidb/search/client/json/req/SelectionJsonHandler.java → clients/java/src/main/java/com/senseidb/search/client/req/SelectionJsonHandler.java

@@ -1,4 +1,4 @@
-package com.senseidb.search.client.json.req;
+package com.senseidb.search.client.req;
 
 import java.util.Arrays;
 import java.util.HashMap;

clients/java/src/main/java/com/senseidb/search/client/json/req/SenseiClientRequest.java → clients/java/src/main/java/com/senseidb/search/client/req/SenseiClientRequest.java

@@ -1,4 +1,4 @@
-package com.senseidb.search.client.json.req;
+package com.senseidb.search.client.req;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -11,11 +11,11 @@
 
 import com.senseidb.search.client.json.CustomJsonHandler;
 import com.senseidb.search.client.json.JsonField;
-import com.senseidb.search.client.json.req.filter.Filter;
-import com.senseidb.search.client.json.req.filter.FilterJsonHandler;
-import com.senseidb.search.client.json.req.query.Query;
-import com.senseidb.search.client.json.req.query.QueryJsonHandler;
-import com.senseidb.search.client.json.req.relevance.Relevance;
+import com.senseidb.search.client.req.filter.Filter;
+import com.senseidb.search.client.req.filter.FilterJsonHandler;
+import com.senseidb.search.client.req.query.Query;
+import com.senseidb.search.client.req.query.QueryJsonHandler;
+import com.senseidb.search.client.req.relevance.Relevance;
 
 /**
  * The sensei request object, that is used to send the Sensei query to the
@@ -24,7 +24,7 @@
  */
 public class SenseiClientRequest {
   /* *//**
-   * @see com.senseidb.search.client.json.req.Paging
+   * @see com.senseidb.search.client.req.Paging
    */
   /*
    * private Paging paging;
@@ -34,7 +34,7 @@ public class SenseiClientRequest {
 
   /**
    *
-   * @see com.senseidb.search.client.json.req.GroupBy
+   * @see com.senseidb.search.client.req.GroupBy
    *
    */
   private GroupBy groupBy;
@@ -145,7 +145,7 @@ public Builder showOnlyFields(String...fields ) {
       return this;
     }
     /**
-     * @see com.senseidb.search.client.json.req.SenseiClientRequest#templateMapping
+     * @see com.senseidb.search.client.req.SenseiClientRequest#templateMapping
      */
 
     public Builder addTemplateMapping(String name, Object value) {

clients/java/src/main/java/com/senseidb/search/client/json/req/Sort.java → clients/java/src/main/java/com/senseidb/search/client/req/Sort.java

@@ -1,4 +1,4 @@
-package com.senseidb.search.client.json.req;
+package com.senseidb.search.client.req;
 
 /**
  * This parameter specifies how the search results should be sorted. The results can be sorted based on one or multiple

clients/java/src/main/java/com/senseidb/search/client/json/req/Term.java → clients/java/src/main/java/com/senseidb/search/client/req/Term.java

@@ -1,6 +1,6 @@
-package com.senseidb.search.client.json.req;
+package com.senseidb.search.client.req;
 
-import com.senseidb.search.client.json.req.query.Query;
+import com.senseidb.search.client.req.query.Query;
 
 /**
  * <p>

clients/java/src/main/java/com/senseidb/search/client/json/req/Terms.java → clients/java/src/main/java/com/senseidb/search/client/req/Terms.java

@@ -1,9 +1,9 @@
-package com.senseidb.search.client.json.req;
+package com.senseidb.search.client.req;
 
 import java.util.List;
 
 import com.senseidb.search.client.json.JsonField;
-import com.senseidb.search.client.json.req.query.Query;
+import com.senseidb.search.client.req.query.Query;
 
 /**
  * <p>

clients/java/src/main/java/com/senseidb/search/client/json/req/filter/BoolFilter.java → clients/java/src/main/java/com/senseidb/search/client/req/filter/BoolFilter.java

@@ -1,4 +1,4 @@
-package com.senseidb.search.client.json.req.filter;
+package com.senseidb.search.client.req.filter;
 
 import java.util.List;
 

clients/java/src/main/java/com/senseidb/search/client/json/req/filter/Filter.java → clients/java/src/main/java/com/senseidb/search/client/req/filter/Filter.java

@@ -1,9 +1,9 @@
-package com.senseidb.search.client.json.req.filter;
+package com.senseidb.search.client.req.filter;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.senseidb.search.client.json.req.Operator;
+import com.senseidb.search.client.req.Operator;
 
 public interface Filter {
 

clients/java/src/main/java/com/senseidb/search/client/json/req/filter/FilterJsonHandler.java → clients/java/src/main/java/com/senseidb/search/client/req/filter/FilterJsonHandler.java

@@ -1,4 +1,4 @@
-package com.senseidb.search.client.json.req.filter;
+package com.senseidb.search.client.req.filter;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -9,12 +9,12 @@
 
 import com.senseidb.search.client.json.JsonHandler;
 import com.senseidb.search.client.json.JsonSerializer;
-import com.senseidb.search.client.json.req.Selection;
-import com.senseidb.search.client.json.req.SelectionJsonHandler;
-import com.senseidb.search.client.json.req.filter.Filter.AndOr;
-import com.senseidb.search.client.json.req.query.Query;
-import com.senseidb.search.client.json.req.query.QueryJsonHandler;
-import com.senseidb.search.client.json.req.query.StringQuery;
+import com.senseidb.search.client.req.Selection;
+import com.senseidb.search.client.req.SelectionJsonHandler;
+import com.senseidb.search.client.req.filter.Filter.AndOr;
+import com.senseidb.search.client.req.query.Query;
+import com.senseidb.search.client.req.query.QueryJsonHandler;
+import com.senseidb.search.client.req.query.StringQuery;
 
 public class FilterJsonHandler implements JsonHandler<Filter>{
     private SelectionJsonHandler selectionJsonHandler = new SelectionJsonHandler();

clients/java/src/main/java/com/senseidb/search/client/json/req/filter/Filters.java → clients/java/src/main/java/com/senseidb/search/client/req/filter/Filters.java

@@ -1,16 +1,16 @@
-package com.senseidb.search.client.json.req.filter;
+package com.senseidb.search.client.req.filter;
 
 import java.util.Arrays;
 import java.util.List;
 
-import com.senseidb.search.client.json.req.Operator;
-import com.senseidb.search.client.json.req.Path;
-import com.senseidb.search.client.json.req.Range;
-import com.senseidb.search.client.json.req.Selection;
-import com.senseidb.search.client.json.req.Term;
-import com.senseidb.search.client.json.req.Terms;
-import com.senseidb.search.client.json.req.filter.Filter.AndOr;
-import com.senseidb.search.client.json.req.query.Query;
+import com.senseidb.search.client.req.Operator;
+import com.senseidb.search.client.req.Path;
+import com.senseidb.search.client.req.Range;
+import com.senseidb.search.client.req.Selection;
+import com.senseidb.search.client.req.Term;
+import com.senseidb.search.client.req.Terms;
+import com.senseidb.search.client.req.filter.Filter.AndOr;
+import com.senseidb.search.client.req.query.Query;
 
 public class Filters {
     public static Ids ids(List<String> values, List<String> excludes) {

clients/java/src/main/java/com/senseidb/search/client/json/req/filter/Ids.java → clients/java/src/main/java/com/senseidb/search/client/req/filter/Ids.java

@@ -1,10 +1,10 @@
-package com.senseidb.search.client.json.req.filter;
+package com.senseidb.search.client.req.filter;
 
 import java.util.List;
 
 import com.senseidb.search.client.json.CustomJsonHandler;
-import com.senseidb.search.client.json.req.query.Query;
-import com.senseidb.search.client.json.req.query.QueryJsonHandler;
+import com.senseidb.search.client.req.query.Query;
+import com.senseidb.search.client.req.query.QueryJsonHandler;
 
 /**
  *  <p>Filters documents that only have the provided ids. Note, this filter does not require the <code>_id</code> field to be indexed since it works using the <code>_uid</code> field.</p>

clients/java/src/main/java/com/senseidb/search/client/json/req/filter/IsNull.java → clients/java/src/main/java/com/senseidb/search/client/req/filter/IsNull.java

@@ -1,4 +1,4 @@
-package com.senseidb.search.client.json.req.filter;
+package com.senseidb.search.client.req.filter;
 
 public class IsNull implements Filter {
   private String field;

clients/java/src/main/java/com/senseidb/search/client/json/req/filter/QueryFilter.java → clients/java/src/main/java/com/senseidb/search/client/req/filter/QueryFilter.java

@@ -1,7 +1,7 @@
-package com.senseidb.search.client.json.req.filter;
+package com.senseidb.search.client.req.filter;
 
 import com.senseidb.search.client.json.CustomJsonHandler;
-import com.senseidb.search.client.json.req.query.Query;
+import com.senseidb.search.client.req.query.Query;
 
 @CustomJsonHandler(FilterJsonHandler.class)
 public class QueryFilter implements Filter{

clients/java/src/main/java/com/senseidb/search/client/json/req/query/BoolQuery.java → clients/java/src/main/java/com/senseidb/search/client/req/query/BoolQuery.java

@@ -1,4 +1,4 @@
-package com.senseidb.search.client.json.req.query;
+package com.senseidb.search.client.req.query;
 
 import java.util.List;
 

clients/java/src/main/java/com/senseidb/search/client/json/req/query/CustomQuery.java → clients/java/src/main/java/com/senseidb/search/client/req/query/CustomQuery.java

@@ -1,4 +1,4 @@
-package com.senseidb.search.client.json.req.query;
+package com.senseidb.search.client.req.query;
 
 import java.util.HashMap;
 import java.util.Map;

clients/java/src/main/java/com/senseidb/search/client/json/req/query/DisMax.java → clients/java/src/main/java/com/senseidb/search/client/req/query/DisMax.java

@@ -1,10 +1,10 @@
-package com.senseidb.search.client.json.req.query;
+package com.senseidb.search.client.req.query;
 
 import java.util.List;
 
 import com.senseidb.search.client.json.CustomJsonHandler;
 import com.senseidb.search.client.json.JsonField;
-import com.senseidb.search.client.json.req.Term;
+import com.senseidb.search.client.req.Term;
 
 /**
  * <p>

clients/java/src/main/java/com/senseidb/search/client/json/req/query/FieldAware.java → clients/java/src/main/java/com/senseidb/search/client/req/query/FieldAware.java

@@ -1,4 +1,4 @@
-package com.senseidb.search.client.json.req.query;
+package com.senseidb.search.client.req.query;
 
 public class FieldAware {
   protected String field;

clients/java/src/main/java/com/senseidb/search/client/json/req/query/FieldAwareQuery.java → clients/java/src/main/java/com/senseidb/search/client/req/query/FieldAwareQuery.java

@@ -1,4 +1,4 @@
-package com.senseidb.search.client.json.req.query;
+package com.senseidb.search.client.req.query;
 
 public class FieldAwareQuery extends Query {
   protected String field;