Fixes violations for Checkstyle

graceframework · Sep 27, 2022 · bb8025e · bb8025e
1 parent cd6e8f0
commit bb8025e
Show file tree

Hide file tree

Showing 20 changed files with 403 additions and 405 deletions.
diff --git a/grails-gsp/src/main/groovy/org/grails/gsp/GroovyPageMetaInfo.java b/grails-gsp/src/main/groovy/org/grails/gsp/GroovyPageMetaInfo.java
@@ -165,12 +165,6 @@ public GroovyPageMetaInfo(Class<?> pageClass) {
         }
     }
 
-    interface GroovyPageMetaInfoInitializer {
-
-        void initialize(GroovyPageMetaInfo metaInfo);
-
-    }
-
     synchronized void initializeOnDemand(GroovyPageMetaInfoInitializer initializer) {
         if (!initialized) {
             initializer.initialize(this);
@@ -574,4 +568,10 @@ public void writeToFinished(Writer out) {
         }
     }
 
+    interface GroovyPageMetaInfoInitializer {
+
+        void initialize(GroovyPageMetaInfo metaInfo);
+
+    }
+
 }
diff --git a/grails-gsp/src/main/groovy/org/grails/gsp/GroovyPageWritable.java b/grails-gsp/src/main/groovy/org/grails/gsp/GroovyPageWritable.java
@@ -68,7 +68,6 @@ public GroovyPageWritable(GroovyPageMetaInfo metaInfo, OutputContextLookup outpu
         this.allowSettingContentType = allowSettingContentType;
     }
 
-
     /**
      * This sets any additional variables that need to be placed in the Binding of the GSP page.
      *
@@ -192,15 +191,6 @@ public void setShowSource(boolean showSource) {
         this.showSource = showSource;
     }
 
-    private static final class GspNoneCodec {
-
-        @SuppressWarnings("unused")
-        public Object encode(Object object) {
-            return object;
-        }
-
-    }
-
     private GroovyPageBinding createBinding(Binding parent) {
         GroovyPageBinding binding = new GroovyPageBinding();
         binding.setParent(parent);
@@ -310,4 +300,13 @@ protected void writeGroovySourceToResponse(GroovyPageMetaInfo info, Writer out)
         }
     }
 
+    private static final class GspNoneCodec {
+
+        @SuppressWarnings("unused")
+        public Object encode(Object object) {
+            return object;
+        }
+
+    }
+
 }
diff --git a/grails-gsp/src/main/groovy/org/grails/gsp/GroovyPagesTemplateEngine.java b/grails-gsp/src/main/groovy/org/grails/gsp/GroovyPagesTemplateEngine.java
@@ -138,48 +138,6 @@ public class GroovyPagesTemplateEngine extends ResourceAwareTemplateEngine
         }
     }
 
-    private class GroovyPagesTemplateEngineCacheEntry extends CacheEntry<GroovyPageMetaInfo> {
-
-        private final String pageName;
-
-        GroovyPagesTemplateEngineCacheEntry(String pageName) {
-            this.pageName = pageName;
-        }
-
-        @Override
-        protected boolean hasExpired(long timeout, Object cacheRequestObject) {
-            GroovyPageMetaInfo meta = getValue();
-            Resource resource = (Resource) cacheRequestObject;
-            return meta == null || isGroovyPageReloadable(resource, meta);
-        }
-
-        @Override
-        protected GroovyPageMetaInfo updateValue(GroovyPageMetaInfo oldValue, Callable<GroovyPageMetaInfo> updater, Object cacheRequestObject)
-                throws Exception {
-            if (oldValue != null) {
-                oldValue.removePageMetaClass();
-            }
-            Resource resource = (Resource) cacheRequestObject;
-            return buildPageMetaInfo(resource, pageName);
-        }
-
-    }
-
-    private static class GroovyPagesTemplateEngineCallable implements Callable<CacheEntry<GroovyPageMetaInfo>> {
-
-        private final CacheEntry<GroovyPageMetaInfo> cacheEntry;
-
-        GroovyPagesTemplateEngineCallable(CacheEntry<GroovyPageMetaInfo> cacheEntry) {
-            this.cacheEntry = cacheEntry;
-        }
-
-        @Override
-        public CacheEntry<GroovyPageMetaInfo> call() throws Exception {
-            return cacheEntry;
-        }
-
-    }
-
     public GroovyPagesTemplateEngine() {
         // default
     }
@@ -844,4 +802,46 @@ public String getGspEncoding() {
         return this.gspEncoding;
     }
 
+    private class GroovyPagesTemplateEngineCacheEntry extends CacheEntry<GroovyPageMetaInfo> {
+
+        private final String pageName;
+
+        GroovyPagesTemplateEngineCacheEntry(String pageName) {
+            this.pageName = pageName;
+        }
+
+        @Override
+        protected boolean hasExpired(long timeout, Object cacheRequestObject) {
+            GroovyPageMetaInfo meta = getValue();
+            Resource resource = (Resource) cacheRequestObject;
+            return meta == null || isGroovyPageReloadable(resource, meta);
+        }
+
+        @Override
+        protected GroovyPageMetaInfo updateValue(GroovyPageMetaInfo oldValue, Callable<GroovyPageMetaInfo> updater, Object cacheRequestObject)
+                throws Exception {
+            if (oldValue != null) {
+                oldValue.removePageMetaClass();
+            }
+            Resource resource = (Resource) cacheRequestObject;
+            return buildPageMetaInfo(resource, pageName);
+        }
+
+    }
+
+    private static class GroovyPagesTemplateEngineCallable implements Callable<CacheEntry<GroovyPageMetaInfo>> {
+
+        private final CacheEntry<GroovyPageMetaInfo> cacheEntry;
+
+        GroovyPagesTemplateEngineCallable(CacheEntry<GroovyPageMetaInfo> cacheEntry) {
+            this.cacheEntry = cacheEntry;
+        }
+
+        @Override
+        public CacheEntry<GroovyPageMetaInfo> call() throws Exception {
+            return cacheEntry;
+        }
+
+    }
+
 }
diff --git a/grails-gsp/src/main/groovy/org/grails/gsp/compiler/GroovyPageParser.java b/grails-gsp/src/main/groovy/org/grails/gsp/compiler/GroovyPageParser.java
@@ -261,55 +261,6 @@ public class GroovyPageParser implements Tokens {
 
     private Set<String> allowedTaglibNamespaces = new LinkedHashSet<>(DEFAULT_TAGLIB_NAMESPACES);
 
-    public String getContentType() {
-        return contentType;
-    }
-
-    public int getCurrentOutputLineNumber() {
-        return scan.getLineNumberForToken();
-    }
-
-    public Map<String, String> getJspTags() {
-        return jspTags;
-    }
-
-    public void setKeepGeneratedDirectory(File keepGeneratedDirectory) {
-        this.keepGeneratedDirectory = keepGeneratedDirectory;
-    }
-
-    public void setEnableSitemeshPreprocessing(boolean enableSitemeshPreprocessing) {
-        this.enableSitemeshPreprocessing = enableSitemeshPreprocessing;
-    }
-
-    class TagMeta {
-
-        String name;
-
-        String namespace;
-
-        Object instance;
-
-        boolean isDynamic;
-
-        boolean hasAttributes;
-
-        int lineNumber;
-
-        boolean emptyTag;
-
-        int tagIndex;
-
-        boolean bufferMode = false;
-
-        int bufferPartNumber = -1;
-
-        @Override
-        public String toString() {
-            return "<" + namespace + ":" + name + ">";
-        }
-
-    }
-
     public GroovyPageParser(String name, String uri, String filename, InputStream in, String encoding, String expressionCodecName)
             throws IOException {
         this(name, uri, filename, readStream(in, encoding), expressionCodecName);
@@ -342,11 +293,30 @@ public GroovyPageParser(String name, String uri, String filename, String gspSour
         makeSourceName(filename);
     }
 
-
     public GroovyPageParser(String name, String uri, String filename, InputStream in) throws IOException {
         this(name, uri, filename, in, null, null);
     }
 
+    public String getContentType() {
+        return contentType;
+    }
+
+    public int getCurrentOutputLineNumber() {
+        return scan.getLineNumberForToken();
+    }
+
+    public Map<String, String> getJspTags() {
+        return jspTags;
+    }
+
+    public void setKeepGeneratedDirectory(File keepGeneratedDirectory) {
+        this.keepGeneratedDirectory = keepGeneratedDirectory;
+    }
+
+    public void setEnableSitemeshPreprocessing(boolean enableSitemeshPreprocessing) {
+        this.enableSitemeshPreprocessing = enableSitemeshPreprocessing;
+    }
+
     /**
      * Configures the parser for the given Config map
      *
@@ -767,7 +737,6 @@ public void flushTagBuffering() {
         }
     }
 
-
     private void html() {
         if (!finalPass) {
             return;
@@ -1584,4 +1553,33 @@ public boolean isModelFieldsMode() {
         return modelFieldsMode;
     }
 
+    class TagMeta {
+
+        String name;
+
+        String namespace;
+
+        Object instance;
+
+        boolean isDynamic;
+
+        boolean hasAttributes;
+
+        int lineNumber;
+
+        boolean emptyTag;
+
+        int tagIndex;
+
+        boolean bufferMode = false;
+
+        int bufferPartNumber = -1;
+
+        @Override
+        public String toString() {
+            return "<" + namespace + ":" + name + ">";
+        }
+
+    }
+
 }
diff --git a/grails-gsp/src/main/groovy/org/grails/gsp/compiler/Tokens.java b/grails-gsp/src/main/groovy/org/grails/gsp/compiler/Tokens.java
@@ -25,6 +25,7 @@
  *
  * Date: Jan 10, 2004
  */
+@SuppressWarnings("checkstyle:InterfaceIsType")
 interface Tokens {
 
     int EOF = -1;

diff --git a/grails-gsp/src/main/groovy/org/grails/gsp/compiler/tags/GrailsTagRegistry.java b/grails-gsp/src/main/groovy/org/grails/gsp/compiler/tags/GrailsTagRegistry.java
@@ -25,7 +25,7 @@
  *
  * @author Graeme Rocher
  */
-public class GrailsTagRegistry {
+public final class GrailsTagRegistry {
 
     private static GrailsTagRegistry instance = new GrailsTagRegistry();
 

diff --git a/grails-gsp/src/main/groovy/org/grails/gsp/io/DefaultGroovyPageLocator.java b/grails-gsp/src/main/groovy/org/grails/gsp/io/DefaultGroovyPageLocator.java
@@ -449,6 +449,14 @@ public static PluginViewPathInfo getPluginViewPathInfo(String uri) {
         return new PluginViewPathInfo(uri);
     }
 
+    public boolean isReloadEnabled() {
+        return reloadEnabled;
+    }
+
+    public void setReloadEnabled(boolean reloadEnabled) {
+        this.reloadEnabled = reloadEnabled;
+    }
+
     public static class PluginViewPathInfo {
 
         public String basePath;
@@ -468,12 +476,4 @@ public PluginViewPathInfo(String uri) {
 
     }
 
-    public boolean isReloadEnabled() {
-        return reloadEnabled;
-    }
-
-    public void setReloadEnabled(boolean reloadEnabled) {
-        this.reloadEnabled = reloadEnabled;
-    }
-
 }
diff --git a/grails-taglib/src/main/groovy/org/grails/taglib/TagOutput.java b/grails-taglib/src/main/groovy/org/grails/taglib/TagOutput.java
@@ -31,7 +31,7 @@
 /**
  * Created by lari on 16/07/14.
  */
-public class TagOutput {
+public final class TagOutput {
 
     public static final String APPLY_CODEC_TAG_NAME = "applyCodec";
 
@@ -45,7 +45,7 @@ private TagOutput() {
     }
 
     @SuppressWarnings("rawtypes")
-    public static final Object captureTagOutput(TagLibraryLookup gspTagLibraryLookup, String namespace,
+    public static Object captureTagOutput(TagLibraryLookup gspTagLibraryLookup, String namespace,
             String tagName, Map attrs, Object body, OutputContext outputContext) {
 
         GroovyObject tagLib = lookupCachedTagLib(gspTagLibraryLookup, namespace, tagName);
@@ -136,13 +136,13 @@ public static final Object captureTagOutput(TagLibraryLookup gspTagLibraryLookup
         }
     }
 
-    public static final GroovyObject lookupCachedTagLib(TagLibraryLookup gspTagLibraryLookup,
+    public static GroovyObject lookupCachedTagLib(TagLibraryLookup gspTagLibraryLookup,
             String namespace, String tagName) {
 
         return gspTagLibraryLookup != null ? gspTagLibraryLookup.lookupTagLibrary(namespace, tagName) : null;
     }
 
-    public static final Closure<?> createOutputCapturingClosure(Object wrappedInstance, final Object body1,
+    public static Closure<?> createOutputCapturingClosure(Object wrappedInstance, final Object body1,
             final OutputContext outputContext) {
         if (body1 == null) {
             return EMPTY_BODY_CLOSURE;

diff --git a/grails-taglib/src/main/groovy/org/grails/taglib/encoder/OutputContextLookupHelper.java b/grails-taglib/src/main/groovy/org/grails/taglib/encoder/OutputContextLookupHelper.java
@@ -23,7 +23,7 @@
  * @author Lari Hotari
  * @author Graeme Rocher
  */
-public class OutputContextLookupHelper {
+public final class OutputContextLookupHelper {
 
     private static final OutputContextLookup outputContextLookup;