whitespace, STS warnings, cleanup

Author: burtbeckwith

grails-bootstrap/src/main/groovy/grails/build/interactive/completors/EscapingFileNameCompletor.groovy

@@ -1,9 +1,22 @@
+/*
+ * Copyright 2011 SpringSource.
+ *
+ * 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 grails.build.interactive.completors
 
 import jline.FileNameCompletor
 
-import java.util.regex.Pattern
-
 /**
  * JLine Completor that does file path matching like FileNameCompletor,
  * but in addition it escapes whitespace in completions with the '\'
@@ -15,14 +28,15 @@ import java.util.regex.Pattern
 class EscapingFileNameCompletor extends FileNameCompletor {
     /**
      * <p>Gets FileNameCompletor to create a list of candidates and then
-     * inserts '\' before any whitespace characters in each of the candidates. 
+     * inserts '\' before any whitespace characters in each of the candidates.
      * If a candidate ends in a whitespace character, then that is <em>not</em>
      * escaped.</p>
      */
     int complete(String buffer, int cursor, List candidates) {
-        def retval = super.complete(buffer, cursor, candidates)
+        int retval = super.complete(buffer, cursor, candidates)
 
-        for (int i = 0; i < candidates.size(); i++) {
+        int count = candidates.size()
+        for (int i = 0; i < count; i++) {
             candidates[i] = candidates[i].replaceAll(/(\s)(?!$)/, '\\\\$1')
         }
 

grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/cli/interactive/CandidateListCompletionHandler.java

@@ -27,7 +27,7 @@
  * a completion matches a list of candidates
  *
  * @author Graeme Rocher
- * @since 1.4
+ * @since 2.0
  */
 public class CandidateListCompletionHandler implements CompletionHandler {
 

grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/cli/interactive/InteractiveMode.groovy

@@ -18,16 +18,17 @@ package org.codehaus.groovy.grails.cli.interactive
 import grails.build.logging.GrailsConsole
 import grails.util.BuildSettings
 import grails.util.BuildSettingsHolder
+import grails.util.PluginBuildSettings
+
+import java.awt.Desktop
 
 import org.codehaus.groovy.grails.cli.GrailsScriptRunner
 import org.codehaus.groovy.grails.cli.ScriptExitException
 import org.codehaus.groovy.grails.cli.ScriptNotFoundException
+import org.codehaus.groovy.grails.cli.parsing.CommandLine
 import org.codehaus.groovy.grails.cli.parsing.ParseException
 import org.codehaus.groovy.grails.cli.support.MetaClassRegistryCleaner
-import org.codehaus.groovy.grails.cli.parsing.CommandLine
-import java.awt.Desktop
 import org.codehaus.groovy.grails.cli.support.UaaIntegration
-import grails.util.PluginBuildSettings
 
 /**
  * Provides the implementation of interactive mode in Grails.
@@ -63,7 +64,7 @@ class InteractiveMode {
 
         // Initialise the command options map supported by the 'open' command.
         openOptions = [
-                'test-report': [ 
+                'test-report': [
                         path: new File(settings.testReportsDir, "html/index.html").absolutePath,
                         description: "Opens the current test report (if it exists)" ],
                 'dep-report': [

grails-bootstrap/src/test/groovy/grails/build/interactive/completors/RegexCompletorSpec.groovy

@@ -11,7 +11,7 @@ class RegexCompletorSpec extends Specification {
 
         when: "the completor is invoked for a given string"
         def retval = completor.complete(source, 0, candidateList)
-        
+
         then: "that string is the sole candidate and the return value is 0"
         candidateList.size() == 1
         candidateList[0] == source
@@ -29,7 +29,7 @@ class RegexCompletorSpec extends Specification {
 
         when: "the completor is invoked for a given (non-matching) string"
         def retval = completor.complete(source, 0, candidateList)
-        
+
         then: "the candidate list is empty and the return value is -1"
         candidateList.size() == 0
         retval == -1

grails-core/src/main/groovy/org/codehaus/groovy/grails/commons/ClassPropertyFetcher.java

@@ -110,11 +110,13 @@ public boolean isReadableProperty(String name) {
     private void init() {
         FieldCallback fieldCallback = new ReflectionUtils.FieldCallback() {
             public void doWith(Field field) {
-                if (field.isSynthetic())
+                if (field.isSynthetic()) {
                     return;
+                }
                 final int modifiers = field.getModifiers();
-                if (!Modifier.isPublic(modifiers))
+                if (!Modifier.isPublic(modifiers)) {
                     return;
+                }
 
                 final String name = field.getName();
                 if (name.indexOf('$') == -1) {
@@ -133,10 +135,12 @@ public void doWith(Field field) {
         MethodCallback methodCallback = new ReflectionUtils.MethodCallback() {
             public void doWith(Method method) throws IllegalArgumentException,
                     IllegalAccessException {
-                if (method.isSynthetic())
+                if (method.isSynthetic()) {
                     return;
-                if (!Modifier.isPublic(method.getModifiers()))
+                }
+                if (!Modifier.isPublic(method.getModifiers())) {
                     return;
+                }
                 if (Modifier.isStatic(method.getModifiers())
                         && method.getReturnType() != Void.class) {
                     if (method.getParameterTypes().length == 0) {
@@ -148,15 +152,14 @@ public void doWith(Method method) throws IllegalArgumentException,
                             } else if (name.length() > 2
                                     && name.startsWith("is")
                                     && Character.isUpperCase(name.charAt(2))
-                                    && (method.getReturnType() == Boolean.class || method
-                                            .getReturnType() == boolean.class)) {
+                                    && (method.getReturnType() == Boolean.class ||
+                                        method.getReturnType() == boolean.class)) {
                                 name = name.substring(2);
                             }
                             PropertyFetcher fetcher = new GetterPropertyFetcher(
                                     method, true);
                             staticFetchers.put(name, fetcher);
-                            staticFetchers.put(StringUtils.uncapitalize(name),
-                                    fetcher);
+                            staticFetchers.put(StringUtils.uncapitalize(name), fetcher);
                         }
                     }
                 }
@@ -191,16 +194,13 @@ public void doWith(Method method) throws IllegalArgumentException,
         for (PropertyDescriptor desc : propertyDescriptors) {
             Method readMethod = desc.getReadMethod();
             if (readMethod != null) {
-                boolean staticReadMethod = Modifier.isStatic(readMethod
-                        .getModifiers());
+                boolean staticReadMethod = Modifier.isStatic(readMethod.getModifiers());
                 if (staticReadMethod) {
                     staticFetchers.put(desc.getName(),
-                            new GetterPropertyFetcher(readMethod,
-                                    staticReadMethod));
+                            new GetterPropertyFetcher(readMethod, staticReadMethod));
                 } else {
                     instanceFetchers.put(desc.getName(),
-                            new GetterPropertyFetcher(readMethod,
-                                    staticReadMethod));
+                            new GetterPropertyFetcher(readMethod, staticReadMethod));
                 }
             }
         }

grails-core/src/main/groovy/org/codehaus/groovy/grails/commons/cfg/GrailsConfig.java

@@ -29,7 +29,7 @@
  * Type safe abstraction over Grails configuration
  *
  * @author Graeme Rocher
- * @since  1.4
+ * @since  2.0
  */
 public class GrailsConfig {
 

grails-core/src/main/groovy/org/codehaus/groovy/grails/commons/spring/GrailsRuntimeConfigurator.java

@@ -89,13 +89,10 @@ public GrailsRuntimeConfigurator(GrailsApplication application) {
     public GrailsRuntimeConfigurator(GrailsApplication application, ApplicationContext parent) {
         this.application = application;
         this.parent = parent;
-        if (parent != null) {
-            parent.containsBean(DATA_SOURCE_BEAN);
-        }
 
         try {
-            pluginManager = parent != null ? parent.getBean(GrailsPluginManager.class) : null;
-            pluginManager = pluginManager != null ? pluginManager : PluginManagerHolder.getPluginManager();
+            pluginManager = parent == null ? null : parent.getBean(GrailsPluginManager.class);
+            pluginManager = pluginManager == null ? PluginManagerHolder.getPluginManager() : pluginManager;
         } catch (BeansException e) {
             // ignore
         }
@@ -301,7 +298,7 @@ else if (LOG.isDebugEnabled()) {
         catch (Exception ex) {
             LOG.error("[RuntimeConfiguration] Unable to perform post initialization config: " + resourceName, ex);
         }
- 
+
         GrailsRuntimeConfigurator.loadSpringGroovyResources(springConfig, app);
     }
 

grails-core/src/main/groovy/org/codehaus/groovy/grails/commons/spring/ReloadAwareAutowireCapableBeanFactory.java

@@ -184,7 +184,7 @@ public void autowireBeanProperties(Object existingBean, int autowireMode,
             boolean dependencyCheck) throws BeansException {
         if(autowireMode == AUTOWIRE_BY_NAME) {
             if(DISABLE_AUTOWIRE_BY_NAME_OPTIMIZATIONS || dependencyCheck || existingBean instanceof Aware) {
-                super.autowireBeanProperties(existingBean, autowireMode, dependencyCheck);          
+                super.autowireBeanProperties(existingBean, autowireMode, dependencyCheck);
             } else {
                 populateBeanInAutowireByName(existingBean);
             }
@@ -193,11 +193,11 @@ public void autowireBeanProperties(Object existingBean, int autowireMode,
                     dependencyCheck);
         }
     }
-    
+
     protected void populateBeanInAutowireByName(final Object existingBean) {
         // list of bean properties for that a bean exists
         Map<String, PropertyDescriptor> autowireableBeanProps = resolveAutowireablePropertyDescriptors(existingBean);
-        
+
         // apply autowire instances directly without all the layers of Spring
         autowireBeanInAutowireByName(existingBean, autowireableBeanProps);
     }
@@ -234,9 +234,7 @@ public Object run() throws Exception {
                 if (ex.getTargetException() instanceof ClassCastException) {
                     throw new TypeMismatchException(propertyChangeEvent, pd.getPropertyType(), ex.getTargetException());
                 }
-                else {
-                    throw new MethodInvocationException(propertyChangeEvent, ex.getTargetException());
-                }
+                throw new MethodInvocationException(propertyChangeEvent, ex.getTargetException());
             }
             catch (Exception ex) {
                 PropertyChangeEvent pce = new PropertyChangeEvent(existingBean, beanName, null, value);

grails-core/src/main/groovy/org/codehaus/groovy/grails/compiler/GrailsProjectCompiler.groovy

@@ -111,7 +111,7 @@ class GrailsProjectCompiler {
             }
         }
     }
-    
+
     AntBuilder getAnt() {
         if (ant == null) {
            ant = new AntBuilder()

grails-core/src/main/groovy/org/codehaus/groovy/grails/orm/support/TransactionManagerPostProcessor.java

@@ -79,7 +79,7 @@ private void initialize() {
             // otherwise we end up in an endless loop (it triggers the current method).
             String[] beanNames = BeanFactoryUtils.beanNamesForTypeIncludingAncestors(
                     beanFactory, PlatformTransactionManager.class, false, false);
-    
+
             // If at least one is found, use the first of them as the
             // transaction manager for the application.
             if (beanNames.length > 0) {

grails-docs/src/test/groovy/grails/doc/internal/LegacyTocStrategySpec.groovy

@@ -11,7 +11,7 @@ class LegacyTocStrategySpec extends Specification {
         def toc = strategy.generateToc([
                 [name: "1. Introduction.gdoc"],
                 [name: "1.1.10 Web Features.gdoc"],
-                [name: "1.1 What's new in Grails 1.4?.gdoc"],
+                [name: "1.1 What's new in Grails 2.0?.gdoc"],
                 [name: "1.1.2. Core Features.gdoc"],
                 [name: "1.2.1 Part One.gdoc"],
                 [name: "2.2 Upgrading from previous versions of Grails.gdoc"],
@@ -28,9 +28,9 @@ class LegacyTocStrategySpec extends Specification {
         toc.children[0].title == "Introduction"
         toc.children[0].file == "1. Introduction.gdoc"
         toc.children[0].parent == toc
-        toc.children[0].children*.name == ["1.1 What's new in Grails 1.4?", "1.2. Breaking Changes"]
-        toc.children[0].children*.title == ["What's new in Grails 1.4?", "Breaking Changes"]
-        toc.children[0].children*.file == ["1.1 What's new in Grails 1.4?.gdoc", "1.2. Breaking Changes.gdoc"]
+        toc.children[0].children*.name == ["1.1 What's new in Grails 2.0?", "1.2. Breaking Changes"]
+        toc.children[0].children*.title == ["What's new in Grails 2.0?", "Breaking Changes"]
+        toc.children[0].children*.file == ["1.1 What's new in Grails 2.0?.gdoc", "1.2. Breaking Changes.gdoc"]
         toc.children[0].children[0].children[1].name == "1.1.2. Core Features"
         toc.children[0].children[0].children[1].title == "Core Features"
         toc.children[0].children[0].children[1].file == "1.1.2. Core Features.gdoc"

grails-docs/src/test/groovy/grails/doc/internal/YamlTocStrategySpec.groovy

@@ -24,7 +24,7 @@ class YamlTocStrategySpec extends Specification {
                 intro:
                   title: Introduction
                   whatsNew:
-                    title: What's new in Grails 1.4?
+                    title: What's new in Grails 2.0?
                     devEnvFeatures: Development Environment Features
                     coreFeatures: Core Features
                     webFeatures: Web Features
@@ -47,7 +47,7 @@ class YamlTocStrategySpec extends Specification {
         toc.children[0].file == "intro.gdoc"
         toc.children[0].parent == toc
         toc.children[0].children*.name == ["whatsNew", "changes"]
-        toc.children[0].children*.title == ["What's new in Grails 1.4?", "Breaking Changes"]
+        toc.children[0].children*.title == ["What's new in Grails 2.0?", "Breaking Changes"]
         toc.children[0].children*.file == ["intro" + File.separatorChar + "whatsNew.gdoc", "intro" + File.separatorChar + "changes.gdoc"]
         toc.children[0].children[0].children[1].name == "coreFeatures"
         toc.children[0].children[0].children[1].title == "Core Features"

grails-hibernate/src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/GrailsHibernateTemplate.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011 SpringSource.
+ *
+ * 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 org.codehaus.groovy.grails.commons.GrailsApplication;
@@ -8,8 +23,8 @@
 import org.springframework.orm.hibernate3.HibernateTemplate;
 
 public class GrailsHibernateTemplate extends HibernateTemplate {
+
     public GrailsHibernateTemplate() {
-        super();
         initialize(null);
     }
 
@@ -27,22 +42,22 @@ public GrailsHibernateTemplate(SessionFactory sessionFactory, GrailsApplication
         super(sessionFactory);
         initialize(application);
     }
-    
+
     private void initialize(GrailsApplication application) {
         setExposeNativeSession(true);
-        if(application != null) {
+        if (application != null) {
             setCacheQueries(GrailsHibernateUtil.isCacheQueriesByDefault(application));
         }
     }
 
     public void applySettings(Query queryObject) {
-        if(isExposeNativeSession()) {
+        if (isExposeNativeSession()) {
             super.prepareQuery(queryObject);
         }
     }
 
     public void applySettings(Criteria criteria) {
-        if(isExposeNativeSession()) {
+        if (isExposeNativeSession()) {
             super.prepareCriteria(criteria);
         }
     }

grails-hibernate/src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/HibernateSession.java

@@ -48,7 +48,7 @@
 
 /**
  * Session implementation that wraps a Hibernate {@link org.hibernate.Session}.
- * 
+ *
  * @author Graeme Rocher
  * @since 1.0
  */
@@ -193,10 +193,9 @@ public void delete(Object obj) {
     }
 
     /**
-     * Deletes all objects matching the given criteria
-     * 
-     * @param criteria
-     *            The criteria
+     * Deletes all objects matching the given criteria.
+     *
+     * @param criteria The criteria
      * @return The total number of records deleted
      */
     public int deleteAll(final QueryableCriteria criteria) {
@@ -221,12 +220,10 @@ public Integer doInHibernate(Session session) throws HibernateException, SQLExce
     }
 
     /**
-     * Updates all objects matching the given criteria and property values
-     * 
-     * @param criteria
-     *            The criteria
-     * @param properties
-     *            The properties
+     * Updates all objects matching the given criteria and property values.
+     *
+     * @param criteria The criteria
+     * @param properties The properties
      * @return The total number of records updated
      */
     public int updateAll(final QueryableCriteria criteria, final Map<String, Object> properties) {