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/12/21 09:34:53 UTC

[camel] branch master updated (46244e8 -> f172a29)

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 46244e8  Fixed CS
     new 121377d  CAMEL-14311: Add validate configuration properties to camel-catalog.
     new f172a29  Regen

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:
 catalog/camel-catalog/pom.xml                      |   1 +
 .../ConfigurationPropertiesValidationResult.java   |   6 +-
 .../runtimecatalog/EndpointValidationResult.java   | 280 +------------------
 .../runtimecatalog/PropertiesValidationResult.java | 304 +++++++++++++++++++++
 docs/components/modules/ROOT/pages/index.adoc      |  14 +-
 5 files changed, 321 insertions(+), 284 deletions(-)
 create mode 100644 core/camel-api/src/main/java/org/apache/camel/runtimecatalog/PropertiesValidationResult.java


[camel] 01/02: CAMEL-14311: Add validate configuration properties to camel-catalog.

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 121377dd07631a923e366bf829decd9e3a968e39
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Dec 21 10:31:05 2019 +0100

    CAMEL-14311: Add validate configuration properties to camel-catalog.
---
 catalog/camel-catalog/pom.xml                      |   1 +
 .../ConfigurationPropertiesValidationResult.java   |   6 +-
 .../runtimecatalog/EndpointValidationResult.java   | 280 +------------------
 .../runtimecatalog/PropertiesValidationResult.java | 304 +++++++++++++++++++++
 4 files changed, 314 insertions(+), 277 deletions(-)

diff --git a/catalog/camel-catalog/pom.xml b/catalog/camel-catalog/pom.xml
index ba9a7ca..16ea047 100644
--- a/catalog/camel-catalog/pom.xml
+++ b/catalog/camel-catalog/pom.xml
@@ -129,6 +129,7 @@
                                         <include>EndpointValidationResult.java</include>
                                         <include>JSonSchemaResolver.java</include>
                                         <include>LanguageValidationResult.java</include>
+                                        <include>PropertiesValidationResult.java</include>
                                     </includes>
                                 </resource>
                                 <resource>
diff --git a/core/camel-api/src/main/java/org/apache/camel/runtimecatalog/ConfigurationPropertiesValidationResult.java b/core/camel-api/src/main/java/org/apache/camel/runtimecatalog/ConfigurationPropertiesValidationResult.java
index 14047b1..16a40d1 100644
--- a/core/camel-api/src/main/java/org/apache/camel/runtimecatalog/ConfigurationPropertiesValidationResult.java
+++ b/core/camel-api/src/main/java/org/apache/camel/runtimecatalog/ConfigurationPropertiesValidationResult.java
@@ -16,12 +16,12 @@
  */
 package org.apache.camel.runtimecatalog;
 
+import java.io.Serializable;
+
 /**
  * Details result of validating configuration properties (eg application.properties for camel-main).
  */
-public class ConfigurationPropertiesValidationResult extends EndpointValidationResult {
-
-    // TODO: Move stuff to base class for EndpointValidationResult so they can share code
+public class ConfigurationPropertiesValidationResult extends PropertiesValidationResult implements Serializable {
 
     private String key;
     private String value;
diff --git a/core/camel-api/src/main/java/org/apache/camel/runtimecatalog/EndpointValidationResult.java b/core/camel-api/src/main/java/org/apache/camel/runtimecatalog/EndpointValidationResult.java
index 6070f1d..d0c9de6 100644
--- a/core/camel-api/src/main/java/org/apache/camel/runtimecatalog/EndpointValidationResult.java
+++ b/core/camel-api/src/main/java/org/apache/camel/runtimecatalog/EndpointValidationResult.java
@@ -18,46 +18,21 @@ package org.apache.camel.runtimecatalog;
 
 import java.io.Serializable;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 /**
  * Details result of validating endpoint uri.
  */
-public class EndpointValidationResult implements Serializable {
+public class EndpointValidationResult extends PropertiesValidationResult implements Serializable {
 
     private final String uri;
-    private int errors;
-    private int warnings;
 
-    // general error
-    private String syntaxError;
-    // general warnings
-    private String unknownComponent;
-    private String incapable;
-
-    // options
-    private Set<String> unknown;
-    private Map<String, String[]> unknownSuggestions;
     private Set<String> lenient;
     private Set<String> notConsumerOnly;
     private Set<String> notProducerOnly;
-    private Set<String> required;
-    private Set<String> deprecated;
-    private Map<String, String> invalidEnum;
-    private Map<String, String[]> invalidEnumChoices;
-    private Map<String, String[]> invalidEnumSuggestions;
-    private Map<String, String> invalidMap;
-    private Map<String, String> invalidArray;
-    private Map<String, String> invalidReference;
-    private Map<String, String> invalidBoolean;
-    private Map<String, String> invalidInteger;
-    private Map<String, String> invalidNumber;
-    private Map<String, String> defaultValues;
 
     public EndpointValidationResult() {
         this(null);
@@ -71,69 +46,14 @@ public class EndpointValidationResult implements Serializable {
         return uri;
     }
 
-    public boolean hasErrors() {
-        return errors > 0;
-    }
-
-    public int getNumberOfErrors() {
-        return errors;
-    }
-
-    public boolean hasWarnings() {
-        return warnings > 0;
-    }
-
-    public int getNumberOfWarnings() {
-        return warnings;
-    }
-
     public boolean isSuccess() {
-        boolean ok = syntaxError == null && unknown == null && required == null;
+        boolean ok = super.isSuccess();
         if (ok) {
             ok = notConsumerOnly == null && notProducerOnly == null;
         }
-        if (ok) {
-            ok = invalidEnum == null && invalidEnumChoices == null && invalidReference == null
-                && invalidBoolean == null && invalidInteger == null && invalidNumber == null;
-        }
-        if (ok) {
-           ok = invalidMap == null && invalidArray == null;
-        }
         return ok;
     }
 
-    public void addSyntaxError(String syntaxError) {
-        this.syntaxError = syntaxError;
-        errors++;
-    }
-
-    public void addIncapable(String uri) {
-        this.incapable = uri;
-        warnings++;
-    }
-
-    public void addUnknownComponent(String name) {
-        this.unknownComponent = name;
-        warnings++;
-    }
-
-    public void addUnknown(String name) {
-        if (unknown == null) {
-            unknown = new LinkedHashSet<>();
-        }
-        if (!unknown.contains(name)) {
-            unknown.add(name);
-            errors++;
-        }
-    }
-
-    public void addUnknownSuggestions(String name, String[] suggestions) {
-        if (unknownSuggestions == null) {
-            unknownSuggestions = new LinkedHashMap<>();
-        }
-        unknownSuggestions.put(name, suggestions);
-    }
-
     public void addLenient(String name) {
         if (lenient == null) {
             lenient = new LinkedHashSet<>();
@@ -143,116 +63,6 @@ public class EndpointValidationResult implements Serializable {
         }
     }
 
-    public void addRequired(String name) {
-        if (required == null) {
-            required = new LinkedHashSet<>();
-        }
-        if (!required.contains(name)) {
-            required.add(name);
-            errors++;
-        }
-    }
-
-    public void addDeprecated(String name) {
-        if (deprecated == null) {
-            deprecated = new LinkedHashSet<>();
-        }
-        if (!deprecated.contains(name)) {
-            deprecated.add(name);
-        }
-    }
-
-    public void addInvalidEnum(String name, String value) {
-        if (invalidEnum == null) {
-            invalidEnum = new LinkedHashMap<>();
-        }
-        if (!invalidEnum.containsKey(name)) {
-            invalidEnum.put(name, value);
-            errors++;
-        }
-    }
-
-    public void addInvalidEnumChoices(String name, String[] choices) {
-        if (invalidEnumChoices == null) {
-            invalidEnumChoices = new LinkedHashMap<>();
-        }
-        invalidEnumChoices.put(name, choices);
-    }
-
-    public void addInvalidEnumSuggestions(String name, String[] suggestions) {
-        if (invalidEnumSuggestions == null) {
-            invalidEnumSuggestions = new LinkedHashMap<>();
-        }
-        invalidEnumSuggestions.put(name, suggestions);
-    }
-
-    public void addInvalidReference(String name, String value) {
-        if (invalidReference == null) {
-            invalidReference = new LinkedHashMap<>();
-        }
-        if (!invalidReference.containsKey(name)) {
-            invalidReference.put(name, value);
-            errors++;
-        }
-    }
-
-    public void addInvalidMap(String name, String value) {
-        if (invalidMap == null) {
-            invalidMap = new LinkedHashMap<>();
-        }
-        if (!invalidMap.containsKey(name)) {
-            invalidMap.put(name, value);
-            errors++;
-        }
-    }
-
-    public void addInvalidArray(String name, String value) {
-        if (invalidArray == null) {
-            invalidArray = new LinkedHashMap<>();
-        }
-        if (!invalidArray.containsKey(name)) {
-            invalidArray.put(name, value);
-            errors++;
-        }
-    }
-
-    public void addInvalidBoolean(String name, String value) {
-        if (invalidBoolean == null) {
-            invalidBoolean = new LinkedHashMap<>();
-        }
-        if (!invalidBoolean.containsKey(name)) {
-            invalidBoolean.put(name, value);
-            errors++;
-        }
-    }
-
-    public void addInvalidInteger(String name, String value) {
-        if (invalidInteger == null) {
-            invalidInteger = new LinkedHashMap<>();
-        }
-        if (!invalidInteger.containsKey(name)) {
-            invalidInteger.put(name, value);
-            errors++;
-        }
-    }
-
-    public void addInvalidNumber(String name, String value) {
-        if (invalidNumber == null) {
-            invalidNumber = new LinkedHashMap<>();
-        }
-        if (!invalidNumber.containsKey(name)) {
-            invalidNumber.put(name, value);
-            errors++;
-        }
-    }
-
-    public void addDefaultValue(String name, String value)  {
-        if (defaultValues == null) {
-            defaultValues = new LinkedHashMap<>();
-        }
-        defaultValues.put(name, value);
-    }
-
     public void addNotConsumerOnly(String name) {
         if (notConsumerOnly == null) {
             notConsumerOnly = new LinkedHashSet<>();
@@ -273,85 +83,6 @@ public class EndpointValidationResult implements Serializable {
         }
     }
 
-    public String getSyntaxError() {
-        return syntaxError;
-    }
-
-    public String getIncapable() {
-        return incapable;
-    }
-
-    public Set<String> getUnknown() {
-        return unknown;
-    }
-
-    public Set<String> getLenient() {
-        return lenient;
-    }
-
-    public Map<String, String[]> getUnknownSuggestions() {
-        return unknownSuggestions;
-    }
-
-    public String getUnknownComponent() {
-        return unknownComponent;
-    }
-
-    public Set<String> getRequired() {
-        return required;
-    }
-
-    public Set<String> getDeprecated() {
-        return deprecated;
-    }
-
-    public Map<String, String> getInvalidEnum() {
-        return invalidEnum;
-    }
-
-    public Map<String, String[]> getInvalidEnumChoices() {
-        return invalidEnumChoices;
-    }
-
-    public List<String> getEnumChoices(String optionName) {
-        if (invalidEnumChoices != null) {
-            String[] enums = invalidEnumChoices.get(optionName);
-            if (enums != null) {
-                return Arrays.asList(enums);
-            }
-        }
-
-        return Collections.emptyList();
-    }
-
-    public Map<String, String> getInvalidReference() {
-        return invalidReference;
-    }
-
-    public Map<String, String> getInvalidMap() {
-        return invalidMap;
-    }
-
-    public Map<String, String> getInvalidArray() {
-        return invalidArray;
-    }
-
-    public Map<String, String> getInvalidBoolean() {
-        return invalidBoolean;
-    }
-
-    public Map<String, String> getInvalidInteger() {
-        return invalidInteger;
-    }
-
-    public Map<String, String> getInvalidNumber() {
-        return invalidNumber;
-    }
-
-    public Map<String, String> getDefaultValues() {
-        return defaultValues;
-    }
-
     public Set<String> getNotConsumerOnly() {
         return notConsumerOnly;
     }
@@ -360,6 +91,10 @@ public class EndpointValidationResult implements Serializable {
         return notProducerOnly;
     }
 
+    public Set<String> getLenient() {
+        return lenient;
+    }
+
     /**
      * A human readable summary of the validation errors.
      *
@@ -529,7 +264,4 @@ public class EndpointValidationResult implements Serializable {
         return sb.toString();
     }
 
-    private static boolean isEmpty(String value) {
-        return value == null || value.isEmpty() || value.trim().isEmpty();
-    }
 }
diff --git a/core/camel-api/src/main/java/org/apache/camel/runtimecatalog/PropertiesValidationResult.java b/core/camel-api/src/main/java/org/apache/camel/runtimecatalog/PropertiesValidationResult.java
new file mode 100644
index 0000000..faef159
--- /dev/null
+++ b/core/camel-api/src/main/java/org/apache/camel/runtimecatalog/PropertiesValidationResult.java
@@ -0,0 +1,304 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.runtimecatalog;
+
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+abstract class PropertiesValidationResult implements Serializable {
+
+    int errors;
+    int warnings;
+
+    // general error
+    String syntaxError;
+    // general warnings
+    String unknownComponent;
+    String incapable;
+
+    // options
+    Set<String> unknown;
+    Map<String, String[]> unknownSuggestions;
+    Set<String> required;
+    Set<String> deprecated;
+    Map<String, String> invalidEnum;
+    Map<String, String[]> invalidEnumChoices;
+    Map<String, String[]> invalidEnumSuggestions;
+    Map<String, String> invalidMap;
+    Map<String, String> invalidArray;
+    Map<String, String> invalidReference;
+    Map<String, String> invalidBoolean;
+    Map<String, String> invalidInteger;
+    Map<String, String> invalidNumber;
+    Map<String, String> defaultValues;
+
+    public boolean hasErrors() {
+        return errors > 0;
+    }
+
+    public int getNumberOfErrors() {
+        return errors;
+    }
+
+    public boolean hasWarnings() {
+        return warnings > 0;
+    }
+
+    public int getNumberOfWarnings() {
+        return warnings;
+    }
+
+    public boolean isSuccess() {
+        boolean ok = syntaxError == null && unknown == null && required == null;
+        if (ok) {
+            ok = invalidEnum == null && invalidEnumChoices == null && invalidReference == null
+                    && invalidBoolean == null && invalidInteger == null && invalidNumber == null;
+        }
+        if (ok) {
+            ok = invalidMap == null && invalidArray == null;
+        }
+        return ok;
+    }
+
+    public void addSyntaxError(String syntaxError) {
+        this.syntaxError = syntaxError;
+        errors++;
+    }
+
+    public void addIncapable(String uri) {
+        this.incapable = uri;
+        warnings++;
+    }
+
+    public void addUnknownComponent(String name) {
+        this.unknownComponent = name;
+        warnings++;
+    }
+
+    public void addUnknown(String name) {
+        if (unknown == null) {
+            unknown = new LinkedHashSet<>();
+        }
+        if (!unknown.contains(name)) {
+            unknown.add(name);
+            errors++;
+        }
+    }
+
+    public void addUnknownSuggestions(String name, String[] suggestions) {
+        if (unknownSuggestions == null) {
+            unknownSuggestions = new LinkedHashMap<>();
+        }
+        unknownSuggestions.put(name, suggestions);
+    }
+
+    public void addRequired(String name) {
+        if (required == null) {
+            required = new LinkedHashSet<>();
+        }
+        if (!required.contains(name)) {
+            required.add(name);
+            errors++;
+        }
+    }
+
+    public void addDeprecated(String name) {
+        if (deprecated == null) {
+            deprecated = new LinkedHashSet<>();
+        }
+        if (!deprecated.contains(name)) {
+            deprecated.add(name);
+        }
+    }
+
+    public void addInvalidEnum(String name, String value) {
+        if (invalidEnum == null) {
+            invalidEnum = new LinkedHashMap<>();
+        }
+        if (!invalidEnum.containsKey(name)) {
+            invalidEnum.put(name, value);
+            errors++;
+        }
+    }
+
+    public void addInvalidEnumChoices(String name, String[] choices) {
+        if (invalidEnumChoices == null) {
+            invalidEnumChoices = new LinkedHashMap<>();
+        }
+        invalidEnumChoices.put(name, choices);
+    }
+
+    public void addInvalidEnumSuggestions(String name, String[] suggestions) {
+        if (invalidEnumSuggestions == null) {
+            invalidEnumSuggestions = new LinkedHashMap<>();
+        }
+        invalidEnumSuggestions.put(name, suggestions);
+    }
+
+    public void addInvalidReference(String name, String value) {
+        if (invalidReference == null) {
+            invalidReference = new LinkedHashMap<>();
+        }
+        if (!invalidReference.containsKey(name)) {
+            invalidReference.put(name, value);
+            errors++;
+        }
+    }
+
+    public void addInvalidMap(String name, String value) {
+        if (invalidMap == null) {
+            invalidMap = new LinkedHashMap<>();
+        }
+        if (!invalidMap.containsKey(name)) {
+            invalidMap.put(name, value);
+            errors++;
+        }
+    }
+
+    public void addInvalidArray(String name, String value) {
+        if (invalidArray == null) {
+            invalidArray = new LinkedHashMap<>();
+        }
+        if (!invalidArray.containsKey(name)) {
+            invalidArray.put(name, value);
+            errors++;
+        }
+    }
+
+    public void addInvalidBoolean(String name, String value) {
+        if (invalidBoolean == null) {
+            invalidBoolean = new LinkedHashMap<>();
+        }
+        if (!invalidBoolean.containsKey(name)) {
+            invalidBoolean.put(name, value);
+            errors++;
+        }
+    }
+
+    public void addInvalidInteger(String name, String value) {
+        if (invalidInteger == null) {
+            invalidInteger = new LinkedHashMap<>();
+        }
+        if (!invalidInteger.containsKey(name)) {
+            invalidInteger.put(name, value);
+            errors++;
+        }
+    }
+
+    public void addInvalidNumber(String name, String value) {
+        if (invalidNumber == null) {
+            invalidNumber = new LinkedHashMap<>();
+        }
+        if (!invalidNumber.containsKey(name)) {
+            invalidNumber.put(name, value);
+            errors++;
+        }
+    }
+
+    public void addDefaultValue(String name, String value)  {
+        if (defaultValues == null) {
+            defaultValues = new LinkedHashMap<>();
+        }
+        defaultValues.put(name, value);
+    }
+
+    public String getSyntaxError() {
+        return syntaxError;
+    }
+
+    public String getIncapable() {
+        return incapable;
+    }
+
+    public Set<String> getUnknown() {
+        return unknown;
+    }
+
+    public Map<String, String[]> getUnknownSuggestions() {
+        return unknownSuggestions;
+    }
+
+    public String getUnknownComponent() {
+        return unknownComponent;
+    }
+
+    public Set<String> getRequired() {
+        return required;
+    }
+
+    public Set<String> getDeprecated() {
+        return deprecated;
+    }
+
+    public Map<String, String> getInvalidEnum() {
+        return invalidEnum;
+    }
+
+    public Map<String, String[]> getInvalidEnumChoices() {
+        return invalidEnumChoices;
+    }
+
+    public List<String> getEnumChoices(String optionName) {
+        if (invalidEnumChoices != null) {
+            String[] enums = invalidEnumChoices.get(optionName);
+            if (enums != null) {
+                return Arrays.asList(enums);
+            }
+        }
+
+        return Collections.emptyList();
+    }
+
+    public Map<String, String> getInvalidReference() {
+        return invalidReference;
+    }
+
+    public Map<String, String> getInvalidMap() {
+        return invalidMap;
+    }
+
+    public Map<String, String> getInvalidArray() {
+        return invalidArray;
+    }
+
+    public Map<String, String> getInvalidBoolean() {
+        return invalidBoolean;
+    }
+
+    public Map<String, String> getInvalidInteger() {
+        return invalidInteger;
+    }
+
+    public Map<String, String> getInvalidNumber() {
+        return invalidNumber;
+    }
+
+    public Map<String, String> getDefaultValues() {
+        return defaultValues;
+    }
+
+    static boolean isEmpty(String value) {
+        return value == null || value.isEmpty() || value.trim().isEmpty();
+    }
+
+}


[camel] 02/02: Regen

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 f172a2998961aca93b8d6b903813263db8f49c5f
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Dec 21 10:34:35 2019 +0100

    Regen
---
 docs/components/modules/ROOT/pages/index.adoc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/components/modules/ROOT/pages/index.adoc b/docs/components/modules/ROOT/pages/index.adoc
index 57e606f..8bb6b70 100644
--- a/docs/components/modules/ROOT/pages/index.adoc
+++ b/docs/components/modules/ROOT/pages/index.adoc
@@ -6,7 +6,7 @@ The following Apache Camel artifacts are provided:
 == Components
 
 // components: START
-Number of Components: 307 in 245 JAR artifacts (1 deprecated)
+Number of Components: 307 in 245 JAR artifacts (0 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===
@@ -84,7 +84,7 @@ Number of Components: 307 in 245 JAR artifacts (1 deprecated)
 
 | xref:aws-sdb-component.adoc[AWS SimpleDB] (camel-aws-sdb) | 2.9 | The aws-sdb component is for storing and retrieving data from/to Amazon's SDB service.
 
-| xref:aws-translate-component.adoc[AWS Translate] (camel-aws-translate) | 3.0 | The aws-translate component is used for managing Amazon Translate
+| xref:aws-translate-component.adoc[AWS Translate] (camel-aws-translate) | 3.0 | The aws-kms is used for managing Amazon Translate
 
 | xref:azure-blob-component.adoc[Azure Storage Blob Service] (camel-azure) | 2.19 | The azure-blob component is used for storing and retrieving blobs from Azure Storage Blob Service.
 
@@ -108,7 +108,7 @@ Number of Components: 307 in 245 JAR artifacts (1 deprecated)
 
 | xref:caffeine-loadcache-component.adoc[Caffeine LoadCache] (camel-caffeine) | 2.20 | The caffeine-loadcache component is used for integration with Caffeine Load Cache.
 
-| xref:cql-component.adoc[Cassandra CQL] (camel-cassandraql) | 2.15 | The cql component aims at integrating Cassandra 2.0 using the CQL3 API (not the Thrift API). It's based on Cassandra Java Driver provided by DataStax.
+| xref:cql-component.adoc[Cassandra CQL] (camel-cassandraql) | 2.15 | The cql component aims at integrating Cassandra 2.0 using the CQL3 API (not the Thrift API).
 
 | xref:chatscript-component.adoc[ChatScript] (camel-chatscript) | 3.0 | Represents a ChatScript endpoint.
 
@@ -128,7 +128,7 @@ Number of Components: 307 in 245 JAR artifacts (1 deprecated)
 
 | xref:controlbus-component.adoc[Control Bus] (camel-controlbus) | 2.11 | The controlbus component provides easy management of Camel applications based on the Control Bus EIP pattern.
 
-| xref:corda-component.adoc[Corda] (camel-corda) | 2.23 | The corda component uses corda-rpc to interact with corda nodes.
+| xref:corda-component.adoc[Corda] (camel-corda) | 2.23 | The corda component uses the corda-rpc to interact with corda nodes.
 
 | xref:couchbase-component.adoc[Couchbase] (camel-couchbase) | 2.19 | Represents a Couchbase endpoint that can query Views with a Poll strategy and/or produce various type of operations.
 
@@ -136,7 +136,7 @@ Number of Components: 307 in 245 JAR artifacts (1 deprecated)
 
 | xref:crypto-component.adoc[Crypto (JCE)] (camel-crypto) | 2.3 | The crypto component is used for signing and verifying exchanges using the Signature Service of the Java Cryptographic Extension (JCE).
 
-| xref:crypto-cms-component.adoc[Crypto CMS] (camel-crypto-cms) | 2.20 | *deprecated* The crypto cms component is used for encrypting data in CMS Enveloped Data format, decrypting CMS Enveloped Data, signing data in CMS Signed Data format, and verifying CMS Signed Data.
+| xref:crypto-cms-component.adoc[Crypto CMS] (camel-crypto-cms) | 2.20 | The crypto cms component is used for encrypting data in CMS Enveloped Data format, decrypting CMS Enveloped Data, signing data in CMS Signed Data format, and verifying CMS Signed Data.
 
 | xref:cxf-component.adoc[CXF] (camel-cxf) | 1.0 | The cxf component is used for SOAP WebServices using Apache CXF.
 
@@ -262,7 +262,7 @@ Number of Components: 307 in 245 JAR artifacts (1 deprecated)
 
 | xref:hazelcast-seda-component.adoc[Hazelcast SEDA] (camel-hazelcast) | 2.7 | The hazelcast-seda component is used to access Hazelcast BlockingQueue.
 
-| xref:hazelcast-set-component.adoc[Hazelcast Set] (camel-hazelcast) | 2.7 | The hazelcast-set component is used to access Hazelcast distributed set.
+| xref:hazelcast-set-component.adoc[Hazelcast Set] (camel-hazelcast) | 2.7 | The camel Endpoint to access Hazelcast distributed set.
 
 | xref:hazelcast-topic-component.adoc[Hazelcast Topic] (camel-hazelcast) | 2.15 | The hazelcast-topic component is used to access Hazelcast distributed topic.
 
@@ -370,7 +370,7 @@ Number of Components: 307 in 245 JAR artifacts (1 deprecated)
 
 | xref:kubernetes-service-accounts-component.adoc[Kubernetes Service Account] (camel-kubernetes) | 2.17 | The Kubernetes Service Accounts component provides a producer to execute service account operations.
 
-| xref:kubernetes-services-component.adoc[Kubernetes Services] (camel-kubernetes) | 2.17 | The Kubernetes Services component provides a producer to execute service operations and a consumer to consume service events.
+| xref:kubernetes-services-component.adoc[Kubernetes Services] (camel-kubernetes) | 2.17 | The Kubernetes Service Accounts component provides a producer to execute service operations and a consumer to consume service events.
 
 | xref:kudu-component.adoc[Kudu] (camel-kudu) | 3.0 | Represents a Kudu endpoint. A kudu endpoint allows you to interact with Apache Kudu, a free and open source column-oriented data store of the Apache Hadoop ecosystem.