You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2022/10/21 08:47:21 UTC
[camel-kamelets] branch kamelet-scheme-method created (now 844ba8d3)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch kamelet-scheme-method
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
at 844ba8d3 Added getKameletScheme tests
This branch includes the following new commits:
new df94839c Added a getKameletScheme method
new 487ad634 Added getKameletScheme tests
new 844ba8d3 Added getKameletScheme tests
The 3 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.
[camel-kamelets] 01/03: Added a getKameletScheme method
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch kamelet-scheme-method
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit df94839ce9b15fd1aafa6439a36058debdb7213f
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Oct 21 10:41:51 2022 +0200
Added a getKameletScheme method
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
.../camel/kamelets/catalog/KameletsCatalog.java | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/library/camel-kamelets-catalog/src/main/java/org/apache/camel/kamelets/catalog/KameletsCatalog.java b/library/camel-kamelets-catalog/src/main/java/org/apache/camel/kamelets/catalog/KameletsCatalog.java
index 0797c68a..31a688ec 100644
--- a/library/camel-kamelets-catalog/src/main/java/org/apache/camel/kamelets/catalog/KameletsCatalog.java
+++ b/library/camel-kamelets-catalog/src/main/java/org/apache/camel/kamelets/catalog/KameletsCatalog.java
@@ -18,7 +18,13 @@ package org.apache.camel.kamelets.catalog;
import java.io.IOException;
import java.io.InputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
import java.util.stream.Collectors;
import com.fasterxml.jackson.databind.DeserializationFeature;
@@ -193,10 +199,12 @@ public class KameletsCatalog {
String prefixName = local.getMetadata().getName().substring(0, lastIndex);
String schemeName = enumValue(prefixName);
if (schemeName != null) {
- List<ComponentModel.EndpointHeaderModel> headers = cc.componentModel(schemeName).getEndpointHeaders();
- for (ComponentModel.EndpointHeaderModel e : headers) {
- if (ObjectHelper.isEmpty(e.getLabel()) || e.getLabel().equalsIgnoreCase(camelType)) {
- resultingHeaders.add(e);
+ if (ObjectHelper.isNotEmpty(cc.componentModel(schemeName).getEndpointHeaders())) {
+ List<ComponentModel.EndpointHeaderModel> headers = cc.componentModel(schemeName).getEndpointHeaders();
+ for (ComponentModel.EndpointHeaderModel e : headers) {
+ if (ObjectHelper.isEmpty(e.getLabel()) || e.getLabel().equalsIgnoreCase(camelType)) {
+ resultingHeaders.add(e);
+ }
}
}
}
@@ -204,6 +212,10 @@ public class KameletsCatalog {
return resultingHeaders;
}
+ public String getKameletScheme(String prefix) {
+ return enumValue(prefix);
+ }
+
private String enumValue(String prefix) {
for (KameletPrefixSchemeEnum c : KameletPrefixSchemeEnum.values()) {
if (c.name.equals(prefix)) return c.scheme;
[camel-kamelets] 02/03: Added getKameletScheme tests
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch kamelet-scheme-method
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit 487ad63462f30a41adbc4ce66b3d189d4a9d1381
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Oct 21 10:44:35 2022 +0200
Added getKameletScheme tests
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
.../java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java b/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java
index 84ddf8ea..9279fb2b 100644
--- a/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java
+++ b/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java
@@ -373,4 +373,10 @@ public class KameletsCatalogTest {
List<ComponentModel.EndpointHeaderModel> headersWttrinSource= catalog.getKameletSupportedHeaders("wttrin-source");
assertEquals(5, headersWttrinSource.size());
}
+
+ @Test
+ void testGetKameletScheme() throws Exception {
+ assertEquals("aws2-s3", catalog.getKameletScheme("aws-s3"));
+ assertEquals("aws2-sqs", catalog.getKameletScheme("aws-sqs"));
+ }
}
[camel-kamelets] 03/03: Added getKameletScheme tests
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch kamelet-scheme-method
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit 844ba8d39db22265eafaab9eb9d2459d1cc263f6
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Oct 21 10:45:36 2022 +0200
Added getKameletScheme tests
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
.../test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java b/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java
index 9279fb2b..64f3ba9b 100644
--- a/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java
+++ b/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java
@@ -378,5 +378,6 @@ public class KameletsCatalogTest {
void testGetKameletScheme() throws Exception {
assertEquals("aws2-s3", catalog.getKameletScheme("aws-s3"));
assertEquals("aws2-sqs", catalog.getKameletScheme("aws-sqs"));
+ assertNull(catalog.getKameletScheme("not-known"));
}
}