From e6ca503273f1ed2c995412a5292db2fe80dfde95 Mon Sep 17 00:00:00 2001 From: TimeChaser <1872101334@qq.com> Date: Wed, 10 Aug 2022 20:51:04 +0800 Subject: [PATCH 1/3] Added a missing single quote in an exception message --- .../apache/ibatis/binding/MapperMethod.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/apache/ibatis/binding/MapperMethod.java b/src/main/java/org/apache/ibatis/binding/MapperMethod.java index 5d903f808f5..57908eef00a 100644 --- a/src/main/java/org/apache/ibatis/binding/MapperMethod.java +++ b/src/main/java/org/apache/ibatis/binding/MapperMethod.java @@ -15,15 +15,6 @@ */ package org.apache.ibatis.binding; -import java.lang.reflect.Array; -import java.lang.reflect.Method; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; - import org.apache.ibatis.annotations.Flush; import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.cursor.Cursor; @@ -38,6 +29,15 @@ import org.apache.ibatis.session.RowBounds; import org.apache.ibatis.session.SqlSession; +import java.lang.reflect.Array; +import java.lang.reflect.Method; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; + /** * @author Clinton Begin * @author Eduardo Macarron @@ -99,7 +99,7 @@ public Object execute(SqlSession sqlSession, Object[] args) { } if (result == null && method.getReturnType().isPrimitive() && !method.returnsVoid()) { throw new BindingException("Mapper method '" + command.getName() - + " attempted to return null from a method with a primitive return type (" + method.getReturnType() + ")."); + + "' attempted to return null from a method with a primitive return type (" + method.getReturnType() + ")."); } return result; } From fde198794fab8be2015a4dbbed03766ecaf4cb7a Mon Sep 17 00:00:00 2001 From: TimeChaser <1872101334@qq.com> Date: Thu, 11 Aug 2022 12:16:34 +0800 Subject: [PATCH 2/3] Put the imports back in the correct order --- .../apache/ibatis/binding/MapperMethod.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/apache/ibatis/binding/MapperMethod.java b/src/main/java/org/apache/ibatis/binding/MapperMethod.java index 57908eef00a..72c7ade8517 100644 --- a/src/main/java/org/apache/ibatis/binding/MapperMethod.java +++ b/src/main/java/org/apache/ibatis/binding/MapperMethod.java @@ -15,6 +15,15 @@ */ package org.apache.ibatis.binding; +import java.lang.reflect.Array; +import java.lang.reflect.Method; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; + import org.apache.ibatis.annotations.Flush; import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.cursor.Cursor; @@ -29,15 +38,6 @@ import org.apache.ibatis.session.RowBounds; import org.apache.ibatis.session.SqlSession; -import java.lang.reflect.Array; -import java.lang.reflect.Method; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; - /** * @author Clinton Begin * @author Eduardo Macarron From 87924a425bf5fc0c03e7285a21634be3db106020 Mon Sep 17 00:00:00 2001 From: TimeChaser <1872101334@qq.com> Date: Fri, 12 Aug 2022 11:10:12 +0800 Subject: [PATCH 3/3] Change the cast target --- .../java/org/apache/ibatis/cache/decorators/SoftCache.java | 7 +++---- .../java/org/apache/ibatis/cache/decorators/WeakCache.java | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/apache/ibatis/cache/decorators/SoftCache.java b/src/main/java/org/apache/ibatis/cache/decorators/SoftCache.java index 55dd2f8325e..5cae86f8d1f 100644 --- a/src/main/java/org/apache/ibatis/cache/decorators/SoftCache.java +++ b/src/main/java/org/apache/ibatis/cache/decorators/SoftCache.java @@ -65,8 +65,8 @@ public void putObject(Object key, Object value) { @Override public Object getObject(Object key) { Object result = null; - @SuppressWarnings("unchecked") // assumed delegate cache is totally managed by this cache - SoftReference softReference = (SoftReference) delegate.getObject(key); + // assumed delegate cache is totally managed by this cache + SoftEntry softReference = (SoftEntry) delegate.getObject(key); if (softReference != null) { result = softReference.get(); if (result == null) { @@ -87,8 +87,7 @@ public Object getObject(Object key) { @Override public Object removeObject(Object key) { removeGarbageCollectedItems(); - @SuppressWarnings("unchecked") - SoftReference softReference = (SoftReference) delegate.removeObject(key); + SoftEntry softReference = (SoftEntry) delegate.removeObject(key); return softReference == null ? null : softReference.get(); } diff --git a/src/main/java/org/apache/ibatis/cache/decorators/WeakCache.java b/src/main/java/org/apache/ibatis/cache/decorators/WeakCache.java index 4f3596f5c0a..faed488133e 100644 --- a/src/main/java/org/apache/ibatis/cache/decorators/WeakCache.java +++ b/src/main/java/org/apache/ibatis/cache/decorators/WeakCache.java @@ -65,8 +65,8 @@ public void putObject(Object key, Object value) { @Override public Object getObject(Object key) { Object result = null; - @SuppressWarnings("unchecked") // assumed delegate cache is totally managed by this cache - WeakReference weakReference = (WeakReference) delegate.getObject(key); + // assumed delegate cache is totally managed by this cache + WeakEntry weakReference = (WeakEntry) delegate.getObject(key); if (weakReference != null) { result = weakReference.get(); if (result == null) { @@ -86,8 +86,7 @@ public Object getObject(Object key) { @Override public Object removeObject(Object key) { removeGarbageCollectedItems(); - @SuppressWarnings("unchecked") - WeakReference weakReference = (WeakReference) delegate.removeObject(key); + WeakEntry weakReference = (WeakEntry) delegate.removeObject(key); return weakReference == null ? null : weakReference.get(); }