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 87ba694 camel3 - Move OutputStreamBuilder to builder package
87ba694 is described below
commit 87ba6949285af89151530dc2f474db42e5bc8a61
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed Jul 31 14:40:38 2019 +0200
camel3 - Move OutputStreamBuilder to builder package
---
MIGRATION.md | 2 ++
.../component/crypto/cms/common/CryptoCmsMarshallerAbstract.java | 2 +-
.../camel/component/crypto/cms/crypt/EnvelopedDataDecryptor.java | 2 +-
.../apache/camel/component/crypto/cms/sig/SignedDataVerifier.java | 2 +-
.../java/org/apache/camel/converter/crypto/CryptoDataFormat.java | 2 +-
.../org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java | 2 +-
.../org/apache/camel/component/dropbox/core/DropboxAPIFacade.java | 2 +-
.../org/apache/camel/component/jetty9/JettyContentExchange9.java | 2 +-
.../src/main/java/org/apache/camel/dataformat/lzf/LZFDataFormat.java | 2 +-
.../java/org/apache/camel/dataformat/tarfile/TarFileDataFormat.java | 2 +-
.../org/apache/camel/dataformat/deflater/GzipDeflaterDataFormat.java | 2 +-
.../org/apache/camel/dataformat/deflater/ZipDeflaterDataFormat.java | 2 +-
.../java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java | 2 +-
.../org/apache/camel/impl/transformer/DataFormatTransformer.java | 2 +-
.../{converter/stream => support/builder}/OutputStreamBuilder.java | 5 ++---
.../java/org/apache/camel/support/processor/MarshalProcessor.java | 2 +-
16 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/MIGRATION.md b/MIGRATION.md
index 8ae321d..51a5d07 100644
--- a/MIGRATION.md
+++ b/MIGRATION.md
@@ -337,6 +337,8 @@ The annotation `org.apache.camel.language.SpEL` has been
moved to `org.apache.ca
The annotation `org.apache.camel.InvokeOnHeader` and
`org.apache.camel.InvokeOnHeaders` has been moved to the `org.apache.camel.spi`
package.
+The class `OutputStreamBuilder` has been moved from package
`org.apache.camel.converter.stream` to `org.apache.camel.support.builder`
package.
+
Rename various APIs in camel-core to fix the typo `chiper` to `cipher`.
The classes `ReloadStrategySupport` and `FileWatcherReloadStrategy` has been
removed.
diff --git
a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/common/CryptoCmsMarshallerAbstract.java
b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/common/CryptoCmsMarshallerAbstract.java
index cedfb0c..ad6976bd 100644
---
a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/common/CryptoCmsMarshallerAbstract.java
+++
b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/common/CryptoCmsMarshallerAbstract.java
@@ -22,7 +22,7 @@ import java.io.OutputStream;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
-import org.apache.camel.converter.stream.OutputStreamBuilder;
+import org.apache.camel.support.builder.OutputStreamBuilder;
import org.apache.camel.util.IOHelper;
import org.apache.commons.codec.binary.Base64OutputStream;
diff --git
a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/crypt/EnvelopedDataDecryptor.java
b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/crypt/EnvelopedDataDecryptor.java
index 66fd781..4ac006b 100644
---
a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/crypt/EnvelopedDataDecryptor.java
+++
b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/crypt/EnvelopedDataDecryptor.java
@@ -30,7 +30,7 @@ import
org.apache.camel.component.crypto.cms.common.CryptoCmsUnmarshaller;
import org.apache.camel.component.crypto.cms.exception.CryptoCmsException;
import
org.apache.camel.component.crypto.cms.exception.CryptoCmsFormatException;
import
org.apache.camel.component.crypto.cms.exception.CryptoCmsNoCertificateForRecipientsException;
-import org.apache.camel.converter.stream.OutputStreamBuilder;
+import org.apache.camel.support.builder.OutputStreamBuilder;
import org.apache.camel.util.IOHelper;
import org.bouncycastle.asn1.cms.Attribute;
import org.bouncycastle.asn1.cms.AttributeTable;
diff --git
a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataVerifier.java
b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataVerifier.java
index 12b50da..a97bb33 100644
---
a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataVerifier.java
+++
b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataVerifier.java
@@ -33,7 +33,7 @@ import
org.apache.camel.component.crypto.cms.exception.CryptoCmsNoCertificateFor
import
org.apache.camel.component.crypto.cms.exception.CryptoCmsSignatureException;
import
org.apache.camel.component.crypto.cms.exception.CryptoCmsSignatureInvalidContentHashException;
import
org.apache.camel.component.crypto.cms.exception.CryptoCmsVerifierCertificateNotValidException;
-import org.apache.camel.converter.stream.OutputStreamBuilder;
+import org.apache.camel.support.builder.OutputStreamBuilder;
import org.apache.camel.util.IOHelper;
import org.bouncycastle.asn1.cms.Attribute;
import org.bouncycastle.asn1.cms.CMSAttributes;
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 1ea7c39..cd8fd74 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
@@ -33,7 +33,7 @@ import static javax.crypto.Cipher.DECRYPT_MODE;
import static javax.crypto.Cipher.ENCRYPT_MODE;
import org.apache.camel.Exchange;
-import org.apache.camel.converter.stream.OutputStreamBuilder;
+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;
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 43e5803..799b736 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,7 +30,7 @@ import java.util.Date;
import java.util.List;
import org.apache.camel.Exchange;
-import org.apache.camel.converter.stream.OutputStreamBuilder;
+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;
diff --git
a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/core/DropboxAPIFacade.java
b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/core/DropboxAPIFacade.java
index 5954ed6..2d1d12f 100644
---
a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/core/DropboxAPIFacade.java
+++
b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/core/DropboxAPIFacade.java
@@ -50,7 +50,7 @@ import
org.apache.camel.component.dropbox.util.DropboxConstants;
import org.apache.camel.component.dropbox.util.DropboxException;
import org.apache.camel.component.dropbox.util.DropboxResultCode;
import org.apache.camel.component.dropbox.util.DropboxUploadMode;
-import org.apache.camel.converter.stream.OutputStreamBuilder;
+import org.apache.camel.support.builder.OutputStreamBuilder;
import org.apache.camel.util.IOHelper;
import org.apache.commons.io.FileUtils;
import org.slf4j.Logger;
diff --git
a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyContentExchange9.java
b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyContentExchange9.java
index b240cac..54f1048 100644
---
a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyContentExchange9.java
+++
b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyContentExchange9.java
@@ -38,7 +38,7 @@ import org.apache.camel.ExchangeTimedOutException;
import org.apache.camel.StreamCache;
import org.apache.camel.component.jetty.JettyContentExchange;
import org.apache.camel.component.jetty.JettyHttpBinding;
-import org.apache.camel.converter.stream.OutputStreamBuilder;
+import org.apache.camel.support.builder.OutputStreamBuilder;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.api.Request;
import org.eclipse.jetty.client.api.Response;
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 e3e4b7d..1457234 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
@@ -24,7 +24,7 @@ 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.converter.stream.OutputStreamBuilder;
+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;
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 49771f5..c88791e 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,7 +25,7 @@ import java.nio.file.Paths;
import java.util.Iterator;
import org.apache.camel.Exchange;
-import org.apache.camel.converter.stream.OutputStreamBuilder;
+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;
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 9bd89d7..0b02b46 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,7 +22,7 @@ import java.util.zip.GZIPInputStream;
import java.util.zip.GZIPOutputStream;
import org.apache.camel.Exchange;
-import org.apache.camel.converter.stream.OutputStreamBuilder;
+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;
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 11fd50e..03d999e 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,7 +23,7 @@ import java.util.zip.DeflaterOutputStream;
import java.util.zip.InflaterInputStream;
import org.apache.camel.Exchange;
-import org.apache.camel.converter.stream.OutputStreamBuilder;
+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;
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 ab1136a..e2a516d 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,7 +27,7 @@ import java.util.zip.ZipInputStream;
import java.util.zip.ZipOutputStream;
import org.apache.camel.Exchange;
-import org.apache.camel.converter.stream.OutputStreamBuilder;
+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;
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 428e0fb..5284715 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,7 +21,7 @@ import java.io.InputStream;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
-import org.apache.camel.converter.stream.OutputStreamBuilder;
+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;
diff --git
a/core/camel-support/src/main/java/org/apache/camel/converter/stream/OutputStreamBuilder.java
b/core/camel-support/src/main/java/org/apache/camel/support/builder/OutputStreamBuilder.java
similarity index 95%
rename from
core/camel-support/src/main/java/org/apache/camel/converter/stream/OutputStreamBuilder.java
rename to
core/camel-support/src/main/java/org/apache/camel/support/builder/OutputStreamBuilder.java
index 5bb235c..f2bdca4 100644
---
a/core/camel-support/src/main/java/org/apache/camel/converter/stream/OutputStreamBuilder.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/builder/OutputStreamBuilder.java
@@ -14,17 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.converter.stream;
+package org.apache.camel.support.builder;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import org.apache.camel.Exchange;
+import org.apache.camel.converter.stream.CachedOutputStream;
import org.apache.camel.support.ExchangeHelper;
-// TODO: We can move this under org.apache.camel.support to have them all
under the same package name
-
/**
* Utility to hide the complexity of choosing which OutputStream
* implementation to choose.
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 8693bf2..ba305c6 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,7 +22,7 @@ import org.apache.camel.CamelContextAware;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Traceable;
-import org.apache.camel.converter.stream.OutputStreamBuilder;
+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;
