方法名调整

mybatis-plus/src/main/java/com/baomidou/mybatisplus/MybatisConfiguration.java

@@ -64,7 +64,7 @@ public class MybatisConfiguration extends Configuration {
 	@Override
 	public void addMappedStatement(MappedStatement ms) {
 		logger.debug(" addMappedStatement: " + ms.getId());
-		if (GlobalConfiguration.GlobalConfig(ms.getConfiguration()).isRefresh()) {
+		if (GlobalConfiguration.getGlobalConfig(ms.getConfiguration()).isRefresh()) {
 			/*
 			 * 支持是否自动刷新 XML 变更内容，开发环境使用【 注：生产环境勿用！】
 			 */

mybatis-plus/src/main/java/com/baomidou/mybatisplus/entity/GlobalConfiguration.java

@@ -233,7 +233,7 @@ public class GlobalConfiguration implements Cloneable, Serializable {
 	 */
 	public static SqlSessionFactory currentSessionFactory(Class<?> clazz) {
 		String configMark = TableInfoHelper.getTableInfo(clazz).getConfigMark();
-		GlobalConfiguration mybatisGlobalConfig = GlobalConfiguration.GlobalConfig(configMark);
+		GlobalConfiguration mybatisGlobalConfig = GlobalConfiguration.getGlobalConfig(configMark);
 		return mybatisGlobalConfig.getSqlSessionFactory();
 	}
 
@@ -290,11 +290,11 @@ public class GlobalConfiguration implements Cloneable, Serializable {
 	 * @param configuration
 	 * @return
 	 */
-	public static GlobalConfiguration GlobalConfig(Configuration configuration) {
+	public static GlobalConfiguration getGlobalConfig(Configuration configuration) {
 		if (configuration == null) {
 			throw new MybatisPlusException("Error: You need Initialize MybatisConfiguration !");
 		}
-		return GlobalConfig(configuration.toString());
+		return getGlobalConfig(configuration.toString());
 	}
 
 	/**
@@ -303,7 +303,7 @@ public class GlobalConfiguration implements Cloneable, Serializable {
 	 * @param configMark
 	 * @return
 	 */
-	public static GlobalConfiguration GlobalConfig(String configMark) {
+	public static GlobalConfiguration getGlobalConfig(String configMark) {
 		GlobalConfiguration cache = GLOBAL_CONFIG.get(configMark);
 		if (cache == null) {
 			// 没有获取全局配置初始全局配置
@@ -315,20 +315,20 @@ public class GlobalConfiguration implements Cloneable, Serializable {
 	}
 
 	public static DBType getDbType(Configuration configuration) {
-		return GlobalConfig(configuration).getDbType();
+		return getGlobalConfig(configuration).getDbType();
 	}
 
 	public static IdType getIdType(Configuration configuration) {
-		return GlobalConfig(configuration).getIdType();
+		return getGlobalConfig(configuration).getIdType();
 	}
 
 	public static boolean isDbColumnUnderline(Configuration configuration) {
-		return GlobalConfig(configuration).isDbColumnUnderline();
+		return getGlobalConfig(configuration).isDbColumnUnderline();
 	}
 
 	public static ISqlInjector getSqlInjector(Configuration configuration) {
 		// fix #140
-		GlobalConfiguration globalConfiguration = GlobalConfig(configuration);
+		GlobalConfiguration globalConfiguration = getGlobalConfig(configuration);
 		ISqlInjector sqlInjector = globalConfiguration.getSqlInjector();
 		if (sqlInjector == null) {
 			sqlInjector = new AutoSqlInjector();
@@ -338,35 +338,35 @@ public class GlobalConfiguration implements Cloneable, Serializable {
 	}
 
 	public static IMetaObjectHandler getMetaObjectHandler(Configuration configuration) {
-		return GlobalConfig(configuration).getMetaObjectHandler();
+		return getGlobalConfig(configuration).getMetaObjectHandler();
 	}
 
 	public static FieldStrategy getFieldStrategy(Configuration configuration) {
-		return GlobalConfig(configuration).getFieldStrategy();
+		return getGlobalConfig(configuration).getFieldStrategy();
 	}
 
 	public static boolean isRefresh(Configuration configuration) {
-		return GlobalConfig(configuration).isRefresh();
+		return getGlobalConfig(configuration).isRefresh();
 	}
 
 	public static boolean isAutoSetDbType(Configuration configuration) {
-		return GlobalConfig(configuration).isAutoSetDbType();
+		return getGlobalConfig(configuration).isAutoSetDbType();
 	}
 
 	public static Set<String> getMapperRegistryCache(Configuration configuration) {
-		return GlobalConfig(configuration).getMapperRegistryCache();
+		return getGlobalConfig(configuration).getMapperRegistryCache();
 	}
 
 	public static String getIdentifierQuote(Configuration configuration) {
-		return GlobalConfig(configuration).getIdentifierQuote();
+		return getGlobalConfig(configuration).getIdentifierQuote();
 	}
 
 	public static SqlSession getSqlSession(Configuration configuration) {
-		return GlobalConfig(configuration).getSqlSession();
+		return getGlobalConfig(configuration).getSqlSession();
 	}
 
 	public static SqlSession getSqlsessionBatch(Configuration configuration) {
-		return GlobalConfig(configuration).getSqlsessionBatch();
+		return getGlobalConfig(configuration).getSqlsessionBatch();
 	}
 
 	/**

mybatis-plus/src/main/java/com/baomidou/mybatisplus/mapper/AutoSqlInjector.java

@@ -84,7 +84,7 @@ public class AutoSqlInjector implements ISqlInjector {
 		this.configuration = builderAssistant.getConfiguration();
 		this.builderAssistant = builderAssistant;
 		this.languageDriver = configuration.getDefaultScriptingLanguageInstance();
-		GlobalConfiguration globalCache = GlobalConfiguration.GlobalConfig(configuration);
+		GlobalConfiguration globalCache = GlobalConfiguration.getGlobalConfig(configuration);
 		/*
 		 * 驼峰设置 PLUS 配置 > 原始配置
 		 */
@@ -534,7 +534,7 @@ public class AutoSqlInjector implements ISqlInjector {
 	 * @return
 	 */
 	protected String sqlWordConvert(String convertStr) {
-		GlobalConfiguration globalConfig = GlobalConfiguration.GlobalConfig(configuration);
+		GlobalConfiguration globalConfig = GlobalConfiguration.getGlobalConfig(configuration);
 		return SqlReservedWords.convert(globalConfig, convertStr);
 	}
 
@@ -704,7 +704,7 @@ public class AutoSqlInjector implements ISqlInjector {
 				return "";
 			}
 			// 查询策略，使用全局策略
-			fieldStrategy = GlobalConfiguration.GlobalConfig(configuration).getFieldStrategy();
+			fieldStrategy = GlobalConfiguration.getGlobalConfig(configuration).getFieldStrategy();
 		}
 
 		// 关闭标签

mybatis-plus/src/main/java/com/baomidou/mybatisplus/mapper/SqlHelper.java

@@ -82,7 +82,7 @@ public class SqlHelper {
 		try {
 			SqlSessionFactory sqlSessionFactory = GlobalConfiguration.currentSessionFactory(clazz);
 			Configuration configuration = sqlSessionFactory.getConfiguration();
-			GlobalConfiguration globalConfiguration = GlobalConfiguration.GlobalConfig(configuration);
+			GlobalConfiguration globalConfiguration = GlobalConfiguration.getGlobalConfig(configuration);
 			if (isBatch) {
 				return globalConfiguration.getSqlsessionBatch();
 			}

mybatis-plus/src/main/java/com/baomidou/mybatisplus/spring/MybatisMapperRefresh.java

@@ -107,7 +107,7 @@ public class MybatisMapperRefresh implements Runnable {
 	}
 
 	public void run() {
-		final GlobalConfiguration globalConfig = GlobalConfiguration.GlobalConfig(configuration);
+		final GlobalConfiguration globalConfig = GlobalConfiguration.getGlobalConfig(configuration);
 		/*
 		 * 启动 XML 热加载
 		 */

mybatis-plus/src/main/java/com/baomidou/mybatisplus/toolkit/TableInfoHelper.java

@@ -91,7 +91,7 @@ public class TableInfoHelper {
 		if (null != builderAssistant) {
 			tableInfo.setCurrentNamespace(builderAssistant.getCurrentNamespace());
 			tableInfo.setConfigMark(builderAssistant.getConfiguration());
-			globalCache = GlobalConfiguration.GlobalConfig(builderAssistant.getConfiguration());
+			globalCache = GlobalConfiguration.getGlobalConfig(builderAssistant.getConfiguration());
 		} else {
 			// 兼容测试场景
 			globalCache = GlobalConfiguration.DEFAULT;
@@ -353,7 +353,7 @@ public class TableInfoHelper {
 	 */
 	public static void initSqlSessionFactory(SqlSessionFactory sqlSessionFactory) {
 		Configuration configuration = sqlSessionFactory.getConfiguration();
-		GlobalConfiguration globalConfig = GlobalConfiguration.GlobalConfig(configuration);
+		GlobalConfiguration globalConfig = GlobalConfiguration.getGlobalConfig(configuration);
 		// SqlRunner
 		SqlRunner.FACTORY = sqlSessionFactory;
 		if (globalConfig == null) {