You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2008/11/07 16:37:52 UTC
svn commit: r712165 - in /activemq/camel/trunk/camel-core/src:
main/java/org/apache/camel/builder/ main/java/org/apache/camel/converter/
main/java/org/apache/camel/model/ main/java/org/apache/camel/processor/
main/java/org/apache/camel/processor/interc...
Author: janstey
Date: Fri Nov 7 07:37:12 2008
New Revision: 712165
URL: http://svn.apache.org/viewvc?rev=712165&view=rev
Log:
CAMEL-1061 - removed several deprecated bits
Added:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ObjectHelperTest.java (with props)
Removed:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ObjectConverterTest.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithRetryLoggingLevelSetTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelTest.java
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java?rev=712165&r1=712164&r2=712165&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java Fri Nov 7 07:37:12 2008
@@ -81,8 +81,8 @@
return this;
}
- public DeadLetterChannelBuilder initialRedeliveryDelay(long initialRedeliveryDelay) {
- getRedeliveryPolicy().initialRedeliveryDelay(initialRedeliveryDelay);
+ public DeadLetterChannelBuilder delay(long delay) {
+ getRedeliveryPolicy().delay(delay);
return this;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java?rev=712165&r1=712164&r2=712165&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java Fri Nov 7 07:37:12 2008
@@ -43,18 +43,6 @@
}
/**
- * Creates an iterator over the value
- *
- * @deprecated use {@link org.apache.camel.util.ObjectHelper#createIterator(Object)}. Will be removed in Camel 2.0.
- */
- @SuppressWarnings("unchecked")
- @Converter
- @Deprecated
- public static Iterator iterator(Object value) {
- return ObjectHelper.createIterator(value);
- }
-
- /**
* Converts the given value to a boolean, handling strings or Boolean
* objects; otherwise returning false if the value could not be converted to
* a boolean
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java?rev=712165&r1=712164&r2=712165&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java Fri Nov 7 07:37:12 2008
@@ -155,8 +155,8 @@
return this;
}
- public ExceptionType initialRedeliveryDelay(long initialRedeliveryDelay) {
- getOrCreateRedeliveryPolicy().initialRedeliveryDelay(initialRedeliveryDelay);
+ public ExceptionType delay(long delay) {
+ getOrCreateRedeliveryPolicy().delay(delay);
return this;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyType.java?rev=712165&r1=712164&r2=712165&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyType.java Fri Nov 7 07:37:12 2008
@@ -34,7 +34,7 @@
@XmlAttribute
private Integer maximumRedeliveries;
@XmlAttribute
- private Long initialRedeliveryDelay;
+ private Long delay;
@XmlAttribute
private Double backOffMultiplier;
@XmlAttribute
@@ -57,8 +57,8 @@
if (maximumRedeliveries != null) {
answer.setMaximumRedeliveries(maximumRedeliveries);
}
- if (initialRedeliveryDelay != null) {
- answer.setDelay(initialRedeliveryDelay);
+ if (delay != null) {
+ answer.setDelay(delay);
}
if (retriesExhaustedLogLevel != null) {
answer.setRetriesExhaustedLogLevel(retriesExhaustedLogLevel);
@@ -105,8 +105,8 @@
return this;
}
- public RedeliveryPolicyType initialRedeliveryDelay(long initialRedeliveryDelay) {
- setInitialRedeliveryDelay(initialRedeliveryDelay);
+ public RedeliveryPolicyType delay(long delay) {
+ setDelay(delay);
return this;
}
@@ -159,12 +159,12 @@
this.collisionAvoidanceFactor = collisionAvoidanceFactor;
}
- public Long getInitialRedeliveryDelay() {
- return initialRedeliveryDelay;
+ public Long getDelay() {
+ return delay;
}
- public void setInitialRedeliveryDelay(Long initialRedeliveryDelay) {
- this.initialRedeliveryDelay = initialRedeliveryDelay;
+ public void setDelay(Long delay) {
+ this.delay = delay;
}
public Integer getMaximumRedeliveries() {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java?rev=712165&r1=712164&r2=712165&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java Fri Nov 7 07:37:12 2008
@@ -69,7 +69,7 @@
@Override
public String toString() {
return "RedeliveryPolicy[maximumRedeliveries=" + maximumRedeliveries
- + ", initialRedeliveryDelay=" + delay
+ + ", delay=" + delay
+ ", maximumRedeliveryDelay=" + maximumRedeliveryDelay
+ ", retriesExhaustedLogLevel=" + retriesExhaustedLogLevel
+ ", retryAttemptedLogLevel=" + retryAttemptedLogLevel
@@ -165,16 +165,6 @@
}
/**
- * Sets the initial redelivery delay in milliseconds on the first redelivery
- *
- * @deprecated use delay. Will be removed in Camel 2.0.
- */
- public RedeliveryPolicy initialRedeliveryDelay(long initialRedeliveryDelay) {
- setDelay(initialRedeliveryDelay);
- return this;
- }
-
- /**
* Enables collision avoidance which adds some randomization to the backoff
* timings to reduce contention probability
*/
@@ -274,22 +264,6 @@
this.collisionAvoidanceFactor = collisionAvoidanceFactor;
}
- /**
- * @deprecated use delay instead. Will be removed in Camel 2.0.
- */
- public long getInitialRedeliveryDelay() {
- return getDelay();
- }
-
- /**
- * Sets the initial redelivery delay in milliseconds on the first redelivery
- *
- * @deprecated use delay instead. Will be removed in Camel 2.0.
- */
- public void setInitialRedeliveryDelay(long initialRedeliveryDelay) {
- setDelay(initialRedeliveryDelay);
- }
-
public int getMaximumRedeliveries() {
return maximumRedeliveries;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java?rev=712165&r1=712164&r2=712165&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java Fri Nov 7 07:37:12 2008
@@ -60,13 +60,6 @@
}
}
- /**
- * @deprecated will be removed in Camel 2.0
- */
- public TraceInterceptor(ProcessorType node, Processor target, TraceFormatter formatter) {
- this(node, target, formatter, new Tracer());
- }
-
public TraceInterceptor(ProcessorType node, Processor target, Tracer tracer) {
this(node, target, null, tracer);
}
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java?rev=712165&r1=712164&r2=712165&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java Fri Nov 7 07:37:12 2008
@@ -166,7 +166,7 @@
.to(ERROR_QUEUE);
onException(IOException.class)
- .initialRedeliveryDelay(5000L)
+ .delay(5000L)
.maximumRedeliveries(3)
.maximumRedeliveryDelay(30000L)
.backOffMultiplier(1.0)
@@ -175,13 +175,13 @@
.to(ERROR_QUEUE);
onException(Exception.class)
- .initialRedeliveryDelay(1000L)
+ .delay(1000L)
.maximumRedeliveries(2)
.setHeader(MESSAGE_INFO, constant("Damm just exception"))
.to(ERROR_QUEUE);
onException(MyBaseBusinessException.class)
- .initialRedeliveryDelay(1000L)
+ .delay(1000L)
.maximumRedeliveries(3)
.setHeader(MESSAGE_INFO, constant("Damm my business is not going to well"))
.to(BUSINESS_ERROR_QUEUE);
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithRetryLoggingLevelSetTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithRetryLoggingLevelSetTest.java?rev=712165&r1=712164&r2=712165&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithRetryLoggingLevelSetTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithRetryLoggingLevelSetTest.java Fri Nov 7 07:37:12 2008
@@ -121,7 +121,7 @@
// START SNIPPET: exceptionBuilder1
onException(IOException.class)
- .initialRedeliveryDelay(1000L)
+ .delay(1000L)
.maximumRedeliveries(3)
.maximumRedeliveryDelay(10000L)
.backOffMultiplier(1.0)
Added: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ObjectHelperTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ObjectHelperTest.java?rev=712165&view=auto
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ObjectHelperTest.java (added)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ObjectHelperTest.java Fri Nov 7 07:37:12 2008
@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.converter;
+
+import java.util.Iterator;
+
+import org.apache.camel.util.ObjectHelper;
+
+import junit.framework.TestCase;
+
+/**
+ * @version $Revision: 640438 $
+ */
+public class ObjectHelperTest extends TestCase {
+ public void testArrayAsIterator() throws Exception {
+ String[] data = {"a", "b"};
+
+ Iterator iter = ObjectHelper.createIterator(data);
+ assertTrue("should have next", iter.hasNext());
+ Object a = iter.next();
+ assertEquals("a", "a", a);
+ assertTrue("should have next", iter.hasNext());
+ Object b = iter.next();
+ assertEquals("b", "b", b);
+ assertFalse("should not have a next", iter.hasNext());
+ }
+
+}
Propchange: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ObjectHelperTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelTest.java?rev=712165&r1=712164&r2=712165&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelTest.java Fri Nov 7 07:37:12 2008
@@ -92,7 +92,7 @@
public void configure() {
from("direct:start").errorHandler(
deadLetterChannel("mock:failed").maximumRedeliveries(2)
- .initialRedeliveryDelay(1)
+ .delay(1)
.loggingLevel(LoggingLevel.DEBUG)
).process(processor).to("mock:success");