Merge branch 'master' of github.com:ebean-orm/ebean

src/main/java/io/ebean/util/CamelCaseHelper.java

@@ -12,7 +12,7 @@ public class CamelCaseHelper {
 
     String[] vals = underscore.split("_");
     if (vals.length == 1) {
-      return underscore;
+      return isUpperCase(underscore) ? underscore.toLowerCase() : underscore;
     }
 
     StringBuilder result = new StringBuilder();
@@ -29,4 +29,13 @@ public class CamelCaseHelper {
 
     return result.toString();
   }
+
+  private static boolean isUpperCase(String underscore) {
+    for (int i = 0; i < underscore.length(); i++) {
+      if (Character.isLowerCase(underscore.charAt(i))) {
+        return false;
+      }
+    }
+    return true;
+  }
 }

src/test/java/io/ebean/util/CamelCaseHelperTest.java

@@ -25,7 +25,7 @@ public class CamelCaseHelperTest {
     assertEquals(CamelCaseHelper.toCamelFromUnderscore("helloThere"), "helloThere");
     assertEquals(CamelCaseHelper.toCamelFromUnderscore("helloThereJim"), "helloThereJim");
     assertEquals(CamelCaseHelper.toCamelFromUnderscore("hello"), "hello");
-    assertEquals(CamelCaseHelper.toCamelFromUnderscore("HELLO"), "HELLO");
+    assertEquals(CamelCaseHelper.toCamelFromUnderscore("HELLO"), "hello");
   }
 
 }