You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2026/09/14 18:39:34 UTC

(groovy) branch GROOVY-12411 updated: GROOVY-12411: import types to satisfy the lint gate

This is an automated email from the ASF dual-hosted git repository.

asf-gitbox-commits pushed a commit to branch GROOVY-12411
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/GROOVY-12411 by this push:
     new ce5b6aec95 GROOVY-12411: import types to satisfy the lint gate
ce5b6aec95 is described below

commit ce5b6aec95f916fe0b0816eca2fc097174a129e8
Author: Daniel Sun <su...@apache.org>
AuthorDate: Tue Sep 15 03:38:53 2026 +0900

    GROOVY-12411: import types to satisfy the lint gate
    
    Replace unnecessary fully qualified names in groovy-lsp and the
    parser name-span tests. Suppress Checkstyle only where the simple
    name is taken: DiagnosticConverter (compiler vs lsp4j Diagnostic)
    and the local AstQuery wrapper.
---
 config/checkstyle/gate-suppressions.xml            |  5 ++++
 .../antlr4/AnnotatedNodeNamePositionTest.groovy    | 23 ++++++++++--------
 .../antlr4/PositionConfigureUtilsTest.groovy       | 12 ++++++----
 .../groovy/lsp/internal/LanguageServerContext.java |  3 ++-
 .../groovy/lsp/internal/compile/AstQuery.java      | 19 ++++++++++++---
 .../lsp/internal/compile/CompilerSettings.java     |  4 +++-
 .../internal/diagnostic/DiagnosticConverter.java   |  5 ++--
 .../lsp/internal/feature/CodeActionService.java    |  7 +++---
 .../lsp/internal/feature/CompletionService.java    |  5 ++--
 .../lsp/internal/feature/HierarchyService.java     | 15 ++++++------
 .../groovy/lsp/internal/feature/HoverService.java  |  3 ++-
 .../groovy/lsp/internal/feature/RenameService.java |  8 ++++---
 .../lsp/internal/feature/SupportServices.java      | 28 ++++++++++++++--------
 .../groovy/lsp/internal/feature/SymbolService.java |  5 ++--
 .../protocol/GroovyTextDocumentService.java        | 11 +++++----
 .../internal/protocol/GroovyWorkspaceService.java  |  5 ++--
 .../groovy/lsp/GroovyLanguageServerTest.groovy     |  9 ++++---
 .../internal/compile/WorkspaceLayoutTest.groovy    | 10 ++++----
 .../diagnostic/DiagnosticConverterTest.groovy      |  6 +++--
 .../lsp/internal/feature/JdtInspiredTest.groovy    |  5 ++--
 .../internal/feature/LanguageQualityTest.groovy    | 15 ++++++++----
 .../lsp/internal/feature/MetalsInspiredTest.groovy | 21 +++++++++-------
 .../internal/feature/NavigationIdentityTest.groovy |  9 ++++---
 .../internal/feature/SupportServicesTest.groovy    | 11 +++++----
 .../lsp/internal/position/PositionsTest.groovy     |  9 ++++---
 .../internal/protocol/ProtocolCoverageTest.groovy  |  3 ++-
 26 files changed, 165 insertions(+), 91 deletions(-)

diff --git a/config/checkstyle/gate-suppressions.xml b/config/checkstyle/gate-suppressions.xml
index 7ff82a3ee4..b6e4041115 100644
--- a/config/checkstyle/gate-suppressions.xml
+++ b/config/checkstyle/gate-suppressions.xml
@@ -86,5 +86,10 @@
     <suppress id="FullyQualifiedName" files="src/main/java/org/codehaus/groovy/vmplugin/v7/IndyInterface\.java$"/>
     <!-- Java8 imports org.codehaus.groovy.ast.Parameter and reads java.lang.reflect.Parameters as well -->
     <suppress id="FullyQualifiedName" files="src/main/java/org/codehaus/groovy/vmplugin/v8/Java8\.java$"/>
+    <!-- DiagnosticConverter imports lsp4j Diagnostic and maps compiler Diagnostic -->
+    <suppress id="FullyQualifiedName" files="subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/diagnostic/DiagnosticConverter\.java$"/>
+    <!-- groovy-lsp AstQuery is named after the compiler AstQuery it wraps -->
+    <suppress id="FullyQualifiedName" files="subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/compile/AstQuery\.java$"/>
+    <suppress id="FullyQualifiedNameInJavadoc" files="subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/compile/AstQuery\.java$"/>
 
 </suppressions>
diff --git a/src/test/groovy/org/apache/groovy/parser/antlr4/AnnotatedNodeNamePositionTest.groovy b/src/test/groovy/org/apache/groovy/parser/antlr4/AnnotatedNodeNamePositionTest.groovy
index 9fbf44db34..32a220424f 100644
--- a/src/test/groovy/org/apache/groovy/parser/antlr4/AnnotatedNodeNamePositionTest.groovy
+++ b/src/test/groovy/org/apache/groovy/parser/antlr4/AnnotatedNodeNamePositionTest.groovy
@@ -18,6 +18,9 @@
  */
 package org.apache.groovy.parser.antlr4
 
+import org.codehaus.groovy.ast.ASTNode
+import org.codehaus.groovy.ast.AnnotatedNode
+import org.codehaus.groovy.ast.ClassHelper
 import org.codehaus.groovy.ast.ClassNode
 import org.codehaus.groovy.ast.FieldNode
 import org.codehaus.groovy.ast.MethodNode
@@ -29,7 +32,7 @@ import org.codehaus.groovy.control.Phases
 import org.junit.jupiter.api.Test
 
 /**
- * Identifier spans on {@link org.codehaus.groovy.ast.AnnotatedNode} are the
+ * Identifier spans on {@link AnnotatedNode} are the
  * name itself, not the whole declaration. Language servers use this for
  * rename, highlight, and the selection range of a definition.
  */
@@ -102,8 +105,8 @@ final class AnnotatedNodeNamePositionTest {
 
     @Test
     void setNamePositionCopiesFromAnnotatedNodeWithNameSpan() {
-        def source = compileClass('class Hello {\n}\n')
-        def target = new ClassNode('Other', 0, org.codehaus.groovy.ast.ClassHelper.OBJECT_TYPE)
+        AnnotatedNode source = compileClass('class Hello {\n}\n')
+        def target = new ClassNode('Other', 0, ClassHelper.OBJECT_TYPE)
         target.setNamePosition(source)
         assert target.hasNamePosition()
         assert [target.nameLineNumber, target.nameColumnNumber, target.nameLastLineNumber, target.nameLastColumnNumber] ==
@@ -112,19 +115,19 @@ final class AnnotatedNodeNamePositionTest {
 
     @Test
     void setNamePositionFallsBackToFullSpan() {
-        def source = new org.codehaus.groovy.ast.ASTNode()
+        def source = new ASTNode()
         source.lineNumber = 4
         source.columnNumber = 2
         source.lastLineNumber = 4
         source.lastColumnNumber = 9
-        def target = new ClassNode('Other', 0, org.codehaus.groovy.ast.ClassHelper.OBJECT_TYPE)
+        def target = new ClassNode('Other', 0, ClassHelper.OBJECT_TYPE)
         target.setNamePosition(source)
         assert [target.nameLineNumber, target.nameColumnNumber, target.nameLastLineNumber, target.nameLastColumnNumber] == [4, 2, 4, 9]
     }
 
     @Test
     void setNamePositionIgnoresNull() {
-        def target = new ClassNode('Other', 0, org.codehaus.groovy.ast.ClassHelper.OBJECT_TYPE)
+        def target = new ClassNode('Other', 0, ClassHelper.OBJECT_TYPE)
         target.setNamePosition(null)
         assert !target.hasNamePosition()
     }
@@ -132,7 +135,7 @@ final class AnnotatedNodeNamePositionTest {
     @Test
     void setSourcePositionCopiesNameWhenPresent() {
         def source = compileClass('class Hello {\n}\n')
-        def target = new ClassNode('Other', 0, org.codehaus.groovy.ast.ClassHelper.OBJECT_TYPE)
+        def target = new ClassNode('Other', 0, ClassHelper.OBJECT_TYPE)
         target.setSourcePosition(source)
         assert target.hasNamePosition()
         assert target.nameColumnNumber == source.nameColumnNumber
@@ -141,12 +144,12 @@ final class AnnotatedNodeNamePositionTest {
 
     @Test
     void setSourcePositionDoesNotInventNameWhenAbsent() {
-        def source = new ClassNode('Other', 0, org.codehaus.groovy.ast.ClassHelper.OBJECT_TYPE)
+        def source = new ClassNode('Other', 0, ClassHelper.OBJECT_TYPE)
         source.lineNumber = 1
         source.columnNumber = 1
         source.lastLineNumber = 1
         source.lastColumnNumber = 6
-        def target = new ClassNode('Copy', 0, org.codehaus.groovy.ast.ClassHelper.OBJECT_TYPE)
+        def target = new ClassNode('Copy', 0, ClassHelper.OBJECT_TYPE)
         target.setSourcePosition(source)
         assert !target.hasNamePosition()
         assert target.columnNumber == 1
@@ -154,7 +157,7 @@ final class AnnotatedNodeNamePositionTest {
 
     @Test
     void nameAccessorsRoundTrip() {
-        def node = new ClassNode('Hello', 0, org.codehaus.groovy.ast.ClassHelper.OBJECT_TYPE)
+        def node = new ClassNode('Hello', 0, ClassHelper.OBJECT_TYPE)
         node.nameLineNumber = 2
         node.nameColumnNumber = 7
         node.nameLastLineNumber = 2
diff --git a/src/test/groovy/org/apache/groovy/parser/antlr4/PositionConfigureUtilsTest.groovy b/src/test/groovy/org/apache/groovy/parser/antlr4/PositionConfigureUtilsTest.groovy
index 4ca76f0aa5..ddd94e3e91 100644
--- a/src/test/groovy/org/apache/groovy/parser/antlr4/PositionConfigureUtilsTest.groovy
+++ b/src/test/groovy/org/apache/groovy/parser/antlr4/PositionConfigureUtilsTest.groovy
@@ -23,6 +23,8 @@ import org.antlr.v4.runtime.Token
 import org.antlr.v4.runtime.tree.TerminalNodeImpl
 import org.apache.groovy.parser.antlr4.util.PositionConfigureUtils
 import org.codehaus.groovy.ast.ASTNode
+import org.codehaus.groovy.ast.ClassHelper
+import org.codehaus.groovy.ast.ClassNode
 import org.codehaus.groovy.ast.expr.ConstantExpression
 import org.codehaus.groovy.ast.expr.EmptyExpression
 import org.junit.jupiter.api.Test
@@ -204,7 +206,7 @@ final class PositionConfigureUtilsTest {
 
     @Test
     void configureNamePositionFromToken() {
-        def node = new org.codehaus.groovy.ast.ClassNode('Hello', 0, org.codehaus.groovy.ast.ClassHelper.OBJECT_TYPE)
+        def node = new ClassNode('Hello', 0, ClassHelper.OBJECT_TYPE)
         PositionConfigureUtils.configureNamePosition(node, token('Hello', 1, 6))
         assert node.hasNamePosition()
         assert [node.nameLineNumber, node.nameColumnNumber, node.nameLastLineNumber, node.nameLastColumnNumber] == [1, 7, 1, 12]
@@ -212,7 +214,7 @@ final class PositionConfigureUtilsTest {
 
     @Test
     void configureNamePositionFromContextUsesStartAndStop() {
-        def node = new org.codehaus.groovy.ast.ClassNode('Hello', 0, org.codehaus.groovy.ast.ClassHelper.OBJECT_TYPE)
+        def node = new ClassNode('Hello', 0, ClassHelper.OBJECT_TYPE)
         def nameCtx = ctx(token('Hel', 2, 6), token('lo', 2, 9))
         PositionConfigureUtils.configureNamePosition(node, nameCtx)
         assert [node.nameLineNumber, node.nameColumnNumber, node.nameLastLineNumber, node.nameLastColumnNumber] == [2, 7, 2, 12]
@@ -220,7 +222,7 @@ final class PositionConfigureUtilsTest {
 
     @Test
     void configureNamePositionFromContextWithNullStopUsesStartToken() {
-        def node = new org.codehaus.groovy.ast.ClassNode('X', 0, org.codehaus.groovy.ast.ClassHelper.OBJECT_TYPE)
+        def node = new ClassNode('X', 0, ClassHelper.OBJECT_TYPE)
         def nameCtx = ctx(token('X', 4, 0), null)
         PositionConfigureUtils.configureNamePosition(node, nameCtx)
         assert [node.nameLineNumber, node.nameColumnNumber, node.nameLastLineNumber, node.nameLastColumnNumber] == [4, 1, 4, 2]
@@ -228,7 +230,7 @@ final class PositionConfigureUtilsTest {
 
     @Test
     void configureNamePositionNullsAreNoops() {
-        def node = new org.codehaus.groovy.ast.ClassNode('Hello', 0, org.codehaus.groovy.ast.ClassHelper.OBJECT_TYPE)
+        def node = new ClassNode('Hello', 0, ClassHelper.OBJECT_TYPE)
         assert PositionConfigureUtils.configureNamePosition(node, (Token) null).is(node)
         assert !node.hasNamePosition()
         assert PositionConfigureUtils.configureNamePosition(null, token('x', 1, 0)) == null
@@ -243,7 +245,7 @@ final class PositionConfigureUtilsTest {
 
     @Test
     void configureNamePositionFromAstNodeCopiesSpan() {
-        def node = new org.codehaus.groovy.ast.ClassNode('Hello', 0, org.codehaus.groovy.ast.ClassHelper.OBJECT_TYPE)
+        def node = new ClassNode('Hello', 0, ClassHelper.OBJECT_TYPE)
         def source = positioned(3, 2, 3, 7)
         PositionConfigureUtils.configureNamePosition(node, source)
         assert [node.nameLineNumber, node.nameColumnNumber, node.nameLastLineNumber, node.nameLastColumnNumber] == [3, 2, 3, 7]
diff --git a/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/LanguageServerContext.java b/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/LanguageServerContext.java
index 71136bcbba..cfa9ecd831 100644
--- a/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/LanguageServerContext.java
+++ b/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/LanguageServerContext.java
@@ -36,6 +36,7 @@ import org.apache.groovy.lsp.internal.protocol.ClientFeatures;
 import org.apache.groovy.lsp.internal.workspace.DocumentStore;
 import org.apache.groovy.lsp.internal.workspace.TextDocument;
 import org.eclipse.lsp4j.ClientCapabilities;
+import org.eclipse.lsp4j.Diagnostic;
 import org.eclipse.lsp4j.ProgressParams;
 import org.eclipse.lsp4j.PublishDiagnosticsParams;
 import org.eclipse.lsp4j.WorkDoneProgressBegin;
@@ -151,7 +152,7 @@ public final class LanguageServerContext {
             return;
         }
         for (var document : snapshot.documents()) {
-            List<org.eclipse.lsp4j.Diagnostic> converted = new ArrayList<>(
+            List<Diagnostic> converted = new ArrayList<>(
                     diagnostics.convert(document, positionEncoding));
             converted.addAll(ImportSupport.unusedDiagnostics(document, positionEncoding));
             languageClient.publishDiagnostics(new PublishDiagnosticsParams(
diff --git a/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/compile/AstQuery.java b/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/compile/AstQuery.java
index 7c2cde3530..e0dc3557d8 100644
--- a/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/compile/AstQuery.java
+++ b/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/compile/AstQuery.java
@@ -101,10 +101,23 @@ public final class AstQuery {
         }
         BlockStatement block = module.getStatementBlock();
         if (block != null) {
-            org.codehaus.groovy.ast.query.AstQuery.from(block)
-                    .andSelf()
-                    .forEach(action);
+            walk(block, action);
+        }
+    }
+
+    /**
+     * Walks {@code node} and its descendants, including {@code node} itself.
+     *
+     * @param node any AST node
+     * @param action node plus enclosing context
+     */
+    public static void walk(final ASTNode node, final BiConsumer<ASTNode, AstContext> action) {
+        if (node == null || action == null) {
+            return;
         }
+        org.codehaus.groovy.ast.query.AstQuery.from(node)
+                .andSelf()
+                .forEach(action);
     }
 
     /**
diff --git a/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/compile/CompilerSettings.java b/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/compile/CompilerSettings.java
index 7e0c6c58a3..0951a79978 100644
--- a/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/compile/CompilerSettings.java
+++ b/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/compile/CompilerSettings.java
@@ -27,7 +27,9 @@ import java.net.URL;
 import java.net.URLClassLoader;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 
 
 /**
@@ -100,7 +102,7 @@ public final class CompilerSettings {
         if (!classpath.isEmpty()) {
             configuration.setClasspathList(new ArrayList<>(classpath));
         }
-        java.util.Set<String> disabled = new java.util.LinkedHashSet<>();
+        Set<String> disabled = new LinkedHashSet<>();
         if (configuration.getDisabledGlobalASTTransformations() != null) {
             disabled.addAll(configuration.getDisabledGlobalASTTransformations());
         }
diff --git a/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/diagnostic/DiagnosticConverter.java b/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/diagnostic/DiagnosticConverter.java
index e16c8aa7ea..9cafa33021 100644
--- a/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/diagnostic/DiagnosticConverter.java
+++ b/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/diagnostic/DiagnosticConverter.java
@@ -27,6 +27,7 @@ import org.codehaus.groovy.control.messages.WarningMessage;
 import org.codehaus.groovy.syntax.SyntaxException;
 import org.eclipse.lsp4j.Diagnostic;
 import org.eclipse.lsp4j.DiagnosticSeverity;
+import org.eclipse.lsp4j.DiagnosticTag;
 import org.eclipse.lsp4j.Position;
 import org.eclipse.lsp4j.Range;
 
@@ -114,10 +115,10 @@ public final class DiagnosticConverter {
         }
         Diagnostic diagnostic = new Diagnostic(range, msg, severity, SOURCE);
         if (msg != null && msg.toLowerCase().contains("deprecated")) {
-            diagnostic.setTags(List.of(org.eclipse.lsp4j.DiagnosticTag.Deprecated));
+            diagnostic.setTags(List.of(DiagnosticTag.Deprecated));
         }
         if (msg != null && msg.toLowerCase().contains("unused")) {
-            diagnostic.setTags(List.of(org.eclipse.lsp4j.DiagnosticTag.Unnecessary));
+            diagnostic.setTags(List.of(DiagnosticTag.Unnecessary));
             if (severity == DiagnosticSeverity.Warning) {
                 diagnostic.setSeverity(DiagnosticSeverity.Hint);
             }
diff --git a/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/feature/CodeActionService.java b/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/feature/CodeActionService.java
index 140463d926..c053295eda 100644
--- a/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/feature/CodeActionService.java
+++ b/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/feature/CodeActionService.java
@@ -34,6 +34,7 @@ import org.codehaus.groovy.ast.Parameter;
 import org.eclipse.lsp4j.CodeAction;
 import org.eclipse.lsp4j.CodeActionKind;
 import org.eclipse.lsp4j.Command;
+import org.eclipse.lsp4j.Diagnostic;
 import org.eclipse.lsp4j.Position;
 import org.eclipse.lsp4j.Range;
 import org.eclipse.lsp4j.TextEdit;
@@ -68,7 +69,7 @@ public final class CodeActionService {
      */
     public List<Either<Command, CodeAction>> contribute(final TextDocument document,
                                                         final CompilationSnapshot snapshot,
-                                                        final List<org.eclipse.lsp4j.Diagnostic> diagnostics,
+                                                        final List<Diagnostic> diagnostics,
                                                         final Range range, final PositionEncoding encoding,
                                                         final Collection<URI> folders, final List<String> sourcePaths) {
         List<Either<Command, CodeAction>> actions = new ArrayList<>();
@@ -243,12 +244,12 @@ public final class CodeActionService {
 
     private static void addCreateClass(final List<Either<Command, CodeAction>> actions,
                                        final CompiledDocument compiled,
-                                       final List<org.eclipse.lsp4j.Diagnostic> diagnostics,
+                                       final List<Diagnostic> diagnostics,
                                        final PositionEncoding encoding) {
         if (diagnostics == null) {
             return;
         }
-        for (org.eclipse.lsp4j.Diagnostic diagnostic : diagnostics) {
+        for (Diagnostic diagnostic : diagnostics) {
             String message = SupportServices.diagnosticMessage(diagnostic);
             if (message == null) {
                 continue;
diff --git a/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/feature/CompletionService.java b/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/feature/CompletionService.java
index 4a514d1b20..676ca5bcbe 100644
--- a/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/feature/CompletionService.java
+++ b/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/feature/CompletionService.java
@@ -25,6 +25,7 @@ import org.apache.groovy.lsp.internal.compile.CompiledDocument;
 import org.apache.groovy.lsp.internal.compile.ImportSupport;
 import org.apache.groovy.lsp.internal.compile.TypeIndex;
 import org.apache.groovy.lsp.internal.position.PositionEncoding;
+import org.apache.groovy.lsp.internal.position.Positions;
 import org.apache.groovy.lsp.internal.util.GroovyKeywords;
 import org.apache.groovy.lsp.internal.workspace.TextDocument;
 import org.codehaus.groovy.ast.ASTNode;
@@ -157,7 +158,7 @@ public final class CompletionService {
     static String prefixAt(final TextDocument document, final Position position,
                            final PositionEncoding encoding) {
         int[] groovy = document.toGroovy(position, encoding);
-        String line = org.apache.groovy.lsp.internal.position.Positions.lineText(document.getText(), groovy[0]);
+        String line = Positions.lineText(document.getText(), groovy[0]);
         int col = Math.max(groovy[1] - 1, 0);
         int cpCount = line.codePointCount(0, line.length());
         if (col > cpCount) {
@@ -178,7 +179,7 @@ public final class CompletionService {
     static boolean isMemberAccess(final TextDocument document, final Position position,
                                   final PositionEncoding encoding) {
         int[] groovy = document.toGroovy(position, encoding);
-        String line = org.apache.groovy.lsp.internal.position.Positions.lineText(document.getText(), groovy[0]);
+        String line = Positions.lineText(document.getText(), groovy[0]);
         int col = Math.max(groovy[1] - 1, 0);
         int cpCount = line.codePointCount(0, line.length());
         if (col > cpCount) {
diff --git a/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/feature/HierarchyService.java b/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/feature/HierarchyService.java
index 79177dffb6..da4c6099bc 100644
--- a/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/feature/HierarchyService.java
+++ b/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/feature/HierarchyService.java
@@ -23,6 +23,7 @@ import org.apache.groovy.lsp.internal.compile.CompilationSnapshot;
 import org.apache.groovy.lsp.internal.compile.CompiledDocument;
 import org.apache.groovy.lsp.internal.position.PositionEncoding;
 import org.apache.groovy.lsp.internal.position.Positions;
+import org.apache.groovy.lsp.internal.util.Uris;
 import org.apache.groovy.lsp.internal.workspace.TextDocument;
 import org.codehaus.groovy.ast.ASTNode;
 import org.codehaus.groovy.ast.ClassHelper;
@@ -31,9 +32,11 @@ import org.codehaus.groovy.ast.MethodNode;
 import org.codehaus.groovy.ast.expr.ConstructorCallExpression;
 import org.codehaus.groovy.ast.expr.MethodCallExpression;
 import org.codehaus.groovy.ast.expr.StaticMethodCallExpression;
+import org.codehaus.groovy.ast.query.AstContext;
 import org.eclipse.lsp4j.CallHierarchyIncomingCall;
 import org.eclipse.lsp4j.CallHierarchyItem;
 import org.eclipse.lsp4j.CallHierarchyOutgoingCall;
+import org.eclipse.lsp4j.Position;
 import org.eclipse.lsp4j.Range;
 import org.eclipse.lsp4j.SymbolKind;
 import org.eclipse.lsp4j.TypeHierarchyItem;
@@ -51,7 +54,7 @@ public final class HierarchyService {
 
     public List<CallHierarchyItem> prepareCallHierarchy(final TextDocument document,
                                                         final CompilationSnapshot snapshot,
-                                                        final org.eclipse.lsp4j.Position position,
+                                                        final Position position,
                                                         final PositionEncoding encoding) {
         CompiledDocument compiled = snapshot == null ? null : snapshot.get(document.getUri());
         if (compiled == null || compiled.getModule() == null) {
@@ -119,9 +122,7 @@ public final class HierarchyService {
         }
         Map<String, Outgoing> grouped = new LinkedHashMap<>();
         String bodyText = textOf(method, snapshot);
-        org.codehaus.groovy.ast.query.AstQuery.from(method.getCode())
-                .andSelf()
-                .forEach((node, ctx) -> {
+        AstQuery.walk(method.getCode(), (node, ctx) -> {
                     MethodNode target = targetOf(node, snapshot);
                     if (target == null || target.getLineNumber() <= 0) {
                         return;
@@ -152,7 +153,7 @@ public final class HierarchyService {
 
     public List<TypeHierarchyItem> prepareTypeHierarchy(final TextDocument document,
                                                         final CompilationSnapshot snapshot,
-                                                        final org.eclipse.lsp4j.Position position,
+                                                        final Position position,
                                                         final PositionEncoding encoding) {
         CompiledDocument compiled = snapshot == null ? null : snapshot.get(document.getUri());
         if (compiled == null || compiled.getModule() == null) {
@@ -250,7 +251,7 @@ public final class HierarchyService {
         return null;
     }
 
-    private static boolean isCallTo(final ASTNode node, final MethodNode method, final org.codehaus.groovy.ast.query.AstContext ctx,
+    private static boolean isCallTo(final ASTNode node, final MethodNode method, final AstContext ctx,
                                     final CompilationSnapshot snapshot) {
         if (node instanceof MethodCallExpression call) {
             return NavigationService.callMatches(call, method, ctx, snapshot);
@@ -369,7 +370,7 @@ public final class HierarchyService {
 
     private static URI uriOf(final CallHierarchyItem item) {
         try {
-            return item.getUri() == null ? null : org.apache.groovy.lsp.internal.util.Uris.parse(item.getUri());
+            return item.getUri() == null ? null : Uris.parse(item.getUri());
         } catch (IllegalArgumentException ex) {
             return null;
         }
diff --git a/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/feature/HoverService.java b/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/feature/HoverService.java
index 8dcf904062..d349bd2982 100644
--- a/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/feature/HoverService.java
+++ b/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/feature/HoverService.java
@@ -36,6 +36,7 @@ import org.codehaus.groovy.ast.PropertyNode;
 import org.codehaus.groovy.ast.expr.ClassExpression;
 import org.codehaus.groovy.ast.expr.ConstantExpression;
 import org.codehaus.groovy.ast.expr.MethodCallExpression;
+import org.codehaus.groovy.ast.expr.PropertyExpression;
 import org.codehaus.groovy.ast.expr.VariableExpression;
 import org.eclipse.lsp4j.Hover;
 import org.eclipse.lsp4j.MarkupContent;
@@ -124,7 +125,7 @@ public final class HoverService {
             }
             return codeFence(call.getMethodAsString() + "(...)");
         }
-        if (node instanceof org.codehaus.groovy.ast.expr.PropertyExpression property) {
+        if (node instanceof PropertyExpression property) {
             String name = property.getPropertyAsString();
             return codeFence(property.getType().getNameWithoutPackage() + " " + (name == null ? "?" : name));
         }
diff --git a/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/feature/RenameService.java b/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/feature/RenameService.java
index 352a721c27..8626d81579 100644
--- a/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/feature/RenameService.java
+++ b/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/feature/RenameService.java
@@ -26,11 +26,13 @@ import org.apache.groovy.lsp.internal.position.Positions;
 import org.apache.groovy.lsp.internal.workspace.TextDocument;
 import org.codehaus.groovy.ast.ASTNode;
 import org.codehaus.groovy.ast.ClassNode;
+import org.eclipse.lsp4j.Location;
 import org.eclipse.lsp4j.Position;
 import org.eclipse.lsp4j.PrepareRenameResult;
 import org.eclipse.lsp4j.Range;
 import org.eclipse.lsp4j.RenameFile;
 import org.eclipse.lsp4j.ResourceOperation;
+import org.eclipse.lsp4j.SnippetTextEdit;
 import org.eclipse.lsp4j.TextDocumentEdit;
 import org.eclipse.lsp4j.TextEdit;
 import org.eclipse.lsp4j.VersionedTextDocumentIdentifier;
@@ -91,9 +93,9 @@ public final class RenameService {
         if (newName == null || newName.isBlank() || !isIdentifier(newName)) {
             return new WorkspaceEdit(Map.of());
         }
-        List<org.eclipse.lsp4j.Location> locations = navigation.references(document, snapshot, position, encoding, true);
+        List<Location> locations = navigation.references(document, snapshot, position, encoding, true);
         Map<String, List<TextEdit>> changes = new HashMap<>();
-        for (org.eclipse.lsp4j.Location location : locations) {
+        for (Location location : locations) {
             changes.computeIfAbsent(location.getUri(), key -> new ArrayList<>())
                     .add(new TextEdit(location.getRange(), newName));
         }
@@ -125,7 +127,7 @@ public final class RenameService {
         String newUri = oldUri.substring(0, oldUri.length() - fileName.length()) + newName + ".groovy";
         List<Either<TextDocumentEdit, ResourceOperation>> documentChanges = new ArrayList<>();
         for (Map.Entry<String, List<TextEdit>> entry : changes.entrySet()) {
-            List<Either<TextEdit, org.eclipse.lsp4j.SnippetTextEdit>> eitherEdits = new ArrayList<>();
+            List<Either<TextEdit, SnippetTextEdit>> eitherEdits = new ArrayList<>();
             for (TextEdit textEdit : entry.getValue()) {
                 eitherEdits.add(Either.forLeft(textEdit));
             }
diff --git a/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/feature/SupportServices.java b/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/feature/SupportServices.java
index c38ebe301c..88f14afc9c 100644
--- a/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/feature/SupportServices.java
+++ b/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/feature/SupportServices.java
@@ -26,14 +26,17 @@ import org.apache.groovy.lsp.internal.compile.TypeIndex;
 import org.apache.groovy.lsp.internal.position.PositionEncoding;
 import org.apache.groovy.lsp.internal.position.Positions;
 import org.apache.groovy.lsp.internal.util.GroovyKeywords;
+import org.apache.groovy.lsp.internal.util.Uris;
 import org.apache.groovy.lsp.internal.workspace.TextDocument;
 import org.codehaus.groovy.ast.ASTNode;
 import org.codehaus.groovy.ast.AnnotatedNode;
 import org.codehaus.groovy.ast.ClassNode;
+import org.codehaus.groovy.ast.FieldNode;
 import org.codehaus.groovy.ast.ImportNode;
 import org.codehaus.groovy.ast.MethodNode;
 import org.codehaus.groovy.ast.ModuleNode;
 import org.codehaus.groovy.ast.Parameter;
+import org.codehaus.groovy.ast.PropertyNode;
 import org.codehaus.groovy.ast.expr.ConstructorCallExpression;
 import org.codehaus.groovy.ast.expr.Expression;
 import org.codehaus.groovy.ast.expr.MethodCallExpression;
@@ -47,6 +50,7 @@ import org.eclipse.lsp4j.CodeAction;
 import org.eclipse.lsp4j.CodeActionKind;
 import org.eclipse.lsp4j.CodeLens;
 import org.eclipse.lsp4j.Command;
+import org.eclipse.lsp4j.Diagnostic;
 import org.eclipse.lsp4j.DocumentHighlight;
 import org.eclipse.lsp4j.DocumentHighlightKind;
 import org.eclipse.lsp4j.DocumentLink;
@@ -54,6 +58,7 @@ import org.eclipse.lsp4j.FoldingRange;
 import org.eclipse.lsp4j.FoldingRangeKind;
 import org.eclipse.lsp4j.InlayHint;
 import org.eclipse.lsp4j.InlayHintKind;
+import org.eclipse.lsp4j.Location;
 import org.eclipse.lsp4j.ParameterInformation;
 import org.eclipse.lsp4j.Position;
 import org.eclipse.lsp4j.Range;
@@ -67,7 +72,10 @@ import org.eclipse.lsp4j.TypeHierarchyItem;
 import org.eclipse.lsp4j.WorkspaceEdit;
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
 
+import java.net.URI;
+import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
@@ -154,10 +162,10 @@ public final class SupportServices {
 
     public List<DocumentHighlight> highlights(final TextDocument document, final CompilationSnapshot snapshot,
                                               final Position position, final PositionEncoding encoding) {
-        List<org.eclipse.lsp4j.Location> refs = new NavigationService()
+        List<Location> refs = new NavigationService()
                 .references(document, snapshot, position, encoding, true);
         List<DocumentHighlight> highlights = new ArrayList<>();
-        for (org.eclipse.lsp4j.Location location : refs) {
+        for (Location location : refs) {
             if (document.getUri().toString().equals(location.getUri())) {
                 highlights.add(new DocumentHighlight(location.getRange(), DocumentHighlightKind.Text));
             }
@@ -342,9 +350,9 @@ public final class SupportServices {
 
     public List<Either<Command, CodeAction>> codeActions(final TextDocument document,
                                                          final CompilationSnapshot snapshot,
-                                                         final List<org.eclipse.lsp4j.Diagnostic> diagnostics,
+                                                         final List<Diagnostic> diagnostics,
                                                          final Range range, final PositionEncoding encoding,
-                                                         final java.util.Collection<java.net.URI> folders,
+                                                         final Collection<URI> folders,
                                                          final List<String> sourcePaths) {
         List<Either<Command, CodeAction>> actions = new ArrayList<>();
         CompiledDocument compiled = snapshot == null ? null : snapshot.get(document.getUri());
@@ -358,7 +366,7 @@ public final class SupportServices {
                 List.of(document.getUri().toString())));
         actions.add(Either.forRight(organize));
         if (diagnostics != null) {
-            for (org.eclipse.lsp4j.Diagnostic diagnostic : diagnostics) {
+            for (Diagnostic diagnostic : diagnostics) {
                 String message = diagnosticMessage(diagnostic);
                 String className = unresolvedClassName(message);
                 if (className == null) {
@@ -396,7 +404,7 @@ public final class SupportServices {
             if (node instanceof MethodNode method && method.isSynthetic()) {
                 continue;
             }
-            Range range = Positions.toNameRange((org.codehaus.groovy.ast.AnnotatedNode) node, document.getText(), encoding);
+            Range range = Positions.toNameRange((AnnotatedNode) node, document.getText(), encoding);
             if (range == null) {
                 continue;
             }
@@ -705,7 +713,7 @@ public final class SupportServices {
         if (document.getUri() == null || !"file".equalsIgnoreCase(document.getUri().getScheme()) || className == null) {
             return null;
         }
-        java.nio.file.Path parent = org.apache.groovy.lsp.internal.util.Uris.toPath(document.getUri()).getParent();
+        Path parent = Uris.toPath(document.getUri()).getParent();
         if (parent == null) {
             return null;
         }
@@ -725,10 +733,10 @@ public final class SupportServices {
         if (node instanceof MethodNode) {
             return 4;
         }
-        if (node instanceof org.codehaus.groovy.ast.PropertyNode) {
+        if (node instanceof PropertyNode) {
             return 5;
         }
-        if (node instanceof org.codehaus.groovy.ast.FieldNode) {
+        if (node instanceof FieldNode) {
             return 5;
         }
         if (node instanceof Parameter) {
@@ -737,7 +745,7 @@ public final class SupportServices {
         return 6;
     }
 
-    static String diagnosticMessage(final org.eclipse.lsp4j.Diagnostic diagnostic) {
+    static String diagnosticMessage(final Diagnostic diagnostic) {
         if (diagnostic == null || diagnostic.getMessage() == null) {
             return null;
         }
diff --git a/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/feature/SymbolService.java b/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/feature/SymbolService.java
index e486977f92..681da1d787 100644
--- a/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/feature/SymbolService.java
+++ b/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/feature/SymbolService.java
@@ -31,6 +31,7 @@ import org.codehaus.groovy.ast.FieldNode;
 import org.codehaus.groovy.ast.MethodNode;
 import org.codehaus.groovy.ast.PropertyNode;
 import org.eclipse.lsp4j.DocumentSymbol;
+import org.eclipse.lsp4j.Location;
 import org.eclipse.lsp4j.Position;
 import org.eclipse.lsp4j.Range;
 import org.eclipse.lsp4j.SymbolInformation;
@@ -118,7 +119,7 @@ public final class SymbolService {
                     continue;
                 }
                 WorkspaceSymbol symbol = new WorkspaceSymbol(name, kindOf(node),
-                        Either.forLeft(new org.eclipse.lsp4j.Location(document.getUri().toString(), range)));
+                        Either.forLeft(new Location(document.getUri().toString(), range)));
                 symbols.add(symbol);
             }
         }
@@ -147,7 +148,7 @@ public final class SymbolService {
                 continue;
             }
             symbols.add(new SymbolInformation(name, kindOf(node),
-                    new org.eclipse.lsp4j.Location(document.getUri().toString(), range)));
+                    new Location(document.getUri().toString(), range)));
         }
         return symbols;
     }
diff --git a/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/protocol/GroovyTextDocumentService.java b/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/protocol/GroovyTextDocumentService.java
index 1904f94509..1bff8caa0d 100644
--- a/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/protocol/GroovyTextDocumentService.java
+++ b/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/protocol/GroovyTextDocumentService.java
@@ -61,6 +61,7 @@ import org.eclipse.lsp4j.InlayHint;
 import org.eclipse.lsp4j.InlayHintParams;
 import org.eclipse.lsp4j.Location;
 import org.eclipse.lsp4j.LocationLink;
+import org.eclipse.lsp4j.PrepareRenameDefaultBehavior;
 import org.eclipse.lsp4j.PrepareRenameParams;
 import org.eclipse.lsp4j.PublishDiagnosticsParams;
 import org.eclipse.lsp4j.PrepareRenameResult;
@@ -87,7 +88,9 @@ import org.eclipse.lsp4j.jsonrpc.messages.Either;
 import org.eclipse.lsp4j.jsonrpc.messages.Either3;
 import org.eclipse.lsp4j.services.TextDocumentService;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
 /**
@@ -235,7 +238,7 @@ public final class GroovyTextDocumentService implements TextDocumentService {
     public CompletableFuture<List<Either<SymbolInformation, DocumentSymbol>>> documentSymbol(
             final DocumentSymbolParams params) {
         CompiledDocument compiled = context.getSnapshot().get(params.getTextDocument().getUri());
-        List<Either<SymbolInformation, DocumentSymbol>> result = new java.util.ArrayList<>();
+        List<Either<SymbolInformation, DocumentSymbol>> result = new ArrayList<>();
         if (ClientFeatures.hierarchicalDocumentSymbols(context.getClientCapabilities())) {
             for (DocumentSymbol symbol : context.getSymbols().documentSymbols(compiled, context.getPositionEncoding())) {
                 result.add(Either.forRight(symbol));
@@ -305,7 +308,7 @@ public final class GroovyTextDocumentService implements TextDocumentService {
     }
 
     @Override
-    public CompletableFuture<Either3<Range, PrepareRenameResult, org.eclipse.lsp4j.PrepareRenameDefaultBehavior>> prepareRename(
+    public CompletableFuture<Either3<Range, PrepareRenameResult, PrepareRenameDefaultBehavior>> prepareRename(
             final PrepareRenameParams params) {
         TextDocument document = require(params.getTextDocument().getUri());
         if (document == null) {
@@ -326,7 +329,7 @@ public final class GroovyTextDocumentService implements TextDocumentService {
     public CompletableFuture<WorkspaceEdit> rename(final RenameParams params) {
         TextDocument document = require(params.getTextDocument().getUri());
         if (document == null) {
-            return CompletableFuture.completedFuture(new WorkspaceEdit(java.util.Map.of()));
+            return CompletableFuture.completedFuture(new WorkspaceEdit(Map.of()));
         }
         return CompletableFuture.completedFuture(
                 context.getRename().rename(document, context.getSnapshot(), params.getPosition(), params.getNewName(),
@@ -453,7 +456,7 @@ public final class GroovyTextDocumentService implements TextDocumentService {
         if (linkSupport) {
             return CompletableFuture.completedFuture(Either.forRight(links));
         }
-        List<Location> locations = new java.util.ArrayList<>();
+        List<Location> locations = new ArrayList<>();
         for (LocationLink link : links) {
             locations.add(new Location(link.getTargetUri(), link.getTargetSelectionRange()));
         }
diff --git a/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/protocol/GroovyWorkspaceService.java b/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/protocol/GroovyWorkspaceService.java
index be2985224d..902571a7b3 100644
--- a/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/protocol/GroovyWorkspaceService.java
+++ b/subprojects/groovy-lsp/src/main/java/org/apache/groovy/lsp/internal/protocol/GroovyWorkspaceService.java
@@ -21,6 +21,7 @@ package org.apache.groovy.lsp.internal.protocol;
 import org.apache.groovy.lsp.internal.LanguageServerContext;
 import org.apache.groovy.lsp.internal.compile.CompiledDocument;
 import org.apache.groovy.lsp.internal.compile.CompilerSettings;
+import org.apache.groovy.lsp.internal.util.Uris;
 import org.eclipse.lsp4j.ApplyWorkspaceEditParams;
 import org.eclipse.lsp4j.DidChangeConfigurationParams;
 import org.eclipse.lsp4j.DidChangeWatchedFilesParams;
@@ -77,12 +78,12 @@ public final class GroovyWorkspaceService implements WorkspaceService {
         }
         if (params.getEvent().getAdded() != null) {
             for (WorkspaceFolder folder : params.getEvent().getAdded()) {
-                context.getWorkspaceFolders().add(org.apache.groovy.lsp.internal.util.Uris.parse(folder.getUri()));
+                context.getWorkspaceFolders().add(Uris.parse(folder.getUri()));
             }
         }
         if (params.getEvent().getRemoved() != null) {
             for (WorkspaceFolder folder : params.getEvent().getRemoved()) {
-                context.getWorkspaceFolders().remove(org.apache.groovy.lsp.internal.util.Uris.parse(folder.getUri()));
+                context.getWorkspaceFolders().remove(Uris.parse(folder.getUri()));
             }
         }
         context.scheduleRecompile(0);
diff --git a/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/GroovyLanguageServerTest.groovy b/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/GroovyLanguageServerTest.groovy
index 4a2b336256..4fb4c0e0ea 100644
--- a/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/GroovyLanguageServerTest.groovy
+++ b/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/GroovyLanguageServerTest.groovy
@@ -20,6 +20,7 @@ package org.apache.groovy.lsp
 
 import org.apache.groovy.lsp.internal.LspFixture
 import org.apache.groovy.lsp.internal.compile.CompilerSettings
+import org.eclipse.lsp4j.ClientCapabilities
 import org.eclipse.lsp4j.CompletionParams
 import org.eclipse.lsp4j.DefinitionParams
 import org.eclipse.lsp4j.DidChangeTextDocumentParams
@@ -28,6 +29,8 @@ import org.eclipse.lsp4j.DocumentFormattingParams
 import org.eclipse.lsp4j.DocumentSymbolParams
 import org.eclipse.lsp4j.FormattingOptions
 import org.eclipse.lsp4j.HoverParams
+import org.eclipse.lsp4j.InitializeParams
+import org.eclipse.lsp4j.MarkupContent
 import org.eclipse.lsp4j.Position
 import org.eclipse.lsp4j.ReferenceContext
 import org.eclipse.lsp4j.ReferenceParams
@@ -50,8 +53,8 @@ final class GroovyLanguageServerTest {
     @Test
     void initializeAdvertisesIncrementalSyncAndCompletion() {
         fixture = new LspFixture()
-        def result = fixture.server.initialize(new org.eclipse.lsp4j.InitializeParams(
-                capabilities: new org.eclipse.lsp4j.ClientCapabilities()
+        def result = fixture.server.initialize(new InitializeParams(
+                capabilities: new ClientCapabilities()
         )).get()
         assert result.capabilities.completionProvider != null
         assert result.capabilities.hoverProvider
@@ -88,7 +91,7 @@ final class GroovyLanguageServerTest {
                 new HoverParams(new TextDocumentIdentifier(uri), new Position(0, 7))).get()
         assert hover != null
         def contents = hover.contents
-        String value = contents instanceof org.eclipse.lsp4j.MarkupContent
+        String value = contents instanceof MarkupContent
                 ? contents.value
                 : contents.getRight().value
         assert value.contains('Hello')
diff --git a/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/internal/compile/WorkspaceLayoutTest.groovy b/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/internal/compile/WorkspaceLayoutTest.groovy
index aaea18dc5a..94f02ceb26 100644
--- a/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/internal/compile/WorkspaceLayoutTest.groovy
+++ b/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/internal/compile/WorkspaceLayoutTest.groovy
@@ -18,6 +18,8 @@
  */
 package org.apache.groovy.lsp.internal.compile
 
+import org.apache.groovy.lsp.internal.position.PositionEncoding
+import org.apache.groovy.lsp.internal.workspace.TextDocument
 import org.junit.jupiter.api.Test
 
 import java.nio.file.Files
@@ -100,9 +102,9 @@ final class WorkspaceLayoutTest {
     void typeIndexIndexesCompiledClasses() {
         def compiler = new GroovyCompiler()
         def settings = CompilerSettings.defaults()
-        def a = new org.apache.groovy.lsp.internal.workspace.TextDocument(
+        def a = new TextDocument(
                 URI.create('file:///tmp/A.groovy'), 'groovy', 1, 'package demo\nclass Alpha {}\n')
-        def b = new org.apache.groovy.lsp.internal.workspace.TextDocument(
+        def b = new TextDocument(
                 URI.create('file:///tmp/B.groovy'), 'groovy', 1, 'package other\nclass Alpha {}\n')
         def snapshot = compiler.compile([a, b], [], settings, WorkspaceLayoutTest.classLoader)
         def index = snapshot.types()
@@ -120,7 +122,7 @@ final class WorkspaceLayoutTest {
         def compiler = new GroovyCompiler()
         def uri = URI.create('file:///tmp/Star.groovy')
         def snapshot = compiler.compile(
-                [new org.apache.groovy.lsp.internal.workspace.TextDocument(uri, 'groovy', 1,
+                [new TextDocument(uri, 'groovy', 1,
                         'package demo\nimport com.example.*\nclass Holder {}\n')],
                 [], CompilerSettings.defaults(), WorkspaceLayoutTest.classLoader)
         def module = snapshot.get(uri).module
@@ -128,7 +130,7 @@ final class WorkspaceLayoutTest {
         assert ImportSupport.needsImport(module, 'org.other.Foo')
         assert ImportSupport.packageName(module) == 'demo'
         def edits = ImportSupport.addImport(snapshot.get(uri), 'org.other.Foo',
-                org.apache.groovy.lsp.internal.position.PositionEncoding.UTF16)
+                PositionEncoding.UTF16)
         assert edits.size() == 1
         assert edits[0].newText.contains('import org.other.Foo')
         compiler.close()
diff --git a/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/internal/diagnostic/DiagnosticConverterTest.groovy b/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/internal/diagnostic/DiagnosticConverterTest.groovy
index 8b288055b1..5f3dcb5c1f 100644
--- a/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/internal/diagnostic/DiagnosticConverterTest.groovy
+++ b/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/internal/diagnostic/DiagnosticConverterTest.groovy
@@ -19,8 +19,10 @@
 package org.apache.groovy.lsp.internal.diagnostic
 
 import org.apache.groovy.lsp.internal.compile.CompiledDocument
+import org.apache.groovy.lsp.internal.feature.SupportServices
 import org.apache.groovy.lsp.internal.position.PositionEncoding
 import org.codehaus.groovy.control.CompilerConfiguration
+import org.codehaus.groovy.control.ErrorCollector
 import org.codehaus.groovy.control.Janitor
 import org.codehaus.groovy.control.SourceUnit
 import org.codehaus.groovy.control.messages.SimpleMessage
@@ -41,7 +43,7 @@ final class DiagnosticConverterTest {
         def source = new SourceUnit('file:///tmp/A.groovy', 'class A {', config, null, null)
         def error = new SyntaxErrorMessage(new SyntaxException('unexpected input', 1, 9), source)
         def warning = new WarningMessage(WarningMessage.LIKELY_ERRORS, 'unused import', null, source)
-        def collector = new org.codehaus.groovy.control.ErrorCollector(config)
+        def collector = new ErrorCollector(config)
         collector.addErrorAndContinue(error)
         collector.addWarning(warning)
         def compiled = new CompiledDocument(URI.create('file:///tmp/A.groovy'), 1, 'class A {', null, source, collector)
@@ -63,7 +65,7 @@ final class DiagnosticConverterTest {
         def source = new SourceUnit('file:///tmp/A.groovy', 'x', config, null, null)
         def message = new SimpleMessage('deprecated API', source)
         def diagnostic = new DiagnosticConverter().toDiagnostic(message, 'x', PositionEncoding.UTF16, DiagnosticSeverity.Warning)
-        assert org.apache.groovy.lsp.internal.feature.SupportServices.diagnosticMessage(diagnostic).contains('deprecated')
+        assert SupportServices.diagnosticMessage(diagnostic).contains('deprecated')
         assert diagnostic.tags
     }
 
diff --git a/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/internal/feature/JdtInspiredTest.groovy b/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/internal/feature/JdtInspiredTest.groovy
index 5492160a5e..535c008fba 100644
--- a/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/internal/feature/JdtInspiredTest.groovy
+++ b/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/internal/feature/JdtInspiredTest.groovy
@@ -19,6 +19,7 @@
 package org.apache.groovy.lsp.internal.feature
 
 import org.apache.groovy.lsp.internal.LspFixture
+import org.eclipse.lsp4j.CodeActionContext
 import org.eclipse.lsp4j.CodeActionParams
 import org.eclipse.lsp4j.CodeLensParams
 import org.eclipse.lsp4j.Position
@@ -125,7 +126,7 @@ final class JdtInspiredTest {
         fixture.server.textDocumentService.codeAction(
                 new CodeActionParams(new TextDocumentIdentifier(uri),
                         new Range(new Position(line, character), new Position(line, character + 1)),
-                        new org.eclipse.lsp4j.CodeActionContext([]))).get()
+                        new CodeActionContext([]))).get()
                 .findAll { it.isRight() }
                 .collect { it.getRight().title }
     }
@@ -134,7 +135,7 @@ final class JdtInspiredTest {
         def actions = fixture.server.textDocumentService.codeAction(
                 new CodeActionParams(new TextDocumentIdentifier(uri),
                         new Range(new Position(line, character), new Position(line, character + 1)),
-                        new org.eclipse.lsp4j.CodeActionContext([]))).get()
+                        new CodeActionContext([]))).get()
         def action = actions.find { it.isRight() && it.getRight().title == title }
         assert action != null
         action.getRight().edit.changes.values().flatten()[0].newText
diff --git a/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/internal/feature/LanguageQualityTest.groovy b/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/internal/feature/LanguageQualityTest.groovy
index f543586418..302d6087a3 100644
--- a/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/internal/feature/LanguageQualityTest.groovy
+++ b/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/internal/feature/LanguageQualityTest.groovy
@@ -21,7 +21,11 @@ package org.apache.groovy.lsp.internal.feature
 import org.apache.groovy.lsp.internal.LspFixture
 import org.apache.groovy.lsp.internal.LanguageServerContext
 import org.apache.groovy.lsp.internal.compile.CompilerSettings
+import org.apache.groovy.lsp.internal.compile.WorkspaceLayout
 import org.apache.groovy.lsp.internal.workspace.TextDocument
+import org.eclipse.lsp4j.CodeActionContext
+import org.eclipse.lsp4j.CodeActionParams
+import org.eclipse.lsp4j.CompletionItem
 import org.eclipse.lsp4j.CompletionParams
 import org.eclipse.lsp4j.Diagnostic
 import org.eclipse.lsp4j.DiagnosticSeverity
@@ -30,6 +34,7 @@ import org.eclipse.lsp4j.Range
 import org.eclipse.lsp4j.SelectionRangeParams
 import org.eclipse.lsp4j.SignatureHelpParams
 import org.eclipse.lsp4j.TextDocumentIdentifier
+import org.eclipse.lsp4j.jsonrpc.messages.Either
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.Test
 
@@ -133,11 +138,11 @@ final class LanguageQualityTest {
         def uri = fixture.open('Use.groovy', 'class Use {\n  Widget x\n}\n')
         def diagnostic = new Diagnostic()
         diagnostic.range = new Range(new Position(1, 2), new Position(1, 8))
-        diagnostic.message = org.eclipse.lsp4j.jsonrpc.messages.Either.forLeft('unable to resolve class Widget')
+        diagnostic.message = Either.forLeft('unable to resolve class Widget')
         diagnostic.severity = DiagnosticSeverity.Error
         def actions = fixture.server.textDocumentService.codeAction(
-                new org.eclipse.lsp4j.CodeActionParams(new TextDocumentIdentifier(uri),
-                        diagnostic.range, new org.eclipse.lsp4j.CodeActionContext([diagnostic]))).get()
+                new CodeActionParams(new TextDocumentIdentifier(uri),
+                        diagnostic.range, new CodeActionContext([diagnostic]))).get()
         assert actions.any { it.getRight().title == 'Add import for demo.Widget' }
     }
 
@@ -172,7 +177,7 @@ final class LanguageQualityTest {
     void resolveCompletionItemWithoutDataIsUnchanged() {
         fixture = new LspFixture()
         fixture.open('Hello.groovy', 'class Hello {}\n')
-        def item = new org.eclipse.lsp4j.CompletionItem('x')
+        def item = new CompletionItem('x')
         def resolved = fixture.server.textDocumentService.resolveCompletionItem(item).get()
         assert resolved.label == 'x'
         assert resolved.documentation == null
@@ -181,7 +186,7 @@ final class LanguageQualityTest {
     @Test
     void withInferredKeepsExplicitClasspath() {
         def settings = new CompilerSettings(['/tmp/explicit.jar'], ['custom'], 3, false, false)
-        def inferred = org.apache.groovy.lsp.internal.compile.WorkspaceLayout.withInferred(settings, [])
+        def inferred = WorkspaceLayout.withInferred(settings, [])
         assert inferred.classpath == ['/tmp/explicit.jar']
         assert inferred.sourcePaths == ['custom']
     }
diff --git a/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/internal/feature/MetalsInspiredTest.groovy b/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/internal/feature/MetalsInspiredTest.groovy
index 308e428ccb..97a5d1b75e 100644
--- a/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/internal/feature/MetalsInspiredTest.groovy
+++ b/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/internal/feature/MetalsInspiredTest.groovy
@@ -19,10 +19,14 @@
 package org.apache.groovy.lsp.internal.feature
 
 import org.apache.groovy.lsp.internal.LspFixture
+import org.apache.groovy.lsp.internal.compile.CompilerSettings
+import org.apache.groovy.lsp.internal.compile.GroovyCompiler
 import org.apache.groovy.lsp.internal.compile.Identifiers
 import org.apache.groovy.lsp.internal.compile.ImportSupport
 import org.apache.groovy.lsp.internal.compile.PackageGuess
 import org.apache.groovy.lsp.internal.position.PositionEncoding
+import org.apache.groovy.lsp.internal.workspace.TextDocument
+import org.eclipse.lsp4j.CodeActionContext
 import org.eclipse.lsp4j.CodeActionParams
 import org.eclipse.lsp4j.Diagnostic
 import org.eclipse.lsp4j.DocumentOnTypeFormattingParams
@@ -31,6 +35,7 @@ import org.eclipse.lsp4j.HoverParams
 import org.eclipse.lsp4j.Position
 import org.eclipse.lsp4j.Range
 import org.eclipse.lsp4j.TextDocumentIdentifier
+import org.eclipse.lsp4j.jsonrpc.messages.Either
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.Test
 
@@ -47,12 +52,12 @@ final class MetalsInspiredTest {
 
     @Test
     void unusedImportIsDetectedFromSource() {
-        def compiler = new org.apache.groovy.lsp.internal.compile.GroovyCompiler()
+        def compiler = new GroovyCompiler()
         def uri = URI.create('file:///tmp/Unused.groovy')
         def src = 'import java.util.concurrent.ConcurrentHashMap\nclass Hello {}\n'
         def snapshot = compiler.compile(
-                [new org.apache.groovy.lsp.internal.workspace.TextDocument(uri, 'groovy', 1, src)],
-                [], org.apache.groovy.lsp.internal.compile.CompilerSettings.defaults(),
+                [new TextDocument(uri, 'groovy', 1, src)],
+                [], CompilerSettings.defaults(),
                 MetalsInspiredTest.classLoader)
         def unused = ImportSupport.unused(snapshot.get(uri))
         assert unused
@@ -74,7 +79,7 @@ final class MetalsInspiredTest {
         assert hints[0].tags
         def actions = fixture.server.textDocumentService.codeAction(
                 new CodeActionParams(new TextDocumentIdentifier(uri),
-                        hints[0].range, new org.eclipse.lsp4j.CodeActionContext(hints))).get()
+                        hints[0].range, new CodeActionContext(hints))).get()
         assert actions.any { it.getRight().title == 'Remove unused imports' }
     }
 
@@ -89,7 +94,7 @@ final class MetalsInspiredTest {
         def actions = fixture.server.textDocumentService.codeAction(
                 new CodeActionParams(new TextDocumentIdentifier(uri),
                         new Range(new Position(1, 6), new Position(1, 11)),
-                        new org.eclipse.lsp4j.CodeActionContext([]))).get()
+                        new CodeActionContext([]))).get()
         def impl = actions.find { it.getRight().title == 'Implement abstract methods' }
         assert impl != null
         def edit = impl.getRight().edit.changes.values().flatten()[0]
@@ -103,10 +108,10 @@ final class MetalsInspiredTest {
         def uri = fixture.open('Use.groovy', 'class Use {}\n')
         def diagnostic = new Diagnostic()
         diagnostic.range = new Range(new Position(0, 0), new Position(0, 1))
-        diagnostic.message = org.eclipse.lsp4j.jsonrpc.messages.Either.forLeft('unable to resolve class Widget')
+        diagnostic.message = Either.forLeft('unable to resolve class Widget')
         def actions = fixture.server.textDocumentService.codeAction(
                 new CodeActionParams(new TextDocumentIdentifier(uri), diagnostic.range,
-                        new org.eclipse.lsp4j.CodeActionContext([diagnostic]))).get()
+                        new CodeActionContext([diagnostic]))).get()
         assert actions.any { it.getRight().title == 'Create class Widget' }
         def stub = actions.find { it.getRight().title == 'Create class Widget' }.getRight().edit.changes.values().flatten()[0]
         assert stub.newText.contains('class Widget')
@@ -123,7 +128,7 @@ final class MetalsInspiredTest {
         def actions = fixture.server.textDocumentService.codeAction(
                 new CodeActionParams(new TextDocumentIdentifier(uri),
                         new Range(new Position(1, 8), new Position(1, 12)),
-                        new org.eclipse.lsp4j.CodeActionContext([]))).get()
+                        new CodeActionContext([]))).get()
         def inferred = actions.find { it.getRight().title.startsWith('Insert inferred type') }
         assert inferred != null
         assert inferred.getRight().edit.changes.values().flatten()[0].newText in ['String', 'GString']
diff --git a/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/internal/feature/NavigationIdentityTest.groovy b/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/internal/feature/NavigationIdentityTest.groovy
index 20a06c1a66..79916b7a64 100644
--- a/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/internal/feature/NavigationIdentityTest.groovy
+++ b/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/internal/feature/NavigationIdentityTest.groovy
@@ -23,8 +23,10 @@ import org.eclipse.lsp4j.CallHierarchyIncomingCallsParams
 import org.eclipse.lsp4j.CallHierarchyOutgoingCallsParams
 import org.eclipse.lsp4j.CallHierarchyPrepareParams
 import org.eclipse.lsp4j.DefinitionParams
+import org.eclipse.lsp4j.DocumentLinkParams
 import org.eclipse.lsp4j.ExecuteCommandParams
 import org.eclipse.lsp4j.HoverParams
+import org.eclipse.lsp4j.MarkupContent
 import org.eclipse.lsp4j.Position
 import org.eclipse.lsp4j.PrepareRenameParams
 import org.eclipse.lsp4j.ReferenceContext
@@ -35,6 +37,7 @@ import org.eclipse.lsp4j.TextDocumentIdentifier
 import org.eclipse.lsp4j.TypeHierarchyPrepareParams
 import org.eclipse.lsp4j.TypeHierarchySubtypesParams
 import org.eclipse.lsp4j.TypeHierarchySupertypesParams
+import org.eclipse.lsp4j.WorkspaceEdit
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.Test
 
@@ -59,7 +62,7 @@ final class NavigationIdentityTest {
         def id = new TextDocumentIdentifier(uri)
         def hover = fixture.server.textDocumentService.hover(new HoverParams(id, new Position(1, 27))).get()
         assert hover != null
-        def value = hover.contents instanceof org.eclipse.lsp4j.MarkupContent
+        def value = hover.contents instanceof MarkupContent
                 ? hover.contents.value
                 : hover.contents.getRight().value
         assert value.contains('foo')
@@ -138,7 +141,7 @@ final class NavigationIdentityTest {
             '''.stripIndent())
         def edit = fixture.server.workspaceService.executeCommand(
                 new ExecuteCommandParams('groovy.lsp.organizeImports', [uri])).get()
-        assert edit instanceof org.eclipse.lsp4j.WorkspaceEdit
+        assert edit instanceof WorkspaceEdit
         def replacement = edit.changes.values().flatten()[0].newText
         assert replacement.contains('import java.io.*')
         assert replacement.contains('import java.util.LinkedList as LL')
@@ -202,7 +205,7 @@ final class NavigationIdentityTest {
             class Hello {}
             '''.stripIndent())
         def links = fixture.server.textDocumentService.documentLink(
-                new org.eclipse.lsp4j.DocumentLinkParams(new TextDocumentIdentifier(uri))).get()
+                new DocumentLinkParams(new TextDocumentIdentifier(uri))).get()
         assert links.every { it.target == null || it.target.contains('://') }
     }
 
diff --git a/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/internal/feature/SupportServicesTest.groovy b/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/internal/feature/SupportServicesTest.groovy
index fe2d7a9587..d23ccb1f10 100644
--- a/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/internal/feature/SupportServicesTest.groovy
+++ b/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/internal/feature/SupportServicesTest.groovy
@@ -22,6 +22,8 @@ import org.apache.groovy.lsp.internal.LspFixture
 import org.apache.groovy.lsp.internal.compile.WorkspaceScanner
 import org.apache.groovy.lsp.internal.position.PositionEncoding
 import org.apache.groovy.lsp.internal.protocol.ServerCapabilityFactory
+import org.apache.groovy.lsp.internal.workspace.TextDocument
+import org.eclipse.lsp4j.CodeActionContext
 import org.eclipse.lsp4j.CodeActionParams
 import org.eclipse.lsp4j.CodeLensParams
 import org.eclipse.lsp4j.Diagnostic
@@ -37,6 +39,7 @@ import org.eclipse.lsp4j.SemanticTokensParams
 import org.eclipse.lsp4j.SignatureHelpParams
 import org.eclipse.lsp4j.TextDocumentIdentifier
 import org.eclipse.lsp4j.WorkspaceSymbolParams
+import org.eclipse.lsp4j.jsonrpc.messages.Either
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.Test
 
@@ -71,11 +74,11 @@ final class SupportServicesTest {
         assert lenses != null
         def diagnostic = new Diagnostic()
         diagnostic.range = new Range(new Position(0, 0), new Position(0, 1))
-        diagnostic.message = org.eclipse.lsp4j.jsonrpc.messages.Either.forLeft('unable to resolve class Foo')
+        diagnostic.message = Either.forLeft('unable to resolve class Foo')
         diagnostic.severity = DiagnosticSeverity.Error
         def actions = fixture.server.textDocumentService.codeAction(
                 new CodeActionParams(id, new Range(new Position(0, 0), new Position(0, 1)),
-                        new org.eclipse.lsp4j.CodeActionContext([diagnostic]))).get()
+                        new CodeActionContext([diagnostic]))).get()
         assert actions.any { it.getRight().title.contains('Organize') }
         def hints = fixture.server.textDocumentService.inlayHint(
                 new InlayHintParams(id, new Range(new Position(0, 0), new Position(3, 0)))).get()
@@ -132,12 +135,12 @@ final class SupportServicesTest {
 
     @Test
     void completionPrefixAndMemberAccess() {
-        def doc = new org.apache.groovy.lsp.internal.workspace.TextDocument(
+        def doc = new TextDocument(
                 URI.create('file:///tmp/A.groovy'), 'groovy', 1, 'hello.wo')
         def prefix = CompletionService.prefixAt(doc, new Position(0, 8), PositionEncoding.UTF16)
         assert prefix == 'wo'
         assert CompletionService.isMemberAccess(doc, new Position(0, 8), PositionEncoding.UTF16)
-        def plain = new org.apache.groovy.lsp.internal.workspace.TextDocument(
+        def plain = new TextDocument(
                 URI.create('file:///tmp/A.groovy'), 'groovy', 1, 'cla')
         assert !CompletionService.isMemberAccess(plain, new Position(0, 3), PositionEncoding.UTF16)
         assert CompletionService.prefixAt(plain, new Position(0, 3), PositionEncoding.UTF16) == 'cla'
diff --git a/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/internal/position/PositionsTest.groovy b/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/internal/position/PositionsTest.groovy
index 93489f1add..f4eb172d86 100644
--- a/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/internal/position/PositionsTest.groovy
+++ b/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/internal/position/PositionsTest.groovy
@@ -21,6 +21,9 @@ package org.apache.groovy.lsp.internal.position
 import org.codehaus.groovy.ast.ASTNode
 import org.codehaus.groovy.ast.ClassHelper
 import org.codehaus.groovy.ast.ClassNode
+import org.codehaus.groovy.ast.expr.ArgumentListExpression
+import org.codehaus.groovy.ast.expr.MethodCallExpression
+import org.codehaus.groovy.ast.expr.VariableExpression
 import org.eclipse.lsp4j.Position
 import org.junit.jupiter.api.Test
 
@@ -105,10 +108,10 @@ final class PositionsTest {
 
     @Test
     void identifierRangeUsesCallNameNotArgumentList() {
-        def call = new org.codehaus.groovy.ast.expr.MethodCallExpression(
-                new org.codehaus.groovy.ast.expr.VariableExpression('this'),
+        def call = new MethodCallExpression(
+                new VariableExpression('this'),
                 'foo',
-                new org.codehaus.groovy.ast.expr.ArgumentListExpression())
+                new ArgumentListExpression())
         call.lineNumber = 1
         call.columnNumber = 1
         call.lastLineNumber = 1
diff --git a/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/internal/protocol/ProtocolCoverageTest.groovy b/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/internal/protocol/ProtocolCoverageTest.groovy
index a374c8a7c5..26afacc673 100644
--- a/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/internal/protocol/ProtocolCoverageTest.groovy
+++ b/subprojects/groovy-lsp/src/test/groovy/org/apache/groovy/lsp/internal/protocol/ProtocolCoverageTest.groovy
@@ -32,6 +32,7 @@ import org.eclipse.lsp4j.DocumentDiagnosticParams
 import org.eclipse.lsp4j.DocumentOnTypeFormattingParams
 import org.eclipse.lsp4j.DocumentRangeFormattingParams
 import org.eclipse.lsp4j.ExecuteCommandParams
+import org.eclipse.lsp4j.FileChangeType
 import org.eclipse.lsp4j.FileEvent
 import org.eclipse.lsp4j.FormattingOptions
 import org.eclipse.lsp4j.Position
@@ -82,7 +83,7 @@ final class ProtocolCoverageTest {
         assert tds.typeHierarchySubtypes(new TypeHierarchySubtypesParams()).get().isEmpty()
 
         ws.didChangeConfiguration(new DidChangeConfigurationParams([groovy: [grapeEnabled: false, classpath: []]]))
-        ws.didChangeWatchedFiles(new DidChangeWatchedFilesParams([new FileEvent(uri, org.eclipse.lsp4j.FileChangeType.Changed)]))
+        ws.didChangeWatchedFiles(new DidChangeWatchedFilesParams([new FileEvent(uri, FileChangeType.Changed)]))
         def folder = Files.createTempDirectory('groovy-lsp-ws')
         ws.didChangeWorkspaceFolders(new DidChangeWorkspaceFoldersParams(new WorkspaceFoldersChangeEvent(
                 [new WorkspaceFolder(folder.toUri().toString(), 'root')], [])))