tabish121 commented on a change in pull request #729: URL: https://github.com/apache/activemq/pull/729#discussion_r792097173
########## File path: activemq-client/src/main/java/org/apache/activemq/ActiveMQContext.java ########## @@ -0,0 +1,477 @@ +/** + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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; + +import java.io.Serializable; + +import javax.jms.BytesMessage; +import javax.jms.ConnectionMetaData; +import javax.jms.Destination; +import javax.jms.ExceptionListener; +import javax.jms.IllegalStateRuntimeException; +import javax.jms.JMSConsumer; +import javax.jms.JMSContext; +import javax.jms.JMSException; +import javax.jms.JMSProducer; +import javax.jms.JMSRuntimeException; +import javax.jms.MapMessage; +import javax.jms.Message; +import javax.jms.ObjectMessage; +import javax.jms.Queue; +import javax.jms.QueueBrowser; +import javax.jms.Session; +import javax.jms.StreamMessage; +import javax.jms.TemporaryQueue; +import javax.jms.TemporaryTopic; +import javax.jms.TextMessage; +import javax.jms.Topic; + +import org.apache.activemq.util.JMSExceptionSupport; + +/** + * In terms of the JMS 1.1 API a JMSContext should be thought of as + * representing both a Connection and a Session. Although the simplified + * API removes the need for applications to use those objects, the concepts + * of connection and session remain important. A connection represents a + * physical link to the JMS server and a session represents a + * single-threaded context for sending and receiving messages. + * + * + * @see javax.jms.JMSContext + */ + +public class ActiveMQContext implements JMSContext { + + private static final boolean DEFAULT_AUTO_START = true; + + private final ActiveMQConnection activemqConnection; + private ActiveMQSession activemqSession = null; + + // Configuration + private boolean autoStart = DEFAULT_AUTO_START; + private final int sessionMode; + + // State + private boolean closeInvoked = false; + private ActiveMQMessageProducer activemqMessageProducer = null; + + ActiveMQContext(final ActiveMQConnection activemqConnection) { + this.activemqConnection = activemqConnection; + this.sessionMode = AUTO_ACKNOWLEDGE; + } + + ActiveMQContext(final ActiveMQConnection activemqConnection, final int sessionMode) { + this.activemqConnection = activemqConnection; + this.sessionMode = sessionMode; + } + + @Override + public JMSContext createContext(int sessionMode) { + return new ActiveMQContext(activemqConnection, sessionMode); + } + + @Override + public JMSProducer createProducer() { + return new ActiveMQProducer(this, getCreatedActiveMQMessageProducer()); + } + + @Override + public String getClientID() { + try { + return this.activemqConnection.getClientID(); + } catch (JMSException e) { + throw JMSExceptionSupport.convertToJMSRuntimeException(e); + } + } + + @Override + public void setClientID(String clientID) { + try { + this.activemqConnection.setClientID(clientID); + } catch (JMSException e) { + throw JMSExceptionSupport.convertToJMSRuntimeException(e); + } + } + + @Override + public ConnectionMetaData getMetaData() { + checkContextState(); + try { + return this.activemqConnection.getMetaData(); + } catch (JMSException e) { + throw JMSExceptionSupport.convertToJMSRuntimeException(e); + } + } + + @Override + public ExceptionListener getExceptionListener() { + checkContextState(); + try { + return this.activemqConnection.getExceptionListener(); + } catch (JMSException e) { + throw JMSExceptionSupport.convertToJMSRuntimeException(e); + } + } + + @Override + public void setExceptionListener(ExceptionListener listener) { + checkContextState(); + try { + this.activemqConnection.setExceptionListener(listener); + } catch (JMSException e) { + throw JMSExceptionSupport.convertToJMSRuntimeException(e); + } + } + + @Override + public void start() { + checkContextState(); + try { + this.activemqConnection.start(); + } catch (JMSException e) { + throw JMSExceptionSupport.convertToJMSRuntimeException(e); + } + } + + @Override + public void stop() { + checkContextState(); + try { + this.activemqConnection.stop(); + } catch (JMSException e) { + throw JMSExceptionSupport.convertToJMSRuntimeException(e); + } + } + + @Override + public void setAutoStart(boolean autoStart) { + this.autoStart = autoStart; + } + + @Override + public boolean getAutoStart() { + return this.autoStart; + } + + @Override + public void close() { + try { + closeInvoked = true; + if(this.activemqMessageProducer != null) { + this.activemqMessageProducer.close(); + } + if (this.activemqSession != null) { + this.activemqSession.close(); + } + this.activemqConnection.close(); Review comment: This explicit close violates the JMS contract for the JMSContext wherein the context should only close the connection if there are no other active JMSContext objects that have been created by a call to the "createContext" method in this class. Specifically from the API docs: " This closes the underlying session and any underlying producers and consumers. If there are no other active (not closed) JMSContext objects using the underlying connection then this method also closes the underlying connection. " ########## File path: activemq-client/src/main/java/org/apache/activemq/ActiveMQProducer.java ########## @@ -0,0 +1,547 @@ +/** + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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; + +import java.io.Serializable; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +import javax.jms.BytesMessage; +import javax.jms.CompletionListener; +import javax.jms.Destination; +import javax.jms.JMSException; +import javax.jms.JMSProducer; +import javax.jms.MapMessage; +import javax.jms.Message; +import javax.jms.MessageFormatRuntimeException; +import javax.jms.MessageProducer; +import javax.jms.ObjectMessage; +import javax.jms.TextMessage; + +import org.apache.activemq.util.JMSExceptionSupport; +import org.apache.activemq.util.TypeConversionSupport; + +public class ActiveMQProducer implements JMSProducer { + + private final ActiveMQContext activemqContext; + private final MessageProducer activemqMessageProducer; + + // QoS override of defaults on a per-JMSProducer instance basis + private String correlationId = null; + private byte[] correlationIdBytes = null; + private Long deliveryDelay = null; + private Integer deliveryMode = null; + private Integer priority = null; + private Destination replyTo = null; + private Long timeToLive = null; + private String type = null; + + // Properties applied to all messages on a per-JMS producer instance basis + private Map<String, Object> messageProperties = null; + + ActiveMQProducer(ActiveMQContext activemqContext, MessageProducer activemqMessageProducer) { + this.activemqContext = activemqContext; + this.activemqMessageProducer = activemqMessageProducer; + } + + @Override + public JMSProducer send(Destination destination, Message message) { + try { + if(this.correlationId != null) { + message.setJMSCorrelationID(this.correlationId); + } + + if(this.correlationIdBytes != null) { + message.setJMSCorrelationIDAsBytes(this.correlationIdBytes); + } + + if(this.replyTo != null) { + message.setJMSReplyTo(this.replyTo); + } + + if(this.type != null) { + message.setJMSType(this.type); + } + + if(!messageProperties.isEmpty()) { + for(Map.Entry<String, Object> propertyEntry : messageProperties.entrySet()) { + message.setObjectProperty(propertyEntry.getKey(), propertyEntry.getValue()); + } + } + + activemqMessageProducer.send(destination, message, getDeliveryMode(), getPriority(), getTimeToLive()); + } catch (JMSException e) { + throw JMSExceptionSupport.convertToJMSRuntimeException(e); + } + return this; + } + + @Override + public JMSProducer send(Destination destination, String body) { + TextMessage textMessage = activemqContext.createTextMessage(body); + send(destination, textMessage); + return this; + } + + @Override + public JMSProducer send(Destination destination, Map<String, Object> body) { + MapMessage mapMessage = activemqContext.createMapMessage(); + + if (body != null) { + try { + for (Map.Entry<String, Object> mapEntry : body.entrySet()) { + final String key = mapEntry.getKey(); + final Object value = mapEntry.getValue(); + final Class<?> valueObject = value.getClass(); + if (String.class.isAssignableFrom(valueObject)) { + mapMessage.setString(key, String.class.cast(value)); + } else if (Integer.class.isAssignableFrom(valueObject)) { + mapMessage.setInt(key, Integer.class.cast(value)); + } else if (Long.class.isAssignableFrom(valueObject)) { + mapMessage.setLong(key, Long.class.cast(value)); + } else if (Double.class.isAssignableFrom(valueObject)) { + mapMessage.setDouble(key, Double.class.cast(value)); + } else if (Boolean.class.isAssignableFrom(valueObject)) { + mapMessage.setBoolean(key, Boolean.class.cast(value)); + } else if (Character.class.isAssignableFrom(valueObject)) { + mapMessage.setChar(key, Character.class.cast(value)); + } else if (Short.class.isAssignableFrom(valueObject)) { + mapMessage.setShort(key, Short.class.cast(value)); + } else if (Float.class.isAssignableFrom(valueObject)) { + mapMessage.setFloat(key, Float.class.cast(value)); + } else if (Byte.class.isAssignableFrom(valueObject)) { + mapMessage.setByte(key, Byte.class.cast(value)); + } else if (byte[].class.isAssignableFrom(valueObject)) { + byte[] array = byte[].class.cast(value); + mapMessage.setBytes(key, array, 0, array.length); + } else { + mapMessage.setObject(key, value); + } + } + } catch (JMSException e) { + throw new MessageFormatRuntimeException(e.getMessage()); + } + } + send(destination, mapMessage); + return this; + } + + @Override + public JMSProducer send(Destination destination, byte[] body) { + BytesMessage bytesMessage = activemqContext.createBytesMessage(); + + try { + if(body != null) { + bytesMessage.writeBytes(body); + } + send(destination, bytesMessage); + } catch (JMSException e) { + throw JMSExceptionSupport.convertToJMSRuntimeException(e); + } + return this; + } + + @Override + public JMSProducer send(Destination destination, Serializable body) { + ObjectMessage objectMessage = activemqContext.createObjectMessage(body); + send(destination, objectMessage); + return this; + } + + @Override + public JMSProducer setDisableMessageID(boolean value) { Review comment: This JMSProducer wrapper should be tracking this setting and applying it on a per send basis so as not to affect the value set (or not set) in other MessageProducer wrappers creating from the same JMS context. ########## File path: activemq-client/src/main/java/org/apache/activemq/ActiveMQProducer.java ########## @@ -0,0 +1,547 @@ +/** + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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; + +import java.io.Serializable; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +import javax.jms.BytesMessage; +import javax.jms.CompletionListener; +import javax.jms.Destination; +import javax.jms.JMSException; +import javax.jms.JMSProducer; +import javax.jms.MapMessage; +import javax.jms.Message; +import javax.jms.MessageFormatRuntimeException; +import javax.jms.MessageProducer; +import javax.jms.ObjectMessage; +import javax.jms.TextMessage; + +import org.apache.activemq.util.JMSExceptionSupport; +import org.apache.activemq.util.TypeConversionSupport; + +public class ActiveMQProducer implements JMSProducer { + + private final ActiveMQContext activemqContext; + private final MessageProducer activemqMessageProducer; + + // QoS override of defaults on a per-JMSProducer instance basis + private String correlationId = null; + private byte[] correlationIdBytes = null; + private Long deliveryDelay = null; + private Integer deliveryMode = null; + private Integer priority = null; + private Destination replyTo = null; + private Long timeToLive = null; + private String type = null; + + // Properties applied to all messages on a per-JMS producer instance basis + private Map<String, Object> messageProperties = null; + + ActiveMQProducer(ActiveMQContext activemqContext, MessageProducer activemqMessageProducer) { + this.activemqContext = activemqContext; + this.activemqMessageProducer = activemqMessageProducer; + } + + @Override + public JMSProducer send(Destination destination, Message message) { + try { + if(this.correlationId != null) { + message.setJMSCorrelationID(this.correlationId); + } + + if(this.correlationIdBytes != null) { + message.setJMSCorrelationIDAsBytes(this.correlationIdBytes); + } + + if(this.replyTo != null) { + message.setJMSReplyTo(this.replyTo); + } + + if(this.type != null) { + message.setJMSType(this.type); + } + + if(!messageProperties.isEmpty()) { + for(Map.Entry<String, Object> propertyEntry : messageProperties.entrySet()) { + message.setObjectProperty(propertyEntry.getKey(), propertyEntry.getValue()); + } + } + + activemqMessageProducer.send(destination, message, getDeliveryMode(), getPriority(), getTimeToLive()); + } catch (JMSException e) { + throw JMSExceptionSupport.convertToJMSRuntimeException(e); + } + return this; + } + + @Override + public JMSProducer send(Destination destination, String body) { + TextMessage textMessage = activemqContext.createTextMessage(body); + send(destination, textMessage); + return this; + } + + @Override + public JMSProducer send(Destination destination, Map<String, Object> body) { + MapMessage mapMessage = activemqContext.createMapMessage(); + + if (body != null) { + try { + for (Map.Entry<String, Object> mapEntry : body.entrySet()) { + final String key = mapEntry.getKey(); + final Object value = mapEntry.getValue(); + final Class<?> valueObject = value.getClass(); + if (String.class.isAssignableFrom(valueObject)) { + mapMessage.setString(key, String.class.cast(value)); + } else if (Integer.class.isAssignableFrom(valueObject)) { + mapMessage.setInt(key, Integer.class.cast(value)); + } else if (Long.class.isAssignableFrom(valueObject)) { + mapMessage.setLong(key, Long.class.cast(value)); + } else if (Double.class.isAssignableFrom(valueObject)) { + mapMessage.setDouble(key, Double.class.cast(value)); + } else if (Boolean.class.isAssignableFrom(valueObject)) { + mapMessage.setBoolean(key, Boolean.class.cast(value)); + } else if (Character.class.isAssignableFrom(valueObject)) { + mapMessage.setChar(key, Character.class.cast(value)); + } else if (Short.class.isAssignableFrom(valueObject)) { + mapMessage.setShort(key, Short.class.cast(value)); + } else if (Float.class.isAssignableFrom(valueObject)) { + mapMessage.setFloat(key, Float.class.cast(value)); + } else if (Byte.class.isAssignableFrom(valueObject)) { + mapMessage.setByte(key, Byte.class.cast(value)); + } else if (byte[].class.isAssignableFrom(valueObject)) { + byte[] array = byte[].class.cast(value); + mapMessage.setBytes(key, array, 0, array.length); + } else { + mapMessage.setObject(key, value); + } + } + } catch (JMSException e) { + throw new MessageFormatRuntimeException(e.getMessage()); + } + } + send(destination, mapMessage); + return this; + } + + @Override + public JMSProducer send(Destination destination, byte[] body) { + BytesMessage bytesMessage = activemqContext.createBytesMessage(); + + try { + if(body != null) { + bytesMessage.writeBytes(body); + } + send(destination, bytesMessage); + } catch (JMSException e) { + throw JMSExceptionSupport.convertToJMSRuntimeException(e); + } + return this; + } + + @Override + public JMSProducer send(Destination destination, Serializable body) { + ObjectMessage objectMessage = activemqContext.createObjectMessage(body); + send(destination, objectMessage); + return this; + } + + @Override + public JMSProducer setDisableMessageID(boolean value) { + try { + activemqMessageProducer.setDisableMessageID(value); + return this; + } catch (JMSException e) { + throw JMSExceptionSupport.convertToJMSRuntimeException(e); + } + } + + @Override + public boolean getDisableMessageID() { + try { + return activemqMessageProducer.getDisableMessageID(); + } catch (JMSException e) { + throw JMSExceptionSupport.convertToJMSRuntimeException(e); + } + } + + @Override + public JMSProducer setDisableMessageTimestamp(boolean value) { + try { + activemqMessageProducer.setDisableMessageTimestamp(value); + return this; + } catch (JMSException e) { + throw JMSExceptionSupport.convertToJMSRuntimeException(e); + } + } + + @Override + public boolean getDisableMessageTimestamp() { + try { + return activemqMessageProducer.getDisableMessageTimestamp(); + } catch (JMSException e) { + throw JMSExceptionSupport.convertToJMSRuntimeException(e); + } + } + + @Override + public JMSProducer setDeliveryMode(int deliveryMode) { Review comment: Good spot to check that the value is valid before proceeding to provide quick feedback ########## File path: activemq-client/src/main/java/org/apache/activemq/ActiveMQProducer.java ########## @@ -0,0 +1,547 @@ +/** + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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; + +import java.io.Serializable; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +import javax.jms.BytesMessage; +import javax.jms.CompletionListener; +import javax.jms.Destination; +import javax.jms.JMSException; +import javax.jms.JMSProducer; +import javax.jms.MapMessage; +import javax.jms.Message; +import javax.jms.MessageFormatRuntimeException; +import javax.jms.MessageProducer; +import javax.jms.ObjectMessage; +import javax.jms.TextMessage; + +import org.apache.activemq.util.JMSExceptionSupport; +import org.apache.activemq.util.TypeConversionSupport; + +public class ActiveMQProducer implements JMSProducer { + + private final ActiveMQContext activemqContext; + private final MessageProducer activemqMessageProducer; + + // QoS override of defaults on a per-JMSProducer instance basis + private String correlationId = null; + private byte[] correlationIdBytes = null; + private Long deliveryDelay = null; + private Integer deliveryMode = null; + private Integer priority = null; + private Destination replyTo = null; + private Long timeToLive = null; + private String type = null; + + // Properties applied to all messages on a per-JMS producer instance basis + private Map<String, Object> messageProperties = null; + + ActiveMQProducer(ActiveMQContext activemqContext, MessageProducer activemqMessageProducer) { + this.activemqContext = activemqContext; + this.activemqMessageProducer = activemqMessageProducer; + } + + @Override + public JMSProducer send(Destination destination, Message message) { + try { + if(this.correlationId != null) { + message.setJMSCorrelationID(this.correlationId); + } + + if(this.correlationIdBytes != null) { + message.setJMSCorrelationIDAsBytes(this.correlationIdBytes); + } + + if(this.replyTo != null) { + message.setJMSReplyTo(this.replyTo); + } + + if(this.type != null) { + message.setJMSType(this.type); + } + + if(!messageProperties.isEmpty()) { + for(Map.Entry<String, Object> propertyEntry : messageProperties.entrySet()) { + message.setObjectProperty(propertyEntry.getKey(), propertyEntry.getValue()); + } + } + + activemqMessageProducer.send(destination, message, getDeliveryMode(), getPriority(), getTimeToLive()); + } catch (JMSException e) { + throw JMSExceptionSupport.convertToJMSRuntimeException(e); + } + return this; + } + + @Override + public JMSProducer send(Destination destination, String body) { + TextMessage textMessage = activemqContext.createTextMessage(body); + send(destination, textMessage); + return this; + } + + @Override + public JMSProducer send(Destination destination, Map<String, Object> body) { + MapMessage mapMessage = activemqContext.createMapMessage(); + + if (body != null) { + try { + for (Map.Entry<String, Object> mapEntry : body.entrySet()) { + final String key = mapEntry.getKey(); + final Object value = mapEntry.getValue(); + final Class<?> valueObject = value.getClass(); + if (String.class.isAssignableFrom(valueObject)) { + mapMessage.setString(key, String.class.cast(value)); + } else if (Integer.class.isAssignableFrom(valueObject)) { + mapMessage.setInt(key, Integer.class.cast(value)); + } else if (Long.class.isAssignableFrom(valueObject)) { + mapMessage.setLong(key, Long.class.cast(value)); + } else if (Double.class.isAssignableFrom(valueObject)) { + mapMessage.setDouble(key, Double.class.cast(value)); + } else if (Boolean.class.isAssignableFrom(valueObject)) { + mapMessage.setBoolean(key, Boolean.class.cast(value)); + } else if (Character.class.isAssignableFrom(valueObject)) { + mapMessage.setChar(key, Character.class.cast(value)); + } else if (Short.class.isAssignableFrom(valueObject)) { + mapMessage.setShort(key, Short.class.cast(value)); + } else if (Float.class.isAssignableFrom(valueObject)) { + mapMessage.setFloat(key, Float.class.cast(value)); + } else if (Byte.class.isAssignableFrom(valueObject)) { + mapMessage.setByte(key, Byte.class.cast(value)); + } else if (byte[].class.isAssignableFrom(valueObject)) { + byte[] array = byte[].class.cast(value); + mapMessage.setBytes(key, array, 0, array.length); + } else { + mapMessage.setObject(key, value); + } + } + } catch (JMSException e) { + throw new MessageFormatRuntimeException(e.getMessage()); + } + } + send(destination, mapMessage); + return this; + } + + @Override + public JMSProducer send(Destination destination, byte[] body) { + BytesMessage bytesMessage = activemqContext.createBytesMessage(); + + try { + if(body != null) { + bytesMessage.writeBytes(body); + } + send(destination, bytesMessage); + } catch (JMSException e) { + throw JMSExceptionSupport.convertToJMSRuntimeException(e); + } + return this; + } + + @Override + public JMSProducer send(Destination destination, Serializable body) { + ObjectMessage objectMessage = activemqContext.createObjectMessage(body); + send(destination, objectMessage); + return this; + } + + @Override + public JMSProducer setDisableMessageID(boolean value) { + try { + activemqMessageProducer.setDisableMessageID(value); + return this; + } catch (JMSException e) { + throw JMSExceptionSupport.convertToJMSRuntimeException(e); + } + } + + @Override + public boolean getDisableMessageID() { + try { + return activemqMessageProducer.getDisableMessageID(); + } catch (JMSException e) { + throw JMSExceptionSupport.convertToJMSRuntimeException(e); + } + } + + @Override + public JMSProducer setDisableMessageTimestamp(boolean value) { Review comment: This JMSProducer wrapper should be tracking this setting and applying it on a per send basis so as not to affect the value set (or not set) in other MessageProducer wrappers creating from the same JMS context. ########## File path: activemq-client/src/main/java/org/apache/activemq/ActiveMQConsumer.java ########## @@ -0,0 +1,106 @@ +/** + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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; + +import javax.jms.JMSConsumer; +import javax.jms.JMSException; +import javax.jms.JMSRuntimeException; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageListener; + +import org.apache.activemq.util.JMSExceptionSupport; + +public class ActiveMQConsumer implements JMSConsumer { + + private final ActiveMQContext activemqContext; + private final MessageConsumer activemqMessageConsumer; + + ActiveMQConsumer(ActiveMQContext activemqContext, MessageConsumer activemqMessageConsumer) { + this.activemqContext = activemqContext; + this.activemqMessageConsumer = activemqMessageConsumer; + } + + @Override + public String getMessageSelector() { + throw new UnsupportedOperationException("getMessageSelector() is not supported"); + } + + @Override + public MessageListener getMessageListener() throws JMSRuntimeException { + throw new UnsupportedOperationException("getMessageListener() is not supported"); + } + + @Override + public void setMessageListener(MessageListener listener) throws JMSRuntimeException { + throw new UnsupportedOperationException("setMessageListener(MessageListener) is not supported"); Review comment: Unclear on why this would be unimplemented as it should be a simple pass-through. ########## File path: activemq-client/src/main/java/org/apache/activemq/ActiveMQConsumer.java ########## @@ -0,0 +1,106 @@ +/** + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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; + +import javax.jms.JMSConsumer; +import javax.jms.JMSException; +import javax.jms.JMSRuntimeException; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageListener; + +import org.apache.activemq.util.JMSExceptionSupport; + +public class ActiveMQConsumer implements JMSConsumer { + + private final ActiveMQContext activemqContext; + private final MessageConsumer activemqMessageConsumer; + + ActiveMQConsumer(ActiveMQContext activemqContext, MessageConsumer activemqMessageConsumer) { + this.activemqContext = activemqContext; + this.activemqMessageConsumer = activemqMessageConsumer; + } + + @Override + public String getMessageSelector() { + throw new UnsupportedOperationException("getMessageSelector() is not supported"); + } + + @Override + public MessageListener getMessageListener() throws JMSRuntimeException { + throw new UnsupportedOperationException("getMessageListener() is not supported"); Review comment: Unclear on why this would be unimplemented as it should be a simple pass-through. ########## File path: activemq-client/src/main/java/org/apache/activemq/ActiveMQConsumer.java ########## @@ -0,0 +1,106 @@ +/** + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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; + +import javax.jms.JMSConsumer; +import javax.jms.JMSException; +import javax.jms.JMSRuntimeException; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageListener; + +import org.apache.activemq.util.JMSExceptionSupport; + +public class ActiveMQConsumer implements JMSConsumer { + + private final ActiveMQContext activemqContext; + private final MessageConsumer activemqMessageConsumer; + + ActiveMQConsumer(ActiveMQContext activemqContext, MessageConsumer activemqMessageConsumer) { + this.activemqContext = activemqContext; + this.activemqMessageConsumer = activemqMessageConsumer; + } + + @Override + public String getMessageSelector() { Review comment: Unclear on why this would be unimplemented as it should be a simple pass-through. ########## File path: activemq-client/src/main/java/org/apache/activemq/ActiveMQProducer.java ########## @@ -0,0 +1,547 @@ +/** + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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; + +import java.io.Serializable; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +import javax.jms.BytesMessage; +import javax.jms.CompletionListener; +import javax.jms.Destination; +import javax.jms.JMSException; +import javax.jms.JMSProducer; +import javax.jms.MapMessage; +import javax.jms.Message; +import javax.jms.MessageFormatRuntimeException; +import javax.jms.MessageProducer; +import javax.jms.ObjectMessage; +import javax.jms.TextMessage; + +import org.apache.activemq.util.JMSExceptionSupport; +import org.apache.activemq.util.TypeConversionSupport; + +public class ActiveMQProducer implements JMSProducer { + + private final ActiveMQContext activemqContext; + private final MessageProducer activemqMessageProducer; + + // QoS override of defaults on a per-JMSProducer instance basis + private String correlationId = null; + private byte[] correlationIdBytes = null; + private Long deliveryDelay = null; + private Integer deliveryMode = null; + private Integer priority = null; + private Destination replyTo = null; + private Long timeToLive = null; + private String type = null; + + // Properties applied to all messages on a per-JMS producer instance basis + private Map<String, Object> messageProperties = null; + + ActiveMQProducer(ActiveMQContext activemqContext, MessageProducer activemqMessageProducer) { + this.activemqContext = activemqContext; + this.activemqMessageProducer = activemqMessageProducer; + } + + @Override + public JMSProducer send(Destination destination, Message message) { + try { + if(this.correlationId != null) { + message.setJMSCorrelationID(this.correlationId); + } + + if(this.correlationIdBytes != null) { + message.setJMSCorrelationIDAsBytes(this.correlationIdBytes); + } + + if(this.replyTo != null) { + message.setJMSReplyTo(this.replyTo); + } + + if(this.type != null) { + message.setJMSType(this.type); + } + + if(!messageProperties.isEmpty()) { + for(Map.Entry<String, Object> propertyEntry : messageProperties.entrySet()) { + message.setObjectProperty(propertyEntry.getKey(), propertyEntry.getValue()); + } + } + + activemqMessageProducer.send(destination, message, getDeliveryMode(), getPriority(), getTimeToLive()); + } catch (JMSException e) { + throw JMSExceptionSupport.convertToJMSRuntimeException(e); + } + return this; + } + + @Override + public JMSProducer send(Destination destination, String body) { + TextMessage textMessage = activemqContext.createTextMessage(body); + send(destination, textMessage); + return this; + } + + @Override + public JMSProducer send(Destination destination, Map<String, Object> body) { + MapMessage mapMessage = activemqContext.createMapMessage(); + + if (body != null) { + try { + for (Map.Entry<String, Object> mapEntry : body.entrySet()) { + final String key = mapEntry.getKey(); + final Object value = mapEntry.getValue(); + final Class<?> valueObject = value.getClass(); + if (String.class.isAssignableFrom(valueObject)) { + mapMessage.setString(key, String.class.cast(value)); + } else if (Integer.class.isAssignableFrom(valueObject)) { + mapMessage.setInt(key, Integer.class.cast(value)); + } else if (Long.class.isAssignableFrom(valueObject)) { + mapMessage.setLong(key, Long.class.cast(value)); + } else if (Double.class.isAssignableFrom(valueObject)) { + mapMessage.setDouble(key, Double.class.cast(value)); + } else if (Boolean.class.isAssignableFrom(valueObject)) { + mapMessage.setBoolean(key, Boolean.class.cast(value)); + } else if (Character.class.isAssignableFrom(valueObject)) { + mapMessage.setChar(key, Character.class.cast(value)); + } else if (Short.class.isAssignableFrom(valueObject)) { + mapMessage.setShort(key, Short.class.cast(value)); + } else if (Float.class.isAssignableFrom(valueObject)) { + mapMessage.setFloat(key, Float.class.cast(value)); + } else if (Byte.class.isAssignableFrom(valueObject)) { + mapMessage.setByte(key, Byte.class.cast(value)); + } else if (byte[].class.isAssignableFrom(valueObject)) { + byte[] array = byte[].class.cast(value); + mapMessage.setBytes(key, array, 0, array.length); + } else { + mapMessage.setObject(key, value); + } + } + } catch (JMSException e) { + throw new MessageFormatRuntimeException(e.getMessage()); + } + } + send(destination, mapMessage); + return this; + } + + @Override + public JMSProducer send(Destination destination, byte[] body) { + BytesMessage bytesMessage = activemqContext.createBytesMessage(); + + try { + if(body != null) { + bytesMessage.writeBytes(body); + } + send(destination, bytesMessage); + } catch (JMSException e) { + throw JMSExceptionSupport.convertToJMSRuntimeException(e); + } + return this; + } + + @Override + public JMSProducer send(Destination destination, Serializable body) { + ObjectMessage objectMessage = activemqContext.createObjectMessage(body); + send(destination, objectMessage); + return this; + } + + @Override + public JMSProducer setDisableMessageID(boolean value) { + try { + activemqMessageProducer.setDisableMessageID(value); + return this; + } catch (JMSException e) { + throw JMSExceptionSupport.convertToJMSRuntimeException(e); + } + } + + @Override + public boolean getDisableMessageID() { + try { + return activemqMessageProducer.getDisableMessageID(); + } catch (JMSException e) { + throw JMSExceptionSupport.convertToJMSRuntimeException(e); + } + } + + @Override + public JMSProducer setDisableMessageTimestamp(boolean value) { + try { + activemqMessageProducer.setDisableMessageTimestamp(value); + return this; + } catch (JMSException e) { + throw JMSExceptionSupport.convertToJMSRuntimeException(e); + } + } + + @Override + public boolean getDisableMessageTimestamp() { + try { + return activemqMessageProducer.getDisableMessageTimestamp(); + } catch (JMSException e) { + throw JMSExceptionSupport.convertToJMSRuntimeException(e); + } + } + + @Override + public JMSProducer setDeliveryMode(int deliveryMode) { + this.deliveryMode = deliveryMode; + return this; + } + + @Override + public int getDeliveryMode() { + if(deliveryMode != null) { + return deliveryMode; + } + + try { + return this.activemqMessageProducer.getDeliveryMode(); + } catch (JMSException e) { + throw JMSExceptionSupport.convertToJMSRuntimeException(e); + } + } + + @Override + public JMSProducer setPriority(int priority) { Review comment: I'd recommend validating the range of priority etc here vs handing off later to MessageProducer to provide immediate feedback on invalid values being set ########## File path: activemq-client/src/main/java/org/apache/activemq/ActiveMQContext.java ########## @@ -0,0 +1,477 @@ +/** + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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; + +import java.io.Serializable; + +import javax.jms.BytesMessage; +import javax.jms.ConnectionMetaData; +import javax.jms.Destination; +import javax.jms.ExceptionListener; +import javax.jms.IllegalStateRuntimeException; +import javax.jms.JMSConsumer; +import javax.jms.JMSContext; +import javax.jms.JMSException; +import javax.jms.JMSProducer; +import javax.jms.JMSRuntimeException; +import javax.jms.MapMessage; +import javax.jms.Message; +import javax.jms.ObjectMessage; +import javax.jms.Queue; +import javax.jms.QueueBrowser; +import javax.jms.Session; +import javax.jms.StreamMessage; +import javax.jms.TemporaryQueue; +import javax.jms.TemporaryTopic; +import javax.jms.TextMessage; +import javax.jms.Topic; + +import org.apache.activemq.util.JMSExceptionSupport; + +/** + * In terms of the JMS 1.1 API a JMSContext should be thought of as + * representing both a Connection and a Session. Although the simplified + * API removes the need for applications to use those objects, the concepts + * of connection and session remain important. A connection represents a + * physical link to the JMS server and a session represents a + * single-threaded context for sending and receiving messages. + * + * + * @see javax.jms.JMSContext + */ + +public class ActiveMQContext implements JMSContext { + + private static final boolean DEFAULT_AUTO_START = true; + + private final ActiveMQConnection activemqConnection; + private ActiveMQSession activemqSession = null; + + // Configuration + private boolean autoStart = DEFAULT_AUTO_START; Review comment: I wasn't able to find where the auto start value was actually being used which implies the context is not honoring the contract of the JMS 2.0 spec in relation to starting (or not) the connection on creation of a consumer type if this value is true and the connection has not yet been started. Given that the default behavior of the simplified API is to auto start (hence being "simpler") it would be rather odd to not being doing that. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
