ROO-3046: Use Apache Commons libraries in Roo - use commons-lang ToSt…

…ringBuilder instead of Roo's ToStringCreator and support classes
spring-attic · Feb 1, 2012 · c6f1c8c · c6f1c8c
1 parent 2366cea
commit c6f1c8c
Show file tree

Hide file tree

Showing 83 changed files with 552 additions and 1,151 deletions.
diff --git a/...urable/src/main/java/org/springframework/roo/addon/configurable/ConfigurableMetadata.java b/...urable/src/main/java/org/springframework/roo/addon/configurable/ConfigurableMetadata.java
@@ -3,14 +3,14 @@
 import static org.springframework.roo.model.SpringJavaType.CONFIGURABLE;
 
 import org.apache.commons.lang3.Validate;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.springframework.roo.classpath.PhysicalTypeIdentifierNamingUtils;
 import org.springframework.roo.classpath.PhysicalTypeMetadata;
 import org.springframework.roo.classpath.details.annotations.AnnotationMetadata;
 import org.springframework.roo.classpath.itd.AbstractItdTypeDetailsProvidingMetadataItem;
 import org.springframework.roo.metadata.MetadataIdentificationUtils;
 import org.springframework.roo.model.JavaType;
 import org.springframework.roo.project.LogicalPath;
-import org.springframework.roo.support.style.ToStringCreator;
 
 /**
  * Metadata for {@link RooConfigurable}.
@@ -81,15 +81,15 @@ private AnnotationMetadata getConfigurableAnnotation() {
 
     @Override
     public String toString() {
-        final ToStringCreator tsc = new ToStringCreator(this);
-        tsc.append("identifier", getId());
-        tsc.append("valid", valid);
-        tsc.append("aspectName", aspectName);
-        tsc.append("destinationType", destination);
-        tsc.append("governor", governorPhysicalTypeMetadata.getId());
-        tsc.append("configurableIntroduced",
+        final ToStringBuilder builder = new ToStringBuilder(this);
+        builder.append("identifier", getId());
+        builder.append("valid", valid);
+        builder.append("aspectName", aspectName);
+        builder.append("destinationType", destination);
+        builder.append("governor", governorPhysicalTypeMetadata.getId());
+        builder.append("configurableIntroduced",
                 getTypeAnnotation(CONFIGURABLE) != null);
-        tsc.append("itdTypeDetails", itdTypeDetails);
-        return tsc.toString();
+        builder.append("itdTypeDetails", itdTypeDetails);
+        return builder.toString();
     }
 }
diff --git a/addon-dod/src/main/java/org/springframework/roo/addon/dod/DataOnDemandMetadata.java b/addon-dod/src/main/java/org/springframework/roo/addon/dod/DataOnDemandMetadata.java
@@ -38,6 +38,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.springframework.roo.classpath.PhysicalTypeIdentifierNamingUtils;
 import org.springframework.roo.classpath.PhysicalTypeMetadata;
 import org.springframework.roo.classpath.customdata.CustomDataKeys;
@@ -60,7 +61,6 @@
 import org.springframework.roo.model.JavaType;
 import org.springframework.roo.model.JdkJavaType;
 import org.springframework.roo.project.LogicalPath;
-import org.springframework.roo.support.style.ToStringCreator;
 
 /**
  * Metadata for {@link RooDataOnDemand}.
@@ -1670,13 +1670,13 @@ private void setSpecificPersistentEntityMethod() {
 
     @Override
     public String toString() {
-        final ToStringCreator tsc = new ToStringCreator(this);
-        tsc.append("identifier", getId());
-        tsc.append("valid", valid);
-        tsc.append("aspectName", aspectName);
-        tsc.append("destinationType", destination);
-        tsc.append("governor", governorPhysicalTypeMetadata.getId());
-        tsc.append("itdTypeDetails", itdTypeDetails);
-        return tsc.toString();
+        final ToStringBuilder builder = new ToStringBuilder(this);
+        builder.append("identifier", getId());
+        builder.append("valid", valid);
+        builder.append("aspectName", aspectName);
+        builder.append("destinationType", destination);
+        builder.append("governor", governorPhysicalTypeMetadata.getId());
+        builder.append("itdTypeDetails", itdTypeDetails);
+        return builder.toString();
     }
 }
diff --git a/addon-email/src/main/java/org/springframework/roo/addon/email/MailProtocol.java b/addon-email/src/main/java/org/springframework/roo/addon/email/MailProtocol.java
@@ -1,7 +1,7 @@
 package org.springframework.roo.addon.email;
 
 import org.apache.commons.lang3.Validate;
-import org.springframework.roo.support.style.ToStringCreator;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
  * Protocols known to the email add-on.
@@ -59,8 +59,8 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        final ToStringCreator tsc = new ToStringCreator(this);
-        tsc.append("provider", protocolLabel);
-        return tsc.toString();
+        final ToStringBuilder builder = new ToStringBuilder(this);
+        builder.append("provider", protocolLabel);
+        return builder.toString();
     }
 }
diff --git a/addon-equals/src/main/java/org/springframework/roo/addon/equals/EqualsMetadata.java b/addon-equals/src/main/java/org/springframework/roo/addon/equals/EqualsMetadata.java
@@ -9,6 +9,7 @@
 import java.util.List;
 
 import org.apache.commons.lang3.Validate;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.springframework.roo.classpath.PhysicalTypeIdentifierNamingUtils;
 import org.springframework.roo.classpath.PhysicalTypeMetadata;
 import org.springframework.roo.classpath.details.FieldMetadata;
@@ -20,7 +21,6 @@
 import org.springframework.roo.model.JavaSymbolName;
 import org.springframework.roo.model.JavaType;
 import org.springframework.roo.project.LogicalPath;
-import org.springframework.roo.support.style.ToStringCreator;
 import org.springframework.roo.support.util.CollectionUtils;
 
 /**
@@ -197,13 +197,13 @@ private MethodMetadataBuilder getHashCodeMethod() {
 
     @Override
     public String toString() {
-        final ToStringCreator tsc = new ToStringCreator(this);
-        tsc.append("identifier", getId());
-        tsc.append("valid", valid);
-        tsc.append("aspectName", aspectName);
-        tsc.append("destinationType", destination);
-        tsc.append("governor", governorPhysicalTypeMetadata.getId());
-        tsc.append("itdTypeDetails", itdTypeDetails);
-        return tsc.toString();
+        final ToStringBuilder builder = new ToStringBuilder(this);
+        builder.append("identifier", getId());
+        builder.append("valid", valid);
+        builder.append("aspectName", aspectName);
+        builder.append("destinationType", destination);
+        builder.append("governor", governorPhysicalTypeMetadata.getId());
+        builder.append("itdTypeDetails", itdTypeDetails);
+        return builder.toString();
     }
 }
diff --git a/addon-finder/src/main/java/org/springframework/roo/addon/finder/FinderMetadata.java b/addon-finder/src/main/java/org/springframework/roo/addon/finder/FinderMetadata.java
@@ -11,6 +11,7 @@
 import java.util.Map;
 
 import org.apache.commons.lang3.Validate;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.classpath.PhysicalTypeIdentifierNamingUtils;
 import org.springframework.roo.classpath.PhysicalTypeMetadata;
@@ -24,7 +25,6 @@
 import org.springframework.roo.model.JavaSymbolName;
 import org.springframework.roo.model.JavaType;
 import org.springframework.roo.project.LogicalPath;
-import org.springframework.roo.support.style.ToStringCreator;
 
 /**
  * Metadata for {@link RooJpaActiveRecord#finders()}.
@@ -325,13 +325,13 @@ private MethodMetadataBuilder getDynamicFinderMethod(
 
     @Override
     public String toString() {
-        final ToStringCreator tsc = new ToStringCreator(this);
-        tsc.append("identifier", getId());
-        tsc.append("valid", valid);
-        tsc.append("aspectName", aspectName);
-        tsc.append("destinationType", destination);
-        tsc.append("governor", governorPhysicalTypeMetadata.getId());
-        tsc.append("itdTypeDetails", itdTypeDetails);
-        return tsc.toString();
+        final ToStringBuilder builder = new ToStringBuilder(this);
+        builder.append("identifier", getId());
+        builder.append("valid", valid);
+        builder.append("aspectName", aspectName);
+        builder.append("destinationType", destination);
+        builder.append("governor", governorPhysicalTypeMetadata.getId());
+        builder.append("itdTypeDetails", itdTypeDetails);
+        return builder.toString();
     }
 }
diff --git a/addon-javabean/src/main/java/org/springframework/roo/addon/javabean/JavaBeanMetadata.java b/addon-javabean/src/main/java/org/springframework/roo/addon/javabean/JavaBeanMetadata.java
@@ -22,6 +22,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.springframework.roo.classpath.PhysicalTypeIdentifierNamingUtils;
 import org.springframework.roo.classpath.PhysicalTypeMetadata;
 import org.springframework.roo.classpath.details.BeanInfoUtils;
@@ -39,7 +40,6 @@
 import org.springframework.roo.model.JavaSymbolName;
 import org.springframework.roo.model.JavaType;
 import org.springframework.roo.project.LogicalPath;
-import org.springframework.roo.support.style.ToStringCreator;
 
 /**
  * Metadata for {@link RooJavaBean}.
@@ -518,13 +518,13 @@ field, new AnnotationMetadataBuilder(annotation
 
     @Override
     public String toString() {
-        final ToStringCreator tsc = new ToStringCreator(this);
-        tsc.append("identifier", getId());
-        tsc.append("valid", valid);
-        tsc.append("aspectName", aspectName);
-        tsc.append("destinationType", destination);
-        tsc.append("governor", governorPhysicalTypeMetadata.getId());
-        tsc.append("itdTypeDetails", itdTypeDetails);
-        return tsc.toString();
+        final ToStringBuilder builder = new ToStringBuilder(this);
+        builder.append("identifier", getId());
+        builder.append("valid", valid);
+        builder.append("aspectName", aspectName);
+        builder.append("destinationType", destination);
+        builder.append("governor", governorPhysicalTypeMetadata.getId());
+        builder.append("itdTypeDetails", itdTypeDetails);
+        return builder.toString();
     }
 }
diff --git a/addon-jpa/src/main/java/org/springframework/roo/addon/jpa/JdbcDatabase.java b/addon-jpa/src/main/java/org/springframework/roo/addon/jpa/JdbcDatabase.java
@@ -1,7 +1,7 @@
 package org.springframework.roo.addon.jpa;
 
 import org.apache.commons.lang3.Validate;
-import org.springframework.roo.support.style.ToStringCreator;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
  * Provides information related to JDBC database configuration.
@@ -77,11 +77,11 @@ public String getKey() {
 
     @Override
     public String toString() {
-        final ToStringCreator tsc = new ToStringCreator(this);
-        tsc.append("name", name());
-        tsc.append("key", key);
-        tsc.append("driver class name", driverClassName);
-        tsc.append("connection string", connectionString);
-        return tsc.toString();
+        final ToStringBuilder builder = new ToStringBuilder(this);
+        builder.append("name", name());
+        builder.append("key", key);
+        builder.append("driver class name", driverClassName);
+        builder.append("connection string", connectionString);
+        return builder.toString();
     }
 }
diff --git a/addon-jpa/src/main/java/org/springframework/roo/addon/jpa/OrmProvider.java b/addon-jpa/src/main/java/org/springframework/roo/addon/jpa/OrmProvider.java
@@ -1,7 +1,7 @@
 package org.springframework.roo.addon.jpa;
 
 import org.apache.commons.lang3.Validate;
-import org.springframework.roo.support.style.ToStringCreator;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
  * ORM providers known to the JPA add-on.
@@ -39,9 +39,9 @@ public String getConfigPrefix() {
 
     @Override
     public String toString() {
-        final ToStringCreator tsc = new ToStringCreator(this);
-        tsc.append("provider", name());
-        tsc.append("adapter", adapter);
-        return tsc.toString();
+        final ToStringBuilder builder = new ToStringBuilder(this);
+        builder.append("provider", name());
+        builder.append("adapter", adapter);
+        return builder.toString();
     }
 }
diff --git a/...src/main/java/org/springframework/roo/addon/jpa/activerecord/JpaActiveRecordMetadata.java b/...src/main/java/org/springframework/roo/addon/jpa/activerecord/JpaActiveRecordMetadata.java
@@ -15,6 +15,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.springframework.roo.classpath.PhysicalTypeIdentifierNamingUtils;
 import org.springframework.roo.classpath.PhysicalTypeMetadata;
 import org.springframework.roo.classpath.customdata.CustomDataKeys;
@@ -33,7 +34,6 @@
 import org.springframework.roo.model.JavaSymbolName;
 import org.springframework.roo.model.JavaType;
 import org.springframework.roo.project.LogicalPath;
-import org.springframework.roo.support.style.ToStringCreator;
 
 /**
  * Metadata for a type annotated with {@link RooJpaActiveRecord}.
@@ -786,14 +786,14 @@ else if (!identifierField.getFieldType().isPrimitive()) {
 
     @Override
     public String toString() {
-        final ToStringCreator tsc = new ToStringCreator(this);
-        tsc.append("identifier", getId());
-        tsc.append("valid", valid);
-        tsc.append("aspectName", aspectName);
-        tsc.append("destinationType", destination);
-        tsc.append("finders", crudAnnotationValues.getFinders());
-        tsc.append("governor", governorPhysicalTypeMetadata.getId());
-        tsc.append("itdTypeDetails", itdTypeDetails);
-        return tsc.toString();
+        final ToStringBuilder builder = new ToStringBuilder(this);
+        builder.append("identifier", getId());
+        builder.append("valid", valid);
+        builder.append("aspectName", aspectName);
+        builder.append("destinationType", destination);
+        builder.append("finders", crudAnnotationValues.getFinders());
+        builder.append("governor", governorPhysicalTypeMetadata.getId());
+        builder.append("itdTypeDetails", itdTypeDetails);
+        return builder.toString();
     }
 }
diff --git a/...c/main/java/org/springframework/roo/addon/jsf/application/JsfApplicationBeanMetadata.java b/...c/main/java/org/springframework/roo/addon/jsf/application/JsfApplicationBeanMetadata.java
@@ -24,6 +24,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.springframework.roo.classpath.PhysicalTypeIdentifierNamingUtils;
 import org.springframework.roo.classpath.PhysicalTypeMetadata;
 import org.springframework.roo.classpath.details.ClassOrInterfaceTypeDetails;
@@ -39,7 +40,6 @@
 import org.springframework.roo.model.JavaSymbolName;
 import org.springframework.roo.model.JavaType;
 import org.springframework.roo.project.LogicalPath;
-import org.springframework.roo.support.style.ToStringCreator;
 
 /**
  * Metadata for {@link RooJsfApplicationBean}.
@@ -269,13 +269,13 @@ private boolean hasScopeAnnotation() {
 
     @Override
     public String toString() {
-        final ToStringCreator tsc = new ToStringCreator(this);
-        tsc.append("identifier", getId());
-        tsc.append("valid", valid);
-        tsc.append("aspectName", aspectName);
-        tsc.append("destinationType", destination);
-        tsc.append("governor", governorPhysicalTypeMetadata.getId());
-        tsc.append("itdTypeDetails", itdTypeDetails);
-        return tsc.toString();
+        final ToStringBuilder builder = new ToStringBuilder(this);
+        builder.append("identifier", getId());
+        builder.append("valid", valid);
+        builder.append("aspectName", aspectName);
+        builder.append("destinationType", destination);
+        builder.append("governor", governorPhysicalTypeMetadata.getId());
+        builder.append("itdTypeDetails", itdTypeDetails);
+        return builder.toString();
     }
 }
diff --git a/...n-jsf/src/main/java/org/springframework/roo/addon/jsf/converter/JsfConverterMetadata.java b/...n-jsf/src/main/java/org/springframework/roo/addon/jsf/converter/JsfConverterMetadata.java
@@ -12,6 +12,7 @@
 import java.util.List;
 
 import org.apache.commons.lang3.Validate;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.springframework.roo.classpath.PhysicalTypeIdentifierNamingUtils;
 import org.springframework.roo.classpath.PhysicalTypeMetadata;
 import org.springframework.roo.classpath.details.MethodMetadata;
@@ -27,7 +28,6 @@
 import org.springframework.roo.model.JavaType;
 import org.springframework.roo.model.JdkJavaType;
 import org.springframework.roo.project.LogicalPath;
-import org.springframework.roo.support.style.ToStringCreator;
 
 /**
  * Metadata for {@link RooJsfConverter}.
@@ -229,13 +229,13 @@ private boolean isConverterInterfaceIntroduced() {
 
     @Override
     public String toString() {
-        final ToStringCreator tsc = new ToStringCreator(this);
-        tsc.append("identifier", getId());
-        tsc.append("valid", valid);
-        tsc.append("aspectName", aspectName);
-        tsc.append("destinationType", destination);
-        tsc.append("governor", governorPhysicalTypeMetadata.getId());
-        tsc.append("itdTypeDetails", itdTypeDetails);
-        return tsc.toString();
+        final ToStringBuilder builder = new ToStringBuilder(this);
+        builder.append("identifier", getId());
+        builder.append("valid", valid);
+        builder.append("aspectName", aspectName);
+        builder.append("destinationType", destination);
+        builder.append("governor", governorPhysicalTypeMetadata.getId());
+        builder.append("itdTypeDetails", itdTypeDetails);
+        return builder.toString();
     }
 }