PLANNER-337 Rename StaticMember to StaticInnerClass + remove _ from m…

…ethod names
kiegroup · Sep 4, 2017 · 619fd09 · 619fd09
1 parent 972887b
commit 619fd09
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 26 deletions.
diff --git a/optaplanner-core/src/main/java/org/optaplanner/core/config/util/ConfigUtils.java b/optaplanner-core/src/main/java/org/optaplanner/core/config/util/ConfigUtils.java
@@ -59,7 +59,7 @@ public static <T> T newInstance(Object bean, String propertyName, Class<T> clazz
             throw new IllegalArgumentException("The " + bean.getClass().getSimpleName() + "'s " + propertyName + " ("
                     + clazz.getName() + ") does not have a public no-arg constructor"
                     // Inner classes include local, anonymous and non-static member classes
-                    + (clazz.isLocalClass() || clazz.isAnonymousClass() || clazz.isMemberClass()
+                    + ((clazz.isLocalClass() || clazz.isAnonymousClass() || clazz.isMemberClass())
                     && !Modifier.isStatic(clazz.getModifiers()) ? " because it is an inner class." : "."), e);
         }
     }

diff --git a/optaplanner-core/src/test/java/org/optaplanner/core/config/util/ConfigUtilsTest.java b/optaplanner-core/src/test/java/org/optaplanner/core/config/util/ConfigUtilsTest.java
@@ -189,47 +189,43 @@ public void setString(String string) {
     }
 
     @Test
-    public void newInstance_StaticMember() {
+    public void newInstanceStaticInnerClass() {
-        assertNotNull(ConfigUtils.newInstance(this, "testProperty", StaticMember.class));
+        assertNotNull(ConfigUtils.newInstance(this, "testProperty", StaticInnerClass.class));
+    }
+
+    public static class StaticInnerClass {
     }
 
     @Test
-    public void newInstance_StaticMemberWithArgsConstructor() {
+    public void newInstanceStaticInnerClassWithArgsConstructor() {
         expectedException.expect(IllegalArgumentException.class);
         expectedException.expectMessage("no-arg constructor.");
-        assertNotNull(ConfigUtils.newInstance(this, "testProperty", StaticMemberWithArgsConstructor.class));
+        assertNotNull(ConfigUtils.newInstance(this, "testProperty", StaticInnerClassWithArgsConstructor.class));
     }
 
-    @Test
+    public static class StaticInnerClassWithArgsConstructor {
-    public void newInstance_NonStaticMember() {
+
-        expectedException.expect(IllegalArgumentException.class);
+        public StaticInnerClassWithArgsConstructor(int i) {
-        expectedException.expectMessage("inner class");
+        }
-        assertNotNull(ConfigUtils.newInstance(this, "testProperty", NonStaticMember.class));
+
     }
 
     @Test
-    public void newInstance_LocalClass() {
+    public void newInstanceNonStaticInnerClass() {
-        class LocalClass {
-            // this is an inner class
-        }
         expectedException.expect(IllegalArgumentException.class);
         expectedException.expectMessage("inner class");
-        assertNotNull(ConfigUtils.newInstance(this, "testProperty", LocalClass.class));
+        assertNotNull(ConfigUtils.newInstance(this, "testProperty", NonStaticInnerClass.class));
     }
 
-    public static class StaticMember {
+    public class NonStaticInnerClass {
-
-    }
-
-    public static class StaticMemberWithArgsConstructor {
-
-        public StaticMemberWithArgsConstructor(int i) {
-        }
-
     }
 
-    public class NonStaticMember {
+    @Test
-        // this is an inner class
+    public void newInstanceLocalClass() {
+        class LocalClass {}
+        expectedException.expect(IllegalArgumentException.class);
+        expectedException.expectMessage("inner class");
+        assertNotNull(ConfigUtils.newInstance(this, "testProperty", LocalClass.class));
     }
 
 }