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 2022/06/19 11:25:50 UTC
[camel] branch main updated: CAMEL-18190: camel-jbang - Downloading dependencies - Did you mean
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
The following commit(s) were added to refs/heads/main by this push:
new 950c0451ad2 CAMEL-18190: camel-jbang - Downloading dependencies - Did you mean
950c0451ad2 is described below
commit 950c0451ad2b17e2860f5acf9faa0cc38c1847b8
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Jun 19 13:25:28 2022 +0200
CAMEL-18190: camel-jbang - Downloading dependencies - Did you mean
---
dsl/camel-kamelet-main/pom.xml | 4 ++
.../DependencyDownloaderComponentResolver.java | 12 ++++-
.../DependencyDownloaderDataFormatResolver.java | 13 ++++-
.../DependencyDownloaderLanguageResolver.java | 14 ++++-
.../download/DependencyDownloaderRoutesLoader.java | 17 ++----
.../camel/main/util/SuggestSimilarHelper.java | 63 ++++++++++++++++++++++
.../camel/main/MavenDependencyResolverTest.java | 2 +
7 files changed, 108 insertions(+), 17 deletions(-)
diff --git a/dsl/camel-kamelet-main/pom.xml b/dsl/camel-kamelet-main/pom.xml
index e70888267b5..d12fb5c1696 100644
--- a/dsl/camel-kamelet-main/pom.xml
+++ b/dsl/camel-kamelet-main/pom.xml
@@ -101,6 +101,10 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-catalog</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-catalog-lucene</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-catalog-console</artifactId>
diff --git a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderComponentResolver.java b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderComponentResolver.java
index b28b1791d61..dce226fb808 100644
--- a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderComponentResolver.java
+++ b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderComponentResolver.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.main.download;
+import java.util.List;
+
import org.apache.camel.CamelContext;
import org.apache.camel.Component;
import org.apache.camel.catalog.CamelCatalog;
@@ -23,6 +25,7 @@ import org.apache.camel.catalog.DefaultCamelCatalog;
import org.apache.camel.component.platform.http.PlatformHttpComponent;
import org.apache.camel.impl.engine.DefaultComponentResolver;
import org.apache.camel.main.http.VertxHttpServer;
+import org.apache.camel.main.util.SuggestSimilarHelper;
import org.apache.camel.tooling.model.ComponentModel;
/**
@@ -59,13 +62,18 @@ public final class DependencyDownloaderComponentResolver extends DefaultComponen
} else {
answer = super.resolveComponent("stub", context);
}
-
if (answer instanceof PlatformHttpComponent) {
// setup a default http server on port 8080 if not already done
VertxHttpServer.setPlatformHttpComponent((PlatformHttpComponent) answer);
VertxHttpServer.registerServer(camelContext, stub);
}
-
+ if (answer == null) {
+ List<String> suggestion = SuggestSimilarHelper.didYouMean(catalog.findComponentNames(), name);
+ if (suggestion != null && !suggestion.isEmpty()) {
+ String s = String.join(", ", suggestion);
+ throw new IllegalArgumentException("Cannot find component with name: " + name + ". Did you mean: " + s);
+ }
+ }
return answer;
}
diff --git a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderDataFormatResolver.java b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderDataFormatResolver.java
index 0a84d34fb85..867fa5b834d 100644
--- a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderDataFormatResolver.java
+++ b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderDataFormatResolver.java
@@ -16,10 +16,13 @@
*/
package org.apache.camel.main.download;
+import java.util.List;
+
import org.apache.camel.CamelContext;
import org.apache.camel.catalog.CamelCatalog;
import org.apache.camel.catalog.DefaultCamelCatalog;
import org.apache.camel.impl.engine.DefaultDataFormatResolver;
+import org.apache.camel.main.util.SuggestSimilarHelper;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.tooling.model.DataFormatModel;
@@ -45,7 +48,15 @@ public final class DependencyDownloaderDataFormatResolver extends DefaultDataFor
downloader.downloadDependency(model.getGroupId(), model.getArtifactId(),
model.getVersion());
}
- return super.createDataFormat(name, context);
+ DataFormat answer = super.createDataFormat(name, context);
+ if (answer == null) {
+ List<String> suggestion = SuggestSimilarHelper.didYouMean(catalog.findDataFormatNames(), name);
+ if (suggestion != null && !suggestion.isEmpty()) {
+ String s = String.join(", ", suggestion);
+ throw new IllegalArgumentException("Cannot find dataformat with name: " + name + ". Did you mean: " + s);
+ }
+ }
+ return answer;
}
}
diff --git a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderLanguageResolver.java b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderLanguageResolver.java
index ba39831912f..7892158abb2 100644
--- a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderLanguageResolver.java
+++ b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderLanguageResolver.java
@@ -16,10 +16,13 @@
*/
package org.apache.camel.main.download;
+import java.util.List;
+
import org.apache.camel.CamelContext;
import org.apache.camel.catalog.CamelCatalog;
import org.apache.camel.catalog.DefaultCamelCatalog;
import org.apache.camel.impl.engine.DefaultLanguageResolver;
+import org.apache.camel.main.util.SuggestSimilarHelper;
import org.apache.camel.spi.Language;
import org.apache.camel.tooling.model.LanguageModel;
@@ -45,8 +48,15 @@ public final class DependencyDownloaderLanguageResolver extends DefaultLanguageR
downloader.downloadDependency(model.getGroupId(), model.getArtifactId(),
model.getVersion());
}
-
- return super.resolveLanguage(name, context);
+ Language answer = super.resolveLanguage(name, context);
+ if (answer == null) {
+ List<String> suggestion = SuggestSimilarHelper.didYouMean(catalog.findDataFormatNames(), name);
+ if (suggestion != null && !suggestion.isEmpty()) {
+ String s = String.join(", ", suggestion);
+ throw new IllegalArgumentException("Cannot find language with name: " + name + ". Did you mean: " + s);
+ }
+ }
+ return answer;
}
}
diff --git a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderRoutesLoader.java b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderRoutesLoader.java
index 062688df12c..766682759c3 100644
--- a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderRoutesLoader.java
+++ b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderRoutesLoader.java
@@ -62,24 +62,17 @@ public class DependencyDownloaderRoutesLoader extends MainRoutesLoader {
RoutesBuilderLoader loader = super.resolveService(extension);
if (loader == null) {
-
// need to use regular factory finder as bootstrap has already marked the loader as a miss
final ExtendedCamelContext ecc = getCamelContext().adapt(ExtendedCamelContext.class);
final FactoryFinder finder = ecc.getFactoryFinder(RoutesBuilderLoader.FACTORY_PATH);
-
- RoutesBuilderLoader answer
- = ResolverHelper.resolveService(ecc, finder, extension, RoutesBuilderLoader.class).orElse(null);
-
- if (answer != null) {
- CamelContextAware.trySetCamelContext(answer, getCamelContext());
+ loader = ResolverHelper.resolveService(ecc, finder, extension, RoutesBuilderLoader.class).orElse(null);
+ if (loader != null) {
+ CamelContextAware.trySetCamelContext(loader, getCamelContext());
// allows for custom initialization
- initRoutesBuilderLoader(answer);
- ServiceHelper.startService(answer);
+ initRoutesBuilderLoader(loader);
+ ServiceHelper.startService(loader);
}
-
- return answer;
}
-
return loader;
}
diff --git a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/util/SuggestSimilarHelper.java b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/util/SuggestSimilarHelper.java
new file mode 100644
index 00000000000..4734bfd5073
--- /dev/null
+++ b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/util/SuggestSimilarHelper.java
@@ -0,0 +1,63 @@
+/*
+ * 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.main.util;
+
+import java.io.StringReader;
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.lucene.analysis.core.KeywordAnalyzer;
+import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.search.spell.PlainTextDictionary;
+import org.apache.lucene.search.spell.SpellChecker;
+import org.apache.lucene.store.ByteBuffersDirectory;
+
+public final class SuggestSimilarHelper {
+
+ private static final int MAX_SUGGESTIONS = 5;
+
+ private SuggestSimilarHelper() {
+ }
+
+ public static List<String> didYouMean(List<String> names, String unknown) {
+ // each option must be on a separate line in a String
+ StringBuilder sb = new StringBuilder();
+ for (String name : names) {
+ sb.append(name);
+ sb.append("\n");
+ }
+ StringReader reader = new StringReader(sb.toString());
+
+ try {
+ PlainTextDictionary words = new PlainTextDictionary(reader);
+
+ // use in-memory lucene spell checker to make the suggestions
+ try (ByteBuffersDirectory dir = new ByteBuffersDirectory()) {
+ SpellChecker checker = new SpellChecker(dir);
+ checker.indexDictionary(words, new IndexWriterConfig(new KeywordAnalyzer()), false);
+
+ String[] suggestions = checker.suggestSimilar(unknown, MAX_SUGGESTIONS);
+ return Arrays.asList(suggestions);
+ }
+ } catch (Exception e) {
+ // ignore
+ }
+
+ return null;
+ }
+
+}
diff --git a/dsl/camel-kamelet-main/src/test/java/org/apache/camel/main/MavenDependencyResolverTest.java b/dsl/camel-kamelet-main/src/test/java/org/apache/camel/main/MavenDependencyResolverTest.java
index 865eea6eb0e..8e95e138172 100644
--- a/dsl/camel-kamelet-main/src/test/java/org/apache/camel/main/MavenDependencyResolverTest.java
+++ b/dsl/camel-kamelet-main/src/test/java/org/apache/camel/main/MavenDependencyResolverTest.java
@@ -21,8 +21,10 @@ import java.util.List;
import org.apache.camel.main.download.MavenArtifact;
import org.apache.camel.main.download.MavenDependencyResolver;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+@Disabled("Manual test")
public class MavenDependencyResolverTest {
@Test