You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2016/01/29 13:10:13 UTC
svn commit: r1727556 - in /qpid/java/trunk:
broker-core/src/main/java/org/apache/qpid/server/message/internal/
broker-core/src/main/java/org/apache/qpid/server/store/
broker-core/src/test/java/org/apache/qpid/server/store/
broker-plugins/amqp-0-10-prot...
Author: rgodfrey
Date: Fri Jan 29 12:10:13 2016
New Revision: 1727556
URL: http://svn.apache.org/viewvc?rev=1727556&view=rev
Log:
QPID-6953 : Remove unused asByteBuffers() method
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessageMetaData.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StorableMessageMetaData.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaData.java
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaData_0_10.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessageMetaData.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessageMetaData.java?rev=1727556&r1=1727555&r2=1727556&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessageMetaData.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessageMetaData.java Fri Jan 29 12:10:13 2016
@@ -27,8 +27,6 @@ import org.apache.qpid.server.util.Conne
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectOutputStream;
-import java.util.Collection;
-import java.util.Collections;
public class InternalMessageMetaData implements StorableMessageMetaData
{
@@ -79,12 +77,6 @@ public class InternalMessageMetaData imp
}
@Override
- public Collection<QpidByteBuffer> asByteBuffers()
- {
- return Collections.singleton(QpidByteBuffer.wrap(_headerBytes));
- }
-
- @Override
public int getContentSize()
{
return _contentSize;
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StorableMessageMetaData.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StorableMessageMetaData.java?rev=1727556&r1=1727555&r2=1727556&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StorableMessageMetaData.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StorableMessageMetaData.java Fri Jan 29 12:10:13 2016
@@ -20,9 +20,6 @@
*/
package org.apache.qpid.server.store;
-import java.nio.ByteBuffer;
-import java.util.Collection;
-
import org.apache.qpid.bytebuffer.QpidByteBuffer;
import org.apache.qpid.server.plugin.MessageMetaDataType;
@@ -34,8 +31,6 @@ public interface StorableMessageMetaData
int writeToBuffer(QpidByteBuffer dest);
- Collection<QpidByteBuffer> asByteBuffers();
-
int getContentSize();
boolean isPersistent();
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaData.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaData.java?rev=1727556&r1=1727555&r2=1727556&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaData.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaData.java Fri Jan 29 12:10:13 2016
@@ -20,9 +20,6 @@
*/
package org.apache.qpid.server.store;
-import java.util.Collection;
-import java.util.Collections;
-
import org.apache.qpid.bytebuffer.QpidByteBuffer;
import org.apache.qpid.server.plugin.MessageMetaDataType;
@@ -97,12 +94,4 @@ public class TestMessageMetaData impleme
return dest.position() - oldPosition;
};
- @Override
- public Collection<QpidByteBuffer> asByteBuffers()
- {
- QpidByteBuffer buf = QpidByteBuffer.allocateDirect(getStorableSize());
- writeToBuffer(buf);
- buf.position(0);
- return Collections.singleton(buf);
- }
}
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaData_0_10.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaData_0_10.java?rev=1727556&r1=1727555&r2=1727556&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaData_0_10.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaData_0_10.java Fri Jan 29 12:10:13 2016
@@ -30,11 +30,8 @@ import org.apache.qpid.transport.Message
import org.apache.qpid.transport.MessageProperties;
import org.apache.qpid.transport.MessageTransfer;
import org.apache.qpid.transport.Struct;
-import org.apache.qpid.transport.codec.BBEncoder;
-import java.nio.ByteBuffer;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -168,24 +165,6 @@ public class MessageMetaData_0_10 implem
return length;
}
- @Override
- public Collection<QpidByteBuffer> asByteBuffers()
- {
- QpidByteBuffer buf = _encoded;
-
- if(buf == null)
- {
- buf = encodeAsBuffer();
- _encoded = buf;
- }
-
- buf = buf.duplicate();
-
- buf.position(0);
-
- return Collections.singleton(buf);
- }
-
public int getContentSize()
{
return _bodySize;
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java?rev=1727556&r1=1727555&r2=1727556&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java Fri Jan 29 12:10:13 2016
@@ -20,9 +20,7 @@
*/
package org.apache.qpid.server.protocol.v0_8;
-import java.util.ArrayList;
import java.util.Collection;
-import java.util.List;
import java.util.Set;
import org.apache.qpid.bytebuffer.QpidByteBuffer;
@@ -38,7 +36,6 @@ import org.apache.qpid.server.message.AM
import org.apache.qpid.server.plugin.MessageMetaDataType;
import org.apache.qpid.server.store.StorableMessageMetaData;
import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
-import org.apache.qpid.transport.ByteBufferSender;
/**
* Encapsulates a publish body and a content header. In the context of the message store these are treated as a
@@ -130,58 +127,6 @@ public class MessageMetaData implements
return dest.position()-oldPosition;
}
- @Override
- public Collection<QpidByteBuffer> asByteBuffers()
- {
- final List<QpidByteBuffer> buffers = new ArrayList<>();
- QpidByteBuffer buf = QpidByteBuffer.allocateDirect(4);
- buffers.add(buf);
- buf.putInt(0, _contentHeaderBody.getSize());
- _contentHeaderBody.writePayload(new ByteBufferSender()
- {
- @Override
- public boolean isDirectBufferPreferred()
- {
- return true;
- }
-
- @Override
- public void send(final QpidByteBuffer msg)
- {
- buffers.add(msg.duplicate());
- }
-
- @Override
- public void flush()
- {
-
- }
-
- @Override
- public void close()
- {
-
- }
- });
- buf = QpidByteBuffer.allocateDirect(9+EncodingUtils.encodedShortStringLength(_messagePublishInfo.getExchange())+EncodingUtils.encodedShortStringLength(_messagePublishInfo.getRoutingKey()));
- EncodingUtils.writeShortStringBytes(buf, _messagePublishInfo.getExchange());
- EncodingUtils.writeShortStringBytes(buf, _messagePublishInfo.getRoutingKey());
- byte flags = 0;
- if(_messagePublishInfo.isMandatory())
- {
- flags |= MANDATORY_FLAG;
- }
- if(_messagePublishInfo.isImmediate())
- {
- flags |= IMMEDIATE_FLAG;
- }
- buf.put(flags);
- buf.putLong(_arrivalTime);
- buf.flip();
- buffers.add(buf);
- return buffers;
- }
-
public int getContentSize()
{
return (int) _contentHeaderBody.getBodySize();
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java?rev=1727556&r1=1727555&r2=1727556&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java Fri Jan 29 12:10:13 2016
@@ -351,24 +351,6 @@ public class MessageMetaData_1_0 impleme
return length;
}
- @Override
- public Collection<QpidByteBuffer> asByteBuffers()
- {
- QpidByteBuffer buf = _encoded;
-
- if(buf == null)
- {
- buf = encodeAsBuffer();
- _encoded = buf;
- }
-
- buf = buf.duplicate();
-
- buf.position(0);
-
- return Collections.singleton(buf);
- }
-
public int getContentSize()
{
QpidByteBuffer buf = _encoded;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org