Avoid split packages on MongoDB with Panache

quarkusio · Jul 19, 2021 · 7f7b3b7 · 7f7b3b7
1 parent dc60271
commit 7f7b3b7
Show file tree

Hide file tree

Showing 20 changed files with 60 additions and 35 deletions.
diff --git a/...rc/main/java/io/quarkus/mongodb/panache/deployment/BasePanacheMongoResourceProcessor.java b/...rc/main/java/io/quarkus/mongodb/panache/deployment/BasePanacheMongoResourceProcessor.java
@@ -50,8 +50,8 @@
 import io.quarkus.mongodb.deployment.MongoClientNameBuildItem;
 import io.quarkus.mongodb.deployment.MongoUnremovableClientsBuildItem;
 import io.quarkus.mongodb.panache.MongoEntity;
-import io.quarkus.mongodb.panache.PanacheMongoRecorder;
 import io.quarkus.mongodb.panache.ProjectionFor;
+import io.quarkus.mongodb.panache.common.PanacheMongoRecorder;
 import io.quarkus.mongodb.panache.jackson.ObjectIdDeserializer;
 import io.quarkus.mongodb.panache.jackson.ObjectIdSerializer;
 import io.quarkus.panache.common.deployment.EntityField;

diff --git a/...-common/runtime/src/main/java/io/quarkus/mongodb/panache/binder/PanacheQlQueryBinder.java b/...-common/runtime/src/main/java/io/quarkus/mongodb/panache/binder/PanacheQlQueryBinder.java
@@ -6,7 +6,7 @@
 import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.CommonTokenStream;
 
-import io.quarkus.mongodb.panache.runtime.MongoPropertyUtil;
+import io.quarkus.mongodb.panache.common.runtime.MongoPropertyUtil;
 import io.quarkus.panacheql.internal.HqlLexer;
 import io.quarkus.panacheql.internal.HqlParser;
 import io.quarkus.panacheql.internal.HqlParserBaseVisitor;

diff --git a/...mongodb/panache/PanacheMongoRecorder.java → .../panache/common/PanacheMongoRecorder.java b/...mongodb/panache/PanacheMongoRecorder.java → .../panache/common/PanacheMongoRecorder.java
@@ -1,8 +1,8 @@
-package io.quarkus.mongodb.panache;
+package io.quarkus.mongodb.panache.common;
 
 import java.util.Map;
 
-import io.quarkus.mongodb.panache.runtime.MongoPropertyUtil;
+import io.quarkus.mongodb.panache.common.runtime.MongoPropertyUtil;
 import io.quarkus.runtime.annotations.Recorder;
 
 @Recorder

diff --git a/...ntime/CommonReactivePanacheQueryImpl.java → ...ntime/CommonReactivePanacheQueryImpl.java b/...ntime/CommonReactivePanacheQueryImpl.java → ...ntime/CommonReactivePanacheQueryImpl.java
@@ -1,4 +1,4 @@
-package io.quarkus.mongodb.panache.reactive.runtime;
+package io.quarkus.mongodb.panache.common.reactive.runtime;
 
 import java.util.List;
 import java.util.Optional;
@@ -11,7 +11,7 @@
 import com.mongodb.client.model.Collation;
 
 import io.quarkus.mongodb.FindOptions;
-import io.quarkus.mongodb.panache.runtime.MongoPropertyUtil;
+import io.quarkus.mongodb.panache.common.runtime.MongoPropertyUtil;
 import io.quarkus.mongodb.reactive.ReactiveMongoCollection;
 import io.quarkus.panache.common.Page;
 import io.quarkus.panache.common.Range;

diff --git a/...tive/runtime/ReactiveMongoOperations.java → ...tive/runtime/ReactiveMongoOperations.java b/...tive/runtime/ReactiveMongoOperations.java → ...tive/runtime/ReactiveMongoOperations.java
@@ -1,8 +1,8 @@
-package io.quarkus.mongodb.panache.reactive.runtime;
+package io.quarkus.mongodb.panache.common.reactive.runtime;
 
-import static io.quarkus.mongodb.panache.runtime.BeanUtils.beanName;
-import static io.quarkus.mongodb.panache.runtime.BeanUtils.clientFromArc;
-import static io.quarkus.mongodb.panache.runtime.BeanUtils.getDatabaseName;
+import static io.quarkus.mongodb.panache.common.runtime.BeanUtils.beanName;
+import static io.quarkus.mongodb.panache.common.runtime.BeanUtils.clientFromArc;
+import static io.quarkus.mongodb.panache.common.runtime.BeanUtils.getDatabaseName;
 
 import java.util.ArrayList;
 import java.util.Arrays;

diff --git a/...ve/runtime/ReactivePanacheUpdateImpl.java → ...ve/runtime/ReactivePanacheUpdateImpl.java b/...ve/runtime/ReactivePanacheUpdateImpl.java → ...ve/runtime/ReactivePanacheUpdateImpl.java
@@ -1,4 +1,4 @@
-package io.quarkus.mongodb.panache.reactive.runtime;
+package io.quarkus.mongodb.panache.common.reactive.runtime;
 
 import java.util.Map;
 

diff --git a/...us/mongodb/panache/runtime/BeanUtils.java → ...odb/panache/common/runtime/BeanUtils.java b/...us/mongodb/panache/runtime/BeanUtils.java → ...odb/panache/common/runtime/BeanUtils.java
@@ -1,4 +1,4 @@
-package io.quarkus.mongodb.panache.runtime;
+package io.quarkus.mongodb.panache.common.runtime;
 
 import java.lang.annotation.Annotation;
 

diff --git a/...nache/runtime/CommonPanacheQueryImpl.java → ...ommon/runtime/CommonPanacheQueryImpl.java b/...nache/runtime/CommonPanacheQueryImpl.java → ...ommon/runtime/CommonPanacheQueryImpl.java
@@ -1,4 +1,4 @@
-package io.quarkus.mongodb.panache.runtime;
+package io.quarkus.mongodb.panache.common.runtime;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...godb/panache/runtime/MongoOperations.java → ...nache/common/runtime/MongoOperations.java b/...godb/panache/runtime/MongoOperations.java → ...nache/common/runtime/MongoOperations.java
@@ -1,8 +1,4 @@
-package io.quarkus.mongodb.panache.runtime;
-
-import static io.quarkus.mongodb.panache.runtime.BeanUtils.beanName;
-import static io.quarkus.mongodb.panache.runtime.BeanUtils.clientFromArc;
-import static io.quarkus.mongodb.panache.runtime.BeanUtils.getDatabaseName;
+package io.quarkus.mongodb.panache.common.runtime;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -342,7 +338,7 @@ ClientSession getSession(Class<?> entityClass) {
 
     private ClientSession registerClientSession(MongoEntity mongoEntity, TransactionSynchronizationRegistry registry) {
         TransactionManager transactionManager = Arc.container().instance(TransactionManager.class).get();
-        MongoClient client = clientFromArc(mongoEntity, MongoClient.class, false);
+        MongoClient client = BeanUtils.clientFromArc(mongoEntity, MongoClient.class, false);
         ClientSession clientSession = client.startSession();
         clientSession.startTransaction();//TODO add txoptions from annotation
         registry.putResource(SESSION_KEY, clientSession);
@@ -381,7 +377,7 @@ private MongoCollection mongoCollection(Object entity) {
     }
 
     private MongoDatabase mongoDatabase(MongoEntity entity) {
-        MongoClient mongoClient = clientFromArc(entity, MongoClient.class, false);
+        MongoClient mongoClient = BeanUtils.clientFromArc(entity, MongoClient.class, false);
         if (entity != null && !entity.database().isEmpty()) {
             return mongoClient.getDatabase(entity.database());
         }
@@ -390,10 +386,10 @@ private MongoDatabase mongoDatabase(MongoEntity entity) {
     }
 
     private String getDefaultDatabaseName(MongoEntity entity) {
-        return defaultDatabaseName.computeIfAbsent(beanName(entity), new Function<String, String>() {
+        return defaultDatabaseName.computeIfAbsent(BeanUtils.beanName(entity), new Function<String, String>() {
             @Override
             public String apply(String beanName) {
-                return getDatabaseName(entity, beanName);
+                return BeanUtils.getDatabaseName(entity, beanName);
             }
         });
     }

diff --git a/...db/panache/runtime/MongoPropertyUtil.java → ...che/common/runtime/MongoPropertyUtil.java b/...db/panache/runtime/MongoPropertyUtil.java → ...che/common/runtime/MongoPropertyUtil.java
@@ -1,4 +1,4 @@
-package io.quarkus.mongodb.panache.runtime;
+package io.quarkus.mongodb.panache.common.runtime;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;

diff --git a/...db/panache/runtime/PanacheUpdateImpl.java → ...che/common/runtime/PanacheUpdateImpl.java b/...db/panache/runtime/PanacheUpdateImpl.java → ...che/common/runtime/PanacheUpdateImpl.java
@@ -1,4 +1,4 @@
-package io.quarkus.mongodb.panache.runtime;
+package io.quarkus.mongodb.panache.common.runtime;
 
 import java.util.Map;
 

diff --git a/.../panache/runtime/MongoOperationsTest.java → ...e/common/runtime/MongoOperationsTest.java b/.../panache/runtime/MongoOperationsTest.java → ...e/common/runtime/MongoOperationsTest.java
@@ -1,6 +1,6 @@
-package io.quarkus.mongodb.panache.runtime;
+package io.quarkus.mongodb.panache.common.runtime;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -13,18 +13,41 @@
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.stream.Stream;
 
+import org.bson.Document;
 import org.bson.codecs.pojo.annotations.BsonProperty;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-import io.quarkus.mongodb.panache.PanacheQuery;
+import com.mongodb.client.ClientSession;
+import com.mongodb.client.MongoCollection;
+
 import io.quarkus.mongodb.panache.PanacheUpdate;
 import io.quarkus.panache.common.Parameters;
 
 class MongoOperationsTest {
-
-    private final MongoOperations<PanacheQuery<?>, PanacheUpdate> operations = new JavaMongoOperations();
+    private final MongoOperations<Object, PanacheUpdate> operations = new MongoOperations() {
+        @Override
+        protected List<?> list(Object o) {
+            return null;
+        }
+
+        @Override
+        protected Stream<?> stream(Object o) {
+            return null;
+        }
+
+        @Override
+        protected Object createUpdate(MongoCollection collection, Class entityClass, Document docUpdate) {
+            return null;
+        }
+
+        @Override
+        protected Object createQuery(MongoCollection collection, ClientSession session, Document query, Document sortDoc) {
+            return null;
+        }
+    };
 
     private static class DemoObj {
         public String field;

diff --git a/...otlin/io/quarkus/mongodb/panache/kotlin/reactive/runtime/KotlinReactiveMongoOperations.kt b/...otlin/io/quarkus/mongodb/panache/kotlin/reactive/runtime/KotlinReactiveMongoOperations.kt
@@ -2,8 +2,8 @@ package io.quarkus.mongodb.panache.kotlin.reactive.runtime
 
 import io.quarkus.mongodb.panache.kotlin.reactive.ReactivePanacheQuery
 import io.quarkus.mongodb.panache.reactive.ReactivePanacheUpdate
-import io.quarkus.mongodb.panache.reactive.runtime.ReactiveMongoOperations
-import io.quarkus.mongodb.panache.reactive.runtime.ReactivePanacheUpdateImpl
+import io.quarkus.mongodb.panache.common.reactive.runtime.ReactiveMongoOperations
+import io.quarkus.mongodb.panache.common.reactive.runtime.ReactivePanacheUpdateImpl
 import io.quarkus.mongodb.reactive.ReactiveMongoCollection
 import io.smallrye.mutiny.Multi
 import io.smallrye.mutiny.Uni

diff --git a/...ain/kotlin/io/quarkus/mongodb/panache/kotlin/reactive/runtime/ReactivePanacheQueryImpl.kt b/...ain/kotlin/io/quarkus/mongodb/panache/kotlin/reactive/runtime/ReactivePanacheQueryImpl.kt
@@ -1,6 +1,6 @@
 package io.quarkus.mongodb.panache.kotlin.reactive.runtime
 
-import io.quarkus.mongodb.panache.reactive.runtime.CommonReactivePanacheQueryImpl
+import io.quarkus.mongodb.panache.common.reactive.runtime.CommonReactivePanacheQueryImpl
 import io.quarkus.mongodb.reactive.ReactiveMongoCollection
 import org.bson.conversions.Bson
 import io.smallrye.mutiny.Uni

diff --git a/...untime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/runtime/KotlinMongoOperations.kt b/...untime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/runtime/KotlinMongoOperations.kt
@@ -4,8 +4,8 @@ import com.mongodb.client.ClientSession
 import com.mongodb.client.MongoCollection
 import io.quarkus.mongodb.panache.PanacheUpdate
 import io.quarkus.mongodb.panache.kotlin.PanacheQuery
-import io.quarkus.mongodb.panache.runtime.MongoOperations
-import io.quarkus.mongodb.panache.runtime.PanacheUpdateImpl
+import io.quarkus.mongodb.panache.common.runtime.MongoOperations
+import io.quarkus.mongodb.panache.common.runtime.PanacheUpdateImpl
 import org.bson.Document
 import java.util.stream.Stream
 

diff --git a/...lin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/runtime/PanacheQueryImpl.kt b/...lin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/runtime/PanacheQueryImpl.kt
@@ -5,7 +5,7 @@ import com.mongodb.client.ClientSession
 import com.mongodb.client.MongoCollection
 import com.mongodb.client.model.Collation
 import io.quarkus.mongodb.panache.kotlin.PanacheQuery
-import io.quarkus.mongodb.panache.runtime.CommonPanacheQueryImpl
+import io.quarkus.mongodb.panache.common.runtime.CommonPanacheQueryImpl
 import io.quarkus.panache.common.Page
 import org.bson.conversions.Bson
 import java.util.stream.Stream

diff --git a/...rc/main/java/io/quarkus/mongodb/panache/reactive/runtime/JavaReactiveMongoOperations.java b/...rc/main/java/io/quarkus/mongodb/panache/reactive/runtime/JavaReactiveMongoOperations.java
@@ -4,6 +4,8 @@
 
 import org.bson.Document;
 
+import io.quarkus.mongodb.panache.common.reactive.runtime.ReactiveMongoOperations;
+import io.quarkus.mongodb.panache.common.reactive.runtime.ReactivePanacheUpdateImpl;
 import io.quarkus.mongodb.panache.reactive.ReactivePanacheQuery;
 import io.quarkus.mongodb.panache.reactive.ReactivePanacheUpdate;
 import io.quarkus.mongodb.reactive.ReactiveMongoCollection;

diff --git a/...e/src/main/java/io/quarkus/mongodb/panache/reactive/runtime/ReactivePanacheQueryImpl.java b/...e/src/main/java/io/quarkus/mongodb/panache/reactive/runtime/ReactivePanacheQueryImpl.java
@@ -8,6 +8,7 @@
 import com.mongodb.ReadPreference;
 import com.mongodb.client.model.Collation;
 
+import io.quarkus.mongodb.panache.common.reactive.runtime.CommonReactivePanacheQueryImpl;
 import io.quarkus.mongodb.panache.reactive.ReactivePanacheQuery;
 import io.quarkus.mongodb.reactive.ReactiveMongoCollection;
 import io.quarkus.panache.common.Page;

diff --git a/...panache/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/JavaMongoOperations.java b/...panache/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/JavaMongoOperations.java
@@ -10,6 +10,8 @@
 
 import io.quarkus.mongodb.panache.PanacheQuery;
 import io.quarkus.mongodb.panache.PanacheUpdate;
+import io.quarkus.mongodb.panache.common.runtime.MongoOperations;
+import io.quarkus.mongodb.panache.common.runtime.PanacheUpdateImpl;
 
 public class JavaMongoOperations extends MongoOperations<PanacheQuery<?>, PanacheUpdate> {
     /**

diff --git a/...db-panache/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/PanacheQueryImpl.java b/...db-panache/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/PanacheQueryImpl.java
@@ -12,6 +12,7 @@
 import com.mongodb.client.model.Collation;
 
 import io.quarkus.mongodb.panache.PanacheQuery;
+import io.quarkus.mongodb.panache.common.runtime.CommonPanacheQueryImpl;
 import io.quarkus.panache.common.Page;
 
 public class PanacheQueryImpl<Entity> implements PanacheQuery<Entity> {