Skip to content

Commit 0505245

Browse files
NipunaRanasingheNipunaRanasinghe
authored
Merge pull request #355 from NipunaRanasinghe/warnings
Fix code warnings for java 11
2 parents b21faac + fc3a5ff commit 0505245

20 files changed

+61
-49
lines changed

‎spotbugs-exclude.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,19 @@
4444
<Class name="org.wso2.lsp4intellij.utils.FileUtils"/>
4545
<Method name="findProjectsFor"/>
4646
</And>
47+
<And>
48+
<Class name="org.wso2.lsp4intellij.listeners.LSPTypedHandler"/>
49+
<Method name="charTyped"/>
50+
</And>
51+
<And>
52+
<Class name="org.wso2.lsp4intellij.listeners.LSPTypedHandler"/>
53+
<Method name="checkAutoPopup"/>
54+
</And>
55+
<And>
56+
<Class name="org.wso2.lsp4intellij.statusbar.LSPServerStatusWidgetFactory"/>
57+
<Method name="createWidget"/>
58+
</And>
59+
4760
</Or>
4861
</And>
4962
</Match>

‎src/main/java/org/wso2/lsp4intellij/IntellijLanguageClient.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@
5757

5858
public class IntellijLanguageClient implements ApplicationComponent, Disposable {
5959

60-
private static Logger LOG = Logger.getInstance(IntellijLanguageClient.class);
60+
private static final Logger LOG = Logger.getInstance(IntellijLanguageClient.class);
6161
private static final Map<Pair<String, String>, LanguageServerWrapper> extToLanguageWrapper = new ConcurrentHashMap<>();
62-
private static Map<String, Set<LanguageServerWrapper>> projectToLanguageWrappers = new ConcurrentHashMap<>();
63-
private static Map<Pair<String, String>, LanguageServerDefinition> extToServerDefinition = new ConcurrentHashMap<>();
64-
private static Map<String, LSPExtensionManager> extToExtManager = new ConcurrentHashMap<>();
62+
private static final Map<String, Set<LanguageServerWrapper>> projectToLanguageWrappers = new ConcurrentHashMap<>();
63+
private static final Map<Pair<String, String>, LanguageServerDefinition> extToServerDefinition = new ConcurrentHashMap<>();
64+
private static final Map<String, LSPExtensionManager> extToExtManager = new ConcurrentHashMap<>();
6565
private static final Predicate<LanguageServerWrapper> RUNNING = (s) -> s.getStatus() != ServerStatus.STOPPED;
6666

6767
@Override

‎src/main/java/org/wso2/lsp4intellij/client/connection/ProcessStreamConnectionProvider.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import java.util.HashSet;
2727
import java.util.List;
2828
import java.util.Objects;
29+
import java.util.stream.Collectors;
2930

3031
/**
3132
* A class symbolizing a stream to a process
@@ -38,7 +39,7 @@ public class ProcessStreamConnectionProvider implements StreamConnectionProvider
3839
private final Logger LOG = Logger.getInstance(ProcessStreamConnectionProvider.class);
3940

4041
@Nullable
41-
private ProcessBuilder builder;
42+
private final ProcessBuilder builder;
4243
@Nullable
4344
private Process process = null;
4445
private List<String> commands;
@@ -72,7 +73,7 @@ private ProcessBuilder createProcessBuilder() {
7273
if (builder != null) {
7374
return builder;
7475
} else {
75-
commands.forEach(c -> c = c.replace("\'", ""));
76+
commands = commands.stream().map(c -> c.replace("'", "")).collect(Collectors.toList());
7677
ProcessBuilder builder = new ProcessBuilder(commands);
7778
builder.directory(new File(workingDir));
7879
builder.redirectError(ProcessBuilder.Redirect.INHERIT);

‎src/main/java/org/wso2/lsp4intellij/client/languageserver/requestmanager/DefaultRequestManager.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ public void didChange(DidChangeTextDocumentParams params) {
348348
public void willSave(WillSaveTextDocumentParams params) {
349349
if (checkStatus()) {
350350
try {
351-
if (Optional.ofNullable(textDocumentOptions).map(x -> x.getWillSave()).orElse(false)) {
351+
if (Optional.ofNullable(textDocumentOptions).map(TextDocumentSyncOptions::getWillSave).orElse(false)) {
352352
textDocumentService.willSave(params);
353353
}
354354
} catch (Exception e) {
@@ -361,7 +361,7 @@ public void willSave(WillSaveTextDocumentParams params) {
361361
public CompletableFuture<List<TextEdit>> willSaveWaitUntil(WillSaveTextDocumentParams params) {
362362
if (checkStatus()) {
363363
try {
364-
return Optional.ofNullable(textDocumentOptions).map(x -> x.getWillSaveWaitUntil()).orElse(false) ?
364+
return Optional.ofNullable(textDocumentOptions).map(TextDocumentSyncOptions::getWillSaveWaitUntil).orElse(false) ?
365365
textDocumentService.willSaveWaitUntil(params) : null;
366366
} catch (Exception e) {
367367
crashed(e);
@@ -375,7 +375,7 @@ public CompletableFuture<List<TextEdit>> willSaveWaitUntil(WillSaveTextDocumentP
375375
public void didSave(DidSaveTextDocumentParams params) {
376376
if (checkStatus()) {
377377
try {
378-
if (Optional.ofNullable(textDocumentOptions).map(x -> x.getSave()).isPresent()) {
378+
if (Optional.ofNullable(textDocumentOptions).map(TextDocumentSyncOptions::getSave).isPresent()) {
379379
textDocumentService.didSave(params);
380380
}
381381
} catch (Exception e) {

‎src/main/java/org/wso2/lsp4intellij/client/languageserver/serverdefinition/LanguageServerDefinition.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class LanguageServerDefinition {
3838

3939
public String ext;
4040
protected Map<String, String> languageIds = Collections.emptyMap();
41-
private Map<String, StreamConnectionProvider> streamConnectionProviders = new ConcurrentHashMap<>();
41+
private final Map<String, StreamConnectionProvider> streamConnectionProviders = new ConcurrentHashMap<>();
4242
public static final String SPLIT_CHAR = ",";
4343

4444
/**

‎src/main/java/org/wso2/lsp4intellij/client/languageserver/wrapper/MessageHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929

3030
class MessageHandler implements Function<MessageConsumer, MessageConsumer> {
3131

32-
private ServerListener listener;
33-
private BooleanSupplier isRunning;
32+
private final ServerListener listener;
33+
private final BooleanSupplier isRunning;
3434
private LanguageServer languageServer;
3535

3636
MessageHandler(@NotNull ServerListener listener, @NotNull BooleanSupplier isRunning) {

‎src/main/java/org/wso2/lsp4intellij/listeners/DocumentListenerImpl.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import com.intellij.openapi.editor.event.DocumentEvent;
1919
import com.intellij.openapi.editor.event.DocumentListener;
20+
import org.jetbrains.annotations.NotNull;
2021

2122
public class DocumentListenerImpl extends LSPListener implements DocumentListener {
2223

@@ -26,7 +27,7 @@ public class DocumentListenerImpl extends LSPListener implements DocumentListene
2627
* @param event the event containing the information about the change.
2728
*/
2829
@Override
29-
public void beforeDocumentChange(DocumentEvent event) {
30+
public void beforeDocumentChange(@NotNull DocumentEvent event) {
3031
}
3132

3233
/**
@@ -35,7 +36,7 @@ public void beforeDocumentChange(DocumentEvent event) {
3536
* @param event the event containing the information about the change.
3637
*/
3738
@Override
38-
public void documentChanged(DocumentEvent event) {
39+
public void documentChanged(@NotNull DocumentEvent event) {
3940
if (checkEnabled()) {
4041
manager.documentChanged(event);
4142
}

‎src/main/java/org/wso2/lsp4intellij/listeners/EditorMouseListenerImpl.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,38 +17,39 @@
1717

1818
import com.intellij.openapi.editor.event.EditorMouseEvent;
1919
import com.intellij.openapi.editor.event.EditorMouseListener;
20+
import org.jetbrains.annotations.NotNull;
2021

2122
/**
2223
* An EditorMouseListener implementation which listens to mouseExited, mouseEntered and mouseClicked events.
2324
*/
2425
public class EditorMouseListenerImpl extends LSPListener implements EditorMouseListener {
2526
@Override
26-
public void mousePressed(EditorMouseEvent editorMouseEvent) {
27+
public void mousePressed(@NotNull EditorMouseEvent editorMouseEvent) {
2728

2829
}
2930

3031
@Override
31-
public void mouseClicked(EditorMouseEvent editorMouseEvent) {
32+
public void mouseClicked(@NotNull EditorMouseEvent editorMouseEvent) {
3233
if (checkEnabled()) {
3334
manager.mouseClicked(editorMouseEvent);
3435
}
3536

3637
}
3738

3839
@Override
39-
public void mouseReleased(EditorMouseEvent editorMouseEvent) {
40+
public void mouseReleased(@NotNull EditorMouseEvent editorMouseEvent) {
4041

4142
}
4243

4344
@Override
44-
public void mouseEntered(EditorMouseEvent editorMouseEvent) {
45+
public void mouseEntered(@NotNull EditorMouseEvent editorMouseEvent) {
4546
if (checkEnabled()) {
4647
manager.mouseEntered();
4748
}
4849
}
4950

5051
@Override
51-
public void mouseExited(EditorMouseEvent editorMouseEvent) {
52+
public void mouseExited(@NotNull EditorMouseEvent editorMouseEvent) {
5253
if (checkEnabled()) {
5354
manager.mouseExited();
5455
}

‎src/main/java/org/wso2/lsp4intellij/listeners/EditorMouseMotionListenerImpl.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,22 @@
1717

1818
import com.intellij.openapi.editor.event.EditorMouseEvent;
1919
import com.intellij.openapi.editor.event.EditorMouseMotionListener;
20+
import org.jetbrains.annotations.NotNull;
2021

2122
/**
2223
* Class listening for mouse movement in an editor (used for hover)
2324
*/
2425
public class EditorMouseMotionListenerImpl extends LSPListener implements EditorMouseMotionListener {
2526

2627
@Override
27-
public void mouseMoved(EditorMouseEvent e) {
28+
public void mouseMoved(@NotNull EditorMouseEvent e) {
2829
if (checkEnabled()) {
2930
manager.mouseMoved(e);
3031
}
3132
}
3233

3334
@Override
34-
public void mouseDragged(EditorMouseEvent editorMouseEvent) {
35+
public void mouseDragged(@NotNull EditorMouseEvent editorMouseEvent) {
3536

3637
}
3738
}

‎src/main/java/org/wso2/lsp4intellij/listeners/LSPCaretListenerImpl.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import com.intellij.openapi.diagnostic.Logger;
1919
import com.intellij.openapi.editor.event.CaretEvent;
2020
import com.intellij.openapi.editor.event.CaretListener;
21+
import org.jetbrains.annotations.NotNull;
2122

2223
import java.util.concurrent.Executors;
2324
import java.util.concurrent.ScheduledExecutorService;
@@ -26,8 +27,9 @@
2627

2728
public class LSPCaretListenerImpl extends LSPListener implements CaretListener {
2829

29-
private Logger LOG = Logger.getInstance(LSPCaretListenerImpl.class);
30-
private ScheduledExecutorService scheduler;
30+
private final Logger LOG = Logger.getInstance(LSPCaretListenerImpl.class);
31+
32+
private final ScheduledExecutorService scheduler;
3133
private ScheduledFuture<?> scheduledFuture;
3234
private static final long DEBOUNCE_INTERVAL_MS = 500;
3335

@@ -37,7 +39,7 @@ public LSPCaretListenerImpl() {
3739
}
3840

3941
@Override
40-
public void caretPositionChanged(CaretEvent e) {
42+
public void caretPositionChanged(@NotNull CaretEvent e) {
4143
try {
4244
if (scheduledFuture != null && !scheduledFuture.isCancelled()) {
4345
scheduledFuture.cancel(false);

‎src/main/java/org/wso2/lsp4intellij/listeners/LSPFileDocumentManagerListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public void beforeAllDocumentsSaving() {
3838
}
3939

4040
@Override
41-
public void beforeFileContentReload(VirtualFile virtualFile, @NotNull Document document) {
41+
public void beforeFileContentReload(@NotNull VirtualFile virtualFile, @NotNull Document document) {
4242

4343
}
4444

‎src/main/java/org/wso2/lsp4intellij/listeners/LSPFileEventManager.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import org.wso2.lsp4intellij.IntellijLanguageClient;
3131
import org.wso2.lsp4intellij.client.languageserver.ServerStatus;
3232
import org.wso2.lsp4intellij.client.languageserver.wrapper.LanguageServerWrapper;
33-
import org.wso2.lsp4intellij.editor.EditorEventManager;
3433
import org.wso2.lsp4intellij.editor.EditorEventManagerBase;
3534
import org.wso2.lsp4intellij.utils.ApplicationUtils;
3635
import org.wso2.lsp4intellij.utils.FileUtils;

‎src/main/java/org/wso2/lsp4intellij/listeners/LSPTypedHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
public class LSPTypedHandler extends TypedHandlerDelegate {
3232

3333
@Override
34-
public Result charTyped(char c, Project project, @NotNull Editor editor, @NotNull PsiFile file) {
34+
public @NotNull Result charTyped(char c, @NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file) {
3535
if (!FileUtils.isFileSupported(file.getVirtualFile())) {
3636
return Result.CONTINUE;
3737
}
@@ -44,7 +44,7 @@ public Result charTyped(char c, Project project, @NotNull Editor editor, @NotNul
4444
}
4545

4646
@Override
47-
public Result checkAutoPopup(char charTyped, @NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file) {
47+
public @NotNull Result checkAutoPopup(char charTyped, @NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file) {
4848
if (!FileUtils.isFileSupported(file.getVirtualFile())) {
4949
return Result.CONTINUE;
5050
}

‎src/main/java/org/wso2/lsp4intellij/requests/HoverHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
*/
3636
public class HoverHandler {
3737

38-
private Logger LOG = Logger.getInstance(HoverHandler.class);
38+
private final Logger LOG = Logger.getInstance(HoverHandler.class);
3939

4040
/**
4141
* Returns the hover string corresponding to a Hover response

‎src/main/java/org/wso2/lsp4intellij/requests/Timeout.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525
public class Timeout {
2626

27-
private static Map<Timeouts, Integer> timeouts = new ConcurrentHashMap<>();
27+
private static final Map<Timeouts, Integer> timeouts = new ConcurrentHashMap<>();
2828

2929
static {
3030
Arrays.stream(Timeouts.values()).forEach(t -> timeouts.put(t, t.getDefaultTimeout()));
@@ -39,6 +39,6 @@ public static Map<Timeouts, Integer> getTimeouts() {
3939
}
4040

4141
public static void setTimeouts(Map<Timeouts, Integer> loaded) {
42-
loaded.forEach((t, v) -> timeouts.replace(t, v));
42+
loaded.forEach(timeouts::replace);
4343
}
4444
}

‎src/main/java/org/wso2/lsp4intellij/requests/WorkspaceEditHandler.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@
6565
* An Object handling WorkspaceEdits
6666
*/
6767
public class WorkspaceEditHandler {
68-
private static Logger LOG = Logger.getInstance(WorkspaceEditHandler.class);
68+
69+
private static final Logger LOG = Logger.getInstance(WorkspaceEditHandler.class);
6970

7071
public static void applyEdit(PsiElement elem, String newName, UsageInfo[] infos,
7172
RefactoringElementListener listener, List<VirtualFile> openedEditors) {
@@ -87,7 +88,7 @@ public static void applyEdit(PsiElement elem, String newName, UsageInfo[] infos,
8788
} catch (MalformedURLException | URISyntaxException e) {
8889
LOG.warn(e);
8990
}
90-
if (edits.keySet().contains(uri)) {
91+
if (edits.containsKey(uri)) {
9192
edits.get(uri).add(edit);
9293
} else {
9394
List<TextEdit> textEdits = new ArrayList<>();
@@ -188,9 +189,9 @@ public static boolean applyEdit(WorkspaceEdit edit, String name, List<VirtualFil
188189
* @param edits The text edits
189190
* @param uri The uri of the file
190191
* @param version The version of the file
191-
* @param openedEditors
192-
* @param curProject
193-
* @param name
192+
* @param openedEditors The list of opened editors
193+
* @param curProject The current project
194+
* @param name The name of the edit
194195
* @return The runnable containing the edits
195196
*/
196197
private static Runnable manageUnopenedEditor(List<TextEdit> edits, String uri, int version,

‎src/main/java/org/wso2/lsp4intellij/statusbar/LSPServerStatusWidgetFactory.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@ public boolean isAvailable(@NotNull Project project) {
4949
}
5050

5151
@Override
52-
public
53-
StatusBarWidget createWidget(@NotNull Project project) {
52+
public @NotNull StatusBarWidget createWidget(@NotNull Project project) {
5453
return widgetForProject.computeIfAbsent(project, (k) -> new LSPServerStatusWidget(project));
5554
}
5655

‎src/main/java/org/wso2/lsp4intellij/utils/FileUtils.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,8 @@
4141
import org.wso2.lsp4intellij.extensions.LSPExtensionManager;
4242

4343
import java.io.File;
44-
import java.net.MalformedURLException;
4544
import java.net.URI;
4645
import java.net.URISyntaxException;
47-
import java.net.URL;
4846
import java.util.ArrayList;
4947
import java.util.Arrays;
5048
import java.util.List;
@@ -223,7 +221,7 @@ public static String sanitizeURI(String uri) {
223221
if (os == OS.UNIX) {
224222
return reconstructed.append(uriCp).toString();
225223
} else {
226-
reconstructed.append(uriCp.substring(0, uriCp.indexOf(URI_PATH_SEP)));
224+
reconstructed.append(uriCp, 0, uriCp.indexOf(URI_PATH_SEP));
227225
char driveLetter = reconstructed.charAt(URI_VALID_FILE_BEGIN.length());
228226
if (Character.isLowerCase(driveLetter)) {
229227
reconstructed.setCharAt(URI_VALID_FILE_BEGIN.length(), Character.toUpperCase(driveLetter));

‎src/main/java/org/wso2/lsp4intellij/utils/GUIUtils.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,9 @@ public static Hint createAndShowEditorHint(Editor editor, String string, Point p
150150
BrowserLauncher.getInstance().browse(e.getURL().toURI());
151151
} else {
152152
final Project project = editor.getProject();
153-
Optional<? extends Pair<Project, VirtualFile>> fileToOpen = Optional.ofNullable(project).map(
154-
p -> Optional.ofNullable(VfsUtil.findFileByURL(e.getURL()))
155-
.map(f -> new ImmutablePair<>(p, f))).orElse(Optional.empty());
153+
Optional<? extends Pair<Project, VirtualFile>> fileToOpen = Optional.ofNullable(project)
154+
.flatMap(p -> Optional.ofNullable(VfsUtil.findFileByURL(e.getURL()))
155+
.map(f -> new ImmutablePair<>(p, f)));
156156

157157
fileToOpen.ifPresent(f -> {
158158
final OpenFileDescriptor descriptor = new OpenFileDescriptor(f.getLeft(), f.getRight());

‎src/main/java/org/wso2/lsp4intellij/utils/Utils.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,7 @@ public static String[] parseArgs(String[] strArr) {
8686
wasEscaped = false;
8787
break;
8888
case '\\':
89-
if (wasEscaped) {
90-
wasEscaped = false;
91-
} else {
92-
wasEscaped = true;
93-
}
89+
wasEscaped = !wasEscaped;
9490
curStr.append('\\');
9591
break;
9692
case 'c':

0 commit comments

Comments
 (0)