[ https://issues.apache.org/jira/browse/ARTEMIS-1498?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16363934#comment-16363934 ]
ASF GitHub Bot commented on ARTEMIS-1498: ----------------------------------------- Github user michaelandrepearce commented on a diff in the pull request: https://github.com/apache/activemq-artemis/pull/1793#discussion_r168166047 --- Diff: artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessage.java --- @@ -0,0 +1,673 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.activemq.artemis.core.protocol.openwire; + +import javax.jms.JMSException; +import java.io.IOException; +import java.util.Enumeration; +import java.util.HashSet; +import java.util.Set; + +import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQPropertyConversionException; +import org.apache.activemq.artemis.api.core.ICoreMessage; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.RefCountMessage; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.buffers.impl.ChannelBufferWrapper; +import org.apache.activemq.artemis.core.message.impl.CoreMessageObjectPools; +import org.apache.activemq.artemis.core.persistence.Persister; +import org.apache.activemq.artemis.utils.DataConstants; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQMessage; +import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.util.ByteSequence; +import org.apache.activemq.wireformat.WireFormat; + +public class OpenWireMessage extends RefCountMessage { + + private org.apache.activemq.command.ActiveMQMessage message; + private WireFormat wireFormat; + ByteBuf data; + boolean bufferValid; + + + public OpenWireMessage(org.apache.activemq.command.ActiveMQMessage message, WireFormat wireFormat) { + this.message = message; + this.wireFormat = wireFormat; + try { + ByteSequence byteSequence = this.wireFormat.marshal(message); + setBuffer(Unpooled.copiedBuffer(byteSequence.getData(), byteSequence.getOffset(), byteSequence.getLength())); + } catch (IOException e) { + throw new ActiveMQPropertyConversionException(e.getMessage()); + } + } + + public OpenWireMessage() { + } + + public void setMarsheller(WireFormat wireFormat) { + this.wireFormat = wireFormat; + } + + public ActiveMQMessage getAMQMessage() { + if (message == null) { + if (data != null) { + try { + message = (ActiveMQMessage) wireFormat.unmarshal(new ChannelBufferWrapper(data)); + } catch (IOException e) { + throw new ActiveMQPropertyConversionException(e.getMessage()); + } + return message; + } else { + return new ActiveMQMessage(); + } + } + return message; + } + + @Override + public void messageChanged() { + } + + @Override + public Long getScheduledDeliveryTime() { + return message.getArrival(); + } + + @Override + public SimpleString getReplyTo() { + return SimpleString.toSimpleString(message.getReplyTo().getPhysicalName()); + } + + @Override + public Message setReplyTo(SimpleString address) { + message.setReplyTo(ActiveMQDestination.createDestination(address.toString(), ActiveMQDestination.QUEUE_TYPE)); + return this; + } + + @Override + public Message setBuffer(ByteBuf buffer) { + this.data = buffer; + return this; + } + + @Override + public ByteBuf getBuffer() { + if (data == null) { + return null; + } else { + return Unpooled.wrappedBuffer(data); + } + } + + @Override + public OpenWireMessage copy() { + return new OpenWireMessage((ActiveMQMessage)message.copy(), wireFormat); + } + + @Override + public Message copy(long newID) { + OpenWireMessage copy = new OpenWireMessage((ActiveMQMessage)message.copy(), wireFormat); + copy.setMessageID(newID); + return copy; + } + + @Override + public long getMessageID() { + return message.getMessageId().getBrokerSequenceId(); + } + + @Override + public Message setMessageID(long id) { + message.getMessageId().setBrokerSequenceId(id); + return this; + } + + @Override + public long getExpiration() { + return message.getExpiration(); + } + + @Override + public Message setExpiration(long expiration) { + message.setExpiration(expiration); + return this; + } + + @Override + public Object getUserID() { + return message.getUserID(); + } + + @Override + public Message setUserID(Object userID) { + message.setUserID(userID.toString()); + return this; + } + + @Override + public boolean isDurable() { + return message.isPersistent(); + } + + @Override + public Message setDurable(boolean durable) { + message.setPersistent(durable); + return this; + } + + @Override + public Persister<Message> getPersister() { + return OpenWireMessagePersister.INSTANCE; + } + + @Override + public String getAddress() { + return message.getDestination().getPhysicalName(); + } + + @Override + public Message setAddress(String address) { + message.setDestination(ActiveMQDestination.createDestination(address, ActiveMQDestination.QUEUE_TYPE)); + return this; + } + + @Override + public SimpleString getAddressSimpleString() { + return SimpleString.toSimpleString(message.getDestination().getPhysicalName()); + } + + @Override + public Message setAddress(SimpleString address) { + message.setDestination(ActiveMQDestination.createDestination(address.toString(), ActiveMQDestination.QUEUE_TYPE)); + return this; + } + + @Override + public long getTimestamp() { + return message.getTimestamp(); + } + + @Override + public Message setTimestamp(long timestamp) { + message.setTimestamp(timestamp); + return this; + } + + @Override + public byte getPriority() { + return message.getPriority(); + } + + @Override + public Message setPriority(byte priority) { + message.setPriority(priority); + return this; + } + + @Override + public void receiveBuffer(ByteBuf buffer) { + --- End diff -- This should be implemented > [interop] Openwire internal headers should not be part of message properties > ---------------------------------------------------------------------------- > > Key: ARTEMIS-1498 > URL: https://issues.apache.org/jira/browse/ARTEMIS-1498 > Project: ActiveMQ Artemis > Issue Type: Bug > Components: OpenWire > Environment: interoperability between Openwire -> AMQP/Core > Reporter: Michal Toth > Priority: Minor > > Sending an empty message from Openwire JMS client to AMQP or Core receiver > client shows extra "internal" headers (__HDR_*) in message properties. > They should not be there, as these are internal for broker in my opinion. > Openwire sender > {noformat} > $ java -jar /var/dtests/node_data/clients/aoc7.jar sender --timeout 5 > --log-msgs interop --broker tcp://localhost:61616 --address queue_name_\$ > --count 1 --conn-username admin --conn-password admin > {'durable': True, 'priority': 4, 'ttl': 0, 'first-acquirer': False, > 'delivery-count': 0, 'id': > 'dhcp-145-96.lab.eng.brq.redhat.com-33646-1509702974536-1:1:1:1:1', > 'user-id':None, 'address': 'queue_name_$', 'subject': None, 'reply-to': None, > 'correlation-id': None, 'content-type': None, 'content-encoding': None, > 'absolute-expiry-time': 0, 'creation-time': 1509702974798, 'group-id': None, > 'group-sequence': 0, 'reply-to-group-id': None, 'properties': {}, 'content': > None, 'type': None} > {noformat} > AMQP/Core receiver > {noformat} > $ java -jar /var/dtests/node_data/clients/aac1.jar receiver --timeout 5 > --log-msgs interop --broker localhost:5672 --address queue_name_\$ --count 1 > --conn-username admin --conn-password admin > Unsupported object type org.apache.qpid.proton.amqp.Binary > \x00\x00\x00Jn\x02\xae\x02{\x00=ID:dhcp-145-96.lab.eng.brq.redhat.com-33646-1509702974536-1:1\x00\x01\x00\x01\x00\x01 > Unsupported object type org.apache.qpid.proton.amqp.Binary > \x00\x00\x00F{\x01+\x00=ID:dhcp-145-96.lab.eng.brq.redhat.com-33646-1509702974536-1:1\x00\x01\x00\x01 > {'durable': True, 'priority': 4, 'ttl': 0, 'first-acquirer': False, > 'delivery-count': 0, 'id': None, 'user-id': None, 'address': 'queue_name_$', > 'subject': None, 'reply-to': None, 'correlation-id': None, 'content-type': > None, 'content-encoding': None, 'absolute-expiry-time': 0, 'creation-time': > 1509702974798, 'group-id': None, 'group-sequence': 0, 'reply-to-group-id': > None, 'properties': {'__HDR_COMMAND_ID': 5, 'JMSXDeliveryCount': 1, > '__HDR_ARRIVAL': 0, '__HDR_MESSAGE_ID': > \x00\x00\x00Jn\x02\xae\x02{\x00=ID:dhcp-145-96.lab.eng.brq.redhat.com-33646-1509702974536-1:1\x00\x01\x00\x01\x00\x01, > '__HDR_GROUP_SEQUENCE': 0, '__HDR_PRODUCER_ID': > \x00\x00\x00F{\x01+\x00=ID:dhcp-145-96.lab.eng.brq.redhat.com-33646-1509702974536-1:1\x00\x01\x00\x01, > '__HDR_DROPPABLE': False, '__HDR_BROKER_IN_TIME': 1509702974800}, 'content': > None} > {noformat} -- This message was sent by Atlassian JIRA (v7.6.3#76005)