catch up act-ebean fix to #33: create new mechanism for app to configure ServerConfig

greenlaw110 · greenlaw110 · commit 09c15353be4b · 2020-03-24T21:01:42.000+11:00
diff --git a/src/main/java/act/db/ebean/EbeanConfigurator.java b/src/main/java/act/db/ebean/EbeanConfigurator.java
@@ -0,0 +1,36 @@
+package act.db.ebean;
+
+/*-
+ * #%L
+ * ACT Ebean
+ * %%
+ * Copyright (C) 2015 - 2020 ActFramework
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+
+import com.avaje.ebean.config.ServerConfig;
+
+/**
+ * Application to implement this interface to do further
+ * configuration to {@link ServerConfig Ebean ServerConfig}.
+ */
+public interface EbeanConfigurator {
+    /**
+     * Configure the Ebean {@link ServerConfig}.
+     * @param ebeanConfig the Ebean config instance
+     */
+    void configure(ServerConfig ebeanConfig);
+}
diff --git a/src/main/java/act/db/ebean/EbeanConfiguratorManager.java b/src/main/java/act/db/ebean/EbeanConfiguratorManager.java
@@ -0,0 +1,39 @@
+package act.db.ebean;
+
+/*-
+ * #%L
+ * ACT Ebean
+ * %%
+ * Copyright (C) 2015 - 2020 ActFramework
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+import com.avaje.ebean.config.ServerConfig;
+
+import javax.inject.Inject;
+import java.util.List;
+
+public class EbeanConfiguratorManager {
+
+    @Inject
+    private List<EbeanConfigurator> configurators;
+
+    void callConfigurators(ServerConfig config) {
+        for (EbeanConfigurator configurator : configurators) {
+            configurator.configure(config);
+        }
+    }
+
+}
diff --git a/src/main/java/act/db/ebean/EbeanService.java b/src/main/java/act/db/ebean/EbeanService.java
@@ -105,7 +105,9 @@ protected void dataSourceProvided(DataSource dataSource, DataSourceConfig dsConf
         }
         IdGeneratorRegister rg = Act.getInstance(IdGeneratorRegister.class);
         rg.registerTo(ebeanConfig);
-        app().eventBus().trigger(new EbeanConfigLoaded(ebeanConfig));
+        EbeanConfiguratorManager configuratorManager = Act.getInstance(EbeanConfiguratorManager.class);
+        configuratorManager.callConfigurators(ebeanConfig);
+        //app().eventBus().trigger(new EbeanConfigLoaded(ebeanConfig));
         if (readonly) {
             ebeanConfig.setDdlGenerate(false);
             ebeanConfig.setDdlRun(false);
diff --git a/src/main/resources/act.scan.list b/src/main/resources/act.scan.list
@@ -1,2 +1,3 @@
 act.db.ebean.EbeanModule
 act.db.ebean.IdGeneratorRegister
+act.db.ebean.EbeanConfiguratorManager

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`act.db.ebean.EbeanModule`
`2`	`2`	`act.db.ebean.IdGeneratorRegister`
	`3`	`+act.db.ebean.EbeanConfiguratorManager`