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 2018/07/05 07:04:24 UTC
[camel] branch master updated (1766e54 -> ce5eb87)
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 1766e54 Add .vscode to gitignore
new ef3676b Polish component description
new ce5eb87 Add missing javadoc to rest-dsl model
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:
.../java/org/apache/camel/model/rest/RestSecuritiesDefinition.java | 5 ++++-
.../main/java/org/apache/camel/model/rest/SecurityDefinition.java | 3 +++
.../org/apache/camel/component/micrometer/MicrometerEndpoint.java | 2 +-
components/readme.adoc | 2 +-
.../micrometer/springboot/MicrometerComponentConfiguration.java | 4 ++--
5 files changed, 11 insertions(+), 5 deletions(-)
[camel] 01/02: Polish component description
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 ef3676b2563bb89b3931d5560bd7fba05ba62ee3
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jul 5 08:57:56 2018 +0200
Polish component description
---
.../org/apache/camel/component/micrometer/MicrometerEndpoint.java | 2 +-
components/readme.adoc | 2 +-
.../micrometer/springboot/MicrometerComponentConfiguration.java | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/MicrometerEndpoint.java b/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/MicrometerEndpoint.java
index 077f506..e0cce8d 100644
--- a/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/MicrometerEndpoint.java
+++ b/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/MicrometerEndpoint.java
@@ -31,7 +31,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriPath;
/**
- * To collect various metrics directly from Camel routes using the DropWizard metrics library.
+ * To collect various metrics directly from Camel routes using the Micrometer library.
*/
@UriEndpoint(firstVersion = "2.22.0", scheme = "micrometer", title = "Micrometer", syntax = "micrometer:metricsType:meterName", producerOnly = true, label = "monitoring")
public class MicrometerEndpoint extends DefaultEndpoint {
diff --git a/components/readme.adoc b/components/readme.adoc
index c91f0b6..e2470a0 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -540,7 +540,7 @@ Number of Components: 297 in 203 JAR artifacts (20 deprecated)
`metrics:metricsType:metricsName` | 2.14 | To collect various metrics directly from Camel routes using the DropWizard metrics library.
| link:camel-micrometer/src/main/docs/micrometer-component.adoc[Micrometer] (camel-micrometer) +
-`micrometer:metricsType:meterName` | 2.22 | To collect various metrics directly from Camel routes using the DropWizard metrics library.
+`micrometer:metricsType:meterName` | 2.22 | To collect various metrics directly from Camel routes using the Micrometer library.
| link:camel-mina/src/main/docs/mina-component.adoc[Mina] (camel-mina) +
`mina:protocol:host:port` | 1.0 | *deprecated* Socket level networking using TCP or UDP with the Apache Mina 1.x library.
diff --git a/platforms/spring-boot/components-starter/camel-micrometer-starter/src/main/java/org/apache/camel/component/micrometer/springboot/MicrometerComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-micrometer-starter/src/main/java/org/apache/camel/component/micrometer/springboot/MicrometerComponentConfiguration.java
index 13c108d..5c71481 100644
--- a/platforms/spring-boot/components-starter/camel-micrometer-starter/src/main/java/org/apache/camel/component/micrometer/springboot/MicrometerComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-micrometer-starter/src/main/java/org/apache/camel/component/micrometer/springboot/MicrometerComponentConfiguration.java
@@ -23,8 +23,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.NestedConfigurationProperty;
/**
- * To collect various metrics directly from Camel routes using the DropWizard
- * metrics library.
+ * To collect various metrics directly from Camel routes using the Micrometer
+ * library.
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
[camel] 02/02: Add missing javadoc to rest-dsl model
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 ce5eb875baff495536250a1e30da53fd84ce607f
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jul 5 09:03:11 2018 +0200
Add missing javadoc to rest-dsl model
---
.../java/org/apache/camel/model/rest/RestSecuritiesDefinition.java | 5 ++++-
.../main/java/org/apache/camel/model/rest/SecurityDefinition.java | 3 +++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestSecuritiesDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestSecuritiesDefinition.java
index 2e15a18..8dbdd71 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/RestSecuritiesDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestSecuritiesDefinition.java
@@ -28,7 +28,7 @@ import javax.xml.bind.annotation.XmlTransient;
import org.apache.camel.spi.Metadata;
/**
- * To configure security definition
+ * To configure rest security definitions.
*/
@Metadata(label = "rest,security", title = "Security Definitions")
@XmlRootElement(name = "securityDefinitions")
@@ -56,6 +56,9 @@ public class RestSecuritiesDefinition {
return securityDefinitions;
}
+ /**
+ * Security definitions
+ */
public void setSecurityDefinitions(List<RestSecurityDefinition> securityDefinitions) {
this.securityDefinitions = securityDefinitions;
}
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/SecurityDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/SecurityDefinition.java
index 0c7b056..c4ce706 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/SecurityDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/SecurityDefinition.java
@@ -23,6 +23,9 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.apache.camel.spi.Metadata;
+/**
+ * Rest security definition
+ */
@Metadata(label = "rest,security", title = "Security")
@XmlRootElement(name = "security")
@XmlAccessorType(XmlAccessType.FIELD)