mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-18 14:58:47 +00:00
#694 - Refactor - Rename IdGenerator to PlatformIdGenerator ... with a view to support customer Id generators
This commit is contained in:
1 parent
2b602f6e51
commit
036092d470
14 files changed
+25
-27
No files matched your search
@@ -16,7 +16,7 @@ import com.avaje.ebean.bean.PersistenceContext;
|
||||
import com.avaje.ebean.bean.PersistenceContextUtil;
|
||||
import com.avaje.ebean.config.EncryptKey;
|
||||
import com.avaje.ebean.config.ServerConfig;
|
||||
import com.avaje.ebean.config.dbplatform.IdGenerator;
|
||||
import com.avaje.ebean.config.dbplatform.PlatformIdGenerator;
|
||||
import com.avaje.ebean.config.dbplatform.IdType;
|
||||
import com.avaje.ebean.event.BeanFindController;
|
||||
import com.avaje.ebean.event.BeanPersistController;
|
||||
@@ -152,7 +152,7 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
|
||||
|
||||
private final boolean idTypePlatformDefault;
|
||||
|
||||
private final IdGenerator idGenerator;
|
||||
private final PlatformIdGenerator idGenerator;
|
||||
|
||||
/**
|
||||
* The database sequence name (optional).
|
||||
|
||||
@@ -15,7 +15,7 @@ import com.avaje.ebean.config.ServerConfig;
|
||||
import com.avaje.ebean.config.dbplatform.DatabasePlatform;
|
||||
import com.avaje.ebean.config.dbplatform.DbHistorySupport;
|
||||
import com.avaje.ebean.config.dbplatform.DbIdentity;
|
||||
import com.avaje.ebean.config.dbplatform.IdGenerator;
|
||||
import com.avaje.ebean.config.dbplatform.PlatformIdGenerator;
|
||||
import com.avaje.ebean.config.dbplatform.IdType;
|
||||
import com.avaje.ebean.event.changelog.ChangeLogFilter;
|
||||
import com.avaje.ebean.event.changelog.ChangeLogListener;
|
||||
@@ -663,7 +663,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
|
||||
InheritInfo inheritInfo = descriptor.getInheritInfo();
|
||||
if (inheritInfo != null && !inheritInfo.isRoot()) {
|
||||
DeployBeanInfo<?> rootBeanInfo = deplyInfoMap.get(inheritInfo.getRoot().getType());
|
||||
IdGenerator rootIdGen = rootBeanInfo.getDescriptor().getIdGenerator();
|
||||
PlatformIdGenerator rootIdGen = rootBeanInfo.getDescriptor().getIdGenerator();
|
||||
if (rootIdGen != null) {
|
||||
descriptor.setIdGenerator(rootIdGen);
|
||||
}
|
||||
@@ -1240,11 +1240,11 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
|
||||
}
|
||||
|
||||
// create the sequence based IdGenerator
|
||||
IdGenerator seqIdGen = createSequenceIdGenerator(seqName);
|
||||
PlatformIdGenerator seqIdGen = createSequenceIdGenerator(seqName);
|
||||
desc.setIdGenerator(seqIdGen);
|
||||
}
|
||||
|
||||
private IdGenerator createSequenceIdGenerator(String seqName) {
|
||||
private PlatformIdGenerator createSequenceIdGenerator(String seqName) {
|
||||
return databasePlatform.createSequenceIdGenerator(backgroundExecutor, dataSource, seqName, dbSequenceBatchSize);
|
||||
}
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ import com.avaje.ebean.annotation.DocStore;
|
||||
import com.avaje.ebean.annotation.DocStoreMode;
|
||||
import com.avaje.ebean.config.ServerConfig;
|
||||
import com.avaje.ebean.config.TableName;
|
||||
import com.avaje.ebean.config.dbplatform.IdGenerator;
|
||||
import com.avaje.ebean.config.dbplatform.PlatformIdGenerator;
|
||||
import com.avaje.ebean.config.dbplatform.IdType;
|
||||
import com.avaje.ebean.event.BeanFindController;
|
||||
import com.avaje.ebean.event.BeanPersistController;
|
||||
@@ -94,7 +94,7 @@ public class DeployBeanDescriptor<T> {
|
||||
*/
|
||||
private String idGeneratorName;
|
||||
|
||||
private IdGenerator idGenerator;
|
||||
private PlatformIdGenerator idGenerator;
|
||||
|
||||
/**
|
||||
* The database sequence name (optional).
|
||||
@@ -816,14 +816,14 @@ public class DeployBeanDescriptor<T> {
|
||||
/**
|
||||
* Return the actual IdGenerator for this bean type (can be null).
|
||||
*/
|
||||
public IdGenerator getIdGenerator() {
|
||||
public PlatformIdGenerator getIdGenerator() {
|
||||
return idGenerator;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the actual IdGenerator for this bean type.
|
||||
*/
|
||||
public void setIdGenerator(IdGenerator idGenerator) {
|
||||
public void setIdGenerator(PlatformIdGenerator idGenerator) {
|
||||
this.idGenerator = idGenerator;
|
||||
if (idGenerator != null && idGenerator.isDbSequence()) {
|
||||
setSequenceName(idGenerator.getName());
|
||||
|
||||
@@ -3,12 +3,12 @@ package com.avaje.ebeaninternal.server.idgen;
|
||||
import java.util.UUID;
|
||||
|
||||
import com.avaje.ebean.Transaction;
|
||||
import com.avaje.ebean.config.dbplatform.IdGenerator;
|
||||
import com.avaje.ebean.config.dbplatform.PlatformIdGenerator;
|
||||
|
||||
/**
|
||||
* IdGenerator for java util UUID.
|
||||
*/
|
||||
public class UuidIdGenerator implements IdGenerator {
|
||||
public class UuidIdGenerator implements PlatformIdGenerator {
|
||||
|
||||
/**
|
||||
* Return UUID from UUID.randomUUID();
|
||||
@@ -38,6 +38,4 @@ public class UuidIdGenerator implements IdGenerator {
|
||||
// ignored
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user