Skip to content

Commit 77c872d

Browse files
anidotnetanidotnet
committed
checkpoint 5
1 parent 6ab4d63 commit 77c872d

File tree

462 files changed

+10403
-18964
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

462 files changed

+10403
-18964
lines changed

‎nitrite-bom/build.gradle‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ dependencies {
2222

2323
api project(":nitrite-mvstore-adapter")
2424
api project(":nitrite-rocksdb-adapter")
25-
api project(":nitrite-mapdb-adapter")
2625

2726
api "org.slf4j:slf4j-api:1.7.30"
2827
api "org.objenesis:objenesis:2.6"
@@ -34,7 +33,7 @@ dependencies {
3433
api "org.mapdb:mapdb:3.0.8"
3534
api "com.h2database:h2-mvstore:1.4.200"
3635
api "com.squareup.okhttp3:okhttp:4.9.0"
37-
api "org.rocksdb:rocksdbjni:6.13.3"
36+
api "org.rocksdb:rocksdbjni:6.20.3"
3837
api "com.esotericsoftware:kryo:4.0.2"
3938
api "org.locationtech.jts:jts-core:1.17.1"
4039
api "commons-codec:commons-codec:1.15"

‎nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/migrate/MigrationTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ public void testCollectionMigrate() {
147147
collection.insert(document);
148148
}
149149

150-
collection.createIndex(indexOptions(IndexType.NonUnique), "firstName");
151-
collection.createIndex(indexOptions(IndexType.NonUnique), "bloodGroup");
150+
collection.createIndex(indexOptions(IndexType.NON_UNIQUE), "firstName");
151+
collection.createIndex(indexOptions(IndexType.NON_UNIQUE), "bloodGroup");
152152
db.close();
153153

154154
Migration migration = new Migration(Constants.INITIAL_SCHEMA_VERSION, 2) {
@@ -195,7 +195,7 @@ public void migrate(Instructions instructions) {
195195
.addField("address")
196196
.addField("vehicles", 1)
197197
.renameField("age", "ageGroup")
198-
.createIndex(IndexType.NonUnique, "ageGroup");
198+
.createIndex(IndexType.NON_UNIQUE, "ageGroup");
199199
}
200200
};
201201

‎nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/migrate/NewClass.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
*/
2929
@Data
3030
@Entity(value = "new", indices = {
31-
@Index(value = "familyName", type = IndexType.NonUnique),
32-
@Index(value = "fullName", type = IndexType.NonUnique),
33-
@Index(value = "literature.ratings", type = IndexType.NonUnique),
31+
@Index(value = "familyName", type = IndexType.NON_UNIQUE),
32+
@Index(value = "fullName", type = IndexType.NON_UNIQUE),
33+
@Index(value = "literature.ratings", type = IndexType.NON_UNIQUE),
3434
})
3535
public class NewClass {
3636
@Id

‎nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/migrate/OldClass.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
*/
2929
@Data
3030
@Entity(value = "old", indices = {
31-
@Index(value = "firstName", type = IndexType.NonUnique),
32-
@Index(value = "lastName", type = IndexType.NonUnique),
33-
@Index(value = "literature.text", type = IndexType.Fulltext),
34-
@Index(value = "literature.ratings", type = IndexType.NonUnique),
31+
@Index(value = "firstName", type = IndexType.NON_UNIQUE),
32+
@Index(value = "lastName", type = IndexType.NON_UNIQUE),
33+
@Index(value = "literature.text", type = IndexType.FULL_TEXT),
34+
@Index(value = "literature.ratings", type = IndexType.NON_UNIQUE),
3535
})
3636
public class OldClass {
3737
@Id

‎nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/CustomFieldSeparatorTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,9 @@ public void testFindByEmbeddedField() {
117117
@ToString
118118
@EqualsAndHashCode
119119
@Indices({
120-
@Index(value = "joinDate", type = IndexType.NonUnique),
121-
@Index(value = "address", type = IndexType.Fulltext),
122-
@Index(value = "employeeNote:text", type = IndexType.Fulltext)
120+
@Index(value = "joinDate", type = IndexType.NON_UNIQUE),
121+
@Index(value = "address", type = IndexType.FULL_TEXT),
122+
@Index(value = "employeeNote:text", type = IndexType.FULL_TEXT)
123123
})
124124
public static class EmployeeForCustomSeparator implements Serializable {
125125
@Id

‎nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/ObjectRepositoryTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,8 @@ public void testIssue217() {
344344

345345
@Data
346346
@Entity(value = "entity.employee", indices = {
347-
@Index(value = "firstName", type = IndexType.NonUnique),
348-
@Index(value = "lastName", type = IndexType.NonUnique),
347+
@Index(value = "firstName", type = IndexType.NON_UNIQUE),
348+
@Index(value = "lastName", type = IndexType.NON_UNIQUE),
349349
})
350350
private static class EmployeeEntity {
351351
private static final Faker faker = new Faker();

‎nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/RepositoryModificationTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ public void testCreateIndex() {
5151
assertTrue(companyRepository.hasIndex("companyName"));
5252
assertFalse(companyRepository.hasIndex("dateCreated"));
5353

54-
companyRepository.createIndex(IndexOptions.indexOptions(IndexType.NonUnique), "dateCreated");
54+
companyRepository.createIndex(IndexOptions.indexOptions(IndexType.NON_UNIQUE), "dateCreated");
5555
assertTrue(companyRepository.hasIndex("dateCreated"));
5656
assertFalse(companyRepository.isIndexing("dateCreated"));
5757
}
5858

5959
@Test
6060
public void testRebuildIndex() {
61-
companyRepository.createIndex(IndexOptions.indexOptions(IndexType.NonUnique), "dateCreated");
61+
companyRepository.createIndex(IndexOptions.indexOptions(IndexType.NON_UNIQUE), "dateCreated");
6262
assertFalse(companyRepository.isIndexing("dateCreated"));
6363

6464
companyRepository.rebuildIndex("dateCreated");
@@ -73,7 +73,7 @@ public void testListIndexes() {
7373
Collection<IndexDescriptor> indices = companyRepository.listIndices();
7474
assertEquals(indices.size(), 2);
7575

76-
companyRepository.createIndex(IndexOptions.indexOptions(IndexType.NonUnique), "dateCreated");
76+
companyRepository.createIndex(IndexOptions.indexOptions(IndexType.NON_UNIQUE), "dateCreated");
7777
indices = companyRepository.listIndices();
7878
assertEquals(indices.size(), 3);
7979
}

‎nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/UniversalTextTokenizerTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ public void testUniversalFullTextIndexing() {
181181
}
182182

183183
@Indices(
184-
@Index(value = "text", type = IndexType.Fulltext)
184+
@Index(value = "text", type = IndexType.FULL_TEXT)
185185
)
186186
public static class TextData {
187187
public int id;

‎nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/Book.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
*/
3232
@Data
3333
@Entity(value = "books", indices = {
34-
@Index(value = "tags", type = IndexType.NonUnique),
35-
@Index(value = "description", type = IndexType.Fulltext),
34+
@Index(value = "tags", type = IndexType.NON_UNIQUE),
35+
@Index(value = "description", type = IndexType.FULL_TEXT),
3636
@Index(value = { "price", "publisher" })
3737
})
3838
public class Book {

‎nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/Employee.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
*/
3434
@ToString
3535
@EqualsAndHashCode
36-
@Index(value = "joinDate", type = IndexType.NonUnique)
37-
@Index(value = "address", type = IndexType.Fulltext)
38-
@Index(value = "employeeNote.text", type = IndexType.Fulltext)
36+
@Index(value = "joinDate", type = IndexType.NON_UNIQUE)
37+
@Index(value = "address", type = IndexType.FULL_TEXT)
38+
@Index(value = "employeeNote.text", type = IndexType.FULL_TEXT)
3939
public class Employee implements Serializable {
4040
@Id
4141
@Getter

0 commit comments

Comments
 (0)