You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ta...@apache.org on 2016/03/16 14:38:50 UTC
qpid-jms git commit: QPIDJMS-156 Fix up some of the toString methods
for JmsResource objects to provide better logging information.
Repository: qpid-jms
Updated Branches:
refs/heads/master 274fff802 -> 2c186335e
QPIDJMS-156 Fix up some of the toString methods for JmsResource objects
to provide better logging information.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/2c186335
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/2c186335
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/2c186335
Branch: refs/heads/master
Commit: 2c186335ee69a13912df531ff3eeeb9d19a0d413
Parents: 274fff8
Author: Timothy Bish <ta...@gmail.com>
Authored: Wed Mar 16 09:37:31 2016 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Wed Mar 16 09:37:31 2016 -0400
----------------------------------------------------------------------
.../apache/qpid/jms/meta/JmsConnectionInfo.java | 5 +-
.../apache/qpid/jms/meta/JmsConsumerInfo.java | 2 +-
.../apache/qpid/jms/meta/JmsProducerInfo.java | 3 +-
.../apache/qpid/jms/meta/JmsSessionInfo.java | 4 +-
.../apache/qpid/jms/util/ToStringSupport.java | 124 -------------------
5 files changed, 6 insertions(+), 132 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2c186335/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConnectionInfo.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConnectionInfo.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConnectionInfo.java
index 8f8cf2b..1c8fa7f 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConnectionInfo.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConnectionInfo.java
@@ -20,7 +20,6 @@ import java.net.URI;
import org.apache.qpid.jms.JmsPrefetchPolicy;
import org.apache.qpid.jms.JmsRedeliveryPolicy;
-import org.apache.qpid.jms.util.ToStringSupport;
/**
* Meta object that contains the JmsConnection identification and configuration
@@ -263,7 +262,9 @@ public final class JmsConnectionInfo implements JmsResource, Comparable<JmsConne
@Override
public String toString() {
- return ToStringSupport.toString(this);
+ return "JmsConnectionInfo { " + getId() +
+ ", configuredURI = " + getConfiguredURI() +
+ ", connectedURI = " + getConnectedURI() + " }";
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2c186335/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConsumerInfo.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConsumerInfo.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConsumerInfo.java
index b653fdd..a4a4b2a 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConsumerInfo.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConsumerInfo.java
@@ -173,7 +173,7 @@ public final class JmsConsumerInfo implements JmsResource, Comparable<JmsConsume
@Override
public String toString() {
- return "JmsConsumerInfo: { " + getId() + " }";
+ return "JmsConsumerInfo: { " + getId() + ", destination = " + getDestination() + " }";
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2c186335/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsProducerInfo.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsProducerInfo.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsProducerInfo.java
index fac5db7..53939a9 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsProducerInfo.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsProducerInfo.java
@@ -17,7 +17,6 @@
package org.apache.qpid.jms.meta;
import org.apache.qpid.jms.JmsDestination;
-import org.apache.qpid.jms.util.ToStringSupport;
public final class JmsProducerInfo implements JmsResource, Comparable<JmsProducerInfo> {
@@ -69,7 +68,7 @@ public final class JmsProducerInfo implements JmsResource, Comparable<JmsProduce
@Override
public String toString() {
- return ToStringSupport.toString(this);
+ return "JmsProducerInfo { " + getId() + ", destination = " + getDestination() + " }";
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2c186335/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsSessionInfo.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsSessionInfo.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsSessionInfo.java
index 9d47c5b..c1927af 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsSessionInfo.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsSessionInfo.java
@@ -18,8 +18,6 @@ package org.apache.qpid.jms.meta;
import javax.jms.Session;
-import org.apache.qpid.jms.util.ToStringSupport;
-
public final class JmsSessionInfo implements JmsResource, Comparable<JmsSessionInfo> {
private final JmsSessionId sessionId;
@@ -84,7 +82,7 @@ public final class JmsSessionInfo implements JmsResource, Comparable<JmsSessionI
@Override
public String toString() {
- return ToStringSupport.toString(this);
+ return "JmsSessionInfo { " + getId() + " }";
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2c186335/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/ToStringSupport.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/ToStringSupport.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/ToStringSupport.java
deleted file mode 100644
index 3fb1b63..0000000
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/ToStringSupport.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.qpid.jms.util;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public final class ToStringSupport {
-
- private static final Logger LOG = LoggerFactory.getLogger(ToStringSupport.class);
-
- private ToStringSupport() {
- }
-
- public static String toString(Object target) {
- return toString(target, Object.class, null);
- }
-
- @SuppressWarnings({ "rawtypes" })
- public static String toString(Object target, Class stopClass) {
- return toString(target, stopClass, null);
- }
-
- @SuppressWarnings({ "unchecked", "rawtypes" })
- public static String toString(Object target, Class stopClass, Map<String, Object> overrideFields) {
- LinkedHashMap<String, Object> map = new LinkedHashMap<String, Object>();
- addFields(target, target.getClass(), stopClass, map);
- if (overrideFields != null) {
- for(Entry<String, Object> entry : overrideFields.entrySet()) {
- map.put(entry.getKey(), entry.getValue());
- }
-
- }
- StringBuffer buffer = new StringBuffer(simpleName(target.getClass()));
- buffer.append(" {");
- Set<Entry<String, Object>> entrySet = map.entrySet();
- boolean first = true;
- for (Map.Entry<String,Object> entry : entrySet) {
- Object value = entry.getValue();
- Object key = entry.getKey();
- if (first) {
- first = false;
- } else {
- buffer.append(", ");
- }
- buffer.append(key);
- buffer.append(" = ");
-
- appendToString(buffer, key, value);
- }
- buffer.append("}");
- return buffer.toString();
- }
-
- protected static void appendToString(StringBuffer buffer, Object key, Object value) {
- if (key.toString().toLowerCase(Locale.ENGLISH).contains("password")){
- buffer.append("*****");
- } else {
- buffer.append(value);
- }
- }
-
- public static String simpleName(Class<?> clazz) {
- String name = clazz.getName();
- int p = name.lastIndexOf(".");
- if (p >= 0) {
- name = name.substring(p + 1);
- }
- return name;
- }
-
- @SuppressWarnings({ "rawtypes" })
- private static void addFields(Object target, Class startClass, Class<Object> stopClass, LinkedHashMap<String, Object> map) {
-
- if (startClass != stopClass) {
- addFields(target, startClass.getSuperclass(), stopClass, map);
- }
-
- Field[] fields = startClass.getDeclaredFields();
- for (Field field : fields) {
- if (Modifier.isStatic(field.getModifiers()) || Modifier.isTransient(field.getModifiers())
- || Modifier.isPrivate(field.getModifiers())) {
- continue;
- }
-
- try {
- field.setAccessible(true);
- Object o = field.get(target);
- if (o != null && o.getClass().isArray()) {
- try {
- o = Arrays.asList((Object[])o);
- } catch (Exception e) {
- }
- }
- map.put(field.getName(), o);
- } catch (Exception e) {
- LOG.debug("Error getting field " + field + " on class " + startClass + ". This exception is ignored.", e);
- }
- }
- }
-}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org