Skip to content

Commit 1432f17

Browse files
committed
Pass engine configuration to typeHandler and typeAlias to retrieve configuration settings if needed
1 parent 675608b commit 1432f17

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
@@ -954,12 +954,12 @@ protected void applyCustomMybatisCustomizations(Configuration configuration) {
954954

955955
if (dependentEngineMybatisTypeAliasConfigs != null) {
956956
for (MybatisTypeAliasConfigurator typeAliasConfig : dependentEngineMybatisTypeAliasConfigs) {
957-
typeAliasConfig.configure(configuration.getTypeAliasRegistry());
957+
typeAliasConfig.configure(this, configuration.getTypeAliasRegistry());
958958
}
959959
}
960960
if (dependentEngineMybatisTypeHandlerConfigs != null) {
961961
for (MybatisTypeHandlerConfigurator typeHandlerConfig : dependentEngineMybatisTypeHandlerConfigs) {
962-
typeHandlerConfig.configure(configuration.getTypeHandlerRegistry());
962+
typeHandlerConfig.configure(this, configuration.getTypeHandlerRegistry());
963963
}
964964
}
965965

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
@@ -113,7 +113,7 @@ protected void registerCustomMybatisMappings(AbstractEngineConfiguration engineC
113113
Node node = typeAliasList.item(i);
114114
MybatisTypeAliasConfigurator typeAlias = new MybatisTypeAliasConfigurator() {
115115
@Override
116-
public void configure(TypeAliasRegistry typeAliasRegistry) {
116+
public void configure(AbstractEngineConfiguration abstractEngineConfiguration, TypeAliasRegistry typeAliasRegistry) {
117117
try {
118118
typeAliasRegistry.registerAlias(node.getAttributes().getNamedItem("alias").getTextContent(),
119119
Class.forName(node.getAttributes().getNamedItem("type").getTextContent()));
@@ -131,7 +131,7 @@ public void configure(TypeAliasRegistry typeAliasRegistry) {
131131
Node node = typeHandlerList.item(i);
132132
MybatisTypeHandlerConfigurator typeHandler = new MybatisTypeHandlerConfigurator() {
133133
@Override
134-
public void configure(TypeHandlerRegistry typeHandlerRegistry) {
134+
public void configure(AbstractEngineConfiguration abstractEngineConfiguration, TypeHandlerRegistry typeHandlerRegistry) {
135135
try {
136136
typeHandlerRegistry.register(node.getAttributes().getNamedItem("javaType").getTextContent(),
137137
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)