Merge pull request #11 from flyingbag/master

SDK-35 #comment Added Java SDK support for "get all meta" feature

README.md

@@ -338,6 +338,19 @@ for (ImageResult imageResult : imageResults) {
     Map<String, String> metadata = imageResult.getMetadata();
     // read your metadata here
 }
+```
+
+To retrieve all metadata of your image results, specify ```get_all_fl``` parameter and set it to ```true```:
+
+```java
+SearchParams params = new SearchParams("vintage_wingtips");
+params.setGetAllFl(true);
+PagedSearchResult searchResult = client.search(params);
+List<ImageResult> imageResults = searchResult.getResult();
+for (ImageResult imageResult : imageResults) {
+    Map<String, String> metadata = imageResult.getMetadata();
+    // read your metadata here
+}
 ```
 
  > Only metadata of type string, int, and float can be retrieved from ViSearch. Metadata of type text is not available for retrieval.

pom.xml

@@ -5,7 +5,7 @@
     <groupId>com.visenze</groupId>
     <artifactId>visearch-java-sdk</artifactId>
     <name>ViSearch Java SDK</name>
-    <version>1.2.3</version>
+    <version>1.2.4</version>
     <packaging>jar</packaging>
     <url>https://github.com/visenze/visearch-sdk-java</url>
     <description>ViSearch Java SDK</description>

src/main/java/com/visenze/visearch/BaseSearchParams.java

@@ -23,6 +23,7 @@ public class BaseSearchParams<P extends BaseSearchParams<P>> {
     static final private List<String> DEFAULT_FL = Lists.newArrayList();
     static final private Boolean DEFAULT_QINFO = false;
     static final private Map<String, String> DEFAULT_CUSTOM = new HashMap<String, String>();
+    static final private Boolean DEFAULT_GET_ALL_FL = false;
 
     protected Optional<Integer> page = Optional.absent();
     protected Optional<Integer> limit = Optional.absent();
@@ -33,6 +34,7 @@ public class BaseSearchParams<P extends BaseSearchParams<P>> {
     protected Optional<Float> scoreMax = Optional.absent();
     protected Optional<Map<String, String>> fq = Optional.absent();
     protected Optional<List<String>> fl = Optional.absent();
+    protected Optional<Boolean> getAllFl = Optional.absent();
     protected Optional<Boolean> qInfo = Optional.absent();
     protected Optional<Map<String, String>> custom = Optional.absent();
 
@@ -90,6 +92,12 @@ public P setFl(List<String> fl) {
         return (P) this;
     }
 
+    @SuppressWarnings("unchecked")
+    public P setGetAllFl(Boolean getAllFl) {
+        this.getAllFl = Optional.fromNullable(getAllFl);
+        return (P) this;
+    }
+
     @SuppressWarnings("unchecked")
     public P setQInfo(Boolean qInfo) {
         this.qInfo = Optional.fromNullable(qInfo);
@@ -138,6 +146,11 @@ public List<String> getFl() {
         return fl.or(DEFAULT_FL);
     }
 
+    public Boolean isGetAllFl()
+    {
+        return getAllFl.or(DEFAULT_GET_ALL_FL);
+    }
+
     public Boolean isQInfo() {
         return qInfo.or(DEFAULT_QINFO);
     }
@@ -182,6 +195,10 @@ public Multimap<String, String> toMap() {
             map.put("fl", fl);
         }
 
+        if (isGetAllFl()) {
+            map.put("get_all_fl", "true");
+        }
+
         if (isQInfo()) {
             map.put("qinfo", "true");
         }

src/test/java/com/visenze/visearch/ViSearchSearchOperationsTest.java

@@ -95,6 +95,7 @@ public void testSearchParamsFull() {
                 .setScoreMax(0.75f)
                 .setFq(fq)
                 .setFl(Lists.newArrayList("field_x", "field_y"))
+                .setGetAllFl(true)
                 .setQInfo(true)
                 .setCustom(custom);
         searchOperations.search(searchParams);
@@ -109,6 +110,7 @@ public void testSearchParamsFull() {
         expectedParams.put("fq", "field_b:value_b");
         expectedParams.put("fl", "field_x");
         expectedParams.put("fl", "field_y");
+        expectedParams.put("get_all_fl", "true");
         expectedParams.put("qinfo", "true");
         expectedParams.put("custom_key", "custom_value");
         verify(mockClient).get("/search", expectedParams);