[camel] 02/04: Fixed CS
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit 7e7c4c3dfedfae95e76254c2a6e1bb642c566a2b Author: Claus Ibsen AuthorDate: Fri May 14 21:21:10 2021 +0200 Fixed CS --- .../apache/camel/component/jackson/SchemaResolver.java | 16 1 file changed, 16 insertions(+) diff --git a/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/SchemaResolver.java b/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/SchemaResolver.java index 2829515..4962542 100644 --- a/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/SchemaResolver.java +++ b/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/SchemaResolver.java @@ -1,3 +1,19 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.camel.component.jackson; import com.fasterxml.jackson.core.FormatSchema;
[camel] 02/04: Fixed CS
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit c580074df8f7a2fcb0286e3e33517b09e1e7f7fd Author: Andrea Cosentino AuthorDate: Wed Mar 31 08:32:35 2021 +0200 Fixed CS --- .../component/aws2/lambda/Lambda2Producer.java | 26 +++--- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Producer.java b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Producer.java index 4418a23..cf7a9d6 100644 --- a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Producer.java +++ b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Producer.java @@ -458,23 +458,23 @@ public class Lambda2Producer extends DefaultProducer { } private void listEventSourceMapping(LambdaClient lambdaClient, Exchange exchange) throws InvalidPayloadException { - ListEventSourceMappingsRequest request = null; - ListEventSourceMappingsResponse result; +ListEventSourceMappingsRequest request = null; +ListEventSourceMappingsResponse result; if (getConfiguration().isPojoRequest()) { request = exchange.getIn().getMandatoryBody(ListEventSourceMappingsRequest.class); } else { -ListEventSourceMappingsRequest.Builder builder = ListEventSourceMappingsRequest.builder(); -builder.functionName(getEndpoint().getFunction()); -request = builder.build(); +ListEventSourceMappingsRequest.Builder builder = ListEventSourceMappingsRequest.builder(); +builder.functionName(getEndpoint().getFunction()); +request = builder.build(); } -try { -result = lambdaClient.listEventSourceMappings(request); -} catch (AwsServiceException ase) { -LOG.trace("listEventSourceMapping command returned the error code {}", ase.awsErrorDetails().errorCode()); -throw ase; -} -Message message = getMessageForResponse(exchange); -message.setBody(result); +try { +result = lambdaClient.listEventSourceMappings(request); +} catch (AwsServiceException ase) { +LOG.trace("listEventSourceMapping command returned the error code {}", ase.awsErrorDetails().errorCode()); +throw ase; +} +Message message = getMessageForResponse(exchange); +message.setBody(result); } private void listTags(LambdaClient lambdaClient, Exchange exchange) throws InvalidPayloadException {
[camel] 02/04: Fixed CS
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 99a8ed1113d4fdacf81329c9ad4d5e01374ae41f Author: Andrea Cosentino AuthorDate: Tue Mar 30 13:25:51 2021 +0200 Fixed CS --- .../component/aws2/lambda/Lambda2Producer.java | 216 ++--- 1 file changed, 108 insertions(+), 108 deletions(-) diff --git a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Producer.java b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Producer.java index 63f282e..23c 100644 --- a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Producer.java +++ b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Producer.java @@ -234,139 +234,139 @@ public class Lambda2Producer extends DefaultProducer { @SuppressWarnings("unchecked") private void createFunction(LambdaClient lambdaClient, Exchange exchange) throws Exception { - CreateFunctionRequest request = null; - CreateFunctionResponse result; +CreateFunctionRequest request = null; +CreateFunctionResponse result; if (getConfiguration().isPojoRequest()) { request = exchange.getIn().getMandatoryBody(CreateFunctionRequest.class); } else { -CreateFunctionRequest.Builder builder = CreateFunctionRequest.builder(); -builder.functionName(getEndpoint().getFunction()); +CreateFunctionRequest.Builder builder = CreateFunctionRequest.builder(); +builder.functionName(getEndpoint().getFunction()); -FunctionCode.Builder functionCode = FunctionCode.builder(); -if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.S3_BUCKET))) { -String s3Bucket = exchange.getIn().getHeader(Lambda2Constants.S3_BUCKET, String.class); -functionCode.s3Bucket(s3Bucket); -} +FunctionCode.Builder functionCode = FunctionCode.builder(); +if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.S3_BUCKET))) { +String s3Bucket = exchange.getIn().getHeader(Lambda2Constants.S3_BUCKET, String.class); +functionCode.s3Bucket(s3Bucket); +} -if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.S3_KEY))) { -String s3Key = exchange.getIn().getHeader(Lambda2Constants.S3_KEY, String.class); -functionCode.s3Key(s3Key); -} +if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.S3_KEY))) { +String s3Key = exchange.getIn().getHeader(Lambda2Constants.S3_KEY, String.class); +functionCode.s3Key(s3Key); +} -if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.S3_OBJECT_VERSION))) { -String s3ObjectVersion = exchange.getIn().getHeader(Lambda2Constants.S3_OBJECT_VERSION, String.class); -functionCode.s3ObjectVersion(s3ObjectVersion); -} +if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.S3_OBJECT_VERSION))) { +String s3ObjectVersion = exchange.getIn().getHeader(Lambda2Constants.S3_OBJECT_VERSION, String.class); +functionCode.s3ObjectVersion(s3ObjectVersion); +} -if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.ZIP_FILE))) { -String zipFile = exchange.getIn().getHeader(Lambda2Constants.ZIP_FILE, String.class); -File fileLocalPath = new File(zipFile); -try (FileInputStream inputStream = new FileInputStream(fileLocalPath)) { - functionCode.zipFile(SdkBytes.fromInputStream(inputStream)); -} -} -if (ObjectHelper.isNotEmpty(exchange.getIn().getBody())) { - functionCode.zipFile(SdkBytes.fromByteBuffer(exchange.getIn().getBody(ByteBuffer.class))); +if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.ZIP_FILE))) { +String zipFile = exchange.getIn().getHeader(Lambda2Constants.ZIP_FILE, String.class); +File fileLocalPath = new File(zipFile); +try (FileInputStream inputStream = new FileInputStream(fileLocalPath)) { + functionCode.zipFile(SdkBytes.fromInputStream(inputStream)); } +} +if (ObjectHelper.isNotEmpty(exchange.getIn().getBody())) { +
[camel] 02/04: Fixed CS
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit c4a824ace813fdbbea4e8af59b4a1d875a5615b1 Author: Andrea Cosentino AuthorDate: Fri Jan 22 09:22:51 2021 +0100 Fixed CS --- .../main/java/org/apache/camel/component/aws2/s3/AWS2S3Endpoint.java| 2 -- 1 file changed, 2 deletions(-) diff --git a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Endpoint.java b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Endpoint.java index fe7fdba..8bf4c36 100644 --- a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Endpoint.java +++ b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Endpoint.java @@ -45,8 +45,6 @@ import software.amazon.awssdk.services.s3.S3Client; import software.amazon.awssdk.services.s3.model.CreateBucketRequest; import software.amazon.awssdk.services.s3.model.GetObjectResponse; import software.amazon.awssdk.services.s3.model.HeadBucketRequest; -import software.amazon.awssdk.services.s3.model.HeadBucketResponse; -import software.amazon.awssdk.services.s3.model.ListObjectsRequest; import software.amazon.awssdk.services.s3.model.PutBucketPolicyRequest; import software.amazon.awssdk.utils.IoUtils;
[camel] 02/04: Fixed CS for Camel-base
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 2ff4dada99e09bc32986d4ba33a84b767402cef4 Author: Andrea Cosentino AuthorDate: Wed May 29 08:24:41 2019 +0200 Fixed CS for Camel-base --- .../main/java/org/apache/camel/impl/engine/DefaultRouteContext.java | 3 +-- .../org/apache/camel/processor/errorhandler/ExceptionPolicy.java | 5 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRouteContext.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRouteContext.java index 14628e3..74aea37 100644 --- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRouteContext.java +++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRouteContext.java @@ -76,6 +76,7 @@ public class DefaultRouteContext implements RouteContext { private final Map properties = new HashMap<>(); private ErrorHandlerFactory errorHandlerFactory; private Integer startupOrder; +private Map> errorHandlers = new HashMap<>(); public DefaultRouteContext(CamelContext camelContext, NamedNode route, String routeId) { this.camelContext = camelContext; @@ -467,8 +468,6 @@ public class DefaultRouteContext implements RouteContext { properties.put(key, value); } -private Map> errorHandlers = new HashMap<>(); - @Override public void addErrorHandler(ErrorHandlerFactory factory, NamedNode onException) { getErrorHandlers(factory).add(onException); diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/ExceptionPolicy.java b/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/ExceptionPolicy.java index cbfdc4a..84766cc 100644 --- a/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/ExceptionPolicy.java +++ b/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/ExceptionPolicy.java @@ -43,7 +43,10 @@ public class ExceptionPolicy { private Map redeliveryPolicy; private List exceptions; -public ExceptionPolicy(String id, String routeId, boolean useOriginalInMessage, boolean hasOutputs, Predicate handledPolicy, Predicate continuedPolicy, Predicate retryWhilePolicy, Processor onRedelivery, Processor onExceptionOccurred, String redeliveryPolicyRef, Map redeliveryPolicy, List exceptions) { +public ExceptionPolicy(String id, String routeId, boolean useOriginalInMessage, + boolean hasOutputs, Predicate handledPolicy, Predicate continuedPolicy, + Predicate retryWhilePolicy, Processor onRedelivery, Processor onExceptionOccurred, + String redeliveryPolicyRef, Map redeliveryPolicy, List exceptions) { this.id = id; this.routeId = routeId; this.useOriginalInMessage = useOriginalInMessage;
[camel] 02/04: Fixed CS
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit df1f34f7f47387b73ea43a70093543d7ed29faca Author: Claus Ibsen AuthorDate: Tue May 28 05:48:42 2019 +0200 Fixed CS --- .../src/test/java/org/apache/camel/converter/StringSourceTest.java | 2 +- .../test/java/org/apache/camel/converter/jaxp/BytesSourceTest.java | 2 +- .../test/java/org/apache/camel/converter/jaxp/XmlConverterTest.java | 5 ++--- .../src/test/java/org/apache/camel/impl/LogDebugBodyStreamsTest.java | 2 +- .../camel/processor/MultiCastParallelAndStreamCachingTest.java | 3 +-- .../apache/camel/processor/StreamSourceContentBasedRouterTest.java | 4 ++-- .../apache/camel/processor/ValidatingProcessorFromSourceTest.java| 3 ++- .../java/org/apache/camel/processor/ValidatingProcessorTest.java | 3 ++- .../src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/core/camel-core/src/test/java/org/apache/camel/converter/StringSourceTest.java b/core/camel-core/src/test/java/org/apache/camel/converter/StringSourceTest.java index e78c464..0d0378e 100644 --- a/core/camel-core/src/test/java/org/apache/camel/converter/StringSourceTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/converter/StringSourceTest.java @@ -21,7 +21,6 @@ import java.io.ByteArrayOutputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import org.apache.camel.util.xml.StringSource; import org.apache.camel.TypeConverter; import org.apache.camel.impl.converter.DefaultTypeConverter; import org.apache.camel.impl.engine.DefaultClassResolver; @@ -29,6 +28,7 @@ import org.apache.camel.impl.engine.DefaultFactoryFinderResolver; import org.apache.camel.impl.engine.DefaultPackageScanClassResolver; import org.apache.camel.support.service.ServiceHelper; import org.apache.camel.util.ReflectionInjector; +import org.apache.camel.util.xml.StringSource; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/core/camel-core/src/test/java/org/apache/camel/converter/jaxp/BytesSourceTest.java b/core/camel-core/src/test/java/org/apache/camel/converter/jaxp/BytesSourceTest.java index f7003e6..6990474 100644 --- a/core/camel-core/src/test/java/org/apache/camel/converter/jaxp/BytesSourceTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/converter/jaxp/BytesSourceTest.java @@ -16,8 +16,8 @@ */ package org.apache.camel.converter.jaxp; -import org.apache.camel.util.xml.BytesSource; import org.apache.camel.ContextTestSupport; +import org.apache.camel.util.xml.BytesSource; import org.junit.Test; public class BytesSourceTest extends ContextTestSupport { diff --git a/core/camel-core/src/test/java/org/apache/camel/converter/jaxp/XmlConverterTest.java b/core/camel-core/src/test/java/org/apache/camel/converter/jaxp/XmlConverterTest.java index 2ef19c3..1f33e39 100644 --- a/core/camel-core/src/test/java/org/apache/camel/converter/jaxp/XmlConverterTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/converter/jaxp/XmlConverterTest.java @@ -15,12 +15,12 @@ * limitations under the License. */ package org.apache.camel.converter.jaxp; + import java.io.File; import java.io.InputStream; import java.io.Reader; import java.nio.ByteBuffer; import java.util.Properties; - import javax.xml.transform.OutputKeys; import javax.xml.transform.Source; import javax.xml.transform.dom.DOMSource; @@ -32,15 +32,14 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; - import org.xml.sax.InputSource; -import org.apache.camel.util.xml.BytesSource; import org.apache.camel.CamelContext; import org.apache.camel.ContextTestSupport; import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.support.DefaultExchange; +import org.apache.camel.util.xml.BytesSource; import org.junit.Before; import org.junit.Test; diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/LogDebugBodyStreamsTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/LogDebugBodyStreamsTest.java index 7c52965..39ec63b 100644 --- a/core/camel-core/src/test/java/org/apache/camel/impl/LogDebugBodyStreamsTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/impl/LogDebugBodyStreamsTest.java @@ -21,9 +21,9 @@ import java.io.InputStream; import org.apache.camel.ContextTestSupport; import org.apache.camel.Exchange; -import org.apache.camel.util.xml.StringSource; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.util.xml.StringSource; import org.junit.Test; public class LogDebugBodyStreamsTest extends ContextTestSupport { diff --git
[camel] 02/04: Fixed CS
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 9566b95ef4f7b0d0f3e4d366408b0949fdf481a7 Author: Claus Ibsen AuthorDate: Sat Sep 8 17:35:21 2018 +0200 Fixed CS --- .../test/java/org/apache/camel/parser/java/SimpleProcessorTest.java| 3 +-- .../src/test/java/org/apache/camel/parser/java/SplitTokenizeTest.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tooling/camel-route-parser/src/test/java/org/apache/camel/parser/java/SimpleProcessorTest.java b/tooling/camel-route-parser/src/test/java/org/apache/camel/parser/java/SimpleProcessorTest.java index 48e2067..d3b275c 100644 --- a/tooling/camel-route-parser/src/test/java/org/apache/camel/parser/java/SimpleProcessorTest.java +++ b/tooling/camel-route-parser/src/test/java/org/apache/camel/parser/java/SimpleProcessorTest.java @@ -16,12 +16,11 @@ */ package org.apache.camel.parser.java; -import org.junit.Test; - import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.Test; public class SimpleProcessorTest extends CamelTestSupport { diff --git a/tooling/camel-route-parser/src/test/java/org/apache/camel/parser/java/SplitTokenizeTest.java b/tooling/camel-route-parser/src/test/java/org/apache/camel/parser/java/SplitTokenizeTest.java index 5a6954c..e6ab121 100644 --- a/tooling/camel-route-parser/src/test/java/org/apache/camel/parser/java/SplitTokenizeTest.java +++ b/tooling/camel-route-parser/src/test/java/org/apache/camel/parser/java/SplitTokenizeTest.java @@ -16,11 +16,10 @@ */ package org.apache.camel.parser.java; -import org.junit.Test; - import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.Test; public class SplitTokenizeTest extends CamelTestSupport {
[camel] 02/04: Fixed CS
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 605469b973c938a38e68add547156634f51820e6 Author: Claus Ibsen AuthorDate: Wed Jun 6 08:46:01 2018 +0200 Fixed CS --- .../java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java index e561e9d..c1b7b5c 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java @@ -567,7 +567,9 @@ public class SpringBootStarterMojo extends AbstractMojo { } } -if (IGNORE_TEST_MODULES && (project.getArtifactId().startsWith("camel-test") || project.getArtifactId().startsWith("camel-testng") || project.getArtifactId().startsWith("camel-testcontainers"))) { +if (IGNORE_TEST_MODULES && (project.getArtifactId().startsWith("camel-test") +|| project.getArtifactId().startsWith("camel-testng") +|| project.getArtifactId().startsWith("camel-testcontainers"))) { getLog().debug("Test components are ignored"); return false; } -- To stop receiving notification emails like this one, please contact davscl...@apache.org.