Use expression

Author: garydgregory

src/main/java/org/apache/commons/lang3/ClassUtils.java

@@ -1412,10 +1412,7 @@ public static boolean isInnerClass(final Class<?> cls) {
      * @since 3.1
      */
     public static boolean isPrimitiveOrWrapper(final Class<?> type) {
-        if (type == null) {
-            return false;
-        }
-        return type.isPrimitive() || isPrimitiveWrapper(type);
+        return type != null && type.isPrimitive() || isPrimitiveWrapper(type);
     }
 
     /**

src/test/java/org/apache/commons/lang3/ClassUtilsTest.java

@@ -1318,7 +1318,6 @@ void testHierarchyIncludingInterfaces() {
 
     @Test
     void testIsPrimitiveOrWrapper() {
-
         // test primitive wrapper classes
         assertTrue(ClassUtils.isPrimitiveOrWrapper(Boolean.class), "Boolean.class");
         assertTrue(ClassUtils.isPrimitiveOrWrapper(Byte.class), "Byte.class");
@@ -1328,7 +1327,6 @@ void testIsPrimitiveOrWrapper() {
         assertTrue(ClassUtils.isPrimitiveOrWrapper(Long.class), "Long.class");
         assertTrue(ClassUtils.isPrimitiveOrWrapper(Double.class), "Double.class");
         assertTrue(ClassUtils.isPrimitiveOrWrapper(Float.class), "Float.class");
-
         // test primitive classes
         assertTrue(ClassUtils.isPrimitiveOrWrapper(Boolean.TYPE), "boolean");
         assertTrue(ClassUtils.isPrimitiveOrWrapper(Byte.TYPE), "byte");
@@ -1339,7 +1337,6 @@ void testIsPrimitiveOrWrapper() {
         assertTrue(ClassUtils.isPrimitiveOrWrapper(Double.TYPE), "double");
         assertTrue(ClassUtils.isPrimitiveOrWrapper(Float.TYPE), "float");
         assertTrue(ClassUtils.isPrimitiveOrWrapper(Void.TYPE), "Void.TYPE");
-
         // others
         assertFalse(ClassUtils.isPrimitiveOrWrapper(null), "null");
         assertFalse(ClassUtils.isPrimitiveOrWrapper(Void.class), "Void.class");