multiple code improvements: squid:S1068, squid:S1854, squid:S1192, sq…

…uid:S00115, squid:UselessParenthesesCheck
pippo-java · Apr 28, 2016 · e2986c5 · e2986c5
1 parent ef4ce8c
commit e2986c5
Show file tree

Hide file tree

Showing 19 changed files with 15 additions and 81 deletions.
diff --git a/pippo-fastjson/src/main/java/ro/pippo/fastjson/FastjsonInitializer.java b/pippo-fastjson/src/main/java/ro/pippo/fastjson/FastjsonInitializer.java
@@ -16,8 +16,6 @@
 package ro.pippo.fastjson;
 
 import org.kohsuke.MetaInfServices;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import ro.pippo.core.Application;
 import ro.pippo.core.Initializer;
@@ -28,8 +26,6 @@
 @MetaInfServices(Initializer.class)
 public class FastjsonInitializer implements Initializer {
 
-    private static final Logger log = LoggerFactory.getLogger(FastjsonInitializer.class);
-
     @Override
     public void init(Application application) {
         application.registerContentTypeEngine(FastjsonEngine.class);

diff --git a/pippo-freemarker/src/main/java/ro/pippo/freemarker/FormatTimeMethod.java b/pippo-freemarker/src/main/java/ro/pippo/freemarker/FormatTimeMethod.java
@@ -21,9 +21,6 @@
 import java.util.List;
 import java.util.Locale;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import ro.pippo.core.PippoRuntimeException;
 import freemarker.template.SimpleDate;
 import freemarker.template.SimpleScalar;
@@ -39,8 +36,6 @@
  */
 public class FormatTimeMethod implements TemplateMethodModelEx {
 
-    private final static Logger log = LoggerFactory.getLogger(FormatTimeMethod.class);
-
     private final Locale locale;
 
     public FormatTimeMethod(Locale locale) {

diff --git a/pippo-freemarker/src/main/java/ro/pippo/freemarker/FreemarkerInitializer.java b/pippo-freemarker/src/main/java/ro/pippo/freemarker/FreemarkerInitializer.java
@@ -16,8 +16,6 @@
 package ro.pippo.freemarker;
 
 import org.kohsuke.MetaInfServices;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import ro.pippo.core.Application;
 import ro.pippo.core.Initializer;
@@ -28,8 +26,6 @@
 @MetaInfServices(Initializer.class)
 public class FreemarkerInitializer implements Initializer {
 
-    private static final Logger log = LoggerFactory.getLogger(FreemarkerInitializer.class);
-
     @Override
     public void init(Application application) {
         application.registerTemplateEngine(FreemarkerTemplateEngine.class);

diff --git a/pippo-freemarker/src/main/java/ro/pippo/freemarker/I18nMethod.java b/pippo-freemarker/src/main/java/ro/pippo/freemarker/I18nMethod.java
@@ -18,9 +18,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import ro.pippo.core.Messages;
 import freemarker.ext.beans.StringModel;
 import freemarker.template.SimpleNumber;
@@ -37,8 +34,6 @@
  */
 public class I18nMethod implements TemplateMethodModelEx {
 
-    private final static Logger log = LoggerFactory.getLogger(I18nMethod.class);
-
     final Messages messages;
     final String language;
 

diff --git a/pippo-freemarker/src/main/java/ro/pippo/freemarker/PrettyTimeMethod.java b/pippo-freemarker/src/main/java/ro/pippo/freemarker/PrettyTimeMethod.java
@@ -20,8 +20,6 @@
 import java.util.Locale;
 
 import org.ocpsoft.prettytime.PrettyTime;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import ro.pippo.core.PippoRuntimeException;
 import freemarker.template.SimpleDate;
@@ -38,8 +36,6 @@
  */
 public class PrettyTimeMethod implements TemplateMethodModelEx {
 
-    private final static Logger log = LoggerFactory.getLogger(PrettyTimeMethod.class);
-
     private final PrettyTime prettyTime;
 
     public PrettyTimeMethod(Locale locale) {

diff --git a/pippo-groovy/src/main/java/ro/pippo/groovy/GroovyInitializer.java b/pippo-groovy/src/main/java/ro/pippo/groovy/GroovyInitializer.java
@@ -16,8 +16,6 @@
 package ro.pippo.groovy;
 
 import org.kohsuke.MetaInfServices;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import ro.pippo.core.Application;
 import ro.pippo.core.Initializer;
@@ -28,8 +26,6 @@
 @MetaInfServices(Initializer.class)
 public class GroovyInitializer implements Initializer {
 
-    private static final Logger log = LoggerFactory.getLogger(GroovyInitializer.class);
-
     @Override
     public void init(Application application) {
         application.registerTemplateEngine(GroovyTemplateEngine.class);

diff --git a/pippo-groovy/src/main/java/ro/pippo/groovy/GroovyTemplateEngine.java b/pippo-groovy/src/main/java/ro/pippo/groovy/GroovyTemplateEngine.java
@@ -98,7 +98,7 @@ public void init(Application application) {
     public void renderString(String templateContent, Map<String, Object> model, Writer writer) {
         try {
             Template groovyTemplate = engine.createTemplate(templateContent);
-            PippoGroovyTemplate gt = ((PippoGroovyTemplate) groovyTemplate.make(model));
+            PippoGroovyTemplate gt = (PippoGroovyTemplate) groovyTemplate.make(model);
             gt.setup(languages, messages, router);
             gt.writeTo(writer);
         } catch (Exception e) {
@@ -122,7 +122,7 @@ public void renderResource(String templateName, Map<String, Object> model, Write
         }
 
         try {
-            PippoGroovyTemplate gt = ((PippoGroovyTemplate) groovyTemplate.make(model));
+            PippoGroovyTemplate gt = (PippoGroovyTemplate) groovyTemplate.make(model);
             gt.setup(languages, messages, router);
             gt.writeTo(writer);
         } catch (Exception e) {

diff --git a/pippo-groovy/src/main/java/ro/pippo/groovy/PippoGroovyTemplate.java b/pippo-groovy/src/main/java/ro/pippo/groovy/PippoGroovyTemplate.java
@@ -31,8 +31,6 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.ocpsoft.prettytime.PrettyTime;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import ro.pippo.core.Languages;
 import ro.pippo.core.Messages;
@@ -51,8 +49,6 @@
  */
 public abstract class PippoGroovyTemplate extends BaseTemplate {
 
-    private final Logger log = LoggerFactory.getLogger(PippoGroovyTemplate.class);
-
     private final Map<String, String> modelTypes;
 
     private final MarkupTemplateEngine engine;

diff --git a/pippo-gson/src/main/java/ro/pippo/gson/GsonInitializer.java b/pippo-gson/src/main/java/ro/pippo/gson/GsonInitializer.java
@@ -16,8 +16,6 @@
 package ro.pippo.gson;
 
 import org.kohsuke.MetaInfServices;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import ro.pippo.core.Application;
 import ro.pippo.core.Initializer;
@@ -28,8 +26,6 @@
 @MetaInfServices(Initializer.class)
 public class GsonInitializer implements Initializer {
 
-    private static final Logger log = LoggerFactory.getLogger(GsonInitializer.class);
-
     @Override
     public void init(Application application) {
         application.registerContentTypeEngine(GsonEngine.class);

diff --git a/pippo-jackson/src/main/java/ro/pippo/jackson/JacksonInitializer.java b/pippo-jackson/src/main/java/ro/pippo/jackson/JacksonInitializer.java
@@ -16,8 +16,7 @@
 package ro.pippo.jackson;
 
 import org.kohsuke.MetaInfServices;
-import org.slf4j.Logger;
+
-import org.slf4j.LoggerFactory;
 import ro.pippo.core.Application;
 import ro.pippo.core.Initializer;
 import ro.pippo.core.util.ClasspathUtils;
@@ -28,8 +27,6 @@
 @MetaInfServices(Initializer.class)
 public class JacksonInitializer implements Initializer {
 
-    private static final Logger log = LoggerFactory.getLogger(JacksonInitializer.class);
-
     @Override
     public void init(Application application) {
         application.registerContentTypeEngine(JacksonJsonEngine.class);

diff --git a/pippo-jade/src/main/java/ro/pippo/jade/JadeInitializer.java b/pippo-jade/src/main/java/ro/pippo/jade/JadeInitializer.java
@@ -16,8 +16,6 @@
 package ro.pippo.jade;
 
 import org.kohsuke.MetaInfServices;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import ro.pippo.core.Application;
 import ro.pippo.core.Initializer;
@@ -28,8 +26,6 @@
 @MetaInfServices(Initializer.class)
 public class JadeInitializer implements Initializer {
 
-    private static final Logger log = LoggerFactory.getLogger(JadeInitializer.class);
-
     @Override
     public void init(Application application) {
         application.registerTemplateEngine(JadeTemplateEngine.class);

diff --git a/pippo-jade/src/main/java/ro/pippo/jade/JadeTemplateEngine.java b/pippo-jade/src/main/java/ro/pippo/jade/JadeTemplateEngine.java
@@ -139,7 +139,7 @@ protected void init(Application application, JadeConfiguration configuration) {
 
     private static class ClassTemplateLoader implements TemplateLoader {
 
-        private static final String suffix = ".jade";
+        private static final String SUFFIX = ".jade";
 
         private Class<?> clazz;
         private String pathPrefix;
@@ -163,8 +163,8 @@ public long getLastModified(String name) {
 
         @Override
         public Reader getReader(String name) throws IOException {
-            if (!name.endsWith(suffix)) {
+            if (!name.endsWith(SUFFIX)) {
-                name += suffix;
+                name += SUFFIX;
             }
 
             String fullPath = pathPrefix + name;

diff --git a/pippo-jaxb/src/main/java/ro/pippo/jaxb/JaxbInitializer.java b/pippo-jaxb/src/main/java/ro/pippo/jaxb/JaxbInitializer.java
@@ -16,8 +16,7 @@
 package ro.pippo.jaxb;
 
 import org.kohsuke.MetaInfServices;
-import org.slf4j.Logger;
+
-import org.slf4j.LoggerFactory;
 import ro.pippo.core.Application;
 import ro.pippo.core.Initializer;
 
@@ -27,8 +26,6 @@
 @MetaInfServices(Initializer.class)
 public class JaxbInitializer implements Initializer {
 
-    private static final Logger log = LoggerFactory.getLogger(JaxbInitializer.class);
-
     @Override
     public void init(Application application) {
         application.registerContentTypeEngine(JaxbEngine.class);

diff --git a/pippo-pebble/src/main/java/ro/pippo/pebble/AngularJSExtension.java b/pippo-pebble/src/main/java/ro/pippo/pebble/AngularJSExtension.java
@@ -20,16 +20,11 @@
 import java.util.List;
 import java.util.Map;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.mitchellbosecke.pebble.extension.AbstractExtension;
 import com.mitchellbosecke.pebble.extension.Function;
 
 public class AngularJSExtension extends AbstractExtension {
 
-    private static final Logger log = LoggerFactory.getLogger(AngularJSExtension.class);
-
     public AngularJSExtension() {
     }
 

diff --git a/pippo-pebble/src/main/java/ro/pippo/pebble/FormatTimeExtension.java b/pippo-pebble/src/main/java/ro/pippo/pebble/FormatTimeExtension.java
@@ -47,11 +47,13 @@ public Map<String, Filter> getFilters() {
 
     public class FormatTimeFilter implements Filter {
 
+        private static final String EXISTING_FORMAT = "existingFormat";
+
         @Override
         public List<String> getArgumentNames() {
             List<String> names = new ArrayList<>();
             names.add("format");
-            names.add("existingFormat");
+            names.add(EXISTING_FORMAT);
             return names;
         }
 
@@ -64,8 +66,8 @@ public Object apply(Object input, Map<String, Object> args) {
             EvaluationContext context = (EvaluationContext) args.get("_context");
             Locale locale = context.getLocale();
 
-            DateFormat existingFormat = null;
+            DateFormat existingFormat;
-            DateFormat intendedFormat = null;
+            DateFormat intendedFormat;
 
             String format = (String) args.get("format");
             int type = parseStyle(format);
@@ -76,8 +78,8 @@ public Object apply(Object input, Map<String, Object> args) {
             }
 
             Date date;
-            if (args.get("existingFormat") != null) {
+            if (args.get(EXISTING_FORMAT) != null) {
-                existingFormat = new SimpleDateFormat((String) args.get("existingFormat"), locale);
+                existingFormat = new SimpleDateFormat((String) args.get(EXISTING_FORMAT), locale);
                 try {
                     date = existingFormat.parse((String) input);
                 } catch (ParseException e) {

diff --git a/pippo-pebble/src/main/java/ro/pippo/pebble/GlobalVariablesExtension.java b/pippo-pebble/src/main/java/ro/pippo/pebble/GlobalVariablesExtension.java
@@ -16,21 +16,13 @@
 package ro.pippo.pebble;
 
 import com.mitchellbosecke.pebble.extension.AbstractExtension;
-import com.mitchellbosecke.pebble.extension.Function;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class GlobalVariablesExtension extends AbstractExtension {
 
-    private static final Logger log = LoggerFactory.getLogger(GlobalVariablesExtension.class);
-
     private final Map<String, Object> globalVariables;
 
     public GlobalVariablesExtension() {

diff --git a/pippo-pebble/src/main/java/ro/pippo/pebble/I18nExtension.java b/pippo-pebble/src/main/java/ro/pippo/pebble/I18nExtension.java
@@ -23,8 +23,6 @@
 
 import com.mitchellbosecke.pebble.extension.escaper.SafeString;
 import com.mitchellbosecke.pebble.template.EvaluationContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import ro.pippo.core.Messages;
 
@@ -34,8 +32,6 @@
 
 public class I18nExtension extends AbstractExtension {
 
-    private static final Logger log = LoggerFactory.getLogger(I18nExtension.class);
-
     private final Messages messages;
 
     public I18nExtension(Messages messages) {

diff --git a/pippo-pebble/src/main/java/ro/pippo/pebble/PebbleInitializer.java b/pippo-pebble/src/main/java/ro/pippo/pebble/PebbleInitializer.java
@@ -16,8 +16,6 @@
 package ro.pippo.pebble;
 
 import org.kohsuke.MetaInfServices;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import ro.pippo.core.Application;
 import ro.pippo.core.Initializer;
@@ -28,8 +26,6 @@
 @MetaInfServices(Initializer.class)
 public class PebbleInitializer implements Initializer {
 
-    private static final Logger log = LoggerFactory.getLogger(PebbleInitializer.class);
-
     @Override
     public void init(Application application) {
         application.registerTemplateEngine(PebbleTemplateEngine.class);

diff --git a/pippo-sasscompiler/src/main/java/ro/pippo/sasscompiler/SassResourceHandler.java b/pippo-sasscompiler/src/main/java/ro/pippo/sasscompiler/SassResourceHandler.java
@@ -17,8 +17,7 @@
 
 import com.vaadin.sass.internal.ScssContext;
 import com.vaadin.sass.internal.ScssStylesheet;
-import org.slf4j.Logger;
+
-import org.slf4j.LoggerFactory;
 import ro.pippo.core.PippoRuntimeException;
 import ro.pippo.core.route.ClasspathResourceHandler;
 import ro.pippo.core.route.RouteContext;
@@ -35,8 +34,6 @@
  */
 public class SassResourceHandler extends ClasspathResourceHandler {
 
-    private static final Logger log = LoggerFactory.getLogger(SassResourceHandler.class);
-
     private boolean minify;
     private Map<String, String> sourceMap = new ConcurrentHashMap<>(); // cache