You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by al...@apache.org on 2020/11/02 14:18:26 UTC
[camel] branch master updated: Fixed
TypeConverterLoaderGeneratorMojo mixing double and float
This is an automated email from the ASF dual-hosted git repository.
aldettinger 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 d841a2b Fixed TypeConverterLoaderGeneratorMojo mixing double and float
d841a2b is described below
commit d841a2bac27646cd16687bdb5b907dddcb355de6
Author: aldettinger <al...@gmail.com>
AuthorDate: Mon Nov 2 14:35:04 2020 +0100
Fixed TypeConverterLoaderGeneratorMojo mixing double and float
---
.../src/test/java/org/apache/camel/component/pdf/PdfCreationTest.java | 2 +-
.../java/org/apache/camel/converter/CamelBaseBulkConverterLoader.java | 4 ++--
.../camel/maven/packaging/TypeConverterLoaderGeneratorMojo.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfCreationTest.java b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfCreationTest.java
index eb6138b..3c2643d 100644
--- a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfCreationTest.java
+++ b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfCreationTest.java
@@ -120,7 +120,7 @@ public class PdfCreationTest extends CamelTestSupport {
@Override
public void configure() throws Exception {
from("direct:start")
- .to("pdf:create?font=Courier&pageSize=PAGE_SIZE_A1")
+ .to("pdf:create?fontSize=6&font=Courier&pageSize=PAGE_SIZE_A1")
.to("mock:result");
}
};
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 f4e3038..2ebce2e 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
@@ -185,7 +185,7 @@ public final class CamelBaseBulkConverterLoader implements TypeConverterLoader,
if (value instanceof java.lang.String) {
return org.apache.camel.converter.ObjectConverter.toClass((java.lang.String) value, exchange);
}
- } else if (to == java.lang.Double.class || to == float.class) {
+ } else if (to == java.lang.Double.class || to == double.class) {
if (value instanceof java.lang.Number) {
return org.apache.camel.converter.ObjectConverter.toDouble((java.lang.Number) value);
}
@@ -560,7 +560,7 @@ public final class CamelBaseBulkConverterLoader implements TypeConverterLoader,
if (from == java.lang.String.class) {
return this;
}
- } else if (to == java.lang.Double.class || to == float.class) {
+ } else if (to == java.lang.Double.class || to == double.class) {
if (from == java.lang.Number.class) {
return this;
}
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/TypeConverterLoaderGeneratorMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/TypeConverterLoaderGeneratorMojo.java
index 6e93fef..bac0fe2 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/TypeConverterLoaderGeneratorMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/TypeConverterLoaderGeneratorMojo.java
@@ -352,7 +352,7 @@ public class TypeConverterLoaderGeneratorMojo extends AbstractGeneratorMojo {
} else if ("java.lang.Float".equals(to)) {
return "float";
} else if ("java.lang.Double".equals(to)) {
- return "float";
+ return "double";
}
}
return null;