This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 782bb3224d3f2a560e4361d4b3d42ae2e9315dd5 Author: Claus Ibsen <[email protected]> AuthorDate: Thu Jan 12 12:20:35 2023 +0100 CAMEL-18894: Remove camel-elasticsearch-rest in v4 --- .../resources/org/apache/camel/catalog/components.properties | 1 - .../src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java | 3 +++ .../src/test/java/org/apache/camel/catalog/CamelCatalogTest.java | 4 ---- .../generated/resources/org/apache/camel/main/components.properties | 1 - 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties index 8410de1d395..05efb9e5516 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties @@ -87,7 +87,6 @@ dropbox dynamic-router ehcache elasticsearch -elasticsearch-rest etcd3 exec facebook diff --git a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java index 8791b097985..5f6c2078446 100644 --- a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java +++ b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java @@ -496,6 +496,9 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa } private static boolean matchArtifact(ArtifactModel<?> am, String groupId, String artifactId, String version) { + if (am == null) { + return false; + } return groupId.equals(am.getGroupId()) && artifactId.equals(am.getArtifactId()) && (version == null || version.isBlank() || version.equals(am.getVersion())); } diff --git a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java index 8da1679a009..87eed623c3e 100644 --- a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java +++ b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java @@ -89,7 +89,6 @@ public class CamelCatalogTest { List<String> names = catalog.findOtherNames(); assertTrue(names.contains("leveldb")); - assertTrue(names.contains("swagger-java")); assertTrue(names.contains("test-spring")); assertFalse(names.contains("http-common")); @@ -153,9 +152,6 @@ public class CamelCatalogTest { schema = catalog.modelJSonSchema("aggregate"); assertNotNull(schema); - schema = catalog.otherJSonSchema("swagger-java"); - assertNotNull(schema); - // lets make it possible to find bean/method using both names schema = catalog.modelJSonSchema("method"); assertNotNull(schema); diff --git a/core/camel-main/src/generated/resources/org/apache/camel/main/components.properties b/core/camel-main/src/generated/resources/org/apache/camel/main/components.properties index 8410de1d395..05efb9e5516 100644 --- a/core/camel-main/src/generated/resources/org/apache/camel/main/components.properties +++ b/core/camel-main/src/generated/resources/org/apache/camel/main/components.properties @@ -87,7 +87,6 @@ dropbox dynamic-router ehcache elasticsearch -elasticsearch-rest etcd3 exec facebook
