Issue-74: createIndex with TTL (expireAfterSeconds) is ignored and no…

…rmal index created
liquibase · Jan 16, 2021 · 0de12a7 · 0de12a7
1 parent 79606e3
commit 0de12a7
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -28,8 +28,9 @@ Liquibase turned to be the most feasible tool to extend as it allows to define c
 ## Release Notes
 
 #### 4.2.2.1
-* Fixed [Does it support preconditions](https://github.com/liquibase/liquibase-mongodb/issues/69)
-* Added documentExistsPrecondition
+* Fixed [Issue-69: Does it support preconditions](https://github.com/liquibase/liquibase-mongodb/issues/69)
+* Added DocumentExistsPrecondition, ExpectedDocumentCountPrecondition
+* Fixed [Issue-74: createIndex with TTL (expireAfterSeconds) is ignored and normal index created](https://github.com/liquibase/liquibase-mongodb/issues/74)
 
 #### 4.2.2
 * Support for Liquibase 4.2.2

diff --git a/src/main/java/liquibase/ext/mongodb/statement/BsonUtils.java b/src/main/java/liquibase/ext/mongodb/statement/BsonUtils.java
@@ -22,16 +22,26 @@
 
 import com.mongodb.DBRefCodecProvider;
 import com.mongodb.MongoClientSettings;
-import com.mongodb.client.model.*;
+import com.mongodb.client.model.CreateCollectionOptions;
+import com.mongodb.client.model.IndexOptions;
+import com.mongodb.client.model.ValidationAction;
+import com.mongodb.client.model.ValidationLevel;
+import com.mongodb.client.model.ValidationOptions;
 import lombok.NoArgsConstructor;
 import org.bson.Document;
 import org.bson.UuidRepresentation;
-import org.bson.codecs.*;
+import org.bson.codecs.BsonValueCodecProvider;
+import org.bson.codecs.DocumentCodec;
+import org.bson.codecs.DocumentCodecProvider;
+import org.bson.codecs.UuidCodec;
+import org.bson.codecs.UuidCodecProvider;
+import org.bson.codecs.ValueCodecProvider;
 import org.bson.codecs.configuration.CodecRegistries;
 import org.bson.codecs.configuration.CodecRegistry;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import static java.util.Objects.nonNull;
 import static java.util.Optional.ofNullable;
@@ -43,12 +53,12 @@
 public final class BsonUtils {
 
     public static final DocumentCodec DOCUMENT_CODEC =
-        new DocumentCodec(fromProviders(
-            new UuidCodecProvider(UuidRepresentation.STANDARD),
-            new ValueCodecProvider(),
-            new BsonValueCodecProvider(),
-            new DocumentCodecProvider(),
-            new DBRefCodecProvider()));
+            new DocumentCodec(fromProviders(
+                    new UuidCodecProvider(UuidRepresentation.STANDARD),
+                    new ValueCodecProvider(),
+                    new BsonValueCodecProvider(),
+                    new DocumentCodecProvider(),
+                    new DBRefCodecProvider()));
 
     public static CodecRegistry uuidCodecRegistry() {
         return CodecRegistries.fromRegistries(
@@ -59,19 +69,19 @@ public static CodecRegistry uuidCodecRegistry() {
 
     public static Document orEmptyDocument(final String json) {
         return (
-            ofNullable(trimToNull(json))
-                .map(s -> Document.parse(s, DOCUMENT_CODEC))
-                .orElseGet(Document::new)
+                ofNullable(trimToNull(json))
+                        .map(s -> Document.parse(s, DOCUMENT_CODEC))
+                        .orElseGet(Document::new)
         );
     }
 
     public static List<Document> orEmptyList(final String json) {
         return (
-            ofNullable(trimToNull(json))
-                .map(jn -> "{ items: " + jn + "}")
-                .map(s -> Document.parse(s, DOCUMENT_CODEC))
-                .map(d -> d.getList("items", Document.class, new ArrayList<>()))
-                .orElseGet(ArrayList::new)
+                ofNullable(trimToNull(json))
+                        .map(jn -> "{ items: " + jn + "}")
+                        .map(s -> Document.parse(s, DOCUMENT_CODEC))
+                        .map(d -> d.getList("items", Document.class, new ArrayList<>()))
+                        .orElseGet(ArrayList::new)
         );
     }
 
@@ -110,6 +120,9 @@ public static IndexOptions orEmptyIndexOptions(final Document options) {
         if (options.containsKey("name")) {
             indexOptions.name(options.getString("name"));
         }
+        if (options.containsKey("expireAfterSeconds")) {
+            indexOptions.expireAfter(options.getLong("expireAfterSeconds"), TimeUnit.SECONDS);
+        }
         return indexOptions;
     }
 

diff --git a/src/test/java/liquibase/ext/mongodb/statement/BsonUtilsTest.java b/src/test/java/liquibase/ext/mongodb/statement/BsonUtilsTest.java
@@ -25,6 +25,7 @@
 import org.junit.jupiter.api.Test;
 
 import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 
 import static java.util.stream.Collectors.toList;
 import static liquibase.ext.mongodb.statement.BsonUtils.DOCUMENT_CODEC;
@@ -74,4 +75,11 @@ void uuidParseTest() {
                 //.isEqualTo(UUID.fromString("2e4933f2-0fd5-a2cd-96db-1dad099a5091"))
                 .isEqualTo(uuid1);
     }
+
+    @Test
+    void orEmptyIndexOptionsTest() {
+        assertThat(BsonUtils.orEmptyIndexOptions(
+                BsonUtils.orEmptyDocument("{expireAfterSeconds: NumberLong(\"60\")}")).getExpireAfter(TimeUnit.SECONDS))
+                .isEqualTo(60L);
+    }
 }
diff --git a/src/test/java/liquibase/ext/mongodb/statement/CreateIndexStatementIT.java b/src/test/java/liquibase/ext/mongodb/statement/CreateIndexStatementIT.java
@@ -50,7 +50,7 @@ void execute() {
         database.createCollection(COLLECTION_NAME_1);
         database.getCollection(COLLECTION_NAME_1).insertOne(initialDocument);
         final CreateIndexStatement createIndexStatement = new CreateIndexStatement(COLLECTION_NAME_1, "{ locale: 1 }",
-            "{ name: \"" + indexName + "\", unique: true}");
+            "{ name: \"" + indexName + "\", unique: true, expireAfterSeconds: NumberLong(\"30\") }");
         createIndexStatement.execute(connection);
 
         final Document document = StreamSupport.stream(database.getCollection(COLLECTION_NAME_1).listIndexes().spliterator(), false)
@@ -60,5 +60,6 @@ void execute() {
 
             assertThat(document.get("unique")).isEqualTo(true);
             assertThat(document.get("key")).isEqualTo(Document.parse("{ locale: 1 }"));
+            assertThat(document.get("expireAfterSeconds")).isEqualTo(30L);
     }
 }