Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FUSETOOLS2-2539 - Remove support for Groovy, JavaScript and Kotlin DSLs #1240

Merged
merged 1 commit into from
Feb 24, 2025
Merged

FUSETOOLS2-2539 - Remove support for Groovy, JavaScript and Kotlin DSLs #1240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 0 additions & 26 deletions src/main/java/com/github/cameltooling/lsp/internal/parser/CamelKGroovyDSLParser.java
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions src/main/java/com/github/cameltooling/lsp/internal/parser/CamelKJSDSLParser.java
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions src/main/java/com/github/cameltooling/lsp/internal/parser/CamelKKotlinDSLParser.java
View file
Open in desktop

This file was deleted.

43 changes: 1 addition & 42 deletions src/main/java/com/github/cameltooling/lsp/internal/parser/ParserFileHelperFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,10 @@ public class ParserFileHelperFactory {

private static final String KUBERNETES_CRD_API_VERSION_CAMEL = "apiVersion: camel.apache.org/";
private static final String CAMELK_XML_FILENAME_SUFFIX = "camelk.xml";
private static final String CAMELK_GROOVY_FILENAME_SUFFIX = ".camelk.groovy";
private static final String CAMELK_KOTLIN_FILENAME_SUFFIX = ".camelk.kts";
private static final String CAMELK_YAML_FILENAME_SUFFIX = ".camelk.yaml";
private static final String PLAIN_CAMEL_YAML_FILENAME_SUFFIX = ".camel.yaml";
private static final String CAMELK_YML_FILENAME_SUFFIX = ".camelk.yml";
private static final String PLAIN_CAMEL_YML_FILENAME_SUFFIX = ".camel.yml";
private static final String CAMELK_JS_FILENAME_SUFFIX = ".camelk.js";
private static final String SHEBANG_CAMEL_K = "#!/usr/bin/env camel-k";

public ParserFileHelper getCorrespondingParserFileHelper(TextDocumentItem textDocumentItem, int line) {
Expand All @@ -48,10 +45,7 @@ public boolean isProbablyCamelFile(TextDocumentItem textDocumentItem) {
String uri = textDocumentItem.getUri();
return isHighProbabilityCamelJavaDSL(textDocumentItem, uri)
|| isCamelXMLDSL(textDocumentItem, uri)
|| isCamelKJSDSL(textDocumentItem, uri)
|| isCamelYamlDSL(textDocumentItem, uri)
|| isCamelKKotlinDSL(textDocumentItem, uri)
|| isCamelKGroovyDSL(textDocumentItem, uri);
|| isCamelYamlDSL(textDocumentItem, uri);
}

private boolean isCamelXMLDSL(TextDocumentItem textDocumentItem, String uri) {
Expand All @@ -63,41 +57,6 @@ private boolean isCamelXMLDSL(TextDocumentItem textDocumentItem, String uri) {
}
}

public boolean isCamelKJSDSL(TextDocumentItem textDocumentItem, String uri) {
//improve this method to provide better heuristic to detect if it is a Camel file or not
return uri.endsWith(CAMELK_JS_FILENAME_SUFFIX)
|| isJSFileWithCamelKModelineLike(textDocumentItem, uri);
}

private boolean isJSFileWithCamelKModelineLike(TextDocumentItem textDocumentItem, String uri) {
return uri.endsWith(".js") && textDocumentItem.getText().startsWith(CamelKModelineParser.MODELINE_LIKE_CAMEL_K);
}

public boolean isCamelKKotlinDSL(TextDocumentItem textDocumentItem, String uri) {
//improve this method to provide better heuristic to detect if it is a Camel file or not
return uri.endsWith(CAMELK_KOTLIN_FILENAME_SUFFIX)
|| isKotlinFileWithCamelKModelineLike(textDocumentItem, uri);
}

private boolean isKotlinFileWithCamelKModelineLike(TextDocumentItem textDocumentItem, String uri) {
return uri.endsWith(".kts") && textDocumentItem.getText().startsWith(CamelKModelineParser.MODELINE_LIKE_CAMEL_K);
}

public boolean isCamelKGroovyDSL(TextDocumentItem textDocumentItem, String uri) {
//improve this method to provide better heuristic to detect if it is a Camel file or not
return uri.endsWith(CAMELK_GROOVY_FILENAME_SUFFIX)
|| isGroovyFileWithCamelKShebang(textDocumentItem, uri)
|| isGroovyFileWithCamelKModelineLike(textDocumentItem, uri);
}

private boolean isGroovyFileWithCamelKModelineLike(TextDocumentItem textDocumentItem, String uri) {
return uri.endsWith(".groovy") && textDocumentItem.getText().startsWith(CamelKModelineParser.MODELINE_LIKE_CAMEL_K);
}

protected boolean isGroovyFileWithCamelKShebang(TextDocumentItem textDocumentItem, String uri) {
return uri.endsWith(".groovy") && textDocumentItem.getText().startsWith(SHEBANG_CAMEL_K);
}

public boolean isCamelYamlDSL(TextDocumentItem textDocumentItem, String uri) {
//improve this method to provide better heuristic to detect if it is a Camel file or not
return uri.endsWith(CAMELK_YAML_FILENAME_SUFFIX)
Expand Down
46 changes: 0 additions & 46 deletions ...m/github/cameltooling/lsp/internal/parser/fileparserhelper/CamelKGroovyDSLFileParser.java
View file
Open in desktop

This file was deleted.

46 changes: 0 additions & 46 deletions ...a/com/github/cameltooling/lsp/internal/parser/fileparserhelper/CamelKJSDSLFileParser.java
View file
Open in desktop

This file was deleted.

47 changes: 0 additions & 47 deletions ...m/github/cameltooling/lsp/internal/parser/fileparserhelper/CamelKKotlinDSLFileParser.java
View file
Open in desktop

This file was deleted.

7 changes: 1 addition & 6 deletions .../com/github/cameltooling/lsp/internal/parser/fileparserhelper/CamelYamlDSLFileParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,7 @@

public class CamelYamlDSLFileParser extends Parser {

private final Parser nextFileParser;

CamelYamlDSLFileParser(Parser parser) {
this.nextFileParser = parser;
CamelYamlDSLFileParser() {
}

@Override
Expand All @@ -37,8 +34,6 @@ public ParserFileHelper getMatchedFileParser(TextDocumentItem textDocumentItem,
if (camelKYamlDSLParser.getCorrespondingType(textDocumentItem, line) != null) {
return camelKYamlDSLParser;
}
} else if (nextFileParser != null) {
return nextFileParser.getMatchedFileParser(textDocumentItem, line, parserFileHelperFactory);
}

return null;
Expand Down
7 changes: 1 addition & 6 deletions ...github/cameltooling/lsp/internal/parser/fileparserhelper/ParserChainOfResponsibility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,7 @@
public class ParserChainOfResponsibility {
public static ParserFileHelper getMatchedParserFileHelper(TextDocumentItem textDocumentItem, int line,
ParserFileHelperFactory parserFileHelperFactory) {
Parser fileParser = new XMLFileParser(
new JavaFileParser(
new CamelKGroovyDSLFileParser(
new CamelYamlDSLFileParser(
new CamelKKotlinDSLFileParser(
new CamelKJSDSLFileParser(null))))));
Parser fileParser = new XMLFileParser(new JavaFileParser(new CamelYamlDSLFileParser()));
return fileParser.getMatchedFileParser(textDocumentItem, line, parserFileHelperFactory);
}

Expand Down
7 changes: 4 additions & 3 deletions src/test/java/com/github/cameltooling/lsp/internal/CamelCatalogRuntimeProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,13 @@ void testQuarkusValueSpecifiedReturnsQuarkusRuntimeProvider() throws Exception {
private void testRuntimeProviderWithProvidedValue(String settingValue, Class<? extends RuntimeProvider> expectedRuntimeProviderType)
throws URISyntaxException, InterruptedException, ExecutionException {
runtimeProvider = settingValue;
CamelLanguageServer camelLanguageServer = initializeLanguageServer("// camel-k: dependency=\nfrom('');", ".groovy");
CamelLanguageServer camelLanguageServer = initializeLanguageServer(
"# camel-k: dependency=\n- from:\n uri: \"\"", ".yaml");
RuntimeProvider usedRuntimeProvider = camelLanguageServer.getTextDocumentService().getCamelCatalog().get().getRuntimeProvider();
assertThat(usedRuntimeProvider).isExactlyInstanceOf(expectedRuntimeProviderType);
CompletableFuture<Either<List<CompletionItem>, CompletionList>> camelUriCompletion = getCompletionFor(camelLanguageServer, new Position(1, "from('".length()));
CompletableFuture<Either<List<CompletionItem>, CompletionList>> camelUriCompletion = getCompletionFor(camelLanguageServer, new Position(2," uri: \"".length()));
assertThat(camelUriCompletion.get().getLeft()).isNotEmpty();
CompletableFuture<Either<List<CompletionItem>, CompletionList>> dependencyCompletion = getCompletionFor(camelLanguageServer, new Position(0, "// camel-k: dependency=".length()));
CompletableFuture<Either<List<CompletionItem>, CompletionList>> dependencyCompletion = getCompletionFor(camelLanguageServer, new Position(0, "# camel-k: dependency=".length()));
assertThat(dependencyCompletion.get().getLeft()).isNotEmpty();
}

Expand Down
Loading