Extract mongo version to interface (#228)

bwaldvogel · Mar 18, 2024 · a6c1f22 · a6c1f22
1 parent 03b38aa
commit a6c1f22
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 12 deletions.
diff --git a/core/src/main/java/de/bwaldvogel/mongo/MongoBackend.java b/core/src/main/java/de/bwaldvogel/mongo/MongoBackend.java
@@ -38,6 +38,6 @@ public interface MongoBackend {
 
     MongoDatabase resolveDatabase(String database);
 
-    MongoBackend version(ServerVersion version);
+    MongoBackend version(MongoVersion version);
 
 }
diff --git a/core/src/main/java/de/bwaldvogel/mongo/MongoVersion.java b/core/src/main/java/de/bwaldvogel/mongo/MongoVersion.java
@@ -0,0 +1,17 @@
+package de.bwaldvogel.mongo;
+
+import java.util.List;
+
+import de.bwaldvogel.mongo.backend.Utils;
+
+public interface MongoVersion {
+
+    List<Integer> getVersionArray();
+
+    default String toVersionString() {
+        return Utils.join(getVersionArray(), ".");
+    }
+
+    int getWireVersion();
+
+}
diff --git a/core/src/main/java/de/bwaldvogel/mongo/ServerVersion.java b/core/src/main/java/de/bwaldvogel/mongo/ServerVersion.java
@@ -3,9 +3,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import de.bwaldvogel.mongo.backend.Utils;
-
-public enum ServerVersion {
+public enum ServerVersion implements MongoVersion {
     MONGO_3_6(List.of(3, 6, 0), 6);
 
     private final List<Integer> versionArray;
@@ -20,10 +18,6 @@ public List<Integer> getVersionArray() {
         return Collections.unmodifiableList(versionArray);
     }
 
-    public String toVersionString() {
-        return Utils.join(versionArray, ".");
-    }
-
     public int getWireVersion() {
         return wireVersion;
     }

diff --git a/core/src/main/java/de/bwaldvogel/mongo/backend/AbstractMongoBackend.java b/core/src/main/java/de/bwaldvogel/mongo/backend/AbstractMongoBackend.java
@@ -22,6 +22,7 @@
 import de.bwaldvogel.mongo.MongoBackend;
 import de.bwaldvogel.mongo.MongoCollection;
 import de.bwaldvogel.mongo.MongoDatabase;
+import de.bwaldvogel.mongo.MongoVersion;
 import de.bwaldvogel.mongo.ServerVersion;
 import de.bwaldvogel.mongo.bson.Document;
 import de.bwaldvogel.mongo.exception.MongoServerException;
@@ -49,7 +50,7 @@ public abstract class AbstractMongoBackend implements MongoBackend {
 
     private final Map<String, MongoDatabase> databases = new ConcurrentHashMap<>();
 
-    private ServerVersion version = ServerVersion.MONGO_3_6;
+    private MongoVersion version = ServerVersion.MONGO_3_6;
 
     private final Clock clock;
     private final Instant started;
@@ -434,7 +435,7 @@ public void close() {
     }
 
     @Override
-    public MongoBackend version(ServerVersion version) {
+    public MongoBackend version(MongoVersion version) {
         this.version = version;
         return this;
     }

diff --git a/core/src/main/java/de/bwaldvogel/mongo/backend/ReadOnlyProxy.java b/core/src/main/java/de/bwaldvogel/mongo/backend/ReadOnlyProxy.java
@@ -7,7 +7,7 @@
 
 import de.bwaldvogel.mongo.MongoBackend;
 import de.bwaldvogel.mongo.MongoDatabase;
-import de.bwaldvogel.mongo.ServerVersion;
+import de.bwaldvogel.mongo.MongoVersion;
 import de.bwaldvogel.mongo.backend.aggregation.Aggregation;
 import de.bwaldvogel.mongo.bson.Document;
 import de.bwaldvogel.mongo.exception.MongoServerException;
@@ -104,7 +104,7 @@ public void dropDatabase(String database) {
     }
 
     @Override
-    public MongoBackend version(ServerVersion version) {
+    public MongoBackend version(MongoVersion version) {
         throw new ReadOnlyException("not supported");
     }