From 5abfb3b646244299f09bdcfc9e9f13d756334846 Mon Sep 17 00:00:00 2001
From: Bjørn Christian Seime <bjorncs@oath.com>
Date: Tue, 30 Jan 2018 12:58:35 +0100
Subject: Add rawPath and rawQuery to AccessLogEntry

---
 .../yahoo/container/logging/AccessLogEntry.java    | 36 ++++++++++++++++++++++
 1 file changed, 36 insertions(+)

(limited to 'container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogEntry.java')

diff --git a/container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogEntry.java b/container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogEntry.java
index 24078151d64..9beae9463c0 100644
--- a/container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogEntry.java
+++ b/container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogEntry.java
@@ -96,6 +96,8 @@ public class AccessLogEntry {
     private int localPort;
     private Principal principal;
     private X500Principal sslPrincipal;
+    private String rawPath;
+    private String rawQuery;
 
     private ListMap<String,String> keyValues=null;
 
@@ -597,6 +599,10 @@ public class AccessLogEntry {
         }
     }
 
+    /**
+     * @deprecated Use {@link #setRawPath(String)} and {@link #setRawQuery(String)} instead.
+     */
+    @Deprecated
     public void setURI(final URI uri) {
         synchronized (monitor) {
             requireNull(this.uri);
@@ -604,6 +610,10 @@ public class AccessLogEntry {
         }
     }
 
+    /**
+     * @deprecated Use {@link #getRawPath()} and {@link #getRawQuery()} instead. This method may return wrong path.
+     */
+    @Deprecated
     public URI getURI() {
         synchronized (monitor) {
             return uri;
@@ -739,6 +749,32 @@ public class AccessLogEntry {
         }
     }
 
+    public void setRawPath(String rawPath) {
+        synchronized (monitor) {
+            requireNull(this.rawPath);
+            this.rawPath = rawPath;
+        }
+    }
+
+    public String getRawPath() {
+        synchronized (monitor) {
+            return rawPath;
+        }
+    }
+
+    public void setRawQuery(String rawQuery) {
+        synchronized (monitor) {
+            requireNull(this.rawQuery);
+            this.rawQuery = rawQuery;
+        }
+    }
+
+    public String getRawQuery() {
+        synchronized (monitor) {
+            return rawQuery;
+        }
+    }
+
     @Override
     public String toString() {
         synchronized (monitor) {
-- 
cgit v1.2.3