chore!: remove deprecations + general clean up (#23)

fernandonogueira · Mar 3, 2024 · 55bcca7 · 55bcca7
1 parent 77dfaca
commit 55bcca7
Show file tree

Hide file tree

Showing 11 changed files with 51 additions and 76 deletions.
diff --git a/src/main/java/ox/engine/Ox.java b/src/main/java/ox/engine/Ox.java
@@ -1,6 +1,5 @@
 package ox.engine;
 
-import com.mongodb.Mongo;
 import com.mongodb.MongoClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -124,25 +123,28 @@ private List<ResolvedMigration> resolveMigrations(String scanPackage)
         Class<?>[] resources = scanner.scanForClasses(new Location(scanPackage), Migration.class);
 
         List<ResolvedMigration> resolvedMigrations = new ArrayList<>();
-        if (resources != null && resources.length > 0) {
-            for (Class<?> resource : resources) {
-                if (Migration.class.isAssignableFrom(resource)) {
-                    Pattern pattern = Pattern.compile("V\\d*_");
-                    Matcher matcher = pattern.matcher(resource.getCanonicalName());
-                    if (matcher.find()) {
-                        String string = matcher.group();
 
-                        ResolvedMigration resolvedMigration = new ResolvedMigration();
-                        Migration migration = ((Class<Migration>) resource).newInstance();
-                        resolvedMigration.setMigrate(migration);
+        if (resources == null) {
+            return resolvedMigrations;
+        }
+
+        for (Class<?> resource : resources) {
+            if (Migration.class.isAssignableFrom(resource)) {
+                Pattern pattern = Pattern.compile("V\\d*_");
+                Matcher matcher = pattern.matcher(resource.getCanonicalName());
+                if (matcher.find()) {
+                    String string = matcher.group();
+
+                    ResolvedMigration resolvedMigration = new ResolvedMigration();
+                    Migration migration = ((Class<Migration>) resource).newInstance();
+                    resolvedMigration.setMigrate(migration);
 
-                        Integer version = Integer.valueOf(string.substring(1, string.length() - 1));
-                        resolvedMigration.setVersion(version);
+                    Integer version = Integer.valueOf(string.substring(1, string.length() - 1));
+                    resolvedMigration.setVersion(version);
 
-                        resolvedMigrations.add(resolvedMigration);
+                    resolvedMigrations.add(resolvedMigration);
 
-                        LOG.info("[Ox] Resolved Migrate Found: " + resolvedMigration);
-                    }
+                    LOG.info("[Ox] Resolved Migrate Found: " + resolvedMigration);
                 }
             }
         }

diff --git a/src/main/java/ox/engine/internal/CreateIndexAction.java b/src/main/java/ox/engine/internal/CreateIndexAction.java
@@ -1,7 +1,7 @@
 package ox.engine.internal;
 
 import com.mongodb.BasicDBObject;
-import com.mongodb.Mongo;
+import com.mongodb.MongoClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import ox.engine.exception.IndexAlreadyExistsException;
@@ -18,7 +18,7 @@ public class CreateIndexAction extends OxAction {
 
     private static final Logger LOG = LoggerFactory.getLogger(CreateIndexAction.class);
 
-    private Map<String, OrderingType> attributes = new LinkedHashMap<String, OrderingType>();
+    private final Map<String, OrderingType> attributes = new LinkedHashMap<>();
 
     private final String indexName;
     private boolean ifNotExists;
@@ -148,14 +148,14 @@ protected void validateAction() throws InvalidMigrateActionException {
             throw new InvalidMigrateActionException("Invalid Migrate action.");
         }
 
-        if (attributes != null && attributes.size() > 1 && ttlIndex) {
+        if (attributes.size() > 1 && ttlIndex) {
             throw new InvalidMigrateActionException("TTL indexes can not have more than 1 attribute");
         }
 
     }
 
     @Override
-    void runAction(MongoDBConnector mongoDBConnector, Mongo mongo, String databaseName) {
+    void runAction(MongoDBConnector mongoDBConnector, MongoClient mongo, String databaseName) {
 
         boolean existsWithSameNameAndDifferentAttrs = mongoDBConnector
                 .verifyIfHasSameNameAndDifferentAttributes(attributes, indexName, collection);

diff --git a/src/main/java/ox/engine/internal/MongoDBConnector.java b/src/main/java/ox/engine/internal/MongoDBConnector.java
@@ -91,12 +91,13 @@ private Integer getVersion(DB db) {
         DBCollection collection = db.getCollection(Configuration.SCHEMA_VERSION_COLLECTION_NAME);
         BasicDBObject o = new BasicDBObject();
         o.append(Configuration.MIGRATION_COLLECTION_VERSION_ATTRIBUTE, -1);
-        DBCursor result = collection.find().sort(o).limit(1);
-        while (result.hasNext()) {
+        try (DBCursor result = collection.find().sort(o).limit(1)) {
+            if (!result.hasNext()) {
+                return 0;
+            }
             DBObject current = result.next();
             return (Integer) current.get(Configuration.MIGRATION_COLLECTION_VERSION_ATTRIBUTE);
         }
-        return 0;
     }
 
     public void executeCommand(OxAction action) {

diff --git a/src/main/java/ox/engine/internal/OxAction.java b/src/main/java/ox/engine/internal/OxAction.java
@@ -1,6 +1,6 @@
 package ox.engine.internal;
 
-import com.mongodb.Mongo;
+import com.mongodb.MongoClient;
 import ox.engine.exception.InvalidMigrateActionException;
 
 public abstract class OxAction {
@@ -46,5 +46,5 @@ public void execute(OxEnvironment env) throws InvalidMigrateActionException {
         env.execute(this);
     }
 
-    abstract void runAction(MongoDBConnector mongoDBConnector, Mongo mongo, String databaseName);
-}
+    abstract void runAction(MongoDBConnector mongoDBConnector, MongoClient mongo, String databaseName);
+}
diff --git a/src/main/java/ox/engine/internal/RemoveCollectionAction.java b/src/main/java/ox/engine/internal/RemoveCollectionAction.java
@@ -1,6 +1,6 @@
 package ox.engine.internal;
 
-import com.mongodb.Mongo;
+import com.mongodb.MongoClient;
 import ox.engine.exception.InvalidMigrateActionException;
 
 public class RemoveCollectionAction extends OxAction {
@@ -21,7 +21,7 @@ protected void validateAction() throws InvalidMigrateActionException {
     }
 
     @Override
-    void runAction(MongoDBConnector mongoDBConnector, Mongo mongo, String databaseName) {
+    void runAction(MongoDBConnector mongoDBConnector, MongoClient mongo, String databaseName) {
         if (mongoDBConnector.verifyIfCollectionExists(collection)) {
             mongoDBConnector.removeCollection(collection);
         }

diff --git a/src/main/java/ox/engine/internal/RemoveIndexAction.java b/src/main/java/ox/engine/internal/RemoveIndexAction.java
@@ -1,6 +1,6 @@
 package ox.engine.internal;
 
-import com.mongodb.Mongo;
+import com.mongodb.MongoClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import ox.engine.exception.InvalidMigrateActionException;
@@ -52,7 +52,7 @@ protected void validateAction() throws InvalidMigrateActionException {
     }
 
     @Override
-    void runAction(MongoDBConnector mongoDBConnector, Mongo mongo, String databaseName) {
+    void runAction(MongoDBConnector mongoDBConnector, MongoClient mongo, String databaseName) {
 
         boolean doesItExists = mongoDBConnector.verifyIfIndexExists(null, indexName, collection);
 
@@ -70,4 +70,4 @@ void runAction(MongoDBConnector mongoDBConnector, Mongo mongo, String databaseNa
         }
 
     }
-}
+}
diff --git a/src/test/java/ox/engine/internal/ValidateCreateGeoSpatialIndexTest.java b/src/test/java/ox/engine/internal/ValidateCreateGeoSpatialIndexTest.java
@@ -1,6 +1,6 @@
 package ox.engine.internal;
 
-import com.mongodb.Mongo;
+import com.mongodb.MongoClient;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -11,7 +11,7 @@
 public class ValidateCreateGeoSpatialIndexTest {
 
     @Mock
-    private Mongo mongo;
+    private MongoClient mongo;
 
     @Mock
     private MongoDBConnector connector;

diff --git a/src/test/java/ox/engine/internal/ValidateCreateIndexRecreateIfAlreadyExistsTest.java b/src/test/java/ox/engine/internal/ValidateCreateIndexRecreateIfAlreadyExistsTest.java
@@ -1,6 +1,6 @@
 package ox.engine.internal;
 
-import com.mongodb.Mongo;
+import com.mongodb.MongoClient;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -19,9 +19,8 @@ public class ValidateCreateIndexRecreateIfAlreadyExistsTest {
     private MongoDBConnector connector;
 
     @Mock
-    private Mongo mongo;
+    private MongoClient mongo;
 
-    @SuppressWarnings("unchecked")
     @Test
     public void testCreateIndexRecreateIfAlreadyExists() throws InvalidMigrateActionException {
 

diff --git a/src/test/java/ox/engine/internal/ValidateCreateIndexTest.java b/src/test/java/ox/engine/internal/ValidateCreateIndexTest.java
@@ -99,14 +99,6 @@ public void createIndexIfIndexAlreadyExistsTest() {
 
         Mockito.when(collection.getIndexInfo()).thenReturn(indexInfo);
 
-//        Mockito.when(
-//                        connector
-//                                .verifyIfIndexExists(
-//                                        Mockito.anyMap(),
-//                                        Mockito.anyString(),
-//                                        Mockito.anyString()))
-//                .thenReturn(true);
-
         OxAction
                 .createIndex("myIndex")
                 .ifNotExists()
@@ -186,28 +178,10 @@ public void createAnInvalidIndexTest() throws InvalidMigrateActionException {
     @Test(expected = InvalidMigrateActionException.class)
     public void createAnInvalidTTLIndex() throws InvalidMigrateActionException {
 
-//        DB db = Mockito.mock(DB.class);
-        DBCollection collection = Mockito.mock(DBCollection.class);
         OxEnvironment env = new OxEnvironment();
-
-//        Mockito.when(db.getCollection(Mockito.anyString())).thenReturn(collection);
-
-        ArrayList<DBObject> indexInfo = new ArrayList<DBObject>();
-
-        BasicDBObject keys = new BasicDBObject();
-        keys.append("attr2", 1);
-
-        BasicDBObject o = new BasicDBObject();
-        o.append("key", keys);
-        o.append("name", "myIndex");
-
-//        indexInfo.add(o);
-
-//        Mockito.when(collection.getIndexInfo()).thenReturn(indexInfo);
-
         OxAction
                 .createIndex("myIndex")
-                .setCollection("myLittleCollection")
+                .setCollection("myRandomCollection")
                 .ifNotExists()
                 .addAttribute("attr1", OrderingType.ASC)
                 .addAttribute("attr2", OrderingType.ASC)

diff --git a/src/test/java/ox/engine/internal/ValidateIndexAlreadyExistsExceptionTest.java b/src/test/java/ox/engine/internal/ValidateIndexAlreadyExistsExceptionTest.java
@@ -1,6 +1,6 @@
 package ox.engine.internal;
 
-import com.mongodb.Mongo;
+import com.mongodb.MongoClient;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
@@ -18,7 +18,7 @@ public class ValidateIndexAlreadyExistsExceptionTest {
     private CreateIndexAction action;
 
     @Mock
-    private Mongo mongo;
+    private MongoClient mongo;
 
     @Mock
     private MongoDBConnector connector;
@@ -27,16 +27,15 @@ public class ValidateIndexAlreadyExistsExceptionTest {
     public void validateIndexAlreadyExistsException() {
 
         action = OxAction
-            .createIndex("myIndexTest")
-            .setCollection("myCollectionTest")
-            .addAttribute("anyAttr", OrderingType.GEO_2DSPHERE);
-
-        Mockito.when(connector
-        .verifyIfIndexExists(
-                Mockito.anyMap(),
-                Mockito.anyString(),
-                Mockito.anyString()))
-        .thenReturn(true);
+                .createIndex("myIndexTest")
+                .setCollection("myCollectionTest")
+                .addAttribute("anyAttr", OrderingType.GEO_2DSPHERE);
+
+        Mockito.when(connector.verifyIfIndexExists(
+                        Mockito.anyMap(),
+                        Mockito.anyString(),
+                        Mockito.anyString()))
+                .thenReturn(true);
 
         action.runAction(connector, mongo, "myDatabase");
     }

diff --git a/src/test/java/ox/utils/Faker.java b/src/test/java/ox/utils/Faker.java
@@ -4,7 +4,7 @@
 
 public class Faker {
 
-    private static List<String> prefixes = List.of("Bulbasaur", "Ivysaur", "Venusaur", "Charmander",
+    private static final List<String> prefixes = List.of("Bulbasaur", "Ivysaur", "Venusaur", "Charmander",
             "Charmeleon", "Charizard", "Squirtle", "Wartortle", "Blastoise", "Caterpie", "Metapod",
             "Butterfree", "Weedle", "Kakuna", "Beedrill", "Pidgey", "Pidgeotto", "Pidgeot", "Rattata", "Raticate",
             "Spearow", "Fearow", "Ekans", "Arbok", "Pikachu", "Raichu", "Sandshrew", "Sandslash", "Nidoran",