http://git-wip-us.apache.org/repos/asf/camel/blob/86efd450/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java index d7eb449..3dac038 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java @@ -19,7 +19,6 @@ package org.apache.camel.component.sjms.producer; import java.util.ArrayList; import java.util.Collection; import java.util.List; - import javax.jms.Connection; import javax.jms.Message; import javax.jms.MessageProducer; @@ -97,13 +96,13 @@ public class InOnlyProducer extends SjmsProducer { Collection<Message> messages = new ArrayList<Message>(1); if (exchange.getIn().getBody() != null) { if (exchange.getIn().getBody() instanceof List) { - Iterable<?> payload = (Iterable<?>)exchange.getIn().getBody(); + Iterable<?> payload = (Iterable<?>) exchange.getIn().getBody(); for (final Object object : payload) { Message message; if (BatchMessage.class.isInstance(object)) { - BatchMessage<?> batchMessage = (BatchMessage<?>)object; + BatchMessage<?> batchMessage = (BatchMessage<?>) object; message = JmsMessageHelper.createMessage(producer.getSession(), batchMessage.getPayload(), batchMessage.getHeaders(), getSjmsEndpoint() - .getJmsKeyFormatStrategy()); + .getJmsKeyFormatStrategy()); } else { message = JmsMessageHelper.createMessage(producer.getSession(), object, exchange.getIn().getHeaders(), getSjmsEndpoint().getJmsKeyFormatStrategy()); } @@ -112,7 +111,7 @@ public class InOnlyProducer extends SjmsProducer { } else { Object payload = exchange.getIn().getBody(); Message message = JmsMessageHelper - .createMessage(producer.getSession(), payload, exchange.getIn().getHeaders(), getSjmsEndpoint().getJmsKeyFormatStrategy()); + .createMessage(producer.getSession(), payload, exchange.getIn().getHeaders(), getSjmsEndpoint().getJmsKeyFormatStrategy()); messages.add(message); } }
http://git-wip-us.apache.org/repos/asf/camel/blob/86efd450/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java index 88a289a..2830113 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java @@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; - import javax.jms.Connection; import javax.jms.Destination; import javax.jms.Message; @@ -58,16 +57,13 @@ public class InOutProducer extends SjmsProducer { /** * We use the {@link ReadWriteLock} to manage the {@link TreeMap} in place * of a {@link ConcurrentMap} because due to significant performance gains. - * TODO Externalize the Exchanger Map to a store object */ private static Map<String, Exchanger<Object>> exchangerMap = new TreeMap<String, Exchanger<Object>>(); private ReadWriteLock lock = new ReentrantReadWriteLock(); /** * A pool of {@link MessageConsumerResource} objects that are the reply - * consumers. - * TODO Add Class documentation for MessageProducerPool - * TODO Externalize + * consumers. */ protected class MessageConsumerResourcesFactory extends BasePoolableObjectFactory<MessageConsumerResources> { @@ -141,11 +137,6 @@ public class InOutProducer extends SjmsProducer { private final Logger tempLogger = LoggerFactory.getLogger(InternalTempDestinationListener.class); private Exchanger<Object> exchanger; - /** - * TODO Add Constructor Javadoc - * - * @param exchanger - */ public InternalTempDestinationListener(Exchanger<Object> exchanger) { this.exchanger = exchanger; } @@ -183,7 +174,7 @@ public class InOutProducer extends SjmsProducer { setConsumers(new GenericObjectPool<MessageConsumerResources>(new MessageConsumerResourcesFactory())); getConsumers().setMaxActive(getConsumerCount()); getConsumers().setMaxIdle(getConsumerCount()); - while(getConsumers().getNumIdle() < getConsumers().getMaxIdle()){ + while (getConsumers().getNumIdle() < getConsumers().getMaxIdle()) { getConsumers().addObject(); } } @@ -206,7 +197,7 @@ public class InOutProducer extends SjmsProducer { try { MessageProducer messageProducer = null; Session session = null; - + conn = getConnectionResource().borrowConnection(); if (isEndpointTransacted()) { session = conn.createSession(true, getAcknowledgeMode()); @@ -222,7 +213,7 @@ public class InOutProducer extends SjmsProducer { if (messageProducer == null) { throw new CamelException("Message Consumer Creation Exception: MessageProducer is NULL"); } - + answer = new MessageProducerResources(session, messageProducer); } catch (Exception e) { @@ -232,19 +223,13 @@ public class InOutProducer extends SjmsProducer { getConnectionResource().returnConnection(conn); } } - + return answer; } /** * TODO time out is actually double as it waits for the producer and then * waits for the response. Use an atomic long to manage the countdown - * - * @see org.apache.camel.component.sjms.SjmsProducer#sendMessage(org.apache.camel.Exchange, - * org.apache.camel.AsyncCallback) - * @param exchange - * @param callback - * @throws Exception */ @Override public void sendMessage(final Exchange exchange, final AsyncCallback callback, final MessageProducerResources producer) throws Exception { @@ -305,9 +290,9 @@ public class InOutProducer extends SjmsProducer { if (exchange.getException() == null) { if (responseObject instanceof Throwable) { - exchange.setException((Throwable)responseObject); + exchange.setException((Throwable) responseObject); } else if (responseObject instanceof Message) { - Message response = (Message)responseObject; + Message response = (Message) responseObject; SjmsExchangeMessageHelper.populateExchange(response, exchange, true); } else { exchange.setException(new CamelException("Unknown response type: " + responseObject)); http://git-wip-us.apache.org/repos/asf/camel/blob/86efd450/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/BatchTransactionCommitStrategy.java ---------------------------------------------------------------------- diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/BatchTransactionCommitStrategy.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/BatchTransactionCommitStrategy.java index 66407dd..a103164 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/BatchTransactionCommitStrategy.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/BatchTransactionCommitStrategy.java @@ -24,7 +24,6 @@ import org.apache.camel.component.sjms.TransactionCommitStrategy; /** * Provides a thread safe counter to track the number of {@link Exchange} * objects that have been been processed. - * */ public class BatchTransactionCommitStrategy implements TransactionCommitStrategy { @@ -55,7 +54,7 @@ public class BatchTransactionCommitStrategy implements TransactionCommitStrategy current.set(0); return true; } - + public void reset() { current.set(0); } http://git-wip-us.apache.org/repos/asf/camel/blob/86efd450/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/DefaultTransactionCommitStrategy.java ---------------------------------------------------------------------- diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/DefaultTransactionCommitStrategy.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/DefaultTransactionCommitStrategy.java index 19d94b4..2b71e7e 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/DefaultTransactionCommitStrategy.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/DefaultTransactionCommitStrategy.java @@ -21,16 +21,14 @@ import org.apache.camel.component.sjms.TransactionCommitStrategy; /** * The default commit strategy for all transaction. - * */ public class DefaultTransactionCommitStrategy implements TransactionCommitStrategy { /** - * @see org.apache.camel.component.sjms.TransactionCommitStrategy#commit(org.apache.camel.Exchange) - * * @param exchange * @return * @throws Exception + * @see org.apache.camel.component.sjms.TransactionCommitStrategy#commit(org.apache.camel.Exchange) */ @Override public boolean commit(Exchange exchange) throws Exception { @@ -38,11 +36,10 @@ public class DefaultTransactionCommitStrategy implements TransactionCommitStrate } /** - * @see org.apache.camel.component.sjms.TransactionCommitStrategy#rollback(org.apache.camel.Exchange) - * * @param exchange * @return * @throws Exception + * @see org.apache.camel.component.sjms.TransactionCommitStrategy#rollback(org.apache.camel.Exchange) */ @Override public boolean rollback(Exchange exchange) throws Exception { http://git-wip-us.apache.org/repos/asf/camel/blob/86efd450/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/SessionBatchTransactionSynchronization.java ---------------------------------------------------------------------- diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/SessionBatchTransactionSynchronization.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/SessionBatchTransactionSynchronization.java index e18e057..7852772 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/SessionBatchTransactionSynchronization.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/SessionBatchTransactionSynchronization.java @@ -19,7 +19,6 @@ package org.apache.camel.component.sjms.tx; import java.util.TimerTask; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; - import javax.jms.Session; import org.apache.camel.Exchange; @@ -135,7 +134,7 @@ public class SessionBatchTransactionSynchronization implements Synchronization { if (session != null && session.getTransacted()) { session.commit(); } - ((BatchTransactionCommitStrategy)commitStrategy).reset(); + ((BatchTransactionCommitStrategy) commitStrategy).reset(); } catch (Exception e) { LOG.warn("Failed to commit the session during timeout: " + e.getMessage() + ". This exception will be ignored.", e); } http://git-wip-us.apache.org/repos/asf/camel/blob/86efd450/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/SessionTransactionSynchronization.java ---------------------------------------------------------------------- diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/SessionTransactionSynchronization.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/SessionTransactionSynchronization.java index 9de2144..433c20e 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/SessionTransactionSynchronization.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/SessionTransactionSynchronization.java @@ -42,9 +42,8 @@ public class SessionTransactionSynchronization implements Synchronization { } /** - * @see - * org.apache.camel.spi.Synchronization#onFailure(org.apache.camel.Exchange) * @param exchange + * @see org.apache.camel.spi.Synchronization#onFailure(org.apache.camel.Exchange) */ @Override public void onFailure(Exchange exchange) { @@ -61,10 +60,9 @@ public class SessionTransactionSynchronization implements Synchronization { } /** - * @see - * org.apache.camel.spi.Synchronization#onComplete(org.apache.camel.Exchange - * ) * @param exchange + * @see org.apache.camel.spi.Synchronization#onComplete(org.apache.camel.Exchange + *) */ @Override public void onComplete(Exchange exchange) { http://git-wip-us.apache.org/repos/asf/camel/blob/86efd450/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/ConnectionFactoryResourceTest.java ---------------------------------------------------------------------- diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/ConnectionFactoryResourceTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/ConnectionFactoryResourceTest.java index de8049c..aca5a38 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/ConnectionFactoryResourceTest.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/ConnectionFactoryResourceTest.java @@ -16,9 +16,6 @@ */ package org.apache.camel.component.sjms.jms; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - import java.util.NoSuchElementException; import org.apache.activemq.ActiveMQConnection; @@ -27,9 +24,9 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -/** - * TODO Add Class documentation for ConnectionFactoryResourceTest - */ +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + public class ConnectionFactoryResourceTest { private ActiveMQConnectionFactory connectionFactory; @@ -43,77 +40,50 @@ public class ConnectionFactoryResourceTest { connectionFactory = null; } - /** - * Test method for - * {@link org.apache.camel.component.sjms.jms.ConnectionFactoryResource#makeObject()} - * . - * - * @throws Exception - */ @Test public void testCreateObject() throws Exception { ConnectionFactoryResource pool = new ConnectionFactoryResource(1, connectionFactory); pool.fillPool(); assertNotNull(pool); - ActiveMQConnection connection = (ActiveMQConnection)pool.makeObject(); + ActiveMQConnection connection = (ActiveMQConnection) pool.makeObject(); assertNotNull(connection); assertTrue(connection.isStarted()); pool.drainPool(); } - /** - * Test method for - * {@link org.apache.camel.component.sjms.jms.ConnectionFactoryResource#destroyObject()} - * . - * - * @throws Exception - */ @Test public void testDestroyObject() throws Exception { ConnectionFactoryResource pool = new ConnectionFactoryResource(1, connectionFactory); pool.fillPool(); assertNotNull(pool); - ActiveMQConnection connection = (ActiveMQConnection)pool.makeObject(); + ActiveMQConnection connection = (ActiveMQConnection) pool.makeObject(); assertNotNull(connection); assertTrue(connection.isStarted()); pool.drainPool(); assertTrue(pool.size() == 0); } - /** - * Test method for - * {@link org.apache.camel.component.sjms.jms.ConnectionResource#borrowConnection()}. - * - * @throws Exception - */ - @Test(expected=NoSuchElementException.class) + @Test(expected = NoSuchElementException.class) public void testBorrowObject() throws Exception { ConnectionFactoryResource pool = new ConnectionFactoryResource(1, connectionFactory); pool.fillPool(); assertNotNull(pool); - ActiveMQConnection connection = (ActiveMQConnection)pool.borrowConnection(); + ActiveMQConnection connection = (ActiveMQConnection) pool.borrowConnection(); assertNotNull(connection); assertTrue(connection.isStarted()); pool.borrowConnection(); } - /** - * Test method for - * {@link org.apache.camel.component.sjms.jms.ConnectionResource#returnConnection(java.lang.Object)} - * . - * - * @throws Exception - */ @Test public void testReturnObject() throws Exception { ConnectionFactoryResource pool = new ConnectionFactoryResource(1, connectionFactory); pool.fillPool(); assertNotNull(pool); - ActiveMQConnection connection = (ActiveMQConnection)pool.borrowConnection(); + ActiveMQConnection connection = (ActiveMQConnection) pool.borrowConnection(); assertNotNull(connection); assertTrue(connection.isStarted()); pool.returnConnection(connection); - ActiveMQConnection connection2 = (ActiveMQConnection)pool.borrowConnection(); + ActiveMQConnection connection2 = (ActiveMQConnection) pool.borrowConnection(); assertNotNull(connection2); pool.drainPool(); } http://git-wip-us.apache.org/repos/asf/camel/blob/86efd450/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerTest.java index f38ade1..5488c94 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerTest.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerTest.java @@ -110,12 +110,6 @@ public class InOutQueueProducerTest extends JmsTestSupport { private String requestText; private String responseText; - /** - * TODO Add Constructor Javadoc - * - * @param request - * @param response - */ public MyMessageListener(String request, String response) { this.requestText = request; this.responseText = response; http://git-wip-us.apache.org/repos/asf/camel/blob/86efd450/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutTempQueueProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutTempQueueProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutTempQueueProducerTest.java index 728c263..5970e54 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutTempQueueProducerTest.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutTempQueueProducerTest.java @@ -84,12 +84,6 @@ public class InOutTempQueueProducerTest extends JmsTestSupport { private String requestText; private String responseText; - /** - * TODO Add Constructor Javadoc - * - * @param request - * @param response - */ public MyMessageListener(String request, String response) { this.requestText = request; this.responseText = response; http://git-wip-us.apache.org/repos/asf/camel/blob/86efd450/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/SjmsConnectionTestSupport.java ---------------------------------------------------------------------- diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/SjmsConnectionTestSupport.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/SjmsConnectionTestSupport.java index 1737567..17ab746 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/SjmsConnectionTestSupport.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/SjmsConnectionTestSupport.java @@ -27,10 +27,6 @@ import org.junit.BeforeClass; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * TODO Add Class documentation for SjmsConnectionTestSupport - * - */ public abstract class SjmsConnectionTestSupport { static { @@ -47,16 +43,10 @@ public abstract class SjmsConnectionTestSupport { public abstract String getConnectionUri(); - /** - * @throws java.lang.Exception - */ @BeforeClass public static void setUpBeforeClass() throws Exception { } - /** - * @throws java.lang.Exception - */ @AfterClass public static void tearDownAfterClass() throws Exception { } @@ -86,12 +76,6 @@ public abstract class SjmsConnectionTestSupport { } } - /** - * Gets the ActiveMQConnectionFactory value of testConnectionFactory for - * this instance of SjmsConnectionTestSupport. - * - * @return the testConnectionFactory - */ public ActiveMQConnectionFactory createTestConnectionFactory(String uri) { ActiveMQConnectionFactory cf = null; if (ObjectHelper.isEmpty(uri)) { @@ -121,45 +105,19 @@ public abstract class SjmsConnectionTestSupport { } } - /** - * Sets the ActiveMQConnectionFactory value of testConnectionFactory for - * this instance of SjmsConnectionTestSupport. - * - * @param testConnectionFactory - * Sets ActiveMQConnectionFactory, default is TODO add default - */ public void setTestConnectionFactory( ActiveMQConnectionFactory testConnectionFactory) { this.testConnectionFactory = testConnectionFactory; } - /** - * Gets the ActiveMQConnectionFactory value of testConnectionFactory for - * this instance of SjmsConnectionTestSupport. - * - * @return the testConnectionFactory - */ public ActiveMQConnectionFactory getTestConnectionFactory() { return testConnectionFactory; } - /** - * Sets the boolean value of persistenceEnabled for this instance of - * SjmsConnectionTestSupport. - * - * @param persistenceEnabled - * Sets boolean, default is false - */ public void setPersistenceEnabled(boolean persistenceEnabled) { this.persistenceEnabled = persistenceEnabled; } - /** - * Gets the boolean value of persistenceEnabled for this instance of - * SjmsConnectionTestSupport. - * - * @return the persistenceEnabled - */ public boolean isPersistenceEnabled() { return persistenceEnabled; }
