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 2019/06/18 10:07:38 UTC
[camel] branch master updated (5589660 -> ea4b733)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 5589660 Do not use deprecated maven api
new c80b547 CAMEL-13647: Allow to do autowrire by classpath.
new ea4b733 CAMEL-13647: Allow to do autowrire by classpath.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/docs/camel-main-maven-plugin.adoc | 1 +
.../java/org/apache/camel/maven/AutowireMojo.java | 39 +++++++++++++++++-----
examples/camel-example-main-artemis/pom.xml | 4 ++-
3 files changed, 35 insertions(+), 9 deletions(-)
[camel] 01/02: CAMEL-13647: Allow to do autowrire by classpath.
Posted by da...@apache.org.
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
commit c80b547ec4cfbed18f8116bd1439791253b12fe7
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Jun 18 12:00:43 2019 +0200
CAMEL-13647: Allow to do autowrire by classpath.
---
.../src/main/docs/camel-main-maven-plugin.adoc | 1 +
.../java/org/apache/camel/maven/AutowireMojo.java | 36 +++++++++++++++++-----
examples/camel-example-main-artemis/pom.xml | 1 +
3 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/catalog/camel-main-maven-plugin/src/main/docs/camel-main-maven-plugin.adoc b/catalog/camel-main-maven-plugin/src/main/docs/camel-main-maven-plugin.adoc
index 99ca864..d826227 100644
--- a/catalog/camel-main-maven-plugin/src/main/docs/camel-main-maven-plugin.adoc
+++ b/catalog/camel-main-maven-plugin/src/main/docs/camel-main-maven-plugin.adoc
@@ -144,6 +144,7 @@ The maven plugin *autowire* goal supports the following options which can be con
|===
| Parameter | Default Value | Description
| logClasspath | false | Whether to log the classpath when starting
+| logUnmapped | false | When autowiring has detected multiple implementations (2 or more) of a given interface, which cannot be mapped, should they be logged so you can see and add manual mapping if needed.
| downloadVersion | true | Whether to allow downloading Camel catalog version from the internet.
This is needed if the project * uses a different Camel version than this plugin is using by default.
| exclude | | To exclude autowiring specific properties with these key names. You can also configure a single entry and separate the excludes with comma.
diff --git a/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/AutowireMojo.java b/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/AutowireMojo.java
index d61c00a..6950bb6 100644
--- a/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/AutowireMojo.java
+++ b/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/AutowireMojo.java
@@ -21,6 +21,7 @@ import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.reflect.Modifier;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
@@ -43,6 +44,7 @@ import org.apache.camel.catalog.JSonSchemaHelper;
import org.apache.camel.catalog.maven.MavenVersionManager;
import org.apache.camel.support.PatternHelper;
import org.apache.camel.util.IOHelper;
+import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.OrderedProperties;
import org.apache.camel.util.StringHelper;
import org.apache.maven.artifact.Artifact;
@@ -78,6 +80,13 @@ public class AutowireMojo extends AbstractExecMojo {
protected boolean logClasspath;
/**
+ * When autowiring has detected multiple implementations (2 or more) of a given interface, which
+ * cannot be mapped, should they be logged so you can see and add manual mapping if needed.
+ */
+ @Parameter(property = "camel.logUnmapped", defaultValue = "false")
+ protected boolean logUnmapped;
+
+ /**
* The output directory for generated autowire file
*/
@Parameter(readonly = true, defaultValue = "${project.build.directory}/classes/META-INF/services/org/apache/camel/")
@@ -281,10 +290,12 @@ public class AutowireMojo extends AbstractExecMojo {
Class clazz = classLoader.loadClass(javaType);
if (clazz.isInterface() && isComplexUserType(clazz)) {
Set<Class<?>> classes = reflections.getSubTypesOf(clazz);
- // filter classes to not be interfaces or not a top level class
- classes = classes.stream().filter(c -> !c.isInterface() && c.getEnclosingClass() == null).collect(Collectors.toSet());
- Class best = chooseBestKnownType(clazz, classes, mappingProperties);
- if (isValidAutowireClass(best)) {
+ // filter classes (must not be interfaces, must not be abstract, must be top level) and also a valid autowire class
+ classes = classes.stream().filter(
+ c -> !c.isInterface() && !Modifier.isAbstract(c.getModifiers()) && c.getEnclosingClass() == null && isValidAutowireClass(c))
+ .collect(Collectors.toSet());
+ Class best = chooseBestKnownType(componentName, name, clazz, classes, mappingProperties);
+ if (best != null) {
String line = "camel.component." + componentName + "." + name + "=#class:" + best.getName();
getLog().debug(line);
autowires.add(line);
@@ -302,7 +313,7 @@ public class AutowireMojo extends AbstractExecMojo {
return autowires;
}
- protected Class chooseBestKnownType(Class type, Set<Class<?>> candidates, Properties knownTypes) {
+ protected Class chooseBestKnownType(String componentName, String optionName, Class type, Set<Class<?>> candidates, Properties knownTypes) {
String known = knownTypes.getProperty(type.getName());
if (known != null) {
for (String k : known.split(";")) {
@@ -320,7 +331,14 @@ public class AutowireMojo extends AbstractExecMojo {
if (candidates.size() == 1) {
return candidates.iterator().next();
} else if (candidates.size() > 1) {
- getLog().debug("Cannot chose best type: " + type.getName() + " among " + candidates.size() + " implementations: " + candidates);
+ if (logUnmapped) {
+ getLog().debug("Cannot chose best type: " + type.getName() + " among " + candidates.size() + " implementations: " + candidates);
+ getLog().info("Cannot autowire option camel.component." + componentName + "." + optionName
+ + " as the interface: " + type.getName() + " has " + candidates.size() + " implementations in the classpath:");
+ for (Class c : candidates) {
+ getLog().info(" Class: " + c.getName());
+ }
+ }
}
return null;
}
@@ -330,9 +348,10 @@ public class AutowireMojo extends AbstractExecMojo {
String prefix = "camel.component." + componentName + ".";
name = StringHelper.dashToCamelCase(name);
- if (exclude != null) {
+ if (ObjectHelper.isNotEmpty(exclude)) {
// works on components too
for (String pattern : exclude) {
+ pattern = pattern.trim();
pattern = StringHelper.dashToCamelCase(pattern);
if (PatternHelper.matchPattern(componentName, pattern)) {
return false;
@@ -343,8 +362,9 @@ public class AutowireMojo extends AbstractExecMojo {
}
}
- if (include != null) {
+ if (ObjectHelper.isNotEmpty(include)) {
for (String pattern : include) {
+ pattern = pattern.trim();
pattern = StringHelper.dashToCamelCase(pattern);
if (PatternHelper.matchPattern(componentName, pattern)) {
return true;
diff --git a/examples/camel-example-main-artemis/pom.xml b/examples/camel-example-main-artemis/pom.xml
index 687bfff..d4bf15e 100644
--- a/examples/camel-example-main-artemis/pom.xml
+++ b/examples/camel-example-main-artemis/pom.xml
@@ -105,6 +105,7 @@
<version>${project.version}</version>
<configuration>
<logClasspath>false</logClasspath>
+ <logUnmapped>true</logUnmapped>
<!-- just include only the jms component -->
<include>jms</include>
</configuration>
[camel] 02/02: CAMEL-13647: Allow to do autowrire by classpath.
Posted by da...@apache.org.
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
commit ea4b7334d9adaaf7bb7e9320439f938742502424
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Jun 18 12:07:25 2019 +0200
CAMEL-13647: Allow to do autowrire by classpath.
---
.../main/java/org/apache/camel/maven/AutowireMojo.java | 15 +++++++++------
examples/camel-example-main-artemis/pom.xml | 5 +++--
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/AutowireMojo.java b/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/AutowireMojo.java
index 6950bb6..7b66a5c 100644
--- a/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/AutowireMojo.java
+++ b/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/AutowireMojo.java
@@ -44,7 +44,6 @@ import org.apache.camel.catalog.JSonSchemaHelper;
import org.apache.camel.catalog.maven.MavenVersionManager;
import org.apache.camel.support.PatternHelper;
import org.apache.camel.util.IOHelper;
-import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.OrderedProperties;
import org.apache.camel.util.StringHelper;
import org.apache.maven.artifact.Artifact;
@@ -290,9 +289,13 @@ public class AutowireMojo extends AbstractExecMojo {
Class clazz = classLoader.loadClass(javaType);
if (clazz.isInterface() && isComplexUserType(clazz)) {
Set<Class<?>> classes = reflections.getSubTypesOf(clazz);
- // filter classes (must not be interfaces, must not be abstract, must be top level) and also a valid autowire class
+ // filter classes (must not be interfaces, must be public, must not be abstract, must be top level) and also a valid autowire class
classes = classes.stream().filter(
- c -> !c.isInterface() && !Modifier.isAbstract(c.getModifiers()) && c.getEnclosingClass() == null && isValidAutowireClass(c))
+ c -> !c.isInterface()
+ && Modifier.isPublic(c.getModifiers())
+ && !Modifier.isAbstract(c.getModifiers())
+ && c.getEnclosingClass() == null
+ && isValidAutowireClass(c))
.collect(Collectors.toSet());
Class best = chooseBestKnownType(componentName, name, clazz, classes, mappingProperties);
if (best != null) {
@@ -336,7 +339,7 @@ public class AutowireMojo extends AbstractExecMojo {
getLog().info("Cannot autowire option camel.component." + componentName + "." + optionName
+ " as the interface: " + type.getName() + " has " + candidates.size() + " implementations in the classpath:");
for (Class c : candidates) {
- getLog().info(" Class: " + c.getName());
+ getLog().info("\t\t" + c.getName());
}
}
}
@@ -348,7 +351,7 @@ public class AutowireMojo extends AbstractExecMojo {
String prefix = "camel.component." + componentName + ".";
name = StringHelper.dashToCamelCase(name);
- if (ObjectHelper.isNotEmpty(exclude)) {
+ if (exclude != null && exclude.length > 0) {
// works on components too
for (String pattern : exclude) {
pattern = pattern.trim();
@@ -362,7 +365,7 @@ public class AutowireMojo extends AbstractExecMojo {
}
}
- if (ObjectHelper.isNotEmpty(include)) {
+ if (include != null && include.length > 0) {
for (String pattern : include) {
pattern = pattern.trim();
pattern = StringHelper.dashToCamelCase(pattern);
diff --git a/examples/camel-example-main-artemis/pom.xml b/examples/camel-example-main-artemis/pom.xml
index d4bf15e..b0132bb 100644
--- a/examples/camel-example-main-artemis/pom.xml
+++ b/examples/camel-example-main-artemis/pom.xml
@@ -105,9 +105,10 @@
<version>${project.version}</version>
<configuration>
<logClasspath>false</logClasspath>
- <logUnmapped>true</logUnmapped>
+ <!-- lets show which options are unmapped -->
+ <!-- <logUnmapped>true</logUnmapped> -->
<!-- just include only the jms component -->
- <include>jms</include>
+ <!-- <include>jms</include> -->
</configuration>
<executions>
<execution>