svn commit: r1301246 - in /commons/sandbox/flatfile/trunk/src/main/java/org/apache/commons/flatfile/dsl: ConstantEntityNameStrategy.java DefaultEntityNameStrategy.java

[mb...@apache.org]

Author: mbenson
Date: Thu Mar 15 22:18:16 2012
New Revision: 1301246

URL: http://svn.apache.org/viewvc?rev=1301246&view=rev
Log:
lang5 + minor cleanup including final members

Modified:
    commons/sandbox/flatfile/trunk/src/main/java/org/apache/commons/flatfile/dsl/ConstantEntityNameStrategy.java
    commons/sandbox/flatfile/trunk/src/main/java/org/apache/commons/flatfile/dsl/DefaultEntityNameStrategy.java

Modified: commons/sandbox/flatfile/trunk/src/main/java/org/apache/commons/flatfile/dsl/ConstantEntityNameStrategy.java
URL: http://svn.apache.org/viewvc/commons/sandbox/flatfile/trunk/src/main/java/org/apache/commons/flatfile/dsl/ConstantEntityNameStrategy.java?rev=1301246&r1=1301245&r2=1301246&view=diff
==============================================================================
--- commons/sandbox/flatfile/trunk/src/main/java/org/apache/commons/flatfile/dsl/ConstantEntityNameStrategy.java (original)
+++ commons/sandbox/flatfile/trunk/src/main/java/org/apache/commons/flatfile/dsl/ConstantEntityNameStrategy.java Thu Mar 15 22:18:16 2012
@@ -21,7 +21,16 @@ package org.apache.commons.flatfile.dsl;
  * @version $Revision$ $Date$
  */
 public class ConstantEntityNameStrategy implements EntityNameStrategy {
-    private String entityName;
+    private final String entityName;
+
+    /**
+     * Create a new ConstantEntityNameStrategy instance.
+     * @param entityName to set
+     */
+    public ConstantEntityNameStrategy(String entityName) {
+        super();
+        this.entityName = entityName;
+    }
 
     /**
      * {@inheritDoc}
@@ -38,11 +47,4 @@ public class ConstantEntityNameStrategy 
         return entityName;
     }
 
-    /**
-     * Set the constant entityName.
-     * @param entityName The String entityName to set.
-     */
-    public void setEntityName(String entityName) {
-        this.entityName = entityName;
-    }
 }

Modified: commons/sandbox/flatfile/trunk/src/main/java/org/apache/commons/flatfile/dsl/DefaultEntityNameStrategy.java
URL: http://svn.apache.org/viewvc/commons/sandbox/flatfile/trunk/src/main/java/org/apache/commons/flatfile/dsl/DefaultEntityNameStrategy.java?rev=1301246&r1=1301245&r2=1301246&view=diff
==============================================================================
--- commons/sandbox/flatfile/trunk/src/main/java/org/apache/commons/flatfile/dsl/DefaultEntityNameStrategy.java (original)
+++ commons/sandbox/flatfile/trunk/src/main/java/org/apache/commons/flatfile/dsl/DefaultEntityNameStrategy.java Thu Mar 15 22:18:16 2012
@@ -17,6 +17,7 @@
 package org.apache.commons.flatfile.dsl;
 
 import org.apache.commons.lang3.ClassUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * Default implementation.
@@ -26,25 +27,23 @@ public class DefaultEntityNameStrategy i
     private static final String NULL = "null";
 
     /**
-     * If <code>o</code> is a <code>String</code>, it returns unscathed.
-     * If <code>o</code> is <code>null</code>, returns <code>"null"</code>.
-     * If <code>o</code> is a <code>Class</code>, returns simple classname.
-     * Otherwise returns simple classname of <code>o</code>.
+     * If <code>o</code> is {@code null}, returns {@literal "null"}.
+     * If <code>o</code> is a {@link CharSequence}, its {@link String} value is returned.
+     * If <code>o</code> is a {@link Class}, its uncapitalized short classname is returned.
+     * Otherwise returns uncapitalized short classname of {@code o}.
      * @param o Object.
      * @return String entity name.
+     * @see ClassUtils#getShortClassName(Class)
      */
-    @SuppressWarnings("unchecked")
     public String getEntityName(Object o) {
         if (o == null) {
             return NULL;
         }
-        if (o instanceof String) {
-            return (String) o;
+        if (o instanceof CharSequence) {
+            return o.toString();
         }
-        Class c = o instanceof Class ? (Class) o : o.getClass();
-        StringBuffer sb = new StringBuffer(ClassUtils.getShortClassName(c));
-        sb.setCharAt(0, Character.toLowerCase(sb.charAt(0)));
-        return sb.toString();
+        final Class<?> c = o instanceof Class<?> ? (Class<?>) o : o.getClass();
+        return StringUtils.uncapitalize(ClassUtils.getShortClassName(c));
     }
 
 }