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/05 14:53:15 UTC
svn commit: r1240735 - in /camel/trunk/components/camel-avro/src:
main/java/org/apache/camel/component/avro/
main/java/org/apache/camel/dataformat/avro/
test/java/org/apache/camel/avro/impl/
test/java/org/apache/camel/component/avro/ test/java/org/apac...
Author: bvahdat
Date: Sun Feb 5 13:53:14 2012
New Revision: 1240735
URL: http://svn.apache.org/viewvc?rev=1240735&view=rev
Log:
Polished.
Modified:
camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroComponent.java
camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroConfiguration.java
camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroConstants.java
camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroConsumer.java
camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroEndpoint.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/AvroHttpProducer.java
camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroNettyConsumer.java
camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroNettyProducer.java
camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroProducer.java
camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroRequestor.java
camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroResponder.java
camel/trunk/components/camel-avro/src/main/java/org/apache/camel/dataformat/avro/AvroDataFormat.java
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/avro/impl/KeyValueProtocolImpl.java
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroConsumerTestSupport.java
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroHttpConsumerTest.java
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroHttpProducerTest.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/AvroNettyConsumerTest.java
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettyProducerTest.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-avro/src/test/java/org/apache/camel/component/avro/AvroProducerTestSupport.java
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroTestSupport.java
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/processors/GetProcessor.java
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/processors/PutProcessor.java
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroMarshalAndUnmarshallTest.java
Modified: camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroComponent.java?rev=1240735&r1=1240734&r2=1240735&view=diff
==============================================================================
--- camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroComponent.java (original)
+++ camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroComponent.java Sun Feb 5 13:53:14 2012
@@ -20,7 +20,9 @@ package org.apache.camel.component.avro;
import java.lang.reflect.Field;
import java.net.URI;
import java.util.Map;
+
import org.apache.avro.Protocol;
+
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.impl.DefaultComponent;
Modified: camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroConfiguration.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroConfiguration.java?rev=1240735&r1=1240734&r2=1240735&view=diff
==============================================================================
--- camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroConfiguration.java (original)
+++ camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroConfiguration.java Sun Feb 5 13:53:14 2012
@@ -19,7 +19,9 @@ package org.apache.camel.component.avro;
import java.net.URI;
import java.util.Map;
+
import org.apache.avro.Protocol;
+
import org.apache.camel.RuntimeCamelException;
public class AvroConfiguration implements Cloneable {
Modified: camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroConstants.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroConstants.java?rev=1240735&r1=1240734&r2=1240735&view=diff
==============================================================================
--- camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroConstants.java (original)
+++ camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroConstants.java Sun Feb 5 13:53:14 2012
@@ -19,7 +19,6 @@ package org.apache.camel.component.avro;
public final class AvroConstants {
-
public static final transient String AVRO_NETTY_TRANSPORT = "netty";
public static final transient String AVRO_HTTP_TRANSPORT = "http";
Modified: camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroConsumer.java?rev=1240735&r1=1240734&r2=1240735&view=diff
==============================================================================
--- camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroConsumer.java (original)
+++ camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroConsumer.java Sun Feb 5 13:53:14 2012
@@ -20,13 +20,9 @@ package org.apache.camel.component.avro;
import org.apache.camel.Endpoint;
import org.apache.camel.Processor;
import org.apache.camel.impl.DefaultConsumer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public abstract class AvroConsumer extends DefaultConsumer {
- private static final Logger LOG = LoggerFactory.getLogger(AvroConsumer.class);
-
public AvroConsumer(Endpoint endpoint, Processor processor) {
super(endpoint, processor);
}
Modified: camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroEndpoint.java?rev=1240735&r1=1240734&r2=1240735&view=diff
==============================================================================
--- camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroEndpoint.java (original)
+++ camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroEndpoint.java Sun Feb 5 13:53:14 2012
@@ -19,6 +19,7 @@ package org.apache.camel.component.avro;
import org.apache.avro.Protocol;
import org.apache.avro.Schema;
+
import org.apache.camel.Component;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
@@ -27,8 +28,6 @@ import org.apache.camel.impl.DefaultEndp
public abstract class AvroEndpoint extends DefaultEndpoint {
private AvroConfiguration configuration;
- private boolean sync;
-
/**
* Constructs a fully-initialized DefaultEndpoint instance. This is the
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=1240735&r1=1240734&r2=1240735&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 5 13:53:14 2012
@@ -18,20 +18,16 @@
package org.apache.camel.component.avro;
import org.apache.avro.ipc.HttpServer;
+
import org.apache.camel.Endpoint;
import org.apache.camel.Processor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class AvroHttpConsumer extends AvroConsumer {
- private static final Logger LOG = LoggerFactory.getLogger(AvroHttpConsumer.class);
HttpServer server;
-
public AvroHttpConsumer(Endpoint endpoint, Processor processor) {
super(endpoint, processor);
- String uri = endpoint.getEndpointUri();
}
@Override
Modified: camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroHttpProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroHttpProducer.java?rev=1240735&r1=1240734&r2=1240735&view=diff
==============================================================================
--- camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroHttpProducer.java (original)
+++ camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroHttpProducer.java Sun Feb 5 13:53:14 2012
@@ -18,8 +18,10 @@
package org.apache.camel.component.avro;
import java.net.URL;
+
import org.apache.avro.ipc.HttpTransceiver;
import org.apache.avro.ipc.Transceiver;
+
import org.apache.camel.Endpoint;
import org.apache.camel.util.URISupport;
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=1240735&r1=1240734&r2=1240735&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 5 13:53:14 2012
@@ -18,21 +18,18 @@
package org.apache.camel.component.avro;
import java.net.InetSocketAddress;
+
import org.apache.avro.ipc.NettyServer;
+
import org.apache.camel.Endpoint;
import org.apache.camel.Processor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class AvroNettyConsumer extends AvroConsumer {
- private static final Logger LOG = LoggerFactory.getLogger(AvroNettyConsumer.class);
NettyServer server;
-
public AvroNettyConsumer(Endpoint endpoint, Processor processor) {
super(endpoint, processor);
- String uri = endpoint.getEndpointUri();
}
@Override
Modified: camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroNettyProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroNettyProducer.java?rev=1240735&r1=1240734&r2=1240735&view=diff
==============================================================================
--- camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroNettyProducer.java (original)
+++ camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroNettyProducer.java Sun Feb 5 13:53:14 2012
@@ -18,13 +18,14 @@
package org.apache.camel.component.avro;
import java.net.InetSocketAddress;
+
import org.apache.avro.ipc.NettyTransceiver;
import org.apache.avro.ipc.Transceiver;
+
import org.apache.camel.Endpoint;
public class AvroNettyProducer extends AvroProducer {
-
public AvroNettyProducer(Endpoint endpoint) {
super(endpoint);
}
Modified: camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroProducer.java?rev=1240735&r1=1240734&r2=1240735&view=diff
==============================================================================
--- camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroProducer.java (original)
+++ camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroProducer.java Sun Feb 5 13:53:14 2012
@@ -20,6 +20,7 @@ package org.apache.camel.component.avro;
import org.apache.avro.ipc.Callback;
import org.apache.avro.ipc.Requestor;
import org.apache.avro.ipc.Transceiver;
+
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.ServicePoolAware;
Modified: camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroRequestor.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroRequestor.java?rev=1240735&r1=1240734&r2=1240735&view=diff
==============================================================================
--- camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroRequestor.java (original)
+++ camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroRequestor.java Sun Feb 5 13:53:14 2012
@@ -18,6 +18,7 @@
package org.apache.camel.component.avro;
import java.io.IOException;
+
import org.apache.avro.Protocol;
import org.apache.avro.ipc.Transceiver;
import org.apache.avro.ipc.specific.SpecificRequestor;
Modified: camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroResponder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroResponder.java?rev=1240735&r1=1240734&r2=1240735&view=diff
==============================================================================
--- camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroResponder.java (original)
+++ camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroResponder.java Sun Feb 5 13:53:14 2012
@@ -22,6 +22,7 @@ import org.apache.avro.Schema;
import org.apache.avro.generic.GenericRecord;
import org.apache.avro.ipc.specific.SpecificResponder;
import org.apache.avro.specific.SpecificData;
+
import org.apache.camel.Exchange;
import org.apache.camel.util.ExchangeHelper;
@@ -44,7 +45,7 @@ public class AvroResponder extends Speci
Object response = null;
int numParams = message.getRequest().getFields().size();
Object[] params = new Object[numParams];
- Class[] paramTypes = new Class[numParams];
+ Class<?>[] paramTypes = new Class[numParams];
int i = 0;
for (Schema.Field param : message.getRequest().getFields()) {
params[i] = ((GenericRecord) request).get(param.name());
Modified: camel/trunk/components/camel-avro/src/main/java/org/apache/camel/dataformat/avro/AvroDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-avro/src/main/java/org/apache/camel/dataformat/avro/AvroDataFormat.java?rev=1240735&r1=1240734&r2=1240735&view=diff
==============================================================================
--- camel/trunk/components/camel-avro/src/main/java/org/apache/camel/dataformat/avro/AvroDataFormat.java (original)
+++ camel/trunk/components/camel-avro/src/main/java/org/apache/camel/dataformat/avro/AvroDataFormat.java Sun Feb 5 13:53:14 2012
@@ -20,6 +20,7 @@ package org.apache.camel.dataformat.avro
import java.io.InputStream;
import java.io.OutputStream;
import java.lang.reflect.Method;
+
import org.apache.avro.Schema;
import org.apache.avro.generic.GenericContainer;
import org.apache.avro.generic.GenericRecord;
@@ -31,6 +32,7 @@ import org.apache.avro.io.Encoder;
import org.apache.avro.io.EncoderFactory;
import org.apache.avro.specific.SpecificDatumReader;
import org.apache.avro.specific.SpecificDatumWriter;
+
import org.apache.camel.CamelContext;
import org.apache.camel.CamelException;
import org.apache.camel.Exchange;
@@ -42,7 +44,6 @@ public class AvroDataFormat implements D
private Schema schema;
private String instanceClassName;
-
/**
* @param schema
*/
@@ -96,25 +97,15 @@ public class AvroDataFormat implements D
}
}
- /*
- * (non-Javadoc)
- * @see org.apache.camel.spi.DataFormat#marshal(org.apache.camel.Exchange,
- * java.lang.Object, java.io.OutputStream)
- */
public void marshal(Exchange exchange, Object graph, OutputStream outputStream) throws Exception {
- DatumWriter datum = new SpecificDatumWriter(getSchema(exchange, graph));
+ DatumWriter<Object> datum = new SpecificDatumWriter<Object>(getSchema(exchange, graph));
Encoder encoder = EncoderFactory.get().binaryEncoder(outputStream, null);
datum.write(graph, encoder);
encoder.flush();
}
- /*
- * (non-Javadoc)
- * @see org.apache.camel.spi.DataFormat#unmarshal(org.apache.camel.Exchange,
- * java.io.InputStream)
- */
public Object unmarshal(Exchange exchange, InputStream inputStream) throws Exception {
- DatumReader<GenericRecord> reader = new SpecificDatumReader(getSchema(exchange, null));
+ DatumReader<GenericRecord> reader = new SpecificDatumReader<GenericRecord>(getSchema(exchange, null));
Decoder decoder = DecoderFactory.get().binaryDecoder(inputStream, null);
Object result = reader.read(null, decoder);
return result;
Modified: camel/trunk/components/camel-avro/src/test/java/org/apache/camel/avro/impl/KeyValueProtocolImpl.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-avro/src/test/java/org/apache/camel/avro/impl/KeyValueProtocolImpl.java?rev=1240735&r1=1240734&r2=1240735&view=diff
==============================================================================
--- camel/trunk/components/camel-avro/src/test/java/org/apache/camel/avro/impl/KeyValueProtocolImpl.java (original)
+++ camel/trunk/components/camel-avro/src/test/java/org/apache/camel/avro/impl/KeyValueProtocolImpl.java Sun Feb 5 13:53:14 2012
@@ -19,7 +19,9 @@ package org.apache.camel.avro.impl;
import java.util.HashMap;
import java.util.Map;
+
import org.apache.avro.AvroRemoteException;
+
import org.apache.camel.avro.generated.Key;
import org.apache.camel.avro.generated.KeyValueProtocol;
import org.apache.camel.avro.generated.Value;
Modified: camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroConsumerTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroConsumerTestSupport.java?rev=1240735&r1=1240734&r2=1240735&view=diff
==============================================================================
--- camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroConsumerTestSupport.java (original)
+++ camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroConsumerTestSupport.java Sun Feb 5 13:53:14 2012
@@ -19,16 +19,17 @@ package org.apache.camel.component.avro;
import java.io.IOException;
import junit.framework.Assert;
+
import org.apache.avro.Protocol;
import org.apache.avro.ipc.Requestor;
import org.apache.avro.ipc.Transceiver;
+
import org.apache.camel.CamelContext;
import org.apache.camel.avro.generated.Key;
import org.apache.camel.avro.generated.KeyValueProtocol;
import org.apache.camel.avro.generated.Value;
import org.apache.camel.avro.impl.KeyValueProtocolImpl;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.CamelTestSupport;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Modified: camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroHttpConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroHttpConsumerTest.java?rev=1240735&r1=1240734&r2=1240735&view=diff
==============================================================================
--- camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroHttpConsumerTest.java (original)
+++ camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroHttpConsumerTest.java Sun Feb 5 13:53:14 2012
@@ -19,8 +19,10 @@ package org.apache.camel.component.avro;
import java.io.IOException;
import java.net.URL;
+
import org.apache.avro.ipc.HttpTransceiver;
import org.apache.avro.ipc.specific.SpecificRequestor;
+
import org.apache.camel.avro.generated.KeyValueProtocol;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.avro.processors.GetProcessor;
Modified: camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroHttpProducerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroHttpProducerTest.java?rev=1240735&r1=1240734&r2=1240735&view=diff
==============================================================================
--- camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroHttpProducerTest.java (original)
+++ camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroHttpProducerTest.java Sun Feb 5 13:53:14 2012
@@ -18,22 +18,12 @@
package org.apache.camel.component.avro;
import java.io.IOException;
-import junit.framework.Assert;
-import org.apache.avro.Protocol;
+
import org.apache.avro.ipc.HttpServer;
-import org.apache.avro.ipc.Server;
import org.apache.avro.ipc.specific.SpecificResponder;
-import org.apache.camel.CamelContext;
-import org.apache.camel.avro.generated.Key;
+
import org.apache.camel.avro.generated.KeyValueProtocol;
-import org.apache.camel.avro.generated.Value;
-import org.apache.camel.avro.impl.KeyValueProtocolImpl;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.CamelTestSupport;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
public class AvroHttpProducerTest extends AvroProducerTestSupport {
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=1240735&r1=1240734&r2=1240735&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 5 13:53:14 2012
@@ -17,24 +17,13 @@
package org.apache.camel.component.avro;
-import junit.framework.Assert;
-import org.apache.avro.Protocol;
-import org.apache.avro.ipc.HttpServer;
-import org.apache.avro.ipc.Server;
-import org.apache.avro.ipc.specific.SpecificResponder;
import org.apache.camel.CamelContext;
-import org.apache.camel.avro.generated.Key;
-import org.apache.camel.avro.generated.KeyValueProtocol;
-import org.apache.camel.avro.generated.Value;
-import org.apache.camel.avro.impl.KeyValueProtocolImpl;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.spring.SpringCamelContext;
-import org.apache.camel.test.CamelTestSupport;
+
import org.junit.After;
import org.junit.Before;
-import org.junit.Test;
+
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
Modified: camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettyConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettyConsumerTest.java?rev=1240735&r1=1240734&r2=1240735&view=diff
==============================================================================
--- camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettyConsumerTest.java (original)
+++ camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettyConsumerTest.java Sun Feb 5 13:53:14 2012
@@ -18,23 +18,15 @@
package org.apache.camel.component.avro;
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
import java.net.InetSocketAddress;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import org.apache.avro.ipc.HttpTransceiver;
+
import org.apache.avro.ipc.NettyTransceiver;
import org.apache.avro.ipc.specific.SpecificRequestor;
+
import org.apache.camel.avro.generated.KeyValueProtocol;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.avro.processors.GetProcessor;
import org.apache.camel.component.avro.processors.PutProcessor;
-import org.apache.camel.test.CamelTestSupport;
-import org.apache.camel.util.URISupport;
-import org.junit.Assert;
-import org.junit.Test;
-
public class AvroNettyConsumerTest extends AvroConsumerTestSupport {
Modified: camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettyProducerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettyProducerTest.java?rev=1240735&r1=1240734&r2=1240735&view=diff
==============================================================================
--- camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettyProducerTest.java (original)
+++ camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettyProducerTest.java Sun Feb 5 13:53:14 2012
@@ -18,23 +18,14 @@
package org.apache.camel.component.avro;
import java.net.InetSocketAddress;
-import org.apache.avro.Protocol;
-import org.apache.avro.ipc.HttpServer;
+
import org.apache.avro.ipc.NettyServer;
-import org.apache.avro.ipc.Server;
import org.apache.avro.ipc.specific.SpecificResponder;
-import org.apache.camel.CamelContext;
-import org.apache.camel.avro.generated.Key;
+
import org.apache.camel.avro.generated.KeyValueProtocol;
-import org.apache.camel.avro.generated.Value;
-import org.apache.camel.avro.impl.KeyValueProtocolImpl;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.CamelTestSupport;
+
import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
public class AvroNettyProducerTest extends AvroProducerTestSupport {
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=1240735&r1=1240734&r2=1240735&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 5 13:53:14 2012
@@ -17,15 +17,13 @@
package org.apache.camel.component.avro;
-import java.io.IOException;
import org.apache.camel.avro.impl.KeyValueProtocolImpl;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.avro.processors.GetProcessor;
-import org.apache.camel.component.avro.processors.PutProcessor;
import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.spring.SpringCamelContext;
+
import org.junit.After;
import org.junit.Before;
+
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
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=1240735&r1=1240734&r2=1240735&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 5 13:53:14 2012
@@ -20,8 +20,10 @@ 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;
import org.junit.Before;
+
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
Modified: camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroProducerTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroProducerTestSupport.java?rev=1240735&r1=1240734&r2=1240735&view=diff
==============================================================================
--- camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroProducerTestSupport.java (original)
+++ camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroProducerTestSupport.java Sun Feb 5 13:53:14 2012
@@ -18,21 +18,19 @@
package org.apache.camel.component.avro;
import java.io.IOException;
-import java.net.InetSocketAddress;
+
import junit.framework.Assert;
+
import org.apache.avro.Protocol;
-import org.apache.avro.ipc.HttpServer;
-import org.apache.avro.ipc.NettyServer;
import org.apache.avro.ipc.Server;
-import org.apache.avro.ipc.specific.SpecificResponder;
+
import org.apache.camel.CamelContext;
import org.apache.camel.avro.generated.Key;
import org.apache.camel.avro.generated.KeyValueProtocol;
import org.apache.camel.avro.generated.Value;
import org.apache.camel.avro.impl.KeyValueProtocolImpl;
-import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.CamelTestSupport;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Modified: camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroTestSupport.java?rev=1240735&r1=1240734&r2=1240735&view=diff
==============================================================================
--- camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroTestSupport.java (original)
+++ camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroTestSupport.java Sun Feb 5 13:53:14 2012
@@ -20,7 +20,9 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
+
import java.util.Properties;
+
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.CamelTestSupport;
Modified: camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/processors/GetProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/processors/GetProcessor.java?rev=1240735&r1=1240734&r2=1240735&view=diff
==============================================================================
--- camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/processors/GetProcessor.java (original)
+++ camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/processors/GetProcessor.java Sun Feb 5 13:53:14 2012
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.avro.processors;
-
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.avro.generated.Key;
Modified: camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/processors/PutProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/processors/PutProcessor.java?rev=1240735&r1=1240734&r2=1240735&view=diff
==============================================================================
--- camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/processors/PutProcessor.java (original)
+++ camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/processors/PutProcessor.java Sun Feb 5 13:53:14 2012
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.avro.processors;
-
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.avro.generated.Key;
Modified: camel/trunk/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroMarshalAndUnmarshallTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroMarshalAndUnmarshallTest.java?rev=1240735&r1=1240734&r2=1240735&view=diff
==============================================================================
--- camel/trunk/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroMarshalAndUnmarshallTest.java (original)
+++ camel/trunk/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroMarshalAndUnmarshallTest.java Sun Feb 5 13:53:14 2012
@@ -22,6 +22,7 @@ import org.apache.camel.avro.generated.V
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
+
import org.junit.Test;
public class AvroMarshalAndUnmarshallTest extends CamelTestSupport {