Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This closes #1276

This commit is contained in:
Clebert Suconic 2017-05-17 14:11:08 -04:00
parent 97843a023f 744221dcb5
commit 88cf826dca
6 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/DiscoveryGroupConfiguration.java
View File

@ -129,8 +129,8 @@ public final class DiscoveryGroupConfiguration implements Serializable {
public String toString() { public String toString() {
return "DiscoveryGroupConfiguration{" + return "DiscoveryGroupConfiguration{" +
"name='" + name + '\'' + "name='" + name + '\'' +
", refreshTimeout=" + refreshTimeout + ",\n refreshTimeout=" + refreshTimeout +
", discoveryInitialWaitTimeout=" + discoveryInitialWaitTimeout + ",\n discoveryInitialWaitTimeout=" + discoveryInitialWaitTimeout +
'}'; "}";
} }
} }

8
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java
View File

@ -252,15 +252,16 @@ public class TransportConfiguration implements Serializable {
public static String toStringParameters(Map<String, Object> params, Map<String, Object> extraProps) { public static String toStringParameters(Map<String, Object> params, Map<String, Object> extraProps) {
StringBuilder str = new StringBuilder(); StringBuilder str = new StringBuilder();
str.append("{");
if (params != null) { if (params != null) {
if (!params.isEmpty()) { if (!params.isEmpty()) {
str.append("?"); str.append("\n\t\t\t");
} }
boolean first = true; boolean first = true;
for (Map.Entry<String, Object> entry : params.entrySet()) { for (Map.Entry<String, Object> entry : params.entrySet()) {
if (!first) { if (!first) {
str.append("&"); str.append("\n\t\t\t");
} }
String key = entry.getKey(); String key = entry.getKey();
@ -280,7 +281,7 @@ public class TransportConfiguration implements Serializable {
if (extraProps != null) { if (extraProps != null) {
for (Map.Entry<String, Object> entry : extraProps.entrySet()) { for (Map.Entry<String, Object> entry : extraProps.entrySet()) {
if (!first) { if (!first) {
str.append("&"); str.append("\n\t\t\t");
} }
String key = entry.getKey(); String key = entry.getKey();
@ -292,6 +293,7 @@ public class TransportConfiguration implements Serializable {
} }
} }
} }
str.append("\n\t\t}");
return str.toString(); return str.toString();
} }

4
artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
View File

@ -1476,12 +1476,12 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery
return "ServerLocatorImpl (identity=" + identity + return "ServerLocatorImpl (identity=" + identity +
") [initialConnectors=" + ") [initialConnectors=" +
Arrays.toString(initialConnectors == null ? new TransportConfiguration[0] : initialConnectors) + Arrays.toString(initialConnectors == null ? new TransportConfiguration[0] : initialConnectors) +
", discoveryGroupConfiguration=" + ",\n discoveryGroupConfiguration=" +
discoveryGroupConfiguration + discoveryGroupConfiguration +
"]"; "]";
} }
return "ServerLocatorImpl [initialConnectors=" + Arrays.toString(initialConnectors == null ? new TransportConfiguration[0] : initialConnectors) + return "ServerLocatorImpl [initialConnectors=" + Arrays.toString(initialConnectors == null ? new TransportConfiguration[0] : initialConnectors) +
", discoveryGroupConfiguration=" + ",\n discoveryGroupConfiguration=" +
discoveryGroupConfiguration + discoveryGroupConfiguration +
"]"; "]";
} }

2
artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/TopologyMemberImpl.java
View File

@ -149,6 +149,6 @@ public final class TopologyMemberImpl implements TopologyMember {
@Override @Override
public String toString() { public String toString() {
return "TopologyMember[id = " + nodeId + ", connector=" + connector + ", backupGroupName=" + backupGroupName + ", scaleDownGroupName=" + scaleDownGroupName + "]"; return "TopologyMember[\n\t\tid = " + nodeId + "\n\t\tconnector=" + connector + "\n\t\tbackupGroupName=" + backupGroupName + "\n\t\tscaleDownGroupName=" + scaleDownGroupName + "]";
} }
} }

8
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
View File

@ -736,13 +736,13 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
@Override @Override
public String toString() { public String toString() {
return this.getClass().getSimpleName() + "@" + return "\n " + this.getClass().getSimpleName() + "@" +
Integer.toHexString(System.identityHashCode(this)) + Integer.toHexString(System.identityHashCode(this)) +
" [name=" + "\n [name=" +
name + name +
", queue=" + ",\n queue=" +
queue + queue +
" targetConnector=" + "\n targetConnector=" +
this.serverLocator + this.serverLocator +
"]"; "]";
} }

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
View File

@ -1961,7 +1961,7 @@ public class QueueImpl implements Queue {
@Override @Override
public String toString() { public String toString() {
return "QueueImpl[name=" + name.toString() + ", postOffice=" + this.postOffice + ", temp=" + this.temporary + "]@" + Integer.toHexString(System.identityHashCode(this)); return "QueueImpl[name=" + name.toString() + ",\n postOffice=" + this.postOffice + ",\n temp=" + this.temporary + "]@" + Integer.toHexString(System.identityHashCode(this));
} }
private synchronized void internalAddTail(final MessageReference ref) { private synchronized void internalAddTail(final MessageReference ref) {