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 2017/03/02 15:05:40 UTC

[06/29] activemq-artemis git commit: removing dead code and docs

removing dead code and docs


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/a3330457
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/a3330457
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/a3330457

Branch: refs/heads/artemis-1009
Commit: a3330457e7e68f39caf3018115885ccb45e7f342
Parents: 03fdc20
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Mar 1 10:54:40 2017 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Mar 2 10:05:21 2017 -0500

----------------------------------------------------------------------
 .../activemq/artemis/api/core/Message.java       |  6 ------
 .../artemis/core/message/impl/CoreMessage.java   | 19 -------------------
 .../protocol/amqp/broker/AMQPMessage.java        |  3 ---
 .../converter/message/InboundTransformer.java    |  2 --
 4 files changed, 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a3330457/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
index a6ef408..d96f232 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
@@ -69,12 +69,6 @@ import org.apache.activemq.artemis.core.persistence.Persister;
  * size = encode.getEncodeSize();
  * encode.encodeDirectly(bufferOutput);
  *
- *
- * Disabling temporary buffer:
- *
- * // This will make the message to only be encoded directly to the output stream, useful on client core API
- * encode.disableInternalBuffer();
-
  */
 public interface Message {
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a3330457/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
index edbcaa9..973c1de 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
@@ -541,25 +541,6 @@ public class CoreMessage extends RefCountMessage {
       return false;
    }
 
-   private void encodeBody(ByteBuf intoBuffer) {
-      intoBuffer.writerIndex(DataConstants.SIZE_INT);
-
-      switch (getBodyType()) {
-
-         // TODO-now implement other types
-         case Text:
-            SimpleString.writeNullableSimpleString(intoBuffer, SimpleString.toSimpleString(body == null ? null : body.toString()));
-            break;
-
-         default:
-            break;
-      }
-
-
-      endOfBodyPosition = buffer.writerIndex() + BUFFER_HEADER_SPACE;
-      buffer.setInt(0, endOfBodyPosition);
-   }
-
    @Override
    public String getAddress() {
       if (address == null) {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a3330457/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
index c963061..7fabefd 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
@@ -488,9 +488,6 @@ public class AMQPMessage extends RefCountMessage {
 
    @Override
    public void sendBuffer(ByteBuf buffer, int deliveryCount) {
-      // TODO: do I need to change the Header with deliveryCount?
-      //       I would send a new instance of Header with a new delivery count, and only send partial of the buffer
-      //       previously received
       checkBuffer();
       Header header = getHeader();
       if (header != null) {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a3330457/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/message/InboundTransformer.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/message/InboundTransformer.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/message/InboundTransformer.java
index cec34ef..1e83959 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/message/InboundTransformer.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/message/InboundTransformer.java
@@ -58,8 +58,6 @@ public abstract class InboundTransformer {
 
    protected IDGenerator idGenerator;
 
-   public static final String TRANSFORMER_NATIVE = "native";
-   public static final String TRANSFORMER_RAW = "raw";
    public static final String TRANSFORMER_JMS = "jms";
 
    public InboundTransformer(IDGenerator idGenerator) {