You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2015/08/10 17:13:25 UTC
[26/53] [abbrv] [partial] activemq-artemis git commit: automatic
checkstyle change
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/management/NotificationService.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/management/NotificationService.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/management/NotificationService.java
index d6625a6..113bc34 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/management/NotificationService.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/management/NotificationService.java
@@ -16,8 +16,8 @@
*/
package org.apache.activemq.artemis.core.server.management;
-public interface NotificationService
-{
+public interface NotificationService {
+
/**
* the message corresponding to a notification will always contain the properties:
* <ul>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/settings/impl/AddressFullMessagePolicy.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/settings/impl/AddressFullMessagePolicy.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/settings/impl/AddressFullMessagePolicy.java
index 4f6c392..ca71587 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/settings/impl/AddressFullMessagePolicy.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/settings/impl/AddressFullMessagePolicy.java
@@ -16,7 +16,6 @@
*/
package org.apache.activemq.artemis.core.settings.impl;
-public enum AddressFullMessagePolicy
-{
+public enum AddressFullMessagePolicy {
DROP, PAGE, BLOCK, FAIL;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/transaction/impl/XidImpl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/transaction/impl/XidImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/transaction/impl/XidImpl.java
index 65208e3..f29bf32 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/transaction/impl/XidImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/transaction/impl/XidImpl.java
@@ -26,8 +26,8 @@ import org.apache.activemq.artemis.utils.Base64;
/**
* Xid implementation
*/
-public class XidImpl implements Xid, Serializable
-{
+public class XidImpl implements Xid, Serializable {
+
private static final long serialVersionUID = 407053232840068514L;
private final byte[] branchQualifier;
@@ -42,14 +42,12 @@ public class XidImpl implements Xid, Serializable
// Static --------------------------------------------------------
- public static String toBase64String(final Xid xid)
- {
+ public static String toBase64String(final Xid xid) {
byte[] data = XidImpl.toByteArray(xid);
return Base64.encodeBytes(data, 0, data.length, Base64.DONT_BREAK_LINES | Base64.URL_SAFE);
}
- private static byte[] toByteArray(final Xid xid)
- {
+ private static byte[] toByteArray(final Xid xid) {
byte[] branchQualifier = xid.getBranchQualifier();
byte[] globalTransactionId = xid.getGlobalTransactionId();
int formatId = xid.getFormatId();
@@ -58,9 +56,8 @@ public class XidImpl implements Xid, Serializable
System.arraycopy(branchQualifier, 0, hashBytes, 0, branchQualifier.length);
System.arraycopy(globalTransactionId, 0, hashBytes, branchQualifier.length, globalTransactionId.length);
byte[] intBytes = new byte[4];
- for (int i = 0; i < 4; i++)
- {
- intBytes[i] = (byte)((formatId >> i * 8) % 0xFF);
+ for (int i = 0; i < 4; i++) {
+ intBytes[i] = (byte) ((formatId >> i * 8) % 0xFF);
}
System.arraycopy(intBytes, 0, hashBytes, branchQualifier.length + globalTransactionId.length, 4);
return hashBytes;
@@ -70,12 +67,12 @@ public class XidImpl implements Xid, Serializable
/**
* Standard constructor
+ *
* @param branchQualifier
* @param formatId
* @param globalTransactionId
*/
- public XidImpl(final byte[] branchQualifier, final int formatId, final byte[] globalTransactionId)
- {
+ public XidImpl(final byte[] branchQualifier, final int formatId, final byte[] globalTransactionId) {
this.branchQualifier = branchQualifier;
this.formatId = formatId;
this.globalTransactionId = globalTransactionId;
@@ -83,10 +80,10 @@ public class XidImpl implements Xid, Serializable
/**
* Copy constructor
+ *
* @param other
*/
- public XidImpl(final Xid other)
- {
+ public XidImpl(final Xid other) {
branchQualifier = copyBytes(other.getBranchQualifier());
formatId = other.getFormatId();
globalTransactionId = copyBytes(other.getGlobalTransactionId());
@@ -94,70 +91,55 @@ public class XidImpl implements Xid, Serializable
// Xid implementation ------------------------------------------------------------------
- public byte[] getBranchQualifier()
- {
+ public byte[] getBranchQualifier() {
return branchQualifier;
}
- public int getFormatId()
- {
+ public int getFormatId() {
return formatId;
}
- public byte[] getGlobalTransactionId()
- {
+ public byte[] getGlobalTransactionId() {
return globalTransactionId;
}
// Public -------------------------------------------------------------------------------
@Override
- public int hashCode()
- {
- if (!hashCalculated)
- {
+ public int hashCode() {
+ if (!hashCalculated) {
calcHash();
}
return hash;
}
@Override
- public boolean equals(final Object other)
- {
- if (this == other)
- {
+ public boolean equals(final Object other) {
+ if (this == other) {
return true;
}
- if (!(other instanceof Xid))
- {
+ if (!(other instanceof Xid)) {
return false;
}
- Xid xother = (Xid)other;
- if (xother.getFormatId() != formatId)
- {
+ Xid xother = (Xid) other;
+ if (xother.getFormatId() != formatId) {
return false;
}
- if (xother.getBranchQualifier().length != branchQualifier.length)
- {
+ if (xother.getBranchQualifier().length != branchQualifier.length) {
return false;
}
- if (xother.getGlobalTransactionId().length != globalTransactionId.length)
- {
+ if (xother.getGlobalTransactionId().length != globalTransactionId.length) {
return false;
}
- for (int i = 0; i < branchQualifier.length; i++)
- {
+ for (int i = 0; i < branchQualifier.length; i++) {
byte[] otherBQ = xother.getBranchQualifier();
- if (branchQualifier[i] != otherBQ[i])
- {
+ if (branchQualifier[i] != otherBQ[i]) {
return false;
}
}
- for (int i = 0; i < globalTransactionId.length; i++)
- {
+ for (int i = 0; i < globalTransactionId.length; i++) {
byte[] otherGtx = xother.getGlobalTransactionId();
- if (globalTransactionId[i] != otherGtx[i])
- {
+ if (globalTransactionId[i] != otherGtx[i]) {
return false;
}
}
@@ -165,31 +147,27 @@ public class XidImpl implements Xid, Serializable
}
@Override
- public String toString()
- {
+ public String toString() {
return "XidImpl (" + System.identityHashCode(this) +
- " bq:" +
- stringRep(branchQualifier) +
- " formatID:" +
- formatId +
- " gtxid:" +
- stringRep(globalTransactionId) +
- " base64:" + toBase64String(this);
+ " bq:" +
+ stringRep(branchQualifier) +
+ " formatID:" +
+ formatId +
+ " gtxid:" +
+ stringRep(globalTransactionId) +
+ " base64:" + toBase64String(this);
}
// Private -------------------------------------------------------------------------------
- private String stringRep(final byte[] bytes)
- {
+ private String stringRep(final byte[] bytes) {
StringBuffer buff = new StringBuffer();
- for (int i = 0; i < bytes.length; i++)
- {
+ for (int i = 0; i < bytes.length; i++) {
byte b = bytes[i];
buff.append(b);
- if (i != bytes.length - 1)
- {
+ if (i != bytes.length - 1) {
buff.append('.');
}
}
@@ -197,15 +175,13 @@ public class XidImpl implements Xid, Serializable
return buff.toString();
}
- private void calcHash()
- {
+ private void calcHash() {
byte[] hashBytes = XidImpl.toByteArray(this);
hash = Arrays.hashCode(hashBytes);
hashCalculated = true;
}
- private byte[] copyBytes(final byte[] other)
- {
+ private byte[] copyBytes(final byte[] other) {
byte[] bytes = new byte[other.length];
System.arraycopy(other, 0, bytes, 0, other.length);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/version/Version.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/version/Version.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/version/Version.java
index 9327381..6e81309 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/version/Version.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/version/Version.java
@@ -16,8 +16,8 @@
*/
package org.apache.activemq.artemis.core.version;
-public interface Version
-{
+public interface Version {
+
String getFullVersion();
String getVersionName();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/version/impl/VersionImpl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/version/impl/VersionImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/version/impl/VersionImpl.java
index 9e1575d..0394a11 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/version/impl/VersionImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/version/impl/VersionImpl.java
@@ -21,8 +21,8 @@ import java.util.Arrays;
import org.apache.activemq.artemis.core.version.Version;
-public class VersionImpl implements Version, Serializable
-{
+public class VersionImpl implements Version, Serializable {
+
private static final long serialVersionUID = -5271227256591080403L;
private final String versionName;
@@ -44,8 +44,7 @@ public class VersionImpl implements Version, Serializable
final int minorVersion,
final int microVersion,
final int incrementingVersion,
- final int[] compatibleVersionList)
- {
+ final int[] compatibleVersionList) {
this.versionName = versionName;
this.majorVersion = majorVersion;
@@ -61,42 +60,33 @@ public class VersionImpl implements Version, Serializable
// Version implementation ------------------------------------------
- public String getFullVersion()
- {
+ public String getFullVersion() {
return versionName;
}
- public String getVersionName()
- {
+ public String getVersionName() {
return versionName;
}
- public int getMajorVersion()
- {
+ public int getMajorVersion() {
return majorVersion;
}
- public int getMinorVersion()
- {
+ public int getMinorVersion() {
return minorVersion;
}
- public int getMicroVersion()
- {
+ public int getMicroVersion() {
return microVersion;
}
- public int getIncrementingVersion()
- {
+ public int getIncrementingVersion() {
return incrementingVersion;
}
- public boolean isCompatible(int version)
- {
- for (int element : compatibleVersionList)
- {
- if (element == version)
- {
+ public boolean isCompatible(int version) {
+ for (int element : compatibleVersionList) {
+ if (element == version) {
return true;
}
}
@@ -104,8 +94,7 @@ public class VersionImpl implements Version, Serializable
}
@Override
- public int hashCode()
- {
+ public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + Arrays.hashCode(compatibleVersionList);
@@ -118,50 +107,38 @@ public class VersionImpl implements Version, Serializable
}
@Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- {
+ public boolean equals(Object obj) {
+ if (this == obj) {
return true;
}
- if (obj == null)
- {
+ if (obj == null) {
return false;
}
- if (!(obj instanceof VersionImpl))
- {
+ if (!(obj instanceof VersionImpl)) {
return false;
}
- VersionImpl other = (VersionImpl)obj;
- if (!Arrays.equals(compatibleVersionList, other.compatibleVersionList))
- {
+ VersionImpl other = (VersionImpl) obj;
+ if (!Arrays.equals(compatibleVersionList, other.compatibleVersionList)) {
return false;
}
- if (incrementingVersion != other.incrementingVersion)
- {
+ if (incrementingVersion != other.incrementingVersion) {
return false;
}
- if (majorVersion != other.majorVersion)
- {
+ if (majorVersion != other.majorVersion) {
return false;
}
- if (microVersion != other.microVersion)
- {
+ if (microVersion != other.microVersion) {
return false;
}
- if (minorVersion != other.minorVersion)
- {
+ if (minorVersion != other.minorVersion) {
return false;
}
- if (versionName == null)
- {
- if (other.versionName != null)
- {
+ if (versionName == null) {
+ if (other.versionName != null) {
return false;
}
}
- else if (!versionName.equals(other.versionName))
- {
+ else if (!versionName.equals(other.versionName)) {
return false;
}
return true;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/BytesMessageUtil.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/BytesMessageUtil.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/BytesMessageUtil.java
index c801596..806a321 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/BytesMessageUtil.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/BytesMessageUtil.java
@@ -18,82 +18,64 @@ package org.apache.activemq.artemis.reader;
import org.apache.activemq.artemis.api.core.Message;
-public class BytesMessageUtil extends MessageUtil
-{
+public class BytesMessageUtil extends MessageUtil {
- public static boolean bytesReadBoolean(Message message)
- {
+ public static boolean bytesReadBoolean(Message message) {
return getBodyBuffer(message).readBoolean();
}
- public static byte bytesReadByte(Message message)
- {
+ public static byte bytesReadByte(Message message) {
return getBodyBuffer(message).readByte();
}
- public static int bytesReadUnsignedByte(Message message)
- {
+ public static int bytesReadUnsignedByte(Message message) {
return getBodyBuffer(message).readUnsignedByte();
}
- public static short bytesReadShort(Message message)
- {
+ public static short bytesReadShort(Message message) {
return getBodyBuffer(message).readShort();
}
- public static int bytesReadUnsignedShort(Message message)
- {
+ public static int bytesReadUnsignedShort(Message message) {
return getBodyBuffer(message).readUnsignedShort();
}
- public static char bytesReadChar(Message message)
- {
- return (char)getBodyBuffer(message).readShort();
+ public static char bytesReadChar(Message message) {
+ return (char) getBodyBuffer(message).readShort();
}
- public static int bytesReadInt(Message message)
- {
+ public static int bytesReadInt(Message message) {
return getBodyBuffer(message).readInt();
}
- public static long bytesReadLong(Message message)
- {
+ public static long bytesReadLong(Message message) {
return getBodyBuffer(message).readLong();
}
- public static float bytesReadFloat(Message message)
- {
+ public static float bytesReadFloat(Message message) {
return Float.intBitsToFloat(getBodyBuffer(message).readInt());
}
- public static double bytesReadDouble(Message message)
- {
+ public static double bytesReadDouble(Message message) {
return Double.longBitsToDouble(getBodyBuffer(message).readLong());
}
- public static String bytesReadUTF(Message message)
- {
+ public static String bytesReadUTF(Message message) {
return getBodyBuffer(message).readUTF();
}
-
-
- public static int bytesReadBytes(Message message, final byte[] value)
- {
+ public static int bytesReadBytes(Message message, final byte[] value) {
return bytesReadBytes(message, value, value.length);
}
- public static int bytesReadBytes(Message message, final byte[] value, final int length)
- {
- if (!getBodyBuffer(message).readable())
- {
+ public static int bytesReadBytes(Message message, final byte[] value, final int length) {
+ if (!getBodyBuffer(message).readable()) {
return -1;
}
int read = Math.min(length, getBodyBuffer(message).readableBytes());
- if (read != 0)
- {
+ if (read != 0) {
getBodyBuffer(message).readBytes(value, 0, read);
}
@@ -101,131 +83,99 @@ public class BytesMessageUtil extends MessageUtil
}
-
- public static void bytesWriteBoolean(Message message, boolean value)
- {
+ public static void bytesWriteBoolean(Message message, boolean value) {
getBodyBuffer(message).writeBoolean(value);
}
-
-
- public static void bytesWriteByte(Message message, byte value)
- {
+ public static void bytesWriteByte(Message message, byte value) {
getBodyBuffer(message).writeByte(value);
}
-
-
- public static void bytesWriteShort(Message message, short value)
- {
+ public static void bytesWriteShort(Message message, short value) {
getBodyBuffer(message).writeShort(value);
}
-
- public static void bytesWriteChar(Message message, char value)
- {
- getBodyBuffer(message).writeShort((short)value);
+ public static void bytesWriteChar(Message message, char value) {
+ getBodyBuffer(message).writeShort((short) value);
}
- public static void bytesWriteInt(Message message, int value)
- {
+ public static void bytesWriteInt(Message message, int value) {
getBodyBuffer(message).writeInt(value);
}
- public static void bytesWriteLong(Message message, long value)
- {
+ public static void bytesWriteLong(Message message, long value) {
getBodyBuffer(message).writeLong(value);
}
- public static void bytesWriteFloat(Message message, float value)
- {
+ public static void bytesWriteFloat(Message message, float value) {
getBodyBuffer(message).writeInt(Float.floatToIntBits(value));
}
- public static void bytesWriteDouble(Message message, double value)
- {
+ public static void bytesWriteDouble(Message message, double value) {
getBodyBuffer(message).writeLong(Double.doubleToLongBits(value));
}
- public static void bytesWriteUTF(Message message, String value)
- {
+ public static void bytesWriteUTF(Message message, String value) {
getBodyBuffer(message).writeUTF(value);
}
- public static void bytesWriteBytes(Message message, byte[] value)
- {
+ public static void bytesWriteBytes(Message message, byte[] value) {
getBodyBuffer(message).writeBytes(value);
}
- public static void bytesWriteBytes(Message message, final byte[] value, final int offset, final int length)
- {
+ public static void bytesWriteBytes(Message message, final byte[] value, final int offset, final int length) {
getBodyBuffer(message).writeBytes(value, offset, length);
}
-
/**
* Returns true if it could send the Object to any known format
+ *
* @param message
* @param value
* @return
*/
- public static boolean bytesWriteObject(Message message, Object value)
- {
- if (value == null)
- {
+ public static boolean bytesWriteObject(Message message, Object value) {
+ if (value == null) {
throw new NullPointerException("Attempt to write a null value");
}
- if (value instanceof String)
- {
+ if (value instanceof String) {
bytesWriteUTF(message, (String) value);
}
- else if (value instanceof Boolean)
- {
+ else if (value instanceof Boolean) {
bytesWriteBoolean(message, (Boolean) value);
}
- else if (value instanceof Character)
- {
+ else if (value instanceof Character) {
bytesWriteChar(message, (Character) value);
}
- else if (value instanceof Byte)
- {
+ else if (value instanceof Byte) {
bytesWriteByte(message, (Byte) value);
}
- else if (value instanceof Short)
- {
+ else if (value instanceof Short) {
bytesWriteShort(message, (Short) value);
}
- else if (value instanceof Integer)
- {
+ else if (value instanceof Integer) {
bytesWriteInt(message, (Integer) value);
}
- else if (value instanceof Long)
- {
+ else if (value instanceof Long) {
bytesWriteLong(message, (Long) value);
}
- else if (value instanceof Float)
- {
+ else if (value instanceof Float) {
bytesWriteFloat(message, (Float) value);
}
- else if (value instanceof Double)
- {
+ else if (value instanceof Double) {
bytesWriteDouble(message, (Double) value);
}
- else if (value instanceof byte[])
- {
+ else if (value instanceof byte[]) {
bytesWriteBytes(message, (byte[]) value);
}
- else
- {
+ else {
return false;
}
-
return true;
}
- public static void bytesMessageReset(Message message)
- {
+ public static void bytesMessageReset(Message message) {
getBodyBuffer(message).resetReaderIndex();
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/MapMessageUtil.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/MapMessageUtil.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/MapMessageUtil.java
index 6f4035a..9ae4798 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/MapMessageUtil.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/MapMessageUtil.java
@@ -20,14 +20,12 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
import org.apache.activemq.artemis.api.core.Message;
import org.apache.activemq.artemis.utils.TypedProperties;
-public class MapMessageUtil extends MessageUtil
-{
+public class MapMessageUtil extends MessageUtil {
/**
* Utility method to set the map on a message body
*/
- public static void writeBodyMap(Message message, TypedProperties properties)
- {
+ public static void writeBodyMap(Message message, TypedProperties properties) {
ActiveMQBuffer buff = getBodyBuffer(message);
buff.resetWriterIndex();
properties.encode(buff);
@@ -36,8 +34,7 @@ public class MapMessageUtil extends MessageUtil
/**
* Utility method to set the map on a message body
*/
- public static TypedProperties readBodyMap(Message message)
- {
+ public static TypedProperties readBodyMap(Message message) {
TypedProperties map = new TypedProperties();
readBodyMap(message, map);
return map;
@@ -46,13 +43,10 @@ public class MapMessageUtil extends MessageUtil
/**
* Utility method to set the map on a message body
*/
- public static void readBodyMap(Message message, TypedProperties map)
- {
+ public static void readBodyMap(Message message, TypedProperties map) {
ActiveMQBuffer buff = getBodyBuffer(message);
buff.resetReaderIndex();
map.decode(buff);
}
-
-
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/MessageUtil.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/MessageUtil.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/MessageUtil.java
index f017c08..9f1a598 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/MessageUtil.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/MessageUtil.java
@@ -32,8 +32,8 @@ import org.apache.activemq.artemis.api.core.SimpleString;
*
* This provides a helper for core message to act some of the JMS functions used by the JMS wrapper
*/
-public class MessageUtil
-{
+public class MessageUtil {
+
public static final SimpleString CORRELATIONID_HEADER_NAME = new SimpleString("JMSCorrelationID");
public static final SimpleString REPLYTO_HEADER_NAME = new SimpleString("JMSReplyTo");
@@ -52,137 +52,99 @@ public class MessageUtil
public static final SimpleString CONNECTION_ID_PROPERTY_NAME = new SimpleString("__AMQ_CID");
-
-
- public static ActiveMQBuffer getBodyBuffer(Message message)
- {
+ public static ActiveMQBuffer getBodyBuffer(Message message) {
return message.getBodyBuffer();
}
-
-
- public static byte[] getJMSCorrelationIDAsBytes(Message message)
- {
+ public static byte[] getJMSCorrelationIDAsBytes(Message message) {
Object obj = message.getObjectProperty(CORRELATIONID_HEADER_NAME);
- if (obj instanceof byte[])
- {
- return (byte[])obj;
+ if (obj instanceof byte[]) {
+ return (byte[]) obj;
}
- else
- {
+ else {
return null;
}
}
-
-
- public static void setJMSType(Message message, String type)
- {
+ public static void setJMSType(Message message, String type) {
message.putStringProperty(TYPE_HEADER_NAME, new SimpleString(type));
}
- public static String getJMSType(Message message)
- {
+ public static String getJMSType(Message message) {
SimpleString ss = message.getSimpleStringProperty(TYPE_HEADER_NAME);
- if (ss != null)
- {
+ if (ss != null) {
return ss.toString();
}
- else
- {
+ else {
return null;
}
}
-
- public static final void setJMSCorrelationIDAsBytes(Message message, final byte[] correlationID) throws ActiveMQException
- {
- if (correlationID == null || correlationID.length == 0)
- {
+ public static final void setJMSCorrelationIDAsBytes(Message message,
+ final byte[] correlationID) throws ActiveMQException {
+ if (correlationID == null || correlationID.length == 0) {
throw new ActiveMQException("Please specify a non-zero length byte[]");
}
message.putBytesProperty(CORRELATIONID_HEADER_NAME, correlationID);
}
- public static void setJMSCorrelationID(Message message, final String correlationID)
- {
- if (correlationID == null)
- {
+ public static void setJMSCorrelationID(Message message, final String correlationID) {
+ if (correlationID == null) {
message.removeProperty(CORRELATIONID_HEADER_NAME);
}
- else
- {
+ else {
message.putStringProperty(CORRELATIONID_HEADER_NAME, new SimpleString(correlationID));
}
}
- public static String getJMSCorrelationID(Message message)
- {
- try
- {
+ public static String getJMSCorrelationID(Message message) {
+ try {
return message.getStringProperty(CORRELATIONID_HEADER_NAME);
}
- catch (ActiveMQPropertyConversionException e)
- {
+ catch (ActiveMQPropertyConversionException e) {
return null;
}
}
-
- public static SimpleString getJMSReplyTo(Message message)
- {
+ public static SimpleString getJMSReplyTo(Message message) {
return message.getSimpleStringProperty(REPLYTO_HEADER_NAME);
}
- public static void setJMSReplyTo(Message message, final SimpleString dest)
- {
+ public static void setJMSReplyTo(Message message, final SimpleString dest) {
- if (dest == null)
- {
+ if (dest == null) {
message.removeProperty(REPLYTO_HEADER_NAME);
}
- else
- {
+ else {
message.putStringProperty(REPLYTO_HEADER_NAME, dest);
}
}
-
-
- public static void clearProperties(Message message)
- {
+ public static void clearProperties(Message message) {
List<SimpleString> toRemove = new ArrayList<SimpleString>();
- for (SimpleString propName : message.getPropertyNames())
- {
+ for (SimpleString propName : message.getPropertyNames()) {
if (!propName.startsWith(JMS) || propName.startsWith(JMSX) ||
- propName.startsWith(JMS_))
- {
+ propName.startsWith(JMS_)) {
toRemove.add(propName);
}
}
- for (SimpleString propName : toRemove)
- {
+ for (SimpleString propName : toRemove) {
message.removeProperty(propName);
}
}
-
-
- public static Set<String> getPropertyNames(Message message)
- {
+ public static Set<String> getPropertyNames(Message message) {
HashSet<String> set = new HashSet<String>();
- for (SimpleString propName : message.getPropertyNames())
- {
+ for (SimpleString propName : message.getPropertyNames()) {
if ((!propName.startsWith(JMS) || propName.startsWith(JMSX) ||
- propName.startsWith(JMS_)) && !propName.startsWith(CONNECTION_ID_PROPERTY_NAME))
- {
+ propName.startsWith(JMS_)) && !propName.startsWith(CONNECTION_ID_PROPERTY_NAME)) {
set.add(propName.toString());
}
}
@@ -192,10 +154,8 @@ public class MessageUtil
return set;
}
- public static boolean propertyExists(Message message, String name)
- {
+ public static boolean propertyExists(Message message, String name) {
return message.containsProperty(new SimpleString(name)) || name.equals(MessageUtil.JMSXDELIVERYCOUNT) ||
- MessageUtil.JMSXGROUPID.equals(name) &&
- message.containsProperty(Message.HDR_GROUP_ID);
+ MessageUtil.JMSXGROUPID.equals(name) && message.containsProperty(Message.HDR_GROUP_ID);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/StreamMessageUtil.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/StreamMessageUtil.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/StreamMessageUtil.java
index fdb3db1..d59662f 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/StreamMessageUtil.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/StreamMessageUtil.java
@@ -21,8 +21,8 @@ import org.apache.activemq.artemis.api.core.Message;
import org.apache.activemq.artemis.api.core.Pair;
import org.apache.activemq.artemis.utils.DataConstants;
-public class StreamMessageUtil extends MessageUtil
-{
+public class StreamMessageUtil extends MessageUtil {
+
/**
* Method to read boolean values out of the Stream protocol existent on JMS Stream Messages
* Throws IllegalStateException if the type was invalid
@@ -30,13 +30,11 @@ public class StreamMessageUtil extends MessageUtil
* @param message
* @return
*/
- public static boolean streamReadBoolean(Message message)
- {
+ public static boolean streamReadBoolean(Message message) {
ActiveMQBuffer buff = getBodyBuffer(message);
byte type = buff.readByte();
- switch (type)
- {
+ switch (type) {
case DataConstants.BOOLEAN:
return buff.readBoolean();
case DataConstants.STRING:
@@ -48,15 +46,12 @@ public class StreamMessageUtil extends MessageUtil
}
- public static byte streamReadByte(Message message)
- {
+ public static byte streamReadByte(Message message) {
ActiveMQBuffer buff = getBodyBuffer(message);
int index = buff.readerIndex();
- try
- {
+ try {
byte type = buff.readByte();
- switch (type)
- {
+ switch (type) {
case DataConstants.BYTE:
return buff.readByte();
case DataConstants.STRING:
@@ -66,20 +61,17 @@ public class StreamMessageUtil extends MessageUtil
throw new IllegalStateException("Invalid conversion");
}
}
- catch (NumberFormatException e)
- {
+ catch (NumberFormatException e) {
buff.readerIndex(index);
throw e;
}
}
- public static short streamReadShort(Message message)
- {
+ public static short streamReadShort(Message message) {
ActiveMQBuffer buff = getBodyBuffer(message);
byte type = buff.readByte();
- switch (type)
- {
+ switch (type) {
case DataConstants.BYTE:
return buff.readByte();
case DataConstants.SHORT:
@@ -92,22 +84,18 @@ public class StreamMessageUtil extends MessageUtil
}
}
- public static char streamReadChar(Message message)
- {
+ public static char streamReadChar(Message message) {
ActiveMQBuffer buff = getBodyBuffer(message);
byte type = buff.readByte();
- switch (type)
- {
+ switch (type) {
case DataConstants.CHAR:
- return (char)buff.readShort();
+ return (char) buff.readShort();
case DataConstants.STRING:
String str = buff.readNullableString();
- if (str == null)
- {
+ if (str == null) {
throw new NullPointerException("Invalid conversion");
}
- else
- {
+ else {
throw new IllegalStateException("Invalid conversion");
}
default:
@@ -116,12 +104,10 @@ public class StreamMessageUtil extends MessageUtil
}
- public static int streamReadInteger(Message message)
- {
+ public static int streamReadInteger(Message message) {
ActiveMQBuffer buff = getBodyBuffer(message);
byte type = buff.readByte();
- switch (type)
- {
+ switch (type) {
case DataConstants.BYTE:
return buff.readByte();
case DataConstants.SHORT:
@@ -136,13 +122,10 @@ public class StreamMessageUtil extends MessageUtil
}
}
-
- public static long streamReadLong(Message message)
- {
+ public static long streamReadLong(Message message) {
ActiveMQBuffer buff = getBodyBuffer(message);
byte type = buff.readByte();
- switch (type)
- {
+ switch (type) {
case DataConstants.BYTE:
return buff.readByte();
case DataConstants.SHORT:
@@ -159,12 +142,10 @@ public class StreamMessageUtil extends MessageUtil
}
}
- public static float streamReadFloat(Message message)
- {
+ public static float streamReadFloat(Message message) {
ActiveMQBuffer buff = getBodyBuffer(message);
byte type = buff.readByte();
- switch (type)
- {
+ switch (type) {
case DataConstants.FLOAT:
return Float.intBitsToFloat(buff.readInt());
case DataConstants.STRING:
@@ -175,13 +156,10 @@ public class StreamMessageUtil extends MessageUtil
}
}
-
- public static double streamReadDouble(Message message)
- {
+ public static double streamReadDouble(Message message) {
ActiveMQBuffer buff = getBodyBuffer(message);
byte type = buff.readByte();
- switch (type)
- {
+ switch (type) {
case DataConstants.FLOAT:
return Float.intBitsToFloat(buff.readInt());
case DataConstants.DOUBLE:
@@ -194,13 +172,10 @@ public class StreamMessageUtil extends MessageUtil
}
}
-
- public static String streamReadString(Message message)
- {
+ public static String streamReadString(Message message) {
ActiveMQBuffer buff = getBodyBuffer(message);
byte type = buff.readByte();
- switch (type)
- {
+ switch (type) {
case DataConstants.BOOLEAN:
return String.valueOf(buff.readBoolean());
case DataConstants.BYTE:
@@ -208,7 +183,7 @@ public class StreamMessageUtil extends MessageUtil
case DataConstants.SHORT:
return String.valueOf(buff.readShort());
case DataConstants.CHAR:
- return String.valueOf((char)buff.readShort());
+ return String.valueOf((char) buff.readShort());
case DataConstants.INT:
return String.valueOf(buff.readInt());
case DataConstants.LONG:
@@ -227,23 +202,20 @@ public class StreamMessageUtil extends MessageUtil
/**
* Utility for reading bytes out of streaming.
* It will return remainingBytes, bytesRead
+ *
* @param remainingBytes remaining Bytes from previous read. Send it to 0 if it was the first call for the message
* @param message
* @return a pair of remaining bytes and bytes read
*/
- public static Pair<Integer, Integer> streamReadBytes(Message message, int remainingBytes, byte[] value)
- {
+ public static Pair<Integer, Integer> streamReadBytes(Message message, int remainingBytes, byte[] value) {
ActiveMQBuffer buff = getBodyBuffer(message);
- if (remainingBytes == -1)
- {
+ if (remainingBytes == -1) {
return new Pair<>(0, -1);
}
- else if (remainingBytes == 0)
- {
+ else if (remainingBytes == 0) {
byte type = buff.readByte();
- if (type != DataConstants.BYTES)
- {
+ if (type != DataConstants.BYTES) {
throw new IllegalStateException("Invalid conversion");
}
remainingBytes = buff.readInt();
@@ -251,21 +223,18 @@ public class StreamMessageUtil extends MessageUtil
int read = Math.min(value.length, remainingBytes);
buff.readBytes(value, 0, read);
remainingBytes -= read;
- if (remainingBytes == 0)
- {
+ if (remainingBytes == 0) {
remainingBytes = -1;
}
return new Pair<>(remainingBytes, read);
}
- public static Object streamReadObject(Message message)
- {
+ public static Object streamReadObject(Message message) {
ActiveMQBuffer buff = getBodyBuffer(message);
byte type = buff.readByte();
- switch (type)
- {
+ switch (type) {
case DataConstants.BOOLEAN:
return buff.readBoolean();
case DataConstants.BYTE:
@@ -273,7 +242,7 @@ public class StreamMessageUtil extends MessageUtil
case DataConstants.SHORT:
return buff.readShort();
case DataConstants.CHAR:
- return (char)buff.readShort();
+ return (char) buff.readShort();
case DataConstants.INT:
return buff.readInt();
case DataConstants.LONG:
@@ -295,5 +264,4 @@ public class StreamMessageUtil extends MessageUtil
}
-
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/TextMessageUtil.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/TextMessageUtil.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/TextMessageUtil.java
index 07abeb8..c7515fc 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/TextMessageUtil.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/TextMessageUtil.java
@@ -20,14 +20,12 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
import org.apache.activemq.artemis.api.core.Message;
import org.apache.activemq.artemis.api.core.SimpleString;
-public class TextMessageUtil extends MessageUtil
-{
+public class TextMessageUtil extends MessageUtil {
/**
* Utility method to set the Text message on a message body
*/
- public static void writeBodyText(Message message, SimpleString text)
- {
+ public static void writeBodyText(Message message, SimpleString text) {
ActiveMQBuffer buff = getBodyBuffer(message);
buff.clear();
buff.writeNullableSimpleString(text);
@@ -36,8 +34,7 @@ public class TextMessageUtil extends MessageUtil
/**
* Utility method to set the Text message on a message body
*/
- public static SimpleString readBodyText(Message message)
- {
+ public static SimpleString readBodyText(Message message) {
ActiveMQBuffer buff = getBodyBuffer(message);
buff.resetReaderIndex();
return buff.readNullableSimpleString();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/AbstractRemotingConnection.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/AbstractRemotingConnection.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/AbstractRemotingConnection.java
index 7f359b7..453a87c 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/AbstractRemotingConnection.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/AbstractRemotingConnection.java
@@ -30,8 +30,8 @@ import org.apache.activemq.artemis.core.remoting.CloseListener;
import org.apache.activemq.artemis.core.remoting.FailureListener;
import org.apache.activemq.artemis.spi.core.remoting.Connection;
-public abstract class AbstractRemotingConnection implements RemotingConnection
-{
+public abstract class AbstractRemotingConnection implements RemotingConnection {
+
protected final List<FailureListener> failureListeners = new CopyOnWriteArrayList<FailureListener>();
protected final List<CloseListener> closeListeners = new CopyOnWriteArrayList<CloseListener>();
protected final Connection transportConnection;
@@ -39,35 +39,28 @@ public abstract class AbstractRemotingConnection implements RemotingConnection
protected final long creationTime;
protected volatile boolean dataReceived;
- public AbstractRemotingConnection(final Connection transportConnection, final Executor executor)
- {
+ public AbstractRemotingConnection(final Connection transportConnection, final Executor executor) {
this.transportConnection = transportConnection;
this.executor = executor;
this.creationTime = System.currentTimeMillis();
}
- public List<FailureListener> getFailureListeners()
- {
+ public List<FailureListener> getFailureListeners() {
return new ArrayList<FailureListener>(failureListeners);
}
- protected void callFailureListeners(final ActiveMQException me, String scaleDownTargetNodeID)
- {
+ protected void callFailureListeners(final ActiveMQException me, String scaleDownTargetNodeID) {
final List<FailureListener> listenersClone = new ArrayList<FailureListener>(failureListeners);
- for (final FailureListener listener : listenersClone)
- {
- try
- {
+ for (final FailureListener listener : listenersClone) {
+ try {
listener.connectionFailed(me, false, scaleDownTargetNodeID);
}
- catch (ActiveMQInterruptedException interrupted)
- {
+ catch (ActiveMQInterruptedException interrupted) {
// this is an expected behaviour.. no warn or error here
ActiveMQClientLogger.LOGGER.debug("thread interrupted", interrupted);
}
- catch (final Throwable t)
- {
+ catch (final Throwable t) {
// Failure of one listener to execute shouldn't prevent others
// from
// executing
@@ -76,19 +69,14 @@ public abstract class AbstractRemotingConnection implements RemotingConnection
}
}
-
- protected void callClosingListeners()
- {
+ protected void callClosingListeners() {
final List<CloseListener> listenersClone = new ArrayList<CloseListener>(closeListeners);
- for (final CloseListener listener : listenersClone)
- {
- try
- {
+ for (final CloseListener listener : listenersClone) {
+ try {
listener.connectionClosed();
}
- catch (final Throwable t)
- {
+ catch (final Throwable t) {
// Failure of one listener to execute shouldn't prevent others
// from
// executing
@@ -97,64 +85,52 @@ public abstract class AbstractRemotingConnection implements RemotingConnection
}
}
- public void setFailureListeners(final List<FailureListener> listeners)
- {
+ public void setFailureListeners(final List<FailureListener> listeners) {
failureListeners.clear();
failureListeners.addAll(listeners);
}
- public Object getID()
- {
+ public Object getID() {
return transportConnection.getID();
}
- public String getRemoteAddress()
- {
+ public String getRemoteAddress() {
return transportConnection.getRemoteAddress();
}
- public void addFailureListener(final FailureListener listener)
- {
- if (listener == null)
- {
+ public void addFailureListener(final FailureListener listener) {
+ if (listener == null) {
throw ActiveMQClientMessageBundle.BUNDLE.failListenerCannotBeNull();
}
failureListeners.add(listener);
}
- public boolean removeFailureListener(final FailureListener listener)
- {
- if (listener == null)
- {
+ public boolean removeFailureListener(final FailureListener listener) {
+ if (listener == null) {
throw ActiveMQClientMessageBundle.BUNDLE.failListenerCannotBeNull();
}
return failureListeners.remove(listener);
}
- public void addCloseListener(final CloseListener listener)
- {
- if (listener == null)
- {
+ public void addCloseListener(final CloseListener listener) {
+ if (listener == null) {
throw ActiveMQClientMessageBundle.BUNDLE.closeListenerCannotBeNull();
}
closeListeners.add(listener);
}
- public boolean removeCloseListener(final CloseListener listener)
- {
- if (listener == null)
- {
+ public boolean removeCloseListener(final CloseListener listener) {
+ if (listener == null) {
throw ActiveMQClientMessageBundle.BUNDLE.closeListenerCannotBeNull();
}
return closeListeners.remove(listener);
}
- public List<CloseListener> removeCloseListeners()
- {
+ public List<CloseListener> removeCloseListeners() {
List<CloseListener> ret = new ArrayList<CloseListener>(closeListeners);
closeListeners.clear();
@@ -162,8 +138,7 @@ public abstract class AbstractRemotingConnection implements RemotingConnection
return ret;
}
- public List<FailureListener> removeFailureListeners()
- {
+ public List<FailureListener> removeFailureListeners() {
List<FailureListener> ret = getFailureListeners();
failureListeners.clear();
@@ -171,30 +146,25 @@ public abstract class AbstractRemotingConnection implements RemotingConnection
return ret;
}
- public void setCloseListeners(List<CloseListener> listeners)
- {
+ public void setCloseListeners(List<CloseListener> listeners) {
closeListeners.clear();
closeListeners.addAll(listeners);
}
- public ActiveMQBuffer createTransportBuffer(final int size)
- {
+ public ActiveMQBuffer createTransportBuffer(final int size) {
return transportConnection.createTransportBuffer(size);
}
- public Connection getTransportConnection()
- {
+ public Connection getTransportConnection() {
return transportConnection;
}
- public long getCreationTime()
- {
+ public long getCreationTime() {
return creationTime;
}
- public boolean checkDataReceived()
- {
+ public boolean checkDataReceived() {
boolean res = dataReceived;
dataReceived = false;
@@ -205,13 +175,11 @@ public abstract class AbstractRemotingConnection implements RemotingConnection
/*
* This can be called concurrently by more than one thread so needs to be locked
*/
- public void fail(final ActiveMQException me)
- {
+ public void fail(final ActiveMQException me) {
fail(me, null);
}
- public void bufferReceived(final Object connectionID, final ActiveMQBuffer buffer)
- {
+ public void bufferReceived(final Object connectionID, final ActiveMQBuffer buffer) {
dataReceived = true;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/ConnectionEntry.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/ConnectionEntry.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/ConnectionEntry.java
index 9004af0..96a96aa 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/ConnectionEntry.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/ConnectionEntry.java
@@ -18,9 +18,8 @@ package org.apache.activemq.artemis.spi.core.protocol;
import java.util.concurrent.Executor;
+public class ConnectionEntry {
-public class ConnectionEntry
-{
public final RemotingConnection connection;
public volatile long lastCheck;
@@ -29,13 +28,14 @@ public class ConnectionEntry
public final Executor connectionExecutor;
- public Object getID()
- {
+ public Object getID() {
return connection.getID();
}
- public ConnectionEntry(final RemotingConnection connection, final Executor connectionExecutor, final long lastCheck, final long ttl)
- {
+ public ConnectionEntry(final RemotingConnection connection,
+ final Executor connectionExecutor,
+ final long lastCheck,
+ final long ttl) {
this.connection = connection;
this.lastCheck = lastCheck;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/RemotingConnection.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/RemotingConnection.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/RemotingConnection.java
index 99cefa5..420314b 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/RemotingConnection.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/RemotingConnection.java
@@ -32,10 +32,11 @@ import org.apache.activemq.artemis.spi.core.remoting.Connection;
* Perhaps a better name for this class now would be ProtocolConnection as this
* represents the link with the used protocol
*/
-public interface RemotingConnection extends BufferHandler
-{
+public interface RemotingConnection extends BufferHandler {
+
/**
* Returns the unique id of the {@link RemotingConnection}.
+ *
* @return the id
*/
Object getID();
@@ -90,7 +91,6 @@ public interface RemotingConnection extends BufferHandler
void setCloseListeners(List<CloseListener> listeners);
-
/**
* return all the failure listeners
*
@@ -100,7 +100,6 @@ public interface RemotingConnection extends BufferHandler
List<FailureListener> removeFailureListeners();
-
/**
* set the failure listeners.
* <p>
@@ -129,7 +128,7 @@ public interface RemotingConnection extends BufferHandler
/**
* called when the underlying connection fails.
*
- * @param me the exception that caused the failure
+ * @param me the exception that caused the failure
* @param scaleDownTargetNodeID the ID of the node where scale down is targeted
*/
void fail(ActiveMQException me, String scaleDownTargetNodeID);
@@ -148,12 +147,14 @@ public interface RemotingConnection extends BufferHandler
/**
* Returns whether or not the {@link RemotingConnection} is a client
+ *
* @return true if client, false if a server
*/
boolean isClient();
/**
* Returns true if this {@link RemotingConnection} has been destroyed.
+ *
* @return true if destroyed, otherwise false
*/
boolean isDestroyed();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/AbstractConnector.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/AbstractConnector.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/AbstractConnector.java
index f20ad72..fbf86c9 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/AbstractConnector.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/AbstractConnector.java
@@ -21,12 +21,11 @@ import java.util.Map;
/**
* Abstract connector
*/
-public abstract class AbstractConnector implements Connector
-{
+public abstract class AbstractConnector implements Connector {
+
protected final Map<String, Object> configuration;
- protected AbstractConnector(Map<String, Object> configuration)
- {
+ protected AbstractConnector(Map<String, Object> configuration) {
this.configuration = configuration;
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/BufferDecoder.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/BufferDecoder.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/BufferDecoder.java
index 7bc01a5..b96c262 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/BufferDecoder.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/BufferDecoder.java
@@ -18,13 +18,14 @@ package org.apache.activemq.artemis.spi.core.remoting;
import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
-public interface BufferDecoder
-{
+public interface BufferDecoder {
+
/**
* called by the remoting system prior to {@link org.apache.activemq.artemis.spi.core.remoting.BufferHandler#bufferReceived(Object, ActiveMQBuffer)}.
* <p>
* The implementation should return true if there is enough data in the buffer to decode. otherwise false.
- * * @param buffer the buffer
+ * * @param buffer the buffer
+ *
* @return true id the buffer can be decoded..
*/
int isReadyToHandle(ActiveMQBuffer buffer);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/BufferHandler.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/BufferHandler.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/BufferHandler.java
index c728350..5f390a1 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/BufferHandler.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/BufferHandler.java
@@ -23,8 +23,8 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
* <p>
* The Buffer Handler will decode the buffer and take the appropriate action, typically forwarding to the correct channel.
*/
-public interface BufferHandler
-{
+public interface BufferHandler {
+
/**
* called by the remoting connection when a buffer is received.
*
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ClientProtocolManager.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ClientProtocolManager.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ClientProtocolManager.java
index c10e325..a3f83dc 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ClientProtocolManager.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ClientProtocolManager.java
@@ -25,12 +25,16 @@ import org.apache.activemq.artemis.api.core.Interceptor;
import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
-public interface ClientProtocolManager
-{
+public interface ClientProtocolManager {
/// Life Cycle Methods:
- RemotingConnection connect(Connection transportConnection, long callTimeout, long callFailoverTimeout, List<Interceptor> incomingInterceptors, List<Interceptor> outgoingInterceptors, TopologyResponseHandler topologyResponseHandler);
+ RemotingConnection connect(Connection transportConnection,
+ long callTimeout,
+ long callFailoverTimeout,
+ List<Interceptor> incomingInterceptors,
+ List<Interceptor> outgoingInterceptors,
+ TopologyResponseHandler topologyResponseHandler);
RemotingConnection getCurrentConnection();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ClientProtocolManagerFactory.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ClientProtocolManagerFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ClientProtocolManagerFactory.java
index 16adbd2..c9c78a5 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ClientProtocolManagerFactory.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ClientProtocolManagerFactory.java
@@ -16,8 +16,7 @@
*/
package org.apache.activemq.artemis.spi.core.remoting;
-public interface ClientProtocolManagerFactory
-{
+public interface ClientProtocolManagerFactory {
ClientProtocolManager newProtocolManager();
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/Connection.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/Connection.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/Connection.java
index d637f8b..76e5a3d 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/Connection.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/Connection.java
@@ -25,8 +25,8 @@ import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
/**
* The connection used by a channel to write data to.
*/
-public interface Connection
-{
+public interface Connection {
+
/**
* Create a new ActiveMQBuffer of the given size.
*
@@ -35,7 +35,6 @@ public interface Connection
*/
ActiveMQBuffer createTransportBuffer(int size);
-
RemotingConnection getProtocolConnection();
void setProtocolConnection(RemotingConnection connection);
@@ -50,8 +49,8 @@ public interface Connection
/**
* writes the buffer to the connection and if flush is true returns only when the buffer has been physically written to the connection.
*
- * @param buffer the buffer to write
- * @param flush whether to flush the buffers onto the wire
+ * @param buffer the buffer to write
+ * @param flush whether to flush the buffers onto the wire
* @param batched whether the packet is allowed to batched for better performance
*/
void write(ActiveMQBuffer buffer, boolean flush, boolean batched);
@@ -59,8 +58,8 @@ public interface Connection
/**
* writes the buffer to the connection and if flush is true returns only when the buffer has been physically written to the connection.
*
- * @param buffer the buffer to write
- * @param flush whether to flush the buffers onto the wire
+ * @param buffer the buffer to write
+ * @param flush whether to flush the buffers onto the wire
* @param batched whether the packet is allowed to batched for better performance
*/
void write(ActiveMQBuffer buffer, boolean flush, boolean batched, ChannelFutureListener futureListener);
@@ -72,7 +71,6 @@ public interface Connection
*/
void write(ActiveMQBuffer buffer);
-
/**
* This should close the internal channel without calling any listeners.
* This is to avoid a situation where the broker is busy writing on an internal thread.
@@ -87,6 +85,7 @@ public interface Connection
/**
* Returns a string representation of the remote address this connection is connected to.
+ *
* @return the remote address
*/
String getRemoteAddress();
@@ -103,6 +102,7 @@ public interface Connection
/**
* Generates a {@link TransportConfiguration} to be used to connect to the same target this is
* connected to.
+ *
* @return TransportConfiguration
*/
TransportConfiguration getConnectorConfig();
@@ -112,6 +112,7 @@ public interface Connection
/**
* the InVM Connection has some special handling as it doesn't use Netty ProtocolChannel
* we will use this method Instead of using instanceof
+ *
* @return
*/
boolean isUsingProtocolHandling();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ConnectionLifeCycleListener.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ConnectionLifeCycleListener.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ConnectionLifeCycleListener.java
index d81bbc6..b5d7d97 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ConnectionLifeCycleListener.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ConnectionLifeCycleListener.java
@@ -22,8 +22,8 @@ import org.apache.activemq.artemis.core.server.ActiveMQComponent;
/**
* A ConnectionLifeCycleListener is called by the remoting implementation to notify of connection events.
*/
-public interface ConnectionLifeCycleListener
-{
+public interface ConnectionLifeCycleListener {
+
/**
* This method is used both by client connector creation and server connection creation through
* acceptors. On the client side the {@code component} parameter is normally passed as
@@ -34,23 +34,25 @@ public interface ConnectionLifeCycleListener
* activemq-server and activemq-client packages while avoiding to pull too much into activemq-core.
* The pivotal point keeping us from removing the method is {@link ConnectorFactory} and the
* usage of it.
- * @param component This will probably be an {@code Acceptor} and only used on the server side.
+ *
+ * @param component This will probably be an {@code Acceptor} and only used on the server side.
* @param connection the connection that has been created
- * @param protocol the messaging protocol type this connection uses
+ * @param protocol the messaging protocol type this connection uses
*/
void connectionCreated(ActiveMQComponent component, Connection connection, String protocol);
/**
* Called when a connection is destroyed.
+ *
* @param connectionID the connection being destroyed.
*/
void connectionDestroyed(Object connectionID);
-
/**
* Called when an error occurs on the connection.
+ *
* @param connectionID the id of the connection.
- * @param me the exception.
+ * @param me the exception.
*/
void connectionException(Object connectionID, ActiveMQException me);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/Connector.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/Connector.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/Connector.java
index 05d5158..0f17469 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/Connector.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/Connector.java
@@ -21,8 +21,8 @@ import java.util.Map;
/**
* A Connector is used by the client for creating and controlling a connection.
*/
-public interface Connector
-{
+public interface Connector {
+
/**
* starts the connector
*/
@@ -54,6 +54,7 @@ public interface Connector
* If the configuration is equivalent to this connector, which means
* if the parameter configuration is used to create a connection to a target
* node, it will be the same node as of the connections made with this connector.
+ *
* @param configuration
* @return true means the configuration is equivalent to the connector. false otherwise.
*/
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ConnectorFactory.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ConnectorFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ConnectorFactory.java
index a1ad5f9..3d7c7b3 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ConnectorFactory.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ConnectorFactory.java
@@ -27,8 +27,8 @@ import org.apache.activemq.artemis.api.core.TransportConfigurationHelper;
* <p>
* A Connector is used to connect to an org.apache.activemq.artemis.spi.core.remoting.Acceptor.
*/
-public interface ConnectorFactory extends TransportConfigurationHelper
-{
+public interface ConnectorFactory extends TransportConfigurationHelper {
+
/**
* creates a new instance of a connector.
*
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ConsumerContext.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ConsumerContext.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ConsumerContext.java
index 560636f..f2c70cf 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ConsumerContext.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ConsumerContext.java
@@ -16,6 +16,6 @@
*/
package org.apache.activemq.artemis.spi.core.remoting;
-public abstract class ConsumerContext
-{
+public abstract class ConsumerContext {
+
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ReadyListener.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ReadyListener.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ReadyListener.java
index aa0a124..b846a1a 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ReadyListener.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ReadyListener.java
@@ -16,8 +16,8 @@
*/
package org.apache.activemq.artemis.spi.core.remoting;
-public interface ReadyListener
-{
+public interface ReadyListener {
+
void readyForWriting(boolean ready);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/SessionContext.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/SessionContext.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/SessionContext.java
index 2bbbece..3f1cc14 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/SessionContext.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/SessionContext.java
@@ -37,8 +37,8 @@ import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
import org.apache.activemq.artemis.utils.IDGenerator;
import org.apache.activemq.artemis.utils.SimpleIDGenerator;
-public abstract class SessionContext
-{
+public abstract class SessionContext {
+
protected ClientSessionInternal session;
protected SendAcknowledgementHandler sendAckHandler;
@@ -47,20 +47,15 @@ public abstract class SessionContext
protected final IDGenerator idGenerator = new SimpleIDGenerator(0);
-
- public SessionContext(RemotingConnection remotingConnection)
- {
+ public SessionContext(RemotingConnection remotingConnection) {
this.remotingConnection = remotingConnection;
}
-
- public ClientSessionInternal getSession()
- {
+ public ClientSessionInternal getSession() {
return session;
}
- public void setSession(ClientSessionInternal session)
- {
+ public void setSession(ClientSessionInternal session) {
this.session = session;
}
@@ -73,61 +68,55 @@ public abstract class SessionContext
*/
public abstract boolean reattachOnNewConnection(RemotingConnection newConnection) throws ActiveMQException;
- public RemotingConnection getRemotingConnection()
- {
+ public RemotingConnection getRemotingConnection() {
return remotingConnection;
}
-
public abstract void closeConsumer(ClientConsumer consumer) throws ActiveMQException;
public abstract void sendConsumerCredits(ClientConsumer consumer, int credits);
public abstract boolean supportsLargeMessage();
- protected void handleReceiveLargeMessage(ConsumerContext consumerID, ClientLargeMessageInternal clientLargeMessage, long largeMessageSize) throws Exception
- {
+ protected void handleReceiveLargeMessage(ConsumerContext consumerID,
+ ClientLargeMessageInternal clientLargeMessage,
+ long largeMessageSize) throws Exception {
ClientSessionInternal session = this.session;
- if (session != null)
- {
+ if (session != null) {
session.handleReceiveLargeMessage(consumerID, clientLargeMessage, largeMessageSize);
}
}
- protected void handleReceiveMessage(ConsumerContext consumerID, final ClientMessageInternal message) throws Exception
- {
+ protected void handleReceiveMessage(ConsumerContext consumerID,
+ final ClientMessageInternal message) throws Exception {
ClientSessionInternal session = this.session;
- if (session != null)
- {
+ if (session != null) {
session.handleReceiveMessage(consumerID, message);
}
}
- protected void handleReceiveContinuation(final ConsumerContext consumerID, byte[] chunk, int flowControlSize, boolean isContinues) throws Exception
- {
+ protected void handleReceiveContinuation(final ConsumerContext consumerID,
+ byte[] chunk,
+ int flowControlSize,
+ boolean isContinues) throws Exception {
ClientSessionInternal session = this.session;
- if (session != null)
- {
+ if (session != null) {
session.handleReceiveContinuation(consumerID, chunk, flowControlSize, isContinues);
}
}
- protected void handleReceiveProducerCredits(SimpleString address, int credits)
- {
+ protected void handleReceiveProducerCredits(SimpleString address, int credits) {
ClientSessionInternal session = this.session;
- if (session != null)
- {
+ if (session != null) {
session.handleReceiveProducerCredits(address, credits);
}
}
- protected void handleReceiveProducerFailCredits(SimpleString address, int credits)
- {
+ protected void handleReceiveProducerFailCredits(SimpleString address, int credits) {
ClientSessionInternal session = this.session;
- if (session != null)
- {
+ if (session != null) {
session.handleReceiveProducerFailCredits(address, credits);
}
@@ -135,7 +124,10 @@ public abstract class SessionContext
public abstract int getCreditsOnSendingFull(MessageInternal msgI);
- public abstract void sendFullMessage(MessageInternal msgI, boolean sendBlocking, SendAcknowledgementHandler handler, SimpleString defaultAddress) throws ActiveMQException;
+ public abstract void sendFullMessage(MessageInternal msgI,
+ boolean sendBlocking,
+ SendAcknowledgementHandler handler,
+ SimpleString defaultAddress) throws ActiveMQException;
/**
* it should return the number of credits (or bytes) used to send this packet
@@ -146,9 +138,12 @@ public abstract class SessionContext
*/
public abstract int sendInitialChunkOnLargeMessage(MessageInternal msgI) throws ActiveMQException;
-
- public abstract int sendLargeMessageChunk(MessageInternal msgI, long messageBodySize, boolean sendBlocking, boolean lastChunk, byte[] chunk, SendAcknowledgementHandler messageHandler) throws ActiveMQException;
-
+ public abstract int sendLargeMessageChunk(MessageInternal msgI,
+ long messageBodySize,
+ boolean sendBlocking,
+ boolean lastChunk,
+ byte[] chunk,
+ SendAcknowledgementHandler messageHandler) throws ActiveMQException;
public abstract void setSendAcknowledgementHandler(final SendAcknowledgementHandler handler);
@@ -159,7 +154,11 @@ public abstract class SessionContext
public abstract void deleteQueue(SimpleString queueName) throws ActiveMQException;
- public abstract void createQueue(SimpleString address, SimpleString queueName, SimpleString filterString, boolean durable, boolean temp) throws ActiveMQException;
+ public abstract void createQueue(SimpleString address,
+ SimpleString queueName,
+ SimpleString filterString,
+ boolean durable,
+ boolean temp) throws ActiveMQException;
public abstract ClientSession.QueueQuery queueQuery(SimpleString queueName) throws ActiveMQException;
@@ -169,7 +168,6 @@ public abstract class SessionContext
public abstract void simpleCommit() throws ActiveMQException;
-
/**
* If we are doing a simple rollback on the RA, we need to ack the last message sent to the consumer,
* otherwise DLQ won't work.
@@ -185,7 +183,10 @@ public abstract class SessionContext
public abstract void sessionStop() throws ActiveMQException;
- public abstract void sendACK(boolean individual, boolean block, final ClientConsumer consumer, final Message message) throws ActiveMQException;
+ public abstract void sendACK(boolean individual,
+ boolean block,
+ final ClientConsumer consumer,
+ final Message message) throws ActiveMQException;
public abstract void expireMessage(final ClientConsumer consumer, Message message) throws ActiveMQException;
@@ -213,8 +214,14 @@ public abstract class SessionContext
public abstract boolean configureTransactionTimeout(int seconds) throws ActiveMQException;
- public abstract ClientConsumerInternal createConsumer(SimpleString queueName, SimpleString filterString, int windowSize, int maxRate, int ackBatchSize, boolean browseOnly,
- Executor executor, Executor flowControlExecutor) throws ActiveMQException;
+ public abstract ClientConsumerInternal createConsumer(SimpleString queueName,
+ SimpleString filterString,
+ int windowSize,
+ int maxRate,
+ int ackBatchSize,
+ boolean browseOnly,
+ Executor executor,
+ Executor flowControlExecutor) throws ActiveMQException;
/**
* Performs a round trip to the server requesting what is the current tx timeout on the session
@@ -234,7 +241,6 @@ public abstract class SessionContext
final boolean preAcknowledge,
final SimpleString defaultAddress) throws ActiveMQException;
-
public abstract void recreateConsumerOnServer(ClientConsumerInternal consumerInternal) throws ActiveMQException;
public abstract void xaFailed(Xid xid) throws ActiveMQException;
@@ -243,7 +249,6 @@ public abstract class SessionContext
public abstract void resetMetadata(HashMap<String, String> metaDataToSend);
-
// Failover utility classes
/**
@@ -257,11 +262,9 @@ public abstract class SessionContext
*/
public abstract void lockCommunications();
-
public abstract void releaseCommunications();
public abstract void cleanup();
-
public abstract void linkFlowControl(SimpleString address, ClientProducerCreditsImpl clientProducerCredits);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/TopologyResponseHandler.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/TopologyResponseHandler.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/TopologyResponseHandler.java
index 18de8eb..eda05ee 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/TopologyResponseHandler.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/TopologyResponseHandler.java
@@ -20,8 +20,8 @@ import org.apache.activemq.artemis.api.core.Pair;
import org.apache.activemq.artemis.api.core.TransportConfiguration;
import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
-public interface TopologyResponseHandler
-{
+public interface TopologyResponseHandler {
+
// This is sent when the server is telling the client the node is being disconnected
void nodeDisconnected(RemotingConnection conn, String nodeID, String scaleDownTargetNodeID);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/AbstractServerLocatorSchema.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/AbstractServerLocatorSchema.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/AbstractServerLocatorSchema.java
index 2d23fd8..3fe97bb 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/AbstractServerLocatorSchema.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/AbstractServerLocatorSchema.java
@@ -22,11 +22,9 @@ import org.apache.activemq.artemis.utils.uri.URISchema;
import java.net.URI;
import java.util.Map;
-public abstract class AbstractServerLocatorSchema extends URISchema<ServerLocator, String>
-{
+public abstract class AbstractServerLocatorSchema extends URISchema<ServerLocator, String> {
- protected ConnectionOptions newConnectionOptions(URI uri, Map<String, String> query) throws Exception
- {
+ protected ConnectionOptions newConnectionOptions(URI uri, Map<String, String> query) throws Exception {
return setData(uri, new ConnectionOptions(), query);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/AbstractTransportConfigurationSchema.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/AbstractTransportConfigurationSchema.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/AbstractTransportConfigurationSchema.java
index 702e6e4..b76fa7f 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/AbstractTransportConfigurationSchema.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/AbstractTransportConfigurationSchema.java
@@ -21,6 +21,6 @@ import org.apache.activemq.artemis.utils.uri.URISchema;
import java.util.List;
-public abstract class AbstractTransportConfigurationSchema extends URISchema<List<TransportConfiguration>, String>
-{
+public abstract class AbstractTransportConfigurationSchema extends URISchema<List<TransportConfiguration>, String> {
+
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/ConnectionOptions.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/ConnectionOptions.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/ConnectionOptions.java
index 2f50b48..f08bfd7 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/ConnectionOptions.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/ConnectionOptions.java
@@ -16,13 +16,13 @@
*/
package org.apache.activemq.artemis.uri;
+
/**
* This will represent all the possible options you could setup on URLs
* When parsing the URL this will serve as an intermediate object
* And it could also be a pl
*/
-public class ConnectionOptions
-{
+public class ConnectionOptions {
private boolean ha;
@@ -30,53 +30,45 @@ public class ConnectionOptions
private int port;
- public ConnectionOptions setHost(String host)
- {
+ public ConnectionOptions setHost(String host) {
this.host = host;
return this;
}
- public String getHost()
- {
+ public String getHost() {
return host;
}
-
- public ConnectionOptions setPort(int port)
- {
+ public ConnectionOptions setPort(int port) {
this.port = port;
return this;
}
- public int getPort()
- {
+ public int getPort() {
return port;
}
- public boolean isHa()
- {
+ public boolean isHa() {
return ha;
}
- public void setHa(boolean ha)
- {
+ public void setHa(boolean ha) {
this.ha = ha;
}
- /** Se need both options (ha / HA in case of typos on the URI) */
- public boolean isHA()
- {
+ /**
+ * Se need both options (ha / HA in case of typos on the URI)
+ */
+ public boolean isHA() {
return ha;
}
- public void setHA(boolean ha)
- {
+ public void setHA(boolean ha) {
this.ha = ha;
}
@Override
- public String toString()
- {
+ public String toString() {
return "ConnectionOptions{" +
"ha=" + ha +
'}';
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/ConnectorTransportConfigurationParser.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/ConnectorTransportConfigurationParser.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/ConnectorTransportConfigurationParser.java
index 18b6a1e..650a3b8 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/ConnectorTransportConfigurationParser.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/ConnectorTransportConfigurationParser.java
@@ -22,10 +22,9 @@ import org.apache.activemq.artemis.utils.uri.URIFactory;
import java.util.List;
-public class ConnectorTransportConfigurationParser extends URIFactory<List<TransportConfiguration>, String>
-{
- public ConnectorTransportConfigurationParser()
- {
+public class ConnectorTransportConfigurationParser extends URIFactory<List<TransportConfiguration>, String> {
+
+ public ConnectorTransportConfigurationParser() {
registerSchema(new TCPTransportConfigurationSchema(TransportConstants.ALLOWABLE_CONNECTOR_KEYS));
registerSchema(new InVMTransportConfigurationSchema());
}