diff --git a/java/java.source.base/src/org/netbeans/api/java/source/AssignComments.java b/java/java.source.base/src/org/netbeans/api/java/source/AssignComments.java index 05b11d0d5798..8f23dbcfd145 100644 --- a/java/java.source.base/src/org/netbeans/api/java/source/AssignComments.java +++ b/java/java.source.base/src/org/netbeans/api/java/source/AssignComments.java @@ -213,9 +213,9 @@ private int setupLimit(Tree t) { if (annTs == null || annTs.isEmpty()) { return pos; } - int modPos = ((JCTree)annTs.get(0)).pos; + int modPos = ((JCTree)annTs.getFirst()).pos; if (modPos < pos) { - child = annTs.get(0); + child = annTs.getFirst(); } else { child = null; } @@ -310,7 +310,7 @@ private void collect(Tree tree, boolean preceding, boolean trailing) { ClassTree clazz = (ClassTree)tree; int cnt = clazz.getMembers().size(); if (cnt == 1) { - Tree mt = clazz.getMembers().get(0); + Tree mt = clazz.getMembers().getFirst(); if (mt.getKind() == Tree.Kind.METHOD && info.getTreeUtilities().isSynthetic(new TreePath(new TreePath(unit), mt))) { cnt--; } diff --git a/java/java.source.base/src/org/netbeans/api/java/source/ClasspathInfo.java b/java/java.source.base/src/org/netbeans/api/java/source/ClasspathInfo.java index c80f9cb83d86..046d983ccf5b 100644 --- a/java/java.source.base/src/org/netbeans/api/java/source/ClasspathInfo.java +++ b/java/java.source.base/src/org/netbeans/api/java/source/ClasspathInfo.java @@ -36,11 +36,9 @@ import java.util.function.Function; import java.util.logging.Logger; import java.util.logging.Level; -import java.util.stream.Collectors; import javax.swing.event.ChangeListener; import javax.swing.text.Document; import javax.tools.JavaFileManager; -import javax.tools.StandardLocation; import org.netbeans.api.annotations.common.CheckForNull; import org.netbeans.api.annotations.common.NonNull; import org.netbeans.api.annotations.common.NullAllowed; @@ -653,7 +651,7 @@ private Map> getCache() { } }) .filter((u) -> u != null) - .collect(Collectors.toList()); + .toList(); if (cfs.size() > 1) { for (URL u : cfs) { res.put(u, cfs); diff --git a/java/java.source.base/src/org/netbeans/api/java/source/CompilationInfo.java b/java/java.source.base/src/org/netbeans/api/java/source/CompilationInfo.java index 938a266081cc..5cd074801450 100644 --- a/java/java.source.base/src/org/netbeans/api/java/source/CompilationInfo.java +++ b/java/java.source.base/src/org/netbeans/api/java/source/CompilationInfo.java @@ -484,7 +484,7 @@ ModuleElement getModule() { //preconditions checked by getTopLevelElements or getCompilationUnit: if (this.impl.isClassFile()) { List topElement = getTopLevelElements(); - return !topElement.isEmpty() ? getElements().getModuleOf(topElement.get(0)) + return !topElement.isEmpty() ? getElements().getModuleOf(topElement.getFirst()) : null; } else { CompilationUnitTree cu = getCompilationUnit(); diff --git a/java/java.source.base/src/org/netbeans/api/java/source/DocTreePathHandle.java b/java/java.source.base/src/org/netbeans/api/java/source/DocTreePathHandle.java index 9bd36e801730..b64b100a1849 100644 --- a/java/java.source.base/src/org/netbeans/api/java/source/DocTreePathHandle.java +++ b/java/java.source.base/src/org/netbeans/api/java/source/DocTreePathHandle.java @@ -237,7 +237,7 @@ private DocTreeDelegate(Position position, KindPath kindPath, TreePathHandle tre this.position = position; this.treePathHandle = treePathHandle; if (kindPath != null) { - this.kind = kindPath.kindPath.get(0); + this.kind = kindPath.kindPath.getFirst(); } else { this.kind = null; } diff --git a/java/java.source.base/src/org/netbeans/api/java/source/ElementHandle.java b/java/java.source.base/src/org/netbeans/api/java/source/ElementHandle.java index dc6732676637..fdd0e8d2cd3e 100644 --- a/java/java.source.base/src/org/netbeans/api/java/source/ElementHandle.java +++ b/java/java.source.base/src/org/netbeans/api/java/source/ElementHandle.java @@ -26,11 +26,8 @@ import com.sun.tools.javac.jvm.Target; import com.sun.tools.javac.tree.JCTree; import com.sun.tools.javac.util.Name; -import java.lang.ref.WeakReference; import java.util.Arrays; import java.util.List; -import java.util.Map; -import java.util.WeakHashMap; import java.util.logging.Logger; import java.util.logging.Level; import javax.lang.model.element.Element; @@ -50,7 +47,6 @@ import org.netbeans.modules.java.source.ElementUtils; import org.netbeans.modules.java.source.usages.ClassFileUtil; import org.openide.util.Parameters; -import org.openide.util.WeakSet; /** * Represents a handle for {@link Element} which can be kept and later resolved diff --git a/java/java.source.base/src/org/netbeans/api/java/source/ElementUtilities.java b/java/java.source.base/src/org/netbeans/api/java/source/ElementUtilities.java index 558af0d37806..21805a3e09d0 100644 --- a/java/java.source.base/src/org/netbeans/api/java/source/ElementUtilities.java +++ b/java/java.source.base/src/org/netbeans/api/java/source/ElementUtilities.java @@ -92,7 +92,6 @@ import org.netbeans.api.annotations.common.NullAllowed; import org.netbeans.modules.java.source.builder.ElementsService; import org.netbeans.modules.java.source.base.SourceLevelUtils; -import org.openide.util.Pair; import org.openide.util.Parameters; /** @@ -756,8 +755,7 @@ public List findOverridableMethods(TypeElement type } } } - Collections.reverse(overridable); - return overridable; + return overridable.reversed(); } /** @@ -881,7 +879,7 @@ public boolean isEffectivelyFinal(VariableElement e) { if (paramIndex > lastParamStart) { String type = parameters.substring(lastParamStart, paramIndex).replace("...", "[]"); //TODO: handle varargs - types.add(info.getTypes().erasure(info.getTreeUtilities().parseType(type, info.getTopLevelElements().get(0)/*XXX*/))); + types.add(info.getTypes().erasure(info.getTreeUtilities().parseType(type, info.getTopLevelElements().getFirst()/*XXX*/))); lastParamStart = paramIndex + 1; } break; @@ -1104,7 +1102,7 @@ private ExecutableElement recordCanonicalConstructor(TypeElement recordType) { todo.add(module); while (!todo.isEmpty()) { - ModuleElement currentlyProcessing = todo.remove(todo.size() - 1); + ModuleElement currentlyProcessing = todo.removeLast(); if (!seen.add(currentlyProcessing)) { continue; @@ -1231,12 +1229,7 @@ private List findUnimplementedMethods(TypeElement i } // if not defaults, prune the defaults out: if (!includeDefaults && element.getKind() == ElementKind.INTERFACE) { - for (Iterator it = undef.iterator(); it.hasNext();) { - ExecutableElement ee = it.next(); - if (ee.getModifiers().contains(Modifier.DEFAULT)) { - it.remove(); - } - } + undef.removeIf(ee -> ee.getModifiers().contains(Modifier.DEFAULT)); } return undef; } diff --git a/java/java.source.base/src/org/netbeans/api/java/source/GeneratorUtilities.java b/java/java.source.base/src/org/netbeans/api/java/source/GeneratorUtilities.java index 6a70a939c00c..8ef63be0566d 100644 --- a/java/java.source.base/src/org/netbeans/api/java/source/GeneratorUtilities.java +++ b/java/java.source.base/src/org/netbeans/api/java/source/GeneratorUtilities.java @@ -364,10 +364,10 @@ public ClassTree insertClassMembers(ClassTree clazz, List member } if (lastMember != null) { // do not move the comments tied to last member in guarded block: - moveCommentsAfterOffset(copy, lastMember, members.get(0), offset, doc); + moveCommentsAfterOffset(copy, lastMember, members.getFirst(), offset, doc); } if (nextMember != null) { - moveCommentsBeforeOffset(copy, nextMember, members.get(members.size() - 1), offset, doc); + moveCommentsBeforeOffset(copy, nextMember, members.getLast(), offset, doc); } TreeMaker tm = copy.getTreeMaker(); ClassTree newClazz = clazz; @@ -530,12 +530,8 @@ void registerTreeName(Tree t, Name n) { } private void addDependency(Name n) { - Collection deps = dependencies.get(member); - if (deps == null) { - deps = new ArrayList<>(3); - dependencies.put(member, deps); - } - deps.add(n); + dependencies.computeIfAbsent(member, k -> new ArrayList<>(3)) + .add(n); } // the following Nodes would just confuse the Identifier scanner: @@ -2146,7 +2142,7 @@ private static String name(Tree tree) { private static String[] correspondingGSNames(Tree member) { if (isSetter(member)) { String name = name(member); - VariableTree param = ((MethodTree)member).getParameters().get(0); + VariableTree param = ((MethodTree)member).getParameters().getFirst(); if (param.getType().getKind() == Tree.Kind.PRIMITIVE_TYPE && ((PrimitiveTypeTree)param.getType()).getPrimitiveTypeKind() == TypeKind.BOOLEAN) { return new String[] {'g' + name.substring(1), "is" + name.substring(3)}; } @@ -2322,10 +2318,10 @@ public int compare(Object o1, Object o2) { */ private void tagFirst(List methods) { //tag first method body, if any - if (methods.size() > 0) { - BlockTree body = methods.get(0).getBody(); + if (!methods.isEmpty()) { + BlockTree body = methods.getFirst().getBody(); if (body != null && !body.getStatements().isEmpty()) { - copy.tag(body.getStatements().get(0), "methodBodyTag"); // NOI18N + copy.tag(body.getStatements().getFirst(), "methodBodyTag"); // NOI18N } } } diff --git a/java/java.source.base/src/org/netbeans/api/java/source/JavaSource.java b/java/java.source.base/src/org/netbeans/api/java/source/JavaSource.java index c9c9c504bb33..6206e86e0aa0 100644 --- a/java/java.source.base/src/org/netbeans/api/java/source/JavaSource.java +++ b/java/java.source.base/src/org/netbeans/api/java/source/JavaSource.java @@ -19,15 +19,11 @@ package org.netbeans.api.java.source; -import com.sun.source.tree.Tree; import com.sun.tools.javac.api.JavacTaskImpl; import com.sun.tools.javac.code.Symbol.CompletionFailure; -import com.sun.tools.javac.tree.JCTree; -import com.sun.tools.javac.util.Log; import java.io.IOException; import java.lang.ref.Reference; import java.lang.ref.WeakReference; -import java.net.URL; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; diff --git a/java/java.source.base/src/org/netbeans/api/java/source/ModificationResult.java b/java/java.source.base/src/org/netbeans/api/java/source/ModificationResult.java index ee316276f130..79776bce6857 100644 --- a/java/java.source.base/src/org/netbeans/api/java/source/ModificationResult.java +++ b/java/java.source.base/src/org/netbeans/api/java/source/ModificationResult.java @@ -19,8 +19,6 @@ package org.netbeans.api.java.source; -import com.sun.tools.javac.api.JavacTaskImpl; -import com.sun.tools.javac.util.Log; import java.io.*; import java.lang.ref.WeakReference; diff --git a/java/java.source.base/src/org/netbeans/api/java/source/ScanUtils.java b/java/java.source.base/src/org/netbeans/api/java/source/ScanUtils.java index da815f1286b4..591ab93f2d6b 100644 --- a/java/java.source.base/src/org/netbeans/api/java/source/ScanUtils.java +++ b/java/java.source.base/src/org/netbeans/api/java/source/ScanUtils.java @@ -26,7 +26,6 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicReference; import javax.lang.model.element.Element; -import javax.lang.model.type.TypeMirror; import javax.swing.SwingUtilities; import org.netbeans.api.annotations.common.NonNull; import org.netbeans.api.annotations.common.NullAllowed; diff --git a/java/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java b/java/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java index 66fa558a893d..4fa41d5939c4 100644 --- a/java/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java +++ b/java/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java @@ -611,7 +611,7 @@ private static FileObject findSourceForBinary(FileObject binaryRoot, FileObject ClassPath sourcePath = ClassPathSupport.createClassPath(sourceRoots); LinkedList folders = new LinkedList<>(sourcePath.findAllResources(pkgName)); if (isPkg) { - return folders.isEmpty() ? binary : folders.get(0); + return folders.isEmpty() ? binary : folders.getFirst(); } final boolean caseSensitive = isCaseSensitive (); final List fnames = new ArrayList<>(); @@ -621,7 +621,7 @@ private static FileObject findSourceForBinary(FileObject binaryRoot, FileObject } folders.addFirst(binary); if (fnames.size() == 1) { - FileObject match = findMatchingChild(fnames.get(0), folders, caseSensitive); + FileObject match = findMatchingChild(fnames.getFirst(), folders, caseSensitive); if (match != null) { return match; } @@ -1087,7 +1087,7 @@ private static boolean mainCandidate(ExecutableElement method) { if (params.size() > 1) { return false; } else if (params.size() == 1) { - TypeMirror param = params.get(0).asType(); + TypeMirror param = params.getFirst().asType(); if (param.getKind() != TypeKind.ARRAY) { return false; } @@ -1439,7 +1439,7 @@ private static ClassPath createClassPath (ClasspathInfo cpInfo, PathKind kind) t @NonNull private static Set mapToURLs( @NonNull final Collection fos) { - final Set res = new HashSet<>(fos.size()); + final Set res = HashSet.newHashSet(fos.size()); for (FileObject fo : fos) { res.add(fo.toURL()); } @@ -1530,7 +1530,7 @@ public static String classNameFor(ClasspathInfo info, String relativePath, Neste } } catch (IOException ioe) {} if (!lines.isEmpty()) { - return lines.get(0); + return lines.getFirst(); } } if(fqnForNestedClass != null) { diff --git a/java/java.source.base/src/org/netbeans/api/java/source/TranslateIdentifier.java b/java/java.source.base/src/org/netbeans/api/java/source/TranslateIdentifier.java index c1f498e69ce9..dd6107d10757 100644 --- a/java/java.source.base/src/org/netbeans/api/java/source/TranslateIdentifier.java +++ b/java/java.source.base/src/org/netbeans/api/java/source/TranslateIdentifier.java @@ -19,7 +19,6 @@ package org.netbeans.api.java.source; -import com.sun.source.tree.CaseTree; import com.sun.source.tree.CompilationUnitTree; import com.sun.source.tree.ConstantCaseLabelTree; import com.sun.source.tree.IdentifierTree; diff --git a/java/java.source.base/src/org/netbeans/api/java/source/TreeMaker.java b/java/java.source.base/src/org/netbeans/api/java/source/TreeMaker.java index 78a5ebbab65d..9353042c6964 100644 --- a/java/java.source.base/src/org/netbeans/api/java/source/TreeMaker.java +++ b/java/java.source.base/src/org/netbeans/api/java/source/TreeMaker.java @@ -67,7 +67,6 @@ import java.util.List; import java.util.Set; -import java.util.stream.Collectors; import org.netbeans.api.annotations.common.NonNull; import org.netbeans.api.annotations.common.NullAllowed; @@ -330,7 +329,7 @@ private List toCaseLabelTrees(List patt return delegate.PatternCaseLabel((PatternTree) p); } throw new IllegalArgumentException("Invalid pattern kind: " + p.getKind()); //NOI18N - }).collect(Collectors.toList()); + }).toList(); } /** diff --git a/java/java.source.base/src/org/netbeans/api/java/source/TreePathHandle.java b/java/java.source.base/src/org/netbeans/api/java/source/TreePathHandle.java index 14b097f0afb8..348572e050a5 100644 --- a/java/java.source.base/src/org/netbeans/api/java/source/TreePathHandle.java +++ b/java/java.source.base/src/org/netbeans/api/java/source/TreePathHandle.java @@ -400,7 +400,7 @@ private TreeDelegate(Position position, KindPath kindPath, FileObject file, Elem this.enclosingElement = element; this.correspondingEl = correspondingEl; if (kindPath != null) { - this.kind = kindPath.kindPath.get(0); + this.kind = kindPath.kindPath.getFirst(); } else { if (correspondingEl != null) { ElementKind k = correspondingEl.getKind(); diff --git a/java/java.source.base/src/org/netbeans/api/java/source/TreeUtilities.java b/java/java.source.base/src/org/netbeans/api/java/source/TreeUtilities.java index 240c618ddabc..2c5be8d31f34 100644 --- a/java/java.source.base/src/org/netbeans/api/java/source/TreeUtilities.java +++ b/java/java.source.base/src/org/netbeans/api/java/source/TreeUtilities.java @@ -511,7 +511,7 @@ public Void visitEnhancedForLoop(EnhancedForLoopTree node, Void p) { long endPos = sourcePositions.getEndPosition(path.getCompilationUnit(), path.getCompilationUnit()); if (pos > endPos) { List classes = path.getCompilationUnit().getTypeDecls(); - if (classes.size() == 1 && classes.get(0) instanceof JCClassDecl clazz && (clazz.mods.flags & Flags.IMPLICIT_CLASS) != 0) { + if (classes.size() == 1 && classes.getFirst() instanceof JCClassDecl clazz && (clazz.mods.flags & Flags.IMPLICIT_CLASS) != 0) { return new TreePath(path, clazz); } } @@ -541,7 +541,7 @@ public Void visitEnhancedForLoop(EnhancedForLoopTree node, Void p) { if (path.getLeaf().getKind() == Tree.Kind.EMPTY_STATEMENT || path.getLeaf().getKind() == Tree.Kind.TRY || (path.getLeaf().getKind() == Tree.Kind.FOR_LOOP && - tokenList.offset() <= sourcePositions.getStartPosition(path.getCompilationUnit(), ((ForLoopTree)path.getLeaf()).getUpdate().get(0)))) + tokenList.offset() <= sourcePositions.getStartPosition(path.getCompilationUnit(), ((ForLoopTree)path.getLeaf()).getUpdate().getFirst()))) break; if (path.getParentPath().getLeaf().getKind() == Tree.Kind.TRY && ((TryTree) path.getParentPath().getLeaf()).getResources().contains(path.getLeaf())) { @@ -772,7 +772,7 @@ public ExpressionTree parseVariableInitializer(String init, SourcePositions[] so */ public BlockTree parseStaticBlock(String block, SourcePositions[] sourcePositions) { return doParse("{ class C { " + block + " }", sourcePositions, "{ class C { ".length(), p -> { - JCClassDecl decl = (JCClassDecl) ((BlockTree) p.parseStatement()).getStatements().get(0); + JCClassDecl decl = (JCClassDecl) ((BlockTree) p.parseStatement()).getStatements().getFirst(); return decl.defs.head.getKind() == Kind.BLOCK ? (BlockTree) decl.defs.head : null; //check result }); } diff --git a/java/java.source.base/src/org/netbeans/api/java/source/TypeMirrorHandle.java b/java/java.source.base/src/org/netbeans/api/java/source/TypeMirrorHandle.java index 992bba8102ee..5d26a40bd7c4 100644 --- a/java/java.source.base/src/org/netbeans/api/java/source/TypeMirrorHandle.java +++ b/java/java.source.base/src/org/netbeans/api/java/source/TypeMirrorHandle.java @@ -124,7 +124,7 @@ private TypeMirrorHandle(TypeKind kind, ElementHandle element private static TypeMirrorHandle create(T tm, Map map) { TypeMirrorHandle handle = map.get(tm); if (handle != null) - return handle.typeMirrors == null ? handle : (TypeMirrorHandle)handle.typeMirrors.get(0); + return handle.typeMirrors == null ? handle : (TypeMirrorHandle)handle.typeMirrors.getFirst(); map.put(tm, new TypeMirrorHandle(null, null, null)); TypeKind kind = tm.getKind(); ElementHandle element = null; @@ -164,7 +164,7 @@ private static TypeMirrorHandle create(T tm, Map map) { if (kind == null) { - TypeMirrorHandle handle = typeMirrors.get(0); - PlaceholderType pt = map.get(handle); - if (pt == null) { - pt = new PlaceholderType(); - map.put(handle, pt); - } + TypeMirrorHandle handle = typeMirrors.getFirst(); + PlaceholderType pt = map.computeIfAbsent(handle, k -> new PlaceholderType()); return pt.delegate != null ? (T)pt.delegate : (T)pt; } switch (kind) { @@ -305,7 +301,7 @@ private T resolve(CompilationInfo info, Map m } return (T)dt; case ARRAY: - TypeMirror resolved = typeMirrors.get(0).resolve(info, map); + TypeMirror resolved = typeMirrors.getFirst().resolve(info, map); if (resolved == null) return null; ArrayType at = info.getTypes().getArrayType(resolved); @@ -319,7 +315,7 @@ private T resolve(CompilationInfo info, Map m Element e = element.resolve(info); if (!(e instanceof TypeSymbol)) return null; - TypeMirrorHandle lBound = typeMirrors.get(0); + TypeMirrorHandle lBound = typeMirrors.getFirst(); TypeMirror lowerBound = lBound != null ? lBound.resolve(info, map) : null; TypeMirrorHandle uBound = typeMirrors.get(1); TypeMirror upperBound = uBound != null ? uBound.resolve(info, map) : null; @@ -331,7 +327,7 @@ private T resolve(CompilationInfo info, Map m } return (T)tv; case WILDCARD: - TypeMirrorHandle eBound = typeMirrors.get(0); + TypeMirrorHandle eBound = typeMirrors.getFirst(); TypeMirror extendsBound = eBound != null ? eBound.resolve(info, map) : null; TypeMirrorHandle sBound = typeMirrors.get(1); TypeMirror superBound = sBound != null ? sBound.resolve(info, map) : null; diff --git a/java/java.source.base/src/org/netbeans/api/java/source/WorkingCopy.java b/java/java.source.base/src/org/netbeans/api/java/source/WorkingCopy.java index 867a289a601e..c845d654e6f3 100644 --- a/java/java.source.base/src/org/netbeans/api/java/source/WorkingCopy.java +++ b/java/java.source.base/src/org/netbeans/api/java/source/WorkingCopy.java @@ -66,8 +66,6 @@ import com.sun.source.tree.TryTree; import com.sun.source.tree.VariableTree; import com.sun.source.util.DocTrees; -import com.sun.tools.javac.tree.JCTree.JCLambda; -import com.sun.tools.javac.tree.JCTree.JCVariableDecl; import java.util.Collection; import java.util.Comparator; @@ -98,7 +96,6 @@ import org.netbeans.modules.java.source.save.ElementOverlay; import org.netbeans.modules.java.source.save.ElementOverlay.FQNComputer; import org.netbeans.modules.java.source.transform.ImmutableDocTreeTranslator; -import org.netbeans.modules.java.source.transform.ImmutableTreeTranslator; import org.netbeans.modules.java.source.transform.TreeDuplicator; import org.netbeans.modules.parsing.api.Source; import org.netbeans.modules.parsing.impl.SourceAccessor; @@ -336,13 +333,8 @@ public synchronized void rewrite(@NonNull Tree tree, @NonNull DocTree oldTree, @ return; } - Map changesMap = docChanges.get(tree); - if(changesMap == null) { - changesMap = new IdentityHashMap(); - docChanges.put(tree, changesMap); - } - - changesMap.put(oldTree, newTree); + docChanges.computeIfAbsent(tree, k -> new IdentityHashMap()) + .put(oldTree, newTree); } /** @@ -464,7 +456,7 @@ public R accept(TreeVisitor visitor, D data) { */ synchronized void associateTree(Tree nue, Tree original, boolean force) { if (rewriteHints == null) { - rewriteHints = new HashMap(7); + rewriteHints = HashMap.newHashMap(7); } if (original == null) { @@ -486,7 +478,7 @@ private static String codeForCompilationUnit(CompilationUnitTree topLevel) throw return ((JCTree.JCCompilationUnit) topLevel).sourcefile.getCharContent(true).toString(); } - private static boolean REWRITE_WHOLE_FILE = Boolean.getBoolean(WorkingCopy.class.getName() + ".rewrite-whole-file"); + private static final boolean REWRITE_WHOLE_FILE = Boolean.getBoolean(WorkingCopy.class.getName() + ".rewrite-whole-file"); private void addSyntheticTrees(DiffContext diffContext, Tree node) { if (node == null) return ; @@ -671,7 +663,7 @@ public Void scan(Tree tree, Void p) { getCurrentPath(), tree)).size() > 1) { // start of a variable, which is a part of a variable group variableParent = getCurrentPath(); - lastVar = group.get(group.size() - 1) == tree; + lastVar = group.getLast() == tree; } else if (variableParent != null && getCurrentPath().getLeaf().getKind() == Tree.Kind.VARIABLE) { VariableTree vt = (VariableTree)getCurrentPath().getLeaf(); beginVariableDeclarator = vt.getModifiers() == tree || vt.getType() == tree; @@ -690,9 +682,7 @@ public Void scan(Tree tree, Void p) { } } pathsToRewrite.add(currentParent); - if (!parent2Rewrites.containsKey(currentParent)) { - parent2Rewrites.put(currentParent, new IdentityHashMap()); - } + parent2Rewrites.computeIfAbsent(currentParent, k -> new IdentityHashMap()); } Tree rev = changes.get(tree); Tree hint = resolveRewriteHint(tree); @@ -798,7 +788,7 @@ public Void visitClass(ClassTree node, Void p) { } } - Collections.reverse(classes); + classes = classes.reversed(); for (Pair ct : classes) { ia.classEntered(ct.first(), ct.second()); @@ -986,7 +976,7 @@ public int compare(int[] o1, int[] o2) { } private void addCommentsToContext(DiffContext context) { - Map m = new HashMap<>(usedComments.size()); + Map m = HashMap.newHashMap(usedComments.size()); for (Comment c : usedComments) { m.put(c.pos(), c); } @@ -1141,12 +1131,6 @@ public Object scan(Tree l, Object p) { } } - private static class CopyEntry { - private RelativePosition pos; - private Tree commentSource; - private boolean copyNonEmpty; - } - private Tree resolveRewriteHint(Tree orig) { Tree last; Tree target = null; @@ -1217,23 +1201,16 @@ FileObject doCreateFromTemplate(CompilationUnitTree cut) throws IOException { } else if (cut.getTypeDecls().isEmpty()) { kind = null; } else { - switch (cut.getTypeDecls().get(0).getKind()) { - case CLASS: - kind = ElementKind.CLASS; - break; - case INTERFACE: - kind = ElementKind.INTERFACE; - break; - case ANNOTATION_TYPE: - kind = ElementKind.ANNOTATION_TYPE; - break; - case ENUM: - kind = ElementKind.ENUM; - break; - default: - Logger.getLogger(WorkingCopy.class.getName()).log(Level.SEVERE, "Cannot resolve template for {0}", cut.getTypeDecls().get(0).getKind()); - kind = null; - } + kind = switch (cut.getTypeDecls().getFirst().getKind()) { + case CLASS -> ElementKind.CLASS; + case INTERFACE -> ElementKind.INTERFACE; + case ANNOTATION_TYPE -> ElementKind.ANNOTATION_TYPE; + case ENUM -> ElementKind.ENUM; + default -> { + Logger.getLogger(WorkingCopy.class.getName()).log(Level.SEVERE, "Cannot resolve template for {0}", cut.getTypeDecls().getFirst().getKind()); + yield null; + } + }; } FileObject template = FileUtil.getConfigFile(template(kind)); return doCreateFromTemplate(template, cut.getSourceFile()); diff --git a/java/java.source.base/src/org/netbeans/api/java/source/support/ProfileSupport.java b/java/java.source.base/src/org/netbeans/api/java/source/support/ProfileSupport.java index c83c1440c073..c407f3668b49 100644 --- a/java/java.source.base/src/org/netbeans/api/java/source/support/ProfileSupport.java +++ b/java/java.source.base/src/org/netbeans/api/java/source/support/ProfileSupport.java @@ -805,11 +805,7 @@ static TypeCache newInstance(Iterable bootClassPath) { @CheckForNull Profile profileForType(@NonNull final ClassName className) { final String binName = className.getInternalName(); - Object res = cache.get(binName); - if (res == null) { - res = findProfile(binName); - cache.put(binName, res); - } + Object res = cache.computeIfAbsent(binName, k -> findProfile(binName)); return res == UNKNOWN ? null : (Profile) res; } diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/JavaSourceUtilImpl.java b/java/java.source.base/src/org/netbeans/modules/java/source/JavaSourceUtilImpl.java index 5bc99f71daab..ac71e418ac45 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/JavaSourceUtilImpl.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/JavaSourceUtilImpl.java @@ -48,7 +48,6 @@ import java.util.function.Function; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import java.util.stream.StreamSupport; import javax.lang.model.element.Element; import javax.lang.model.element.ModuleElement; @@ -245,7 +244,7 @@ protected Map generate( StreamSupport.stream(attributed.spliterator(), false) .filter((e) -> e.getKind().isClass() || e.getKind().isInterface()) .map((e) -> (TypeElement)e) - .collect(Collectors.toList())); + .toList()); final Map result = new HashMap<>(); for (JavaFileObject jfo : generated) { if (jfo instanceof OutputFileManager.MemOutFileObject) { diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/ModuleNames.java b/java/java.source.base/src/org/netbeans/modules/java/source/ModuleNames.java index 252df8a00296..6fe876c15eba 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/ModuleNames.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/ModuleNames.java @@ -20,7 +20,6 @@ import com.sun.source.tree.CompilationUnitTree; import com.sun.source.tree.ModuleTree; -import com.sun.source.tree.Tree; import com.sun.tools.javac.api.JavacTaskImpl; import java.io.BufferedInputStream; import java.io.File; @@ -39,7 +38,6 @@ import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; -import java.util.stream.Collectors; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import org.netbeans.api.annotations.common.CheckForNull; @@ -117,7 +115,7 @@ public String getModuleName( //Project binary final CacheLine cl = getProjectModuleName( rootUrl, - Arrays.stream(sfbqRes.getRoots()).map(FileObject::toURL).collect(Collectors.toList()), + Arrays.stream(sfbqRes.getRoots()).map(FileObject::toURL).toList(), canUseSources); if (cl.getValueNoCheck() != null) { return register(rootUrl, cl); diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/builder/ASTService.java b/java/java.source.base/src/org/netbeans/modules/java/source/builder/ASTService.java index 804f7a4d92b9..d18aaced6f2c 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/builder/ASTService.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/builder/ASTService.java @@ -20,17 +20,14 @@ import javax.lang.model.element.Element; import javax.lang.model.type.TypeMirror; -import org.netbeans.api.java.source.*; import com.sun.source.tree.*; import com.sun.tools.javac.code.*; -import com.sun.tools.javac.code.Symbol.*; import com.sun.tools.javac.tree.JCTree; import com.sun.tools.javac.tree.JCTree.*; import com.sun.tools.javac.util.*; -import static com.sun.tools.javac.tree.JCTree.*; /** * A javac abstract syntax tree which maps all nodes to a single root. diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/builder/CommentHandlerService.java b/java/java.source.base/src/org/netbeans/modules/java/source/builder/CommentHandlerService.java index 3fbdf79fce7c..f49ee495c482 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/builder/CommentHandlerService.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/builder/CommentHandlerService.java @@ -24,7 +24,6 @@ import com.sun.source.tree.Tree; -import com.sun.tools.javac.tree.JCTree.*; import com.sun.tools.javac.util.Context; import java.util.*; diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/indexing/APTUtils.java b/java/java.source.base/src/org/netbeans/modules/java/source/indexing/APTUtils.java index ba5871e09eb4..8d75d598ef4e 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/indexing/APTUtils.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/indexing/APTUtils.java @@ -471,9 +471,7 @@ boolean verifyAttributes(FileObject fo, boolean checkOnly) { return vote; } } - final String cmpOptsStr = JavacParser.validateCompilerOptions(compilerOptions.getArguments(), null) - .stream() - .collect(Collectors.joining(" ")); //NOI18N + final String cmpOptsStr = String.join(" ", JavacParser.validateCompilerOptions(compilerOptions.getArguments(), null)); //NOI18N if (JavaIndex.ensureAttributeValue(url, COMPILER_OPTIONS, cmpOptsStr, checkOnly)) { JavaIndex.LOG.fine("forcing reindex due to compiler options change"); //NOI18N vote = true; @@ -629,7 +627,7 @@ private boolean verifyProcessorPath( .filter(pUsed) .map((f) -> Pair.of(f, f.isFile() ? f.length() : -1)) .filter(pModified) - .collect(Collectors.toList()); + .toList(); if (!times.isEmpty()) { LOG.log(Level.FINEST, "Important changed: {0}", times); //NOI18N for (Pair p : times) { diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/indexing/FQN2Files.java b/java/java.source.base/src/org/netbeans/modules/java/source/indexing/FQN2Files.java index 5af6b03d879c..2f39105e4f74 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/indexing/FQN2Files.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/indexing/FQN2Files.java @@ -33,7 +33,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import javax.lang.model.element.Element; -import javax.lang.model.element.ElementVisitor; import javax.lang.model.element.ModuleElement; import javax.lang.model.element.Name; import javax.lang.model.element.PackageElement; @@ -42,7 +41,6 @@ import javax.lang.model.element.VariableElement; import javax.lang.model.util.ElementScanner9; import javax.tools.JavaFileObject; -import org.openide.filesystems.FileObject; import org.openide.util.Exceptions; /** diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/indexing/VanillaCompileWorker.java b/java/java.source.base/src/org/netbeans/modules/java/source/indexing/VanillaCompileWorker.java index 11e1f8c9923e..be58255d8b7d 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/indexing/VanillaCompileWorker.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/indexing/VanillaCompileWorker.java @@ -308,8 +308,7 @@ protected ParsingOutput compile( } } else { for (Tree tree : unit.getKey().getTypeDecls()) { - if (tree instanceof JCTree) { - final JCTree jct = (JCTree)tree; + if (tree instanceof JCTree jct) { if (jct.getTag() == JCTree.Tag.CLASSDEF) { final Element sym = ((JCClassDecl)tree).sym; if (sym != null) @@ -329,7 +328,7 @@ protected ParsingOutput compile( activeTypes.stream() .filter((e) -> e.getKind().isClass() || e.getKind().isInterface()) .map ((e) -> (TypeElement)e) - .collect(Collectors.toList()), + .toList(), jt.getElements()) || context.isSupplementaryFilesIndexing()) { javaContext.analyze(Collections.singleton(unit.getKey()), jt, active, addedTypes, addedModules, main); } else { @@ -372,8 +371,8 @@ protected ParsingOutput compile( CompileTuple unit = clazz2Tuple.get(type); if (unit == null || !unit.virtual) { for (JavaFileObject generated : generatedFiles) { - if (generated instanceof FileObjects.FileBase) { - createdFiles.add(((FileObjects.FileBase) generated).getFile()); + if (generated instanceof FileObjects.FileBase fb) { + createdFiles.add(fb.getFile()); } else { // presumably should not happen } @@ -570,7 +569,7 @@ public Void visitCompilationUnit(CompilationUnitTree node, Void p) { d -> Collections.singletonList(d), (dl1, dl2) -> Stream.of(dl1, dl2) .flatMap(dl -> dl.stream()) - .collect(Collectors.toList()), + .toList(), () -> new TreeMap<>())); super.visitCompilationUnit(node, p); //TODO: if diagnostics are remaining, make all classes non-usable @@ -714,7 +713,7 @@ public Void visitClass(ClassTree node, Void p) { boolean prevErrorFound = errorFound; errorFound = false; try { - anonymousClasses = Collections.newSetFromMap(new LinkedHashMap<>()); + anonymousClasses = new LinkedHashSet<>(); JCClassDecl clazz = (JCTree.JCClassDecl) node; Symbol.ClassSymbol csym = clazz.sym; if (isErroneousClass(csym)) { diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/matching/CopyFinder.java b/java/java.source.base/src/org/netbeans/modules/java/source/matching/CopyFinder.java index 244c3bab6188..ae8e0acaff35 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/matching/CopyFinder.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/matching/CopyFinder.java @@ -54,7 +54,6 @@ import com.sun.source.tree.NewClassTree; import com.sun.source.tree.ParameterizedTypeTree; import com.sun.source.tree.ParenthesizedTree; -import com.sun.source.tree.PatternTree; import com.sun.source.tree.PrimitiveTypeTree; import com.sun.source.tree.ReturnTree; import com.sun.source.tree.Scope; diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/AptSourceFileManager.java b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/AptSourceFileManager.java index d13629ab9c32..e2e2f42e67d4 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/AptSourceFileManager.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/AptSourceFileManager.java @@ -181,7 +181,7 @@ public Iterable> listLocationsForModules(Location location) throws return oml.getModuleRoots().isEmpty() ? null : Collections.singleton((Location)oml); }) .filter(locations -> locations != null) - .collect(Collectors.toList()); + .toList(); } else { cachedModuleLocations = Collections.emptySet(); } diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/CTSymArchive.java b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/CTSymArchive.java index 088df5b17d48..98700a101a10 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/CTSymArchive.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/CTSymArchive.java @@ -84,11 +84,8 @@ protected void beforeInit() throws IOException { dirname = i == -1 ? "" : name.substring(0, i); //NOI18N basename = name.substring(i+1); } - Set content = pkgs.get(dirname); - if (content == null) { - pkgs.put(dirname, content = new HashSet<>()); - } - content.add(basename); + pkgs.computeIfAbsent(dirname, k -> new HashSet<>()) + .add(basename); } } diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/CachingArchiveClassLoader.java b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/CachingArchiveClassLoader.java index d58a70f81d1f..c65b688e18f9 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/CachingArchiveClassLoader.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/CachingArchiveClassLoader.java @@ -45,7 +45,6 @@ import org.openide.util.Exceptions; import org.openide.util.Pair; import org.openide.util.Parameters; -import java.nio.file.FileStore; import java.security.CodeSigner; import java.security.CodeSource; import java.security.ProtectionDomain; diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/CachingArchiveProvider.java b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/CachingArchiveProvider.java index 9ce7339e745e..c4bfd39254e1 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/CachingArchiveProvider.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/CachingArchiveProvider.java @@ -22,14 +22,11 @@ import java.io.File; -import java.io.IOException; import java.net.MalformedURLException; import java.net.URI; import java.net.URISyntaxException; import java.net.URL; -import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.attribute.BasicFileAttributes; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/CompilationInfoImpl.java b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/CompilationInfoImpl.java index 1269c6c7cbcf..6bae58de62d6 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/CompilationInfoImpl.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/CompilationInfoImpl.java @@ -44,7 +44,6 @@ import java.util.Map.Entry; import java.util.SortedMap; import java.util.TreeMap; -import java.util.stream.Collectors; import javax.swing.text.Document; import javax.tools.Diagnostic; @@ -543,7 +542,7 @@ private boolean hasSource() { List getFiles(List sourceFiles) throws IOException { return sourceFiles.stream() .map(fo -> runAndThrow(this::getSourceFileObject, fo)) - .collect(Collectors.toList()); + .toList(); } private R runAndThrow(Convert run, P p) { diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/FileObjects.java b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/FileObjects.java index daeb0ca37a9a..6efd61d8c520 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/FileObjects.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/FileObjects.java @@ -24,7 +24,6 @@ import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -64,7 +63,6 @@ import java.util.jar.Manifest; import java.util.regex.Matcher; import java.util.regex.Pattern; -import java.util.stream.Collectors; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; import javax.lang.model.SourceVersion; @@ -942,7 +940,7 @@ static Pair> parseModulePatches(@NonNull final Iterator patches = Arrays.stream(m.group(2).split(File.pathSeparator)) .map((p) -> FileUtil.normalizeFile(new File(p))) .map(FileUtil::urlForArchiveOrDir) - .collect(Collectors.toList()); + .toList(); return Pair.of(module, patches); } } diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/FindAnonymousVisitor.java b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/FindAnonymousVisitor.java index 30cb662cebe2..10280389bd78 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/FindAnonymousVisitor.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/FindAnonymousVisitor.java @@ -24,7 +24,6 @@ import com.sun.source.tree.Tree; import com.sun.source.tree.VariableTree; import org.netbeans.api.java.source.support.ErrorAwareTreeScanner; -import com.sun.tools.javac.tree.JCTree.JCClassDecl; import java.util.HashSet; import java.util.Set; diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/FolderArchive.java b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/FolderArchive.java index d35381b9c24e..842577ae5288 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/FolderArchive.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/FolderArchive.java @@ -35,7 +35,6 @@ import java.util.List; import java.util.Set; import java.util.function.Function; -import java.util.function.Predicate; import java.util.logging.Level; import java.util.logging.Logger; import javax.tools.JavaFileObject; diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/JavacParser.java b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/JavacParser.java index 6b7483c1b31e..b6726dba379c 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/JavacParser.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/JavacParser.java @@ -55,6 +55,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Optional; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; @@ -63,7 +64,6 @@ import java.util.function.Supplier; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import java.util.stream.StreamSupport; import javax.annotation.processing.Processor; @@ -88,7 +88,6 @@ import org.netbeans.api.project.Project; import org.netbeans.lib.editor.util.swing.PositionRegion; import org.netbeans.modules.java.preprocessorbridge.spi.JavaFileFilterImplementation; -import org.netbeans.modules.java.source.JavaFileFilterQuery; import org.netbeans.modules.java.source.JavaSourceAccessor; import org.netbeans.modules.java.source.PostFlowAnalysis; import org.netbeans.modules.java.source.indexing.APTUtils; @@ -194,8 +193,6 @@ public class JavacParser extends Parser { Collections.synchronizedList(new LinkedList<>()); //Incremental parsing support private final AtomicReference> changedMethod = new AtomicReference<>(); - //J2ME preprocessor support - private final FilterListener filterListener; //ClasspathInfo Listener private final ChangeListener cpInfoListener; private final SequentialParsing sequentialParsing; @@ -220,16 +217,6 @@ public class JavacParser extends Parser { this.snapshots = snapshots; final boolean singleJavaFile = this.snapshots.size() == 1 && MIME_TYPE.equals(snapshots.iterator().next().getSource().getMimeType()); this.supportsReparse = singleJavaFile && !DISABLE_PARTIAL_REPARSE; - JavaFileFilterImplementation filter = null; - if (singleJavaFile) { - final Source source = snapshots.iterator().next().getSource(); - FileObject fo = source.getFileObject(); - if (fo != null) { - //fileless Source -- ie. debugger watch CC etc - filter = JavaFileFilterQuery.getFilter(fo); - } - } - this.filterListener = filter != null ? new FilterListener (filter) : null; this.cpInfoListener = new ClasspathInfoListener( listeners, () -> { @@ -555,8 +542,7 @@ else if (isUserTask) { //Todo: shared = false should replace this //for now it creates a new parser and passes it outside the infrastructure //used by debugger private api - if (task instanceof NewComilerTask) { - final NewComilerTask nct = (NewComilerTask)task; + if (task instanceof NewComilerTask nct) { if (nct.getCompilationController() == null || nct.getTimeStamp() != parseId) { try { CompilationInfoImpl cii = new CompilationInfoImpl(this, file, root, null, null, cachedSnapShot, true, new HashMap<>(), new HashMap<>()); @@ -756,7 +742,7 @@ Phase moveToPhase (final Phase phase, final CompilationInfoImpl currentInfo, Lis JavaCompiler compiler = JavaCompiler.instance(jti.getContext()); List> savedTodo = new ArrayList<>(compiler.todo); try { - List currentFileObjects = new ArrayList<>(); + List currentFileObjects = new ArrayList<>(forcedSources.size() + 1); currentFileObjects.addAll(forcedSources); currentFileObjects.add(file); List currentFiles = currentInfo.getFiles(currentFileObjects); @@ -900,7 +886,6 @@ static JavacTaskImpl createJavacTask( jfos); Lookup.getDefault() .lookupAll(TreeLoaderRegistry.class) - .stream() .forEach(r -> r.enhance(javacTask.getContext(), cpInfo, detached)); ParameterNameProviderImpl.register(javacTask, cpInfo); return javacTask; @@ -958,7 +943,7 @@ private static JavacTaskImpl createJavacTask( cpInfo, flags.contains(ConfigFlags.MODULE_INFO)); String useRelease = useRelease(sourceLevel, validatedSourceLevel); - if (lintOptions.length() > 0) { + if (!lintOptions.isEmpty()) { options.addAll(Arrays.asList(lintOptions.split(" "))); } if (!backgroundCompilation) { @@ -1043,13 +1028,13 @@ private static JavacTaskImpl createJavacTask( } if (!additionalModules.isEmpty()) { options.add("--add-modules"); //NOI18N - options.add(additionalModules.stream().collect(Collectors.joining(","))); //NOI18N + options.add(String.join(",", additionalModules)); //NOI18N } //filter out classfiles: files = StreamSupport.stream(files.spliterator(), false) .filter(file -> file.getKind() == Kind.SOURCE) - .collect(Collectors.toList()); + .toList(); Context context = new Context(); //need to preregister the Messages here, because the getTask below requires Log instance: @@ -1066,11 +1051,9 @@ private static JavacTaskImpl createJavacTask( NBClassReader.preRegister(context); Lookup.getDefault() .lookupAll(ContextEnhancer.class) - .stream() .forEach(r -> r.enhance(context, backgroundCompilation)); Lookup.getDefault() .lookupAll(DuplicateClassRegistry.class) - .stream() .forEach(r -> r.enhance(context, fqn2Files)); if (cancelService != null) { DefaultCancelService.preRegister(context, cancelService); @@ -1275,8 +1258,8 @@ private static boolean hasResource( @NonNull ClassPath[] boot, @NonNull ClassPath[] compile, @NonNull ClassPath[] source) { - final String resourceClass = String.format("%s.class", resourceBase); //NOI18N - final String resourceJava = String.format("%s.java", resourceBase); //NOI18N + final String resourceClass = "%s.class".formatted(resourceBase); //NOI18N + final String resourceJava = "%s.java".formatted(resourceBase); //NOI18N if (!hasResource(resourceClass, boot)) { if (!hasResource(resourceJava, source)) { if (!hasResource(resourceClass, compile)) { @@ -1366,9 +1349,9 @@ public static void dumpSource(CompilationInfoImpl info, Throwable exc) { final ClassPath classPath = info.getClasspathInfo().getClassPath(ClasspathInfo.PathKind.COMPILE); final ClassPath sourcePath = info.getClasspathInfo().getClassPath(ClasspathInfo.PathKind.SOURCE); - writer.println("bootPath: " + (bootPath != null ? bootPath.toString() : "null")); - writer.println("classPath: " + (classPath != null ? classPath.toString() : "null")); - writer.println("sourcePath: " + (sourcePath != null ? sourcePath.toString() : "null")); + writer.println("bootPath: " + Objects.toString(bootPath, "null")); + writer.println("classPath: " + Objects.toString(classPath, "null")); + writer.println("sourcePath: " + Objects.toString(sourcePath, "null")); writer.println("----- Original exception ---------------------------------------------"); // NOI18N exc.printStackTrace(writer); @@ -1435,8 +1418,8 @@ public boolean isCanceled() { } private void checkSourceModification(SourceModificationEvent evt) { - if (evt instanceof SourceModificationEvent.Composite) { - evt = ((SourceModificationEvent.Composite)evt).getWriteEvent(); + if (evt instanceof SourceModificationEvent.Composite composite) { + evt = composite.getWriteEvent(); } if (evt != null && evt.sourceChanged()) { Pair changedMethod = null; diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/ModuleFileManager.java b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/ModuleFileManager.java index dea019c2c28e..98d5b771e5cc 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/ModuleFileManager.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/ModuleFileManager.java @@ -32,7 +32,6 @@ import java.util.function.Function; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import javax.tools.FileObject; import javax.tools.JavaFileManager; import javax.tools.JavaFileObject; @@ -273,7 +272,7 @@ public boolean isSameFile(FileObject a, FileObject b) { public Iterable> listLocationsForModules(Location location) throws IOException { return moduleLocations(location).stream() .map((ml) -> Collections.singleton(ml)) - .collect(Collectors.toList()); + .toList(); } @Override diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/ModuleOraculum.java b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/ModuleOraculum.java index 8fd2bdcb9846..f9c3cd607361 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/ModuleOraculum.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/ModuleOraculum.java @@ -19,11 +19,9 @@ package org.netbeans.modules.java.source.parsing; import com.sun.source.tree.CompilationUnitTree; -import com.sun.source.tree.PackageTree; import com.sun.tools.javac.api.JavacTaskImpl; import java.io.Closeable; import java.io.File; -import java.io.IOException; import java.lang.ref.Reference; import java.lang.ref.WeakReference; import java.util.Collections; diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/ModuleSourceFileManager.java b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/ModuleSourceFileManager.java index 0a42047a8193..bf1aa842add9 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/ModuleSourceFileManager.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/ModuleSourceFileManager.java @@ -292,7 +292,7 @@ private Set sourceModuleLocationsRemovedPatches() { final Collection origEntries = l.getModuleEntries(); final List entries = origEntries.stream() .filter((e) -> !patches.containsKey(e.getURL())) - .collect(Collectors.toList()); + .toList(); if (entries.isEmpty()) { return null; } else if (origEntries.size() == entries.size()) { diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/OutputFileManager.java b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/OutputFileManager.java index 146ead01bd67..3f06013f09e3 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/OutputFileManager.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/OutputFileManager.java @@ -258,7 +258,7 @@ public Iterable> listLocationsForModules(Location location) throws ml.getModuleName()); return Collections.singleton(oml); }) - .collect(Collectors.toList()); + .toList(); } else { cachedModuleLocations = Collections.emptySet(); } diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/ParameterNameProviderImpl.java b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/ParameterNameProviderImpl.java index 3bc125c006e9..6ee6cafe3860 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/ParameterNameProviderImpl.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/ParameterNameProviderImpl.java @@ -52,7 +52,6 @@ import java.util.Set; import java.util.function.BiConsumer; import java.util.regex.Pattern; -import java.util.stream.Collectors; import javax.lang.model.element.Element; import javax.lang.model.element.ElementKind; import javax.lang.model.element.ExecutableElement; @@ -147,7 +146,7 @@ public CharSequence getParameterName(VariableElement parameter) { public Void visitMethod(MethodTree mt, Void v) { Element el = cc.getTrees().getElement(getCurrentPath()); if (el != null && el.getKind() == ElementKind.METHOD) { - parametersInClass.put(computeKey(el), ((ExecutableElement) el).getParameters().stream().map(p -> p.getSimpleName().toString()).collect(Collectors.toList())); + parametersInClass.put(computeKey(el), ((ExecutableElement) el).getParameters().stream().map(p -> p.getSimpleName().toString()).toList()); } return super.visitMethod(mt, v); } @@ -185,7 +184,7 @@ public Void visitMethod(MethodTree mt, Void v) { if (!DISABLE_ARTIFICAL_PARAMETER_NAMES) { names = artificial_method2Parameters.computeIfAbsent(methodKey, mk -> { Set usedNames = new HashSet<>(); - return ((ExecutableElement) method).getParameters().stream().map(p -> generateReadableParameterName(p.asType().toString(), usedNames)).collect(Collectors.toList()); + return ((ExecutableElement) method).getParameters().stream().map(p -> generateReadableParameterName(p.asType().toString(), usedNames)).toList(); }); } else { names = Collections.emptyList(); @@ -203,7 +202,7 @@ public Void visitMethod(MethodTree mt, Void v) { private static String computeKey(Element el) { - return Arrays.stream(SourceUtils.getJVMSignature(ElementHandle.create(el))).collect(Collectors.joining(":")); + return String.join(":", SourceUtils.getJVMSignature(ElementHandle.create(el))); } static void capCache(LinkedHashMap map) { diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/PatchModuleFileManager.java b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/PatchModuleFileManager.java index 8f2a89d11452..d89f1851c4e5 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/PatchModuleFileManager.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/PatchModuleFileManager.java @@ -30,11 +30,9 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Optional; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import java.util.stream.Stream; import javax.tools.FileObject; @@ -52,7 +50,6 @@ import org.openide.filesystems.FileUtil; import org.openide.filesystems.URLMapper; import org.openide.util.BaseUtilities; -import org.openide.util.Exceptions; import org.openide.util.Pair; /** @@ -104,7 +101,7 @@ public Location getLocationForModule(Location location, String moduleName) throw } }) .filter((url) -> url != null) - .collect(Collectors.toList()); + .toList(); return cacheRoots.isEmpty() ? null : new PatchLocation( @@ -141,7 +138,7 @@ public Iterable> listLocationsForModules(Location location) throws if (location == StandardLocation.PATCH_MODULE_PATH) { return moduleLocations(location).stream() .map((ml) -> Collections.singleton(ml)) - .collect(Collectors.toList()); + .toList(); } else { return Collections.emptyList(); } @@ -168,7 +165,7 @@ public boolean handleOption(String head, Iterator tail) { } else if (head.startsWith(JavacParser.NB_X_MODULE)) { overrideModuleName = head.substring(JavacParser.NB_X_MODULE.length()); addModulePatches(overrideModuleName, - src.entries().stream().map(e -> e.getURL()).collect(Collectors.toList())); + src.entries().stream().map(e -> e.getURL()).toList()); return true; } return false; @@ -358,7 +355,7 @@ private static final class PatchLocation extends ModuleLocation { name, Stream.of(bin, src) .flatMap((c) -> c.stream()) - .collect(Collectors.toList())); + .toList()); this.bin = binaryLocation(name, bin); this.src = sourceLocation(name, src); } @@ -408,7 +405,7 @@ private static ModuleLocation.WithExcludes sourceLocation( } return ClassPathSupport.createClassPath(root).entries().get(0); }) - .collect(Collectors.toList()); + .toList(); return ModuleLocation.WithExcludes.createExcludes(StandardLocation.MODULE_SOURCE_PATH, moduleEntries, name); } diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/ProcessorGenerated.java b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/ProcessorGenerated.java index 76e1c4f27491..5406e7e733cd 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/ProcessorGenerated.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/ProcessorGenerated.java @@ -29,7 +29,6 @@ import java.net.URISyntaxException; import java.net.URL; import java.nio.charset.StandardCharsets; -import java.text.MessageFormat; import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -41,14 +40,11 @@ import org.netbeans.api.annotations.common.CheckForNull; import org.netbeans.api.annotations.common.NonNull; import org.netbeans.api.annotations.common.NullAllowed; -import org.netbeans.api.java.classpath.ClassPath; -import org.netbeans.api.java.source.ClasspathInfo; import org.netbeans.modules.java.source.classpath.AptCacheForSourceQuery; import org.netbeans.modules.java.source.indexing.JavaIndex; import org.netbeans.modules.java.source.indexing.TransactionContext; import org.openide.util.Exceptions; import org.openide.util.Pair; -import org.openide.util.Parameters; import org.openide.util.BaseUtilities; /** diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/pretty/ImportAnalysis2.java b/java/java.source.base/src/org/netbeans/modules/java/source/pretty/ImportAnalysis2.java index 8eb0641ab2f7..312a63a19a6d 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/pretty/ImportAnalysis2.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/pretty/ImportAnalysis2.java @@ -39,7 +39,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import java.util.Stack; import javax.lang.model.element.Element; import javax.lang.model.element.ElementKind; import javax.lang.model.element.Modifier; diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/pretty/VeryPretty.java b/java/java.source.base/src/org/netbeans/modules/java/source/pretty/VeryPretty.java index 9c98bfd0c649..e0780a195911 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/pretty/VeryPretty.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/pretty/VeryPretty.java @@ -26,7 +26,6 @@ import com.sun.source.tree.MemberReferenceTree.ReferenceMode; import com.sun.source.tree.MethodTree; import com.sun.source.tree.ModuleTree; -import com.sun.source.tree.PatternTree; import com.sun.source.tree.StatementTree; import com.sun.source.tree.Tree; import static com.sun.source.tree.Tree.*; @@ -72,17 +71,13 @@ import com.sun.source.doctree.ValueTree; import com.sun.source.doctree.VersionTree; import com.sun.source.tree.ExpressionTree; -import com.sun.source.tree.SwitchExpressionTree; import com.sun.source.tree.YieldTree; -import com.sun.source.util.DocTreePathScanner; -import com.sun.source.util.DocTreeScanner; import com.sun.tools.javac.api.JavacTaskImpl; import com.sun.tools.javac.api.JavacTrees; import com.sun.tools.javac.code.*; import static com.sun.tools.javac.code.Flags.*; import com.sun.tools.javac.comp.Operators; -import com.sun.tools.javac.main.JavaCompiler; import com.sun.tools.javac.parser.Tokens; import com.sun.tools.javac.tree.DCTree; import com.sun.tools.javac.tree.DCTree.DCDocComment; @@ -97,12 +92,8 @@ import com.sun.tools.javac.util.Name; import com.sun.tools.javac.util.Names; -import java.io.IOException; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import java.net.URL; import java.util.*; -import java.util.concurrent.atomic.AtomicBoolean; import java.util.logging.Level; import java.util.logging.Logger; @@ -128,7 +119,6 @@ import org.netbeans.modules.java.source.save.Reformatter; import org.netbeans.modules.java.source.transform.FieldGroupTree; import org.netbeans.spi.java.classpath.support.ClassPathSupport; -import org.openide.util.Exceptions; /** Prints out a tree as an indented Java source program. */ diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/save/DiffContext.java b/java/java.source.base/src/org/netbeans/modules/java/source/save/DiffContext.java index db578a633dcb..bedb0242fae1 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/save/DiffContext.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/save/DiffContext.java @@ -33,7 +33,6 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import java.util.SortedMap; import javax.swing.text.Document; import org.netbeans.api.java.lexer.JavaTokenId; import org.netbeans.api.java.source.CodeStyle; diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/save/Measure.java b/java/java.source.base/src/org/netbeans/modules/java/source/save/Measure.java index 41d4ce311346..4f0ad9037381 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/save/Measure.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/save/Measure.java @@ -21,7 +21,6 @@ import com.sun.tools.javac.tree.JCTree; import java.util.Comparator; import static org.netbeans.modules.java.source.save.Measure.*; -import static com.sun.source.tree.Tree.Kind; import com.sun.tools.javac.tree.DCTree; /** diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/save/PositionEstimator.java b/java/java.source.base/src/org/netbeans/modules/java/source/save/PositionEstimator.java index 3e08d55a68b5..624bdbc7bb46 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/save/PositionEstimator.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/save/PositionEstimator.java @@ -29,7 +29,6 @@ import com.sun.tools.javac.code.Flags; import com.sun.tools.javac.tree.JCTree; import com.sun.tools.javac.tree.JCTree.JCVariableDecl; -import com.sun.tools.javac.tree.TreeInfo; import java.util.ArrayList; import java.util.EnumSet; import java.util.HashMap; @@ -38,7 +37,6 @@ import java.util.Map; import java.util.function.Predicate; import javax.swing.text.StyledDocument; -import org.netbeans.api.editor.guards.GuardedSection; import org.netbeans.api.editor.guards.GuardedSectionManager; import org.netbeans.api.java.lexer.JavaTokenId; import org.netbeans.modules.java.source.transform.FieldGroupTree; diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/save/Reformatter.java b/java/java.source.base/src/org/netbeans/modules/java/source/save/Reformatter.java index acd9afbfb58b..e3f2a62430c5 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/save/Reformatter.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/save/Reformatter.java @@ -25,7 +25,6 @@ import com.sun.tools.javac.api.JavacTaskImpl; import com.sun.tools.javac.api.JavacTrees; import com.sun.tools.javac.code.Flags; -import com.sun.tools.javac.main.JavaCompiler; import com.sun.tools.javac.tree.JCTree; import com.sun.tools.javac.tree.JCTree.JCBlock; import com.sun.tools.javac.tree.JCTree.JCMethodDecl; diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/save/Reindenter.java b/java/java.source.base/src/org/netbeans/modules/java/source/save/Reindenter.java index 0294c9981c3e..fd976719e2fb 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/save/Reindenter.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/save/Reindenter.java @@ -50,7 +50,6 @@ import com.sun.tools.javac.api.JavacTool; import com.sun.tools.javac.api.JavacTrees; import com.sun.tools.javac.code.Flags; -import com.sun.tools.javac.main.JavaCompiler; import com.sun.tools.javac.tree.JCTree.JCClassDecl; import java.util.Collections; diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/transform/ImmutableTreeTranslator.java b/java/java.source.base/src/org/netbeans/modules/java/source/transform/ImmutableTreeTranslator.java index 1574bcd6fedb..819025ad4442 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/transform/ImmutableTreeTranslator.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/transform/ImmutableTreeTranslator.java @@ -24,7 +24,6 @@ import com.sun.source.tree.Tree.Kind; import com.sun.tools.javac.code.Flags; import com.sun.tools.javac.model.JavacElements; -import com.sun.tools.javac.tree.JCTree.JCLambda; import com.sun.tools.javac.tree.JCTree.JCModifiers; import com.sun.tools.javac.util.Context; import java.util.ArrayList; diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/transform/TreeHelpers.java b/java/java.source.base/src/org/netbeans/modules/java/source/transform/TreeHelpers.java index 9636f719157f..82085ac16014 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/transform/TreeHelpers.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/transform/TreeHelpers.java @@ -20,11 +20,9 @@ import com.sun.source.tree.CompilationUnitTree; import com.sun.source.tree.Tree; -import com.sun.tools.javac.tree.JCTree; import com.sun.tools.javac.tree.JCTree.JCCompilationUnit; import com.sun.tools.javac.tree.JCTree.Tag; import java.util.List; -import java.util.stream.Collectors; /** * @@ -35,7 +33,7 @@ public static List getCombinedTopLevelDecls(CompilationUnitTree JCCompilationUnit cu = (JCCompilationUnit) cut; return cu.defs.stream() .filter(t -> t.hasTag(Tag.CLASSDEF) || t.hasTag(Tag.MODULEDEF)) - .collect(Collectors.toList()); + .toList(); } } diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/usages/ClassFileUtil.java b/java/java.source.base/src/org/netbeans/modules/java/source/usages/ClassFileUtil.java index f9021223c072..dfdd8018c749 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/usages/ClassFileUtil.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/usages/ClassFileUtil.java @@ -20,9 +20,6 @@ package org.netbeans.modules.java.source.usages; import com.sun.tools.javac.code.Symbol; -import com.sun.tools.javac.util.Convert; -import com.sun.tools.javac.util.Convert.Validation; -import com.sun.tools.javac.util.InvalidUtfException; import com.sun.tools.javac.util.Name; import java.util.*; @@ -35,7 +32,6 @@ import javax.lang.model.element.VariableElement; import javax.lang.model.type.ArrayType; import javax.lang.model.type.DeclaredType; -import javax.lang.model.type.ErrorType; import javax.lang.model.type.IntersectionType; import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/usages/ClassIndexImpl.java b/java/java.source.base/src/org/netbeans/modules/java/source/usages/ClassIndexImpl.java index 4b685c4a1827..5aba2b2dfef6 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/usages/ClassIndexImpl.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/usages/ClassIndexImpl.java @@ -23,7 +23,6 @@ import java.lang.ref.WeakReference; import java.net.URL; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Iterator; diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/usages/DocumentUtil.java b/java/java.source.base/src/org/netbeans/modules/java/source/usages/DocumentUtil.java index fd70645db0c7..7150613392f3 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/usages/DocumentUtil.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/usages/DocumentUtil.java @@ -20,7 +20,6 @@ package org.netbeans.modules.java.source.usages; import java.io.IOException; -import java.io.Reader; import java.util.ArrayList; import java.util.Arrays; import java.util.EnumSet; @@ -39,11 +38,9 @@ import org.apache.lucene.analysis.core.WhitespaceAnalyzer; import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.apache.lucene.analysis.miscellaneous.PerFieldAnalyzerWrapper; -import org.apache.lucene.analysis.util.CharTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; -import org.apache.lucene.index.DocValuesType; import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.IndexableField; import org.apache.lucene.index.IndexableFieldType; diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/usages/QueryUtil.java b/java/java.source.base/src/org/netbeans/modules/java/source/usages/QueryUtil.java index 29d6b1195068..4ed387054e51 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/usages/QueryUtil.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/usages/QueryUtil.java @@ -23,7 +23,6 @@ import java.util.Set; import java.util.TreeSet; import java.util.regex.Pattern; -import java.util.stream.Collectors; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.BooleanQuery; @@ -134,7 +133,7 @@ static Query scopeFilter ( qFiltered.add( new TermInSetQuery( DocumentUtil.FIELD_PACKAGE_NAME, - pkgs.stream().map(s -> new BytesRef(s)).collect(Collectors.toList()) + pkgs.stream().map(s -> new BytesRef(s)).toList() ), Occur.MUST); qFiltered.add(q, Occur.MUST); diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/usages/SourceAnalyzerFactory.java b/java/java.source.base/src/org/netbeans/modules/java/source/usages/SourceAnalyzerFactory.java index 8d0bf5a4fde6..61bf4f6b144b 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/usages/SourceAnalyzerFactory.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/usages/SourceAnalyzerFactory.java @@ -28,7 +28,6 @@ import com.sun.tools.javac.code.Symbol.MethodSymbol; import com.sun.tools.javac.code.Type; import com.sun.tools.javac.tree.JCTree; -import com.sun.tools.javac.util.Name; import com.sun.tools.javac.util.Names; import java.io.*; import java.net.MalformedURLException;