Merge pull request #3139 from dukbong/Replace

Recommend using isEmpty() instead of size().
mybatis · Apr 16, 2024 · 7ae38a2 · 7ae38a2
2 parents 4a8e2ea + b57b86c
commit 7ae38a2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/org/apache/ibatis/executor/loader/ResultLoaderMap.java b/src/main/java/org/apache/ibatis/executor/loader/ResultLoaderMap.java
@@ -70,6 +70,10 @@ public Set<String> getPropertyNames() {
   public int size() {
     return loaderMap.size();
   }
+
+  public boolean isEmpty() {
+    return loaderMap.isEmpty();
+  }
 
   public boolean hasLoader(String property) {
     return loaderMap.containsKey(property.toUpperCase(Locale.ENGLISH));

diff --git a/src/main/java/org/apache/ibatis/executor/loader/javassist/JavassistProxyFactory.java b/src/main/java/org/apache/ibatis/executor/loader/javassist/JavassistProxyFactory.java
@@ -143,14 +143,14 @@ public Object invoke(Object enhanced, Method method, Method methodProxy, Object[
             original = objectFactory.create(type, constructorArgTypes, constructorArgs);
           }
           PropertyCopier.copyBeanProperties(type, enhanced, original);
-          if (lazyLoader.size() > 0) {
+          if (!lazyLoader.isEmpty()) {
             return new JavassistSerialStateHolder(original, lazyLoader.getProperties(), objectFactory,
                 constructorArgTypes, constructorArgs);
           } else {
             return original;
           }
         }
-        if (lazyLoader.size() > 0 && !FINALIZE_METHOD.equals(methodName)) {
+        if (!lazyLoader.isEmpty() && !FINALIZE_METHOD.equals(methodName)) {
           if (aggressive || lazyLoadTriggerMethods.contains(methodName)) {
             lazyLoader.loadAll();
           } else if (PropertyNamer.isSetter(methodName)) {