camel git commit: fixed CS error
Repository: camel Updated Branches: refs/heads/master fce2a5ab5 -> d0dafc6f9 fixed CS error Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d0dafc6f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d0dafc6f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d0dafc6f Branch: refs/heads/master Commit: d0dafc6f973a77077bab69d0474c5216574ce647 Parents: fce2a5a Author: Christian Mueller Authored: Sun Mar 26 16:40:17 2017 +0200 Committer: Christian Mueller Committed: Sun Mar 26 16:40:17 2017 +0200 -- .../KinesisComponentIntegrationTest.java| 60 ++-- 1 file changed, 29 insertions(+), 31 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/d0dafc6f/components/camel-aws/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java -- diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java index 5764c59..3970fcf 100644 --- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java +++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java @@ -16,6 +16,11 @@ */ package org.apache.camel.component.aws.kinesis.integration; +import com.amazonaws.regions.Regions; +import com.amazonaws.services.kinesis.AmazonKinesis; +import com.amazonaws.services.kinesis.AmazonKinesisClientBuilder; +import com.amazonaws.services.kinesis.model.Record; + import org.apache.camel.EndpointInject; import org.apache.camel.Exchange; import org.apache.camel.ExchangePattern; @@ -29,44 +34,39 @@ import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Ignore; import org.junit.Test; -import com.amazonaws.regions.Regions; -import com.amazonaws.services.kinesis.AmazonKinesis; -import com.amazonaws.services.kinesis.AmazonKinesisClientBuilder; -import com.amazonaws.services.kinesis.model.Record; - @Ignore("Must be manually tested.") public class KinesisComponentIntegrationTest extends CamelTestSupport { - + @EndpointInject(uri = "direct:start") private ProducerTemplate template; - + @EndpointInject(uri = "mock:result") private MockEndpoint result; - + @Test public void send() throws Exception { result.expectedMessageCount(2); - + template.send("direct:start", ExchangePattern.InOnly, new Processor() { public void process(Exchange exchange) throws Exception { exchange.getIn().setHeader(KinesisConstants.PARTITION_KEY, "partition-1"); exchange.getIn().setBody("Kinesis Event 1."); } }); - + template.send("direct:start", ExchangePattern.InOut, new Processor() { public void process(Exchange exchange) throws Exception { exchange.getIn().setHeader(KinesisConstants.PARTITION_KEY, "partition-1"); exchange.getIn().setBody("Kinesis Event 2."); } }); - + assertMockEndpointsSatisfied(); - + assertResultExchange(result.getExchanges().get(0), "Kinesis Event 1.", "partition-1"); assertResultExchange(result.getExchanges().get(1), "Kinesis Event 2.", "partition-1"); } - + private void assertResultExchange(Exchange resultExchange, String data, String partition) { assertIsInstanceOf(Record.class, resultExchange.getIn().getBody()); Record record = resultExchange.getIn().getBody(Record.class); @@ -75,29 +75,27 @@ public class KinesisComponentIntegrationTest extends CamelTestSupport { assertNotNull(resultExchange.getIn().getHeader(KinesisConstants.APPROX_ARRIVAL_TIME)); assertNotNull(resultExchange.getIn().getHeader(KinesisConstants.SEQUENCE_NUMBER)); } - + @Override - protected JndiRegistry createRegistry() throws Exception { -JndiRegistry registry = super.createRegistry(); - -AmazonKinesis client = AmazonKinesisClientBuilder.standard().withRegion(Regions.EU_CENTRAL_1).build(); -registry.bind("amazonKinesisClient", client); - -return registry; - } - - protected RouteBuilder createRouteBuilder() throws Exception { +protected JndiRegistry createRegistry() throws Exception { +JndiRegistry registry = super.createRegistry(); + +AmazonKinesis client = AmazonKinesisClientBuilder.sta
camel git commit: fixed CS error
Repository: camel Updated Branches: refs/heads/camel-2.15.x 00d37f6ff -> b7aeb46a9 fixed CS error Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b7aeb46a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b7aeb46a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b7aeb46a Branch: refs/heads/camel-2.15.x Commit: b7aeb46a9cfa575135a89bcbf737ffa1308f31ca Parents: 00d37f6 Author: Christian Mueller Authored: Sat Jan 9 19:42:50 2016 +0100 Committer: Christian Mueller Committed: Sat Jan 9 19:42:50 2016 +0100 -- .../test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/b7aeb46a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java -- diff --git a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java index dc80d42..41eafbb 100644 --- a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java +++ b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java @@ -45,7 +45,7 @@ public class JdbcFix9491Test extends AbstractJdbcTestSupport { direct.sendBody("select * from customer"); assertMockEndpointsSatisfied(); - Assert.assertEquals(2,mock.getReceivedExchanges().get(1).getIn().getBody(List.class).size()); +Assert.assertEquals(2, mock.getReceivedExchanges().get(1).getIn().getBody(List.class).size()); }
camel git commit: fixed CS error
Repository: camel Updated Branches: refs/heads/camel-2.16.x 395675341 -> f8c8bdcd9 fixed CS error Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f8c8bdcd Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f8c8bdcd Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f8c8bdcd Branch: refs/heads/camel-2.16.x Commit: f8c8bdcd9b6f2478b4edc4c9bb8e7ede6b73d954 Parents: 3956753 Author: Christian Mueller Authored: Sat Jan 9 19:41:30 2016 +0100 Committer: Christian Mueller Committed: Sat Jan 9 19:41:30 2016 +0100 -- .../test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/f8c8bdcd/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java -- diff --git a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java index dc80d42..41eafbb 100644 --- a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java +++ b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java @@ -45,7 +45,7 @@ public class JdbcFix9491Test extends AbstractJdbcTestSupport { direct.sendBody("select * from customer"); assertMockEndpointsSatisfied(); - Assert.assertEquals(2,mock.getReceivedExchanges().get(1).getIn().getBody(List.class).size()); +Assert.assertEquals(2, mock.getReceivedExchanges().get(1).getIn().getBody(List.class).size()); }
camel git commit: fixed CS error
Repository: camel Updated Branches: refs/heads/master c8833ddf9 -> ac4fff949 fixed CS error Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ac4fff94 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ac4fff94 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ac4fff94 Branch: refs/heads/master Commit: ac4fff949b1d67f1be3f2fa9a577015a43db420a Parents: c8833dd Author: Christian Mueller Authored: Sat Jan 9 19:34:12 2016 +0100 Committer: Christian Mueller Committed: Sat Jan 9 19:34:12 2016 +0100 -- .../test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/ac4fff94/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java -- diff --git a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java index dc80d42..41eafbb 100644 --- a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java +++ b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java @@ -45,7 +45,7 @@ public class JdbcFix9491Test extends AbstractJdbcTestSupport { direct.sendBody("select * from customer"); assertMockEndpointsSatisfied(); - Assert.assertEquals(2,mock.getReceivedExchanges().get(1).getIn().getBody(List.class).size()); +Assert.assertEquals(2, mock.getReceivedExchanges().get(1).getIn().getBody(List.class).size()); }
camel git commit: Fixed CS error of camel-spring
Repository: camel Updated Branches: refs/heads/camel-2.15.x 3cb822056 -> 360c6c26a Fixed CS error of camel-spring Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/360c6c26 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/360c6c26 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/360c6c26 Branch: refs/heads/camel-2.15.x Commit: 360c6c26ad04a9a48c2c8b517e3726881e63dfb4 Parents: 3cb8220 Author: Willem Jiang Authored: Tue Apr 28 13:50:12 2015 + Committer: Willem Jiang Committed: Tue Apr 28 13:50:12 2015 + -- .../org/apache/camel/spring/CamelContextFactoryBeanTest.java| 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/360c6c26/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java -- diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java index d356cc8..ec963f3 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java @@ -109,5 +109,6 @@ public class CamelContextFactoryBeanTest extends TestCase { assertTrue(modelJAXBContextFactory instanceof CustomModelJAXBContextFactory); } -private static class CustomModelJAXBContextFactory extends DefaultModelJAXBContextFactory {} -} \ No newline at end of file +private static class CustomModelJAXBContextFactory extends DefaultModelJAXBContextFactory { +} +}
[1/2] camel git commit: fixed CS error
Repository: camel Updated Branches: refs/heads/master ae7b52acb -> 6c2467222 fixed CS error Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8bcd609b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8bcd609b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8bcd609b Branch: refs/heads/master Commit: 8bcd609b58c2f64764b3d77319ee5ebc7adb9068 Parents: ae7b52a Author: Christian Mueller Authored: Thu Apr 23 21:39:22 2015 +0200 Committer: Christian Mueller Committed: Thu Apr 23 21:39:22 2015 +0200 -- camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/8bcd609b/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java -- diff --git a/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java b/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java index 4290a88..7367d1e 100644 --- a/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java +++ b/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java @@ -1709,7 +1709,7 @@ public final class ObjectHelper { } //check the suppressed exception first -for (Throwable throwable: exception.getSuppressed()) { +for (Throwable throwable : exception.getSuppressed()) { if (type.isInstance(throwable)) { return type.cast(throwable); }
[2/2] camel git commit: Fixed CS error of camel-test
Fixed CS error of camel-test Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bff1ec76 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bff1ec76 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bff1ec76 Branch: refs/heads/master Commit: bff1ec76807607b95b63ce2f8fc73b64af0887f9 Parents: ea6d2fc Author: Willem Jiang Authored: Wed Apr 22 20:54:59 2015 +0800 Committer: Willem Jiang Committed: Wed Apr 22 22:10:55 2015 +0800 -- .../main/java/org/apache/camel/test/junit4/CamelTestSupport.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/bff1ec76/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java -- diff --git a/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java b/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java index b6931de..e716da6 100644 --- a/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java +++ b/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java @@ -82,11 +82,12 @@ public abstract class CamelTestSupport extends TestSupport { protected volatile ProducerTemplate template; protected volatile ConsumerTemplate consumer; protected volatile Service camelContextService; +protected boolean dumpRouteStats; private boolean useRouteBuilder = true; private final DebugBreakpoint breakpoint = new DebugBreakpoint(); private final StopWatch watch = new StopWatch(); private final Map fromEndpoints = new HashMap(); -protected boolean dumpRouteStats; + /** * Use the RouteBuilder or not
camel git commit: fixed CS error
Repository: camel Updated Branches: refs/heads/master 2cbd2a4eb -> 1bb97cc69 fixed CS error Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1bb97cc6 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1bb97cc6 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1bb97cc6 Branch: refs/heads/master Commit: 1bb97cc6909231b777e8d0a300cb74f2dc2a1d9f Parents: 2cbd2a4 Author: Christian Mueller Authored: Sun Mar 1 14:16:52 2015 +0100 Committer: Christian Mueller Committed: Sun Mar 1 14:16:52 2015 +0100 -- .../camel/maven/EipDocumentationEnricherMojo.java | 18 +- 1 file changed, 13 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/1bb97cc6/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/main/java/org/apache/camel/maven/EipDocumentationEnricherMojo.java -- diff --git a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/main/java/org/apache/camel/maven/EipDocumentationEnricherMojo.java b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/main/java/org/apache/camel/maven/EipDocumentationEnricherMojo.java index 15ac9be..aebd0b1 100644 --- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/main/java/org/apache/camel/maven/EipDocumentationEnricherMojo.java +++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/main/java/org/apache/camel/maven/EipDocumentationEnricherMojo.java @@ -79,7 +79,7 @@ public class EipDocumentationEnricherMojo extends AbstractMojo { @Override public void execute() throws MojoExecutionException, MojoFailureException { -Set injectedTypes = new HashSet<>(); +Set injectedTypes = new HashSet(); File rootDir = new File(camelCoreDir, Constants.PATH_TO_MODEL_DIR); DomFinder domFinder = new DomFinder(); DocumentationEnricher documentationEnricher = new DocumentationEnricher(); @@ -104,7 +104,9 @@ public class EipDocumentationEnricherMojo extends AbstractMojo { } } saveToFile(document, outputCamelSchemaFile, buildTransformer()); -} catch (XPathExpressionException | IOException e) { +} catch (XPathExpressionException e) { +throw new MojoExecutionException("Error during documentation enrichment", e); +} catch (IOException e) { throw new MojoExecutionException("Error during documentation enrichment", e); } } @@ -134,7 +136,7 @@ public class EipDocumentationEnricherMojo extends AbstractMojo { } private Map buildTypeToNameMap(NodeList elementsAndTypes) { -Map typeToNameMap = new HashMap<>(); +Map typeToNameMap = new HashMap(); for (int i = 0; i < elementsAndTypes.getLength(); i++) { Element item = (Element) elementsAndTypes.item(i); String name = item.getAttribute(Constants.NAME_ATTRIBUTE_NAME); @@ -180,7 +182,11 @@ public class EipDocumentationEnricherMojo extends AbstractMojo { try { builder = factory.newDocumentBuilder(); result = builder.parse(xml); -} catch (SAXException | ParserConfigurationException | IOException e) { +} catch (SAXException e) { +throw new MojoExecutionException("Error during building a document", e); +} catch (ParserConfigurationException e) { +throw new MojoExecutionException("Error during building a document", e); +} catch (IOException e) { throw new MojoExecutionException("Error during building a document", e); } return result; @@ -191,7 +197,9 @@ public class EipDocumentationEnricherMojo extends AbstractMojo { StreamResult result = new StreamResult(new FileOutputStream(outputFile)); DOMSource source = new DOMSource(document); transformer.transform(source, result); -} catch (FileNotFoundException | TransformerException e) { +} catch (TransformerException e) { +throw new MojoExecutionException("Error during saving to file", e); +} catch (FileNotFoundException e) { throw new MojoExecutionException("Error during saving to file", e); } }
camel git commit: fixed CS error
Repository: camel Updated Branches: refs/heads/master df4a9413e -> 2cbd2a4eb fixed CS error Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2cbd2a4e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2cbd2a4e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2cbd2a4e Branch: refs/heads/master Commit: 2cbd2a4ebae7867313107734d86c3c37b93c9a8c Parents: df4a941 Author: Christian Mueller Authored: Sun Mar 1 13:47:11 2015 +0100 Committer: Christian Mueller Committed: Sun Mar 1 13:47:11 2015 +0100 -- .../src/main/java/org/apache/camel/impl/DefaultCamelContext.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/2cbd2a4e/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java -- diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java index 143b58c..9ac71b6 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java +++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java @@ -730,7 +730,8 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon public Void call() throws Exception { builder.addRoutesToCamelContext(DefaultCamelContext.this); return null; -}}); +} +}); } public synchronized RoutesDefinition loadRoutesDefinition(InputStream is) throws Exception {
[4/4] camel git commit: Fixed CS error of camel-package-maven-plugin
Fixed CS error of camel-package-maven-plugin Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/48d7f606 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/48d7f606 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/48d7f606 Branch: refs/heads/master Commit: 48d7f606f07e5d2ce66801654caaa033463ea070 Parents: 7517eb8 Author: Willem Jiang Authored: Wed Feb 25 14:31:04 2015 +0800 Committer: Willem Jiang Committed: Wed Feb 25 14:31:04 2015 +0800 -- .../java/org/apache/camel/maven/packaging/StringHelper.java | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/48d7f606/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/StringHelper.java -- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/StringHelper.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/StringHelper.java index 9af9ec9..ac6a133 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/StringHelper.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/StringHelper.java @@ -16,7 +16,10 @@ */ package org.apache.camel.maven.packaging; -public class StringHelper { +public final class StringHelper { +private StringHelper() { +// Utils Class +} public static String after(String text, String after) { if (!text.contains(after)) {
camel git commit: fixed CS error
Repository: camel Updated Branches: refs/heads/master 85778bc43 -> 1d5ba0570 fixed CS error Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1d5ba057 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1d5ba057 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1d5ba057 Branch: refs/heads/master Commit: 1d5ba05703f97eec7aa6894454b14ddce4278710 Parents: 85778bc Author: Christian Mueller Authored: Fri Jan 2 08:00:34 2015 +0100 Committer: Christian Mueller Committed: Fri Jan 2 08:01:16 2015 +0100 -- .../camel/component/jira/mocks/MockSearchRestClient.java | 8 .../apache/camel/component/jira/mocks/MockSearchResult.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/1d5ba057/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockSearchRestClient.java -- diff --git a/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockSearchRestClient.java b/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockSearchRestClient.java index 8eb5463..44d38cb 100644 --- a/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockSearchRestClient.java +++ b/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockSearchRestClient.java @@ -33,11 +33,11 @@ import org.joda.time.DateTime; public class MockSearchRestClient implements SearchRestClient { + private static final String KEY_BASE = "CAMELJIRA-"; -private final List issues = new ArrayList<>(); -private final Map> comments = new HashMap<>(); +private final List issues = new ArrayList(); +private final Map> comments = new HashMap>(); private AtomicLong basicIssueId = new AtomicLong(0); - @Override public SearchResult searchJql(String s, ProgressMonitor progressMonitor) { @@ -51,7 +51,7 @@ public class MockSearchRestClient implements SearchRestClient { @Override public SearchResult searchJqlWithFullIssues(String jql, int maxPerQuery, int start, ProgressMonitor progressMonitor) { -List result = new ArrayList<>(); +List result = new ArrayList(); for (BasicIssue issue : issues) { if (issue.getId() >= start) { result.add(issue); http://git-wip-us.apache.org/repos/asf/camel/blob/1d5ba057/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockSearchResult.java -- diff --git a/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockSearchResult.java b/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockSearchResult.java index f8ef7ee..1945465 100644 --- a/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockSearchResult.java +++ b/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockSearchResult.java @@ -43,7 +43,7 @@ public class MockSearchResult extends SearchResult { @Override public Iterable getIssues() { Collections.sort(issues, basicIssueComparator); -ArrayList copy = new ArrayList<>(issues); +ArrayList copy = new ArrayList(issues); if (!issues.isEmpty()) { issues.remove(0); }
camel git commit: fixed CS error
Repository: camel Updated Branches: refs/heads/master 1e2b8f2e0 -> 5dd0a639f fixed CS error Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5dd0a639 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5dd0a639 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5dd0a639 Branch: refs/heads/master Commit: 5dd0a639f50e25f2d0faba57a897f2b6696b Parents: 1e2b8f2 Author: Christian Mueller Authored: Thu Jan 1 13:30:45 2015 +0100 Committer: Christian Mueller Committed: Thu Jan 1 13:30:45 2015 +0100 -- .../java/org/apache/camel/tools/apt/EipAnnotationProcessor.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/5dd0a639/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java -- diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java index eb877c7..ba82d9b 100644 --- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java +++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java @@ -269,7 +269,8 @@ public class EipAnnotationProcessor extends AbstractAnnotationProcessor { } } -private boolean processAttribute(RoundEnvironment roundEnv, TypeElement originalClassType, TypeElement classElement, VariableElement fieldElement, String fieldName, XmlAttribute attribute, Set eipOptions, String prefix) { +private boolean processAttribute(RoundEnvironment roundEnv, TypeElement originalClassType, TypeElement classElement, VariableElement fieldElement, String fieldName, XmlAttribute attribute, +Set eipOptions, String prefix) { Elements elementUtils = processingEnv.getElementUtils(); String name = attribute.name();
[2/5] camel git commit: Fixed CS error of camel-spark
Fixed CS error of camel-spark Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/74b6c5cd Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/74b6c5cd Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/74b6c5cd Branch: refs/heads/master Commit: 74b6c5cd0a1888a6d8bb0e6364b2998c258c27ed Parents: 85e1239 Author: Willem Jiang Authored: Thu Nov 27 15:12:59 2014 +0800 Committer: Willem Jiang Committed: Thu Nov 27 15:16:17 2014 +0800 -- .../org/apache/camel/component/sparkrest/SparkEndpoint.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/74b6c5cd/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkEndpoint.java -- diff --git a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkEndpoint.java b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkEndpoint.java index f655abf..56bc14c 100644 --- a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkEndpoint.java +++ b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkEndpoint.java @@ -29,14 +29,13 @@ import spark.route.HttpMethod; @UriEndpoint(scheme = "spark-rest", consumerClass = SparkConsumer.class, label = "rest") public class SparkEndpoint extends DefaultEndpoint { - +@UriParam +SparkConfiguration sparkConfiguration; @UriPath private String verb; @UriPath private String path; @UriParam -SparkConfiguration sparkConfiguration; -@UriParam private SparkBinding sparkBinding; @UriParam private String accept;