From 8ce73e3f5022b236967361a4afbd6a62dc693c34 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Thu, 21 Sep 2017 23:41:24 +0200
Subject: [PATCH] Moved getCallingClass function to ClassUtil

---
 src/zutil/ClassUtil.java                | 20 ++++++++++++++++++++
 src/zutil/log/LogUtil.java              | 17 ++---------------
 test/zutil/net/ssdp/SSDPClientTest.java |  3 ++-
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/zutil/ClassUtil.java b/src/zutil/ClassUtil.java
index 52125aa..9d77e7a 100755
--- a/src/zutil/ClassUtil.java
+++ b/src/zutil/ClassUtil.java
@@ -27,6 +27,7 @@ package zutil;
 import java.lang.reflect.Field;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
+import java.util.ArrayList;
 import java.util.HashSet;
 
 /**
@@ -162,4 +163,23 @@ public class ClassUtil {
         }
         return new Class[0];
     }
+
+
+    /**
+     * @return the first class in the stack that do not match the filter
+     */
+    public static String getCallingClass(Class... filter){
+        ArrayList filterStr = new ArrayList();
+        for (Class clazz : filter)
+            filterStr.add(clazz.getName());
+
+        StackTraceElement[] stackTraceElements = Thread.currentThread().getStackTrace();
+        for(int i=1; i<stackTraceElements.length ;++i){
+            String className = stackTraceElements[i].getClassName();
+            if( !filterStr.contains(className) ){
+                return className;
+            }
+        }
+        return null;
+    }
 }
diff --git a/src/zutil/log/LogUtil.java b/src/zutil/log/LogUtil.java
index 4f5a70c..2e640da 100755
--- a/src/zutil/log/LogUtil.java
+++ b/src/zutil/log/LogUtil.java
@@ -24,6 +24,7 @@
 
 package zutil.log;
 
+import zutil.ClassUtil;
 import zutil.io.file.FileUtil;
 
 import java.io.File;
@@ -45,21 +46,7 @@ public class LogUtil {
 	 * @return a new Logger for the calling class
 	 */
 	public static Logger getLogger(){
-		return Logger.getLogger(getCallingClass());
-	}
-
-	/**
-	 * @return the parent class other than Logger in the stack
-	 */
-	public static String getCallingClass(){
-		StackTraceElement[] stackTraceElements = Thread.currentThread().getStackTrace();
-		for(int i=1; i<stackTraceElements.length ;++i){
-			String name = stackTraceElements[i].getClassName();
-			if( !name.equals( LogUtil.class.getName() ) ){
-				return name;
-			}
-		}
-		return null;
+		return Logger.getLogger(ClassUtil.getCallingClass(LogUtil.class));
 	}
 
 	/**
diff --git a/test/zutil/net/ssdp/SSDPClientTest.java b/test/zutil/net/ssdp/SSDPClientTest.java
index f166421..34c951d 100755
--- a/test/zutil/net/ssdp/SSDPClientTest.java
+++ b/test/zutil/net/ssdp/SSDPClientTest.java
@@ -24,6 +24,7 @@
 
 package zutil.net.ssdp;
 
+import zutil.ClassUtil;
 import zutil.log.LogUtil;
 
 import java.io.IOException;
@@ -36,7 +37,7 @@ import java.util.logging.Level;
 public class SSDPClientTest {
 
     public static void main(String[] args) throws IOException {
-        System.out.println(LogUtil.getCallingClass());
+        System.out.println(ClassUtil.getCallingClass());
         LogUtil.setGlobalLevel(Level.FINEST);
         SSDPClient ssdp = new SSDPClient();
         ssdp.requestService("upnp:rootdevice");