From e872572b1ce28e040cdb1b5c16eacfb96e6b3a4e Mon Sep 17 00:00:00 2001
From: j2blake <j2blake@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 1 May 2012 16:15:31 +0000
Subject: [PATCH] Clean up the LogUtil output.

---
 .../vitro/webapp/utils/log/LogUtils.java      | 34 ++++++++++---------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/log/LogUtils.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/log/LogUtils.java
index 51399c0b5..db53b88af 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/log/LogUtils.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/log/LogUtils.java
@@ -2,7 +2,6 @@
 
 package edu.cornell.mannlib.vitro.webapp.utils.log;
 
-import java.lang.reflect.TypeVariable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -13,7 +12,6 @@ import java.util.TreeSet;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 
 /**
@@ -96,27 +94,17 @@ public class LogUtils {
 		if (o instanceof Map<?, ?>) {
 			return formatMap((Map<?, ?>) (o));
 		}
-		if (o.getClass().isArray()
-				&& (!o.getClass().getComponentType().isPrimitive())) {
-			return formatClass(o) + ": " + Arrays.deepToString((Object[]) o);
+		if (o.getClass().isArray()) {
+			return formatArray(o);
 		}
-		return formatClass(o) + ": " + String.valueOf(o);
+		return formatObject(o);
 	}
 
 	private String formatClass(Object o) {
 		if (o == null) {
 			return "";
 		}
-
-		Class<?> clazz = o.getClass();
-		TypeVariable<?>[] generics = clazz.getTypeParameters();
-
-		if (generics.length == 0) {
-			return clazz.getName();
-		} else {
-			return clazz.getName() + '<' + StringUtils.join(generics, ", ")
-					+ '>';
-		}
+		return o.getClass().getName();
 	}
 
 	private String formatCollection(Collection<?> collection) {
@@ -154,4 +142,18 @@ public class LogUtils {
 		return result.toString();
 	}
 
+	private String formatArray(Object o) {
+		return formatClass(o) + ": " + Arrays.deepToString((Object[]) o);
+	}
+
+	private String formatObject(Object o) {
+		String className = o.getClass().getName();
+		String valueString = String.valueOf(o);
+		if (valueString.contains(className)) {
+			return valueString;
+		} else {
+			return formatClass(o) + ": " + valueString;
+		}
+	}
+
 }