[camel] branch master updated: camel-core - Reorder type converter to better match correct

[davsclaus]

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 be27bd0  camel-core - Reorder type converter to better match correct
be27bd0 is described below

commit be27bd04b8f884a540b8d1f24a866fc0d1f67270
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Dec 17 11:40:14 2020 +0100

    camel-core - Reorder type converter to better match correct
---
 .../apache/camel/converter/CamelBaseBulkConverterLoader.java   | 10 +++++-----
 .../src/main/java/org/apache/camel/converter/IOConverter.java  | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

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 2ebce2e..deab870 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
@@ -58,12 +58,12 @@ public final class CamelBaseBulkConverterLoader implements 
TypeConverterLoader,
             if (value instanceof java.io.File) {
                 return 
org.apache.camel.converter.IOConverter.toByteArray((java.io.File) value);
             }
-            if (value instanceof java.io.Reader) {
-                return 
org.apache.camel.converter.IOConverter.toByteArray((java.io.Reader) value, 
exchange);
-            }
             if (value instanceof java.io.BufferedReader) {
                 return 
org.apache.camel.converter.IOConverter.toByteArray((java.io.BufferedReader) 
value, exchange);
             }
+            if (value instanceof java.io.Reader) {
+                return 
org.apache.camel.converter.IOConverter.toByteArray((java.io.Reader) value, 
exchange);
+            }
             if (value instanceof java.lang.String) {
                 return 
org.apache.camel.converter.IOConverter.toByteArray((java.lang.String) value, 
exchange);
             }
@@ -438,10 +438,10 @@ public final class CamelBaseBulkConverterLoader 
implements TypeConverterLoader,
             if (from == java.io.File.class) {
                 return this;
             }
-            if (from == java.io.Reader.class) {
+            if (from == java.io.BufferedReader.class) {
                 return this;
             }
-            if (from == java.io.BufferedReader.class) {
+            if (from == java.io.Reader.class) {
                 return this;
             }
             if (from == java.lang.String.class) {
diff --git 
a/core/camel-base/src/main/java/org/apache/camel/converter/IOConverter.java 
b/core/camel-base/src/main/java/org/apache/camel/converter/IOConverter.java
index 54f4986..9690465 100644
--- a/core/camel-base/src/main/java/org/apache/camel/converter/IOConverter.java
+++ b/core/camel-base/src/main/java/org/apache/camel/converter/IOConverter.java
@@ -165,8 +165,9 @@ public final class IOConverter {
     }
 
     @Converter(order = 19)
-    public static byte[] toByteArray(Reader reader, Exchange exchange) throws 
IOException {
-        return toByteArray(IOHelper.buffered(reader), exchange);
+    public static byte[] toByteArray(BufferedReader reader, Exchange exchange) 
throws IOException {
+        String s = toString(reader);
+        return toByteArray(s, exchange);
     }
 
     @Converter(order = 20)
@@ -190,9 +191,8 @@ public final class IOConverter {
     }
 
     @Converter(order = 23)
-    public static byte[] toByteArray(BufferedReader reader, Exchange exchange) 
throws IOException {
-        String s = toString(reader);
-        return toByteArray(s, exchange);
+    public static byte[] toByteArray(Reader reader, Exchange exchange) throws 
IOException {
+        return toByteArray(IOHelper.buffered(reader), exchange);
     }
 
     @Converter(order = 24)