Author: bvahdat
Date: Fri Dec 21 19:39:55 2012
New Revision: 1425107
URL: http://svn.apache.org/viewvc?rev=1425107&view=rev
Log:
Merged revisions 1425106 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1425106 | bvahdat | 2012-12-21 20:37:52 +0100 (Fr, 21 Dez 2012) | 1 line
Polished and fixed one CS error.
........
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/processor/DefaultScheduledPollConsumerBridgeErrorHandlerTest.java
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java
camel/branches/camel-2.10.x/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/converters/MongoDbBasicConverters.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1425106
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java?rev=1425107&r1=1425106&r2=1425107&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
(original)
+++
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
Fri Dec 21 19:39:55 2012
@@ -334,7 +334,7 @@ public abstract class DefaultEndpoint ex
EndpointHelper.setReferenceProperties(getCamelContext(), consumer,
copy);
EndpointHelper.setProperties(getCamelContext(), consumer, copy);
- // special consumer.routeExceptionHandler option
+ // special consumer.bridgeErrorHandler option
Object bridge = copy.remove("bridgeErrorHandler");
if (bridge != null && "true".equals(bridge)) {
if (consumer instanceof DefaultConsumer) {
Modified:
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/processor/DefaultScheduledPollConsumerBridgeErrorHandlerTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/processor/DefaultScheduledPollConsumerBridgeErrorHandlerTest.java?rev=1425107&r1=1425106&r2=1425107&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/processor/DefaultScheduledPollConsumerBridgeErrorHandlerTest.java
(original)
+++
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/processor/DefaultScheduledPollConsumerBridgeErrorHandlerTest.java
Fri Dec 21 19:39:55 2012
@@ -67,7 +67,7 @@ public class DefaultScheduledPollConsume
// END SNIPPET: e1
}
- public class MyComponent extends DefaultComponent {
+ public static class MyComponent extends DefaultComponent {
@Override
protected Endpoint createEndpoint(String uri, String remaining,
Map<String, Object> parameters) throws Exception {
@@ -75,7 +75,7 @@ public class DefaultScheduledPollConsume
}
}
- public class MyEndpoint extends DefaultEndpoint {
+ public static class MyEndpoint extends DefaultEndpoint {
public MyEndpoint(String endpointUri, Component component) {
super(endpointUri, component);
@@ -99,7 +99,7 @@ public class DefaultScheduledPollConsume
}
}
- public class MyConsumer extends ScheduledPollConsumer {
+ public static class MyConsumer extends ScheduledPollConsumer {
public MyConsumer(Endpoint endpoint, Processor processor) {
super(endpoint, processor);
Modified:
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java?rev=1425107&r1=1425106&r2=1425107&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java
(original)
+++
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java
Fri Dec 21 19:39:55 2012
@@ -82,7 +82,7 @@ public class StreamResequencerTest exten
@Override
protected boolean useJmx() {
boolean enable = "testStreamResequencerTypeWithJmx".equals(getName());
- log.info("Going to {} JMX for the test {}", (enable ? "enable" :
"disable"), getName());
+ log.info("Going to {} JMX for the test {}", enable ? "enable" :
"disable", getName());
return enable;
}
Modified:
camel/branches/camel-2.10.x/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/converters/MongoDbBasicConverters.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/converters/MongoDbBasicConverters.java?rev=1425107&r1=1425106&r2=1425107&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/converters/MongoDbBasicConverters.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/converters/MongoDbBasicConverters.java
Fri Dec 21 19:39:55 2012
@@ -19,7 +19,6 @@ package org.apache.camel.component.mongo
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
-import java.io.IOException;
import java.io.InputStream;
import java.util.Map;
@@ -38,7 +37,6 @@ import org.codehaus.jackson.map.ObjectMa
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@SuppressWarnings({"rawtypes"})
@Converter
public final class MongoDbBasicConverters {
@@ -47,7 +45,8 @@ public final class MongoDbBasicConverter
// Jackson's ObjectMapper is thread-safe, so no need to create a pool nor
synchronize access to it
private static ObjectMapper objectMapper = new ObjectMapper();
- private MongoDbBasicConverters() { }
+ private MongoDbBasicConverters() {
+ }
@Converter
public static DBObject fromMapToDBObject(Map<?, ?> map) {
@@ -118,7 +117,7 @@ public final class MongoDbBasicConverter
public static DBObject fromAnyObjectToDBObject(Object value) {
BasicDBObject answer;
try {
- Map m = MongoDbBasicConverters.objectMapper.convertValue(value,
Map.class);
+ Map<?, ?> m =
MongoDbBasicConverters.objectMapper.convertValue(value, Map.class);
answer = new BasicDBObject(m);
} catch (Exception e) {
LOG.warn("Conversion has fallen back to generic Object ->
DBObject, but unable to convert type {}. Returning null.",
