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/08/25 07:13:40 UTC
[camel] branch master updated: CAMEL-13870: Fixed compiler issue
for dummy-component
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 21de834 CAMEL-13870: Fixed compiler issue for dummy-component
21de834 is described below
commit 21de834d97c3da5d7a65e832fb69df15ae8a7ea9
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Aug 25 09:13:17 2019 +0200
CAMEL-13870: Fixed compiler issue for dummy-component
---
catalog/dummy-component/pom.xml | 12 ++++++++++--
.../org/apache/camel/component/dummy/DummyComponent.java | 2 ++
.../camel-properties/src/main/docs/properties-component.adoc | 3 +--
.../apache/camel/tools/apt/EndpointAnnotationProcessor.java | 5 ++++-
4 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/catalog/dummy-component/pom.xml b/catalog/dummy-component/pom.xml
index db3b213..ca66db9 100644
--- a/catalog/dummy-component/pom.xml
+++ b/catalog/dummy-component/pom.xml
@@ -54,18 +54,26 @@
<build>
<plugins>
- <!-- use Camel plugins to generate component details -->
+ <!-- generate components meta-data and validate component includes documentation etc -->
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-package-maven-plugin</artifactId>
<version>${project.version}</version>
<executions>
<execution>
+ <id>prepare</id>
<goals>
- <goal>generate-components-list</goal>
+ <goal>prepare-components</goal>
</goals>
<phase>generate-resources</phase>
</execution>
+ <execution>
+ <id>validate</id>
+ <goals>
+ <goal>validate-components</goal>
+ </goals>
+ <phase>prepare-package</phase>
+ </execution>
</executions>
</plugin>
</plugins>
diff --git a/catalog/dummy-component/src/main/java/org/apache/camel/component/dummy/DummyComponent.java b/catalog/dummy-component/src/main/java/org/apache/camel/component/dummy/DummyComponent.java
index 043fc6d..422ed02 100644
--- a/catalog/dummy-component/src/main/java/org/apache/camel/component/dummy/DummyComponent.java
+++ b/catalog/dummy-component/src/main/java/org/apache/camel/component/dummy/DummyComponent.java
@@ -19,8 +19,10 @@ package org.apache.camel.component.dummy;
import java.util.Map;
import org.apache.camel.Endpoint;
+import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.DefaultComponent;
+@Component("dummy")
public class DummyComponent extends DefaultComponent {
public DummyComponent() {
diff --git a/components/camel-properties/src/main/docs/properties-component.adoc b/components/camel-properties/src/main/docs/properties-component.adoc
index d542d8d..8fe3a5f 100644
--- a/components/camel-properties/src/main/docs/properties-component.adoc
+++ b/components/camel-properties/src/main/docs/properties-component.adoc
@@ -87,7 +87,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 13 options, which are listed below.
+The component supports 12 options, which are listed below.
@@ -103,7 +103,6 @@ The component supports 13 options, which are listed below.
| *camel.component.properties.ignore-missing-location* | Whether to silently ignore if a location cannot be located, such as a properties file not found. | false | Boolean
| *camel.component.properties.initial-properties* | Sets initial properties which will be used before any locations are resolved. The option is a java.util.Properties type. | | String
| *camel.component.properties.location* | A list of locations to load properties. You can use comma to separate multiple locations. This option will override any default locations and only use the locations from this option. | | String
-| *camel.component.properties.locations* | A list of locations to load properties. This option will override any default locations and only use the locations from this option. | | List
| *camel.component.properties.override-properties* | Sets a special list of override properties that take precedence and will use first, if a property exist. The option is a java.util.Properties type. | | String
| *camel.component.properties.properties-parser* | To use a custom PropertiesParser. The option is a org.apache.camel.component.properties.PropertiesParser type. | | String
| *camel.component.properties.system-properties-mode* | Sets the JVM system property mode (0 = never, 1 = fallback, 2 = override). The default mode (override) is to use system properties if present, and override any existing properties. OS environment variable mode is checked before JVM system property mode | 2 | Integer
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
index 38c5f88..2de4bbb 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
@@ -168,7 +168,10 @@ public class EndpointAnnotationProcessor extends AbstractCamelAnnotationProcesso
if (componentClassElement != null) {
findComponentClassProperties(writer, roundEnv, componentModel, componentOptions, componentClassElement, "", parentData, null, null);
}
- generateComponentConfigurer(roundEnv, uriEndpoint, scheme, schemes, componentModel, componentOptions);
+ // if the component has known class name
+ if (!"@@@JAVATYPE@@@".equals(componentModel.getJavaType())) {
+ generateComponentConfigurer(roundEnv, uriEndpoint, scheme, schemes, componentModel, componentOptions);
+ }
// endpoint options
findClassProperties(writer, roundEnv, componentModel, endpointPaths, endpointOptions, classElement, "", uriEndpoint.excludeProperties(), parentData, null, null);