* Fixed tabbing to be 2-spaces instead of 4

* changed direct access of timestamp field to use getTimstamp() instead inside of calculateElapsedTime.
qos-ch · Oct 15, 2013 · e7d41d6 · e7d41d6
1 parent e6f99ba
commit e7d41d6
Show file tree

Hide file tree

Showing 8 changed files with 83 additions and 118 deletions.
diff --git a/logback-access/pom.xml b/logback-access/pom.xml
@@ -50,12 +50,12 @@
       <optional>true</optional>
     </dependency>
 
-      <dependency>
-          <groupId>org.apache.tomcat</groupId>
-          <artifactId>tomcat-coyote</artifactId>
-          <scope>compile</scope>
-          <optional>true</optional>
-      </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>tomcat-coyote</artifactId>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
@@ -65,7 +65,7 @@
     </dependency>
 
     <dependency>
-       <groupId>org.codehaus.janino</groupId>
+      <groupId>org.codehaus.janino</groupId>
       <artifactId>janino</artifactId>
       <scope>compile</scope>
       <optional>true</optional>
@@ -148,13 +148,13 @@
                 Bnd's analysis of java code.
             -->
             <Import-Package>
-                ch.qos.logback.core.rolling,
-                ch.qos.logback.core.rolling.helper,
-                javax.servlet.*;version="2.5",
-                javax.*;resolution:=optional,
-                org.apache.catalina.*;version="${tomcat.version}";resolution:=optional,
-                org.eclipse.jetty.*;version="${jetty.version}";resolution:=optional,
-                *
+              ch.qos.logback.core.rolling,
+              ch.qos.logback.core.rolling.helper,
+              javax.servlet.*;version="2.5",
+              javax.*;resolution:=optional,
+              org.apache.catalina.*;version="${tomcat.version}";resolution:=optional,
+              org.eclipse.jetty.*;version="${jetty.version}";resolution:=optional,
+              *
             </Import-Package>
             <Bundle-RequiredExecutionEnvironment>J2SE-1.5
             </Bundle-RequiredExecutionEnvironment>

diff --git a/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java b/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java
@@ -13,40 +13,15 @@
  */
 package ch.qos.logback.access;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import ch.qos.logback.access.pattern.ContentLengthConverter;
-import ch.qos.logback.access.pattern.DateConverter;
-import ch.qos.logback.access.pattern.ElapsedTimeConverter;
-import ch.qos.logback.access.pattern.EnsureLineSeparation;
-import ch.qos.logback.access.pattern.FullRequestConverter;
-import ch.qos.logback.access.pattern.FullResponseConverter;
-import ch.qos.logback.access.pattern.LineSeparatorConverter;
-import ch.qos.logback.access.pattern.LocalIPAddressConverter;
-import ch.qos.logback.access.pattern.LocalPortConverter;
-import ch.qos.logback.access.pattern.NAConverter;
-import ch.qos.logback.access.pattern.RemoteHostConverter;
-import ch.qos.logback.access.pattern.RemoteIPAddressConverter;
-import ch.qos.logback.access.pattern.RemoteUserConverter;
-import ch.qos.logback.access.pattern.RequestAttributeConverter;
-import ch.qos.logback.access.pattern.RequestContentConverter;
-import ch.qos.logback.access.pattern.RequestCookieConverter;
-import ch.qos.logback.access.pattern.RequestHeaderConverter;
-import ch.qos.logback.access.pattern.RequestMethodConverter;
-import ch.qos.logback.access.pattern.RequestParameterConverter;
-import ch.qos.logback.access.pattern.RequestProtocolConverter;
-import ch.qos.logback.access.pattern.RequestURIConverter;
-import ch.qos.logback.access.pattern.RequestURLConverter;
-import ch.qos.logback.access.pattern.ResponseContentConverter;
-import ch.qos.logback.access.pattern.ResponseHeaderConverter;
-import ch.qos.logback.access.pattern.ServerNameConverter;
-import ch.qos.logback.access.pattern.StatusCodeConverter;
+import ch.qos.logback.access.pattern.*;
 import ch.qos.logback.access.spi.IAccessEvent;
 import ch.qos.logback.core.pattern.PatternLayoutBase;
 import ch.qos.logback.core.pattern.color.*;
 import ch.qos.logback.core.pattern.parser.Parser;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * <p>
  * This class is a module-specific implementation of
@@ -55,10 +30,10 @@
  * way to format the logging output that is just as easy and flexible as the
  * usual <code>PatternLayout</code>.
  * </p>
- * <p>
+ * <p/>
  * For more information about this layout, please refer to the online manual at
  * http://logback.qos.ch/manual/layouts.html#AccessPatternLayout
- * 
+ *
  * @author Ceki G&uuml;lc&uuml;
  * @author S&eacute;bastien Pennec
  */
@@ -123,22 +98,22 @@ public class PatternLayout extends PatternLayoutBase<IAccessEvent> {
     defaultConverterMap.put("server", ServerNameConverter.class.getName());
 
     defaultConverterMap.put("localPort", LocalPortConverter.class.getName());
-    
+
     defaultConverterMap.put("requestAttribute", RequestAttributeConverter.class
         .getName());
     defaultConverterMap.put("reqAttribute", RequestAttributeConverter.class
         .getName());
-    
+
     defaultConverterMap
         .put("reqCookie", RequestCookieConverter.class.getName());
     defaultConverterMap
-    .put("requestCookie", RequestCookieConverter.class.getName());
+        .put("requestCookie", RequestCookieConverter.class.getName());
+
 
-
     defaultConverterMap.put("responseHeader", ResponseHeaderConverter.class
         .getName());
-    
-    
+
+
     defaultConverterMap.put("requestParameter", RequestParameterConverter.class
         .getName());
     defaultConverterMap.put("reqParameter", RequestParameterConverter.class
@@ -174,7 +149,7 @@ public class PatternLayout extends PatternLayoutBase<IAccessEvent> {
     defaultConverterMap.put("boldWhite", BoldWhiteCompositeConverter.class.getName());
   }
 
-  
+
   public PatternLayout() {
     // set a default value for pattern
     setPattern(CLF_PATTERN);

diff --git a/logback-access/src/main/java/ch/qos/logback/access/jetty/JettyServerAdapter.java b/logback-access/src/main/java/ch/qos/logback/access/jetty/JettyServerAdapter.java
@@ -13,27 +13,26 @@
  */
 package ch.qos.logback.access.jetty;
 
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-
+import ch.qos.logback.access.spi.ServerAdapter;
 import org.eclipse.jetty.http.HttpFields;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Response;
 
-import ch.qos.logback.access.spi.ServerAdapter;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * A jetty specific implementation of the {@link ServerAdapter} interface.
- * 
+ *
  * @author S&eacute;bastien Pennec
  * @author Ceki Gulcu
  */
 public class JettyServerAdapter implements ServerAdapter {
 
   Request request;
   Response response;
-  
+
   public JettyServerAdapter(Request jettyRequest, Response jettyResponse) {
     this.request = jettyRequest;
     this.response = jettyResponse;
@@ -62,5 +61,5 @@ public Map<String, String> buildResponseHeaderMap() {
     }
     return responseHeaderMap;
   }
-  
+
 }
diff --git a/logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java b/logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java
@@ -13,22 +13,15 @@
  */
 package ch.qos.logback.access.spi;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.Vector;
+import ch.qos.logback.access.AccessConstants;
+import ch.qos.logback.access.pattern.AccessConverter;
+import ch.qos.logback.access.servlet.Util;
 
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
-import ch.qos.logback.access.AccessConstants;
-import ch.qos.logback.access.pattern.AccessConverter;
-import ch.qos.logback.access.servlet.Util;
+import java.io.Serializable;
+import java.util.*;
 
 // Contributors:  Joern Huxhorn (see also bug #110)
 
@@ -37,15 +30,15 @@
  * logging component instance is called in the container to log then a
  * <code>AccessEvent</code> instance is created. This instance is passed
  * around to the different logback components.
- * 
+ *
  * @author Ceki G&uuml;lc&uuml;
  * @author S&eacute;bastien Pennec
  */
 public class AccessEvent implements Serializable, IAccessEvent {
 
-  
+
   private static final long serialVersionUID = 866718993618836343L;
-  
+
   private static final String EMPTY = "";
 
   private transient final HttpServletRequest httpRequest;
@@ -61,7 +54,7 @@ public class AccessEvent implements Serializable, IAccessEvent {
   String serverName;
   String requestContent;
   String responseContent;
-    long elapsedTime;
+  long elapsedTime;
 
   Map<String, String> requestHeaderMap;
   Map<String, String[]> requestParameterMap;
@@ -80,28 +73,28 @@ public class AccessEvent implements Serializable, IAccessEvent {
   private long timeStamp = 0;
 
   public AccessEvent(HttpServletRequest httpRequest,
-      HttpServletResponse httpResponse, ServerAdapter adapter) {
+                     HttpServletResponse httpResponse, ServerAdapter adapter) {
     this.httpRequest = httpRequest;
     this.httpResponse = httpResponse;
     this.timeStamp = System.currentTimeMillis();
     this.serverAdapter = adapter;
-      this.elapsedTime = calculateElapsedTime();
+    this.elapsedTime = calculateElapsedTime();
   }
 
   /**
-   * Returns the underlying HttpServletRequest. After serialization the returned 
-   * value will be null. 
-   * 
+   * Returns the underlying HttpServletRequest. After serialization the returned
+   * value will be null.
+   *
    * @return
    */
   public HttpServletRequest getRequest() {
     return httpRequest;
   }
 
   /**
-   * Returns the underlying HttpServletResponse. After serialization the returned 
-   * value will be null. 
-   * 
+   * Returns the underlying HttpServletResponse. After serialization the returned
+   * value will be null.
+   *
    * @return
    */
   public HttpServletResponse getResponse() {
@@ -295,7 +288,7 @@ public Map<String, String[]> getRequestParameterMap() {
 
   /**
    * Attributes are not serialized
-   * 
+   *
    * @param key
    */
   public String getAttribute(String key) {
@@ -315,12 +308,12 @@ public String[] getRequestParameter(String key) {
     if (httpRequest != null) {
       String[] value = httpRequest.getParameterValues(key);
       if (value == null) {
-        return new String[] { NA };
+        return new String[]{NA};
       } else {
         return value;
       }
     } else {
-      return new String[] { NA };
+      return new String[]{NA};
     }
   }
 
@@ -361,17 +354,17 @@ public int getStatusCode() {
   }
 
   public long getElapsedTime() {
-      return elapsedTime;
+    return elapsedTime;
   }
 
-    private long calculateElapsedTime() {
-        if (serverAdapter.getRequestTimestamp() < 0) {
-          return -1;
-        }
-        return timeStamp - serverAdapter.getRequestTimestamp();
+  private long calculateElapsedTime() {
+    if (serverAdapter.getRequestTimestamp() < 0) {
+      return -1;
     }
+    return getTimeStamp() - serverAdapter.getRequestTimestamp();
+  }
 
-    public String getRequestContent() {
+  public String getRequestContent() {
     if (requestContent != null) {
       return requestContent;
     }

diff --git a/logback-access/src/main/java/ch/qos/logback/access/spi/IAccessEvent.java b/logback-access/src/main/java/ch/qos/logback/access/spi/IAccessEvent.java
@@ -13,13 +13,13 @@
  */
 package ch.qos.logback.access.spi;
 
+import ch.qos.logback.core.spi.DeferredProcessingAware;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import ch.qos.logback.core.spi.DeferredProcessingAware;
 
 // Contributors:  Joern Huxhorn (see also bug #110)
 

diff --git a/logback-access/src/main/java/ch/qos/logback/access/tomcat/TomcatServerAdapter.java b/logback-access/src/main/java/ch/qos/logback/access/tomcat/TomcatServerAdapter.java
@@ -13,24 +13,23 @@
  */
 package ch.qos.logback.access.tomcat;
 
-import java.util.HashMap;
-import java.util.Map;
-
+import ch.qos.logback.access.spi.ServerAdapter;
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
 
-import ch.qos.logback.access.spi.ServerAdapter;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * A tomcat specific implementation of the {@link ServerAdapter} interface.
- * 
+ *
  * @author S&eacute;bastien Pennec
  */
 public class TomcatServerAdapter implements ServerAdapter {
 
   Request request;
   Response response;
-  
+
   public TomcatServerAdapter(Request tomcatRequest, Response tomcatResponse) {
     this.request = tomcatRequest;
     this.response = tomcatResponse;
@@ -45,7 +44,7 @@ public int getStatusCode() {
   }
 
   public long getRequestTimestamp() {
-     return request.getCoyoteRequest().getStartTime();
+    return request.getCoyoteRequest().getStartTime();
   }
 
   public Map<String, String> buildResponseHeaderMap() {