Skip to content

CAMEL-15267: Added a ByteArrayOutputStream to ByteBuffer converter in… #3967

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aldettinger merged 1 commit into from
Jul 2, 2020
Merged

CAMEL-15267: Added a ByteArrayOutputStream to ByteBuffer converter in… #3967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions core/camel-base/src/generated/java/org/apache/camel/converter/NIOConverterLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ private void registerConverters(TypeConverterRegistry registry) {
(type, exchange, value) -> org.apache.camel.converter.NIOConverter.toString((java.nio.ByteBuffer) value, exchange));
addTypeConverter(registry, java.nio.ByteBuffer.class, byte[].class, false,
(type, exchange, value) -> org.apache.camel.converter.NIOConverter.toByteBuffer((byte[]) value));
addTypeConverter(registry, java.nio.ByteBuffer.class, java.io.ByteArrayOutputStream.class, false,
(type, exchange, value) -> org.apache.camel.converter.NIOConverter.toByteBuffer((java.io.ByteArrayOutputStream) value));
addTypeConverter(registry, java.nio.ByteBuffer.class, java.io.File.class, false,
(type, exchange, value) -> org.apache.camel.converter.NIOConverter.toByteBuffer((java.io.File) value));
addTypeConverter(registry, java.nio.ByteBuffer.class, java.lang.Double.class, false,
Expand Down
6 changes: 6 additions & 0 deletions core/camel-base/src/main/java/org/apache/camel/converter/NIOConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package org.apache.camel.converter;

import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
Expand Down Expand Up @@ -63,6 +64,11 @@ public static ByteBuffer toByteBuffer(byte[] data) {
return ByteBuffer.wrap(data);
}

@Converter
public static ByteBuffer toByteBuffer(ByteArrayOutputStream baos) {
return ByteBuffer.wrap(baos.toByteArray());
}

@Converter
public static ByteBuffer toByteBuffer(File file) throws IOException {
InputStream in = null;
Expand Down
8 changes: 8 additions & 0 deletions core/camel-core/src/test/java/org/apache/camel/converter/NIOConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package org.apache.camel.converter;

import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.InputStream;
import java.nio.ByteBuffer;
Expand Down Expand Up @@ -79,6 +80,13 @@ public void testToByteBuffer() {
assertNotNull(bb);
}

@Test
public void testToByteBufferByteArrayOutputStream() {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
baos.write(72);
assertEquals(72, NIOConverter.toByteBuffer(baos).get());
}

@Test
public void testToByteBufferString() {
ByteBuffer bb = NIOConverter.toByteBuffer("Hello", null);
Expand Down