You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2012/02/12 20:47:07 UTC
svn commit: r1243305 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/model/
components/camel-avro/src/main/java/org/apache/camel/component/avro/
components/camel-avro/src/test/java/org/apache/camel/component/avro/
components/camel-aws/src/...
Author: bvahdat
Date: Sun Feb 12 19:47:06 2012
New Revision: 1243305
URL: http://svn.apache.org/viewvc?rev=1243305&view=rev
Log:
Polished and fixed one CS error.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroHttpConsumer.java
camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroNettyConsumer.java
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroHttpSpringProducerTest.java
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettySpringConsumerTest.java
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettySpringProducerTest.java
camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/AbstractDdbCommand.java
camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/BatchGetItemsCommand.java
camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DeleteTableCommand.java
camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/ScanCommand.java
camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/UpdateItemCommand.java
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/AmazonDDBClientMock.java
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/DeleteTableCommandTest.java
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/QueryCommandTest.java
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/ScanCommandTest.java
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/UpdateTableCommandTest.java
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java
camel/trunk/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/DigitalSignatureConstants.java
camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPredicateFilterTest.java
camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java
camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerRemoteRouteTimeOutTest.java
camel/trunk/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/EchoCommandFactory.java
camel/trunk/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentProducerTest.java
camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketClientCamelRoute2Test.java
camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketClientCamelRouteTest.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java?rev=1243305&r1=1243304&r2=1243305&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java Sun Feb 12 19:47:06 2012
@@ -546,8 +546,7 @@ public abstract class ProcessorDefinitio
// lookup and resolve known constant fields for String based properties
for (Map.Entry<String, Object> entry : properties.entrySet()) {
- // the name is always a String
- String name = (String) entry.getKey();
+ String name = entry.getKey();
Object value = entry.getValue();
if (value instanceof String) {
// we can only resolve String typed values
Modified: camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroHttpConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroHttpConsumer.java?rev=1243305&r1=1243304&r2=1243305&view=diff
==============================================================================
--- camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroHttpConsumer.java (original)
+++ camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroHttpConsumer.java Sun Feb 12 19:47:06 2012
@@ -44,9 +44,4 @@ public class AvroHttpConsumer extends Av
server.close();
}
}
-
- @Override
- public AvroEndpoint getEndpoint() {
- return (AvroEndpoint) super.getEndpoint();
- }
}
Modified: camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroNettyConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroNettyConsumer.java?rev=1243305&r1=1243304&r2=1243305&view=diff
==============================================================================
--- camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroNettyConsumer.java (original)
+++ camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroNettyConsumer.java Sun Feb 12 19:47:06 2012
@@ -46,9 +46,4 @@ public class AvroNettyConsumer extends A
server.close();
}
}
-
- @Override
- public AvroEndpoint getEndpoint() {
- return (AvroEndpoint) super.getEndpoint();
- }
}
Modified: camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroHttpSpringProducerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroHttpSpringProducerTest.java?rev=1243305&r1=1243304&r2=1243305&view=diff
==============================================================================
--- camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroHttpSpringProducerTest.java (original)
+++ camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroHttpSpringProducerTest.java Sun Feb 12 19:47:06 2012
@@ -18,7 +18,6 @@
package org.apache.camel.component.avro;
import org.apache.camel.CamelContext;
-import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.spring.SpringCamelContext;
import org.junit.After;
@@ -54,7 +53,7 @@ public class AvroHttpSpringProducerTest
@Override
protected CamelContext createCamelContext() throws Exception {
- return (ModelCamelContext) SpringCamelContext.springCamelContext(applicationContext);
+ return SpringCamelContext.springCamelContext(applicationContext);
}
@Override
Modified: camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettySpringConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettySpringConsumerTest.java?rev=1243305&r1=1243304&r2=1243305&view=diff
==============================================================================
--- camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettySpringConsumerTest.java (original)
+++ camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettySpringConsumerTest.java Sun Feb 12 19:47:06 2012
@@ -18,7 +18,6 @@
package org.apache.camel.component.avro;
import org.apache.camel.avro.impl.KeyValueProtocolImpl;
-import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.spring.SpringCamelContext;
import org.junit.After;
@@ -35,7 +34,7 @@ public class AvroNettySpringConsumerTest
@Before
public void setUp() throws Exception {
applicationContext = createApplicationContext();
- context = (ModelCamelContext) SpringCamelContext.springCamelContext(applicationContext);
+ context = SpringCamelContext.springCamelContext(applicationContext);
keyValue = (KeyValueProtocolImpl) applicationContext.getBean("keyValue");
super.setUp();
}
Modified: camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettySpringProducerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettySpringProducerTest.java?rev=1243305&r1=1243304&r2=1243305&view=diff
==============================================================================
--- camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettySpringProducerTest.java (original)
+++ camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettySpringProducerTest.java Sun Feb 12 19:47:06 2012
@@ -18,7 +18,6 @@
package org.apache.camel.component.avro;
import org.apache.camel.CamelContext;
-import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.spring.SpringCamelContext;
import org.junit.After;
@@ -54,7 +53,7 @@ public class AvroNettySpringProducerTest
@Override
protected CamelContext createCamelContext() throws Exception {
- return (ModelCamelContext) SpringCamelContext.springCamelContext(applicationContext);
+ return SpringCamelContext.springCamelContext(applicationContext);
}
@Override
Modified: camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/AbstractDdbCommand.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/AbstractDdbCommand.java?rev=1243305&r1=1243304&r2=1243305&view=diff
==============================================================================
--- camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/AbstractDdbCommand.java (original)
+++ camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/AbstractDdbCommand.java Sun Feb 12 19:47:06 2012
@@ -26,8 +26,6 @@ import com.amazonaws.services.dynamodb.m
import org.apache.camel.Exchange;
import org.apache.camel.Message;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public abstract class AbstractDdbCommand {
protected DdbConfiguration configuration;
@@ -59,10 +57,12 @@ public abstract class AbstractDdbCommand
return tableName != null ? tableName : configuration.getTableName();
}
+ @SuppressWarnings("unchecked")
protected Map<String, ExpectedAttributeValue> determineUpdateCondition() {
return exchange.getIn().getHeader(DdbConstants.UPDATE_CONDITION, Map.class);
}
+ @SuppressWarnings("unchecked")
protected Map<String, AttributeValue> determineItem() {
return exchange.getIn().getHeader(DdbConstants.ITEM, Map.class);
}
@@ -85,6 +85,7 @@ public abstract class AbstractDdbCommand
return exchange.getIn().getHeader(DdbConstants.KEY, Key.class);
}
+ @SuppressWarnings("unchecked")
protected Collection<String> determineAttributeNames() {
return exchange.getIn().getHeader(DdbConstants.ATTRIBUTE_NAMES, Collection.class);
}
Modified: camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/BatchGetItemsCommand.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/BatchGetItemsCommand.java?rev=1243305&r1=1243304&r2=1243305&view=diff
==============================================================================
--- camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/BatchGetItemsCommand.java (original)
+++ camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/BatchGetItemsCommand.java Sun Feb 12 19:47:06 2012
@@ -39,6 +39,7 @@ public class BatchGetItemsCommand extend
addToResult(DdbConstants.UNPROCESSED_KEYS, result.getUnprocessedKeys());
}
+ @SuppressWarnings("unchecked")
private Map<String, KeysAndAttributes> determineBatchItems() {
return exchange.getIn().getHeader(DdbConstants.BATCH_ITEMS, Map.class);
}
Modified: camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DeleteTableCommand.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DeleteTableCommand.java?rev=1243305&r1=1243304&r2=1243305&view=diff
==============================================================================
--- camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DeleteTableCommand.java (original)
+++ camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DeleteTableCommand.java Sun Feb 12 19:47:06 2012
@@ -17,9 +17,7 @@
package org.apache.camel.component.aws.ddb;
import com.amazonaws.services.dynamodb.AmazonDynamoDB;
-import com.amazonaws.services.dynamodb.AmazonDynamoDBClient;
import com.amazonaws.services.dynamodb.model.DeleteTableRequest;
-import com.amazonaws.services.dynamodb.model.DeleteTableResult;
import com.amazonaws.services.dynamodb.model.TableDescription;
import org.apache.camel.Exchange;
Modified: camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/ScanCommand.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/ScanCommand.java?rev=1243305&r1=1243304&r2=1243305&view=diff
==============================================================================
--- camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/ScanCommand.java (original)
+++ camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/ScanCommand.java Sun Feb 12 19:47:06 2012
@@ -43,6 +43,7 @@ public class ScanCommand extends Abstrac
addToResult(DdbConstants.SCANNED_COUNT, result.getScannedCount());
}
+ @SuppressWarnings("unchecked")
private Map<String, Condition> determineScanFilter() {
return exchange.getIn().getHeader(DdbConstants.SCAN_FILTER, Map.class);
}
Modified: camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/UpdateItemCommand.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/UpdateItemCommand.java?rev=1243305&r1=1243304&r2=1243305&view=diff
==============================================================================
--- camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/UpdateItemCommand.java (original)
+++ camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/UpdateItemCommand.java Sun Feb 12 19:47:06 2012
@@ -42,6 +42,7 @@ public class UpdateItemCommand extends A
addAttributesToResult(result.getAttributes());
}
+ @SuppressWarnings("unchecked")
private Map<String, AttributeValueUpdate> determineUpdateValues() {
return exchange.getIn().getHeader(DdbConstants.UPDATE_VALUES, Map.class);
}
Modified: camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/AmazonDDBClientMock.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/AmazonDDBClientMock.java?rev=1243305&r1=1243304&r2=1243305&view=diff
==============================================================================
--- camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/AmazonDDBClientMock.java (original)
+++ camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/AmazonDDBClientMock.java Sun Feb 12 19:47:06 2012
@@ -156,6 +156,7 @@ public class AmazonDDBClientMock extends
return new GetItemResult().withItem(getAttributes());
}
+ @SuppressWarnings("unchecked")
@Override
public BatchGetItemResult batchGetItem(BatchGetItemRequest batchGetItemRequest) {
this.batchGetItemRequest = batchGetItemRequest;
@@ -171,6 +172,7 @@ public class AmazonDDBClientMock extends
.withUnprocessedKeys(unprocessedKeys);
}
+ @SuppressWarnings("unchecked")
@Override
public ScanResult scan(ScanRequest scanRequest) {
this.scanRequest = scanRequest;
@@ -182,6 +184,7 @@ public class AmazonDDBClientMock extends
.withLastEvaluatedKey(new Key(new AttributeValue("LAST_KEY")));
}
+ @SuppressWarnings("unchecked")
@Override
public QueryResult query(QueryRequest queryRequest) {
this.queryRequest = queryRequest;
Modified: camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/DeleteTableCommandTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/DeleteTableCommandTest.java?rev=1243305&r1=1243304&r2=1243305&view=diff
==============================================================================
--- camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/DeleteTableCommandTest.java (original)
+++ camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/DeleteTableCommandTest.java Sun Feb 12 19:47:06 2012
@@ -19,15 +19,13 @@ package org.apache.camel.component.aws.d
import java.util.Date;
import com.amazonaws.services.dynamodb.model.KeySchema;
-import com.amazonaws.services.dynamodb.model.ProvisionedThroughput;
import com.amazonaws.services.dynamodb.model.ProvisionedThroughputDescription;
-import com.amazonaws.services.dynamodb.model.TableDescription;
import com.amazonaws.services.dynamodb.model.TableStatus;
import org.apache.camel.Exchange;
-import org.apache.camel.component.aws.sdb.AmazonSDBClientMock;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.DefaultExchange;
+
import org.junit.Before;
import org.junit.Test;
Modified: camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/QueryCommandTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/QueryCommandTest.java?rev=1243305&r1=1243304&r2=1243305&view=diff
==============================================================================
--- camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/QueryCommandTest.java (original)
+++ camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/QueryCommandTest.java Sun Feb 12 19:47:06 2012
@@ -17,7 +17,6 @@
package org.apache.camel.component.aws.ddb;
import java.util.Arrays;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -25,11 +24,11 @@ import com.amazonaws.services.dynamodb.m
import com.amazonaws.services.dynamodb.model.ComparisonOperator;
import com.amazonaws.services.dynamodb.model.Condition;
import com.amazonaws.services.dynamodb.model.Key;
-import com.amazonaws.services.dynamodb.model.QueryResult;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.DefaultExchange;
+
import org.junit.Before;
import org.junit.Test;
@@ -73,12 +72,10 @@ public class QueryCommandTest {
command.execute();
assertEquals(Integer.valueOf(1), exchange.getIn().getHeader(DdbConstants.COUNT, Integer.class));
- assertEquals(Double.valueOf(1.0), exchange.getIn().getHeader(DdbConstants.CONSUMED_CAPACITY,
- Double.class));
- assertEquals(new Key(new AttributeValue("LAST_KEY")), exchange.getIn().getHeader(
- DdbConstants.LAST_EVALUATED_KEY, Key.class));
- Map<String, AttributeValue> items = (Map<String, AttributeValue>)exchange.getIn().getHeader(
- DdbConstants.ITEMS, List.class).get(0);
+ assertEquals(Double.valueOf(1.0), exchange.getIn().getHeader(DdbConstants.CONSUMED_CAPACITY, Double.class));
+ assertEquals(new Key(new AttributeValue("LAST_KEY")), exchange.getIn().getHeader(DdbConstants.LAST_EVALUATED_KEY, Key.class));
+
+ Map<?, ?> items = (Map<?, ?>) exchange.getIn().getHeader(DdbConstants.ITEMS, List.class).get(0);
assertEquals(new AttributeValue("attrValue"), items.get("attrName"));
}
}
Modified: camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/ScanCommandTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/ScanCommandTest.java?rev=1243305&r1=1243304&r2=1243305&view=diff
==============================================================================
--- camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/ScanCommandTest.java (original)
+++ camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/ScanCommandTest.java Sun Feb 12 19:47:06 2012
@@ -61,18 +61,12 @@ public class ScanCommandTest {
command.execute();
assertEquals(scanFilter, ddbClient.scanRequest.getScanFilter());
- assertEquals(Integer.valueOf(10), exchange.getIn().getHeader(DdbConstants.SCANNED_COUNT,
- Integer.class));
+ assertEquals(Integer.valueOf(10), exchange.getIn().getHeader(DdbConstants.SCANNED_COUNT, Integer.class));
assertEquals(Integer.valueOf(1), exchange.getIn().getHeader(DdbConstants.COUNT, Integer.class));
- assertEquals(Double.valueOf(1.0), exchange.getIn().getHeader(DdbConstants.CONSUMED_CAPACITY,
- Double.class));
- assertEquals(new Key(new AttributeValue("LAST_KEY")), exchange.getIn().getHeader(
- DdbConstants.LAST_EVALUATED_KEY, Key.class));
-
- Map<String, AttributeValue> items = (Map<String, AttributeValue>)exchange.getIn().getHeader(
- DdbConstants.ITEMS, List.class).get(0);
+ assertEquals(Double.valueOf(1.0), exchange.getIn().getHeader(DdbConstants.CONSUMED_CAPACITY, Double.class));
+ assertEquals(new Key(new AttributeValue("LAST_KEY")), exchange.getIn().getHeader(DdbConstants.LAST_EVALUATED_KEY, Key.class));
+ Map<?, ?> items = (Map<?, ?>) exchange.getIn().getHeader(DdbConstants.ITEMS, List.class).get(0);
assertEquals(new AttributeValue("attrValue"), items.get("attrName"));
-
}
}
\ No newline at end of file
Modified: camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/UpdateTableCommandTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/UpdateTableCommandTest.java?rev=1243305&r1=1243304&r2=1243305&view=diff
==============================================================================
--- camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/UpdateTableCommandTest.java (original)
+++ camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/UpdateTableCommandTest.java Sun Feb 12 19:47:06 2012
@@ -17,9 +17,9 @@
package org.apache.camel.component.aws.ddb;
import org.apache.camel.Exchange;
-import org.apache.camel.component.aws.sdb.AmazonSDBClientMock;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.DefaultExchange;
+
import org.junit.Before;
import org.junit.Test;
Modified: camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java?rev=1243305&r1=1243304&r2=1243305&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java (original)
+++ camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java Sun Feb 12 19:47:06 2012
@@ -28,7 +28,6 @@ import java.util.Map;
import java.util.Scanner;
import org.apache.camel.Exchange;
-import org.apache.camel.converter.IOConverter;
import org.apache.camel.dataformat.bindy.BindyAbstractDataFormat;
import org.apache.camel.dataformat.bindy.BindyAbstractFactory;
import org.apache.camel.dataformat.bindy.BindyCsvFactory;
@@ -37,6 +36,7 @@ import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.PackageScanClassResolver;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: camel/trunk/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/DigitalSignatureConstants.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/DigitalSignatureConstants.java?rev=1243305&r1=1243304&r2=1243305&view=diff
==============================================================================
--- camel/trunk/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/DigitalSignatureConstants.java (original)
+++ camel/trunk/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/DigitalSignatureConstants.java Sun Feb 12 19:47:06 2012
@@ -27,4 +27,8 @@ public final class DigitalSignatureConst
public static final String SIGNATURE = "CamelDigitalSignature";
public static final String KEYSTORE_ALIAS = "CamelSignatureKeyStoreAlias";
public static final String KEYSTORE_PASSWORD = "CamelSignatureKeyStorePassword";
+
+ private DigitalSignatureConstants() {
+ // Utility class
+ }
}
Modified: camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPredicateFilterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPredicateFilterTest.java?rev=1243305&r1=1243304&r2=1243305&view=diff
==============================================================================
--- camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPredicateFilterTest.java (original)
+++ camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPredicateFilterTest.java Sun Feb 12 19:47:06 2012
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.xquery;
-import org.w3c.dom.Document;
-
import org.apache.camel.EndpointInject;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
Modified: camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java?rev=1243305&r1=1243304&r2=1243305&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java (original)
+++ camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java Sun Feb 12 19:47:06 2012
@@ -171,16 +171,7 @@ public class SpringWebserviceProducer ex
field.setAccessible(true);
Object value = field.get(webServiceMessageSender);
-
- Field inheritedField;
- try {
- inheritedField = CamelHttpsUrlConnectionMessageSender.this.getClass().getSuperclass().getDeclaredField(fieldName);
- } catch (NoSuchFieldException e) {
- throw new IllegalArgumentException("Unexpected exception!", e);
- }
-
- inheritedField.setAccessible(true);
- inheritedField.set(CamelHttpsUrlConnectionMessageSender.this, value);
+ field.set(CamelHttpsUrlConnectionMessageSender.this, value);
LOG.trace("Populated the field {} with the value {}", fieldName, value);
}
Modified: camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerRemoteRouteTimeOutTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerRemoteRouteTimeOutTest.java?rev=1243305&r1=1243304&r2=1243305&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerRemoteRouteTimeOutTest.java (original)
+++ camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerRemoteRouteTimeOutTest.java Sun Feb 12 19:47:06 2012
@@ -69,7 +69,7 @@ public class ProducerRemoteRouteTimeOutT
@Test
public void callStockQuoteWebserviceCommonsHttpWith5000MillSecondsTimeout() throws Exception {
Object result = template.requestBody("direct:stockQuoteWebserviceCommonsHttpWith5000MillSecondsTimeout", xmlRequestForGoogleStockQuote);
-
+
assertNotNull(result);
assertTrue(result instanceof String);
String resultMessage = (String) result;
@@ -144,18 +144,15 @@ public class ProducerRemoteRouteTimeOutT
CamelHttpsUrlConnectionMessageSender toMessageSender = new CamelHttpsUrlConnectionMessageSender(new SpringWebserviceConfiguration(), fromMessageSender);
assertFalse("acceptGzipEncoding field didn't get populated properly!", toMessageSender.isAcceptGzipEncoding());
- for (Field expectedField : fromMessageSender.getClass().getDeclaredFields()) {
- if (Modifier.isStatic(expectedField.getModifiers())) {
+ for (Field field : fromMessageSender.getClass().getDeclaredFields()) {
+ if (Modifier.isStatic(field.getModifiers())) {
continue;
}
- expectedField.setAccessible(true);
- String fieldName = expectedField.getName();
-
- Field actualField = toMessageSender.getClass().getSuperclass().getDeclaredField(fieldName);
- actualField.setAccessible(true);
+ field.setAccessible(true);
+ String fieldName = field.getName();
- assertSame("The field '" + fieldName + "' didn't get populated properly!", expectedField.get(fromMessageSender), actualField.get(toMessageSender));
+ assertSame("The field '" + fieldName + "' didn't get populated properly!", field.get(fromMessageSender), field.get(toMessageSender));
}
}
Modified: camel/trunk/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/EchoCommandFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/EchoCommandFactory.java?rev=1243305&r1=1243304&r2=1243305&view=diff
==============================================================================
--- camel/trunk/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/EchoCommandFactory.java (original)
+++ camel/trunk/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/EchoCommandFactory.java Sun Feb 12 19:47:06 2012
@@ -34,9 +34,7 @@ public class EchoCommandFactory implemen
protected static class EchoCommand implements Command, Runnable {
private String command;
- private InputStream in;
private OutputStream out;
- private OutputStream err;
private ExitCallback callback;
private Thread thread;
@@ -46,7 +44,6 @@ public class EchoCommandFactory implemen
@Override
public void setInputStream(InputStream in) {
- this.in = in;
}
@Override
@@ -56,7 +53,6 @@ public class EchoCommandFactory implemen
@Override
public void setErrorStream(OutputStream err) {
- this.err = err;
}
@Override
@@ -77,13 +73,20 @@ public class EchoCommandFactory implemen
@Override
public void run() {
+ boolean succeeded = true;
+ String message = null;
try {
out.write(command.getBytes());
out.flush();
} catch (Exception e) {
- e.printStackTrace();
+ succeeded = false;
+ message = e.toString();
} finally {
- callback.onExit(0);
+ if (succeeded) {
+ callback.onExit(0);
+ } else {
+ callback.onExit(1, message);
+ }
}
}
}
Modified: camel/trunk/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentProducerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentProducerTest.java?rev=1243305&r1=1243304&r2=1243305&view=diff
==============================================================================
--- camel/trunk/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentProducerTest.java (original)
+++ camel/trunk/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentProducerTest.java Sun Feb 12 19:47:06 2012
@@ -18,8 +18,7 @@ package org.apache.camel.component.ssh;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.sshd.common.KeyPairProvider;
-import org.apache.sshd.common.keyprovider.FileKeyPairProvider;
+
import org.junit.Test;
public class SshComponentProducerTest extends SshComponentTestSupport {
Modified: camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketClientCamelRoute2Test.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketClientCamelRoute2Test.java?rev=1243305&r1=1243304&r2=1243305&view=diff
==============================================================================
--- camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketClientCamelRoute2Test.java (original)
+++ camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketClientCamelRoute2Test.java Sun Feb 12 19:47:06 2012
@@ -31,7 +31,6 @@ import org.junit.Test;
public class WebsocketClientCamelRoute2Test extends CamelTestSupport {
private static URI uriWS;
- private static WebSocketConnection webSocketConnection;
@Test
public void testWSHttpCall() throws Exception {
Modified: camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketClientCamelRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketClientCamelRouteTest.java?rev=1243305&r1=1243304&r2=1243305&view=diff
==============================================================================
--- camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketClientCamelRouteTest.java (original)
+++ camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketClientCamelRouteTest.java Sun Feb 12 19:47:06 2012
@@ -28,7 +28,6 @@ import org.junit.Test;
public class WebsocketClientCamelRouteTest extends CamelTestSupport {
private static URI uriWS;
- private static WebSocketConnection webSocketConnection;
@Test
public void testWSHttpCall() throws Exception {