From 13b27f8d7ac08bb3ff1a56a48865201263d6462d Mon Sep 17 00:00:00 2001
From: developerKurt <mustafakurt.business@gmail.com>
Date: Fri, 3 Jan 2020 10:20:07 +0300
Subject: As the owner requested:   • Javadocs are removed   • Spring test
 framework removed, created custom mock implementation instead   • Added class
 and method renamed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/traccar/helper/ServletHelper.java     | 27 ++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 src/main/java/org/traccar/helper/ServletHelper.java

(limited to 'src/main/java/org/traccar/helper/ServletHelper.java')

diff --git a/src/main/java/org/traccar/helper/ServletHelper.java b/src/main/java/org/traccar/helper/ServletHelper.java
new file mode 100644
index 000000000..4eab49001
--- /dev/null
+++ b/src/main/java/org/traccar/helper/ServletHelper.java
@@ -0,0 +1,27 @@
+package org.traccar.helper;
+
+import javax.servlet.http.HttpServletRequest;
+
+
+public final class ServletHelper {
+
+
+    public static String retrieveRemoteAddress(HttpServletRequest request) {
+
+        if (request != null) {
+            String ipAddress = request.getHeader("X-FORWARDED-FOR");
+
+            if (ipAddress != null && !ipAddress.isEmpty()) {
+                return ipAddress.substring(0, ipAddress.indexOf(",")); //Removes the additional data
+            } else {
+                ipAddress = request.getRemoteAddr();
+                return ipAddress;
+            }
+
+        } else {
+            return null;
+        }
+
+
+    }
+}
\ No newline at end of file
-- 
cgit v1.2.3


From b62d3ba2a545a2f6b2963a2aa2c36b53abdfd6bc Mon Sep 17 00:00:00 2001
From: developerKurt <mustafakurt.business@gmail.com>
Date: Fri, 3 Jan 2020 10:24:14 +0300
Subject: Resolved styling errors

---
 src/main/java/org/traccar/helper/ServletHelper.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/main/java/org/traccar/helper/ServletHelper.java')

diff --git a/src/main/java/org/traccar/helper/ServletHelper.java b/src/main/java/org/traccar/helper/ServletHelper.java
index 4eab49001..f951d17c0 100644
--- a/src/main/java/org/traccar/helper/ServletHelper.java
+++ b/src/main/java/org/traccar/helper/ServletHelper.java
@@ -6,6 +6,9 @@ import javax.servlet.http.HttpServletRequest;
 public final class ServletHelper {
 
 
+    private ServletHelper() {
+    }
+
     public static String retrieveRemoteAddress(HttpServletRequest request) {
 
         if (request != null) {
@@ -21,7 +24,5 @@ public final class ServletHelper {
         } else {
             return null;
         }
-
-
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3