Allow app to define customised ebean IdGenerator #22

greenlaw110 · greenlaw110 · commit 1f6501a4c7df · 2020-03-23T22:02:24.000+11:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # act-ebean-java7 CHANGE LOG
 
+1.8.1
+* Allow app to define customised ebean IdGenerator #22
+
 1.8.0
 * update to act-1.8.29
 * update EbeanDao - add `processLikeValue` method
diff --git a/src/main/java/act/db/ebean/EbeanService.java b/src/main/java/act/db/ebean/EbeanService.java
@@ -103,6 +103,8 @@ protected void dataSourceProvided(DataSource dataSource, DataSourceConfig dsConf
             ebeanConfig = new EbeanConfigAdaptor().adaptFrom(this.config, dsConfig, this);
             ebeanConfig.setDataSource(dataSource);
         }
+        IdGeneratorRegister rg = Act.getInstance(IdGeneratorRegister.class);
+        rg.registerTo(ebeanConfig);
         app().eventBus().trigger(new EbeanConfigLoaded(ebeanConfig));
         if (readonly) {
             ebeanConfig.setDdlGenerate(false);
diff --git a/src/main/java/act/db/ebean/IdGeneratorRegister.java b/src/main/java/act/db/ebean/IdGeneratorRegister.java
@@ -0,0 +1,44 @@
+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.IdGenerator;
+import com.avaje.ebean.config.ServerConfig;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.util.ArrayList;
+import java.util.List;
+
+@Singleton
+public class IdGeneratorRegister {
+
+    @Inject
+    private List<IdGenerator> idGenerators = new ArrayList<>();
+
+    void registerTo(ServerConfig config) {
+        for (IdGenerator generator : idGenerators) {
+            config.add(generator);
+        }
+    }
+
+}
diff --git a/src/main/resources/act.scan.list b/src/main/resources/act.scan.list
@@ -1,2 +1,2 @@
 act.db.ebean.EbeanModule
-act.db.jpa.EntityFinder
+act.db.ebean.IdGeneratorRegister

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,8 @@ protected void dataSourceProvided(DataSource dataSource, DataSourceConfig dsConf`
`103`	`103`	`ebeanConfig = new EbeanConfigAdaptor().adaptFrom(this.config, dsConfig, this);`
`104`	`104`	`ebeanConfig.setDataSource(dataSource);`
`105`	`105`	`}`
	`106`	`+ IdGeneratorRegister rg = Act.getInstance(IdGeneratorRegister.class);`
	`107`	`+ rg.registerTo(ebeanConfig);`
`106`	`108`	`app().eventBus().trigger(new EbeanConfigLoaded(ebeanConfig));`
`107`	`109`	`if (readonly) {`
`108`	`110`	`ebeanConfig.setDdlGenerate(false);`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`act.db.ebean.EbeanModule`
`2`		`-act.db.jpa.EntityFinder`
	`2`	`+act.db.ebean.IdGeneratorRegister`