whitespace, cleanup

grails · Feb 25, 2013 · 5acd53b · 5acd53b
1 parent 399e36e
commit 5acd53b
Show file tree

Hide file tree

Showing 312 changed files with 1,495 additions and 2,041 deletions.
diff --git a/grails-hibernate/src/main/groovy/grails/orm/HibernateCriteriaBuilder.java b/grails-hibernate/src/main/groovy/grails/orm/HibernateCriteriaBuilder.java
@@ -236,7 +236,7 @@ protected void addProjectionToList(Projection propertyProjection, String alias)
 
     /**
      * Adds a sql projection to the criteria
-     * 
+     *
      * @param sql SQL projecting a single value
      * @param columnAlias column alias for the projected value
      * @param type the type of the projected value
@@ -247,7 +247,7 @@ protected void sqlProjection(String sql, String columnAlias, Type type) {
 
     /**
      * Adds a sql projection to the criteria
-     * 
+     *
      * @param sql SQL projecting
      * @param columnAliases List of column aliases for the projected values
      * @param types List of types for the projected values
@@ -258,7 +258,7 @@ protected void sqlProjection(String sql, List<String> columnAliases, List<Type>
 
     /**
      * Adds a sql projection to the criteria
-     * 
+     *
      * @param sql SQL projecting
      * @param groupBy group by clause
      * @param columnAliases List of column aliases for the projected values
@@ -1938,7 +1938,7 @@ private static void addOrder(Criteria c, String sort, String order, boolean igno
             c.addOrder( ignoreCase ? Order.asc(sort).ignoreCase() : Order.asc(sort) );
         }
     }
-    
+
     /*
      * Define constants which may be used inside of criteria queries
      * to refer to standard Hibernate Type instances.

diff --git a/.../src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/GrailsHibernateDomainClass.java b/.../src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/GrailsHibernateDomainClass.java
@@ -22,7 +22,11 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.codehaus.groovy.grails.commons.*;
+import org.codehaus.groovy.grails.commons.AbstractGrailsClass;
+import org.codehaus.groovy.grails.commons.ExternalGrailsDomainClass;
+import org.codehaus.groovy.grails.commons.GrailsApplication;
+import org.codehaus.groovy.grails.commons.GrailsClassUtils;
+import org.codehaus.groovy.grails.commons.GrailsDomainClassProperty;
 import org.codehaus.groovy.grails.exceptions.InvalidPropertyException;
 import org.codehaus.groovy.grails.validation.ConstraintsEvaluator;
 import org.codehaus.groovy.grails.validation.DefaultConstraintEvaluator;
@@ -186,7 +190,6 @@ private ConstraintsEvaluator getConstraintsEvaluator() {
         return new DefaultConstraintEvaluator();
     }
 
-
     public boolean isOwningClass(Class domainClass) {
         return false;
     }

diff --git a/...ibernate/src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/HibernateDatastore.java b/...ibernate/src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/HibernateDatastore.java
@@ -55,7 +55,7 @@ public SessionFactory getSessionFactory() {
     }
 
     @Override
-    protected Session createSession(@SuppressWarnings("hiding") Map<String, String> connectionDetails) {
+    protected Session createSession(Map<String, String> connectionDetails) {
         return new HibernateSession(this, sessionFactory);
     }
 

diff --git a/...nate/src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/cfg/GrailsDomainBinder.java b/...nate/src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/cfg/GrailsDomainBinder.java
@@ -228,7 +228,7 @@ public GrailsCollectionSecondPass(GrailsDomainClassProperty property, Mappings m
             this.sessionFactoryBeanName = sessionFactoryBeanName;
         }
 
-        public void doSecondPass(Map<?, ?> persistentClasses, @SuppressWarnings("unused") Map<?, ?> inheritedMetas) throws MappingException {
+        public void doSecondPass(Map<?, ?> persistentClasses, Map<?, ?> inheritedMetas) throws MappingException {
             bindCollectionSecondPass(property, mappings, persistentClasses, collection, sessionFactoryBeanName);
             createCollectionKeys();
         }
@@ -412,7 +412,7 @@ private static void bindListSecondPass(GrailsDomainClassProperty property, Mappi
         String columnName = getIndexColumnName(property, sessionFactoryBeanName);
         final boolean isManyToMany = property.isManyToMany();
 
-        if(isManyToMany && !property.isOwningSide()) {
+        if (isManyToMany && !property.isOwningSide()) {
             throw new MappingException("Invalid association ["+property.getDomainClass().getName()+"->"+ property.getName() +"]. List collection types only supported on the owning side of a many-to-many relationship.");
         }
 
@@ -973,8 +973,8 @@ private static void bindDependentKeyValue(GrailsDomainClassProperty property, De
      * @param persistentClasses
      * @return The DependantValue (key)
      */
-    private static DependantValue createPrimaryKeyValue(Mappings mappings, @SuppressWarnings("unused") GrailsDomainClassProperty property,
-                                                        Collection collection, @SuppressWarnings("unused") Map<?, ?> persistentClasses) {
+    private static DependantValue createPrimaryKeyValue(Mappings mappings, GrailsDomainClassProperty property,
+                                                        Collection collection, Map<?, ?> persistentClasses) {
         KeyValue keyValue;
         DependantValue key;
         String propertyRef = collection.getReferencedPropertyName();
@@ -1356,13 +1356,13 @@ public static Mapping evaluateMapping(GrailsDomainClass domainClass, Closure<?>
                 }
 
                 final Object identity = m.getIdentity();
-                if(identity instanceof Identity) {
+                if (identity instanceof Identity) {
                     final Identity identityObject = (Identity) identity;
                     final String idName = identityObject.getName();
-                    if(idName != null && !GrailsDomainClassProperty.IDENTITY.equals(idName)) {
+                    if (idName != null && !GrailsDomainClassProperty.IDENTITY.equals(idName)) {
                         GrailsDomainClassProperty persistentProperty = domainClass.getPersistentProperty(idName);
-                        if(!persistentProperty.isIdentity()) {
-                            if(persistentProperty instanceof DefaultGrailsDomainClassProperty) {
+                        if (!persistentProperty.isIdentity()) {
+                            if (persistentProperty instanceof DefaultGrailsDomainClassProperty) {
                                 ((DefaultGrailsDomainClassProperty)persistentProperty).setIdentity(true);
                             }
                         }
@@ -1445,7 +1445,7 @@ public static void clearMappingCache(Class<?> theClass) {
         String className = theClass.getName();
         for(Iterator<Map.Entry<Class<?>, Mapping>> it = MAPPING_CACHE.entrySet().iterator(); it.hasNext();) {
             Map.Entry<Class<?>, Mapping> entry = it.next();
-            if(className.equals(entry.getKey().getName())) {
+            if (className.equals(entry.getKey().getName())) {
                 it.remove();
             }
         }
@@ -1595,7 +1595,7 @@ private static void bindSubClass(GrailsDomainClass sub, PersistentClass parent,
      * @param sessionFactoryBeanName  the session factory bean name
      */
     private static void bindJoinedSubClass(GrailsDomainClass sub, JoinedSubclass joinedSubclass,
-            Mappings mappings, @SuppressWarnings("unused") Mapping gormMapping, String sessionFactoryBeanName) {
+            Mappings mappings, Mapping gormMapping, String sessionFactoryBeanName) {
         bindClass(sub, joinedSubclass, mappings);
 
         if (joinedSubclass.getEntityPersisterClass() == null) {
@@ -2119,7 +2119,7 @@ private static boolean isBidirectionalManyToOne(GrailsDomainClassProperty curren
      * @param sessionFactoryBeanName  the session factory bean name
      */
     private static void bindComponent(Component component, GrailsDomainClassProperty property,
-            @SuppressWarnings("unused") boolean isNullable, Mappings mappings, String sessionFactoryBeanName) {
+            boolean isNullable, Mappings mappings, String sessionFactoryBeanName) {
         component.setEmbedded(true);
         Class<?> type = property.getType();
         String role = StringHelper.qualify(type.getName(), property.getName());
@@ -2238,8 +2238,7 @@ private static Property createProperty(Value value, PersistentClass persistentCl
         return prop;
     }
 
-    private static void bindOneToMany(GrailsDomainClassProperty currentGrailsProp, OneToMany one,
-            @SuppressWarnings("unused") Mappings mappings) {
+    private static void bindOneToMany(GrailsDomainClassProperty currentGrailsProp, OneToMany one, Mappings mappings) {
         one.setReferencedEntityName(currentGrailsProp.getReferencedPropertyType().getName());
         one.setIgnoreNotFound(true);
     }
@@ -2606,7 +2605,7 @@ private static String getAssociationDescription(GrailsDomainClassProperty grails
      * @param sessionFactoryBeanName  the session factory bean name
      */
     private static void bindSimpleValue(GrailsDomainClassProperty property, GrailsDomainClassProperty parentProperty,
-            SimpleValue simpleValue, String path, @SuppressWarnings("unused") Mappings mappings, String sessionFactoryBeanName) {
+            SimpleValue simpleValue, String path, Mappings mappings, String sessionFactoryBeanName) {
         // set type
         bindSimpleValue(property,parentProperty, simpleValue, path, getPropertyConfig(property), sessionFactoryBeanName);
     }
@@ -2699,7 +2698,7 @@ private static void setTypeForPropertyConfig(GrailsDomainClassProperty grailsPro
      * @param mappings    The mappings
      */
     private static void bindSimpleValue(String type, SimpleValue simpleValue, boolean nullable,
-            String columnName, @SuppressWarnings("unused") Mappings mappings) {
+            String columnName, Mappings mappings) {
 
         simpleValue.setTypeName(type);
         Table t = simpleValue.getTable();

diff --git a/...ate/src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/cfg/GrailsHibernateUtil.java b/...ate/src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/cfg/GrailsHibernateUtil.java
@@ -306,7 +306,7 @@ public static void cacheCriteriaByMapping(Class<?> targetClass, Criteria criteri
         }
     }
 
-    public static void cacheCriteriaByMapping(@SuppressWarnings("unused") GrailsApplication grailsApplication,
+    public static void cacheCriteriaByMapping(GrailsApplication grailsApplication,
             Class<?> targetClass, Criteria criteria) {
         cacheCriteriaByMapping(targetClass, criteria);
     }

diff --git a/...ernate/src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/cfg/IdentityEnumType.java b/...ernate/src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/cfg/IdentityEnumType.java
@@ -183,9 +183,7 @@ private BidiEnumMap(Class<? extends Enum> enumClass) throws NoSuchMethodExceptio
                 LOG.debug(String.format("Building Bidirectional Enum Map..."));
             }
 
-            @SuppressWarnings("hiding")
             EnumMap enumToKey = new EnumMap(enumClass);
-            @SuppressWarnings("hiding")
             HashMap keytoEnum = new HashMap();
 
             Method idAccessor = enumClass.getMethod(ENUM_ID_ACCESSOR);

diff --git a/...codehaus/groovy/grails/orm/hibernate/metaclass/AbstractClausedStaticPersistentMethod.java b/...codehaus/groovy/grails/orm/hibernate/metaclass/AbstractClausedStaticPersistentMethod.java
@@ -18,9 +18,21 @@
 import grails.orm.RlikeExpression;
 import groovy.lang.Closure;
 import groovy.lang.MissingMethodException;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Locale;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.codehaus.groovy.grails.commons.*;
+import org.codehaus.groovy.grails.commons.DomainClassArtefactHandler;
+import org.codehaus.groovy.grails.commons.GrailsApplication;
+import org.codehaus.groovy.grails.commons.GrailsClassUtils;
+import org.codehaus.groovy.grails.commons.GrailsDomainClass;
+import org.codehaus.groovy.grails.commons.GrailsDomainClassProperty;
 import org.hibernate.Criteria;
 import org.hibernate.SessionFactory;
 import org.hibernate.criterion.CriteriaQuery;
@@ -32,13 +44,6 @@
 import org.springframework.beans.TypeMismatchException;
 import org.springframework.util.Assert;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Locale;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 /**
  * @author Graeme Rocher
  * @since 31-Aug-2005
@@ -439,7 +444,6 @@ public AbstractClausedStaticPersistentMethod(GrailsApplication application, Sess
         }
     }
 
-
     /* (non-Javadoc)
      * @see org.codehaus.groovy.grails.orm.hibernate.metaclass.AbstractStaticPersistentMethod#doInvokeInternal(java.lang.Class, java.lang.String, java.lang.Object[])
      */

diff --git a/...oovy/org/codehaus/groovy/grails/orm/hibernate/metaclass/AbstractSavePersistentMethod.java b/...oovy/org/codehaus/groovy/grails/orm/hibernate/metaclass/AbstractSavePersistentMethod.java
@@ -104,7 +104,7 @@ public static void clearDisabledValidations() {
 
     public AbstractSavePersistentMethod(Pattern pattern, SessionFactory sessionFactory,
               ClassLoader classLoader, GrailsApplication application,
-              @SuppressWarnings("unused") GrailsDomainClass domainClass, HibernateDatastore datastore) {
+              GrailsDomainClass domainClass, HibernateDatastore datastore) {
         super(pattern, sessionFactory, classLoader, application);
 
         this.datastore = datastore;
@@ -302,7 +302,6 @@ protected Object handleValidationError(GrailsDomainClass domainClass, final Obje
                     if (propertyValue != null) {
                         setObjectToReadOnly(propertyValue);
                     }
-
                 }
             }
         }

diff --git a/...ovy/org/codehaus/groovy/grails/orm/hibernate/metaclass/ExecuteUpdatePersistentMethod.java b/...ovy/org/codehaus/groovy/grails/orm/hibernate/metaclass/ExecuteUpdatePersistentMethod.java
@@ -17,6 +17,17 @@
 import grails.gorm.DetachedCriteria;
 import groovy.lang.Closure;
 import groovy.lang.MissingMethodException;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Pattern;
+
 import org.codehaus.groovy.grails.commons.GrailsApplication;
 import org.codehaus.groovy.grails.orm.hibernate.exceptions.GrailsQueryException;
 import org.hibernate.HibernateException;
@@ -26,10 +37,6 @@
 import org.springframework.orm.hibernate3.HibernateCallback;
 import org.springframework.orm.hibernate3.SessionFactoryUtils;
 
-import java.sql.SQLException;
-import java.util.*;
-import java.util.regex.Pattern;
-
 /**
  * Allows the executing of arbitrary HQL updates.
  * <p/>
@@ -53,7 +60,6 @@ protected Object doInvokeInternal(Class clazz, String methodName, DetachedCriter
         return doInvokeInternal(clazz,methodName, (Closure) null,arguments) ;
     }
 
-
     @Override
     protected Object doInvokeInternal(final Class clazz, final String methodName, Closure additionalCriteria, final Object[] arguments) {
 

diff --git a/...oovy/org/codehaus/groovy/grails/orm/hibernate/proxy/GroovyAwareJavassistProxyFactory.java b/...oovy/org/codehaus/groovy/grails/orm/hibernate/proxy/GroovyAwareJavassistProxyFactory.java
@@ -43,7 +43,7 @@ public class GroovyAwareJavassistProxyFactory implements ProxyFactory, Serializa
     private CompositeType componentIdType;
     private Class<?> factory;
 
-    @SuppressWarnings({"unchecked", "hiding", "rawtypes"})
+    @SuppressWarnings({"unchecked", "rawtypes"})
     public void postInstantiate(
             final String entityName,
             final Class persistentClass,

diff --git a/...main/groovy/org/codehaus/groovy/grails/orm/hibernate/query/HibernateCriterionAdapter.java b/...main/groovy/org/codehaus/groovy/grails/orm/hibernate/query/HibernateCriterionAdapter.java
@@ -93,7 +93,7 @@ public HibernateCriterionAdapter(PersistentEntity entity, Query.Criterion criter
             public org.hibernate.criterion.Criterion toHibernateCriterion(HibernateQuery hibernateQuery, Query.Criterion criterion, String alias) {
                 DetachedAssociationCriteria<?> existing = (DetachedAssociationCriteria<?>) criterion;
                 String newAlias = hibernateQuery.handleAssociationQuery(existing.getAssociation(), existing.getCriteria());
-                if(alias == null) {
+                if (alias == null) {
                     alias = newAlias;
                 }
                 else {
@@ -110,7 +110,7 @@ public org.hibernate.criterion.Criterion toHibernateCriterion(HibernateQuery hib
                 AssociationQuery existing = (AssociationQuery) criterion;
                 Junction conjunction = Restrictions.conjunction();
                 String newAlias = hibernateQuery.handleAssociationQuery(existing.getAssociation(), existing.getCriteria().getCriteria());
-                if(alias == null) {
+                if (alias == null) {
                     alias = newAlias;
                 }
                 else {
@@ -156,16 +156,16 @@ public org.hibernate.criterion.Criterion toHibernateCriterion(HibernateQuery hib
     /** utility methods to group and clean up the initialization of the Criterion Adapters**/
 
     //used for PropertyCriterions with a specified value ( which can be a subquery)
-    private static void addPropertyCriterionAdaptor(final Class clazz, final String constraintName) {
+    private static void addPropertyCriterionAdaptor(final Class<?> clazz, final String constraintName) {
         addCriterionAdaptor(clazz, constraintName, Object.class);
     }
 
     //used for collection size PropertyCriterions
-    private static void addPropertySizeCriterionAdaptor(final Class clazz, final String constraintName) {
+    private static void addPropertySizeCriterionAdaptor(final Class<?> clazz, final String constraintName) {
         addCriterionAdaptor(clazz, constraintName, int.class);
     }
 
-    private static void addCriterionAdaptor(final Class clazz, final String constraintName, final Class valueClass) {
+    private static void addCriterionAdaptor(final Class<?> clazz, final String constraintName, final Class<?> valueClass) {
         criterionAdaptors.put(clazz, new CriterionAdaptor() {
             @Override
             public org.hibernate.criterion.Criterion toHibernateCriterion(HibernateQuery hibernateQuery, Query.Criterion criterion, String alias) {
@@ -184,7 +184,7 @@ public org.hibernate.criterion.Criterion toHibernateCriterion(HibernateQuery hib
     }
 
     // use for criterions without a value
-    private static void addPropertyNameCriterionAdaptor(final Class clazz, final String constraintName) {
+    private static void addPropertyNameCriterionAdaptor(final Class<?> clazz, final String constraintName) {
         criterionAdaptors.put(clazz, new CriterionAdaptor() {
             @Override
             public org.hibernate.criterion.Criterion toHibernateCriterion(HibernateQuery hibernateQuery, Query.Criterion criterion, String alias) {
@@ -194,7 +194,7 @@ public org.hibernate.criterion.Criterion toHibernateCriterion(HibernateQuery hib
     }
 
     // use for criterions used to compare 2 properties
-    private static void addPropertyComparisonCriterionAdaptor(final Class clazz, final String constraintName) {
+    private static void addPropertyComparisonCriterionAdaptor(final Class<?> clazz, final String constraintName) {
         criterionAdaptors.put(clazz, new CriterionAdaptor() {
             @Override
             public org.hibernate.criterion.Criterion toHibernateCriterion(HibernateQuery hibernateQuery, Query.Criterion criterion, String alias) {
@@ -204,7 +204,7 @@ public org.hibernate.criterion.Criterion toHibernateCriterion(HibernateQuery hib
     }
 
     // use for regular expression criterions
-    private static void addPropertyLikeCriterionAdaptor(final Class clazz, final String constraintName) {
+    private static void addPropertyLikeCriterionAdaptor(final Class<?> clazz, final String constraintName) {
         criterionAdaptors.put(clazz, new CriterionAdaptor() {
             @Override
             public org.hibernate.criterion.Criterion toHibernateCriterion(HibernateQuery hibernateQuery, Query.Criterion criterion, String alias) {
@@ -214,7 +214,7 @@ public org.hibernate.criterion.Criterion toHibernateCriterion(HibernateQuery hib
     }
 
     // used for junctions
-    private static void addJunctionCriterionAdaptor(final Class clazz, final String constraintName) {
+    private static void addJunctionCriterionAdaptor(final Class<?> clazz, final String constraintName) {
         criterionAdaptors.put(clazz, new CriterionAdaptor() {
             @Override
             public org.hibernate.criterion.Criterion toHibernateCriterion(HibernateQuery hibernateQuery, Query.Criterion criterion, String alias) {
@@ -276,7 +276,6 @@ else if (subCriterion instanceof FunctionCallingCriterion) {
         }
     }
 
-
     private Query.Criterion criterion;
 
     public HibernateCriterionAdapter(Query.Criterion criterion) {
@@ -291,7 +290,6 @@ public org.hibernate.criterion.Criterion toHibernateCriterion(HibernateQuery hib
         return null;
     }
 
-
     public static abstract class CriterionAdaptor {
         public abstract org.hibernate.criterion.Criterion toHibernateCriterion(HibernateQuery hibernateQuery, Query.Criterion criterion, String alias);