async API: typed analyzers

Author: rashtao

src/main/java/com/arangodb/async/ArangoDatabaseAsync.java

@@ -24,6 +24,7 @@
 import com.arangodb.ArangoSerializationAccessor;
 import com.arangodb.entity.*;
 import com.arangodb.entity.arangosearch.AnalyzerEntity;
+import com.arangodb.entity.arangosearch.analyzer.SearchAnalyzer;
 import com.arangodb.model.*;
 import com.arangodb.model.arangosearch.AnalyzerDeleteOptions;
 import com.arangodb.model.arangosearch.ArangoSearchCreateOptions;
@@ -704,34 +705,70 @@ <T> CompletableFuture<T> getDocument(final String id, final Class<T> type, final
      * @return the created Analyzer
      * @see <a href="https://www.arangodb.com/docs/stable/http/analyzers.html">API Documentation</a>
      * @since ArangoDB 3.5.0
+     * @deprecated use {@link this#createSearchAnalyzer(SearchAnalyzer)}}
      */
     CompletableFuture<AnalyzerEntity> createAnalyzer(AnalyzerEntity options);
 
+    /**
+     * Creates an Analyzer
+     *
+     * @param analyzer SearchAnalyzer
+     * @return the created Analyzer
+     * @throws ArangoDBException
+     * @see <a href="https://www.arangodb.com/docs/stable/http/analyzers.html">API Documentation</a>
+     * @since ArangoDB 3.5.0
+     */
+    CompletableFuture<SearchAnalyzer> createSearchAnalyzer(SearchAnalyzer analyzer);
+
     /**
      * Gets information about an Analyzer
      *
      * @param name of the Analyzer without database prefix
      * @return information about an Analyzer
      * @see <a href="https://www.arangodb.com/docs/stable/http/analyzers.html">API Documentation</a>
      * @since ArangoDB 3.5.0
+     * @deprecated use {@link this#getSearchAnalyzer(String)}}
      */
     CompletableFuture<AnalyzerEntity> getAnalyzer(String name);
 
+    /**
+     * Gets information about an Analyzer
+     *
+     * @param name of the Analyzer without database prefix
+     * @return information about an Analyzer
+     * @throws ArangoDBException
+     * @see <a href="https://www.arangodb.com/docs/stable/http/analyzers.html">API Documentation</a>
+     * @since ArangoDB 3.5.0
+     */
+    CompletableFuture<SearchAnalyzer> getSearchAnalyzer(String name);
+
     /**
      * Retrieves all analyzers definitions.
      *
      * @return collection of all analyzers definitions
      * @see <a href="https://www.arangodb.com/docs/stable/http/analyzers.html">API Documentation</a>
      * @since ArangoDB 3.5.0
+     * @deprecated use {@link this#getSearchAnalyzers()}
      */
     CompletableFuture<Collection<AnalyzerEntity>> getAnalyzers();
 
+    /**
+     * Retrieves all analyzers definitions.
+     *
+     * @return collection of all analyzers definitions
+     * @throws ArangoDBException
+     * @see <a href="https://www.arangodb.com/docs/stable/http/analyzers.html">API Documentation</a>
+     * @since ArangoDB 3.5.0
+     */
+    CompletableFuture<Collection<SearchAnalyzer>> getSearchAnalyzers();
+
     /**
      * Deletes an Analyzer
      *
      * @param name of the Analyzer without database prefix
      * @see <a href="https://www.arangodb.com/docs/stable/http/analyzers.html">API Documentation</a>
      * @since ArangoDB 3.5.0
+     * @deprecated use {@link this#deleteSearchAnalyzer(String)}}}
      */
     CompletableFuture<Void> deleteAnalyzer(String name);
 
@@ -742,7 +779,29 @@ <T> CompletableFuture<T> getDocument(final String id, final Class<T> type, final
      * @param options AnalyzerDeleteOptions
      * @see <a href="https://www.arangodb.com/docs/stable/http/analyzers.html">API Documentation</a>
      * @since ArangoDB 3.5.0
+     * @deprecated use {@link this#deleteSearchAnalyzer(String, AnalyzerDeleteOptions)}}}
      */
     CompletableFuture<Void> deleteAnalyzer(String name, AnalyzerDeleteOptions options);
 
+    /**
+     * Deletes an Analyzer
+     *
+     * @param name of the Analyzer without database prefix
+     * @throws ArangoDBException
+     * @see <a href="https://www.arangodb.com/docs/stable/http/analyzers.html">API Documentation</a>
+     * @since ArangoDB 3.5.0
+     */
+    CompletableFuture<Void> deleteSearchAnalyzer(String name);
+
+    /**
+     * Deletes an Analyzer
+     *
+     * @param name    of the Analyzer without database prefix
+     * @param options AnalyzerDeleteOptions
+     * @throws ArangoDBException
+     * @see <a href="https://www.arangodb.com/docs/stable/http/analyzers.html">API Documentation</a>
+     * @since ArangoDB 3.5.0
+     */
+    CompletableFuture<Void> deleteSearchAnalyzer(String name, AnalyzerDeleteOptions options);
+
 }

src/main/java/com/arangodb/async/internal/ArangoDatabaseAsyncImpl.java

@@ -24,6 +24,7 @@
 import com.arangodb.async.*;
 import com.arangodb.entity.*;
 import com.arangodb.entity.arangosearch.AnalyzerEntity;
+import com.arangodb.entity.arangosearch.analyzer.SearchAnalyzer;
 import com.arangodb.internal.ArangoCursorExecute;
 import com.arangodb.internal.InternalArangoDatabase;
 import com.arangodb.internal.net.HostHandle;
@@ -431,16 +432,31 @@ public CompletableFuture<AnalyzerEntity> createAnalyzer(AnalyzerEntity options)
         return executor.execute(createAnalyzerRequest(options), AnalyzerEntity.class);
     }
 
+    @Override
+    public CompletableFuture<SearchAnalyzer> createSearchAnalyzer(SearchAnalyzer analyzer) {
+        return executor.execute(createAnalyzerRequest(analyzer), SearchAnalyzer.class);
+    }
+
     @Override
     public CompletableFuture<AnalyzerEntity> getAnalyzer(String name) {
         return executor.execute(getAnalyzerRequest(name), AnalyzerEntity.class);
     }
 
+    @Override
+    public CompletableFuture<SearchAnalyzer> getSearchAnalyzer(String name) {
+        return executor.execute(getAnalyzerRequest(name), SearchAnalyzer.class);
+    }
+
     @Override
     public CompletableFuture<Collection<AnalyzerEntity>> getAnalyzers() {
         return executor.execute(getAnalyzersRequest(), getAnalyzersResponseDeserializer());
     }
 
+    @Override
+    public CompletableFuture<Collection<SearchAnalyzer>> getSearchAnalyzers() {
+        return executor.execute(getAnalyzersRequest(), getSearchAnalyzersResponseDeserializer());
+    }
+
     @Override
     public CompletableFuture<Void> deleteAnalyzer(String name) {
         return executor.execute(deleteAnalyzerRequest(name, null), Void.class);
@@ -451,5 +467,15 @@ public CompletableFuture<Void> deleteAnalyzer(String name, AnalyzerDeleteOptions
         return executor.execute(deleteAnalyzerRequest(name, options), Void.class);
     }
 
+    @Override
+    public CompletableFuture<Void> deleteSearchAnalyzer(String name) {
+        return deleteAnalyzer(name);
+    }
+
+    @Override
+    public CompletableFuture<Void> deleteSearchAnalyzer(String name, AnalyzerDeleteOptions options) {
+        return deleteAnalyzer(name, options);
+    }
+
 
 }

src/test/java/com/arangodb/ArangoSearchTest.java

@@ -304,7 +304,8 @@ private void createGetAndDeleteTypedAnalyzer(SearchAnalyzer analyzer) {
             db.getAnalyzer(analyzer.getName());
             fail("deleted analyzer should not be found!");
         } catch (ArangoDBException e) {
-            // ok
+            assertThat(e.getResponseCode(), is(404));
+            assertThat(e.getErrorNum(), is(1202));
         }
 
     }