Author: bvahdat
Date: Wed Oct 31 05:08:50 2012
New Revision: 1403986
URL: http://svn.apache.org/viewvc?rev=1403986&view=rev
Log:
Polished.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/binding/BindingComponent.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/binding/DataFormatBinding.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonBindingTest.java
camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsComponent.java
camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSubmitSmCommand.java
camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/MessageReceiverListenerImplTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/binding/BindingComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/binding/BindingComponent.java?rev=1403986&r1=1403985&r2=1403986&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/binding/BindingComponent.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/binding/BindingComponent.java
Wed Oct 31 05:08:50 2012
@@ -22,7 +22,6 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.impl.DefaultComponent;
import org.apache.camel.spi.Binding;
-import org.apache.camel.util.CamelContextHelper;
import org.apache.camel.util.ObjectHelper;
import static org.apache.camel.util.CamelContextHelper.getMandatoryEndpoint;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java?rev=1403986&r1=1403985&r2=1403986&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
Wed Oct 31 05:08:50 2012
@@ -171,7 +171,7 @@ public final class ProcessorDefinitionHe
// traverse outputs and recursive children as well
List<ProcessorDefinition<?>> children = node.getOutputs();
if (children != null && !children.isEmpty()) {
- for (ProcessorDefinition child : children) {
+ for (ProcessorDefinition<?> child : children) {
// traverse children also
gatherAllNodeIds(child, set, onlyCustomId, includeAbstract);
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java?rev=1403986&r1=1403985&r2=1403986&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java
Wed Oct 31 05:08:50 2012
@@ -25,7 +25,6 @@ import javax.xml.bind.annotation.XmlTran
import org.apache.camel.Expression;
import org.apache.camel.Processor;
-import org.apache.camel.model.language.ExpressionDefinition;
import org.apache.camel.processor.SortProcessor;
import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.ObjectHelper;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java?rev=1403986&r1=1403985&r2=1403986&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java
Wed Oct 31 05:08:50 2012
@@ -27,7 +27,6 @@ import javax.xml.bind.annotation.XmlTran
import org.apache.camel.Expression;
import org.apache.camel.Processor;
import org.apache.camel.builder.ExpressionBuilder;
-import org.apache.camel.model.language.ExpressionDefinition;
import org.apache.camel.processor.Throttler;
import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.ObjectHelper;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/binding/DataFormatBinding.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/binding/DataFormatBinding.java?rev=1403986&r1=1403985&r2=1403986&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/binding/DataFormatBinding.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/binding/DataFormatBinding.java
Wed Oct 31 05:08:50 2012
@@ -16,8 +16,6 @@
*/
package org.apache.camel.processor.binding;
-import org.apache.camel.Exchange;
-import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.processor.MarshalProcessor;
import org.apache.camel.processor.UnmarshalProcessor;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java?rev=1403986&r1=1403985&r2=1403986&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
Wed Oct 31 05:08:50 2012
@@ -193,8 +193,7 @@ public final class IntrospectionSupport
ClassInfo cache = cacheClass(target.getClass());
- for (int i = 0; i < cache.methods.length; i++) {
- MethodInfo info = cache.methods[i];
+ for (MethodInfo info : cache.methods) {
Method method = info.method;
// we can only get properties if we have both a getter and a setter
if (info.isGetter && info.hasGetterAndSetter) {
Modified:
camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonBindingTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonBindingTest.java?rev=1403986&r1=1403985&r2=1403986&view=diff
==============================================================================
---
camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonBindingTest.java
(original)
+++
camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonBindingTest.java
Wed Oct 31 05:08:50 2012
@@ -18,7 +18,6 @@ package org.apache.camel.component.jacks
import javax.naming.Context;
-import org.apache.camel.Endpoint;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.binding.BindingComponent;
import org.apache.camel.processor.binding.DataFormatBinding;
Modified:
camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsComponent.java?rev=1403986&r1=1403985&r2=1403986&view=diff
==============================================================================
---
camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsComponent.java
(original)
+++
camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsComponent.java
Wed Oct 31 05:08:50 2012
@@ -132,7 +132,7 @@ public class JcloudsComponent extends De
*/
private boolean isNameSupportedByContext() {
try {
- Context.class.getMethod("getName", null);
+ Context.class.getMethod("getName");
return true;
} catch (NoSuchMethodException ex) {
return false;
Modified:
camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSubmitSmCommand.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSubmitSmCommand.java?rev=1403986&r1=1403985&r2=1403986&view=diff
==============================================================================
---
camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSubmitSmCommand.java
(original)
+++
camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSubmitSmCommand.java
Wed Oct 31 05:08:50 2012
@@ -30,7 +30,6 @@ import org.jsmpp.bean.GSMSpecificFeature
import org.jsmpp.bean.MessageMode;
import org.jsmpp.bean.MessageType;
import org.jsmpp.bean.NumberingPlanIndicator;
-import org.jsmpp.bean.OptionalParameter;
import org.jsmpp.bean.RegisteredDelivery;
import org.jsmpp.bean.SubmitSm;
import org.jsmpp.bean.TypeOfNumber;
Modified:
camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/MessageReceiverListenerImplTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/MessageReceiverListenerImplTest.java?rev=1403986&r1=1403985&r2=1403986&view=diff
==============================================================================
---
camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/MessageReceiverListenerImplTest.java
(original)
+++
camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/MessageReceiverListenerImplTest.java
Wed Oct 31 05:08:50 2012
@@ -24,7 +24,6 @@ import org.jsmpp.bean.AlertNotification;
import org.jsmpp.bean.DataSm;
import org.jsmpp.bean.DeliverSm;
import org.jsmpp.bean.OptionalParameter;
-import org.jsmpp.extra.ProcessRequestException;
import org.jsmpp.session.DataSmResult;
import org.jsmpp.session.SMPPSession;
import org.jsmpp.util.MessageIDGenerator;
@@ -33,14 +32,11 @@ import org.junit.Before;
import org.junit.Test;
import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.expectLastCall;
import static org.easymock.classextension.EasyMock.createMock;
import static org.easymock.classextension.EasyMock.replay;
import static org.easymock.classextension.EasyMock.verify;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
-import static org.junit.Assert.fail;
public class MessageReceiverListenerImplTest {