remove usage of Indices from test codes. Fixes #948

nitrite · May 7, 2024 · d20a92e · d20a92e
1 parent 3808623
commit d20a92e
Show file tree

Hide file tree

Showing 25 changed files with 58 additions and 150 deletions.
diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/NitriteTest.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/NitriteTest.java
@@ -33,7 +33,6 @@
 import org.dizitart.no2.repository.ObjectRepository;
 import org.dizitart.no2.repository.annotations.Id;
 import org.dizitart.no2.repository.annotations.Index;
-import org.dizitart.no2.repository.annotations.Indices;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -264,9 +263,7 @@ public void testNoUniqueAndTextIndex() {
     @Data
     @NoArgsConstructor
     @AllArgsConstructor
-    @Indices({
-        @Index(fields = "synced", type = IndexType.NON_UNIQUE)
-    })
+    @Index(fields = "synced", type = IndexType.NON_UNIQUE)
     public static class Receipt {
         @Id
         private String clientRef;
@@ -283,21 +280,17 @@ public enum Status {
     public static class EmptyClass {
     }
 
-    @Indices({
-        @Index(fields = "value", type = IndexType.FULL_TEXT),
-        @Index(fields = "value")
-    })
     @Data
     @NoArgsConstructor
     @AllArgsConstructor
+    @Index(fields = "value", type = IndexType.FULL_TEXT)
+    @Index(fields = "value")
     public static class EntityUniqueFullText {
         private String value;
     }
 
-    @Indices({
-        @Index(fields = "value", type = IndexType.FULL_TEXT),
-        @Index(fields = "value", type = IndexType.NON_UNIQUE)
-    })
+    @Index(fields = "value", type = IndexType.FULL_TEXT)
+    @Index(fields = "value", type = IndexType.NON_UNIQUE)
     @Data
     @NoArgsConstructor
     @AllArgsConstructor

diff --git a/...apper/src/test/java/org/dizitart/no2/integration/repository/CustomFieldSeparatorTest.java b/...apper/src/test/java/org/dizitart/no2/integration/repository/CustomFieldSeparatorTest.java
@@ -31,7 +31,6 @@
 import org.dizitart.no2.repository.ObjectRepository;
 import org.dizitart.no2.repository.annotations.Id;
 import org.dizitart.no2.repository.annotations.Index;
-import org.dizitart.no2.repository.annotations.Indices;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -113,11 +112,9 @@ public void testFindByEmbeddedField() {
 
     @ToString
     @EqualsAndHashCode
-    @Indices({
-        @Index(fields = "joinDate", type = IndexType.NON_UNIQUE),
-        @Index(fields = "address", type = IndexType.FULL_TEXT),
-        @Index(fields = "employeeNote:text", type = IndexType.FULL_TEXT)
-    })
+    @Index(fields = "joinDate", type = IndexType.NON_UNIQUE)
+    @Index(fields = "address", type = IndexType.FULL_TEXT)
+    @Index(fields = "employeeNote:text", type = IndexType.FULL_TEXT)
     public static class EmployeeForCustomSeparator implements Serializable {
         @Id
         @Getter

diff --git a/...per/src/test/java/org/dizitart/no2/integration/repository/UniversalTextTokenizerTest.java b/...per/src/test/java/org/dizitart/no2/integration/repository/UniversalTextTokenizerTest.java
@@ -29,7 +29,6 @@
 import org.dizitart.no2.repository.Cursor;
 import org.dizitart.no2.repository.ObjectRepository;
 import org.dizitart.no2.repository.annotations.Index;
-import org.dizitart.no2.repository.annotations.Indices;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -173,9 +172,7 @@ public void testUniversalFullTextIndexing() {
         }
     }
 
-    @Indices(
-        @Index(fields = "text", type = IndexType.FULL_TEXT)
-    )
+    @Index(fields = "text", type = IndexType.FULL_TEXT)
     public static class TextData {
         public int id;
         public String text;

diff --git a/...te-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/Company.java b/...te-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/Company.java
@@ -24,7 +24,6 @@
 import lombok.ToString;
 import org.dizitart.no2.repository.annotations.Id;
 import org.dizitart.no2.repository.annotations.Index;
-import org.dizitart.no2.repository.annotations.Indices;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -38,9 +37,7 @@
 @Setter
 @ToString
 @EqualsAndHashCode
-@Indices({
-    @Index(fields = "companyName")
-})
+@Index(fields = "companyName")
 public class Company implements Serializable {
     @Id(fieldName = "company_id")
     @JsonProperty("company_id")

diff --git a/nitrite-mvstore-adapter/src/test/java/org/dizitart/no2/NitriteTest.java b/nitrite-mvstore-adapter/src/test/java/org/dizitart/no2/NitriteTest.java
@@ -28,8 +28,8 @@
 import org.dizitart.no2.common.SortOrder;
 import org.dizitart.no2.common.concurrent.ThreadPoolManager;
 import org.dizitart.no2.common.mapper.EntityConverter;
-import org.dizitart.no2.common.mapper.SimpleNitriteMapper;
 import org.dizitart.no2.common.mapper.NitriteMapper;
+import org.dizitart.no2.common.mapper.SimpleNitriteMapper;
 import org.dizitart.no2.exceptions.NitriteIOException;
 import org.dizitart.no2.exceptions.ValidationException;
 import org.dizitart.no2.index.IndexOptions;
@@ -41,7 +41,6 @@
 import org.dizitart.no2.repository.ObjectRepository;
 import org.dizitart.no2.repository.annotations.Id;
 import org.dizitart.no2.repository.annotations.Index;
-import org.dizitart.no2.repository.annotations.Indices;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -674,9 +673,7 @@ public CompatChild fromDocument(Document document, NitriteMapper nitriteMapper)
     @Data
     @NoArgsConstructor
     @AllArgsConstructor
-    @Indices({
-        @Index(fields = "synced", type = IndexType.NON_UNIQUE)
-    })
+    @Index(fields = "synced", type = IndexType.NON_UNIQUE)
     public static class Receipt {
         @Id
         private String clientRef;

diff --git a/nitrite-mvstore-adapter/src/test/java/org/dizitart/no2/integration/NitriteStressTest.java b/nitrite-mvstore-adapter/src/test/java/org/dizitart/no2/integration/NitriteStressTest.java
@@ -35,7 +35,6 @@
 import org.dizitart.no2.repository.ObjectRepository;
 import org.dizitart.no2.repository.annotations.Id;
 import org.dizitart.no2.repository.annotations.Index;
-import org.dizitart.no2.repository.annotations.Indices;
 import org.junit.*;
 import uk.co.jemos.podam.api.PodamFactory;
 import uk.co.jemos.podam.api.PodamFactoryImpl;
@@ -371,11 +370,9 @@ public PerfTest fromDocument(Document document, NitriteMapper nitriteMapper) {
         }
     }
 
-    @Indices({
-        @Index(fields = "firstName", type = IndexType.NON_UNIQUE),
-        @Index(fields = "age", type = IndexType.NON_UNIQUE),
-        @Index(fields = "text", type = IndexType.FULL_TEXT),
-    })
+    @Index(fields = "firstName", type = IndexType.NON_UNIQUE)
+    @Index(fields = "age", type = IndexType.NON_UNIQUE)
+    @Index(fields = "text", type = IndexType.FULL_TEXT)
     private static class PerfTestIndexed extends PerfTest {
 
         public static class Converter implements EntityConverter<PerfTestIndexed> {

diff --git a/...apter/src/test/java/org/dizitart/no2/integration/repository/CustomFieldSeparatorTest.java b/...apter/src/test/java/org/dizitart/no2/integration/repository/CustomFieldSeparatorTest.java
@@ -21,21 +21,20 @@
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import org.dizitart.no2.Nitrite;
+import org.dizitart.no2.NitriteConfig;
+import org.dizitart.no2.collection.Document;
 import org.dizitart.no2.common.mapper.EntityConverter;
+import org.dizitart.no2.common.mapper.NitriteMapper;
 import org.dizitart.no2.common.mapper.SimpleNitriteMapper;
+import org.dizitart.no2.index.IndexType;
 import org.dizitart.no2.integration.Retry;
 import org.dizitart.no2.integration.repository.data.Company;
 import org.dizitart.no2.integration.repository.data.Note;
-import org.dizitart.no2.Nitrite;
-import org.dizitart.no2.NitriteConfig;
-import org.dizitart.no2.collection.Document;
-import org.dizitart.no2.index.IndexType;
-import org.dizitart.no2.common.mapper.NitriteMapper;
 import org.dizitart.no2.mvstore.MVStoreModule;
 import org.dizitart.no2.repository.ObjectRepository;
 import org.dizitart.no2.repository.annotations.Id;
 import org.dizitart.no2.repository.annotations.Index;
-import org.dizitart.no2.repository.annotations.Indices;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -123,11 +122,9 @@ public void testFindByEmbeddedField() {
 
     @ToString
     @EqualsAndHashCode
-    @Indices({
-        @Index(fields = "joinDate", type = IndexType.NON_UNIQUE),
-        @Index(fields = "address", type = IndexType.FULL_TEXT),
-        @Index(fields = "employeeNote:text", type = IndexType.FULL_TEXT)
-    })
+    @Index(fields = "joinDate", type = IndexType.NON_UNIQUE)
+    @Index(fields = "address", type = IndexType.FULL_TEXT)
+    @Index(fields = "employeeNote:text", type = IndexType.FULL_TEXT)
     public static class EmployeeForCustomSeparator implements Serializable {
         @Id
         @Getter

diff --git a/...ter/src/test/java/org/dizitart/no2/integration/repository/UniversalTextTokenizerTest.java b/...ter/src/test/java/org/dizitart/no2/integration/repository/UniversalTextTokenizerTest.java
@@ -32,7 +32,6 @@
 import org.dizitart.no2.repository.Cursor;
 import org.dizitart.no2.repository.ObjectRepository;
 import org.dizitart.no2.repository.annotations.Index;
-import org.dizitart.no2.repository.annotations.Indices;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -179,9 +178,7 @@ public void testUniversalFullTextIndexing() {
         }
     }
 
-    @Indices(
-        @Index(fields = "text", type = IndexType.FULL_TEXT)
-    )
+    @Index(fields = "text", type = IndexType.FULL_TEXT)
     public static class TextData {
         public Integer id;
         public String text;

diff --git a/...e-mvstore-adapter/src/test/java/org/dizitart/no2/integration/repository/data/Company.java b/...e-mvstore-adapter/src/test/java/org/dizitart/no2/integration/repository/data/Company.java
@@ -25,7 +25,6 @@
 import org.dizitart.no2.common.mapper.NitriteMapper;
 import org.dizitart.no2.repository.annotations.Id;
 import org.dizitart.no2.repository.annotations.Index;
-import org.dizitart.no2.repository.annotations.Indices;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -37,9 +36,7 @@
  */
 @Getter
 @EqualsAndHashCode
-@Indices({
-    @Index(fields = "companyName")
-})
+@Index(fields = "companyName")
 public class Company implements Serializable {
     @Id(fieldName = "company_id")
     @Setter

diff --git a/nitrite-rocksdb-adapter/src/test/java/org/dizitart/no2/NitriteTest.java b/nitrite-rocksdb-adapter/src/test/java/org/dizitart/no2/NitriteTest.java
@@ -28,8 +28,8 @@
 import org.dizitart.no2.common.SortOrder;
 import org.dizitart.no2.common.concurrent.ThreadPoolManager;
 import org.dizitart.no2.common.mapper.EntityConverter;
-import org.dizitart.no2.common.mapper.SimpleNitriteMapper;
 import org.dizitart.no2.common.mapper.NitriteMapper;
+import org.dizitart.no2.common.mapper.SimpleNitriteMapper;
 import org.dizitart.no2.exceptions.NitriteIOException;
 import org.dizitart.no2.exceptions.ValidationException;
 import org.dizitart.no2.index.IndexOptions;
@@ -40,7 +40,6 @@
 import org.dizitart.no2.repository.ObjectRepository;
 import org.dizitart.no2.repository.annotations.Id;
 import org.dizitart.no2.repository.annotations.Index;
-import org.dizitart.no2.repository.annotations.Indices;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -477,9 +476,7 @@ public CompatChild fromDocument(Document document, NitriteMapper nitriteMapper)
     @Data
     @NoArgsConstructor
     @AllArgsConstructor
-    @Indices({
-        @Index(fields = "synced", type = IndexType.NON_UNIQUE)
-    })
+    @Index(fields = "synced", type = IndexType.NON_UNIQUE)
     public static class Receipt {
         @Id
         private String clientRef;

diff --git a/nitrite-rocksdb-adapter/src/test/java/org/dizitart/no2/integration/NitriteStressTest.java b/nitrite-rocksdb-adapter/src/test/java/org/dizitart/no2/integration/NitriteStressTest.java
@@ -35,7 +35,6 @@
 import org.dizitart.no2.repository.ObjectRepository;
 import org.dizitart.no2.repository.annotations.Id;
 import org.dizitart.no2.repository.annotations.Index;
-import org.dizitart.no2.repository.annotations.Indices;
 import org.junit.*;
 import uk.co.jemos.podam.api.PodamFactory;
 import uk.co.jemos.podam.api.PodamFactoryImpl;
@@ -368,11 +367,9 @@ public PerfTest fromDocument(Document document, NitriteMapper nitriteMapper) {
         }
     }
 
-    @Indices({
-        @Index(fields = "firstName", type = IndexType.NON_UNIQUE),
-        @Index(fields = "age", type = IndexType.NON_UNIQUE),
-        @Index(fields = "text", type = IndexType.FULL_TEXT),
-    })
+    @Index(fields = "firstName", type = IndexType.NON_UNIQUE)
+    @Index(fields = "age", type = IndexType.NON_UNIQUE)
+    @Index(fields = "text", type = IndexType.FULL_TEXT)
     private static class PerfTestIndexed extends PerfTest {
         public static class Converter implements EntityConverter<PerfTestIndexed> {
 

diff --git a/...apter/src/test/java/org/dizitart/no2/integration/repository/CustomFieldSeparatorTest.java b/...apter/src/test/java/org/dizitart/no2/integration/repository/CustomFieldSeparatorTest.java
@@ -34,7 +34,6 @@
 import org.dizitart.no2.repository.ObjectRepository;
 import org.dizitart.no2.repository.annotations.Id;
 import org.dizitart.no2.repository.annotations.Index;
-import org.dizitart.no2.repository.annotations.Indices;
 import org.dizitart.no2.rocksdb.RocksDBModule;
 import org.junit.After;
 import org.junit.Before;
@@ -122,11 +121,9 @@ public void testFindByEmbeddedField() {
 
     @ToString
     @EqualsAndHashCode
-    @Indices({
-        @Index(fields = "joinDate", type = IndexType.NON_UNIQUE),
-        @Index(fields = "address", type = IndexType.FULL_TEXT),
-        @Index(fields = "employeeNote:text", type = IndexType.FULL_TEXT)
-    })
+    @Index(fields = "joinDate", type = IndexType.NON_UNIQUE)
+    @Index(fields = "address", type = IndexType.FULL_TEXT)
+    @Index(fields = "employeeNote:text", type = IndexType.FULL_TEXT)
     public static class EmployeeForCustomSeparator implements Serializable {
         @Id
         @Getter

diff --git a/...ter/src/test/java/org/dizitart/no2/integration/repository/UniversalTextTokenizerTest.java b/...ter/src/test/java/org/dizitart/no2/integration/repository/UniversalTextTokenizerTest.java
@@ -30,7 +30,6 @@
 import org.dizitart.no2.repository.Cursor;
 import org.dizitart.no2.repository.ObjectRepository;
 import org.dizitart.no2.repository.annotations.Index;
-import org.dizitart.no2.repository.annotations.Indices;
 import org.dizitart.no2.rocksdb.RocksDBModule;
 import org.junit.After;
 import org.junit.Before;
@@ -165,9 +164,7 @@ public void testUniversalFullTextIndexing() {
         }
     }
 
-    @Indices(
-        @Index(fields = "text", type = IndexType.FULL_TEXT)
-    )
+    @Index(fields = "text", type = IndexType.FULL_TEXT)
     public static class TextData {
         public Integer id;
         public String text;

diff --git a/...e-rocksdb-adapter/src/test/java/org/dizitart/no2/integration/repository/data/Company.java b/...e-rocksdb-adapter/src/test/java/org/dizitart/no2/integration/repository/data/Company.java
@@ -25,7 +25,6 @@
 import org.dizitart.no2.common.mapper.NitriteMapper;
 import org.dizitart.no2.repository.annotations.Id;
 import org.dizitart.no2.repository.annotations.Index;
-import org.dizitart.no2.repository.annotations.Indices;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -37,9 +36,7 @@
  */
 @Getter
 @EqualsAndHashCode
-@Indices({
-    @Index(fields = "companyName")
-})
+@Index(fields = "companyName")
 public class Company implements Serializable {
     @Id(fieldName = "company_id")
     @Setter

diff --git a/nitrite-support/src/test/java/org/dizitart/no2/support/data/Company.java b/nitrite-support/src/test/java/org/dizitart/no2/support/data/Company.java
@@ -22,7 +22,6 @@
 import org.dizitart.no2.common.mapper.NitriteMapper;
 import org.dizitart.no2.repository.annotations.Id;
 import org.dizitart.no2.repository.annotations.Index;
-import org.dizitart.no2.repository.annotations.Indices;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -33,9 +32,7 @@
  * @author Anindya Chatterjee.
  */
 @Data
-@Indices({
-    @Index(fields = "companyName")
-})
+@Index(fields = "companyName")
 public class Company implements Serializable {
     @Id(fieldName = "company_id")
     private Long companyId;

diff --git a/nitrite-support/src/test/java/org/dizitart/no2/support/data/Employee.java b/nitrite-support/src/test/java/org/dizitart/no2/support/data/Employee.java
@@ -22,11 +22,10 @@
 import lombok.ToString;
 import org.dizitart.no2.collection.Document;
 import org.dizitart.no2.common.mapper.EntityConverter;
+import org.dizitart.no2.common.mapper.NitriteMapper;
 import org.dizitart.no2.index.IndexType;
 import org.dizitart.no2.repository.annotations.Id;
 import org.dizitart.no2.repository.annotations.Index;
-import org.dizitart.no2.repository.annotations.Indices;
-import org.dizitart.no2.common.mapper.NitriteMapper;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -36,11 +35,9 @@
  */
 @ToString
 @EqualsAndHashCode
-@Indices({
-    @Index(fields = "joinDate", type = IndexType.NON_UNIQUE),
-    @Index(fields = "address", type = IndexType.FULL_TEXT),
-    @Index(fields = "employeeNote.text", type = IndexType.FULL_TEXT)
-})
+@Index(fields = "joinDate", type = IndexType.NON_UNIQUE)
+@Index(fields = "address", type = IndexType.FULL_TEXT)
+@Index(fields = "employeeNote.text", type = IndexType.FULL_TEXT)
 public class Employee implements Serializable {
     @Id
     @Getter