Index: exposed searchSync method

Author: PLNech

algoliasearch/src/main/java/com/algolia/search/saas/BaseAPIClient.java

@@ -330,14 +330,14 @@ protected JSONObject putRequest(String url, String obj) throws AlgoliaException
     }
 
     /**
-     * Reads the answer and return it as a String
+     * Reads the InputStream as UTF-8
      *
-     * @param istream the InputStream to read
-     * @return the stream's content
-     * @throws IOException if the stream can't be read or closed
+     * @param stream the InputStream to read
+     * @return the stream's content as a String
+     * @throws IOException if the stream can't be read, decoded as UTF-8 or closed
      */
-    private String _getAnswer(InputStream istream) throws IOException {
-        InputStreamReader is = new InputStreamReader(istream, "UTF-8");
+    private String _toCharArray(InputStream stream) throws IOException {
+        InputStreamReader is = new InputStreamReader(stream, "UTF-8");
         StringBuilder builder = new StringBuilder();
         char[] buf = new char[1000];
         int l = 0;
@@ -349,6 +349,30 @@ private String _getAnswer(InputStream istream) throws IOException {
         return builder.toString();
     }
 
+    /**
+     * Reads the InputStream into a byte array
+     * @param stream the InputStream to read
+     * @return the stream's content as a byte[]
+     * @throws AlgoliaException if the stream can't be read or flushed
+     */
+    private byte[] _toByteArray(InputStream stream) throws AlgoliaException {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        int read;
+        byte[] buffer = new byte[1024];
+
+        try {
+            while ((read = stream.read(buffer, 0, buffer.length)) != -1) {
+                out.write(buffer, 0, read);
+            }
+
+            out.flush();
+            return out.toByteArray();
+        } catch (IOException e) {
+            throw new AlgoliaException("Error while reading stream: " + e.getMessage());
+        }
+    }
+
+
     private JSONObject _getJSONObject(String input) throws JSONException {
         return new JSONObject(new JSONTokener(input));
     }
@@ -358,7 +382,7 @@ private JSONObject _getJSONObject(byte[] array) throws JSONException {
     }
 
     private JSONObject _getAnswerJSONObject(InputStream istream) throws IOException, JSONException {
-        return _getJSONObject(_getAnswer(istream));
+        return _getJSONObject(_toCharArray(istream));
     }
 
     /**
@@ -499,7 +523,7 @@ private synchronized byte[] _requestRaw(Method m, String url, String json, List<
                 throw new AlgoliaException(message);
             } else {
                 try {
-                    errors.put(host, _getAnswer(stream));
+                    errors.put(host, _toCharArray(stream));
                 } catch (IOException e) {
                     errors.put(host, String.valueOf(code));
                 }
@@ -531,23 +555,6 @@ private synchronized byte[] _requestRaw(Method m, String url, String json, List<
         throw new AlgoliaException(builder.toString());
     }
 
-    private byte[] _toByteArray(InputStream stream) throws AlgoliaException {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        int read;
-        byte[] buffer = new byte[1024];
-
-        try {
-            while ((read = stream.read(buffer, 0, buffer.length)) != -1) {
-                out.write(buffer, 0, read);
-            }
-
-            out.flush();
-            return out.toByteArray();
-        } catch (IOException e) {
-            throw new AlgoliaException("Error while reading stream: " + e.getMessage());
-        }
-    }
-
     private void addError(HashMap<String, String> errors, String host, IOException e) {
         errors.put(host, String.format("%s=%s", e.getClass().getName(), e.getMessage()));
     }

algoliasearch/src/main/java/com/algolia/search/saas/Index.java

@@ -28,8 +28,8 @@
 import com.algolia.search.saas.listeners.DeleteObjectsListener;
 import com.algolia.search.saas.listeners.GetObjectsListener;
 import com.algolia.search.saas.listeners.IndexingListener;
-import com.algolia.search.saas.listeners.SearchListener;
 import com.algolia.search.saas.listeners.SearchDisjunctiveFacetingListener;
+import com.algolia.search.saas.listeners.SearchListener;
 import com.algolia.search.saas.listeners.SettingsListener;
 import com.algolia.search.saas.listeners.WaitTaskListener;
 
@@ -82,6 +82,22 @@ public void searchASync(Query query, SearchListener listener) {
         new ASyncSearchTask().execute(params);
     }
 
+    /**
+     * Search inside the index synchronously
+     * @return a JSONObject containing search results
+     */
+    public JSONObject searchSync(Query query) throws AlgoliaException {
+        return search(query);
+    }
+
+    /**
+     * Search inside the index synchronously
+     * @return a byte array containing search results
+     */
+    protected byte[] searchSyncRaw(Query query) throws AlgoliaException {
+        return searchRaw(query);
+    }
+
     ////////////////////////////////////////////////////////////////////////////////////////////////
     /// SEARCH DISJUNCTIVE FACETING TASK
     ////////////////////////////////////////////////////////////////////////////////////////////////
@@ -178,7 +194,7 @@ public void addObjectASync(JSONObject object, IndexingListener listener) {
      *
      * @param object the object to add.
      *  The object is represented by an associative array
-     * @param objectID an objectID you want to attribute to this object 
+     * @param objectID an objectID you want to attribute to this object
      * (if the attribute already exist the old object will be overwrite)
      * @param listener the listener that will receive the result or error.
      */