[camel] branch master updated: CAMEL-13546 - handle not only java utils with generics but also other generics because < and > is invalid in windows

[on...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

onders 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 65a0acb  CAMEL-13546 - handle not only java utils with generics but also other generics because < and > is invalid in windows
65a0acb is described below

commit 65a0acb1c58696ed2f260b28265520cc56c81751
Author: önder sezgin <on...@apache.org>
AuthorDate: Mon May 20 14:49:07 2019 +0300

    CAMEL-13546 - handle not only java utils with generics but also other generics because < and > is invalid in windows
---
 .../apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
index 139915e..8d25d38 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
@@ -1140,7 +1140,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
 
     // read java type from project, returns null if not found
     private JavaClass readJavaType(String type) {
-        if (!type.startsWith("java.lang.")) {
+        if (!type.startsWith("java.lang.") && (!type.contains("<") || !type.contains(">"))) {
             final String fileName = type.replaceAll("[\\[\\]]", "").replaceAll("\\.", "\\/") + ".java";
             Path sourcePath = project.getCompileSourceRoots().stream().map(Paths::get).map(p -> p.resolve(fileName)).filter(Files::isRegularFile).findFirst().orElse(null);
             if (sourcePath == null) {