Feature/3.6/analyzers (#325)

* enhancedNgramAnalyzer and enhancedTextAnalyzer

* tests fix

* ArangoSearch tests bugfix

* changelog upd

Author: rashtao

ChangeLog.md

@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [6.5.0] - 2019-xx-xx
+
+- enhancedNgramAnalyzer and enhancedTextAnalyzer (ArangoDB v3.6)
+
 ## [6.4.1] - 2019-10-23
 
 - jackson v2.9.10

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

@@ -397,6 +397,34 @@ public void ngramAnalyzer() {
         createGetAndDeleteAnalyzer(options);
     }
 
+    @Test
+    public void enhancedNgramAnalyzer() {
+        assumeTrue(isAtLeastVersion(3, 6));
+
+        String name = "test-" + UUID.randomUUID().toString();
+
+        Set<AnalyzerFeature> features = new HashSet<>();
+        features.add(AnalyzerFeature.frequency);
+        features.add(AnalyzerFeature.norm);
+        features.add(AnalyzerFeature.position);
+
+        Map<String, Object> properties = new HashMap<>();
+        properties.put("max", 6L);
+        properties.put("min", 3L);
+        properties.put("preserveOriginal", true);
+        properties.put("startMarker", "^");
+        properties.put("endMarker", "^");
+        properties.put("streamType", "utf8");
+
+        AnalyzerEntity options = new AnalyzerEntity();
+        options.setFeatures(features);
+        options.setName(name);
+        options.setType(AnalyzerType.ngram);
+        options.setProperties(properties);
+
+        createGetAndDeleteAnalyzer(options);
+    }
+
     @Test
     public void textAnalyzer() {
         assumeTrue(isAtLeastVersion(3, 5));
@@ -424,6 +452,39 @@ public void textAnalyzer() {
         createGetAndDeleteAnalyzer(options);
     }
 
+    @Test
+    public void enhancedTextAnalyzer() {
+        assumeTrue(isAtLeastVersion(3, 6));
+
+        String name = "test-" + UUID.randomUUID().toString();
+
+        Set<AnalyzerFeature> features = new HashSet<>();
+        features.add(AnalyzerFeature.frequency);
+        features.add(AnalyzerFeature.norm);
+        features.add(AnalyzerFeature.position);
+
+        Map<String, Object> edgeNgram = new HashMap<>();
+        edgeNgram.put("min", 2L);
+        edgeNgram.put("max", 100000L);
+        edgeNgram.put("preserveOriginal", true);
+
+        Map<String, Object> properties = new HashMap<>();
+        properties.put("locale", "ru.utf-8");
+        properties.put("case", "lower");
+        properties.put("stopwords", Collections.emptyList());
+        properties.put("accent", true);
+        properties.put("stemming", true);
+        properties.put("edgeNgram", edgeNgram);
+
+        AnalyzerEntity options = new AnalyzerEntity();
+        options.setFeatures(features);
+        options.setName(name);
+        options.setType(AnalyzerType.text);
+        options.setProperties(properties);
+
+        createGetAndDeleteAnalyzer(options);
+    }
+
     @Test
     public void arangoSearchOptions() {
         assumeTrue(isAtLeastVersion(3, 4));

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

@@ -366,6 +366,7 @@ public void normAnalyzer() throws ExecutionException, InterruptedException {
     @Test
     public void ngramAnalyzer() throws ExecutionException, InterruptedException {
         assumeTrue(isAtLeastVersion(3, 5));
+
         String name = "test-" + UUID.randomUUID().toString();
 
         Set<AnalyzerFeature> features = new HashSet<>();
@@ -390,6 +391,7 @@ public void ngramAnalyzer() throws ExecutionException, InterruptedException {
     @Test
     public void textAnalyzer() throws ExecutionException, InterruptedException {
         assumeTrue(isAtLeastVersion(3, 5));
+
         String name = "test-" + UUID.randomUUID().toString();
 
         Set<AnalyzerFeature> features = new HashSet<>();