Author: davsclaus
Date: Wed Feb 3 11:09:08 2010
New Revision: 905995
URL: http://svn.apache.org/viewvc?rev=905995&view=rev
Log:
CAMEL-2440: Aligned getter/setter on RuntimeConfiguration to let 3rd part such
as camel-grails be able to set values when they expect getter/setter to be of
same type.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/RuntimeConfiguration.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DelayerPerRouteTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextAutoStartupTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/RuntimeConfiguration.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/RuntimeConfiguration.java?rev=905995&r1=905994&r2=905995&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/RuntimeConfiguration.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/RuntimeConfiguration.java
Wed Feb 3 11:09:08 2010
@@ -38,7 +38,7 @@
*
* @return true if stream cache is enabled
*/
- boolean isStreamCaching();
+ Boolean isStreamCaching();
/**
* Sets whether tracing is enabled or not (default is disabled).
@@ -54,7 +54,7 @@
*
* @return true if tracing is enabled
*/
- boolean isTracing();
+ Boolean isTracing();
/**
* Sets whether handle fault is enabled or not (default is disabled).
@@ -70,7 +70,7 @@
*
* @return true if tracing is enabled
*/
- boolean isHandleFault();
+ Boolean isHandleFault();
/**
* Sets a delay value in millis that a message is delayed at every step it
takes in the route path,
@@ -80,7 +80,7 @@
*
* @param delay delay in millis
*/
- void setDelayer(long delay);
+ void setDelayer(Long delay);
/**
* Gets the delay value
@@ -105,7 +105,7 @@
*
* @return true if should auto start
*/
- boolean isAutoStartup();
+ Boolean isAutoStartup();
/**
* Sets the option to use when shutting down routes.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=905995&r1=905994&r2=905995&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
Wed Feb 3 11:09:08 2010
@@ -831,7 +831,7 @@
this.streamCache = cache;
}
- public boolean isStreamCaching() {
+ public Boolean isStreamCaching() {
return streamCache;
}
@@ -839,11 +839,11 @@
this.trace = tracing;
}
- public boolean isTracing() {
+ public Boolean isTracing() {
return trace;
}
- public boolean isHandleFault() {
+ public Boolean isHandleFault() {
return handleFault;
}
@@ -855,7 +855,7 @@
return delay;
}
- public void setDelayer(long delay) {
+ public void setDelayer(Long delay) {
this.delay = delay;
}
@@ -1405,7 +1405,7 @@
this.autoStartup = autoStartup;
}
- public boolean isAutoStartup() {
+ public Boolean isAutoStartup() {
return autoStartup != null && autoStartup;
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java?rev=905995&r1=905994&r2=905995&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java
Wed Feb 3 11:09:08 2010
@@ -226,7 +226,7 @@
this.trace = tracing;
}
- public boolean isTracing() {
+ public Boolean isTracing() {
if (trace != null) {
return trace;
} else {
@@ -239,7 +239,7 @@
this.stramCache = cache;
}
- public boolean isStreamCaching() {
+ public Boolean isStreamCaching() {
if (stramCache != null) {
return stramCache;
} else {
@@ -252,7 +252,7 @@
this.handleFault = handleFault;
}
- public boolean isHandleFault() {
+ public Boolean isHandleFault() {
if (handleFault != null) {
return handleFault;
} else {
@@ -261,7 +261,7 @@
}
}
- public void setDelayer(long delay) {
+ public void setDelayer(Long delay) {
this.delay = delay;
}
@@ -278,7 +278,7 @@
this.autoStartup = autoStartup;
}
- public boolean isAutoStartup() {
+ public Boolean isAutoStartup() {
if (autoStartup != null) {
return autoStartup;
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DelayerPerRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DelayerPerRouteTest.java?rev=905995&r1=905994&r2=905995&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DelayerPerRouteTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DelayerPerRouteTest.java
Wed Feb 3 11:09:08 2010
@@ -39,7 +39,7 @@
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- context.setDelayer(2000);
+ context.setDelayer(2000L);
from("seda:a").delayer(1000).to("mock:result");
Modified:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextAutoStartupTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextAutoStartupTest.java?rev=905995&r1=905994&r2=905995&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextAutoStartupTest.java
(original)
+++
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextAutoStartupTest.java
Wed Feb 3 11:09:08 2010
@@ -37,7 +37,7 @@
SpringCamelContext camel = (SpringCamelContext) ac.getBean("myCamel");
assertEquals("myCamel", camel.getName());
assertEquals(false, camel.isStarted());
- assertEquals(false, camel.isAutoStartup());
+ assertEquals(Boolean.FALSE, camel.isAutoStartup());
assertEquals(0, camel.getRoutes().size());
// now start Camel
@@ -47,7 +47,7 @@
// now its started
assertEquals(true, camel.isStarted());
// but auto startup is still fasle
- assertEquals(false, camel.isAutoStartup());
+ assertEquals(Boolean.FALSE, camel.isAutoStartup());
// but now we have one route
assertEquals(1, camel.getRoutes().size());
@@ -66,7 +66,7 @@
SpringCamelContext camel = (SpringCamelContext) ac.getBean("myCamel");
assertEquals("myCamel", camel.getName());
assertEquals(true, camel.isStarted());
- assertEquals(true, camel.isAutoStartup());
+ assertEquals(Boolean.TRUE, camel.isAutoStartup());
assertEquals(1, camel.getRoutes().size());
// send a message to the route and see that it works
