From 3a9a04d61b0107ccf9c60b120126fad5cb068a46 Mon Sep 17 00:00:00 2001 From: liaozan <378024053@qq.com> Date: Fri, 10 Nov 2023 19:01:42 +0800 Subject: [PATCH] Update code style according to ide inspections --- .../util/ConfigurationPropertiesUtils.java | 10 +++--- .../support/ValidationMessageBuilder.java | 15 ++++---- .../HierarchicalDataReadListener.java | 13 ++++--- .../common/module/tree/dao/TreeNodeDao.java | 14 ++++---- .../tree/event/EmptyTreeOperationAware.java | 5 +-- .../module/tree/event/TreeOperationAware.java | 5 +-- .../module/tree/event/TreeOperationEvent.java | 7 ++-- .../DefaultGlobalExceptionResolver.java | 25 ++++++++----- .../DubboConfigInitEventListener.java | 4 +++ .../MybatisPlusGlobalConfigCustomizer.java | 13 ++++--- .../DataSourcePropertiesExtractor.java | 2 +- .../autoconfigure/oss/util/OssUtils.java | 16 +++++---- .../com/schbrain/framework/dao/BaseDao.java | 36 +++++++++---------- .../mybatis/CustomizeMapperFactoryBean.java | 10 ++++-- .../dao/mybatis/mapper/BaseMapper.java | 15 +++++--- .../mapper/sqlsource/AbstractSqlSource.java | 10 ++++-- .../sqlsource/UpdateByCompleteSqlSource.java | 4 +-- .../sqlsource/UpdateByConditionSqlSource.java | 4 +-- 18 files changed, 126 insertions(+), 82 deletions(-) diff --git a/commons/common-util/src/main/java/com/schbrain/common/util/ConfigurationPropertiesUtils.java b/commons/common-util/src/main/java/com/schbrain/common/util/ConfigurationPropertiesUtils.java index 0f00dd9..f69aaab 100644 --- a/commons/common-util/src/main/java/com/schbrain/common/util/ConfigurationPropertiesUtils.java +++ b/commons/common-util/src/main/java/com/schbrain/common/util/ConfigurationPropertiesUtils.java @@ -46,13 +46,13 @@ public class ConfigurationPropertiesUtils { public static String getPrefix(Class sourceClass) { ConfigurationProperties annotation = sourceClass.getAnnotation(ConfigurationProperties.class); - if (annotation == null) { - String className = ConfigurationProperties.class.getName(); - String errorDetail = sourceClass.getSimpleName() + " must annotated @" + className + " or overwrite getPropertiesPrefix method"; - throw new IllegalStateException(errorDetail); - } + ValidateUtils.notNull(annotation, getErrorDetail(sourceClass)); MergedAnnotation mergedAnnotation = MergedAnnotation.from(annotation); return mergedAnnotation.getString(MergedAnnotation.VALUE); } + private static String getErrorDetail(Class sourceClass) { + return sourceClass.getSimpleName() + " must annotated @" + ConfigurationProperties.class.getName() + " or overwrite getPropertiesPrefix method"; + } + } diff --git a/commons/common-util/src/main/java/com/schbrain/common/util/support/ValidationMessageBuilder.java b/commons/common-util/src/main/java/com/schbrain/common/util/support/ValidationMessageBuilder.java index 9814d48..2eb4090 100644 --- a/commons/common-util/src/main/java/com/schbrain/common/util/support/ValidationMessageBuilder.java +++ b/commons/common-util/src/main/java/com/schbrain/common/util/support/ValidationMessageBuilder.java @@ -17,12 +17,7 @@ public class ValidationMessageBuilder { StringJoiner joiner = new StringJoiner(", "); for (ObjectError error : bindingResult.getAllErrors()) { String errorMessage = Optional.ofNullable(error.getDefaultMessage()).orElse("验证失败"); - String source; - if (error instanceof FieldError) { - source = ((FieldError) error).getField(); - } else { - source = error.getObjectName(); - } + String source = getSourceName(error); joiner.add(source + " " + errorMessage); } return joiner.toString(); @@ -37,6 +32,14 @@ public class ValidationMessageBuilder { return joiner.toString(); } + private static String getSourceName(ObjectError error) { + if (error instanceof FieldError) { + return ((FieldError) error).getField(); + } else { + return error.getObjectName(); + } + } + private static String getActualProperty(String propertyPath) { if (StringUtils.isBlank(propertyPath)) { return propertyPath; diff --git a/commons/common-util/src/main/java/com/schbrain/common/util/support/excel/listener/HierarchicalDataReadListener.java b/commons/common-util/src/main/java/com/schbrain/common/util/support/excel/listener/HierarchicalDataReadListener.java index cdd449f..7c47dd8 100644 --- a/commons/common-util/src/main/java/com/schbrain/common/util/support/excel/listener/HierarchicalDataReadListener.java +++ b/commons/common-util/src/main/java/com/schbrain/common/util/support/excel/listener/HierarchicalDataReadListener.java @@ -52,9 +52,8 @@ public class HierarchicalDataReadListener extends ExcelReadListenerBase children = new LinkedList<>(); diff --git a/commons/module-tree/src/main/java/com/schbrain/common/module/tree/dao/TreeNodeDao.java b/commons/module-tree/src/main/java/com/schbrain/common/module/tree/dao/TreeNodeDao.java index 23df4db..a31625f 100644 --- a/commons/module-tree/src/main/java/com/schbrain/common/module/tree/dao/TreeNodeDao.java +++ b/commons/module-tree/src/main/java/com/schbrain/common/module/tree/dao/TreeNodeDao.java @@ -101,7 +101,7 @@ public class TreeNodeDao { newNode.setDepth(parent.getDepth() + 1); newNode.setParentId(parent.getId()); // 增加父节点右边所有节点的left和right，留出空位 - increaseNodesLeftAndRight(newNode.getRelateId(), parent.getLft(), parent.getLft(), false, 2); + increaseNodesLeftAndRight(newNode.getRelateId(), parent.getLft(), parent.getLft()); // 添加节点 return baseDao.add(newNode); } @@ -111,7 +111,7 @@ public class TreeNodeDao { newNode.setDepth(preBroNode.getDepth()); newNode.setParentId(preBroNode.getParentId()); // 增加兄弟节点右边所有节点的left和right，留出空位 - increaseNodesLeftAndRight(preBroNode.getRelateId(), preBroNode.getRgt(), preBroNode.getRgt(), false, 2); + increaseNodesLeftAndRight(preBroNode.getRelateId(), preBroNode.getRgt(), preBroNode.getRgt()); // 添加节点 return baseDao.add(newNode); } @@ -330,20 +330,20 @@ public class TreeNodeDao { * 如果是父节点的left和right，则includeRight为true，因为父节点的right值也需要更新； * 如果是兄弟节点的left和right，则include为false，因为系统节点的right值不需要更新。 */ - private int increaseNodesLeftAndRight(Long relateId, Integer left, Integer right, boolean includeRight, Integer increment) { + private void increaseNodesLeftAndRight(Long relateId, Integer left, Integer right) { StringBuilder sql = new StringBuilder(); sql.append("UPDATE ") .append(baseDao.getTableName()) - .append(" SET lft = lft + ").append(increment) + .append(" SET lft = lft + ").append(2) .append(" WHERE relate_id = #{relateId} AND lft > #{lft} AND validate = #{validate}"); baseDao.updateByCompleteSql(sql.toString(), relateId, left, ValidateEnum.VALID.getValue()); sql.delete(0, sql.length()); sql.append("UPDATE ").append(baseDao.getTableName()) - .append(" SET rgt = rgt + ").append(increment) + .append(" SET rgt = rgt + ").append(2) .append(" WHERE relate_id = #{relateId} AND rgt ") - .append(includeRight ? ">=" : ">") + .append(">") .append(" #{rgt} AND validate = #{validate}"); - return baseDao.updateByCompleteSql(sql.toString(), relateId, right, ValidateEnum.VALID.getValue()); + baseDao.updateByCompleteSql(sql.toString(), relateId, right, ValidateEnum.VALID.getValue()); } private int decreaseNodesLeftAndRight(Long relateId, Integer left, Integer right, Integer decrement) { diff --git a/commons/module-tree/src/main/java/com/schbrain/common/module/tree/event/EmptyTreeOperationAware.java b/commons/module-tree/src/main/java/com/schbrain/common/module/tree/event/EmptyTreeOperationAware.java index 745adec..44d5480 100644 --- a/commons/module-tree/src/main/java/com/schbrain/common/module/tree/event/EmptyTreeOperationAware.java +++ b/commons/module-tree/src/main/java/com/schbrain/common/module/tree/event/EmptyTreeOperationAware.java @@ -5,7 +5,8 @@ import com.schbrain.common.module.tree.TreeNode; import java.util.List; /** - * Created by hzchengyi on 2019/1/21. + * @author hzchengyi + * @since 2019/1/21 */ public class EmptyTreeOperationAware implements TreeOperationAware { @@ -19,4 +20,4 @@ public class EmptyTreeOperationAware implements TreeOpera } -} \ No newline at end of file +} diff --git a/commons/module-tree/src/main/java/com/schbrain/common/module/tree/event/TreeOperationAware.java b/commons/module-tree/src/main/java/com/schbrain/common/module/tree/event/TreeOperationAware.java index 5061874..71075d4 100644 --- a/commons/module-tree/src/main/java/com/schbrain/common/module/tree/event/TreeOperationAware.java +++ b/commons/module-tree/src/main/java/com/schbrain/common/module/tree/event/TreeOperationAware.java @@ -5,7 +5,8 @@ import com.schbrain.common.module.tree.TreeNode; import java.util.List; /** - * Created by hzchengyi on 2019/1/21. + * @author hzchengyi + * @since 2019/1/21 */ public interface TreeOperationAware { @@ -19,4 +20,4 @@ public interface TreeOperationAware { */ void after(TreeOperationEvent event, List nodes); -} \ No newline at end of file +} diff --git a/commons/module-tree/src/main/java/com/schbrain/common/module/tree/event/TreeOperationEvent.java b/commons/module-tree/src/main/java/com/schbrain/common/module/tree/event/TreeOperationEvent.java index 85aa659..2c19ed3 100644 --- a/commons/module-tree/src/main/java/com/schbrain/common/module/tree/event/TreeOperationEvent.java +++ b/commons/module-tree/src/main/java/com/schbrain/common/module/tree/event/TreeOperationEvent.java @@ -1,10 +1,11 @@ package com.schbrain.common.module.tree.event; /** - * Created by hzchengyi on 2019/1/21. + * @author hzchengyi + * @since 2019/1/21 */ public enum TreeOperationEvent { ADD, DELETE, - MOVE; -} \ No newline at end of file + MOVE +} diff --git a/commons/web-common/src/main/java/com/schbrain/common/web/exception/DefaultGlobalExceptionResolver.java b/commons/web-common/src/main/java/com/schbrain/common/web/exception/DefaultGlobalExceptionResolver.java index dd4ca9e..b4579bd 100644 --- a/commons/web-common/src/main/java/com/schbrain/common/web/exception/DefaultGlobalExceptionResolver.java +++ b/commons/web-common/src/main/java/com/schbrain/common/web/exception/DefaultGlobalExceptionResolver.java @@ -88,10 +88,7 @@ public class DefaultGlobalExceptionResolver extends AbstractHandlerMethodExcepti if (targetMethod == null) { return null; } - ServletInvocableHandlerMethod exceptionHandlerMethod = new ServletInvocableHandlerMethod(handler, targetMethod); - exceptionHandlerMethod.setHandlerMethodArgumentResolvers(argumentResolverComposite); - exceptionHandlerMethod.setHandlerMethodReturnValueHandlers(returnValueHandlerComposite); - return exceptionHandlerMethod; + return createInvocableHandlerMethod(handler, targetMethod); } @Nullable @@ -112,11 +109,26 @@ public class DefaultGlobalExceptionResolver extends AbstractHandlerMethodExcepti // nothing to do } + private ServletInvocableHandlerMethod createInvocableHandlerMethod(Object handler, Method targetMethod) { + ServletInvocableHandlerMethod exceptionHandlerMethod = new ServletInvocableHandlerMethod(handler, targetMethod); + exceptionHandlerMethod.setHandlerMethodArgumentResolvers(argumentResolverComposite); + exceptionHandlerMethod.setHandlerMethodReturnValueHandlers(returnValueHandlerComposite); + return exceptionHandlerMethod; + } + private ExceptionHandlerMethodResolver getHandlerMethodResolver(Class handlerType) { return exceptionHandlerMethodResolvers.computeIfAbsent(handlerType, key -> new ExceptionHandlerMethodResolver(handlerType)); } private Object[] getArguments(Exception exception, HandlerMethod handlerMethod) { + List exceptions = getExceptions(exception); + Object[] arguments = new Object[exceptions.size() + 1]; + exceptions.toArray(arguments); + arguments[arguments.length - 1] = handlerMethod; + return arguments; + } + + private List getExceptions(Exception exception) { List exceptions = new ArrayList<>(); Throwable exToExpose = exception; while (exToExpose != null) { @@ -124,10 +136,7 @@ public class DefaultGlobalExceptionResolver extends AbstractHandlerMethodExcepti Throwable cause = exToExpose.getCause(); exToExpose = (cause != exToExpose ? cause : null); } - Object[] arguments = new Object[exceptions.size() + 1]; - exceptions.toArray(arguments); - arguments[arguments.length - 1] = handlerMethod; - return arguments; + return exceptions; } } diff --git a/starters/dubbo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/dubbo/listener/DubboConfigInitEventListener.java b/starters/dubbo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/dubbo/listener/DubboConfigInitEventListener.java index 7c42ee2..59e9cd2 100644 --- a/starters/dubbo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/dubbo/listener/DubboConfigInitEventListener.java +++ b/starters/dubbo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/dubbo/listener/DubboConfigInitEventListener.java @@ -44,6 +44,10 @@ class DubboConfigInitEventListener extends OnceApplicationContextEventListener externalConfiguration = filterDubboProperties(environment); + return buildConfigCenterConfig(externalConfiguration); + } + + private ConfigCenterConfig buildConfigCenterConfig(Map externalConfiguration) { ConfigCenterConfig configCenterConfig = new ConfigCenterConfig(); configCenterConfig.setAppExternalConfig(externalConfiguration); return configCenterConfig; diff --git a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/configuration/MybatisPlusGlobalConfigCustomizer.java b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/configuration/MybatisPlusGlobalConfigCustomizer.java index 1a36bea..3941f04 100644 --- a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/configuration/MybatisPlusGlobalConfigCustomizer.java +++ b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/configuration/MybatisPlusGlobalConfigCustomizer.java @@ -30,14 +30,17 @@ public class MybatisPlusGlobalConfigCustomizer implements MybatisPlusPropertiesC @Override public void customize(MybatisPlusProperties properties) { - GlobalConfig globalConfig = properties.getGlobalConfig(); - globalConfig.setBanner(false); - - DbConfig dbConfig = globalConfig.getDbConfig(); + DbConfig dbConfig = buildDbConfig(properties); dbConfig.setIdType(IdType.AUTO); dbConfig.setInsertStrategy(FieldStrategy.NOT_NULL); dbConfig.setUpdateStrategy(FieldStrategy.NOT_NULL); dbConfig.setWhereStrategy(FieldStrategy.NOT_NULL); } -} \ No newline at end of file + private DbConfig buildDbConfig(MybatisPlusProperties properties) { + GlobalConfig globalConfig = properties.getGlobalConfig(); + globalConfig.setBanner(false); + return globalConfig.getDbConfig(); + } + +} diff --git a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/datasource/extractor/DataSourcePropertiesExtractor.java b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/datasource/extractor/DataSourcePropertiesExtractor.java index c01a3b9..8f3785d 100644 --- a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/datasource/extractor/DataSourcePropertiesExtractor.java +++ b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/datasource/extractor/DataSourcePropertiesExtractor.java @@ -11,7 +11,7 @@ import java.util.Properties; */ public interface DataSourcePropertiesExtractor { - boolean support(DataSource dataSource) throws SQLException; + boolean support(DataSource dataSource); Properties extract(DataSource dataSource, Map properties) throws SQLException; diff --git a/starters/oss-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/oss/util/OssUtils.java b/starters/oss-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/oss/util/OssUtils.java index 6691076..b4fb55b 100644 --- a/starters/oss-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/oss/util/OssUtils.java +++ b/starters/oss-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/oss/util/OssUtils.java @@ -171,14 +171,9 @@ public class OssUtils { } public static UploadCredentials generateUploadToken() { - AssumeRoleRequest request = new AssumeRoleRequest(); - request.setSysMethod(MethodType.POST); - request.setRoleArn(stsProperties.getRoleArn()); - request.setRoleSessionName(stsProperties.getRoleSessionName()); - request.setDurationSeconds(stsProperties.getDurationSeconds()); AssumeRoleResponse response; try { - response = getStsAcsClient().getAcsResponse(request); + response = getStsAcsClient().getAcsResponse(createAssumeRoleRequest()); } catch (com.aliyuncs.exceptions.ClientException e) { return new UploadCredentials(e.getErrMsg()); } @@ -283,6 +278,15 @@ public class OssUtils { return getOssClient().doesObjectExist(bucket, key); } + private static AssumeRoleRequest createAssumeRoleRequest() { + AssumeRoleRequest request = new AssumeRoleRequest(); + request.setSysMethod(MethodType.POST); + request.setRoleArn(stsProperties.getRoleArn()); + request.setRoleSessionName(stsProperties.getRoleSessionName()); + request.setDurationSeconds(stsProperties.getDurationSeconds()); + return request; + } + private static DownloadResult download0(String bucket, String objectKey) { GetObjectRequest request = new GetObjectRequest(bucket, objectKey); try { diff --git a/support/schbrain-base-dao/src/main/java/com/schbrain/framework/dao/BaseDao.java b/support/schbrain-base-dao/src/main/java/com/schbrain/framework/dao/BaseDao.java index 7620bb9..633e1ba 100644 --- a/support/schbrain-base-dao/src/main/java/com/schbrain/framework/dao/BaseDao.java +++ b/support/schbrain-base-dao/src/main/java/com/schbrain/framework/dao/BaseDao.java @@ -17,35 +17,35 @@ public interface BaseDao { * 插入单个领域对象 *

注意：插入时只会指定非null的领域对象属性对应的列

* - * @param obj 待插入领域对象 + * @param entity 待插入领域对象 * @return 插入是否成功 */ - Boolean add(T obj); + Boolean add(T entity); /** * 批量插入领域对象 * - * @param objList 待插入领域对象列表 + * @param entityList 待插入领域对象列表 * @param fields 插入时指定的领域对象属性列表，如果为空表示对象的所有属性 * @return 影响行数 */ - Integer addList(List objList, String... fields); + Integer addList(List entityList, String... fields); T getById(long id); - T getOneByObject(T obj); + T getOneByObject(T entity); - T getOneByCondition(String whereClause, Object... objs); + T getOneByCondition(String whereClause, Object... entityList); List listByIdList(List idList); - List listByCondition(String whereClause, Object... objs); + List listByCondition(String whereClause, Object... entityList); - List listByObject(T obj); + List listByObject(T entity); - Integer getCountByCondition(String whereClause, Object... objs); + Integer getCountByCondition(String whereClause, Object... entityList); - Page pageByCondition(int pageNum, int pageSize, String whereClause, Object... objs); + Page pageByCondition(int pageNum, int pageSize, String whereClause, Object... entityList); /** * 分页获取列表 @@ -54,23 +54,23 @@ public interface BaseDao { * @param pageSize 当前页记录数 * @param whereClause where关键词后的条件语句 * @param orderByClause order by关键词后的排序语句，注意：语句中不支持参数 - * @param objs where关键词后的条件语句中参数对应的值 + * @param entityList where关键词后的条件语句中参数对应的值 * @return page对象，包含记录及分页信息 */ - Page pageByCondition(int pageNum, int pageSize, String whereClause, String orderByClause, Object... objs); + Page pageByCondition(int pageNum, int pageSize, String whereClause, String orderByClause, Object... entityList); Boolean deleteById(long id); Integer deleteByIdList(List idList); - Integer deleteByCondition(String whereClause, Object... objs); + Integer deleteByCondition(String whereClause, Object... entityList); - Boolean updateById(T obj); + Boolean updateById(T entity); - Boolean updateByIdWithNull(T obj); + Boolean updateByIdWithNull(T entity); - Integer updateByCondition(T obj, String whereClause, Object... objs); + Integer updateByCondition(T entity, String whereClause, Object... entityList); - Integer updateByCompleteSql(String completeSql, Object... objs); + Integer updateByCompleteSql(String completeSql, Object... entityList); -} \ No newline at end of file +} diff --git a/support/schbrain-base-dao/src/main/java/com/schbrain/framework/dao/mybatis/CustomizeMapperFactoryBean.java b/support/schbrain-base-dao/src/main/java/com/schbrain/framework/dao/mybatis/CustomizeMapperFactoryBean.java index c6ed131..2a79ca4 100644 --- a/support/schbrain-base-dao/src/main/java/com/schbrain/framework/dao/mybatis/CustomizeMapperFactoryBean.java +++ b/support/schbrain-base-dao/src/main/java/com/schbrain/framework/dao/mybatis/CustomizeMapperFactoryBean.java @@ -35,13 +35,17 @@ public class CustomizeMapperFactoryBean extends MapperFactoryBean { List interceptorList = configuration.getInterceptors(); boolean hasPageInterceptor = interceptorList.stream().anyMatch(PageInterceptor.class::isInstance); if (!hasPageInterceptor) { - PageInterceptor pageInterceptor = new PageInterceptor(); - pageInterceptor.setProperties(new Properties()); - configuration.addInterceptor(pageInterceptor); + configuration.addInterceptor(createPageInterceptor()); } // 创建代理 BaseDaoInvocationHandler handler = new BaseDaoInvocationHandler<>(originMapperProxy, sqlSession, mapperInterface); return ProxyUtil.newProxyInstance(mapperInterface.getClassLoader(), handler, mapperInterface); } + private PageInterceptor createPageInterceptor() { + PageInterceptor pageInterceptor = new PageInterceptor(); + pageInterceptor.setProperties(new Properties()); + return pageInterceptor; + } + } diff --git a/support/schbrain-base-dao/src/main/java/com/schbrain/framework/dao/mybatis/mapper/BaseMapper.java b/support/schbrain-base-dao/src/main/java/com/schbrain/framework/dao/mybatis/mapper/BaseMapper.java index cc9b64d..2a2b1bf 100644 --- a/support/schbrain-base-dao/src/main/java/com/schbrain/framework/dao/mybatis/mapper/BaseMapper.java +++ b/support/schbrain-base-dao/src/main/java/com/schbrain/framework/dao/mybatis/mapper/BaseMapper.java @@ -87,10 +87,7 @@ public class BaseMapper { } private void parseMapperClass() { - MapperConfig mapperConfig = mapperInterface.getAnnotation(MapperConfig.class); - if (null == mapperConfig) { - throw new MapperParseException(String.format("Can not find MapperConfig annotation in mapper class %s ", mapperInterface.getName())); - } + MapperConfig mapperConfig = getMapperConfig(); tableName = mapperConfig.tableName(); if (StringUtils.isBlank(tableName)) { throw new MapperParseException(String.format("Table name is blank in MapperConfig annotation in mapper class %s ", mapperInterface.getName())); @@ -105,6 +102,14 @@ public class BaseMapper { } } + private MapperConfig getMapperConfig() { + MapperConfig mapperConfig = mapperInterface.getAnnotation(MapperConfig.class); + if (null == mapperConfig) { + throw new MapperParseException(String.format("Can not find MapperConfig annotation in mapper class %s ", mapperInterface.getName())); + } + return mapperConfig; + } + private Object getById(Object[] args) { if (null == args[0]) { throw new IllegalArgumentException("Parameter id can not be null"); @@ -157,4 +162,4 @@ public class BaseMapper { return sqlSession.update(bms.getUpdateByIdWithNullMSId(), updateObj) > 0; } -} \ No newline at end of file +} diff --git a/support/schbrain-base-dao/src/main/java/com/schbrain/framework/dao/mybatis/mapper/sqlsource/AbstractSqlSource.java b/support/schbrain-base-dao/src/main/java/com/schbrain/framework/dao/mybatis/mapper/sqlsource/AbstractSqlSource.java index e10a340..ef02231 100644 --- a/support/schbrain-base-dao/src/main/java/com/schbrain/framework/dao/mybatis/mapper/sqlsource/AbstractSqlSource.java +++ b/support/schbrain-base-dao/src/main/java/com/schbrain/framework/dao/mybatis/mapper/sqlsource/AbstractSqlSource.java @@ -34,8 +34,7 @@ public abstract class AbstractSqlSource implements SqlSource { if (StringUtils.isBlank(sql)) { return "1=1"; } - Object[] params = ((Object[]) args[1]); - int paramCount = null == params ? 0 : params.length; + int paramCount = getParamCount(args); Matcher matcher = pattern.matcher(sql); int i = 0; StringBuilder result = new StringBuilder(); @@ -78,4 +77,9 @@ public abstract class AbstractSqlSource implements SqlSource { return PropertyParser.parse(sql, configuration.getVariables()); } -} \ No newline at end of file + private int getParamCount(Object[] args) { + Object[] params = ((Object[]) args[1]); + return null == params ? 0 : params.length; + } + +} diff --git a/support/schbrain-base-dao/src/main/java/com/schbrain/framework/dao/mybatis/mapper/sqlsource/UpdateByCompleteSqlSource.java b/support/schbrain-base-dao/src/main/java/com/schbrain/framework/dao/mybatis/mapper/sqlsource/UpdateByCompleteSqlSource.java index fb4070e..a6df674 100644 --- a/support/schbrain-base-dao/src/main/java/com/schbrain/framework/dao/mybatis/mapper/sqlsource/UpdateByCompleteSqlSource.java +++ b/support/schbrain-base-dao/src/main/java/com/schbrain/framework/dao/mybatis/mapper/sqlsource/UpdateByCompleteSqlSource.java @@ -20,7 +20,7 @@ public class UpdateByCompleteSqlSource extends AbstractSqlSource { @Override public BoundSql getBoundSql(Object parameterObject) { - Object[] args = (Object[]) ((Map) parameterObject).get("array"); + Object[] args = (Object[]) ((Map) parameterObject).get("array"); SqlSourceBuilder sqlSourceParser = new SqlSourceBuilder(configuration); String sql = replacePlaceholder(getGenericParamSqlAndCheckParamCount(args)); Map paramMap = getSqlCommandParam((Object[]) args[1]); @@ -30,4 +30,4 @@ public class UpdateByCompleteSqlSource extends AbstractSqlSource { return boundSql; } -} \ No newline at end of file +} diff --git a/support/schbrain-base-dao/src/main/java/com/schbrain/framework/dao/mybatis/mapper/sqlsource/UpdateByConditionSqlSource.java b/support/schbrain-base-dao/src/main/java/com/schbrain/framework/dao/mybatis/mapper/sqlsource/UpdateByConditionSqlSource.java index 919627a..3d84f3e 100644 --- a/support/schbrain-base-dao/src/main/java/com/schbrain/framework/dao/mybatis/mapper/sqlsource/UpdateByConditionSqlSource.java +++ b/support/schbrain-base-dao/src/main/java/com/schbrain/framework/dao/mybatis/mapper/sqlsource/UpdateByConditionSqlSource.java @@ -31,7 +31,7 @@ public class UpdateByConditionSqlSource extends AbstractSqlSource { @Override protected BoundSql getBoundSql(String scriptSql, Object parameterObject) { - Object[] args = (Object[]) ((Map) parameterObject).get("array"); + Object[] args = (Object[]) ((Map) parameterObject).get("array"); Object[] conditionArgs = new Object[]{args[1], args[2]}; Map paramMap = getSqlCommandParam((Object[]) args[2]); paramMap.put("obj", args[0]); @@ -43,4 +43,4 @@ public class UpdateByConditionSqlSource extends AbstractSqlSource { return boundSql; } -} \ No newline at end of file +} -- GitLab