You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2021/06/08 07:57:33 UTC
[camel] branch main updated: CAMEL-16625: Add type converters for
org.apache.camel.spi.Resource
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
The following commit(s) were added to refs/heads/main by this push:
new 6f8ff92 CAMEL-16625: Add type converters for org.apache.camel.spi.Resource
6f8ff92 is described below
commit 6f8ff92b84626dadca521c3f6a39c829627fb853
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Jun 8 09:55:17 2021 +0200
CAMEL-16625: Add type converters for org.apache.camel.spi.Resource
---
.../converter/CamelBaseBulkConverterLoader.java | 34 ++++++++++-
.../apache/camel/converter/ResourceConverter.java | 65 +++++++++++++++++++++
.../camel/converter/ResourceConverterTest.java | 67 ++++++++++++++++++++++
3 files changed, 165 insertions(+), 1 deletion(-)
diff --git a/core/camel-base/src/generated/java/org/apache/camel/converter/CamelBaseBulkConverterLoader.java b/core/camel-base/src/generated/java/org/apache/camel/converter/CamelBaseBulkConverterLoader.java
index 7ad0b21..a195b53 100644
--- a/core/camel-base/src/generated/java/org/apache/camel/converter/CamelBaseBulkConverterLoader.java
+++ b/core/camel-base/src/generated/java/org/apache/camel/converter/CamelBaseBulkConverterLoader.java
@@ -42,7 +42,7 @@ public final class CamelBaseBulkConverterLoader implements TypeConverterLoader,
@Override
public int size() {
- return 104;
+ return 109;
}
@Override
@@ -71,6 +71,9 @@ public final class CamelBaseBulkConverterLoader implements TypeConverterLoader,
if (value instanceof java.nio.ByteBuffer) {
return org.apache.camel.converter.NIOConverter.toByteArray((java.nio.ByteBuffer) value);
}
+ if (value instanceof org.apache.camel.spi.Resource) {
+ return org.apache.camel.converter.ResourceConverter.toByteArray((org.apache.camel.spi.Resource) value, camelContext);
+ }
if (value instanceof java.io.File) {
return org.apache.camel.converter.IOConverter.toByteArray((java.io.File) value);
}
@@ -121,6 +124,9 @@ public final class CamelBaseBulkConverterLoader implements TypeConverterLoader,
if (value instanceof java.util.stream.Stream) {
return org.apache.camel.converter.IOConverter.toInputStream((java.util.stream.Stream) value, exchange);
}
+ if (value instanceof org.apache.camel.spi.Resource) {
+ return org.apache.camel.converter.ResourceConverter.toInputStream((org.apache.camel.spi.Resource) value);
+ }
if (value instanceof java.net.URL) {
return org.apache.camel.converter.IOConverter.toInputStream((java.net.URL) value);
}
@@ -161,6 +167,9 @@ public final class CamelBaseBulkConverterLoader implements TypeConverterLoader,
return org.apache.camel.converter.IOConverter.toOutputStream((java.io.File) value);
}
} else if (to == java.io.Reader.class) {
+ if (value instanceof org.apache.camel.spi.Resource) {
+ return org.apache.camel.converter.ResourceConverter.toReader((org.apache.camel.spi.Resource) value);
+ }
if (value instanceof java.io.InputStream) {
return org.apache.camel.converter.IOConverter.toReader((java.io.InputStream) value, exchange);
}
@@ -275,6 +284,9 @@ public final class CamelBaseBulkConverterLoader implements TypeConverterLoader,
if (value instanceof java.nio.ByteBuffer) {
return org.apache.camel.converter.NIOConverter.toString((java.nio.ByteBuffer) value, exchange);
}
+ if (value instanceof org.apache.camel.spi.Resource) {
+ return org.apache.camel.converter.ResourceConverter.toString((org.apache.camel.spi.Resource) value, camelContext);
+ }
if (value instanceof java.time.Duration) {
return org.apache.camel.converter.DurationConverter.toString((java.time.Duration) value);
}
@@ -446,6 +458,10 @@ public final class CamelBaseBulkConverterLoader implements TypeConverterLoader,
if (value instanceof org.apache.camel.Predicate) {
return org.apache.camel.converter.CamelConverter.toProcessor((org.apache.camel.Predicate) value);
}
+ } else if (to == org.apache.camel.spi.Resource.class) {
+ if (value instanceof java.lang.String) {
+ return org.apache.camel.converter.ResourceConverter.toResource((java.lang.String) value, camelContext);
+ }
}
return null;
}
@@ -455,6 +471,9 @@ public final class CamelBaseBulkConverterLoader implements TypeConverterLoader,
if (from == java.nio.ByteBuffer.class) {
return this;
}
+ if (from == org.apache.camel.spi.Resource.class) {
+ return this;
+ }
if (from == java.io.File.class) {
return this;
}
@@ -505,6 +524,9 @@ public final class CamelBaseBulkConverterLoader implements TypeConverterLoader,
if (from == java.util.stream.Stream.class) {
return this;
}
+ if (from == org.apache.camel.spi.Resource.class) {
+ return this;
+ }
if (from == java.net.URL.class) {
return this;
}
@@ -545,6 +567,9 @@ public final class CamelBaseBulkConverterLoader implements TypeConverterLoader,
return this;
}
} else if (to == java.io.Reader.class) {
+ if (from == org.apache.camel.spi.Resource.class) {
+ return this;
+ }
if (from == java.io.InputStream.class) {
return this;
}
@@ -639,6 +664,9 @@ public final class CamelBaseBulkConverterLoader implements TypeConverterLoader,
if (from == java.nio.ByteBuffer.class) {
return this;
}
+ if (from == org.apache.camel.spi.Resource.class) {
+ return this;
+ }
if (from == java.time.Duration.class) {
return this;
}
@@ -805,6 +833,10 @@ public final class CamelBaseBulkConverterLoader implements TypeConverterLoader,
if (from == org.apache.camel.Predicate.class) {
return this;
}
+ } else if (to == org.apache.camel.spi.Resource.class) {
+ if (from == java.lang.String.class) {
+ return this;
+ }
}
return null;
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/converter/ResourceConverter.java b/core/camel-base/src/main/java/org/apache/camel/converter/ResourceConverter.java
new file mode 100644
index 0000000..9d81053
--- /dev/null
+++ b/core/camel-base/src/main/java/org/apache/camel/converter/ResourceConverter.java
@@ -0,0 +1,65 @@
+/*
+ * 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.converter;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Converter;
+import org.apache.camel.ExtendedCamelContext;
+import org.apache.camel.spi.Resource;
+
+@Converter(generateBulkLoader = true)
+public final class ResourceConverter {
+
+ /**
+ * Utility classes should not have a public constructor.
+ */
+ private ResourceConverter() {
+ }
+
+ @Converter(order = 1)
+ public static InputStream toInputStream(Resource resource) throws IOException {
+ return resource.getInputStream();
+ }
+
+ @Converter(order = 2)
+ public static Reader toReader(Resource resource) throws Exception {
+ return resource.getReader();
+ }
+
+ @Converter(order = 3)
+ public static byte[] toByteArray(Resource resource, CamelContext camelContext) throws IOException {
+ InputStream is = resource.getInputStream();
+ return camelContext.getTypeConverter().tryConvertTo(byte[].class, is);
+ }
+
+ @Converter(order = 4)
+ public static String toString(Resource resource, CamelContext camelContext) throws IOException {
+ InputStream is = resource.getInputStream();
+ return camelContext.getTypeConverter().tryConvertTo(String.class, is);
+ }
+
+ @Converter(order = 5)
+ public static Resource toResource(String uri, CamelContext camelContext) throws IOException {
+ ExtendedCamelContext ecc = camelContext.adapt(ExtendedCamelContext.class);
+ return ecc.getResourceLoader().resolveResource(uri);
+ }
+
+}
diff --git a/core/camel-core/src/test/java/org/apache/camel/converter/ResourceConverterTest.java b/core/camel-core/src/test/java/org/apache/camel/converter/ResourceConverterTest.java
new file mode 100644
index 0000000..503e676
--- /dev/null
+++ b/core/camel-core/src/test/java/org/apache/camel/converter/ResourceConverterTest.java
@@ -0,0 +1,67 @@
+/*
+ * 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.converter;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.spi.Resource;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class ResourceConverterTest extends ContextTestSupport {
+
+ @Test
+ public void testMem() {
+ Resource res = context.getTypeConverter().convertTo(Resource.class, "mem:foo");
+ String out = context.getTypeConverter().convertTo(String.class, res);
+ assertEquals("foo", out);
+ }
+
+ @Test
+ public void testBase64() {
+ String b64 = Base64.getEncoder().encodeToString("Hello Camel".getBytes(StandardCharsets.UTF_8));
+ Resource res = context.getTypeConverter().convertTo(Resource.class, "base64:" + b64);
+ String out = context.getTypeConverter().convertTo(String.class, res);
+ assertEquals("Hello Camel", out);
+ }
+
+ @Test
+ public void testClasspath() {
+ Resource res = context.getTypeConverter().convertTo(Resource.class, "classpath:myxpath.txt");
+ String out = context.getTypeConverter().convertTo(String.class, res);
+ assertEquals("/person/name/text()", out);
+ }
+
+ @Test
+ public void testFile() {
+ Resource res = context.getTypeConverter().convertTo(Resource.class, "file:src/test/resources/mysimple.txt");
+ String out = context.getTypeConverter().convertTo(String.class, res);
+ assertEquals("The name is ${body}", out);
+ }
+
+ @Test
+ public void testRef() {
+ context.getRegistry().bind("foo", "Hello Foo");
+ Resource res = context.getTypeConverter().convertTo(Resource.class, "ref:foo");
+ String out = context.getTypeConverter().convertTo(String.class, res);
+ assertEquals("Hello Foo", out);
+ }
+
+}