Merge pull request #985 from hazendaz/tests

[cleanup] More cleanup
mybatis · Aug 11, 2024 · aaaa887 · aaaa887
2 parents fb4d3db + 1df5bcd
commit aaaa887
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java b/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java
@@ -555,11 +555,10 @@ private <T> T[] appendArrays(T[] oldArrays, T[] newArrays, IntFunction<T[]> gene
  }
  if (newArrays == null) {
  return oldArrays;
- } else {
- List<T> newList = new ArrayList<>(Arrays.asList(oldArrays));
- newList.addAll(Arrays.asList(newArrays));
- return newList.toArray(generator.apply(0));
  }
+ List<T> newList = new ArrayList<>(Arrays.asList(oldArrays));
+ newList.addAll(Arrays.asList(newArrays));
+ return newList.toArray(generator.apply(0));
  }
 
  @Override

diff --git a/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java b/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java
@@ -61,6 +61,7 @@
  */
 public class MapperScannerRegistrar implements ImportBeanDefinitionRegistrar, ResourceLoaderAware {
 
+ // Note: Do not move resourceLoader via cleanup
  private ResourceLoader resourceLoader;
 
  @Override

diff --git a/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java b/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java
@@ -468,11 +468,11 @@ private String getPropertyValue(String propertyName, PropertyValues values) {
  }
  if (value instanceof String) {
  return value.toString();
- } else if (value instanceof TypedStringValue) {
+ }
+ if (value instanceof TypedStringValue) {
  return ((TypedStringValue) value).getValue();
- } else {
- return null;
  }
+ return null;
  }
 
  @SuppressWarnings("unchecked")