cleanup

Author: burtbeckwith

src/java/org/codehaus/groovy/grails/orm/hibernate/ConfigurableLocalSessionFactoryBean.java

@@ -1,17 +1,17 @@
 /* Copyright 2004-2005 the original author or authors.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */ 
+ */
 package org.codehaus.groovy.grails.orm.hibernate;
 
 import groovy.lang.GroovySystem;
@@ -84,9 +84,9 @@ public GrailsApplication getGrailsApplication() {
     public void setGrailsApplication(GrailsApplication grailsApplication) {
         this.grailsApplication = grailsApplication;
     }
-    
+
     /**
-     * Overrides default behaviour to allow for a configurable configuration class 
+     * Overrides default behaviour to allow for a configurable configuration class.
      */
      @Override
     protected Configuration newConfiguration() {
@@ -97,7 +97,7 @@ protected Configuration newConfiguration() {
             }
             catch (Throwable e) {
                 // probably not Java 5 or missing some annotation jars, use default
-                configClass = DefaultGrailsDomainConfiguration.class;                
+                configClass = DefaultGrailsDomainConfiguration.class;
             }
         }
         Object config = BeanUtils.instantiateClass(configClass);
@@ -138,7 +138,7 @@ private String getCauseMessage(HibernateException e) {
         Throwable cause = e.getCause();
         if (cause instanceof InvocationTargetException) {
             cause = ((InvocationTargetException)cause).getTargetException();
-        }        
+        }
         return cause.getMessage();
     }
 

src/java/org/codehaus/groovy/grails/orm/hibernate/metaclass/AbstractDynamicPersistentMethod.java

@@ -17,6 +17,9 @@
 
 import groovy.lang.GroovySystem;
 import groovy.lang.MetaClass;
+
+import java.util.regex.Pattern;
+
 import org.codehaus.groovy.grails.commons.metaclass.AbstractDynamicMethodInvocation;
 import org.codehaus.groovy.grails.orm.hibernate.cfg.GrailsHibernateUtil;
 import org.hibernate.SessionFactory;
@@ -26,17 +29,10 @@
 import org.springframework.validation.Errors;
 import org.springframework.validation.FieldError;
 
-import java.util.List;
-import java.util.regex.Pattern;
-
 /**
- *
- *
  * @author Steven Devijver
- * @since Aug 7, 2005
  */
-public abstract class AbstractDynamicPersistentMethod extends
-        AbstractDynamicMethodInvocation {
+public abstract class AbstractDynamicPersistentMethod extends AbstractDynamicMethodInvocation {
 
     public static final String ERRORS_PROPERTY = "errors";
 
@@ -45,23 +41,25 @@ public abstract class AbstractDynamicPersistentMethod extends
 
     public AbstractDynamicPersistentMethod(Pattern pattern, SessionFactory sessionFactory, ClassLoader classLoader) {
         super(pattern);
-        this.classLoader = classLoader;
         Assert.notNull(sessionFactory, "Session factory is required!");
-        hibernateTemplate=new HibernateTemplate(sessionFactory);
+        this.classLoader = classLoader;
+        hibernateTemplate = new HibernateTemplate(sessionFactory);
         hibernateTemplate.setCacheQueries(GrailsHibernateUtil.isCacheQueriesByDefault());
     }
 
     protected HibernateTemplate getHibernateTemplate() {
-    	return hibernateTemplate;
+        return hibernateTemplate;
     }
 
+    @Override
     public Object invoke(Object target, String methodName, Object[] arguments) {
         ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
         try {
             Thread.currentThread().setContextClassLoader(this.classLoader);
             return doInvokeInternal(target, arguments);
-        } finally {
-        	Thread.currentThread().setContextClassLoader(originalClassLoader);
+        }
+        finally {
+            Thread.currentThread().setContextClassLoader(originalClassLoader);
         }
     }
 
@@ -74,18 +72,13 @@ public Object invoke(Object target, String methodName, Object[] arguments) {
      * @param target The target object
      */
     protected void setObjectToReadOnly(final Object target) {
-        SessionFactory sessionFactory = getHibernateTemplate().getSessionFactory();
-
-        GrailsHibernateUtil.setObjectToReadyOnly(target, sessionFactory);
+        GrailsHibernateUtil.setObjectToReadyOnly(target, getHibernateTemplate().getSessionFactory());
     }
 
     protected void setObjectToReadWrite(final Object target) {
-        SessionFactory sessionFactory = getHibernateTemplate().getSessionFactory();
-
-        GrailsHibernateUtil.setObjectToReadWrite(target, sessionFactory);
+        GrailsHibernateUtil.setObjectToReadWrite(target, getHibernateTemplate().getSessionFactory());
     }
 
-
     /**
      * Initializes the Errors property on target.  The target will be assigned a new
      * Errors property.  If the target contains any binding errors, those binding
@@ -101,17 +94,14 @@ protected Errors setupErrorsProperty(Object target) {
         Errors errors = new BeanPropertyBindingResult(target, target.getClass().getName());
 
         Errors originalErrors = (Errors) mc.getProperty(target, ERRORS_PROPERTY);
-        List originalFieldErrors = originalErrors.getFieldErrors();
-        for(Object o : originalFieldErrors) {
-            FieldError fe = (FieldError) o;
-            if(fe.isBindingFailure()) {
+        for (Object o : originalErrors.getFieldErrors()) {
+            FieldError fe = (FieldError)o;
+            if (fe.isBindingFailure()) {
                 errors.rejectValue(fe.getField(), fe.getCode(), fe.getArguments(), fe.getDefaultMessage());
             }
         }
 
         mc.setProperty(target, ERRORS_PROPERTY, errors);
         return errors;
     }
-
-
 }