Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5cb6ebf7 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5cb6ebf7 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5cb6ebf7 Branch: refs/heads/master Commit: 5cb6ebf70b0beea5e32576aa73f67a2812d029e5 Parents: 1151af4 Author: Claus Ibsen <davscl...@apache.org> Authored: Fri Apr 29 08:44:03 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Apr 29 08:46:49 2016 +0200 ---------------------------------------------------------------------- .../component/amqp/AMQPConnectionDetails.java | 2 +- .../component/atmos/util/AtmosOperation.java | 2 +- .../component/atmos/util/AtmosResultHeader.java | 2 +- .../aws/ddbstream/BigIntComparisons.java | 2 +- .../component/aws/ddbstream/ShardList.java | 6 +- .../camel/component/aws/sqs/SqsConsumer.java | 2 +- .../aws/ddbstream/BigIntComparisonsTest.java | 6 +- .../component/aws/s3/S3ConsumerPrefixTest.java | 2 +- .../component/aws/s3/S3IncludeBodyTest.java | 2 +- .../sqs/SqsEndpointUseExistingQueueTest.java | 2 +- .../dataformat/barcode/BarcodeImageType.java | 17 +- .../barcode/BarcodeDataFormatTest.java | 67 +-- .../component/beanstalk/BeanstalkConsumer.java | 4 +- .../component/beanstalk/BeanstalkProducer.java | 4 +- .../beanstalk/processors/DefaultCommand.java | 2 +- .../camel/component/beanstalk/Helper.java | 2 +- .../cxf/transport/CamelDestination.java | 2 +- .../cxf/transport/CamelOutputStream.java | 6 +- .../apache/camel/component/cxf/CxfConsumer.java | 429 ++++++++++--------- .../apache/camel/component/cxf/CxfEndpoint.java | 7 +- .../converter/DelegatingXMLStreamReader.java | 2 +- .../component/cxf/jaxrs/CxfRsProducer.java | 2 +- .../component/cxf/jaxrs/SimpleCxfRsBinding.java | 2 +- .../cxf/CxfConusmerNamespacePayLoadTest.java | 2 +- .../cxf/CxfCustomizedExceptionTest.java | 2 +- .../cxf/CxfMessageHeaderTimeoutTest.java | 2 +- .../camel/component/cxf/CxfOneWayRouteTest.java | 2 +- ...PayLoadMessageRouterAddressOverrideTest.java | 6 +- .../cxf/CxfPayLoadMessageRouterTest.java | 6 +- .../CxfPayLoadMessageXmlBindingRouterTest.java | 6 +- ...nsumerDuplicateNamespaceStreamCacheTest.java | 6 +- .../cxf/CxfPayloadProviderRouterTest.java | 2 +- .../component/cxf/CxfProducerContextTest.java | 4 +- .../cxf/CxfSpringCustomizedExceptionTest.java | 2 +- .../camel/component/cxf/TestCxfFeature.java | 5 +- .../component/cxf/cxfbean/CxfBeanTest.java | 8 +- ...CxfBeanWithWsdlLocationInBeanAndIoCTest.java | 2 +- .../CxfBeanWithWsdlLocationInBeanTest.java | 2 +- .../component/cxf/jaxrs/CxfRsConsumerTest.java | 2 +- .../component/cxf/jaxrs/CxfRsProducerTest.java | 8 +- .../component/cxf/jaxrs/CxfRsRouterTest.java | 12 +- .../cxf/jaxrs/CxfRsSpringConsumerTest.java | 2 +- .../cxf/jaxrs/DataFormatProviderTest.java | 5 +- .../cxf/wsrm/MessageLossSimulator.java | 5 +- .../component/http4/HttpCamelHeadersTest.java | 4 +- .../component/http4/HttpCompressionTest.java | 4 +- .../processor/HystrixManagementTest.java | 4 +- .../component/jms/reply/QueueReplyManager.java | 2 +- .../jms/tx/AbstractTransactionTest.java | 3 +- ...tionWithoutDefineTransactionManagerTest.java | 3 +- .../blueprint/ContextCreationTimeoutTest.java | 5 +- .../camel/test/karaf/AbstractFeatureTest.java | 2 +- .../CamelSpringBootJUnit4ClassRunner.java | 6 +- .../spring/CamelSpringJUnit4ClassRunner.java | 6 +- 54 files changed, 331 insertions(+), 373 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPConnectionDetails.java ---------------------------------------------------------------------- diff --git a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPConnectionDetails.java b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPConnectionDetails.java index fa06b5b..029e17b 100644 --- a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPConnectionDetails.java +++ b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPConnectionDetails.java @@ -50,7 +50,7 @@ public class AMQPConnectionDetails { PropertiesComponent propertiesComponent = camelContext.getComponent("properties", PropertiesComponent.class); String host = property(propertiesComponent, AMQP_HOST, "localhost"); - int port = Integer.parseInt(property(propertiesComponent, AMQP_PORT , "5672")); + int port = Integer.parseInt(property(propertiesComponent, AMQP_PORT, "5672")); String username = property(propertiesComponent, AMQP_USERNAME, null); String password = property(propertiesComponent, AMQP_PASSWORD, null); http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/util/AtmosOperation.java ---------------------------------------------------------------------- diff --git a/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/util/AtmosOperation.java b/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/util/AtmosOperation.java index 2764c18..b1575d5 100644 --- a/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/util/AtmosOperation.java +++ b/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/util/AtmosOperation.java @@ -25,7 +25,7 @@ public enum AtmosOperation { private final String text; - private AtmosOperation(final String text) { + AtmosOperation(final String text) { this.text = text; } http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/util/AtmosResultHeader.java ---------------------------------------------------------------------- diff --git a/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/util/AtmosResultHeader.java b/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/util/AtmosResultHeader.java index c119401..22f1af4 100644 --- a/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/util/AtmosResultHeader.java +++ b/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/util/AtmosResultHeader.java @@ -17,6 +17,6 @@ package org.apache.camel.component.atmos.util; public enum AtmosResultHeader { - DOWNLOADED_FILE, DOWNLOADED_FILES, UPLOADED_FILE, UPLOADED_FILES, FOUND_FILES , DELETED_PATH, MOVED_PATH; + DOWNLOADED_FILE, DOWNLOADED_FILES, UPLOADED_FILE, UPLOADED_FILES, FOUND_FILES, DELETED_PATH, MOVED_PATH; } http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddbstream/BigIntComparisons.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddbstream/BigIntComparisons.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddbstream/BigIntComparisons.java index a06bd0a..947e72a 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddbstream/BigIntComparisons.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddbstream/BigIntComparisons.java @@ -25,7 +25,7 @@ interface BigIntComparisons { */ boolean matches(BigInteger first, BigInteger second); - static enum Conditions implements BigIntComparisons { + enum Conditions implements BigIntComparisons { LT() { @Override public boolean matches(BigInteger first, BigInteger second) { http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddbstream/ShardList.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddbstream/ShardList.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddbstream/ShardList.java index 8852ada..8c2ce9d 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddbstream/ShardList.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddbstream/ShardList.java @@ -134,11 +134,7 @@ class ShardList { return "ShardList{" + "shards=" + shards + '}'; } - - - - - private static enum StartingSequenceNumberComparator implements Comparator<Shard> { + private enum StartingSequenceNumberComparator implements Comparator<Shard> { INSTANCE() { @Override public int compare(Shard o1, Shard o2) { http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java index 0a0904e..7f646f0 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java @@ -312,7 +312,7 @@ public class SqsConsumer extends ScheduledBatchPollingConsumer { private final Exchange exchange; private final int repeatSeconds; - public TimeoutExtender(Exchange exchange, int repeatSeconds) { + TimeoutExtender(Exchange exchange, int repeatSeconds) { this.exchange = exchange; this.repeatSeconds = repeatSeconds; } http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddbstream/BigIntComparisonsTest.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddbstream/BigIntComparisonsTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddbstream/BigIntComparisonsTest.java index c881d41..988f66a 100644 --- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddbstream/BigIntComparisonsTest.java +++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddbstream/BigIntComparisonsTest.java @@ -49,11 +49,11 @@ public class BigIntComparisonsTest { public static Collection<Object[]> parameters() { List<Object[]> results = new ArrayList<>(); - results.add(new Object[]{BigIntComparisons.Conditions.LT , 1, 5, true}); + results.add(new Object[]{BigIntComparisons.Conditions.LT, 1, 5, true}); results.add(new Object[]{BigIntComparisons.Conditions.LTEQ, 1, 5, true}); - results.add(new Object[]{BigIntComparisons.Conditions.LT , 1, 1, false}); + results.add(new Object[]{BigIntComparisons.Conditions.LT, 1, 1, false}); results.add(new Object[]{BigIntComparisons.Conditions.LTEQ, 1, 1, true}); - results.add(new Object[]{BigIntComparisons.Conditions.LT , 5, 1, false}); + results.add(new Object[]{BigIntComparisons.Conditions.LT, 5, 1, false}); results.add(new Object[]{BigIntComparisons.Conditions.LTEQ, 5, 1, false}); return results; http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerPrefixTest.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerPrefixTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerPrefixTest.java index 6f1acfa..37c4b6d 100644 --- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerPrefixTest.java +++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerPrefixTest.java @@ -75,7 +75,7 @@ public class S3ConsumerPrefixTest extends CamelTestSupport { private AtomicInteger requestCount = new AtomicInteger(0); - public DummyAmazonS3Client() { + DummyAmazonS3Client() { super(new BasicAWSCredentials("myAccessKey", "mySecretKey")); } http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3IncludeBodyTest.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3IncludeBodyTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3IncludeBodyTest.java index 6d5ecf5..3a0295d 100644 --- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3IncludeBodyTest.java +++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3IncludeBodyTest.java @@ -73,7 +73,7 @@ public class S3IncludeBodyTest extends CamelTestSupport { private AtomicInteger requestCount = new AtomicInteger(0); - public DummyAmazonS3Client() { + DummyAmazonS3Client() { super(new BasicAWSCredentials("myAccessKey", "mySecretKey")); } http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointUseExistingQueueTest.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointUseExistingQueueTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointUseExistingQueueTest.java index de5ca57..2a48d91 100644 --- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointUseExistingQueueTest.java +++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointUseExistingQueueTest.java @@ -72,7 +72,7 @@ public class SqsEndpointUseExistingQueueTest extends CamelTestSupport { static class AmazonSQSClientMock extends AmazonSQSClient { - public AmazonSQSClientMock() { + AmazonSQSClientMock() { super(new BasicAWSCredentials("myAccessKey", "mySecretKey")); } http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-barcode/src/main/java/org/apache/camel/dataformat/barcode/BarcodeImageType.java ---------------------------------------------------------------------- diff --git a/components/camel-barcode/src/main/java/org/apache/camel/dataformat/barcode/BarcodeImageType.java b/components/camel-barcode/src/main/java/org/apache/camel/dataformat/barcode/BarcodeImageType.java index c6a0910..380d7af 100644 --- a/components/camel-barcode/src/main/java/org/apache/camel/dataformat/barcode/BarcodeImageType.java +++ b/components/camel-barcode/src/main/java/org/apache/camel/dataformat/barcode/BarcodeImageType.java @@ -14,26 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.camel.dataformat.barcode; /** * Endings for the supported image types. - * */ public enum BarcodeImageType { - /** - * JPEG image. - */ - JPG - - /** - * GIF image. - */ - , GIF - - /** - * PNG image. - */ - , PNG + JPG, GIF, PNG } http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatTest.java ---------------------------------------------------------------------- diff --git a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatTest.java b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatTest.java index 5469b3d..04bb1d9 100644 --- a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatTest.java +++ b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatTest.java @@ -35,73 +35,54 @@ import static org.junit.Assert.assertTrue; * for {@link BarcodeDataFormat}. */ public class BarcodeDataFormatTest { - + /** * Test default constructor. */ @Test public final void testDefaultConstructor() { BarcodeDataFormat barcodeDataFormat = new BarcodeDataFormat(); - this.checkParams(BarcodeParameters.IMAGE_TYPE - , BarcodeParameters.WIDTH - , BarcodeParameters.HEIGHT - , BarcodeParameters.FORMAT - , barcodeDataFormat.getParams()); + this.checkParams(BarcodeParameters.IMAGE_TYPE, BarcodeParameters.WIDTH, BarcodeParameters.HEIGHT, BarcodeParameters.FORMAT, barcodeDataFormat.getParams()); } - + /** * Test constructor with barcode format. */ @Test public final void testConstructorWithBarcodeFormat() { - BarcodeDataFormat barcodeDataFormat = + BarcodeDataFormat barcodeDataFormat = new BarcodeDataFormat(BarcodeFormat.AZTEC); - this.checkParams(BarcodeParameters.IMAGE_TYPE - , BarcodeParameters.WIDTH - , BarcodeParameters.HEIGHT - , BarcodeFormat.AZTEC - , barcodeDataFormat.getParams()); + this.checkParams(BarcodeParameters.IMAGE_TYPE, BarcodeParameters.WIDTH, BarcodeParameters.HEIGHT, BarcodeFormat.AZTEC, barcodeDataFormat.getParams()); } - + /** * Test constructor with size. */ @Test public final void testConstructorWithSize() { - BarcodeDataFormat barcodeDataFormat = + BarcodeDataFormat barcodeDataFormat = new BarcodeDataFormat(200, 250); - this.checkParams(BarcodeParameters.IMAGE_TYPE - , 200, 250 - , BarcodeParameters.FORMAT - , barcodeDataFormat.getParams()); + this.checkParams(BarcodeParameters.IMAGE_TYPE, 200, 250, BarcodeParameters.FORMAT, barcodeDataFormat.getParams()); } - + /** * Test constructor with image type. */ @Test public final void testConstructorWithImageType() { - BarcodeDataFormat barcodeDataFormat = + BarcodeDataFormat barcodeDataFormat = new BarcodeDataFormat(BarcodeImageType.JPG); - this.checkParams(BarcodeImageType.JPG - , BarcodeParameters.WIDTH - , BarcodeParameters.HEIGHT - , BarcodeParameters.FORMAT - , barcodeDataFormat.getParams()); + this.checkParams(BarcodeImageType.JPG, BarcodeParameters.WIDTH, BarcodeParameters.HEIGHT, BarcodeParameters.FORMAT, barcodeDataFormat.getParams()); } - + /** * Test constructor with all. */ @Test public final void testConstructorWithAll() { - BarcodeDataFormat barcodeDataFormat = - new BarcodeDataFormat(200, 250, BarcodeImageType.JPG - , BarcodeFormat.AZTEC); - this.checkParams(BarcodeImageType.JPG - , 200, 250 - , BarcodeFormat.AZTEC - , barcodeDataFormat.getParams()); + BarcodeDataFormat barcodeDataFormat = + new BarcodeDataFormat(200, 250, BarcodeImageType.JPG, BarcodeFormat.AZTEC); + this.checkParams(BarcodeImageType.JPG, 200, 250, BarcodeFormat.AZTEC, barcodeDataFormat.getParams()); } /** @@ -115,14 +96,14 @@ public class BarcodeDataFormatTest { assertTrue(instance.getReaderHintMap() .containsKey(DecodeHintType.TRY_HARDER)); } - + /** * Test optimized hints for data matrix. */ @Test public final void testOptimizieHintsForDataMatrix() { BarcodeDataFormat instance = new BarcodeDataFormat(BarcodeFormat.DATA_MATRIX); - assertTrue("data matrix shape hint incorrect.", + assertTrue("data matrix shape hint incorrect.", instance.getWriterHintMap() .containsKey(EncodeHintType.DATA_MATRIX_SHAPE)); assertTrue("try harder hint incorrect.", @@ -227,19 +208,11 @@ public class BarcodeDataFormatTest { Map<DecodeHintType, Object> result = instance.getReaderHintMap(); assertNotNull(result); } - + /** * Helper to check the saved parameters. - * - * @param imageType - * @param width - * @param height - * @param encoding - * @param format - * @param params - */ - private void checkParams(BarcodeImageType imageType, int width, int height - , BarcodeFormat format, BarcodeParameters params) { + */ + private void checkParams(BarcodeImageType imageType, int width, int height, BarcodeFormat format, BarcodeParameters params) { assertEquals(params.getType(), imageType); assertTrue(params.getWidth() == width); assertTrue(params.getHeight() == height); http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkConsumer.java b/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkConsumer.java index 561a3c9..07a2e6b 100644 --- a/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkConsumer.java +++ b/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkConsumer.java @@ -203,7 +203,7 @@ public class BeanstalkConsumer extends ScheduledPollConsumer { protected final Command successCommand; protected final Command failureCommand; - public Sync() { + Sync() { successCommand = new DeleteCommand(getEndpoint()); if (BeanstalkComponent.COMMAND_BURY.equals(onFailure.name())) { @@ -239,7 +239,7 @@ public class BeanstalkConsumer extends ScheduledPollConsumer { private final Command command; private final Exchange exchange; - public RunCommand(final Command command, final Exchange exchange) { + RunCommand(final Command command, final Exchange exchange) { this.command = command; this.exchange = exchange; } http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkProducer.java b/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkProducer.java index 6ff0082..7f115cd 100644 --- a/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkProducer.java +++ b/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkProducer.java @@ -101,11 +101,11 @@ public class BeanstalkProducer extends DefaultProducer implements AsyncProcessor private final Exchange exchange; private final AsyncCallback callback; - public RunCommand(final Exchange exchange) { + RunCommand(final Exchange exchange) { this(exchange, null); } - public RunCommand(final Exchange exchange, final AsyncCallback callback) { + RunCommand(final Exchange exchange, final AsyncCallback callback) { this.exchange = exchange; this.callback = callback; } http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/processors/DefaultCommand.java ---------------------------------------------------------------------- diff --git a/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/processors/DefaultCommand.java b/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/processors/DefaultCommand.java index d81bb10..2a5539c 100644 --- a/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/processors/DefaultCommand.java +++ b/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/processors/DefaultCommand.java @@ -24,7 +24,7 @@ import org.apache.camel.util.ExchangeHelper; abstract class DefaultCommand implements Command { protected final BeanstalkEndpoint endpoint; - public DefaultCommand(BeanstalkEndpoint endpoint) { + DefaultCommand(BeanstalkEndpoint endpoint) { this.endpoint = endpoint; } http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/Helper.java ---------------------------------------------------------------------- diff --git a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/Helper.java b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/Helper.java index 212ced2..92221a4 100644 --- a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/Helper.java +++ b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/Helper.java @@ -69,7 +69,7 @@ public final class Helper { class MockConnectionSettings extends ConnectionSettings { final Client client; - public MockConnectionSettings(Client client) { + MockConnectionSettings(Client client) { super("tube"); this.client = client; } http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java index ad02956..16a3e5b 100644 --- a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java +++ b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java @@ -262,7 +262,7 @@ public class CamelDestination extends AbstractDestination implements Configurabl private class CamelOutputStream extends CachedOutputStream { private Message outMessage; - public CamelOutputStream(Message m) { + CamelOutputStream(Message m) { outMessage = m; } http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelOutputStream.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelOutputStream.java b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelOutputStream.java index cd90530..06ffcb8 100644 --- a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelOutputStream.java +++ b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelOutputStream.java @@ -51,9 +51,9 @@ class CamelOutputStream extends CachedOutputStream { private MessageObserver observer; private boolean hasLoggedAsyncWarning; - public CamelOutputStream(String targetCamelEndpointUri, Producer producer, - HeaderFilterStrategy headerFilterStrategy, MessageObserver observer, - Message m) { + CamelOutputStream(String targetCamelEndpointUri, Producer producer, + HeaderFilterStrategy headerFilterStrategy, MessageObserver observer, + Message m) { this.targetCamelEndpointUri = targetCamelEndpointUri; this.producer = producer; this.headerFilterStrategy = headerFilterStrategy; http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java index 4c29f8a..2271e2f 100644 --- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java +++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java @@ -64,210 +64,7 @@ public class CxfConsumer extends DefaultConsumer { cxfEndpoint = endpoint; // create server ServerFactoryBean svrBean = endpoint.createServerFactoryBean(); - svrBean.setInvoker(new Invoker() { - // we receive a CXF request when this method is called - public Object invoke(Exchange cxfExchange, Object o) { - LOG.trace("Received CXF Request: {}", cxfExchange); - Continuation continuation; - if (!endpoint.isSynchronous() && isAsyncInvocationSupported(cxfExchange) - && (continuation = getContinuation(cxfExchange)) != null) { - LOG.trace("Calling the Camel async processors."); - return asyncInvoke(cxfExchange, continuation); - } else { - LOG.trace("Calling the Camel sync processors."); - return syncInvoke(cxfExchange); - } - } - // NOTE this code cannot work with CXF 2.2.x and JMSContinuation - // as it doesn't break out the interceptor chain when we call it - private Object asyncInvoke(Exchange cxfExchange, final Continuation continuation) { - synchronized (continuation) { - if (continuation.isNew()) { - final org.apache.camel.Exchange camelExchange = prepareCamelExchange(cxfExchange); - - // Now we don't set up the timeout value - LOG.trace("Suspending continuation of exchangeId: {}", camelExchange.getExchangeId()); - - // The continuation could be called before the suspend is called - continuation.suspend(cxfEndpoint.getContinuationTimeout()); - - // use the asynchronous API to process the exchange - getAsyncProcessor().process(camelExchange, new AsyncCallback() { - public void done(boolean doneSync) { - // make sure the continuation resume will not be called before the suspend method in other thread - synchronized (continuation) { - LOG.trace("Resuming continuation of exchangeId: {}", camelExchange.getExchangeId()); - // resume processing after both, sync and async callbacks - continuation.setObject(camelExchange); - continuation.resume(); - } - } - }); - - } else if (continuation.isResumed()) { - org.apache.camel.Exchange camelExchange = (org.apache.camel.Exchange)continuation.getObject(); - try { - setResponseBack(cxfExchange, camelExchange); - } finally { - CxfConsumer.this.doneUoW(camelExchange); - } - - } - } - return null; - } - private Continuation getContinuation(Exchange cxfExchange) { - ContinuationProvider provider = - (ContinuationProvider)cxfExchange.getInMessage().get(ContinuationProvider.class.getName()); - Continuation continuation = provider == null ? null : provider.getContinuation(); - // Make sure we don't return the JMSContinuation, as it doesn't support the Continuation we wants - // Don't want to introduce the dependency of cxf-rt-transprot-jms here - if (continuation != null && continuation.getClass().getName().equals("org.apache.cxf.transport.jms.continuations.JMSContinuation")) { - return null; - } else { - return continuation; - } - } - private Object syncInvoke(Exchange cxfExchange) { - org.apache.camel.Exchange camelExchange = prepareCamelExchange(cxfExchange); - try { - try { - LOG.trace("Processing +++ START +++"); - // send Camel exchange to the target processor - getProcessor().process(camelExchange); - } catch (Exception e) { - throw new Fault(e); - } - - LOG.trace("Processing +++ END +++"); - setResponseBack(cxfExchange, camelExchange); - } finally { - doneUoW(camelExchange); - } - // response should have been set in outMessage's content - return null; - } - - private org.apache.camel.Exchange prepareCamelExchange(Exchange cxfExchange) { - // get CXF binding - CxfEndpoint endpoint = (CxfEndpoint)getEndpoint(); - CxfBinding binding = endpoint.getCxfBinding(); - - // create a Camel exchange, the default MEP is InOut - org.apache.camel.Exchange camelExchange = endpoint.createExchange(); - - DataFormat dataFormat = endpoint.getDataFormat(); - - BindingOperationInfo boi = cxfExchange.getBindingOperationInfo(); - // make sure the "boi" is remained as wrapped in PAYLOAD mode - if (boi != null && dataFormat == DataFormat.PAYLOAD && boi.isUnwrapped()) { - boi = boi.getWrappedOperation(); - cxfExchange.put(BindingOperationInfo.class, boi); - } - - if (boi != null) { - camelExchange.setProperty(BindingOperationInfo.class.getName(), boi); - LOG.trace("Set exchange property: BindingOperationInfo: {}", boi); - // set the message exchange patter with the boi - if (boi.getOperationInfo().isOneWay()) { - camelExchange.setPattern(ExchangePattern.InOnly); - } - } else { - if (cxfEndpoint.getExchangePattern().equals(ExchangePattern.InOnly)) { - camelExchange.setPattern(ExchangePattern.InOnly); - } - } - - - // set data format mode in Camel exchange - camelExchange.setProperty(CxfConstants.DATA_FORMAT_PROPERTY, dataFormat); - LOG.trace("Set Exchange property: {}={}", DataFormat.class.getName(), dataFormat); - - camelExchange.setProperty(Message.MTOM_ENABLED, String.valueOf(endpoint.isMtomEnabled())); - - if (endpoint.getMergeProtocolHeaders()) { - camelExchange.setProperty(CxfConstants.CAMEL_CXF_PROTOCOL_HEADERS_MERGED, Boolean.TRUE); - } - // bind the CXF request into a Camel exchange - binding.populateExchangeFromCxfRequest(cxfExchange, camelExchange); - // extract the javax.xml.ws header - Map<String, Object> context = new HashMap<String, Object>(); - binding.extractJaxWsContext(cxfExchange, context); - // put the context into camelExchange - camelExchange.setProperty(CxfConstants.JAXWS_CONTEXT, context); - - // we want to handle the UoW - try { - CxfConsumer.this.createUoW(camelExchange); - } catch (Exception e) { - log.error("Error processing request", e); - throw new Fault(e); - } - return camelExchange; - } - - @SuppressWarnings("unchecked") - private void setResponseBack(Exchange cxfExchange, org.apache.camel.Exchange camelExchange) { - CxfEndpoint endpoint = (CxfEndpoint)getEndpoint(); - CxfBinding binding = endpoint.getCxfBinding(); - - checkFailure(camelExchange, cxfExchange); - - binding.populateCxfResponseFromExchange(camelExchange, cxfExchange); - - // check failure again as fault could be discovered by converter - checkFailure(camelExchange, cxfExchange); - - // copy the headers javax.xml.ws header back - binding.copyJaxWsContext(cxfExchange, (Map<String, Object>)camelExchange.getProperty(CxfConstants.JAXWS_CONTEXT)); - } - - private void checkFailure(org.apache.camel.Exchange camelExchange, Exchange cxfExchange) throws Fault { - final Throwable t; - if (camelExchange.isFailed()) { - org.apache.camel.Message camelMsg = camelExchange.hasOut() ? camelExchange.getOut() : camelExchange.getIn(); - if (camelMsg.isFault()) { - t = camelMsg.getBody(Throwable.class); - } else { - t = camelExchange.getException(); - } - cxfExchange.getInMessage().put(FaultMode.class, FaultMode.UNCHECKED_APPLICATION_FAULT); - if (t instanceof Fault) { - cxfExchange.getInMessage().put(FaultMode.class, FaultMode.CHECKED_APPLICATION_FAULT); - throw (Fault)t; - } else if (t != null) { - // This is not a CXF Fault. Build the CXF Fault manually. - Fault fault = new Fault(t); - if (fault.getMessage() == null) { - // The Fault has no Message. This is the case if it has - // no message, for example was a NullPointerException. - fault.setMessage(t.getClass().getSimpleName()); - } - WebFault faultAnnotation = t.getClass().getAnnotation(WebFault.class); - Object faultInfo = null; - try { - Method method = t.getClass().getMethod("getFaultInfo"); - faultInfo = method.invoke(t, new Object[0]); - } catch (Exception e) { - // do nothing here - } - if (faultAnnotation != null && faultInfo == null) { - // t has a JAX-WS WebFault annotation, which describes - // in detail the Web Service Fault that should be thrown. Add the - // detail. - Element detail = fault.getOrCreateDetail(); - Element faultDetails = detail.getOwnerDocument() - .createElementNS(faultAnnotation.targetNamespace(), faultAnnotation.name()); - detail.appendChild(faultDetails); - } - - throw fault; - } - - } - } - - }); + svrBean.setInvoker(new CxfConsumerInvoker(endpoint)); server = svrBean.create(); // Apply the server configurer if it is possible if (cxfEndpoint.getCxfEndpointConfigurer() != null) { @@ -277,7 +74,11 @@ public class CxfConsumer extends DefaultConsumer { server.getEndpoint().getEndpointInfo().setProperty("publishedEndpointUrl", endpoint.getPublishedEndpointUrl()); } } - + + public Server getServer() { + return server; + } + @Override protected void doStart() throws Exception { super.doStart(); @@ -289,6 +90,7 @@ public class CxfConsumer extends DefaultConsumer { server.stop(); super.doStop(); } + private EndpointReferenceType getReplyTo(Object o) { try { return (EndpointReferenceType)o.getClass().getMethod("getReplyTo").invoke(o); @@ -296,6 +98,7 @@ public class CxfConsumer extends DefaultConsumer { throw new Fault(t); } } + protected boolean isAsyncInvocationSupported(Exchange cxfExchange) { Message cxfMessage = cxfExchange.getInMessage(); Object addressingProperties = cxfMessage.get(CxfConstants.WSA_HEADERS_INBOUND); @@ -310,11 +113,219 @@ public class CxfConsumer extends DefaultConsumer { } // we assume it should support AsyncInvocation out of box return true; - } - public Server getServer() { - return server; + private class CxfConsumerInvoker implements Invoker { + private final CxfEndpoint endpoint; + + CxfConsumerInvoker(CxfEndpoint endpoint) { + this.endpoint = endpoint; + } + + // we receive a CXF request when this method is called + public Object invoke(Exchange cxfExchange, Object o) { + LOG.trace("Received CXF Request: {}", cxfExchange); + Continuation continuation; + if (!endpoint.isSynchronous() && isAsyncInvocationSupported(cxfExchange) + && (continuation = getContinuation(cxfExchange)) != null) { + LOG.trace("Calling the Camel async processors."); + return asyncInvoke(cxfExchange, continuation); + } else { + LOG.trace("Calling the Camel sync processors."); + return syncInvoke(cxfExchange); + } + } + + // NOTE this code cannot work with CXF 2.2.x and JMSContinuation + // as it doesn't break out the interceptor chain when we call it + private Object asyncInvoke(Exchange cxfExchange, final Continuation continuation) { + synchronized (continuation) { + if (continuation.isNew()) { + final org.apache.camel.Exchange camelExchange = prepareCamelExchange(cxfExchange); + + // Now we don't set up the timeout value + LOG.trace("Suspending continuation of exchangeId: {}", camelExchange.getExchangeId()); + + // The continuation could be called before the suspend is called + continuation.suspend(cxfEndpoint.getContinuationTimeout()); + + // use the asynchronous API to process the exchange + getAsyncProcessor().process(camelExchange, new AsyncCallback() { + public void done(boolean doneSync) { + // make sure the continuation resume will not be called before the suspend method in other thread + synchronized (continuation) { + LOG.trace("Resuming continuation of exchangeId: {}", camelExchange.getExchangeId()); + // resume processing after both, sync and async callbacks + continuation.setObject(camelExchange); + continuation.resume(); + } + } + }); + + } else if (continuation.isResumed()) { + org.apache.camel.Exchange camelExchange = (org.apache.camel.Exchange)continuation.getObject(); + try { + setResponseBack(cxfExchange, camelExchange); + } finally { + CxfConsumer.this.doneUoW(camelExchange); + } + + } + } + return null; + } + + private Continuation getContinuation(Exchange cxfExchange) { + ContinuationProvider provider = + (ContinuationProvider)cxfExchange.getInMessage().get(ContinuationProvider.class.getName()); + Continuation continuation = provider == null ? null : provider.getContinuation(); + // Make sure we don't return the JMSContinuation, as it doesn't support the Continuation we wants + // Don't want to introduce the dependency of cxf-rt-transprot-jms here + if (continuation != null && continuation.getClass().getName().equals("org.apache.cxf.transport.jms.continuations.JMSContinuation")) { + return null; + } else { + return continuation; + } + } + + private Object syncInvoke(Exchange cxfExchange) { + org.apache.camel.Exchange camelExchange = prepareCamelExchange(cxfExchange); + try { + try { + LOG.trace("Processing +++ START +++"); + // send Camel exchange to the target processor + getProcessor().process(camelExchange); + } catch (Exception e) { + throw new Fault(e); + } + + LOG.trace("Processing +++ END +++"); + setResponseBack(cxfExchange, camelExchange); + } finally { + doneUoW(camelExchange); + } + // response should have been set in outMessage's content + return null; + } + + private org.apache.camel.Exchange prepareCamelExchange(Exchange cxfExchange) { + // get CXF binding + CxfEndpoint endpoint = (CxfEndpoint)getEndpoint(); + CxfBinding binding = endpoint.getCxfBinding(); + + // create a Camel exchange, the default MEP is InOut + org.apache.camel.Exchange camelExchange = endpoint.createExchange(); + + DataFormat dataFormat = endpoint.getDataFormat(); + + BindingOperationInfo boi = cxfExchange.getBindingOperationInfo(); + // make sure the "boi" is remained as wrapped in PAYLOAD mode + if (boi != null && dataFormat == DataFormat.PAYLOAD && boi.isUnwrapped()) { + boi = boi.getWrappedOperation(); + cxfExchange.put(BindingOperationInfo.class, boi); + } + + if (boi != null) { + camelExchange.setProperty(BindingOperationInfo.class.getName(), boi); + LOG.trace("Set exchange property: BindingOperationInfo: {}", boi); + // set the message exchange patter with the boi + if (boi.getOperationInfo().isOneWay()) { + camelExchange.setPattern(ExchangePattern.InOnly); + } + } else { + if (cxfEndpoint.getExchangePattern().equals(ExchangePattern.InOnly)) { + camelExchange.setPattern(ExchangePattern.InOnly); + } + } + + + // set data format mode in Camel exchange + camelExchange.setProperty(CxfConstants.DATA_FORMAT_PROPERTY, dataFormat); + LOG.trace("Set Exchange property: {}={}", DataFormat.class.getName(), dataFormat); + + camelExchange.setProperty(Message.MTOM_ENABLED, String.valueOf(endpoint.isMtomEnabled())); + + if (endpoint.getMergeProtocolHeaders()) { + camelExchange.setProperty(CxfConstants.CAMEL_CXF_PROTOCOL_HEADERS_MERGED, Boolean.TRUE); + } + // bind the CXF request into a Camel exchange + binding.populateExchangeFromCxfRequest(cxfExchange, camelExchange); + // extract the javax.xml.ws header + Map<String, Object> context = new HashMap<String, Object>(); + binding.extractJaxWsContext(cxfExchange, context); + // put the context into camelExchange + camelExchange.setProperty(CxfConstants.JAXWS_CONTEXT, context); + + // we want to handle the UoW + try { + CxfConsumer.this.createUoW(camelExchange); + } catch (Exception e) { + log.error("Error processing request", e); + throw new Fault(e); + } + return camelExchange; + } + + @SuppressWarnings("unchecked") + private void setResponseBack(Exchange cxfExchange, org.apache.camel.Exchange camelExchange) { + CxfEndpoint endpoint = (CxfEndpoint)getEndpoint(); + CxfBinding binding = endpoint.getCxfBinding(); + + checkFailure(camelExchange, cxfExchange); + + binding.populateCxfResponseFromExchange(camelExchange, cxfExchange); + + // check failure again as fault could be discovered by converter + checkFailure(camelExchange, cxfExchange); + + // copy the headers javax.xml.ws header back + binding.copyJaxWsContext(cxfExchange, (Map<String, Object>)camelExchange.getProperty(CxfConstants.JAXWS_CONTEXT)); + } + + private void checkFailure(org.apache.camel.Exchange camelExchange, Exchange cxfExchange) throws Fault { + final Throwable t; + if (camelExchange.isFailed()) { + org.apache.camel.Message camelMsg = camelExchange.hasOut() ? camelExchange.getOut() : camelExchange.getIn(); + if (camelMsg.isFault()) { + t = camelMsg.getBody(Throwable.class); + } else { + t = camelExchange.getException(); + } + cxfExchange.getInMessage().put(FaultMode.class, FaultMode.UNCHECKED_APPLICATION_FAULT); + if (t instanceof Fault) { + cxfExchange.getInMessage().put(FaultMode.class, FaultMode.CHECKED_APPLICATION_FAULT); + throw (Fault)t; + } else if (t != null) { + // This is not a CXF Fault. Build the CXF Fault manually. + Fault fault = new Fault(t); + if (fault.getMessage() == null) { + // The Fault has no Message. This is the case if it has + // no message, for example was a NullPointerException. + fault.setMessage(t.getClass().getSimpleName()); + } + WebFault faultAnnotation = t.getClass().getAnnotation(WebFault.class); + Object faultInfo = null; + try { + Method method = t.getClass().getMethod("getFaultInfo"); + faultInfo = method.invoke(t, new Object[0]); + } catch (Exception e) { + // do nothing here + } + if (faultAnnotation != null && faultInfo == null) { + // t has a JAX-WS WebFault annotation, which describes + // in detail the Web Service Fault that should be thrown. Add the + // detail. + Element detail = fault.getOrCreateDetail(); + Element faultDetails = detail.getOwnerDocument() + .createElementNS(faultAnnotation.targetNamespace(), faultAnnotation.name()); + detail.appendChild(faultDetails); + } + + throw fault; + } + + } + } + } - } http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java index b9d6749..9fb77e7 100644 --- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java +++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java @@ -40,10 +40,11 @@ import javax.xml.ws.Provider; import javax.xml.ws.WebServiceProvider; import javax.xml.ws.handler.Handler; -import org.apache.camel.AsyncEndpoint; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; + +import org.apache.camel.AsyncEndpoint; import org.apache.camel.CamelContext; import org.apache.camel.CamelException; import org.apache.camel.Consumer; @@ -1131,15 +1132,13 @@ public class CxfEndpoint extends DefaultEndpoint implements AsyncEndpoint, Heade this.username = username; } - - /** * We need to override the {@link ClientImpl#setParameters} method * to insert parameters into CXF Message for {@link DataFormat#PAYLOAD} mode. */ class CamelCxfClientImpl extends ClientImpl { - public CamelCxfClientImpl(Bus bus, Endpoint ep) { + CamelCxfClientImpl(Bus bus, Endpoint ep) { super(bus, ep); } http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/DelegatingXMLStreamReader.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/DelegatingXMLStreamReader.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/DelegatingXMLStreamReader.java index 47c081c..ce9882c 100644 --- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/DelegatingXMLStreamReader.java +++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/DelegatingXMLStreamReader.java @@ -35,7 +35,7 @@ class DelegatingXMLStreamReader implements XMLStreamReader { private final String[] xprefixes; private int depth; - public DelegatingXMLStreamReader(XMLStreamReader reader, Map<String, String> nsmap) { + DelegatingXMLStreamReader(XMLStreamReader reader, Map<String, String> nsmap) { this.reader = reader; //the original nsmap will be mutated if some of its declarations are redundantly present at the current reader Set<String> prefixes = nsmap.keySet(); http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java index a6ae7c2..33045dd 100644 --- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java +++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java @@ -468,7 +468,7 @@ public class CxfRsProducer extends DefaultProducer { class ClientFactoryBeanCache { private LRUSoftCache<String, JAXRSClientFactoryBean> cache; - public ClientFactoryBeanCache(final int maxCacheSize) { + ClientFactoryBeanCache(final int maxCacheSize) { this.cache = new LRUSoftCache<String, JAXRSClientFactoryBean>(maxCacheSize); } http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java index 9bccb1f..a1a12be 100644 --- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java +++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java @@ -105,7 +105,7 @@ public class SimpleCxfRsBinding extends DefaultCxfRsBinding { /** The JAX-RS annotations to be injected as headers in the IN message */ private static final Set<Class<?>> HEADER_ANNOTATIONS = Collections.unmodifiableSet( - new HashSet<Class<?>>(Arrays.asList(new Class<?>[]{ + new HashSet<Class<?>>(Arrays.asList(new Class<?>[] { CookieParam.class, FormParam.class, PathParam.class, http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConusmerNamespacePayLoadTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConusmerNamespacePayLoadTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConusmerNamespacePayLoadTest.java index 535f739..2fe455a 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConusmerNamespacePayLoadTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConusmerNamespacePayLoadTest.java @@ -47,7 +47,7 @@ public class CxfConusmerNamespacePayLoadTest extends CxfConsumerPayloadTest { public void testInvokingServiceFromClient() throws Exception { // just send a request which has all the namespace in the soap header HttpPost post = new HttpPost(simpleEndpointAddress); - post.addHeader("Accept" , "text/xml"); + post.addHeader("Accept", "text/xml"); StringEntity entity = new StringEntity(ECHO_REQUEST, ContentType.create("text/xml", "ISO-8859-1")); post.setEntity(entity); http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java index 1197bb6..623a9db 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java @@ -123,7 +123,7 @@ public class CxfCustomizedExceptionTest extends CamelTestSupport { @Test public void testInvokingServiceFromCamel() throws Exception { - Object result = template.sendBodyAndHeader("direct:start", ExchangePattern.InOut, "hello world" , CxfConstants.OPERATION_NAME, "echo"); + Object result = template.sendBodyAndHeader("direct:start", ExchangePattern.InOut, "hello world", CxfConstants.OPERATION_NAME, "echo"); assertTrue("Exception is not instance of SoapFault", result instanceof SoapFault); assertEquals("Expect to get right detail message", DETAIL_TEXT, ((SoapFault)result).getDetail().getTextContent()); assertEquals("Expect to get right fault-code", "{http://schemas.xmlsoap.org/soap/envelope/}Client";, ((SoapFault)result).getFaultCode().toString()); http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMessageHeaderTimeoutTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMessageHeaderTimeoutTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMessageHeaderTimeoutTest.java index f960c90..3eceb4d 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMessageHeaderTimeoutTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMessageHeaderTimeoutTest.java @@ -78,7 +78,7 @@ public class CxfMessageHeaderTimeoutTest extends CamelSpringTestSupport { clientPolicy.setReceiveTimeout(100); requestContext.put(HTTPClientPolicy.class.getName(), clientPolicy); exchange.getIn().setBody(params); - exchange.getIn().setHeader(Client.REQUEST_CONTEXT , requestContext); + exchange.getIn().setHeader(Client.REQUEST_CONTEXT, requestContext); } }); http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java index 5e31ff3..230c58f 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java @@ -61,7 +61,7 @@ public class CxfOneWayRouteTest extends CamelSpringTestSupport { protected Greeter getCXFClient() throws Exception { Service service = Service.create(SERVICE_NAME); - service.addPort(PORT_NAME , "http://schemas.xmlsoap.org/soap/";, ROUTER_ADDRESS); + service.addPort(PORT_NAME, "http://schemas.xmlsoap.org/soap/";, ROUTER_ADDRESS); Greeter greeter = service.getPort(PORT_NAME, Greeter.class); return greeter; } http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageRouterAddressOverrideTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageRouterAddressOverrideTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageRouterAddressOverrideTest.java index 31e6c87..50c57b6 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageRouterAddressOverrideTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageRouterAddressOverrideTest.java @@ -48,10 +48,10 @@ public class CxfPayLoadMessageRouterAddressOverrideTest extends CxfPayLoadMessag CxfPayload<?> payload = exchange.getIn().getBody(CxfPayload.class); List<Source> elements = payload.getBodySources(); - assertNotNull("We should get the elements here" , elements); - assertEquals("Get the wrong elements size" , elements.size(), 1); + assertNotNull("We should get the elements here", elements); + assertEquals("Get the wrong elements size", elements.size(), 1); Element el = new XmlConverter().toDOMElement(elements.get(0)); - assertEquals("Get the wrong namespace URI" , el.getNamespaceURI(), "http://cxf.component.camel.apache.org/";); + assertEquals("Get the wrong namespace URI", el.getNamespaceURI(), "http://cxf.component.camel.apache.org/";); } }) .to(serviceEndpointURI); http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageRouterTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageRouterTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageRouterTest.java index 20c0581..27c285c 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageRouterTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageRouterTest.java @@ -46,10 +46,10 @@ public class CxfPayLoadMessageRouterTest extends CxfSimpleRouterTest { public void process(Exchange exchange) throws Exception { CxfPayload<?> payload = exchange.getIn().getBody(CxfPayload.class); List<Source> elements = payload.getBodySources(); - assertNotNull("We should get the elements here" , elements); - assertEquals("Get the wrong elements size" , elements.size(), 1); + assertNotNull("We should get the elements here", elements); + assertEquals("Get the wrong elements size", elements.size(), 1); Element el = new XmlConverter().toDOMElement(elements.get(0)); - assertEquals("Get the wrong namespace URI" , el.getNamespaceURI(), "http://cxf.component.camel.apache.org/";); + assertEquals("Get the wrong namespace URI", el.getNamespaceURI(), "http://cxf.component.camel.apache.org/";); } }) http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageXmlBindingRouterTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageXmlBindingRouterTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageXmlBindingRouterTest.java index 0af9813..be5d4bf 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageXmlBindingRouterTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageXmlBindingRouterTest.java @@ -111,11 +111,11 @@ public class CxfPayLoadMessageXmlBindingRouterTest extends CamelTestSupport { public void process(Exchange exchange) throws Exception { CxfPayload<?> payload = exchange.getIn().getBody(CxfPayload.class); List<Source> elements = payload.getBodySources(); - assertNotNull("We should get the elements here" , elements); - assertEquals("Get the wrong elements size" , elements.size(), 1); + assertNotNull("We should get the elements here", elements); + assertEquals("Get the wrong elements size", elements.size(), 1); Element el = new XmlConverter().toDOMElement(elements.get(0)); - assertEquals("Get the wrong namespace URI" , el.getNamespaceURI(), "http://cxf.component.camel.apache.org/";); + assertEquals("Get the wrong namespace URI", el.getNamespaceURI(), "http://cxf.component.camel.apache.org/";); } }) http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadConsumerDuplicateNamespaceStreamCacheTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadConsumerDuplicateNamespaceStreamCacheTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadConsumerDuplicateNamespaceStreamCacheTest.java index ace11a7..a92737e 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadConsumerDuplicateNamespaceStreamCacheTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadConsumerDuplicateNamespaceStreamCacheTest.java @@ -24,8 +24,10 @@ public class CxfPayloadConsumerDuplicateNamespaceStreamCacheTest extends CxfPayl * payload. If this is set another time from the envelope, the result will * be an invalid XML. */ - protected static final String REQUEST_MESSAGE = "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\"; xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"; xmlns:xs=\"http://www.w3.org/2001/XMLSchema\";>" - + "<soap:Body><ns2:getToken xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\"; xmlns:ns2=\"http://camel.apache.org/cxf/namespace\";><arg0 xsi:type=\"xs:string\">Send</arg0></ns2:getToken></soap:Body></soap:Envelope>"; + protected static final String REQUEST_MESSAGE = + "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\"; xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"; xmlns:xs=\"http://www.w3.org/2001/XMLSchema\";>" + + "<soap:Body><ns2:getToken xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\"; xmlns:ns2=\"http://camel.apache.org/cxf/namespace\";>" + + "<arg0 xsi:type=\"xs:string\">Send</arg0></ns2:getToken></soap:Body></soap:Envelope>"; @Test public void testInvokeRouter() { http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadProviderRouterTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadProviderRouterTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadProviderRouterTest.java index 6bc3177..3fe9d15 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadProviderRouterTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadProviderRouterTest.java @@ -111,7 +111,7 @@ public class CxfPayloadProviderRouterTest extends AbstractCXFGreeterRouterTest { static class VerifyInboundInterceptor extends AbstractPhaseInterceptor<Message> { private boolean called; - public VerifyInboundInterceptor() { + VerifyInboundInterceptor() { super(Phase.USER_PROTOCOL); } http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerContextTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerContextTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerContextTest.java index 20ca725..072e921 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerContextTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerContextTest.java @@ -72,7 +72,7 @@ public class CxfProducerContextTest extends CxfProducerTest { Map<String, Object> requestContext = new HashMap<String, Object>(); requestContext.put(Message.ENDPOINT_ADDRESS, getSimpleServerAddress()); exchange.getIn().setBody(params); - exchange.getIn().setHeader(Client.REQUEST_CONTEXT , requestContext); + exchange.getIn().setHeader(Client.REQUEST_CONTEXT, requestContext); exchange.getIn().setHeader(CxfConstants.OPERATION_NAME, ECHO_OPERATION); exchange.getIn().setHeader(Exchange.FILE_NAME, "testFile"); exchange.getIn().setHeader("requestObject", new DefaultCxfBinding()); @@ -92,7 +92,7 @@ public class CxfProducerContextTest extends CxfProducerTest { Map<String, Object> requestContext = new HashMap<String, Object>(); requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, getJaxWsServerAddress()); exchange.getIn().setBody(params); - exchange.getIn().setHeader(Client.REQUEST_CONTEXT , requestContext); + exchange.getIn().setHeader(Client.REQUEST_CONTEXT, requestContext); exchange.getIn().setHeader(CxfConstants.OPERATION_NAME, GREET_ME_OPERATION); exchange.getIn().setHeader(Exchange.FILE_NAME, "testFile"); } http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSpringCustomizedExceptionTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSpringCustomizedExceptionTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSpringCustomizedExceptionTest.java index 19a0a74..3f5dc09 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSpringCustomizedExceptionTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSpringCustomizedExceptionTest.java @@ -73,7 +73,7 @@ public class CxfSpringCustomizedExceptionTest extends CamelTestSupport { @Test public void testInvokingServiceFromCamel() throws Exception { try { - template.sendBodyAndHeader("direct:start", ExchangePattern.InOut, "hello world" , CxfConstants.OPERATION_NAME, "echo"); + template.sendBodyAndHeader("direct:start", ExchangePattern.InOut, "hello world", CxfConstants.OPERATION_NAME, "echo"); fail("Should have thrown an exception"); } catch (Exception ex) { Throwable result = ex.getCause(); http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/TestCxfFeature.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/TestCxfFeature.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/TestCxfFeature.java index ecede29..a68e732 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/TestCxfFeature.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/TestCxfFeature.java @@ -28,8 +28,7 @@ import org.apache.cxf.phase.AbstractPhaseInterceptor; import org.apache.cxf.phase.Phase; public class TestCxfFeature extends AbstractFeature { - - + @Override protected void initializeProvider(InterceptorProvider provider, Bus bus) { @@ -43,7 +42,7 @@ public class TestCxfFeature extends AbstractFeature { class EndpointCheckInterceptor extends AbstractPhaseInterceptor<Message> { - public EndpointCheckInterceptor() { + EndpointCheckInterceptor() { super(Phase.PREPARE_SEND); } http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTest.java index a3eed4d..0c3a4ac 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTest.java @@ -98,7 +98,7 @@ public class CxfBeanTest extends AbstractJUnit4SpringContextTests { private void invokeRsService(String getUrl, String expected) throws Exception { HttpGet get = new HttpGet(getUrl); - get.addHeader("Accept" , "application/json"); + get.addHeader("Accept", "application/json"); get.addHeader("key", "customer"); CloseableHttpClient httpclient = HttpClientBuilder.create().build(); @@ -171,7 +171,7 @@ public class CxfBeanTest extends AbstractJUnit4SpringContextTests { @Test public void testPostConsumer() throws Exception { HttpPost post = new HttpPost("http://localhost:"; + PORT1 + "/customerservice/customers"); - post.addHeader("Accept" , "text/xml"); + post.addHeader("Accept", "text/xml"); StringEntity entity = new StringEntity(POST_REQUEST, "ISO-8859-1"); entity.setContentType("text/xml; charset=ISO-8859-1"); post.setEntity(entity); @@ -191,7 +191,7 @@ public class CxfBeanTest extends AbstractJUnit4SpringContextTests { @Test public void testPostConsumerUniqueResponseCode() throws Exception { HttpPost post = new HttpPost("http://localhost:"; + PORT1 + "/customerservice/customersUniqueResponseCode"); - post.addHeader("Accept" , "text/xml"); + post.addHeader("Accept", "text/xml"); StringEntity entity = new StringEntity(POST2_REQUEST, "ISO-8859-1"); entity.setContentType("text/xml; charset=ISO-8859-1"); post.setEntity(entity); @@ -228,7 +228,7 @@ public class CxfBeanTest extends AbstractJUnit4SpringContextTests { @Test public void testJaxWsBean() throws Exception { HttpPost post = new HttpPost("http://localhost:"; + PORT2 + "/customerservice/customers"); - post.addHeader("Accept" , "text/xml"); + post.addHeader("Accept", "text/xml"); String body = "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\";>" + "<soap:Body><GetPerson xmlns=\"http://camel.apache.org/wsdl-first/types\";>" + "<personId>hello</personId></GetPerson></soap:Body></soap:Envelope>"; http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanAndIoCTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanAndIoCTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanAndIoCTest.java index 80e27dc..36f80f3 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanAndIoCTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanAndIoCTest.java @@ -37,7 +37,7 @@ public class CxfBeanWithWsdlLocationInBeanAndIoCTest extends AbstractJUnit4Sprin @Test public void testDoNotUseWsdlDefinedInJaxWsBeanByDefault() throws Exception { HttpPost post = new HttpPost("http://localhost:"; + port + "/customerservice/customers"); - post.addHeader("Accept" , "text/xml"); + post.addHeader("Accept", "text/xml"); String body = "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\";>" + "<soap:Body><GetPerson xmlns=\"http://camel.apache.org/wsdl-first/types\";>" + "<personId>hello</personId></GetPerson></soap:Body></soap:Envelope>"; http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanTest.java index c7235a2..b47ddb1 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanTest.java @@ -39,7 +39,7 @@ public class CxfBeanWithWsdlLocationInBeanTest extends AbstractJUnit4SpringConte @Test public void testDoNotUseWsdlDefinedInJaxWsBeanByDefault() throws Exception { HttpPost post = new HttpPost("http://localhost:"; + port + "/customerservice/customers"); - post.addHeader("Accept" , "text/xml"); + post.addHeader("Accept", "text/xml"); String body = "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\";>" + "<soap:Body><GetPerson xmlns=\"http://camel.apache.org/wsdl-first/types\";>" + "<personId>hello</personId></GetPerson></soap:Body></soap:Envelope>"; http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerTest.java index fafccf3..0d61ebf 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerTest.java @@ -90,7 +90,7 @@ public class CxfRsConsumerTest extends CamelTestSupport { private void invokeGetCustomer(String uri, String expect) throws Exception { HttpGet get = new HttpGet(uri); - get.addHeader("Accept" , "application/json"); + get.addHeader("Accept", "application/json"); CloseableHttpClient httpclient = HttpClientBuilder.create().build(); try { http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java index 2cfe626..039859c 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java @@ -368,10 +368,7 @@ public class CxfRsProducerTest extends CamelSpringTestSupport { @Test public void testProducerWithQueryParameters() { - // START SNIPPET: QueryExample - Exchange exchange = template.send("cxfrs://http://localhost:"; + getPort2() + "/" + getClass().getSimpleName() + "/testQuery?httpClientAPI=true&q1=12&q2=13" - // END SNIPPET: QueryExample - , new Processor() { + Exchange exchange = template.send("cxfrs://http://localhost:"; + getPort2() + "/" + getClass().getSimpleName() + "/testQuery?httpClientAPI=true&q1=12&q2=13", new Processor() { public void process(Exchange exchange) throws Exception { exchange.setPattern(ExchangePattern.InOut); Message inMessage = exchange.getIn(); @@ -391,8 +388,7 @@ public class CxfRsProducerTest extends CamelSpringTestSupport { @Test public void testProducerWithQueryParametersHeader() { - Exchange exchange = template.send("cxfrs://http://localhost:"; + getPort2() + "/" + getClass().getSimpleName() + "/testQuery?httpClientAPI=true&q1=12&q2=13" - , new Processor() { + Exchange exchange = template.send("cxfrs://http://localhost:"; + getPort2() + "/" + getClass().getSimpleName() + "/testQuery?httpClientAPI=true&q1=12&q2=13", new Processor() { public void process(Exchange exchange) throws Exception { exchange.setPattern(ExchangePattern.InOut); Message inMessage = exchange.getIn(); http://git-wip-us.apache.org/repos/asf/camel/blob/5cb6ebf7/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsRouterTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsRouterTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsRouterTest.java index e67f537..e799a6e 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsRouterTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsRouterTest.java @@ -60,7 +60,7 @@ public class CxfRsRouterTest extends CamelSpringTestSupport { @Test public void testGetCustomer() throws Exception { HttpGet get = new HttpGet("http://localhost:"; + getPort() + "/CxfRsRouterTest/route/customerservice/customers/123"); - get.addHeader("Accept" , "application/json"); + get.addHeader("Accept", "application/json"); CloseableHttpClient httpclient = HttpClientBuilder.create().build(); try { @@ -77,7 +77,7 @@ public class CxfRsRouterTest extends CamelSpringTestSupport { @Test public void testGetCustomerWithQuery() throws Exception { HttpGet get = new HttpGet("http://localhost:"; + getPort() + "/CxfRsRouterTest/route/customerservice/customers?id=123"); - get.addHeader("Accept" , "application/json"); + get.addHeader("Accept", "application/json"); CloseableHttpClient httpclient = HttpClientBuilder.create().build(); try { @@ -93,7 +93,7 @@ public class CxfRsRouterTest extends CamelSpringTestSupport { @Test public void testGetCustomers() throws Exception { HttpGet get = new HttpGet("http://localhost:"; + getPort() + "/CxfRsRouterTest/route/customerservice/customers/"); - get.addHeader("Accept" , "application/xml"); + get.addHeader("Accept", "application/xml"); CloseableHttpClient httpclient = HttpClientBuilder.create().build(); try { @@ -116,7 +116,7 @@ public class CxfRsRouterTest extends CamelSpringTestSupport { @Test public void testGetSubResource() throws Exception { HttpGet get = new HttpGet("http://localhost:"; + getPort() + "/CxfRsRouterTest/route/customerservice/orders/223/products/323"); - get.addHeader("Accept" , "application/json"); + get.addHeader("Accept", "application/json"); CloseableHttpClient httpclient = HttpClientBuilder.create().build(); try { @@ -149,7 +149,7 @@ public class CxfRsRouterTest extends CamelSpringTestSupport { @Test public void testPostConsumer() throws Exception { HttpPost post = new HttpPost("http://localhost:"; + getPort() + "/CxfRsRouterTest/route/customerservice/customers"); - post.addHeader("Accept" , "text/xml"); + post.addHeader("Accept", "text/xml"); StringEntity entity = new StringEntity(POST_REQUEST, "ISO-8859-1"); entity.setContentType("text/xml; charset=ISO-8859-1"); post.setEntity(entity); @@ -174,7 +174,7 @@ public class CxfRsRouterTest extends CamelSpringTestSupport { @Test public void testPostConsumerUniqueResponseCode() throws Exception { HttpPost post = new HttpPost("http://localhost:"; + getPort() + "/CxfRsRouterTest/route/customerservice/customersUniqueResponseCode"); - post.addHeader("Accept" , "text/xml"); + post.addHeader("Accept", "text/xml"); StringEntity entity = new StringEntity(POST_REQUEST, "ISO-8859-1"); entity.setContentType("text/xml; charset=ISO-8859-1"); post.setEntity(entity);
