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
The following commit(s) were added to refs/heads/master by this push: new 36e8556 Fixed CS 36e8556 is described below commit 36e85563f9653856f0e4b8636258231d2fc27768 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Thu Aug 1 07:31:46 2019 +0200 Fixed CS --- .../java/org/apache/camel/converter/crypto/CryptoDataFormat.java | 9 ++++----- .../apache/camel/converter/crypto/PGPKeyAccessDataFormat.java | 2 +- .../main/java/org/apache/camel/dataformat/lzf/LZFDataFormat.java | 3 +-- .../org/apache/camel/dataformat/tarfile/TarFileDataFormat.java | 2 +- .../apache/camel/dataformat/deflater/GzipDeflaterDataFormat.java | 2 +- .../apache/camel/dataformat/deflater/ZipDeflaterDataFormat.java | 2 +- .../org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java | 2 +- .../org/apache/camel/impl/transformer/DataFormatTransformer.java | 2 +- .../org/apache/camel/support/processor/MarshalProcessor.java | 2 +- 9 files changed, 12 insertions(+), 14 deletions(-) diff --git a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/CryptoDataFormat.java b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/CryptoDataFormat.java index cd8fd74..075f099 100644 --- a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/CryptoDataFormat.java +++ b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/CryptoDataFormat.java @@ -23,26 +23,25 @@ import java.io.InputStream; import java.io.OutputStream; import java.security.Key; import java.security.spec.AlgorithmParameterSpec; - import javax.crypto.Cipher; import javax.crypto.CipherInputStream; import javax.crypto.CipherOutputStream; import javax.crypto.spec.IvParameterSpec; -import static javax.crypto.Cipher.DECRYPT_MODE; -import static javax.crypto.Cipher.ENCRYPT_MODE; - import org.apache.camel.Exchange; -import org.apache.camel.support.builder.OutputStreamBuilder; import org.apache.camel.spi.DataFormat; import org.apache.camel.spi.DataFormatName; import org.apache.camel.spi.annotations.Dataformat; import org.apache.camel.support.ExchangeHelper; +import org.apache.camel.support.builder.OutputStreamBuilder; import org.apache.camel.support.service.ServiceSupport; import org.apache.camel.util.IOHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static javax.crypto.Cipher.DECRYPT_MODE; +import static javax.crypto.Cipher.ENCRYPT_MODE; + /** * <code>CryptoDataFormat</code> uses a specified key and algorithm to encrypt, * decrypt and verify exchange payloads. The Data format allows an diff --git a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java index 799b736..309fd01 100644 --- a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java +++ b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java @@ -30,10 +30,10 @@ import java.util.Date; import java.util.List; import org.apache.camel.Exchange; -import org.apache.camel.support.builder.OutputStreamBuilder; import org.apache.camel.spi.DataFormat; import org.apache.camel.spi.DataFormatName; import org.apache.camel.support.ExchangeHelper; +import org.apache.camel.support.builder.OutputStreamBuilder; import org.apache.camel.support.service.ServiceSupport; import org.apache.camel.util.IOHelper; import org.bouncycastle.bcpg.ArmoredOutputStream; diff --git a/components/camel-lzf/src/main/java/org/apache/camel/dataformat/lzf/LZFDataFormat.java b/components/camel-lzf/src/main/java/org/apache/camel/dataformat/lzf/LZFDataFormat.java index 1457234..dda2a05 100644 --- a/components/camel-lzf/src/main/java/org/apache/camel/dataformat/lzf/LZFDataFormat.java +++ b/components/camel-lzf/src/main/java/org/apache/camel/dataformat/lzf/LZFDataFormat.java @@ -16,7 +16,6 @@ */ package org.apache.camel.dataformat.lzf; - import java.io.InputStream; import java.io.OutputStream; @@ -24,10 +23,10 @@ import com.ning.compress.lzf.LZFInputStream; import com.ning.compress.lzf.LZFOutputStream; import com.ning.compress.lzf.parallel.PLZFOutputStream; import org.apache.camel.Exchange; -import org.apache.camel.support.builder.OutputStreamBuilder; import org.apache.camel.spi.DataFormat; import org.apache.camel.spi.DataFormatName; import org.apache.camel.spi.annotations.Dataformat; +import org.apache.camel.support.builder.OutputStreamBuilder; import org.apache.camel.support.service.ServiceSupport; import org.apache.camel.util.IOHelper; diff --git a/components/camel-tarfile/src/main/java/org/apache/camel/dataformat/tarfile/TarFileDataFormat.java b/components/camel-tarfile/src/main/java/org/apache/camel/dataformat/tarfile/TarFileDataFormat.java index c88791e..0444f0a 100644 --- a/components/camel-tarfile/src/main/java/org/apache/camel/dataformat/tarfile/TarFileDataFormat.java +++ b/components/camel-tarfile/src/main/java/org/apache/camel/dataformat/tarfile/TarFileDataFormat.java @@ -25,10 +25,10 @@ import java.nio.file.Paths; import java.util.Iterator; import org.apache.camel.Exchange; -import org.apache.camel.support.builder.OutputStreamBuilder; import org.apache.camel.spi.DataFormat; import org.apache.camel.spi.DataFormatName; import org.apache.camel.spi.annotations.Dataformat; +import org.apache.camel.support.builder.OutputStreamBuilder; import org.apache.camel.support.service.ServiceSupport; import org.apache.camel.util.IOHelper; import org.apache.camel.util.StringHelper; diff --git a/components/camel-zip-deflater/src/main/java/org/apache/camel/dataformat/deflater/GzipDeflaterDataFormat.java b/components/camel-zip-deflater/src/main/java/org/apache/camel/dataformat/deflater/GzipDeflaterDataFormat.java index 0b02b46..bbaa548 100644 --- a/components/camel-zip-deflater/src/main/java/org/apache/camel/dataformat/deflater/GzipDeflaterDataFormat.java +++ b/components/camel-zip-deflater/src/main/java/org/apache/camel/dataformat/deflater/GzipDeflaterDataFormat.java @@ -22,10 +22,10 @@ import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; import org.apache.camel.Exchange; -import org.apache.camel.support.builder.OutputStreamBuilder; import org.apache.camel.spi.DataFormat; import org.apache.camel.spi.DataFormatName; import org.apache.camel.spi.annotations.Dataformat; +import org.apache.camel.support.builder.OutputStreamBuilder; import org.apache.camel.support.service.ServiceSupport; import org.apache.camel.util.IOHelper; diff --git a/components/camel-zip-deflater/src/main/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormat.java b/components/camel-zip-deflater/src/main/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormat.java index 03d999e..d830f5e 100644 --- a/components/camel-zip-deflater/src/main/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormat.java +++ b/components/camel-zip-deflater/src/main/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormat.java @@ -23,10 +23,10 @@ import java.util.zip.DeflaterOutputStream; import java.util.zip.InflaterInputStream; import org.apache.camel.Exchange; -import org.apache.camel.support.builder.OutputStreamBuilder; import org.apache.camel.spi.DataFormat; import org.apache.camel.spi.DataFormatName; import org.apache.camel.spi.annotations.Dataformat; +import org.apache.camel.support.builder.OutputStreamBuilder; import org.apache.camel.support.service.ServiceSupport; import org.apache.camel.util.IOHelper; diff --git a/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java b/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java index e2a516d..d78b8d4 100644 --- a/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java +++ b/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java @@ -27,10 +27,10 @@ import java.util.zip.ZipInputStream; import java.util.zip.ZipOutputStream; import org.apache.camel.Exchange; -import org.apache.camel.support.builder.OutputStreamBuilder; import org.apache.camel.spi.DataFormat; import org.apache.camel.spi.DataFormatName; import org.apache.camel.spi.annotations.Dataformat; +import org.apache.camel.support.builder.OutputStreamBuilder; import org.apache.camel.support.service.ServiceSupport; import org.apache.camel.util.IOHelper; import org.apache.camel.util.StringHelper; diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/transformer/DataFormatTransformer.java b/core/camel-base/src/main/java/org/apache/camel/impl/transformer/DataFormatTransformer.java index 5284715..8fd01d6 100644 --- a/core/camel-base/src/main/java/org/apache/camel/impl/transformer/DataFormatTransformer.java +++ b/core/camel-base/src/main/java/org/apache/camel/impl/transformer/DataFormatTransformer.java @@ -21,10 +21,10 @@ import java.io.InputStream; import org.apache.camel.CamelContext; import org.apache.camel.Exchange; import org.apache.camel.Message; -import org.apache.camel.support.builder.OutputStreamBuilder; import org.apache.camel.spi.DataFormat; import org.apache.camel.spi.DataType; import org.apache.camel.spi.Transformer; +import org.apache.camel.support.builder.OutputStreamBuilder; import org.apache.camel.support.service.ServiceHelper; import org.apache.camel.util.ObjectHelper; diff --git a/core/camel-support/src/main/java/org/apache/camel/support/processor/MarshalProcessor.java b/core/camel-support/src/main/java/org/apache/camel/support/processor/MarshalProcessor.java index ba305c6..4b5cc78 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/processor/MarshalProcessor.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/processor/MarshalProcessor.java @@ -22,10 +22,10 @@ import org.apache.camel.CamelContextAware; import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.Traceable; -import org.apache.camel.support.builder.OutputStreamBuilder; import org.apache.camel.spi.DataFormat; import org.apache.camel.spi.IdAware; import org.apache.camel.support.AsyncProcessorSupport; +import org.apache.camel.support.builder.OutputStreamBuilder; import org.apache.camel.support.service.ServiceHelper; import org.apache.camel.util.ObjectHelper;