From 8f57cd0e31fcc27100f5234fd6b59ecd72603521 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Sat, 16 Oct 2010 13:20:20 +0200
Subject: [PATCH] fix pmd reported violations

---
 .../src/main/java/sonia/scm/agent/Main.java      | 13 ++++++++++++-
 .../src/main/java/sonia/scm/group/Group.java     |  1 -
 .../java/sonia/scm/cache/EhCacheManager.java     |  9 +++------
 .../sonia/scm/filter/GZipResponseWrapper.java    | 16 +++++++++++++++-
 .../scm/plugin/AbstractResourceServlet.java      |  8 +++-----
 5 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/scm-agent/src/main/java/sonia/scm/agent/Main.java b/scm-agent/src/main/java/sonia/scm/agent/Main.java
index ba4691dbca..87aba9b0ae 100644
--- a/scm-agent/src/main/java/sonia/scm/agent/Main.java
+++ b/scm-agent/src/main/java/sonia/scm/agent/Main.java
@@ -7,6 +7,11 @@
 
 package sonia.scm.agent;
 
+//~--- non-JDK imports --------------------------------------------------------
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 //~--- JDK imports ------------------------------------------------------------
 
 import com.sun.grizzly.http.SelectorThread;
@@ -32,6 +37,9 @@ public class Main
   /** Field description */
   private static final String DEFAULT_URI = "http://localhost:{0}/";
 
+  /** Field description */
+  private static Logger logger = LoggerFactory.getLogger(Main.class);
+
   //~--- methods --------------------------------------------------------------
 
   /**
@@ -95,7 +103,10 @@ public class Main
       {
         return Integer.parseInt(port);
       }
-      catch (NumberFormatException e) {}
+      catch (NumberFormatException ex)
+      {
+        logger.debug(ex.getMessage(), ex);
+      }
     }
 
     return defaultPort;
diff --git a/scm-core/src/main/java/sonia/scm/group/Group.java b/scm-core/src/main/java/sonia/scm/group/Group.java
index 72241fbc0f..a8a5c5a252 100644
--- a/scm-core/src/main/java/sonia/scm/group/Group.java
+++ b/scm-core/src/main/java/sonia/scm/group/Group.java
@@ -22,7 +22,6 @@ import java.util.List;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
diff --git a/scm-webapp/src/main/java/sonia/scm/cache/EhCacheManager.java b/scm-webapp/src/main/java/sonia/scm/cache/EhCacheManager.java
index 7e41a1c84f..5e7ea16f9a 100644
--- a/scm-webapp/src/main/java/sonia/scm/cache/EhCacheManager.java
+++ b/scm-webapp/src/main/java/sonia/scm/cache/EhCacheManager.java
@@ -52,7 +52,7 @@ public class EhCacheManager implements CacheManager
   public <K, V> ExtendedCache<K, V> getExtendedCache(Class<K> key,
           Class<V> value, String name)
   {
-    return getCache(key, value, name);
+    return getCache(name);
   }
 
   /**
@@ -71,23 +71,20 @@ public class EhCacheManager implements CacheManager
   public <K, V> SimpleCache<K, V> getSimpleCache(Class<K> key, Class<V> value,
           String name)
   {
-    return getCache(key, value, name);
+    return getCache(name);
   }
 
   /**
    * Method description
    *
    *
-   * @param key
-   * @param value
    * @param name
    * @param <K>
    * @param <V>
    *
    * @return
    */
-  private <K, V> EhCache<K, V> getCache(Class<K> key, Class<V> value,
-          String name)
+  private <K, V> EhCache<K, V> getCache(String name)
   {
     return new EhCache<K, V>(cacheManager.getCache(name));
   }
diff --git a/scm-webapp/src/main/java/sonia/scm/filter/GZipResponseWrapper.java b/scm-webapp/src/main/java/sonia/scm/filter/GZipResponseWrapper.java
index 28d09c1ff6..d4d57a9e65 100644
--- a/scm-webapp/src/main/java/sonia/scm/filter/GZipResponseWrapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/filter/GZipResponseWrapper.java
@@ -7,6 +7,11 @@
 
 package sonia.scm.filter;
 
+//~--- non-JDK imports --------------------------------------------------------
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 //~--- JDK imports ------------------------------------------------------------
 
 import java.io.IOException;
@@ -24,6 +29,12 @@ import javax.servlet.http.HttpServletResponseWrapper;
 public class GZipResponseWrapper extends HttpServletResponseWrapper
 {
 
+  /** Field description */
+  private static final Logger logger =
+    LoggerFactory.getLogger(GZipResponseWrapper.class);
+
+  //~--- constructors ---------------------------------------------------------
+
   /**
    * Constructs ...
    *
@@ -71,7 +82,10 @@ public class GZipResponseWrapper extends HttpServletResponseWrapper
         }
       }
     }
-    catch (IOException e) {}
+    catch (IOException ex)
+    {
+      logger.error(ex.getMessage(), ex);
+    }
   }
 
   /**
diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/AbstractResourceServlet.java b/scm-webapp/src/main/java/sonia/scm/plugin/AbstractResourceServlet.java
index 84b83c1c04..07286db785 100644
--- a/scm-webapp/src/main/java/sonia/scm/plugin/AbstractResourceServlet.java
+++ b/scm-webapp/src/main/java/sonia/scm/plugin/AbstractResourceServlet.java
@@ -102,7 +102,7 @@ public abstract class AbstractResourceServlet extends HttpServlet
   protected void doGet(HttpServletRequest request, HttpServletResponse response)
           throws ServletException, IOException
   {
-    processRequest(request, response);
+    processRequest(response);
   }
 
   /**
@@ -120,7 +120,7 @@ public abstract class AbstractResourceServlet extends HttpServlet
                         HttpServletResponse response)
           throws ServletException, IOException
   {
-    processRequest(request, response);
+    processRequest(response);
   }
 
   //~--- get methods ----------------------------------------------------------
@@ -142,14 +142,12 @@ public abstract class AbstractResourceServlet extends HttpServlet
    * Method description
    *
    *
-   * @param request
    * @param response
    *
    * @throws IOException
    * @throws ServletException
    */
-  private void processRequest(HttpServletRequest request,
-                              HttpServletResponse response)
+  private void processRequest(HttpServletResponse response)
           throws ServletException, IOException
   {
     response.setCharacterEncoding(getCharacterEncoding());