🐛#12 Fix missing FTS parameters (#13)

Author: gkysaad

gradle.properties

@@ -1,4 +1,4 @@
-version=3.0-SNAPSHOT
+version=3.1.1-SNAPSHOT
 
 # plugins
 lombok_version=4.1.6

src/main/java/com/github/couchmove/repository/CouchbaseRepository.java

@@ -5,6 +5,7 @@
 import com.github.couchmove.pojo.CouchbaseEntity;
 
 import java.time.Duration;
+import java.util.Map;
 
 /**
  * A repository for encapsulating storage, retrieval, and removal of json documents to Couchbase {@link Bucket}

src/main/java/com/github/couchmove/repository/CouchbaseRepositoryImpl.java

@@ -38,6 +38,7 @@
 import java.time.Duration;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import static com.couchbase.client.java.kv.InsertOptions.insertOptions;
@@ -160,23 +161,26 @@ public void importFtsIndex(String name, String jsonContent) {
         jsonContent = injectParameters(jsonContent);
         logger.trace("Import FTS index : \n'{}'", jsonContent);
         try {
-            SearchIndex searchIndex = getJsonMapper().readValue(jsonContent, SearchIndex.class);
+            CustomSearchIndex searchIndex = getJsonMapper().readValue(jsonContent, CustomSearchIndex.class);
             cluster.searchIndexes().upsertIndex(searchIndex, withRetry(upsertSearchIndexOptions()));
         } catch (CouchbaseException | JsonProcessingException e) {
             throw new CouchmoveException("Could not store FTS index '" + name + "'", e);
         }
     }
 
-    @Override
-    public boolean isFtsIndexExists(String name) {
+    public Optional<SearchIndex> getFtsIndex(String name) {
         try {
-            cluster.searchIndexes().getIndex(name);
-            return true;
+            return Optional.of(cluster.searchIndexes().getIndex(name));
         } catch (IndexNotFoundException e) {
-            return false;
+            return Optional.empty();
         }
     }
 
+    @Override
+    public boolean isFtsIndexExists(String name) {
+        return getFtsIndex(name).isPresent();
+    }
+
     String injectParameters(String statement) {
         return StrSubstitutor.replace(statement, of(BUCKET_PARAM, getBucketName()));
     }

src/main/java/com/github/couchmove/repository/CustomSearchIndex.java

@@ -0,0 +1,45 @@
+package com.github.couchmove.repository;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.couchbase.client.java.manager.search.SearchIndex;
+import com.couchbase.client.core.deps.com.fasterxml.jackson.annotation.JsonCreator;
+import com.couchbase.client.core.deps.com.fasterxml.jackson.annotation.JsonProperty;
+import com.couchbase.client.core.json.Mapper;
+
+public class CustomSearchIndex extends SearchIndex {
+
+    @JsonCreator
+    public CustomSearchIndex(
+        @JsonProperty("uuid") String uuid,
+        @JsonProperty("name") String name,
+        @JsonProperty("type") String type,
+        @JsonProperty("params") Map<String, Object> params,
+        @JsonProperty("sourceUUID") String sourceUuid,
+        @JsonProperty("sourceName") String sourceName,
+        @JsonProperty("sourceParams") Map<String, Object> sourceParams,
+        @JsonProperty("sourceType") String sourceType,
+        @JsonProperty("planParams") Map<String, Object> planParams) {
+        super(uuid, name, type, params, sourceUuid, sourceName, sourceParams, sourceType, planParams);
+    }
+
+    @Override
+    public String toJson() {
+        Map<String, Object> output = new HashMap<>();
+
+        if (super.uuid() != null) {
+            output.put("uuid", super.uuid());
+        }
+        output.put("name", super.name());
+        output.put("sourceName", super.sourceName());
+        output.put("type", super.type() == null ? "fulltext-index" : super.type());
+        output.put("sourceType", super.sourceType() == null ? "couchbase" : super.sourceType());
+        output.put("params", super.params());
+        output.put("planParams", super.planParams());
+        output.put("sourceUUID", super.sourceUuid());
+
+        return Mapper.encodeAsString(output);
+    }    
+    
+}

src/test/java/com/github/couchmove/repository/CouchbaseRepositoryIT.java

@@ -3,6 +3,7 @@
 import com.couchbase.client.core.error.CasMismatchException;
 import com.couchbase.client.core.error.DocumentExistsException;
 import com.couchbase.client.java.manager.query.QueryIndex;
+import com.couchbase.client.java.manager.search.SearchIndex;
 import com.couchbase.client.java.manager.view.DesignDocument;
 import com.couchbase.client.java.view.DesignDocumentNamespace;
 import com.github.couchmove.exception.CouchmoveException;
@@ -15,10 +16,12 @@
 import org.junit.Assert;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.testcontainers.shaded.com.fasterxml.jackson.databind.ObjectMapper;
 
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.List;
+import java.util.Map;
 import java.util.Random;
 import java.util.stream.Collectors;
 
@@ -146,6 +149,13 @@ public void should_import_fts_index() throws IOException {
 
         // Then it should be created
         assertThat(repository.isFtsIndexExists(TEST)).isTrue();
+
+        // Get fts file contents
+        Map<String, Object> ftsIndexMap = (Map<String, Object>) CouchbaseRepositoryImpl.getJsonMapper().readValue(ftsIndex, Map.class);
+
+        // Ensure params is created as specified
+        SearchIndex searchIndex = ((CouchbaseRepositoryImpl<?>) repository).getFtsIndex(TEST).get();
+        assertThat(searchIndex.params()).isEqualTo(ftsIndexMap.get("params"));
     }
 
     @Test

src/test/resources/db/migration/test.fts

@@ -2,28 +2,37 @@
   "name": "test",
   "type": "fulltext-index",
   "params": {
-    "mapping": {
-      "default_mapping": {
-        "enabled": true,
-        "dynamic": true
+      "doc_config": {
+          "docid_prefix_delim": "",
+          "docid_regexp": "",
+          "mode": "type_field",
+          "type_field": "_class"
       },
-      "default_type": "_default",
-      "default_analyzer": "standard",
-      "default_datetime_parser": "dateTimeOptional",
-      "default_field": "_all",
-      "store_dynamic": false,
-      "index_dynamic": true
-    },
-    "store": {
-      "indexType": "scorch",
-      "kvStoreName": ""
-    },
-    "doc_config": {
-      "mode": "type_field",
-      "type_field": "type",
-      "docid_prefix_delim": "",
-      "docid_regexp": ""
-    }
+      "mapping": {
+          "analysis": {},
+          "default_analyzer": "standard",
+          "default_datetime_parser": "dateTimeOptional",
+          "default_field": "_all",
+          "default_mapping": {
+              "dynamic": true,
+              "enabled": false
+          },
+          "default_type": "_default",
+          "docvalues_dynamic": true,
+          "index_dynamic": true,
+          "store_dynamic": false,
+          "type_field": "_type",
+          "types": {
+              "testType": {
+                  "dynamic": true,
+                  "enabled": true
+              }
+          }
+      },
+      "store": {
+          "indexType": "scorch",
+          "segmentVersion": 15
+      }
   },
   "sourceType": "couchbase",
   "sourceName": "${bucket}"