Rename InitialScriptLoader to ScriptExecutor

Author: nakamura-to

deployment/src/main/java/org/seasar/doma/quarkus/deployment/DomaProcessor.java

@@ -23,7 +23,7 @@
 import org.seasar.doma.DaoImplementation;
 import org.seasar.doma.quarkus.runtime.DomaProducer;
 import org.seasar.doma.quarkus.runtime.DomaRecorder;
-import org.seasar.doma.quarkus.runtime.InitialScriptLoader;
+import org.seasar.doma.quarkus.runtime.ScriptExecutor;
 
 class DomaProcessor {
 
@@ -82,7 +82,7 @@ NativeImageResourceBuildItem nativeImageResources(DomaSettingsBuildItem settings
   @BuildStep
   ReflectiveClassBuildItem reflectiveClasses(BeanArchiveIndexBuildItem beanArchiveIndex) {
     List<String> classes = new ArrayList<>();
-    classes.add(InitialScriptLoader.class.getName());
+    classes.add(ScriptExecutor.class.getName());
     IndexView indexView = beanArchiveIndex.getIndex();
     DomaClassScanner scanner = new DomaClassScanner(indexView);
     List<String> scannedClasses = scanner.scan();

deployment/src/test/java/org/seasar/doma/quarkus/deployment/InjectConfigTest.java

@@ -13,7 +13,7 @@
 import org.seasar.doma.jdbc.Config;
 import org.seasar.doma.jdbc.criteria.Entityql;
 import org.seasar.doma.jdbc.criteria.NativeSql;
-import org.seasar.doma.quarkus.runtime.InitialScriptLoader;
+import org.seasar.doma.quarkus.runtime.ScriptExecutor;
 
 public class InjectConfigTest {
 
@@ -34,7 +34,7 @@ public class InjectConfigTest {
   @Inject Config config;
   @Inject Entityql entityql;
   @Inject NativeSql nativeSql;
-  @Inject InitialScriptLoader scriptLoader;
+  @Inject ScriptExecutor scriptLoader;
 
   @Test
   public void test() {

deployment/src/test/java/org/seasar/doma/quarkus/deployment/ScriptExecutorNoFileTest.java

@@ -0,0 +1,54 @@
+package org.seasar.doma.quarkus.deployment;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import io.quarkus.test.QuarkusUnitTest;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import javax.inject.Inject;
+import javax.sql.DataSource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+public class ScriptExecutorNoFileTest {
+
+  @RegisterExtension
+  static QuarkusUnitTest runner =
+      new QuarkusUnitTest()
+          .setArchiveProducer(
+              () ->
+                  ShrinkWrap.create(JavaArchive.class)
+                      .add(
+                          new StringAsset(
+                              "quarkus.datasource.db-kind=h2\n"
+                                  + "quarkus.datasource.username=USERNAME-NAMED\n"
+                                  + "quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:testing\n"
+                                  + "quarkus.datasource.jdbc.driver=org.h2.Driver\n"
+                                  + "quarkus.doma.sql-load-script=no-file\n"
+                                  + "quarkus.doma.log.sql=true\n"),
+                          "application.properties")
+                      .addAsResource("import.sql"));
+
+  @Inject DataSource dataSource;
+
+  @Test
+  public void test() throws Exception {
+    Integer count = null;
+    try (Connection connection = dataSource.getConnection()) {
+      try (Statement statement = connection.createStatement()) {
+        try (ResultSet resultSet =
+            statement.executeQuery(
+                "select count(*) from information_schema.tables where table_name = 'EMPLOYEE'")) {
+          if (resultSet.next()) {
+            count = resultSet.getInt(1);
+          }
+        }
+      }
+    }
+    assertEquals(0, count);
+  }
+}

deployment/src/test/java/org/seasar/doma/quarkus/deployment/InitialScriptLoaderCustomTest.java renamed to deployment/src/test/java/org/seasar/doma/quarkus/deployment/ScriptExecutorOtherFileTest.java

@@ -14,7 +14,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-public class InitialScriptLoaderCustomTest {
+public class ScriptExecutorOtherFileTest {
 
   @RegisterExtension
   static QuarkusUnitTest runner =

deployment/src/test/java/org/seasar/doma/quarkus/deployment/InitialScriptLoaderTest.java renamed to deployment/src/test/java/org/seasar/doma/quarkus/deployment/ScriptExecutorTest.java

@@ -14,7 +14,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-public class InitialScriptLoaderTest {
+public class ScriptExecutorTest {
 
   @RegisterExtension
   static QuarkusUnitTest runner =

runtime/src/main/java/org/seasar/doma/quarkus/runtime/DomaProducer.java

@@ -254,7 +254,7 @@ NativeSql nativeSql(Config config) {
   @Startup
   @ApplicationScoped
   @DefaultBean
-  InitialScriptLoader initialScriptLoader(Config config) {
-    return new InitialScriptLoader(config, sqlLoadScript);
+  ScriptExecutor scriptExecutor(Config config) {
+    return new ScriptExecutor(config, sqlLoadScript);
   }
 }

runtime/src/main/java/org/seasar/doma/quarkus/runtime/InitialScriptLoader.java renamed to runtime/src/main/java/org/seasar/doma/quarkus/runtime/ScriptExecutor.java

@@ -16,21 +16,23 @@
 import org.seasar.doma.jdbc.command.ScriptCommand;
 import org.seasar.doma.jdbc.query.ScriptQuery;
 
-public class InitialScriptLoader {
+public class ScriptExecutor {
 
-  private static final String METHOD_NAME = "load";
+  private static final String METHOD_NAME = "execute";
   private final Config config;
+  private final String path;
 
-  public InitialScriptLoader(Config config, String sqlLoadScript) {
+  public ScriptExecutor(Config config, String path) {
     this.config = Objects.requireNonNull(config);
-    if (sqlLoadScript != null) {
-      load(sqlLoadScript);
+    this.path = path;
+    if (path != null) {
+      execute();
     }
   }
 
-  void load(String path) {
+  private void execute() {
     Method method = getMethod();
-    InitialScriptQuery query = new InitialScriptQuery(path, method);
+    ScriptExecutorQuery query = new ScriptExecutorQuery(path, method);
     query.prepare();
     ScriptCommand command = config.getCommandImplementors().createScriptCommand(method, query);
     command.execute();
@@ -39,18 +41,18 @@ void load(String path) {
 
   private Method getMethod() {
     try {
-      return getClass().getDeclaredMethod(METHOD_NAME, String.class);
+      return getClass().getDeclaredMethod(METHOD_NAME);
     } catch (NoSuchMethodException e) {
       throw new IllegalStateException(e);
     }
   }
 
-  public class InitialScriptQuery implements ScriptQuery {
+  public class ScriptExecutorQuery implements ScriptQuery {
     private final String path;
     private final URL url;
     private final Method method;
 
-    public InitialScriptQuery(String path, Method method) {
+    public ScriptExecutorQuery(String path, Method method) {
       this.path = Objects.requireNonNull(path);
       this.url = config.getScriptFileLoader().loadAsURL(path);
       this.method = Objects.requireNonNull(method);