JNG-6038 rest injector (#333)

* JNG-6038 Refactor Guice rest injector * Fixing postgresql datasoure * Removed unused code
BlackBeltTechnology · Dec 12, 2024 · c89adb6 · c89adb6
1 parent bfb21b2
commit c89adb6
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 533 deletions.
diff --git a/judo-runtime-core-jsl-itest/common/pom.xml b/judo-runtime-core-jsl-itest/common/pom.xml
@@ -76,5 +76,11 @@
             <version>4.8.0</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.zaxxer</groupId>
+            <artifactId>HikariCP</artifactId>
+            <version>5.0.0</version>
+        </dependency>
+
     </dependencies>
 </project>
diff --git a/...ommon/src/main/java/hu/blackbelt/judo/runtime/core/jsl/fixture/JudoDatasourceFixture.java b/...ommon/src/main/java/hu/blackbelt/judo/runtime/core/jsl/fixture/JudoDatasourceFixture.java
@@ -21,6 +21,7 @@
  */
 
 import com.google.common.collect.ImmutableMap;
+import com.zaxxer.hikari.HikariDataSource;
 import hu.blackbelt.judo.meta.rdbms.RdbmsTable;
 import hu.blackbelt.judo.meta.rdbms.runtime.RdbmsModel;
 import hu.blackbelt.judo.meta.rdbms.runtime.RdbmsUtils;
@@ -149,7 +150,6 @@ public void prepareDatasources() {
         } else {
             throw new IllegalStateException("Unsupported dialect: " + dialect);
         }
-        transactionManager = new DataSourceTransactionManager(dataSource);
     }
 
     public <T extends Throwable> T assertThrowsInTransaction(final Class<T> expectedType, final Executable executable) {

diff --git a/...t/common/src/main/java/hu/blackbelt/judo/runtime/core/jsl/fixture/JudoRuntimeFixture.java b/...t/common/src/main/java/hu/blackbelt/judo/runtime/core/jsl/fixture/JudoRuntimeFixture.java
@@ -3,17 +3,20 @@
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.Module;
+import com.google.inject.util.Modules;
 import hu.blackbelt.judo.meta.expression.builder.jql.JqlExpressionBuilderConfig;
 import hu.blackbelt.judo.meta.expression.builder.jql.asm.AsmJqlExtractor;
+import hu.blackbelt.judo.runtime.core.dao.rdbms.Dialect;
+import hu.blackbelt.judo.runtime.core.dao.rdbms.RdbmsInit;
+import hu.blackbelt.judo.runtime.core.guice.JudoDefaultModule;
 import hu.blackbelt.judo.runtime.core.guice.JudoModelLoader;
 import hu.blackbelt.judo.runtime.core.dao.rdbms.hsqldb.HsqldbDialect;
 import hu.blackbelt.judo.runtime.core.dao.rdbms.hsqldb.HsqldbRdbmsInit;
 import hu.blackbelt.judo.runtime.core.dao.rdbms.liquibase.SimpleLiquibaseExecutor;
 import hu.blackbelt.judo.runtime.core.dao.rdbms.postgresql.PostgresqlDialect;
 import hu.blackbelt.judo.runtime.core.dao.rdbms.postgresql.PostgresqlRdbmsInit;
-import hu.blackbelt.judo.runtime.core.jsl.modules.JudoDefaultTestModule;
-import hu.blackbelt.judo.runtime.core.jsl.modules.JudoHsqldbTestModules;
-import hu.blackbelt.judo.runtime.core.jsl.modules.JudoPostgresqlTestModules;
+import hu.blackbelt.judo.runtime.core.guice.dao.rdbms.hsqldb.JudoHsqldbModule;
+import hu.blackbelt.judo.runtime.core.guice.dao.rdbms.postgresql.JudoPostgresqlModule;
 import hu.blackbelt.judo.runtime.core.query.QueryFactory;
 import hu.blackbelt.mapper.api.ExtendableCoercer;
 import hu.blackbelt.mapper.impl.DefaultCoercer;
@@ -69,13 +72,10 @@ public JudoRuntimeFixture() {}
 
     JdbcDatabaseContainer sqlContainer;
 
-    JudoPostgresqlTestModules judoPostgresqlTestModules;
+    Dialect dialect;
 
-    JudoHsqldbTestModules judoHsqldbTestModules;
-
-    HsqldbDialect hsqldbDialect;
-
-    PostgresqlDialect postgresqlDialect;
+    JudoDefaultModule.JudoDefaultModuleBuilder judoDefaultModuleBuilder;
+    Module databaseModule;
 
     SimpleLiquibaseExecutor simpleLiquibaseExecutor;
 
@@ -104,82 +104,62 @@ private void initQueryFactory() {
 
     }
 
-    private void initJudoHsqldbModules(JudoDatasourceFixture datasource) {
-
+    private void initModules(JudoDatasourceFixture datasource, Dialect dialect) {
+        RdbmsInit init = null;
         simpleLiquibaseExecutor = new SimpleLiquibaseExecutor();
-        HsqldbRdbmsInit init = HsqldbRdbmsInit.builder()
-                .liquibaseExecutor(simpleLiquibaseExecutor)
-                .liquibaseModel(modelHolder.getLiquibaseModel())
-                .build();
+        if (dialect instanceof HsqldbDialect) {
+            init = HsqldbRdbmsInit.builder()
+                    .liquibaseExecutor(simpleLiquibaseExecutor)
+                    .liquibaseModel(modelHolder.getLiquibaseModel())
+                    .build();
+            databaseModule = JudoHsqldbModule
+                    .builder().build();
+        }
+        if (dialect instanceof PostgresqlDialect) {
+            init = PostgresqlRdbmsInit.builder()
+                    .liquibaseExecutor(simpleLiquibaseExecutor)
+                    .liquibaseModel(modelHolder.getLiquibaseModel())
+                    .build();
+            databaseModule = JudoPostgresqlModule
+                    .builder()
+                    .dataSource(datasource.getDataSource())
+                    .build();
+        }
         init.execute(datasource.getDataSource());
 
-        judoHsqldbTestModules = JudoHsqldbTestModules
-                .builder()
-                .dataSource(datasource.getDataSource())
-                .hsqldbRdbmsInit(init)
-                .build();
-    }
-
-    private void initJudoPostgresqlModules(JudoDatasourceFixture datasource) {
+        judoDefaultModuleBuilder = JudoDefaultModule.builder()
+                .judoModelLoader(modelHolder);
 
-        simpleLiquibaseExecutor = new SimpleLiquibaseExecutor();
-        PostgresqlRdbmsInit init = PostgresqlRdbmsInit.builder()
-                .liquibaseExecutor(simpleLiquibaseExecutor)
-                .liquibaseModel(modelHolder.getLiquibaseModel())
-                .build();
-        init.execute(datasource.getDataSource());
-
-        sqlContainer = datasource.getSqlContainer();
-        judoPostgresqlTestModules = JudoPostgresqlTestModules.builder()
-                .databaseName(sqlContainer.getDatabaseName())
-                .user(sqlContainer.getUsername())
-                .password(sqlContainer.getPassword())
-                .port(sqlContainer.getFirstMappedPort())
-                .dataSource(datasource.getDataSource())
-                .postgresqlRdbmsInit(init)
-                .build();
     }
 
     public void prepare(String modelName, JudoDatasourceFixture datasource) throws Exception {
 
         if (DIALECT_POSTGRESQL.equals(datasource.getDialect())) {
-            postgresqlDialect = new PostgresqlDialect();
-            modelHolder = JudoModelLoader.loadFromDirectory(modelName, new File(MODEL_SOURCES), postgresqlDialect, true);
-            initQueryFactory();
-            initJudoPostgresqlModules(datasource);
+            dialect = new PostgresqlDialect();
         } else if (DIALECT_HSQLDB.equals(datasource.getDialect())) {
-            hsqldbDialect = new HsqldbDialect();
-            modelHolder = JudoModelLoader.loadFromDirectory(modelName, new File(MODEL_SOURCES), hsqldbDialect, true);
-            initQueryFactory();
-            initJudoHsqldbModules(datasource);
+            dialect = new HsqldbDialect();
         } else {
             throw new IllegalArgumentException("Unsupported dialect: " + datasource.getDialect());
         }
+        modelHolder = JudoModelLoader.loadFromDirectory(modelName, new File(MODEL_SOURCES), dialect, true, false);
+        initQueryFactory();
+        initModules(datasource, dialect);
     }
 
     public void init(Module module, Object injectModulesTo) {
-
-        if (postgresqlDialect != null) {
-            injector = Guice.createInjector(judoPostgresqlTestModules, module, JudoDefaultTestModule
-                    .builder()
-                    .injectModulesTo(injectModulesTo)
-                    .judoModelLoader(modelHolder)
-                    .coercer(coercer)
-                    .queryFactory(queryFactory)
-                    .markSelectedRangeItems(markSelectedRangeItems)
-                    .build()
-            );
-        } else if (hsqldbDialect != null) {
-            injector = Guice.createInjector(judoHsqldbTestModules, module, JudoDefaultTestModule
-                    .builder()
-                    .injectModulesTo(injectModulesTo)
-                    .judoModelLoader(modelHolder)
-                    .coercer(coercer)
-                    .queryFactory(queryFactory)
-                    .markSelectedRangeItems(markSelectedRangeItems)
-                    .build()
-            );
-        }
+        judoDefaultModuleBuilder = judoDefaultModuleBuilder
+                .injectModulesTo(injectModulesTo)
+                .judoModelLoader(modelHolder)
+                .extendableCoercer(coercer)
+                .queryFactory(queryFactory)
+                .rdbmsDaoMarkSelectedRangeItems(markSelectedRangeItems);
+
+        Module modules = Modules.combine(
+                module,
+                judoDefaultModuleBuilder.build(),
+                databaseModule
+        );
+        injector = Guice.createInjector(modules);
     }
 
     public void tearDown() {