Skip to content

Commit 9d62bfa

Browse files
committed
Pass engine configuration to typeHandler and typeAlias to retrieve configuration settings if needed
1 parent 5b511be commit 9d62bfa

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/AbstractEngineConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,12 +1004,12 @@ protected void applyCustomMybatisCustomizations(Configuration configuration) {
10041004

10051005
if (dependentEngineMybatisTypeAliasConfigs != null) {
10061006
for (MybatisTypeAliasConfigurator typeAliasConfig : dependentEngineMybatisTypeAliasConfigs) {
1007-
typeAliasConfig.configure(configuration.getTypeAliasRegistry());
1007+
typeAliasConfig.configure(this, configuration.getTypeAliasRegistry());
10081008
}
10091009
}
10101010
if (dependentEngineMybatisTypeHandlerConfigs != null) {
10111011
for (MybatisTypeHandlerConfigurator typeHandlerConfig : dependentEngineMybatisTypeHandlerConfigs) {
1012-
typeHandlerConfig.configure(configuration.getTypeHandlerRegistry());
1012+
typeHandlerConfig.configure(this, configuration.getTypeHandlerRegistry());
10131013
}
10141014
}
10151015

modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/AbstractEngineConfigurator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ protected void registerCustomMybatisMappings(AbstractEngineConfiguration engineC
110110
Node node = typeAliasList.item(i);
111111
MybatisTypeAliasConfigurator typeAlias = new MybatisTypeAliasConfigurator() {
112112
@Override
113-
public void configure(TypeAliasRegistry typeAliasRegistry) {
113+
public void configure(AbstractEngineConfiguration abstractEngineConfiguration, TypeAliasRegistry typeAliasRegistry) {
114114
try {
115115
typeAliasRegistry.registerAlias(node.getAttributes().getNamedItem("alias").getTextContent(),
116116
Class.forName(node.getAttributes().getNamedItem("type").getTextContent()));
@@ -128,7 +128,7 @@ public void configure(TypeAliasRegistry typeAliasRegistry) {
128128
Node node = typeHandlerList.item(i);
129129
MybatisTypeHandlerConfigurator typeHandler = new MybatisTypeHandlerConfigurator() {
130130
@Override
131-
public void configure(TypeHandlerRegistry typeHandlerRegistry) {
131+
public void configure(AbstractEngineConfiguration abstractEngineConfiguration, TypeHandlerRegistry typeHandlerRegistry) {
132132
try {
133133
typeHandlerRegistry.register(node.getAttributes().getNamedItem("javaType").getTextContent(),
134134
node.getAttributes().getNamedItem("handler").getTextContent());

modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/MybatisTypeAliasConfigurator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
package org.flowable.common.engine.impl.db;
1414

1515
import org.apache.ibatis.type.TypeAliasRegistry;
16+
import org.flowable.common.engine.impl.AbstractEngineConfiguration;
1617

1718
/**
1819
* This class configures typeAliases in {@link TypeAliasRegistry}
@@ -21,5 +22,5 @@
2122
*/
2223
public interface MybatisTypeAliasConfigurator {
2324

24-
void configure(TypeAliasRegistry typeAliasRegistry);
25+
void configure(AbstractEngineConfiguration engineConfiguration, TypeAliasRegistry typeAliasRegistry);
2526
}

modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/MybatisTypeHandlerConfigurator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
import org.apache.ibatis.type.TypeHandler;
1616
import org.apache.ibatis.type.TypeHandlerRegistry;
17+
import org.flowable.common.engine.impl.AbstractEngineConfiguration;
1718

1819
/**
1920
* This class configures {@link TypeHandler} in {@link TypeHandlerRegistry}
@@ -22,5 +23,5 @@
2223
*/
2324
public interface MybatisTypeHandlerConfigurator {
2425

25-
void configure(TypeHandlerRegistry typeHandlerRegistry);
26+
void configure(AbstractEngineConfiguration engineConfiguration, TypeHandlerRegistry typeHandlerRegistry);
2627
}

0 commit comments

Comments
 (0)