http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java ---------------------------------------------------------------------- diff --git a/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java b/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java index e87c19e..f2ee36f 100644 --- a/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java +++ b/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java @@ -88,6 +88,7 @@ public class Artemis { // Sort the list by file name.. Collections.sort(files, new Comparator<File>() { + @Override public int compare(File file, File file1) { return file.getName().compareTo(file1.getName()); }
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/ActionAbstract.java ---------------------------------------------------------------------- diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/ActionAbstract.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/ActionAbstract.java index 406da24..43b1b3e 100644 --- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/ActionAbstract.java +++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/ActionAbstract.java @@ -47,6 +47,7 @@ public abstract class ActionAbstract implements Action { } } + @Override public String getBrokerInstance() { if (brokerInstance == null) { /* We use File URI for locating files. The ARTEMIS_HOME variable is used to determine file paths. For Windows @@ -61,6 +62,7 @@ public abstract class ActionAbstract implements Action { return brokerInstance; } + @Override public String getBrokerHome() { if (brokerHome == null) { /* We use File URI for locating files. The ARTEMIS_HOME variable is used to determine file paths. For Windows @@ -80,6 +82,7 @@ public abstract class ActionAbstract implements Action { return brokerHome; } + @Override public Object execute(ActionContext context) throws Exception { this.context = context; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java ---------------------------------------------------------------------- diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java index dae32b7..cd7eb5d 100644 --- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java +++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java @@ -635,6 +635,7 @@ public class Create extends InputAbstract { File dir = new File(path(getHome().toString(), false) + "/lib"); File[] matches = dir.listFiles(new FilenameFilter() { + @Override public boolean accept(File dir, String name) { return name.startsWith("jboss-logmanager") && name.endsWith(".jar"); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Run.java ---------------------------------------------------------------------- diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Run.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Run.java index ca13356..c2db6f8 100644 --- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Run.java +++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Run.java @@ -160,6 +160,7 @@ public class Run extends Configurable { }, 500, 500); Runtime.getRuntime().addShutdownHook(new Thread() { + @Override public void run() { try { server.stop(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/DecodeJournal.java ---------------------------------------------------------------------- diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/DecodeJournal.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/DecodeJournal.java index bc1179d..88c761f 100644 --- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/DecodeJournal.java +++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/DecodeJournal.java @@ -54,6 +54,7 @@ public class DecodeJournal extends LockAbstract { @Option(name = "--input", description = "The input file name (default=exp.dmp)", required = true) public String input = "exp.dmp"; + @Override public Object execute(ActionContext context) throws Exception { super.execute(context); try { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/EncodeJournal.java ---------------------------------------------------------------------- diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/EncodeJournal.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/EncodeJournal.java index 4320082..38e599b 100644 --- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/EncodeJournal.java +++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/EncodeJournal.java @@ -48,6 +48,7 @@ public class EncodeJournal extends LockAbstract { @Option(name = "--file-size", description = "The journal size (default 10485760)") public int size = 10485760; + @Override public Object execute(ActionContext context) throws Exception { super.execute(context); try { @@ -122,18 +123,22 @@ public class EncodeJournal extends LockAbstract { final JournalFile file) throws Exception { JournalImpl.readJournalFile(fileFactory, file, new JournalReaderCallback() { + @Override public void onReadUpdateRecordTX(final long transactionID, final RecordInfo recordInfo) throws Exception { out.println("operation@UpdateTX,txID@" + transactionID + "," + describeRecord(recordInfo)); } + @Override public void onReadUpdateRecord(final RecordInfo recordInfo) throws Exception { out.println("operation@Update," + describeRecord(recordInfo)); } + @Override public void onReadRollbackRecord(final long transactionID) throws Exception { out.println("operation@Rollback,txID@" + transactionID); } + @Override public void onReadPrepareRecord(final long transactionID, final byte[] extraData, final int numberOfRecords) throws Exception { @@ -144,28 +149,34 @@ public class EncodeJournal extends LockAbstract { encode(extraData)); } + @Override public void onReadDeleteRecordTX(final long transactionID, final RecordInfo recordInfo) throws Exception { out.println("operation@DeleteRecordTX,txID@" + transactionID + "," + describeRecord(recordInfo)); } + @Override public void onReadDeleteRecord(final long recordID) throws Exception { out.println("operation@DeleteRecord,id@" + recordID); } + @Override public void onReadCommitRecord(final long transactionID, final int numberOfRecords) throws Exception { out.println("operation@Commit,txID@" + transactionID + ",numberOfRecords@" + numberOfRecords); } + @Override public void onReadAddRecordTX(final long transactionID, final RecordInfo recordInfo) throws Exception { out.println("operation@AddRecordTX,txID@" + transactionID + "," + describeRecord(recordInfo)); } + @Override public void onReadAddRecord(final RecordInfo recordInfo) throws Exception { out.println("operation@AddRecord," + describeRecord(recordInfo)); } + @Override public void markAsDataFile(final JournalFile file) { } }); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/util/ProducerThread.java ---------------------------------------------------------------------- diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/util/ProducerThread.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/util/ProducerThread.java index 427443f..7801e33 100644 --- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/util/ProducerThread.java +++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/util/ProducerThread.java @@ -64,6 +64,7 @@ public class ProducerThread extends Thread { this.session = session; } + @Override public void run() { MessageProducer producer = null; String threadName = Thread.currentThread().getName(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/process/ProcessBuilder.java ---------------------------------------------------------------------- diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/process/ProcessBuilder.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/process/ProcessBuilder.java index bbfb82f..86c66af 100644 --- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/process/ProcessBuilder.java +++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/process/ProcessBuilder.java @@ -30,6 +30,7 @@ public class ProcessBuilder { static { Runtime.getRuntime().addShutdownHook(new Thread() { + @Override public void run() { for (Process p : processes) { // if (p.isAlive()) http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/FileBroker.java ---------------------------------------------------------------------- diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/FileBroker.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/FileBroker.java index b66f6aa..04f658f 100644 --- a/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/FileBroker.java +++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/FileBroker.java @@ -43,6 +43,7 @@ public class FileBroker implements Broker { this.configurationUrl = broker.configuration; } + @Override public synchronized void start() throws Exception { if (started) { return; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-cli/src/main/java/org/apache/activemq/artemis/util/ServerUtil.java ---------------------------------------------------------------------- diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/util/ServerUtil.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/util/ServerUtil.java index 68916c3..bcd440f 100644 --- a/artemis-cli/src/main/java/org/apache/activemq/artemis/util/ServerUtil.java +++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/util/ServerUtil.java @@ -54,6 +54,7 @@ public class ServerUtil { final Process process = builder.start(); Runtime.getRuntime().addShutdownHook(new Thread() { + @Override public void run() { process.destroy(); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffer.java ---------------------------------------------------------------------- diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffer.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffer.java index da78fb7..c129e3a 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffer.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffer.java @@ -634,6 +634,7 @@ public interface ActiveMQBuffer extends DataInput { * @return a byte at the current {@code readerIndex} * @throws IndexOutOfBoundsException if {@code this.readableBytes} is less than {@code 1} */ + @Override byte readByte(); /** @@ -643,6 +644,7 @@ public interface ActiveMQBuffer extends DataInput { * @return an unsigned byte at the current {@code readerIndex} * @throws IndexOutOfBoundsException if {@code this.readableBytes} is less than {@code 1} */ + @Override int readUnsignedByte(); /** @@ -652,6 +654,7 @@ public interface ActiveMQBuffer extends DataInput { * @return a 16-bit short integer at the current {@code readerIndex} * @throws IndexOutOfBoundsException if {@code this.readableBytes} is less than {@code 2} */ + @Override short readShort(); /** @@ -661,6 +664,7 @@ public interface ActiveMQBuffer extends DataInput { * @return an unsigned 16-bit short integer at the current {@code readerIndex} * @throws IndexOutOfBoundsException if {@code this.readableBytes} is less than {@code 2} */ + @Override int readUnsignedShort(); /** @@ -670,6 +674,7 @@ public interface ActiveMQBuffer extends DataInput { * @return a 32-bit integer at the current {@code readerIndex} * @throws IndexOutOfBoundsException if {@code this.readableBytes} is less than {@code 4} */ + @Override int readInt(); /** @@ -688,6 +693,7 @@ public interface ActiveMQBuffer extends DataInput { * @return a 64-bit integer at the current {@code readerIndex} * @throws IndexOutOfBoundsException if {@code this.readableBytes} is less than {@code 8} */ + @Override long readLong(); /** @@ -697,6 +703,7 @@ public interface ActiveMQBuffer extends DataInput { * @return a char at the current {@code readerIndex} * @throws IndexOutOfBoundsException if {@code this.readableBytes} is less than {@code 2} */ + @Override char readChar(); /** @@ -706,6 +713,7 @@ public interface ActiveMQBuffer extends DataInput { * @return a float at the current {@code readerIndex} * @throws IndexOutOfBoundsException if {@code this.readableBytes} is less than {@code 4} */ + @Override float readFloat(); /** @@ -715,6 +723,7 @@ public interface ActiveMQBuffer extends DataInput { * @return a double at the current {@code readerIndex} * @throws IndexOutOfBoundsException if {@code this.readableBytes} is less than {@code 8} */ + @Override double readDouble(); /** @@ -724,6 +733,7 @@ public interface ActiveMQBuffer extends DataInput { * @return a boolean at the current {@code readerIndex} * @throws IndexOutOfBoundsException if {@code this.readableBytes} is less than {@code 1} */ + @Override boolean readBoolean(); /** @@ -759,6 +769,7 @@ public interface ActiveMQBuffer extends DataInput { * * @return a UTF-8 String at the current {@code readerIndex} */ + @Override String readUTF(); /** @@ -875,6 +886,7 @@ public interface ActiveMQBuffer extends DataInput { * @param length The number of bytes to skip * @throws IndexOutOfBoundsException if {@code length} is greater than {@code this.readableBytes} */ + @Override int skipBytes(int length); /** http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java ---------------------------------------------------------------------- diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java index d50e46d..b9f8861 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java @@ -101,10 +101,12 @@ public final class SimpleString implements CharSequence, Serializable, Comparabl // CharSequence implementation // --------------------------------------------------------------------------- + @Override public int length() { return data.length >> 1; } + @Override public char charAt(int pos) { if (pos < 0 || pos >= data.length >> 1) { throw new IndexOutOfBoundsException(); @@ -114,6 +116,7 @@ public final class SimpleString implements CharSequence, Serializable, Comparabl return (char) ((data[pos] & 0xFF) | (data[pos + 1] << 8) & 0xFF00); } + @Override public CharSequence subSequence(final int start, final int end) { int len = data.length >> 1; @@ -132,6 +135,7 @@ public final class SimpleString implements CharSequence, Serializable, Comparabl // Comparable implementation ------------------------------------- + @Override public int compareTo(final SimpleString o) { return toString().compareTo(o.toString()); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-commons/src/main/java/org/apache/activemq/artemis/core/buffers/impl/ChannelBufferWrapper.java ---------------------------------------------------------------------- diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/core/buffers/impl/ChannelBufferWrapper.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/core/buffers/impl/ChannelBufferWrapper.java index 1c830c6..5c0cbdd 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/core/buffers/impl/ChannelBufferWrapper.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/core/buffers/impl/ChannelBufferWrapper.java @@ -56,10 +56,12 @@ public class ChannelBufferWrapper implements ActiveMQBuffer { this.releasable = releasable; } + @Override public boolean readBoolean() { return readByte() != 0; } + @Override public SimpleString readNullableSimpleString() { int b = buffer.readByte(); if (b == DataConstants.NULL) { @@ -68,6 +70,7 @@ public class ChannelBufferWrapper implements ActiveMQBuffer { return readSimpleStringInternal(); } + @Override public String readNullableString() { int b = buffer.readByte(); if (b == DataConstants.NULL) { @@ -76,6 +79,7 @@ public class ChannelBufferWrapper implements ActiveMQBuffer { return readStringInternal(); } + @Override public SimpleString readSimpleString() { return readSimpleStringInternal(); } @@ -87,6 +91,7 @@ public class ChannelBufferWrapper implements ActiveMQBuffer { return new SimpleString(data); } + @Override public String readString() { return readStringInternal(); } @@ -109,14 +114,17 @@ public class ChannelBufferWrapper implements ActiveMQBuffer { } } + @Override public String readUTF() { return UTF8Util.readUTF(this); } + @Override public void writeBoolean(final boolean val) { buffer.writeByte((byte) (val ? -1 : 0)); } + @Override public void writeNullableSimpleString(final SimpleString val) { if (val == null) { buffer.writeByte(DataConstants.NULL); @@ -127,6 +135,7 @@ public class ChannelBufferWrapper implements ActiveMQBuffer { } } + @Override public void writeNullableString(final String val) { if (val == null) { buffer.writeByte(DataConstants.NULL); @@ -137,6 +146,7 @@ public class ChannelBufferWrapper implements ActiveMQBuffer { } } + @Override public void writeSimpleString(final SimpleString val) { writeSimpleStringInternal(val); } @@ -147,6 +157,7 @@ public class ChannelBufferWrapper implements ActiveMQBuffer { buffer.writeBytes(data); } + @Override public void writeString(final String val) { writeStringInternal(val); } @@ -172,343 +183,428 @@ public class ChannelBufferWrapper implements ActiveMQBuffer { } } + @Override public void writeUTF(final String utf) { UTF8Util.saveUTF(this, utf); } + @Override public int capacity() { return buffer.capacity(); } + @Override public ByteBuf byteBuf() { return buffer; } + @Override public void clear() { buffer.clear(); } + @Override public ActiveMQBuffer copy() { return new ChannelBufferWrapper(buffer.copy(), releasable); } + @Override public ActiveMQBuffer copy(final int index, final int length) { return new ChannelBufferWrapper(buffer.copy(index, length), releasable); } + @Override public void discardReadBytes() { buffer.discardReadBytes(); } + @Override public ActiveMQBuffer duplicate() { return new ChannelBufferWrapper(buffer.duplicate(), releasable); } + @Override public byte getByte(final int index) { return buffer.getByte(index); } + @Override public void getBytes(final int index, final byte[] dst, final int dstIndex, final int length) { buffer.getBytes(index, dst, dstIndex, length); } + @Override public void getBytes(final int index, final byte[] dst) { buffer.getBytes(index, dst); } + @Override public void getBytes(final int index, final ByteBuffer dst) { buffer.getBytes(index, dst); } + @Override public void getBytes(final int index, final ActiveMQBuffer dst, final int dstIndex, final int length) { buffer.getBytes(index, dst.byteBuf(), dstIndex, length); } + @Override public void getBytes(final int index, final ActiveMQBuffer dst, final int length) { buffer.getBytes(index, dst.byteBuf(), length); } + @Override public void getBytes(final int index, final ActiveMQBuffer dst) { buffer.getBytes(index, dst.byteBuf()); } + @Override public char getChar(final int index) { return (char) buffer.getShort(index); } + @Override public double getDouble(final int index) { return Double.longBitsToDouble(buffer.getLong(index)); } + @Override public float getFloat(final int index) { return Float.intBitsToFloat(buffer.getInt(index)); } + @Override public int getInt(final int index) { return buffer.getInt(index); } + @Override public long getLong(final int index) { return buffer.getLong(index); } + @Override public short getShort(final int index) { return buffer.getShort(index); } + @Override public short getUnsignedByte(final int index) { return buffer.getUnsignedByte(index); } + @Override public long getUnsignedInt(final int index) { return buffer.getUnsignedInt(index); } + @Override public int getUnsignedShort(final int index) { return buffer.getUnsignedShort(index); } + @Override public void markReaderIndex() { buffer.markReaderIndex(); } + @Override public void markWriterIndex() { buffer.markWriterIndex(); } + @Override public boolean readable() { return buffer.isReadable(); } + @Override public int readableBytes() { return buffer.readableBytes(); } + @Override public byte readByte() { return buffer.readByte(); } + @Override public void readBytes(final byte[] dst, final int dstIndex, final int length) { buffer.readBytes(dst, dstIndex, length); } + @Override public void readBytes(final byte[] dst) { buffer.readBytes(dst); } + @Override public void readBytes(final ByteBuffer dst) { buffer.readBytes(dst); } + @Override public void readBytes(final ActiveMQBuffer dst, final int dstIndex, final int length) { buffer.readBytes(dst.byteBuf(), dstIndex, length); } + @Override public void readBytes(final ActiveMQBuffer dst, final int length) { buffer.readBytes(dst.byteBuf(), length); } + @Override public void readBytes(final ActiveMQBuffer dst) { buffer.readBytes(dst.byteBuf()); } + @Override public ActiveMQBuffer readBytes(final int length) { return new ChannelBufferWrapper(buffer.readBytes(length), releasable); } + @Override public char readChar() { return (char) buffer.readShort(); } + @Override public double readDouble() { return Double.longBitsToDouble(buffer.readLong()); } + @Override public int readerIndex() { return buffer.readerIndex(); } + @Override public void readerIndex(final int readerIndex) { buffer.readerIndex(readerIndex); } + @Override public float readFloat() { return Float.intBitsToFloat(buffer.readInt()); } + @Override public int readInt() { return buffer.readInt(); } + @Override public long readLong() { return buffer.readLong(); } + @Override public short readShort() { return buffer.readShort(); } + @Override public ActiveMQBuffer readSlice(final int length) { return new ChannelBufferWrapper(buffer.readSlice(length), releasable); } + @Override public int readUnsignedByte() { return buffer.readUnsignedByte(); } + @Override public long readUnsignedInt() { return buffer.readUnsignedInt(); } + @Override public int readUnsignedShort() { return buffer.readUnsignedShort(); } + @Override public void resetReaderIndex() { buffer.resetReaderIndex(); } + @Override public void resetWriterIndex() { buffer.resetWriterIndex(); } + @Override public void setByte(final int index, final byte value) { buffer.setByte(index, value); } + @Override public void setBytes(final int index, final byte[] src, final int srcIndex, final int length) { buffer.setBytes(index, src, srcIndex, length); } + @Override public void setBytes(final int index, final byte[] src) { buffer.setBytes(index, src); } + @Override public void setBytes(final int index, final ByteBuffer src) { buffer.setBytes(index, src); } + @Override public void setBytes(final int index, final ActiveMQBuffer src, final int srcIndex, final int length) { buffer.setBytes(index, src.byteBuf(), srcIndex, length); } + @Override public void setBytes(final int index, final ActiveMQBuffer src, final int length) { buffer.setBytes(index, src.byteBuf(), length); } + @Override public void setBytes(final int index, final ActiveMQBuffer src) { buffer.setBytes(index, src.byteBuf()); } + @Override public void setChar(final int index, final char value) { buffer.setShort(index, (short) value); } + @Override public void setDouble(final int index, final double value) { buffer.setLong(index, Double.doubleToLongBits(value)); } + @Override public void setFloat(final int index, final float value) { buffer.setInt(index, Float.floatToIntBits(value)); } + @Override public void setIndex(final int readerIndex, final int writerIndex) { buffer.setIndex(readerIndex, writerIndex); } + @Override public void setInt(final int index, final int value) { buffer.setInt(index, value); } + @Override public void setLong(final int index, final long value) { buffer.setLong(index, value); } + @Override public void setShort(final int index, final short value) { buffer.setShort(index, value); } + @Override public int skipBytes(final int length) { buffer.skipBytes(length); return length; } + @Override public ActiveMQBuffer slice() { return new ChannelBufferWrapper(buffer.slice(), releasable); } + @Override public ActiveMQBuffer slice(final int index, final int length) { return new ChannelBufferWrapper(buffer.slice(index, length), releasable); } + @Override public ByteBuffer toByteBuffer() { return buffer.nioBuffer(); } + @Override public ByteBuffer toByteBuffer(final int index, final int length) { return buffer.nioBuffer(index, length); } + @Override public boolean writable() { return buffer.isWritable(); } + @Override public int writableBytes() { return buffer.writableBytes(); } + @Override public void writeByte(final byte value) { buffer.writeByte(value); } + @Override public void writeBytes(final byte[] src, final int srcIndex, final int length) { buffer.writeBytes(src, srcIndex, length); } + @Override public void writeBytes(final byte[] src) { buffer.writeBytes(src); } + @Override public void writeBytes(final ByteBuffer src) { buffer.writeBytes(src); } + @Override public void writeBytes(final ActiveMQBuffer src, final int srcIndex, final int length) { buffer.writeBytes(src.byteBuf(), srcIndex, length); } + @Override public void writeBytes(final ActiveMQBuffer src, final int length) { buffer.writeBytes(src.byteBuf(), length); } + @Override public void writeChar(final char chr) { buffer.writeShort((short) chr); } + @Override public void writeDouble(final double value) { buffer.writeLong(Double.doubleToLongBits(value)); } + @Override public void writeFloat(final float value) { buffer.writeInt(Float.floatToIntBits(value)); } + @Override public void writeInt(final int value) { buffer.writeInt(value); } + @Override public void writeLong(final long value) { buffer.writeLong(value); } + @Override public int writerIndex() { return buffer.writerIndex(); } + @Override public void writerIndex(final int writerIndex) { buffer.writerIndex(writerIndex); } + @Override public void writeShort(final short value) { buffer.writeShort(value); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ActiveMQThreadFactory.java ---------------------------------------------------------------------- diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ActiveMQThreadFactory.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ActiveMQThreadFactory.java index e84e9f4..169ce9a 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ActiveMQThreadFactory.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ActiveMQThreadFactory.java @@ -56,6 +56,7 @@ public final class ActiveMQThreadFactory implements ThreadFactory { this.acc = AccessController.getContext(); } + @Override public Thread newThread(final Runnable command) { // create a thread in a privileged block if running with Security Manager if (acc != null) { @@ -74,6 +75,7 @@ public final class ActiveMQThreadFactory implements ThreadFactory { this.target = target; } + @Override public Thread run() { return createThread(target); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ConcurrentHashSet.java ---------------------------------------------------------------------- diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ConcurrentHashSet.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ConcurrentHashSet.java index c0fe578..9a3ae8c 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ConcurrentHashSet.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ConcurrentHashSet.java @@ -71,6 +71,7 @@ public class ConcurrentHashSet<E> extends AbstractSet<E> implements ConcurrentSe return theMap.remove(o) == ConcurrentHashSet.dummy; } + @Override public boolean addIfAbsent(final E o) { Object obj = theMap.putIfAbsent(o, ConcurrentHashSet.dummy); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodec.java ---------------------------------------------------------------------- diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodec.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodec.java index 6028742..9fd5c5b 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodec.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodec.java @@ -42,6 +42,7 @@ public class DefaultSensitiveStringCodec implements SensitiveDataCodec<String> { private byte[] internalKey = "clusterpassword".getBytes(); + @Override public String decode(Object secret) throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeyException, BadPaddingException, IllegalBlockSizeException { SecretKeySpec key = new SecretKeySpec(internalKey, "Blowfish"); @@ -77,6 +78,7 @@ public class DefaultSensitiveStringCodec implements SensitiveDataCodec<String> { return n.toString(16); } + @Override public void init(Map<String, String> params) { String key = params.get("key"); if (key != null) { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/FactoryFinder.java ---------------------------------------------------------------------- diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/FactoryFinder.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/FactoryFinder.java index 5f4f2a8..748006d 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/FactoryFinder.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/FactoryFinder.java @@ -54,6 +54,7 @@ public class FactoryFinder { final ConcurrentMap<String, Class> classMap = new ConcurrentHashMap<String, Class>(); + @Override public Object create(final String path) throws InstantiationException, IllegalAccessException, ClassNotFoundException, IOException { Class clazz = classMap.get(path); if (clazz == null) { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/PasswordMaskingUtil.java ---------------------------------------------------------------------- diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/PasswordMaskingUtil.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/PasswordMaskingUtil.java index b6f5598..99c4cba 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/PasswordMaskingUtil.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/PasswordMaskingUtil.java @@ -49,6 +49,7 @@ public class PasswordMaskingUtil { // load class codecInstance = AccessController.doPrivileged(new PrivilegedAction<SensitiveDataCodec<String>>() { + @Override public SensitiveDataCodec<String> run() { ClassLoader loader = Thread.currentThread().getContextClassLoader(); try { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java ---------------------------------------------------------------------- diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java index 4163cdc..df9607b 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java @@ -279,6 +279,7 @@ public final class UUIDGenerator { for (final NetworkInterface networkInterface : ifaces) { tasks.add(new Callable<byte[]>() { + @Override public byte[] call() throws Exception { boolean up = (Boolean) isUpMethod.invoke(networkInterface); boolean loopback = (Boolean) isLoopbackMethod.invoke(networkInterface); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ReferenceCounterTest.java ---------------------------------------------------------------------- diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ReferenceCounterTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ReferenceCounterTest.java index c338fb3..e02c8bc 100644 --- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ReferenceCounterTest.java +++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ReferenceCounterTest.java @@ -34,6 +34,7 @@ public class ReferenceCounterTest extends Assert { final AtomicInteger counts = new AtomicInteger(0); volatile Thread lastThreadUsed; + @Override public void run() { counts.incrementAndGet(); latch.countDown(); @@ -83,6 +84,7 @@ public class ReferenceCounterTest extends Assert { for (int i = 0; i < t.length; i++) { t[i] = new Thread() { + @Override public void run() { ref.increment(); } @@ -96,6 +98,7 @@ public class ReferenceCounterTest extends Assert { for (int i = 0; i < t.length; i++) { t[i] = new Thread() { + @Override public void run() { ref.decrement(); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java index e4b1519..e419dfc 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java @@ -46,6 +46,7 @@ public abstract class JGroupsBroadcastEndpoint implements BroadcastEndpoint { this.channelName = channelName; } + @Override public void broadcast(final byte[] data) throws Exception { if (broadcastOpened) { org.jgroups.Message msg = new org.jgroups.Message(); @@ -56,6 +57,7 @@ public abstract class JGroupsBroadcastEndpoint implements BroadcastEndpoint { } } + @Override public byte[] receiveBroadcast() throws Exception { if (clientOpened) { return receiver.receiveBroadcast(); @@ -65,6 +67,7 @@ public abstract class JGroupsBroadcastEndpoint implements BroadcastEndpoint { } } + @Override public byte[] receiveBroadcast(long time, TimeUnit unit) throws Exception { if (clientOpened) { return receiver.receiveBroadcast(time, unit); @@ -74,6 +77,7 @@ public abstract class JGroupsBroadcastEndpoint implements BroadcastEndpoint { } } + @Override public synchronized void openClient() throws Exception { if (clientOpened) { return; @@ -84,6 +88,7 @@ public abstract class JGroupsBroadcastEndpoint implements BroadcastEndpoint { clientOpened = true; } + @Override public synchronized void openBroadcaster() throws Exception { if (broadcastOpened) return; @@ -102,6 +107,7 @@ public abstract class JGroupsBroadcastEndpoint implements BroadcastEndpoint { channel.connect(); } + @Override public synchronized void close(boolean isBroadcast) throws Exception { if (isBroadcast) { broadcastOpened = false; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsFileBroadcastEndpoint.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsFileBroadcastEndpoint.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsFileBroadcastEndpoint.java index 67d4cde..702cb5a 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsFileBroadcastEndpoint.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsFileBroadcastEndpoint.java @@ -32,6 +32,7 @@ public final class JGroupsFileBroadcastEndpoint extends JGroupsBroadcastEndpoint this.file = file; } + @Override public JChannel createChannel() throws Exception { URL configURL = Thread.currentThread().getContextClassLoader().getResource(file); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/UDPBroadcastEndpointFactory.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/UDPBroadcastEndpointFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/UDPBroadcastEndpointFactory.java index 13c6985..4f100e3 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/UDPBroadcastEndpointFactory.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/UDPBroadcastEndpointFactory.java @@ -50,6 +50,7 @@ public final class UDPBroadcastEndpointFactory implements BroadcastEndpointFacto public UDPBroadcastEndpointFactory() { } + @Override public BroadcastEndpoint createBroadcastEndpoint() throws Exception { return new UDPBroadcastEndpoint().setGroupAddress(groupAddress != null ? InetAddress.getByName(groupAddress) : null).setGroupPort(groupPort).setLocalBindAddress(localBindAddress != null ? InetAddress.getByName(localBindAddress) : null).setLocalBindPort(localBindPort); } @@ -135,11 +136,13 @@ public final class UDPBroadcastEndpointFactory implements BroadcastEndpointFacto return this; } + @Override public void broadcast(byte[] data) throws Exception { DatagramPacket packet = new DatagramPacket(data, data.length, groupAddress, groupPort); broadcastingSocket.send(packet); } + @Override public byte[] receiveBroadcast() throws Exception { final byte[] data = new byte[65535]; final DatagramPacket packet = new DatagramPacket(data, data.length); @@ -162,12 +165,14 @@ public final class UDPBroadcastEndpointFactory implements BroadcastEndpointFacto return data; } + @Override public byte[] receiveBroadcast(long time, TimeUnit unit) throws Exception { // We just use the regular method on UDP, there's no timeout support // and this is basically for tests only return receiveBroadcast(); } + @Override public void openBroadcaster() throws Exception { if (localBindPort != -1) { broadcastingSocket = new DatagramSocket(localBindPort, localAddress); @@ -196,6 +201,7 @@ public final class UDPBroadcastEndpointFactory implements BroadcastEndpointFacto open = true; } + @Override public void openClient() throws Exception { // HORNETQ-874 if (checkForLinux() || checkForSolaris() || checkForHp()) { @@ -224,6 +230,7 @@ public final class UDPBroadcastEndpointFactory implements BroadcastEndpointFacto } //@Todo: using isBroadcast to share endpoint between broadcast and receiving + @Override public void close(boolean isBroadcast) throws Exception { open = false; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientConsumer.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientConsumer.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientConsumer.java index 0f0d5d1..55985fe 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientConsumer.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientConsumer.java @@ -111,6 +111,7 @@ public interface ClientConsumer extends AutoCloseable { * * @throws ActiveMQException */ + @Override void close() throws ActiveMQException; /** http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientMessage.java index d206c56..d2f58a6 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientMessage.java @@ -125,111 +125,133 @@ public interface ClientMessage extends Message { /** * Overridden from {@link Message} to enable fluent API */ + @Override ClientMessage putBooleanProperty(SimpleString key, boolean value); /** * Overridden from {@link Message} to enable fluent API */ + @Override ClientMessage putBooleanProperty(String key, boolean value); /** * Overridden from {@link Message} to enable fluent API */ + @Override ClientMessage putByteProperty(SimpleString key, byte value); /** * Overridden from {@link Message} to enable fluent API */ + @Override ClientMessage putByteProperty(String key, byte value); /** * Overridden from {@link Message} to enable fluent API */ + @Override ClientMessage putBytesProperty(SimpleString key, byte[] value); /** * Overridden from {@link Message} to enable fluent API */ + @Override ClientMessage putBytesProperty(String key, byte[] value); /** * Overridden from {@link Message} to enable fluent API */ + @Override ClientMessage putShortProperty(SimpleString key, short value); /** * Overridden from {@link Message} to enable fluent API */ + @Override ClientMessage putShortProperty(String key, short value); /** * Overridden from {@link Message} to enable fluent API */ + @Override ClientMessage putCharProperty(SimpleString key, char value); /** * Overridden from {@link Message} to enable fluent API */ + @Override ClientMessage putCharProperty(String key, char value); /** * Overridden from {@link Message} to enable fluent API */ + @Override ClientMessage putIntProperty(SimpleString key, int value); /** * Overridden from {@link Message} to enable fluent API */ + @Override ClientMessage putIntProperty(String key, int value); /** * Overridden from {@link Message} to enable fluent API */ + @Override ClientMessage putLongProperty(SimpleString key, long value); /** * Overridden from {@link Message} to enable fluent API */ + @Override ClientMessage putLongProperty(String key, long value); /** * Overridden from {@link Message} to enable fluent API */ + @Override ClientMessage putFloatProperty(SimpleString key, float value); /** * Overridden from {@link Message} to enable fluent API */ + @Override ClientMessage putFloatProperty(String key, float value); /** * Overridden from {@link Message} to enable fluent API */ + @Override ClientMessage putDoubleProperty(SimpleString key, double value); /** * Overridden from {@link Message} to enable fluent API */ + @Override ClientMessage putDoubleProperty(String key, double value); /** * Overridden from {@link Message} to enable fluent API */ + @Override ClientMessage putStringProperty(SimpleString key, SimpleString value); /** * Overridden from {@link Message} to enable fluent API */ + @Override ClientMessage putStringProperty(String key, String value); /** * Overridden from {@link Message} to enable fluent API */ + @Override ClientMessage writeBodyBufferBytes(byte[] bytes); /** * Overridden from {@link Message} to enable fluent API */ + @Override ClientMessage writeBodyBufferString(String string); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientProducer.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientProducer.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientProducer.java index 6a30472..c157fa3 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientProducer.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientProducer.java @@ -124,6 +124,7 @@ public interface ClientProducer extends AutoCloseable { * * @throws ActiveMQException if an exception occurs while closing the producer */ + @Override void close() throws ActiveMQException; /** http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSession.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSession.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSession.java index 0df09b2..40db6cf 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSession.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSession.java @@ -145,6 +145,7 @@ public interface ClientSession extends XAResource, AutoCloseable { * * @throws ActiveMQException if an exception occurs while closing the session */ + @Override void close() throws ActiveMQException; /** http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSessionFactory.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSessionFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSessionFactory.java index ae8315f..9fc1f48 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSessionFactory.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSessionFactory.java @@ -138,6 +138,7 @@ public interface ClientSessionFactory extends AutoCloseable { /** * Closes this factory and any session created by it. */ + @Override void close(); /** http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ServerLocator.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ServerLocator.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ServerLocator.java index b198878..af65bf5 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ServerLocator.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ServerLocator.java @@ -722,6 +722,7 @@ public interface ServerLocator extends AutoCloseable { /** * Closes this factory and release all its resources */ + @Override void close(); /** http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/FirstElementConnectionLoadBalancingPolicy.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/FirstElementConnectionLoadBalancingPolicy.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/FirstElementConnectionLoadBalancingPolicy.java index 2373879..fcf6545 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/FirstElementConnectionLoadBalancingPolicy.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/FirstElementConnectionLoadBalancingPolicy.java @@ -25,6 +25,7 @@ public final class FirstElementConnectionLoadBalancingPolicy implements Connecti * @param max param is ignored * @return 0 */ + @Override public int select(final int max) { return 0; } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RandomConnectionLoadBalancingPolicy.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RandomConnectionLoadBalancingPolicy.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RandomConnectionLoadBalancingPolicy.java index e672b1b..4ab66a3 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RandomConnectionLoadBalancingPolicy.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RandomConnectionLoadBalancingPolicy.java @@ -32,6 +32,7 @@ public final class RandomConnectionLoadBalancingPolicy implements ConnectionLoad * @param max the upper limit of the random number selection * @see java.util.Random#nextInt(int) */ + @Override public int select(final int max) { return random.getRandom().nextInt(max); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RandomStickyConnectionLoadBalancingPolicy.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RandomStickyConnectionLoadBalancingPolicy.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RandomStickyConnectionLoadBalancingPolicy.java index 556d33f..5e269a9 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RandomStickyConnectionLoadBalancingPolicy.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RandomStickyConnectionLoadBalancingPolicy.java @@ -30,6 +30,7 @@ public final class RandomStickyConnectionLoadBalancingPolicy implements Connecti /** * @see java.util.Random#nextInt(int) */ + @Override public int select(final int max) { if (pos == -1) { pos = random.getRandom().nextInt(max); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RoundRobinConnectionLoadBalancingPolicy.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RoundRobinConnectionLoadBalancingPolicy.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RoundRobinConnectionLoadBalancingPolicy.java index 1af74f4..cdf0828 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RoundRobinConnectionLoadBalancingPolicy.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RoundRobinConnectionLoadBalancingPolicy.java @@ -37,6 +37,7 @@ public final class RoundRobinConnectionLoadBalancingPolicy implements Connection private int pos; + @Override public int select(final int max) { if (first) { // We start on a random one http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/CoreNotificationType.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/CoreNotificationType.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/CoreNotificationType.java index 105471c..1821962 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/CoreNotificationType.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/CoreNotificationType.java @@ -47,6 +47,7 @@ public enum CoreNotificationType implements NotificationType { this.value = value; } + @Override public int getType() { return value; } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/AddressQueryImpl.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/AddressQueryImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/AddressQueryImpl.java index 96aed1d..aeec614 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/AddressQueryImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/AddressQueryImpl.java @@ -38,14 +38,17 @@ public class AddressQueryImpl implements ClientSession.AddressQuery { this.autoCreateJmsQueues = autoCreateJmsQueues; } + @Override public List<SimpleString> getQueueNames() { return queueNames; } + @Override public boolean isExists() { return exists; } + @Override public boolean isAutoCreateJmsQueues() { return autoCreateJmsQueues; } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java index 080a5dd..727ba74 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java @@ -175,6 +175,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal { // ClientConsumer implementation // ----------------------------------------------------------------- + @Override public ConsumerContext getConsumerContext() { return consumerContext; } @@ -348,6 +349,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal { } } + @Override public ClientMessage receive(final long timeout) throws ActiveMQException { ClientMessage msg = receive(timeout, false); @@ -358,14 +360,17 @@ public final class ClientConsumerImpl implements ClientConsumerInternal { return msg; } + @Override public ClientMessage receive() throws ActiveMQException { return receive(0, false); } + @Override public ClientMessage receiveImmediate() throws ActiveMQException { return receive(0, true); } + @Override public MessageHandler getMessageHandler() throws ActiveMQException { checkClosed(); @@ -374,6 +379,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal { // Must be synchronized since messages may be arriving while handler is being set and might otherwise end // up not queueing enough executors - so messages get stranded + @Override public synchronized ClientConsumerImpl setMessageHandler(final MessageHandler theHandler) throws ActiveMQException { checkClosed(); @@ -401,6 +407,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal { return this; } + @Override public void close() throws ActiveMQException { doCleanUp(true); } @@ -411,6 +418,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal { * @param future the future to run once the onMessage Thread has completed * @throws ActiveMQException */ + @Override public Thread prepareForClose(final FutureLatch future) throws ActiveMQException { closing = true; @@ -427,6 +435,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal { return onMessageThread; } + @Override public void cleanUp() { try { doCleanUp(false); @@ -436,10 +445,12 @@ public final class ClientConsumerImpl implements ClientConsumerInternal { } } + @Override public boolean isClosed() { return closed; } + @Override public void stop(final boolean waitForOnMessage) throws ActiveMQException { waitForOnMessageToComplete(waitForOnMessage); @@ -457,6 +468,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal { } } + @Override public void clearAtFailover() { clearBuffer(); @@ -474,12 +486,14 @@ public final class ClientConsumerImpl implements ClientConsumerInternal { ackIndividually = false; } + @Override public synchronized void start() { stopped = false; requeueExecutors(); } + @Override public Exception getLastException() { return lastException; } @@ -487,22 +501,27 @@ public final class ClientConsumerImpl implements ClientConsumerInternal { // ClientConsumerInternal implementation // -------------------------------------------------------------- + @Override public ClientSession.QueueQuery getQueueInfo() { return queueInfo; } + @Override public SimpleString getFilterString() { return filterString; } + @Override public SimpleString getQueueName() { return queueName; } + @Override public boolean isBrowseOnly() { return browseOnly; } + @Override public synchronized void handleMessage(final ClientMessageInternal message) throws Exception { if (closing) { // This is ok - we just ignore the message @@ -586,6 +605,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal { handleRegularMessage(largeMessage); } + @Override public synchronized void handleLargeMessage(final ClientLargeMessageInternal clientLargeMessage, long largeMessageSize) throws Exception { if (closing) { @@ -617,6 +637,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal { handleRegularMessage(clientLargeMessage); } + @Override public synchronized void handleLargeMessageContinuation(final byte[] chunk, final int flowControlSize, final boolean isContinues) throws Exception { @@ -634,6 +655,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal { } } + @Override public void clear(boolean waitForOnMessage) throws ActiveMQException { synchronized (this) { // Need to send credits for the messages in the buffer @@ -681,14 +703,17 @@ public final class ClientConsumerImpl implements ClientConsumerInternal { } } + @Override public int getClientWindowSize() { return clientWindowSize; } + @Override public int getBufferSize() { return buffer.size(); } + @Override public void acknowledge(final ClientMessage message) throws ActiveMQException { ClientMessageInternal cmi = (ClientMessageInternal) message; @@ -707,6 +732,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal { } } + @Override public void individualAcknowledge(ClientMessage message) throws ActiveMQException { if (lastAckedMessage != null) { flushAcks(); @@ -715,6 +741,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal { session.individualAcknowledge(this, message); } + @Override public void flushAcks() throws ActiveMQException { if (lastAckedMessage != null) { doAck(lastAckedMessage); @@ -727,6 +754,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal { * * @param discountSlowConsumer When dealing with slowConsumers, we need to discount one credit that was pre-sent when the first receive was called. For largeMessage that is only done at the latest packet */ + @Override public void flowControl(final int messageBytes, final boolean discountSlowConsumer) throws ActiveMQException { if (clientWindowSize >= 0) { creditsToSend += messageBytes; @@ -803,6 +831,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal { // If resetting a slow consumer, we need to wait the execution final CountDownLatch latch = new CountDownLatch(1); flowControlExecutor.execute(new Runnable() { + @Override public void run() { latch.countDown(); } @@ -837,6 +866,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal { private void sendCredits(final int credits) { pendingFlowControl.countUp(); flowControlExecutor.execute(new Runnable() { + @Override public void run() { try { sessionContext.sendConsumerCredits(ClientConsumerImpl.this, credits); @@ -918,6 +948,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal { ActiveMQClientLogger.LOGGER.trace("Calling handler.onMessage"); } final ClassLoader originalLoader = AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() { + @Override public ClassLoader run() { ClassLoader originalLoader = Thread.currentThread().getContextClassLoader(); @@ -934,6 +965,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal { finally { try { AccessController.doPrivileged(new PrivilegedAction<Object>() { + @Override public Object run() { Thread.currentThread().setContextClassLoader(originalLoader); return null; @@ -1040,6 +1072,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal { private class Runner implements Runnable { + @Override public void run() { try { callOnMessage(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientLargeMessageImpl.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientLargeMessageImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientLargeMessageImpl.java index 78c53c9..b30df3f 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientLargeMessageImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientLargeMessageImpl.java @@ -41,6 +41,7 @@ public final class ClientLargeMessageImpl extends ClientMessageImpl implements C /** * @param largeMessageSize the largeMessageSize to set */ + @Override public void setLargeMessageSize(long largeMessageSize) { this.largeMessageSize = largeMessageSize; } @@ -74,10 +75,12 @@ public final class ClientLargeMessageImpl extends ClientMessageImpl implements C return true; } + @Override public void setLargeMessageController(final LargeMessageController controller) { largeMessageController = controller; } + @Override public void checkCompletion() throws ActiveMQException { checkBuffer(); } @@ -100,6 +103,7 @@ public final class ClientLargeMessageImpl extends ClientMessageImpl implements C return getLongProperty(Message.HDR_LARGE_BODY_SIZE).intValue(); } + @Override public LargeMessageController getLargeMessageController() { return largeMessageController; } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerCreditManagerImpl.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerCreditManagerImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerCreditManagerImpl.java index 30c8376..229dc82 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerCreditManagerImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerCreditManagerImpl.java @@ -41,6 +41,7 @@ public class ClientProducerCreditManagerImpl implements ClientProducerCreditMana this.windowSize = windowSize; } + @Override public synchronized ClientProducerCredits getCredits(final SimpleString address, final boolean anon, SessionContext context) { @@ -84,6 +85,7 @@ public class ClientProducerCreditManagerImpl implements ClientProducerCreditMana } } + @Override public synchronized void returnCredits(final SimpleString address) { ClientProducerCredits credits = producerCredits.get(address); @@ -92,6 +94,7 @@ public class ClientProducerCreditManagerImpl implements ClientProducerCreditMana } } + @Override public synchronized void receiveCredits(final SimpleString address, final int credits) { ClientProducerCredits cr = producerCredits.get(address); @@ -100,6 +103,7 @@ public class ClientProducerCreditManagerImpl implements ClientProducerCreditMana } } + @Override public synchronized void receiveFailCredits(final SimpleString address, int credits) { ClientProducerCredits cr = producerCredits.get(address); @@ -108,12 +112,14 @@ public class ClientProducerCreditManagerImpl implements ClientProducerCreditMana } } + @Override public synchronized void reset() { for (ClientProducerCredits credits : producerCredits.values()) { credits.reset(); } } + @Override public synchronized void close() { windowSize = -1; @@ -126,10 +132,12 @@ public class ClientProducerCreditManagerImpl implements ClientProducerCreditMana unReferencedCredits.clear(); } + @Override public synchronized int creditsMapSize() { return producerCredits.size(); } + @Override public synchronized int unReferencedCreditsSize() { return unReferencedCredits.size(); } @@ -162,35 +170,45 @@ public class ClientProducerCreditManagerImpl implements ClientProducerCreditMana static ClientProducerCreditsNoFlowControl instance = new ClientProducerCreditsNoFlowControl(); + @Override public void acquireCredits(int credits) throws InterruptedException { } + @Override public void receiveCredits(int credits) { } + @Override public void receiveFailCredits(int credits) { } + @Override public boolean isBlocked() { return false; } + @Override public void init(SessionContext ctx) { } + @Override public void reset() { } + @Override public void close() { } + @Override public void incrementRefCount() { } + @Override public int decrementRefCount() { return 1; } + @Override public void releaseOutstanding() { } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerCreditsImpl.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerCreditsImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerCreditsImpl.java index 206f188..f7cf98f 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerCreditsImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerCreditsImpl.java @@ -63,6 +63,7 @@ public class ClientProducerCreditsImpl implements ClientProducerCredits { semaphore = new Semaphore(0, false); } + @Override public void init(SessionContext sessionContext) { // We initial request twice as many credits as we request in subsequent requests // This allows the producer to keep sending as more arrive, minimising pauses @@ -73,6 +74,7 @@ public class ClientProducerCreditsImpl implements ClientProducerCredits { this.sessionContext.linkFlowControl(address, this); } + @Override public void acquireCredits(final int credits) throws InterruptedException, ActiveMQException { checkCredits(credits); @@ -117,6 +119,7 @@ public class ClientProducerCreditsImpl implements ClientProducerCredits { } } + @Override public boolean isBlocked() { return blocked; } @@ -125,6 +128,7 @@ public class ClientProducerCreditsImpl implements ClientProducerCredits { return semaphore.availablePermits(); } + @Override public void receiveCredits(final int credits) { synchronized (this) { arriving -= credits; @@ -133,12 +137,14 @@ public class ClientProducerCreditsImpl implements ClientProducerCredits { semaphore.release(credits); } + @Override public void receiveFailCredits(final int credits) { serverRespondedWithFail = true; // receive credits like normal to keep the sender from blocking receiveCredits(credits); } + @Override public synchronized void reset() { // Any pendingCredits credits from before failover won't arrive, so we re-initialise @@ -154,6 +160,7 @@ public class ClientProducerCreditsImpl implements ClientProducerCredits { checkCredits(Math.max(windowSize * 2, beforeFailure)); } + @Override public void close() { // Closing a producer that is blocking should make it return closed = true; @@ -161,14 +168,17 @@ public class ClientProducerCreditsImpl implements ClientProducerCredits { semaphore.release(Integer.MAX_VALUE / 2); } + @Override public synchronized void incrementRefCount() { refCount++; } + @Override public synchronized int decrementRefCount() { return --refCount; } + @Override public synchronized void releaseOutstanding() { semaphore.drainPermits(); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java index 6247bfa..b963aac 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java @@ -108,22 +108,26 @@ public class ClientProducerImpl implements ClientProducerInternal { // ClientProducer implementation ---------------------------------------------------------------- + @Override public SimpleString getAddress() { return address; } + @Override public void send(final Message msg) throws ActiveMQException { checkClosed(); doSend(null, msg, null, false); } + @Override public void send(final SimpleString address1, final Message msg) throws ActiveMQException { checkClosed(); doSend(address1, msg, null, false); } + @Override public void send(final String address1, final Message message) throws ActiveMQException { send(SimpleString.toSimpleString(address1), message); } @@ -150,6 +154,7 @@ public class ClientProducerImpl implements ClientProducerInternal { send(null, message, handler); } + @Override public synchronized void close() throws ActiveMQException { if (closed) { return; @@ -158,6 +163,7 @@ public class ClientProducerImpl implements ClientProducerInternal { doCleanup(); } + @Override public void cleanUp() { if (closed) { return; @@ -166,24 +172,29 @@ public class ClientProducerImpl implements ClientProducerInternal { doCleanup(); } + @Override public boolean isClosed() { return closed; } + @Override public boolean isBlockOnDurableSend() { return blockOnDurableSend; } + @Override public boolean isBlockOnNonDurableSend() { return blockOnNonDurableSend; } + @Override public int getMaxRate() { return rateLimiter == null ? -1 : rateLimiter.getRate(); } // Public --------------------------------------------------------------------------------------- + @Override public ClientProducerCredits getProducerCredits() { return producerCredits; }
