Merge remote-tracking branch 'origin/master'

Author: bbottema

README.md

@@ -15,10 +15,15 @@ through multiple converters if a direct one is not available. It contains many b
 <dependency>
   <groupId>com.github.bbottema</groupId>
   <artifactId>java-reflection</artifactId>
-  <version>3.11.3</version>
+  <version>3.12.0</version>
 </dependency>
 ```
 
+v3.12.0 (4-November-2019)
+
+- For simple class lookups, In addition to java.lang, also try the packages java.util and java.math
+
+
 v3.11.1 - v3.11.3 (29-October-2019 - 1-November-2019)
 
 - 3.11.3: Solved an NullPointerException in a collectMethods method

RELEASE.txt

@@ -4,6 +4,11 @@ https://github.com/bbottema/java-reflection
 RELEASE NOTES Java Reflection
 
 
+v3.12.0 (4-November-2019)
+
+- For simple class lookups, In addition to java.lang, also try the packages java.util and java.math
+
+
 v3.11.1 - v3.11.3 (29-October-2019 - 1-November-2019)
 
 - 3.11.3: Solved an NullPointerException in a collectMethods method

pom.xml

@@ -7,7 +7,7 @@
 	<artifactId>java-reflection</artifactId>
 	<packaging>jar</packaging>
 	<name>Java Reflection</name>
-	<version>3.11.3</version>
+	<version>3.12.1</version>
 	<description>Java Reflection provides a small package with nifty reflection features that will help with finding constructors, methods and value conversions</description>
 	<url>https://github.com/bbottema/java-reflection</url>
 	<inceptionYear>2011</inceptionYear>

src/main/java/org/bbottema/javareflection/ClassUtils.java

@@ -36,6 +36,7 @@
  * </ul>
  */
 @UtilityClass
+@SuppressWarnings("WeakerAccess")
 public final class ClassUtils {
 
 	/**
@@ -53,12 +54,18 @@ public static <T> Class<T> locateClass(final String className, final boolean ful
 		if (CLASS_CACHE.containsKey(cacheKey)) {
 			return (Class<T>) CLASS_CACHE.get(cacheKey);
 		}
-		final Class<?> _class;
+		Class<?> _class;
 		if (fullscan) {
 			_class = locateClass(className, null, classLoader);
 		} else {
 			// try standard package used for most common classes
 			_class = locateClass(className, "java.lang", classLoader);
+			if (_class == null) {
+				_class = locateClass(className, "java.util", classLoader);
+			}
+			if (_class == null) {
+				_class = locateClass(className, "java.math", classLoader);
+			}
 		}
 		CLASS_CACHE.put(cacheKey, _class);
 		return (Class<T>) _class;

src/main/java/org/bbottema/javareflection/MethodUtils.java

@@ -73,7 +73,7 @@ public final class MethodUtils {
 	 */
     @Nullable
     @SuppressWarnings({"unchecked"})
-    public static <T> T invokeMethodSimple(final Method method, final Object subject, final Object... args) {
+    public static <T> T invokeMethodSimple(final Method method, @Nullable final Object subject, final Object... args) {
         try {
             return (T) method.invoke(subject, args);
         } catch (SecurityException e) {

src/test/java/org/bbottema/javareflection/ClassUtilsTest.java

@@ -16,6 +16,7 @@
 import java.net.Socket;
 import java.util.Collection;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import static java.util.EnumSet.of;
@@ -33,6 +34,7 @@ public void resetStaticCaches() {
 
 	@Test
 	public void testLocateClass() {
+		assertThat(ClassUtils.locateClass("Locale", false, null)).isEqualTo(Locale.class);
 		assertThat(ClassUtils.locateClass("Math", false, null)).isEqualTo(Math.class);
 		assertThat(ClassUtils.locateClass("Mathh", false, null)).isNull();
 		assertThat(ClassUtils.locateClass("ClassUtils", false, null)).isNull();

src/test/java/org/bbottema/javareflection/MethodUtilsTest.java

@@ -18,6 +18,7 @@
 import org.bbottema.javareflection.valueconverter.ValueConversionHelper;
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.internal.util.collections.Iterables;
 import sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl;
 
 import javax.annotation.Nonnull;
@@ -38,12 +39,14 @@
 
 import static java.util.Arrays.asList;
 import static java.util.EnumSet.allOf;
+import static java.util.EnumSet.of;
 import static java.util.Objects.requireNonNull;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 import static org.bbottema.javareflection.ClassUtils.collectMethodsByName;
 import static org.bbottema.javareflection.MethodUtils.onlyMethod;
 import static org.bbottema.javareflection.model.MethodModifier.MATCH_ANY;
+import static org.bbottema.javareflection.model.MethodModifier.PUBLIC;
 
 public class MethodUtilsTest {
 
@@ -208,10 +211,10 @@ public void testIsMethodCompatible_Simple() throws NoSuchMethodException {
 	@Test
 	public void testIsMethodCompatible_TestLookupModes() throws NoSuchMethodException {
 		Set<LookupMode> noConversions = EnumSet.noneOf(LookupMode.class);
-		Set<LookupMode> commonConversions = EnumSet.of(LookupMode.COMMON_CONVERT);
-		Set<LookupMode> castConvert = EnumSet.of(LookupMode.CAST_TO_SUPER, LookupMode.CAST_TO_INTERFACE);
-		Set<LookupMode> castThenCommonsConvert = EnumSet.of(LookupMode.CAST_TO_SUPER, LookupMode.COMMON_CONVERT);
-		Set<LookupMode> smartConversions = EnumSet.of(LookupMode.SMART_CONVERT);
+		Set<LookupMode> commonConversions = of(LookupMode.COMMON_CONVERT);
+		Set<LookupMode> castConvert = of(LookupMode.CAST_TO_SUPER, LookupMode.CAST_TO_INTERFACE);
+		Set<LookupMode> castThenCommonsConvert = of(LookupMode.CAST_TO_SUPER, LookupMode.COMMON_CONVERT);
+		Set<LookupMode> smartConversions = of(LookupMode.SMART_CONVERT);
 
 		Method m = Math.class.getMethod("min", int.class, int.class);
 		assertThat(MethodUtils.isMethodCompatible(m, noConversions, int.class, boolean.class)).isFalse();
@@ -334,4 +337,13 @@ public void testFirstParameterIndexByAnnotation() {
 		assertThat(MethodUtils.firstParameterIndexByAnnotation(testMethod, Nonnull.class)).isEqualTo(2);
 		assertThat(MethodUtils.firstParameterIndexByAnnotation(testMethod, Meta.class)).isEqualTo(-1);
 	}
+
+	@Test
+	public void testInvokeMethodSimple() {
+		Set<InvokableObject<Method>> valueOf = MethodUtils.findSimpleCompatibleMethod(String.class, "valueOf", boolean.class);
+		Method valueOfBoolean = Iterables.firstOf(valueOf).getMethod();
+
+		assertThat(MethodUtils.invokeMethodSimple(valueOfBoolean, null, true)).isEqualTo("true");
+		assertThat(MethodUtils.invokeMethodSimple(valueOfBoolean, null, false)).isEqualTo("false");
+	}
 }