This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch namespace-3.20.x in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit 69f956a0c385367ef18648335c9727b6d0baf3c7 Author: Andrea Cosentino <[email protected]> AuthorDate: Wed Feb 15 15:30:16 2023 +0100 Add a "namespace" label to help group kamelets - Catalog method Signed-off-by: Andrea Cosentino <[email protected]> --- kamelets/avro-deserialize-action.kamelet.yaml | 1 + kamelets/avro-serialize-action.kamelet.yaml | 1 + kamelets/exec-sink.kamelet.yaml | 1 + .../main/java/org/apache/camel/kamelets/catalog/KameletsCatalog.java | 2 +- .../java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java | 2 -- .../camel-kamelets/src/main/resources/kamelets/exec-sink.kamelet.yaml | 1 + 6 files changed, 5 insertions(+), 3 deletions(-) diff --git a/kamelets/avro-deserialize-action.kamelet.yaml b/kamelets/avro-deserialize-action.kamelet.yaml index 75adf5c9..6d8cb02d 100644 --- a/kamelets/avro-deserialize-action.kamelet.yaml +++ b/kamelets/avro-deserialize-action.kamelet.yaml @@ -25,6 +25,7 @@ metadata: camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgeG1sbnM6c29kaXBvZGk9Imh0dHA6Ly9zb2RpcG [...] camel.apache.org/provider: "Apache Software Foundation" camel.apache.org/kamelet.group: "Actions" + camel.apache.org/kamelet.group: "Transformation" labels: camel.apache.org/kamelet.type: "action" spec: diff --git a/kamelets/avro-serialize-action.kamelet.yaml b/kamelets/avro-serialize-action.kamelet.yaml index 375d7220..94ef5ed7 100644 --- a/kamelets/avro-serialize-action.kamelet.yaml +++ b/kamelets/avro-serialize-action.kamelet.yaml @@ -25,6 +25,7 @@ metadata: camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgeG1sbnM6c29kaXBvZGk9Imh0dHA6Ly9zb2RpcG [...] camel.apache.org/provider: "Apache Software Foundation" camel.apache.org/kamelet.group: "Actions" + camel.apache.org/kamelet.group: "Transformation" labels: camel.apache.org/kamelet.type: "action" spec: diff --git a/kamelets/exec-sink.kamelet.yaml b/kamelets/exec-sink.kamelet.yaml index f86f8ccf..438d5ddd 100644 --- a/kamelets/exec-sink.kamelet.yaml +++ b/kamelets/exec-sink.kamelet.yaml @@ -24,6 +24,7 @@ metadata: camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/Pgo8IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDIwMDEwOTA0Ly9FTiIKICJodHRwOi8vd3d3LnczLm9yZy9UUi8yMDAxL1JFQy1TVkctMjAwMTA5MDQvRFREL3N2ZzEwLmR0ZCI+CjxzdmcgdmVyc2lvbj0iMS4wIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiB3aWR0aD0iMTI4MC4wMDAwMDBwdCIgaGVpZ2h0PSIxMDEyLjAwMDAwMHB0IiB2aWV3Qm94PSIwIDAgMTI4MC4wMDAwMDAgMTAxMi4wMDAwMDAiCiBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCBtZW [...] camel.apache.org/provider: "Apache Software Foundation" camel.apache.org/kamelet.group: "Exec" + camel.apache.org/kamelet.namespace: "System" labels: camel.apache.org/kamelet.type: sink spec: 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 20c2d1c7..014c20a6 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 @@ -121,7 +121,7 @@ public class KameletsCatalog { public List<Kamelet> getKameletsByNamespace(String namespace) { List<Kamelet> collect = kameletModels.entrySet().stream() - .filter(x -> x.getValue().getMetadata().getLabels().get(KameletAnnotationsNames.KAMELET_ANNOTATION_NAMESPACE).contains(namespace)) + .filter(x -> x.getValue().getMetadata().getAnnotations().get(KameletAnnotationsNames.KAMELET_ANNOTATION_NAMESPACE).contains(namespace)) .map(Map.Entry::getValue) .collect(Collectors.toList()); return collect; 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 c9d68e9b..d673737f 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 @@ -22,7 +22,6 @@ import io.github.classgraph.ClassGraph; import org.apache.camel.kamelets.catalog.model.KameletTypeEnum; import org.apache.camel.tooling.model.ComponentModel; import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -102,7 +101,6 @@ public class KameletsCatalogTest { } @Test - @Disabled void testGetKameletsByNamespace() throws Exception { List<Kamelet> c = catalog.getKameletsByNamespace("AWS"); assertTrue(!c.isEmpty()); diff --git a/library/camel-kamelets/src/main/resources/kamelets/exec-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/exec-sink.kamelet.yaml index f86f8ccf..438d5ddd 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/exec-sink.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/exec-sink.kamelet.yaml @@ -24,6 +24,7 @@ metadata: camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/Pgo8IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDIwMDEwOTA0Ly9FTiIKICJodHRwOi8vd3d3LnczLm9yZy9UUi8yMDAxL1JFQy1TVkctMjAwMTA5MDQvRFREL3N2ZzEwLmR0ZCI+CjxzdmcgdmVyc2lvbj0iMS4wIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiB3aWR0aD0iMTI4MC4wMDAwMDBwdCIgaGVpZ2h0PSIxMDEyLjAwMDAwMHB0IiB2aWV3Qm94PSIwIDAgMTI4MC4wMDAwMDAgMTAxMi4wMDAwMDAiCiBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCBtZW [...] camel.apache.org/provider: "Apache Software Foundation" camel.apache.org/kamelet.group: "Exec" + camel.apache.org/kamelet.namespace: "System" labels: camel.apache.org/kamelet.type: sink spec:
