Author: bvahdat
Date: Thu Jun 14 17:24:57 2012
New Revision: 1350348
URL: http://svn.apache.org/viewvc?rev=1350348&view=rev
Log:
Polished.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/OnCompletionContainsTest.java
camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseSpringConsumerTest.java
camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseSpringProducerTest.java
camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java
camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaEndpointTest.java
camel/trunk/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/MockAS400ConnectionPool.java
camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/AbstractMongoDbTest.java
camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTEndpoint.java
camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTProducer.java
camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTConsumerTest.java
camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/DamnException.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/ReflectionUtils.java
camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConsumer.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java?rev=1350348&r1=1350347&r2=1350348&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
Thu Jun 14 17:24:57 2012
@@ -52,12 +52,14 @@ public class PropertiesComponent extends
* The default prefix token.
* @deprecated Use {@link #DEFAULT_PREFIX_TOKEN} instead.
*/
+ @Deprecated
public static final String PREFIX_TOKEN = DEFAULT_PREFIX_TOKEN;
/**
* The default suffix token.
* @deprecated Use {@link #DEFAULT_SUFFIX_TOKEN} instead.
*/
+ @Deprecated
public static final String SUFFIX_TOKEN = DEFAULT_SUFFIX_TOKEN;
/**
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/OnCompletionContainsTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/OnCompletionContainsTest.java?rev=1350348&r1=1350347&r2=1350348&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/OnCompletionContainsTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/OnCompletionContainsTest.java
Thu Jun 14 17:24:57 2012
@@ -28,11 +28,10 @@ import org.apache.camel.support.Synchron
public class OnCompletionContainsTest extends ContextTestSupport {
class SimpleSynchronizationAdapter extends SynchronizationAdapter {
- private String endPoint;
- private String body;
+ private final String endPoint;
+ private final String body;
SimpleSynchronizationAdapter(String endPoint, String body) {
- super();
this.endPoint = endPoint;
this.body = body;
}
@@ -69,8 +68,7 @@ public class OnCompletionContainsTest ex
SynchronizationAdapter adapter = new
SimpleSynchronizationAdapter("mock:sync", "A");
exchange.addOnCompletion(adapter);
- // should not add the adapter again as we already have
- // it
+ // should not add the adapter again as we already have
it
if (!exchange.containsOnCompletion(adapter)) {
exchange.addOnCompletion(adapter);
}
@@ -78,14 +76,12 @@ public class OnCompletionContainsTest ex
adapter = new
SimpleSynchronizationAdapter("mock:sync", "B");
exchange.addOnCompletion(adapter);
- // now add the B again as we want to test that this
also
- // work
+ // now add the B again as we want to test that this
also work
if (exchange.containsOnCompletion(adapter)) {
exchange.addOnCompletion(adapter);
}
- // add a C that is no a SimpleSynchronizationAdapter
- // class
+ // add a C that is no a SimpleSynchronizationAdapter
class
exchange.addOnCompletion(new SynchronizationAdapter() {
@Override
public void onDone(Exchange exchange) {
Modified:
camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseSpringConsumerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseSpringConsumerTest.java?rev=1350348&r1=1350347&r2=1350348&view=diff
==============================================================================
---
camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseSpringConsumerTest.java
(original)
+++
camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseSpringConsumerTest.java
Thu Jun 14 17:24:57 2012
@@ -17,7 +17,6 @@
package org.apache.camel.component.hbase;
-import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.spring.SpringCamelContext;
import org.apache.hadoop.hbase.TableExistsException;
import org.junit.After;
@@ -39,7 +38,7 @@ public class HBaseSpringConsumerTest ext
//Ignore if table exists
}
applicationContext = createApplicationContext();
- context = (ModelCamelContext)
SpringCamelContext.springCamelContext(applicationContext);
+ context =
SpringCamelContext.springCamelContext(applicationContext);
}
}
Modified:
camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseSpringProducerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseSpringProducerTest.java?rev=1350348&r1=1350347&r2=1350348&view=diff
==============================================================================
---
camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseSpringProducerTest.java
(original)
+++
camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseSpringProducerTest.java
Thu Jun 14 17:24:57 2012
@@ -17,7 +17,6 @@
package org.apache.camel.component.hbase;
-import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.spring.SpringCamelContext;
import org.apache.hadoop.hbase.TableExistsException;
import org.junit.After;
@@ -39,7 +38,7 @@ public class HBaseSpringProducerTest ext
//Ignore if table exists
}
applicationContext = createApplicationContext();
- context = (ModelCamelContext)
SpringCamelContext.springCamelContext(applicationContext);
+ context =
SpringCamelContext.springCamelContext(applicationContext);
}
}
Modified:
camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java?rev=1350348&r1=1350347&r2=1350348&view=diff
==============================================================================
---
camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java
(original)
+++
camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java
Thu Jun 14 17:24:57 2012
@@ -63,6 +63,7 @@ public class JpaEndpoint extends Schedul
* @param endpointUri
* @deprecated use {@link JpaEndpoint#JpaEndpoint(String, JpaComponent)}
instead
*/
+ @Deprecated
public JpaEndpoint(String endpointUri) {
super(endpointUri);
}
@@ -79,6 +80,7 @@ public class JpaEndpoint extends Schedul
* @param entityManagerFactory
* @deprecated use {@link JpaEndpoint#JpaEndpoint(String, JpaComponent)}
instead
*/
+ @Deprecated
public JpaEndpoint(String endpointUri, EntityManagerFactory
entityManagerFactory) {
super(endpointUri);
this.entityManagerFactory = entityManagerFactory;
@@ -91,6 +93,7 @@ public class JpaEndpoint extends Schedul
* @param transactionManager
* @deprecated use {@link JpaEndpoint#JpaEndpoint(String, JpaComponent)}
instead
*/
+ @Deprecated
public JpaEndpoint(String endpointUri, EntityManagerFactory
entityManagerFactory, PlatformTransactionManager transactionManager) {
super(endpointUri);
this.entityManagerFactory = entityManagerFactory;
Modified:
camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaEndpointTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaEndpointTest.java?rev=1350348&r1=1350347&r2=1350348&view=diff
==============================================================================
---
camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaEndpointTest.java
(original)
+++
camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaEndpointTest.java
Thu Jun 14 17:24:57 2012
@@ -45,6 +45,7 @@ public class JpaEndpointTest extends Cam
*
* @deprecated
*/
+ @Deprecated
@Test
public void testJpaEndpointCtrUrl() throws Exception {
JpaEndpoint jpa = new
JpaEndpoint("jpa://org.apache.camel.examples.SendEmail");
@@ -61,6 +62,7 @@ public class JpaEndpointTest extends Cam
*
* @deprecated
*/
+ @Deprecated
@Test
public void testJpaEndpointCtrUrlEMF() throws Exception {
EntityManagerFactory fac =
Persistence.createEntityManagerFactory("camel");
@@ -79,6 +81,7 @@ public class JpaEndpointTest extends Cam
*
* @deprecated
*/
+ @Deprecated
@Test
public void testJpaEndpointCtrUrlEMFandTM() throws Exception {
EntityManagerFactory fac =
Persistence.createEntityManagerFactory("camel");
Modified:
camel/trunk/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/MockAS400ConnectionPool.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/MockAS400ConnectionPool.java?rev=1350348&r1=1350347&r2=1350348&view=diff
==============================================================================
---
camel/trunk/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/MockAS400ConnectionPool.java
(original)
+++
camel/trunk/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/MockAS400ConnectionPool.java
Thu Jun 14 17:24:57 2012
@@ -30,7 +30,6 @@ public class MockAS400ConnectionPool ext
private static final long serialVersionUID = -7473444280370756827L;
public MockAS400ConnectionPool() {
- super();
setRunMaintenance(false);
setThreadUsed(false);
}
Modified:
camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/AbstractMongoDbTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/AbstractMongoDbTest.java?rev=1350348&r1=1350347&r2=1350348&view=diff
==============================================================================
---
camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/AbstractMongoDbTest.java
(original)
+++
camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/AbstractMongoDbTest.java
Thu Jun 14 17:24:57 2012
@@ -54,10 +54,6 @@ public abstract class AbstractMongoDbTes
protected ApplicationContext applicationContext;
- public AbstractMongoDbTest() {
- super();
- }
-
/**
* Checks whether Mongo is running using the connection URI defined in the
mongodb.test.properties file
* @throws IOException
Modified:
camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTEndpoint.java?rev=1350348&r1=1350347&r2=1350348&view=diff
==============================================================================
---
camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTEndpoint.java
(original)
+++
camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTEndpoint.java
Thu Jun 14 17:24:57 2012
@@ -37,7 +37,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Twitter direct endpoint
+ * MQTT endpoint
*/
public class MQTTEndpoint extends DefaultEndpoint {
private static final transient Logger LOG =
LoggerFactory.getLogger(MQTTEndpoint.class);
@@ -163,7 +163,6 @@ public class MQTTEndpoint extends Defaul
}
void publish(String topic, byte[] payload, QoS qoS, boolean retain) throws
Exception {
- final Promise promise = new Promise();
connection.publish(topic, payload, qoS, retain, null);
/*
connection.publish(topic, payload, qoS, retain, new Callback<Void>() {
Modified:
camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTProducer.java?rev=1350348&r1=1350347&r2=1350348&view=diff
==============================================================================
---
camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTProducer.java
(original)
+++
camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTProducer.java
Thu Jun 14 17:24:57 2012
@@ -32,8 +32,6 @@ public class MQTTProducer extends Defaul
}
-
-
@Override
public boolean process(Exchange exchange, AsyncCallback asyncCallback) {
try {
@@ -46,7 +44,6 @@ public class MQTTProducer extends Defaul
}
void doProcess(Exchange exchange) throws Exception {
-
byte[] body = exchange.getIn().getBody(byte[].class);
if (body != null) {
MQTTConfiguration configuration = mqttEndpoint.getConfiguration();
@@ -67,7 +64,6 @@ public class MQTTProducer extends Defaul
topicName = topicValue.toString();
}
mqttEndpoint.publish(topicName, body, qoS, retain);
-
}
}
}
Modified:
camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTConsumerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTConsumerTest.java?rev=1350348&r1=1350347&r2=1350348&view=diff
==============================================================================
---
camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTConsumerTest.java
(original)
+++
camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTConsumerTest.java
Thu Jun 14 17:24:57 2012
@@ -35,8 +35,6 @@ public class MQTTConsumerTest extends MQ
MQTT mqtt = new MQTT();
BlockingConnection publisherConnection = mqtt.blockingConnection();
Topic topic = new Topic(TEST_TOPIC, QoS.AT_MOST_ONCE);
- Topic[] topics = {topic};
-
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(numberOfMessages);
Modified:
camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/DamnException.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/DamnException.java?rev=1350348&r1=1350347&r2=1350348&view=diff
==============================================================================
---
camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/DamnException.java
(original)
+++
camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/DamnException.java
Thu Jun 14 17:24:57 2012
@@ -21,6 +21,8 @@ package org.apache.camel.component.rmi;
*/
public class DamnException extends Exception {
+ private static final long serialVersionUID = 1L;
+
public DamnException(String s) {
super(s);
}
Modified:
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/ReflectionUtils.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/ReflectionUtils.java?rev=1350348&r1=1350347&r2=1350348&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/ReflectionUtils.java
(original)
+++
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/ReflectionUtils.java
Thu Jun 14 17:24:57 2012
@@ -38,7 +38,7 @@ public class ReflectionUtils extends org
} catch (IllegalArgumentException ex) {
throw new UnsupportedOperationException("Cannot inject value of
class: " + value.getClass() + " into: " + f);
} catch (IllegalAccessException ex) {
- ReflectionUtils.handleReflectionException(ex);
+ handleReflectionException(ex);
}
}
Modified:
camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConsumer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConsumer.java?rev=1350348&r1=1350347&r2=1350348&view=diff
==============================================================================
---
camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConsumer.java
(original)
+++
camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConsumer.java
Thu Jun 14 17:24:57 2012
@@ -19,7 +19,6 @@ package org.apache.camel.component.zooke
import java.util.concurrent.ExecutorService;
import java.util.concurrent.LinkedBlockingQueue;
-import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.zookeeper.operations.AnyOfOperations;
@@ -56,7 +55,7 @@ public class ZooKeeperConsumer extends D
private ExecutorService executor;
public ZooKeeperConsumer(ZooKeeperEndpoint endpoint, Processor processor) {
- super((Endpoint)endpoint, processor);
+ super(endpoint, processor);
this.connectionManager = endpoint.getConnectionManager();
this.configuration = endpoint.getConfiguration();
}
