From d49d46776136633f17833631c7e40d569effc38a Mon Sep 17 00:00:00 2001 From: Raveen Savinda Rathnayake Date: Wed, 22 Nov 2017 00:14:04 +0530 Subject: [PATCH] Replacing Nonnull with NotNull --- build.gradle | 2 +- config/findbugs/excludeFilter.xml | 12 ++ .../siddhi/plugins/idea/SiddhiASTFactory.java | 9 +- .../siddhi/plugins/idea/SiddhiFileType.java | 8 +- .../plugins/idea/SiddhiFileTypeFactory.java | 5 +- .../wso2/siddhi/plugins/idea/SiddhiIcons.java | 6 +- .../plugins/idea/SiddhiModuleBuilder.java | 6 +- .../siddhi/plugins/idea/SiddhiModuleType.java | 18 +-- .../plugins/idea/SiddhiParserDefinition.java | 15 +- .../idea/actions/SiddhiCreateFileAction.java | 6 +- .../daemon/impl/SiddhiAnnotator.java | 8 +- .../impl/SiddhiProjectSdkSetupValidator.java | 9 +- .../highlighting/SiddhiBraceMatcher.java | 7 +- .../completion/SiddhiCompletionUtils.java | 144 +++++++++--------- .../SiddhiKeywordsCompletionContributor.java | 11 +- .../PartitionCompletionContributor.java | 9 +- .../query/QueryCompletionContributor.java | 5 +- .../QueryInputCompletionContributor.java | 9 +- .../QueryOutputCompletionContributor.java | 5 +- .../QuerySectionCompletionContributor.java | 5 +- .../util/KeywordCompletionUtils.java | 11 +- .../ListenableHideableDecorator.java | 6 +- .../SiddhiConfigurableProvider.java | 13 +- .../SiddhiLibrariesConfigurable.java | 14 +- .../SiddhiLibrariesConfigurableProvider.java | 32 ++-- .../SiddhiModuleAwareConfigurable.java | 7 +- .../SiddhiModuleEditorsProvider.java | 4 +- .../SiddhiModuleSettingsConfigurable.java | 9 +- .../configuration/SiddhiModuleSettingsUI.java | 12 +- .../idea/debugger/SiddhiDebugProcess.java | 34 ++--- .../SiddhiDebuggerEditorsProvider.java | 7 +- .../idea/debugger/SiddhiStackFrame.java | 10 +- .../idea/debugger/SiddhiSuspendContext.java | 16 +- .../debugger/SiddhiWebSocketConnector.java | 8 +- .../plugins/idea/debugger/SiddhiXValue.java | 28 ++-- .../breakpoint/SiddhiBreakPointTypeIN.java | 11 +- .../breakpoint/SiddhiBreakPointTypeOUT.java | 11 +- .../idea/editor/SiddhiFoldingBuilder.java | 14 +- .../plugins/idea/formatter/SiddhiBlock.java | 20 +-- .../SiddhiEnterBetweenBracesHandler.java | 5 +- .../SiddhiFormattingModelBuilder.java | 5 +- .../settings/SiddhiCodeStyleConfigurable.java | 7 +- .../SiddhiCodeStyleSettingsProvider.java | 7 +- ...ddhiLanguageCodeStyleSettingsProvider.java | 9 +- .../highlighter/SiddhiColorSettingsPage.java | 12 +- .../highlighter/SiddhiSyntaxHighlighter.java | 6 +- .../SiddhiSyntaxHighlighterFactory.java | 5 +- .../WrongModuleTypeNotificationProvider.java | 16 +- .../SiddhiApplicationLibrariesService.java | 5 +- .../idea/project/SiddhiLibrariesService.java | 32 ++-- .../idea/project/SiddhiLibraryState.java | 8 +- .../SiddhiModuleLibrariesInitializer.java | 26 ++-- .../idea/project/SiddhiModuleSettings.java | 19 ++- .../idea/project/SiddhiProjectExtension.java | 7 +- .../SiddhiProjectLibrariesService.java | 5 +- .../SiddhiProjectStructureDetector.java | 22 +-- .../idea/psi/AggregationDefinitionNode.java | 5 +- .../siddhi/plugins/idea/psi/AliasNode.java | 5 +- .../idea/psi/AnnotationElementNode.java | 5 +- .../plugins/idea/psi/AnnotationNode.java | 5 +- .../plugins/idea/psi/AnonymousStreamNode.java | 5 +- .../plugins/idea/psi/AppAnnotationNode.java | 5 +- .../plugins/idea/psi/AttributeNameNode.java | 4 +- .../plugins/idea/psi/AttributeNode.java | 5 +- .../idea/psi/AttributeReferenceNode.java | 5 +- .../plugins/idea/psi/AttributeTypeNode.java | 5 +- .../plugins/idea/psi/BasicSourceNode.java | 5 +- .../psi/BasicSourceStreamHandlerNode.java | 5 +- .../psi/BasicSourceStreamHandlersNode.java | 5 +- .../plugins/idea/psi/ConstantValueNode.java | 5 +- .../idea/psi/DefinitionElementNode.java | 5 +- ...nitionElementWithExecutionElementNode.java | 5 +- .../plugins/idea/psi/DeleteFromTableNode.java | 5 +- .../plugins/idea/psi/EndPatternNode.java | 5 +- .../idea/psi/ExecutionElementNode.java | 5 +- .../plugins/idea/psi/ExpressionNode.java | 5 +- .../siddhi/plugins/idea/psi/FilterNode.java | 5 +- .../plugins/idea/psi/FunctionBodyNode.java | 5 +- .../idea/psi/FunctionDefinitionNode.java | 5 +- .../plugins/idea/psi/FunctionIdNode.java | 5 +- .../plugins/idea/psi/FunctionNameNode.java | 5 +- .../idea/psi/FunctionOperationNode.java | 5 +- .../siddhi/plugins/idea/psi/GroupByNode.java | 5 +- .../siddhi/plugins/idea/psi/HavingNode.java | 5 +- .../wso2/siddhi/plugins/idea/psi/IdNode.java | 5 +- .../plugins/idea/psi/IdentifierPSINode.java | 5 +- .../siddhi/plugins/idea/psi/JoinNode.java | 5 +- .../plugins/idea/psi/JoinSourceNode.java | 5 +- .../plugins/idea/psi/JoinStreamNode.java | 5 +- .../plugins/idea/psi/LanguageNameNode.java | 5 +- .../plugins/idea/psi/LeftSourceNode.java | 5 +- .../idea/psi/LeftUnidirectionalJoinNode.java | 5 +- .../plugins/idea/psi/MathOperationNode.java | 5 +- .../siddhi/plugins/idea/psi/NameNode.java | 5 +- .../plugins/idea/psi/NullCheckNode.java | 5 +- .../idea/psi/OnWithExpressionNode.java | 5 +- .../plugins/idea/psi/OutputAttributeNode.java | 5 +- .../plugins/idea/psi/OutputEventTypeNode.java | 5 +- .../plugins/idea/psi/OutputRateNode.java | 5 +- .../siddhi/plugins/idea/psi/ParseNode.java | 5 +- .../plugins/idea/psi/PartitionNode.java | 5 +- .../idea/psi/PartitionWithStreamNode.java | 5 +- .../wso2/siddhi/plugins/idea/psi/PerNode.java | 5 +- .../idea/psi/PostWindowHandlerNode.java | 5 +- .../idea/psi/PreWindowHandlerNode.java | 5 +- .../plugins/idea/psi/QueryInputNode.java | 5 +- .../siddhi/plugins/idea/psi/QueryNode.java | 5 +- .../plugins/idea/psi/QueryOutputNode.java | 5 +- .../plugins/idea/psi/QuerySectionNode.java | 5 +- .../plugins/idea/psi/RightSourceNode.java | 5 +- .../RightUnidirectionalOrNormalJoinNode.java | 5 +- .../plugins/idea/psi/SiddhiAppNode.java | 5 +- .../siddhi/plugins/idea/psi/SiddhiFile.java | 7 +- .../plugins/idea/psi/SignedIntValueNode.java | 5 +- .../siddhi/plugins/idea/psi/SourceNode.java | 5 +- .../plugins/idea/psi/StandardStreamNode.java | 5 +- .../plugins/idea/psi/StartPatternNode.java | 5 +- .../idea/psi/StreamDefinitionNode.java | 5 +- .../plugins/idea/psi/StreamFunctionNode.java | 5 +- .../siddhi/plugins/idea/psi/StreamIdNode.java | 5 +- .../plugins/idea/psi/StringValueNode.java | 5 +- .../plugins/idea/psi/TableDefinitionNode.java | 5 +- .../siddhi/plugins/idea/psi/TargetNode.java | 5 +- .../plugins/idea/psi/TimeValueNode.java | 5 +- .../idea/psi/TriggerDefinitionNode.java | 5 +- .../plugins/idea/psi/TriggerNameNode.java | 5 +- .../idea/psi/UpdateOrInsertIntoNode.java | 5 +- .../plugins/idea/psi/UpdateTableNode.java | 5 +- .../idea/psi/WindowDefinitionNode.java | 5 +- .../siddhi/plugins/idea/psi/WindowNode.java | 5 +- .../plugins/idea/psi/WithinTimeRangeNode.java | 5 +- .../references/AttributeNameReference.java | 6 +- .../references/SiddhiElementReference.java | 5 +- .../psi/references/StreamIdReference.java | 6 +- .../idea/psi/references/TargetReference.java | 6 +- .../idea/runconfig/SiddhiConsoleFilter.java | 24 +-- .../idea/runconfig/SiddhiDebugger.java | 22 +-- .../runconfig/SiddhiRunConfiguration.java | 25 ++- .../runconfig/SiddhiRunConfigurationBase.java | 42 ++--- .../SiddhiRunConfigurationProducerBase.java | 13 +- .../plugins/idea/runconfig/SiddhiRunUtil.java | 18 +-- .../plugins/idea/runconfig/SiddhiRunner.java | 7 +- .../idea/runconfig/SiddhiRunningState.java | 17 +-- .../SiddhiApplicationConfiguration.java | 17 +-- ...hiApplicationRunConfigurationProducer.java | 7 +- ...SiddhiApplicationRunConfigurationType.java | 9 +- .../SiddhiApplicationRunningState.java | 11 +- .../remote/SiddhiRemoteConfiguration.java | 12 +- .../SiddhiRemoteRunConfigurationProducer.java | 7 +- .../SiddhiRemoteRunConfigurationType.java | 9 +- .../remote/SiddhiRemoteRunningState.java | 7 +- .../ui/SiddhiApplicationSettingsEditor.java | 8 +- .../ui/SiddhiRemoteSettingsEditor.java | 8 +- .../idea/sdk/SiddhiEnvironmentUtil.java | 7 +- .../sdk/SiddhiPathModificationTracker.java | 10 +- .../SiddhiSdkLibraryPresentationProvider.java | 4 +- .../plugins/idea/sdk/SiddhiSdkService.java | 6 +- .../plugins/idea/sdk/SiddhiSdkType.java | 30 ++-- .../plugins/idea/sdk/SiddhiSdkUtil.java | 55 +++---- .../SiddhiIdentifierTokenizer.java | 5 +- .../SiddhiSpellcheckingStrategy.java | 5 +- .../SiddhiStructureViewElement.java | 8 +- .../SiddhiStructureViewFactory.java | 5 +- .../SiddhiStructureViewModel.java | 7 +- .../SiddhiStructureViewRootElement.java | 5 +- .../plugins/idea/ui/SiddhiNotification.java | 5 +- .../idea/usage/SiddhiFindUsageProvider.java | 19 ++- .../plugins/idea/util/SiddhiExecutor.java | 70 ++++----- 168 files changed, 768 insertions(+), 897 deletions(-) diff --git a/build.gradle b/build.gradle index 690c899..883e1bd 100644 --- a/build.gradle +++ b/build.gradle @@ -110,4 +110,4 @@ task copyPsiViewerPluginToSandBox(type: Copy) { copyPsiViewerPluginToSandBox.dependsOn downloadPsiViewerPlugin copyPsiViewerPluginToSandBox.mustRunAfter prepareSandbox -runIde.dependsOn copyPsiViewerPluginToSandBox +runIde.dependsOn copyPsiViewerPluginToSandBox,check diff --git a/config/findbugs/excludeFilter.xml b/config/findbugs/excludeFilter.xml index 3935585..98004e2 100644 --- a/config/findbugs/excludeFilter.xml +++ b/config/findbugs/excludeFilter.xml @@ -42,4 +42,16 @@ + + + + + + diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/SiddhiASTFactory.java b/src/main/java/org/wso2/siddhi/plugins/idea/SiddhiASTFactory.java index 03918b9..3f871c7 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/SiddhiASTFactory.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/SiddhiASTFactory.java @@ -24,11 +24,10 @@ import com.intellij.psi.impl.source.tree.PsiCoreCommentImpl; import com.intellij.psi.tree.IElementType; import org.antlr.jetbrains.adaptor.lexer.TokenIElementType; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.grammar.SiddhiQLLexer; import org.wso2.siddhi.plugins.idea.psi.IdentifierPSINode; -import javax.annotation.Nonnull; - /** * Defines how to create parse tree nodes (Jetbrains calls them AST nodes). Later * non-leaf nodes are converted to PSI nodes by the {@link ParserDefinition}. @@ -41,7 +40,7 @@ public class SiddhiASTFactory extends CoreASTFactory { * The FileElement is a parse tree node, which is converted to a PsiFile * by {@link ParserDefinition#createFile}. */ - @Nonnull + @NotNull @Override public CompositeElement createComposite(IElementType type) { return super.createComposite(type); @@ -52,9 +51,9 @@ public CompositeElement createComposite(IElementType type) { * Does not see whitespace tokens. Default impl makes {@link LeafPsiElement} * or {@link PsiCoreCommentImpl} depending on {@link ParserDefinition#getCommentTokens()}. */ - @Nonnull + @NotNull @Override - public LeafElement createLeaf(@Nonnull IElementType type, @Nonnull CharSequence text) { + public LeafElement createLeaf(@NotNull IElementType type, @NotNull CharSequence text) { if (type instanceof TokenIElementType && ((TokenIElementType) type).getANTLRTokenType() == SiddhiQLLexer.ID) { // found an ID node; here we do not distinguish between definitions and references diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/SiddhiFileType.java b/src/main/java/org/wso2/siddhi/plugins/idea/SiddhiFileType.java index 60aa43a..d15c69e 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/SiddhiFileType.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/SiddhiFileType.java @@ -17,9 +17,9 @@ package org.wso2.siddhi.plugins.idea; import com.intellij.openapi.fileTypes.LanguageFileType; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import javax.annotation.Nonnull; import javax.swing.Icon; /** @@ -33,19 +33,19 @@ private SiddhiFileType() { super(SiddhiLanguage.INSTANCE); } - @Nonnull + @NotNull @Override public String getName() { return "Siddhi file"; } - @Nonnull + @NotNull @Override public String getDescription() { return "Siddhi language file"; } - @Nonnull + @NotNull @Override public String getDefaultExtension() { return "siddhi"; diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/SiddhiFileTypeFactory.java b/src/main/java/org/wso2/siddhi/plugins/idea/SiddhiFileTypeFactory.java index b3fc29d..0263509 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/SiddhiFileTypeFactory.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/SiddhiFileTypeFactory.java @@ -18,8 +18,7 @@ import com.intellij.openapi.fileTypes.FileTypeConsumer; import com.intellij.openapi.fileTypes.FileTypeFactory; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * Creates file types associated with siddhi language. @@ -27,7 +26,7 @@ public class SiddhiFileTypeFactory extends FileTypeFactory { @Override - public void createFileTypes(@Nonnull FileTypeConsumer fileTypeConsumer) { + public void createFileTypes(@NotNull FileTypeConsumer fileTypeConsumer) { fileTypeConsumer.consume(SiddhiFileType.INSTANCE, "siddhi"); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/SiddhiIcons.java b/src/main/java/org/wso2/siddhi/plugins/idea/SiddhiIcons.java index 13d5d23..efd6e4a 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/SiddhiIcons.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/SiddhiIcons.java @@ -19,8 +19,8 @@ import com.intellij.icons.AllIcons; import com.intellij.openapi.util.IconLoader; import com.intellij.ui.LayeredIcon; +import org.jetbrains.annotations.NotNull; -import javax.annotation.Nonnull; import javax.swing.Icon; /** @@ -38,8 +38,8 @@ private SiddhiIcons() { } - @Nonnull - private static LayeredIcon createIconWithShift(@Nonnull Icon base, Icon mark) { + @NotNull + private static LayeredIcon createIconWithShift(@NotNull Icon base, Icon mark) { LayeredIcon icon = new LayeredIcon(2) { @Override public int getIconHeight() { diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/SiddhiModuleBuilder.java b/src/main/java/org/wso2/siddhi/plugins/idea/SiddhiModuleBuilder.java index ee18ffc..37e37ca 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/SiddhiModuleBuilder.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/SiddhiModuleBuilder.java @@ -27,11 +27,11 @@ import com.intellij.openapi.roots.ModifiableRootModel; import com.intellij.openapi.util.Pair; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.sdk.SiddhiSdkType; import java.util.ArrayList; import java.util.List; -import javax.annotation.Nonnull; /** * Module builder for siddhi. @@ -52,7 +52,7 @@ public List> getSourcePaths() { return paths; } - @Nonnull + @NotNull @Override public ModuleType getModuleType() { return SiddhiModuleType.getInstance(); @@ -64,7 +64,7 @@ public boolean isSuitableSdkType(SdkTypeId sdkType) { } @Override - public void moduleCreated(@Nonnull Module module) { + public void moduleCreated(@NotNull Module module) { CompilerWorkspaceConfiguration.getInstance(module.getProject()).CLEAR_OUTPUT_DIRECTORY = false; } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/SiddhiModuleType.java b/src/main/java/org/wso2/siddhi/plugins/idea/SiddhiModuleType.java index dc05d4e..d9bf23d 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/SiddhiModuleType.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/SiddhiModuleType.java @@ -22,10 +22,10 @@ import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.module.ModuleTypeManager; import com.intellij.openapi.roots.ui.configuration.ModulesProvider; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.sdk.SiddhiSdkType; -import javax.annotation.Nonnull; import javax.swing.Icon; /** @@ -37,24 +37,24 @@ public SiddhiModuleType() { super(SiddhiConstants.MODULE_TYPE_ID); } - @Nonnull + @NotNull public static SiddhiModuleType getInstance() { return (SiddhiModuleType) ModuleTypeManager.getInstance().findByID(SiddhiConstants.MODULE_TYPE_ID); } - @Nonnull + @NotNull @Override public SiddhiModuleBuilder createModuleBuilder() { return new SiddhiModuleBuilder(); } - @Nonnull + @NotNull @Override public String getName() { return "Siddhi Module"; } - @Nonnull + @NotNull @Override public String getDescription() { return "Siddhi modules are used for developing Siddhi applications."; @@ -71,11 +71,11 @@ public Icon getNodeIcon(boolean isOpened) { return SiddhiIcons.ICON; } - @Nonnull + @NotNull @Override - public ModuleWizardStep[] createWizardSteps(@Nonnull WizardContext wizardContext, - @Nonnull SiddhiModuleBuilder moduleBuilder, - @Nonnull ModulesProvider modulesProvider) { + public ModuleWizardStep[] createWizardSteps(@NotNull WizardContext wizardContext, + @NotNull SiddhiModuleBuilder moduleBuilder, + @NotNull ModulesProvider modulesProvider) { return new ModuleWizardStep[]{new ProjectJdkForModuleStep(wizardContext, SiddhiSdkType.getInstance()) { @Override public void updateDataModel() { diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/SiddhiParserDefinition.java b/src/main/java/org/wso2/siddhi/plugins/idea/SiddhiParserDefinition.java index 489af14..c2cb915 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/SiddhiParserDefinition.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/SiddhiParserDefinition.java @@ -36,6 +36,7 @@ import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; import org.antlr.v4.runtime.Parser; import org.antlr.v4.runtime.tree.ParseTree; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.grammar.SiddhiQLLexer; import org.wso2.siddhi.plugins.idea.grammar.SiddhiQLParser; import org.wso2.siddhi.plugins.idea.psi.AggregationDefinitionNode; @@ -113,8 +114,6 @@ import org.wso2.siddhi.plugins.idea.psi.WindowNode; import org.wso2.siddhi.plugins.idea.psi.WithinTimeRangeNode; -import javax.annotation.Nonnull; - import static org.wso2.siddhi.plugins.idea.grammar.SiddhiQLParser.AGGREGATE; import static org.wso2.siddhi.plugins.idea.grammar.SiddhiQLParser.AGGREGATION; import static org.wso2.siddhi.plugins.idea.grammar.SiddhiQLParser.ALL; @@ -303,14 +302,14 @@ public class SiddhiParserDefinition implements ParserDefinition { public static final TokenSet SYMBOLS = PSIElementTypeFactory.createTokenSet(SiddhiLanguage.INSTANCE, AT_SYMBOL, HASH); - @Nonnull + @NotNull @Override public Lexer createLexer(Project project) { SiddhiQLLexer lexer = new SiddhiQLLexer(null); return new ANTLRLexerAdaptor(SiddhiLanguage.INSTANCE, lexer); } - @Nonnull + @NotNull public PsiParser createParser(final Project project) { final SiddhiQLParser parser = new SiddhiQLParser(null); return new ANTLRParserAdaptor(SiddhiLanguage.INSTANCE, parser) { @@ -326,17 +325,17 @@ protected ParseTree parse(Parser parser, IElementType root) { /** * Tokens of those types are automatically skipped by PsiBuilder. */ - @Nonnull + @NotNull public TokenSet getWhitespaceTokens() { return WHITESPACE; } - @Nonnull + @NotNull public TokenSet getCommentTokens() { return COMMENTS; } - @Nonnull + @NotNull public TokenSet getStringLiteralElements() { return STRING_LITERALS; } @@ -386,7 +385,7 @@ public PsiFile createFile(FileViewProvider viewProvider) { * sufficient to create a {@link ANTLRPsiNode} around * the parse tree node */ - @Nonnull + @NotNull public PsiElement createElement(ASTNode node) { IElementType elementType = node.getElementType(); if (elementType instanceof TokenIElementType) { diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/actions/SiddhiCreateFileAction.java b/src/main/java/org/wso2/siddhi/plugins/idea/actions/SiddhiCreateFileAction.java index d030e1e..802480f 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/actions/SiddhiCreateFileAction.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/actions/SiddhiCreateFileAction.java @@ -27,12 +27,12 @@ import com.intellij.psi.PsiDirectory; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.SiddhiIcons; import org.wso2.siddhi.plugins.idea.psi.SiddhiFile; import java.util.Map; -import javax.annotation.Nonnull; /** * Defines 'creating a file' action in siddhi. @@ -49,7 +49,7 @@ public SiddhiCreateFileAction() { @Override protected void buildDialog(Project project, PsiDirectory directory, - @Nonnull CreateFileFromTemplateDialog.Builder builder) { + @NotNull CreateFileFromTemplateDialog.Builder builder) { builder.setTitle(NEW_SIDDHI_FILE).addKind("Siddhi Main", SiddhiIcons.ICON, MAIN_TEMPLATE_NAME); } @@ -59,7 +59,7 @@ protected String getDefaultTemplateProperty() { return DEFAULT_SIDDHI_TEMPLATE_PROPERTY; } - @Nonnull + @NotNull @Override protected String getActionName(PsiDirectory directory, String newName, String templateName) { return NEW_SIDDHI_FILE; diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/codeinsight/daemon/impl/SiddhiAnnotator.java b/src/main/java/org/wso2/siddhi/plugins/idea/codeinsight/daemon/impl/SiddhiAnnotator.java index c9c011d..a43ea9f 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/codeinsight/daemon/impl/SiddhiAnnotator.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/codeinsight/daemon/impl/SiddhiAnnotator.java @@ -23,13 +23,13 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.impl.source.tree.LeafPsiElement; import com.intellij.psi.tree.IElementType; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.SiddhiTypes; import org.wso2.siddhi.plugins.idea.highlighter.SiddhiSyntaxHighlightingColors; import org.wso2.siddhi.plugins.idea.psi.StreamIdNode; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.Nonnull; /** * Add annotations to files in siddhi language. @@ -44,7 +44,7 @@ public class SiddhiAnnotator implements Annotator { private static final Pattern INVALID_ESCAPE_CHAR_PATTERN = Pattern.compile(INVALID_ESCAPE_CHARACTERS); @Override - public void annotate(@Nonnull PsiElement element, @Nonnull AnnotationHolder holder) { + public void annotate(@NotNull PsiElement element, @NotNull AnnotationHolder holder) { if (element instanceof StreamIdNode) { annotateStreamIdNodes(element, holder); } else if (element instanceof LeafPsiElement) { @@ -52,12 +52,12 @@ public void annotate(@Nonnull PsiElement element, @Nonnull AnnotationHolder hold } } - private void annotateStreamIdNodes(@Nonnull PsiElement element, @Nonnull AnnotationHolder holder) { + private void annotateStreamIdNodes(@NotNull PsiElement element, @NotNull AnnotationHolder holder) { Annotation annotation = holder.createInfoAnnotation(element.getTextRange(), null); annotation.setTextAttributes(SiddhiSyntaxHighlightingColors.STREAM_ID); } - private void annotateLeafPsiElementNodes(@Nonnull PsiElement element, @Nonnull AnnotationHolder holder) { + private void annotateLeafPsiElementNodes(@NotNull PsiElement element, @NotNull AnnotationHolder holder) { IElementType elementType = ((LeafPsiElement) element).getElementType(); if (elementType != SiddhiTypes.STRING_LITERAL) { return; diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/codeinsight/daemon/impl/SiddhiProjectSdkSetupValidator.java b/src/main/java/org/wso2/siddhi/plugins/idea/codeinsight/daemon/impl/SiddhiProjectSdkSetupValidator.java index 6aea0aa..62137ce 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/codeinsight/daemon/impl/SiddhiProjectSdkSetupValidator.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/codeinsight/daemon/impl/SiddhiProjectSdkSetupValidator.java @@ -30,14 +30,13 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiManager; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.SiddhiFileType; import org.wso2.siddhi.plugins.idea.SiddhiLanguage; import org.wso2.siddhi.plugins.idea.sdk.SiddhiSdkService; import org.wso2.siddhi.plugins.idea.sdk.SiddhiSdkType; -import javax.annotation.Nonnull; - /** * Validates the sdk setup of the project. */ @@ -46,7 +45,7 @@ public class SiddhiProjectSdkSetupValidator implements ProjectSdkSetupValidator public static final SiddhiProjectSdkSetupValidator INSTANCE = new SiddhiProjectSdkSetupValidator(); @Override - public boolean isApplicableFor(@Nonnull Project project, @Nonnull VirtualFile file) { + public boolean isApplicableFor(@NotNull Project project, @NotNull VirtualFile file) { if (file.getFileType() == SiddhiFileType.INSTANCE) { return true; } @@ -56,7 +55,7 @@ public boolean isApplicableFor(@Nonnull Project project, @Nonnull VirtualFile fi @Nullable @Override - public String getErrorMessage(@Nonnull Project project, @Nonnull VirtualFile file) { + public String getErrorMessage(@NotNull Project project, @NotNull VirtualFile file) { final Module module = ModuleUtilCore.findModuleForFile(file, project); if (module == null || module.isDisposed()) { return null; @@ -79,7 +78,7 @@ public String getErrorMessage(@Nonnull Project project, @Nonnull VirtualFile fil } @Override - public void doFix(@Nonnull Project project, @Nonnull VirtualFile file) { + public void doFix(@NotNull Project project, @NotNull VirtualFile file) { // Get the current project SDK. Sdk currentProjectSDK = ProjectRootManager.getInstance(project).getProjectSdk(); if (currentProjectSDK != null) { diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/codeinsight/highlighting/SiddhiBraceMatcher.java b/src/main/java/org/wso2/siddhi/plugins/idea/codeinsight/highlighting/SiddhiBraceMatcher.java index 8b576c4..3cc29e4 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/codeinsight/highlighting/SiddhiBraceMatcher.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/codeinsight/highlighting/SiddhiBraceMatcher.java @@ -29,11 +29,10 @@ import com.intellij.psi.PsiMethod; import com.intellij.psi.PsiStatement; import com.intellij.psi.tree.IElementType; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.SiddhiTypes; -import javax.annotation.Nonnull; - /** * Defines the brace matching support required for siddhi language. */ @@ -44,7 +43,7 @@ public class SiddhiBraceMatcher implements PairedBraceMatcher { new BracePair(SiddhiTypes.OPEN_SQUARE_BRACKETS, SiddhiTypes.CLOSE_SQUARE_BRACKETS, false) }; - @Nonnull + @NotNull @Override public BracePair[] getPairs() { BracePair[] pairsCopy = pairs; @@ -52,7 +51,7 @@ public BracePair[] getPairs() { } @Override - public boolean isPairedBracesAllowedBeforeType(@Nonnull final IElementType lbraceType, + public boolean isPairedBracesAllowedBeforeType(@NotNull final IElementType lbraceType, @Nullable final IElementType contextType) { return true; } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/completion/SiddhiCompletionUtils.java b/src/main/java/org/wso2/siddhi/plugins/idea/completion/SiddhiCompletionUtils.java index f75e882..d346299 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/completion/SiddhiCompletionUtils.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/completion/SiddhiCompletionUtils.java @@ -28,6 +28,7 @@ import com.intellij.openapi.editor.EditorModificationUtil; import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.SiddhiIcons; import org.wso2.siddhi.plugins.idea.psi.StreamDefinitionNode; @@ -36,7 +37,6 @@ import java.util.LinkedList; import java.util.List; -import javax.annotation.Nonnull; /** * Suggests parenthesis. @@ -511,8 +511,8 @@ private SiddhiCompletionUtils() { * @param insertHandler insert handler of the lookup * @return {@link LookupElementBuilder} which will be used to create the lookup element. */ - @Nonnull - private static LookupElementBuilder createLookupElement(@Nonnull String name, + @NotNull + private static LookupElementBuilder createLookupElement(@NotNull String name, @Nullable InsertHandler insertHandler) { return LookupElementBuilder.create(name).withBoldness(true).withInsertHandler(insertHandler); } @@ -523,8 +523,8 @@ private static LookupElementBuilder createLookupElement(@Nonnull String name, * @param name name of the lookup * @return {@link LookupElementBuilder} which will be used to create the lookup element. */ - @Nonnull - private static LookupElementBuilder createKeywordLookupElement(@Nonnull String name) { + @NotNull + private static LookupElementBuilder createKeywordLookupElement(@NotNull String name) { return createLookupElement(name, createTemplateBasedInsertHandler("siddhi_lang_" + name)); } @@ -534,13 +534,13 @@ private static LookupElementBuilder createKeywordLookupElement(@Nonnull String n * @param name name of the lookup * @return {@link LookupElementBuilder} which will be used to create the lookup element. */ - @Nonnull - private static LookupElementBuilder createKeywordWithoutEndWhitespaceLookupElement(@Nonnull String name) { + @NotNull + private static LookupElementBuilder createKeywordWithoutEndWhitespaceLookupElement(@NotNull String name) { return createLookupElement(name, null); } - @Nonnull - private static InsertHandler createTemplateBasedInsertHandler(@Nonnull String templateId) { + @NotNull + private static InsertHandler createTemplateBasedInsertHandler(@NotNull String templateId) { return (context, item) -> { Template template = TemplateSettings.getInstance().getTemplateById(templateId); Editor editor = context.getEditor(); @@ -566,8 +566,8 @@ private static InsertHandler createTemplateBasedInsertHandler(@No * @param insertHandler insert handler of the lookup * @return {@link LookupElementBuilder} which will be used to create the lookup element. */ - @Nonnull - private static LookupElementBuilder createDataTypeLookupElement(@Nonnull String name, + @NotNull + private static LookupElementBuilder createDataTypeLookupElement(@NotNull String name, @Nullable InsertHandler insertHandler) { return createLookupElement(name, insertHandler).withTypeText("Data Type"); @@ -580,8 +580,8 @@ private static LookupElementBuilder createDataTypeLookupElement(@Nonnull String * @param insertHandler insert handler of the lookup * @return {@link LookupElementBuilder} which will be used to create the lookup element. */ - @Nonnull - private static LookupElementBuilder createWindowProcessorTypeLookupElement(@Nonnull String name, + @NotNull + private static LookupElementBuilder createWindowProcessorTypeLookupElement(@NotNull String name, @Nullable InsertHandler insertHandler) { return createLookupElement(name, insertHandler).withTypeText("Window Processor"); @@ -594,8 +594,8 @@ private static LookupElementBuilder createWindowProcessorTypeLookupElement(@Nonn * @param insertHandler insert handler of the lookup * @return {@link LookupElementBuilder} which will be used to create the lookup element. */ - @Nonnull - private static LookupElementBuilder createDefineSnippetTypeLookupElement(@Nonnull String name, + @NotNull + private static LookupElementBuilder createDefineSnippetTypeLookupElement(@NotNull String name, @Nullable InsertHandler insertHandler) { return createLookupElement(name, insertHandler).withTypeText("Snippet"); @@ -609,11 +609,11 @@ private static LookupElementBuilder createDefineSnippetTypeLookupElement(@Nonnul * @param text string which needed to be shown as type text * @return {@link LookupElementBuilder} which will be used to create the lookup element. */ - @Nonnull - private static LookupElementBuilder createLookupElementWithCustomTypeText(@Nonnull String name, + @NotNull + private static LookupElementBuilder createLookupElementWithCustomTypeText(@NotNull String name, @Nullable InsertHandler insertHandler, - @Nonnull String text) { + @NotNull String text) { return createLookupElement(name, insertHandler).withTypeText(text); } @@ -623,7 +623,7 @@ private static LookupElementBuilder createLookupElementWithCustomTypeText(@Nonnu * * @param resultSet result list which is used to add lookups */ - public static void addValueTypesAsLookups(@Nonnull CompletionResultSet resultSet) { + public static void addValueTypesAsLookups(@NotNull CompletionResultSet resultSet) { resultSet.addElement(PrioritizedLookupElement.withPriority(LONG, VALUE_TYPES_PRIORITY)); resultSet.addElement(PrioritizedLookupElement.withPriority(INT, VALUE_TYPES_PRIORITY)); resultSet.addElement(PrioritizedLookupElement.withPriority(FLOAT, VALUE_TYPES_PRIORITY)); @@ -638,7 +638,7 @@ public static void addValueTypesAsLookups(@Nonnull CompletionResultSet resultSet * * @param resultSet result list which is used to add lookups */ - public static void addInitialTypesAsLookups(@Nonnull CompletionResultSet resultSet) { + public static void addInitialTypesAsLookups(@NotNull CompletionResultSet resultSet) { resultSet.addElement(PrioritizedLookupElement.withPriority(DEFINE, VALUE_TYPES_PRIORITY)); resultSet.addElement(PrioritizedLookupElement.withPriority(PARTITION, VALUE_TYPES_PRIORITY)); resultSet.addElement(PrioritizedLookupElement.withPriority(FROM, VALUE_TYPES_PRIORITY)); @@ -674,7 +674,7 @@ public static void addInitialTypesAsLookups(@Nonnull CompletionResultSet resultS * * @param resultSet result list which is used to add lookups */ - public static void addQuerySnippetAsLookup(@Nonnull CompletionResultSet resultSet) { + public static void addQuerySnippetAsLookup(@NotNull CompletionResultSet resultSet) { resultSet.addElement(PrioritizedLookupElement.withPriority(QUERY_SNIIP, VALUE_TYPES_PRIORITY)); } @@ -683,7 +683,7 @@ public static void addQuerySnippetAsLookup(@Nonnull CompletionResultSet resultSe * * @param resultSet result list which is used to add lookups */ - public static void addAfterATSymbolLookups(@Nonnull CompletionResultSet resultSet) { + public static void addAfterATSymbolLookups(@NotNull CompletionResultSet resultSet) { resultSet.addElement(PrioritizedLookupElement.withPriority(ANNOTATION_SINK2, VALUE_TYPES_PRIORITY)); resultSet.addElement(PrioritizedLookupElement.withPriority(ANNOTATION_SOURCE2, VALUE_TYPES_PRIORITY)); resultSet.addElement(PrioritizedLookupElement.withPriority(ANNOTATION_CONFIG_SNIIP2, VALUE_TYPES_PRIORITY)); @@ -706,7 +706,7 @@ public static void addAfterATSymbolLookups(@Nonnull CompletionResultSet resultSe * * @param resultSet result list which is used to add lookups */ - public static void addBeginingOfQueryOutputKeywords(@Nonnull CompletionResultSet resultSet) { + public static void addBeginingOfQueryOutputKeywords(@NotNull CompletionResultSet resultSet) { addKeywordAsLookup(resultSet, INSERT); addKeywordAsLookup(resultSet, DELETE); addKeywordAsLookup(resultSet, UPDATE_OR_INSERT_INTO); @@ -718,7 +718,7 @@ public static void addBeginingOfQueryOutputKeywords(@Nonnull CompletionResultSet * * @param resultSet result list which is used to add lookups */ - public static void addSuggestionsAfterQueryInput(@Nonnull CompletionResultSet resultSet) { + public static void addSuggestionsAfterQueryInput(@NotNull CompletionResultSet resultSet) { addKeywordAsLookup(resultSet, SELECT); addKeywordAsLookup(resultSet, OUTPUT); addKeywordAsLookup(resultSet, INSERT); @@ -732,7 +732,7 @@ public static void addSuggestionsAfterQueryInput(@Nonnull CompletionResultSet re * * @param resultSet result list which is used to add lookups */ - public static void addDefineTypesAsLookups(@Nonnull CompletionResultSet resultSet) { + public static void addDefineTypesAsLookups(@NotNull CompletionResultSet resultSet) { resultSet.addElement(PrioritizedLookupElement.withPriority(STREAM, VALUE_TYPES_PRIORITY)); resultSet.addElement(PrioritizedLookupElement.withPriority(TABLE, VALUE_TYPES_PRIORITY)); resultSet.addElement(PrioritizedLookupElement.withPriority(TRIGGER, VALUE_TYPES_PRIORITY)); @@ -746,129 +746,129 @@ public static void addDefineTypesAsLookups(@Nonnull CompletionResultSet resultSe * @param resultSet result list which is used to add lookups * @param lookupElement lookup element which needs to be added to the result list */ - private static void addKeywordAsLookup(@Nonnull CompletionResultSet resultSet, @Nonnull LookupElement + private static void addKeywordAsLookup(@NotNull CompletionResultSet resultSet, @NotNull LookupElement lookupElement) { resultSet.addElement(PrioritizedLookupElement.withPriority(lookupElement, KEYWORDS_PRIORITY)); } - private static LookupElement createKeywordAsLookup(@Nonnull LookupElement lookupElement) { + private static LookupElement createKeywordAsLookup(@NotNull LookupElement lookupElement) { return PrioritizedLookupElement.withPriority(lookupElement, KEYWORDS_PRIORITY); } - public static void addAtKeyword(@Nonnull CompletionResultSet resultSet) { + public static void addAtKeyword(@NotNull CompletionResultSet resultSet) { addKeywordAsLookup(resultSet, AT); } - public static void addEveryKeyword(@Nonnull CompletionResultSet resultSet) { + public static void addEveryKeyword(@NotNull CompletionResultSet resultSet) { addKeywordAsLookup(resultSet, EVERY); } - public static void addFromKeyword(@Nonnull CompletionResultSet resultSet) { + public static void addFromKeyword(@NotNull CompletionResultSet resultSet) { addKeywordAsLookup(resultSet, FROM); } - public static void addByKeyword(@Nonnull CompletionResultSet resultSet) { + public static void addByKeyword(@NotNull CompletionResultSet resultSet) { addKeywordAsLookup(resultSet, BY); } - public static void addHavingKeyword(@Nonnull CompletionResultSet resultSet) { + public static void addHavingKeyword(@NotNull CompletionResultSet resultSet) { addKeywordAsLookup(resultSet, HAVING); } - public static void addReturnKeyword(@Nonnull CompletionResultSet resultSet) { + public static void addReturnKeyword(@NotNull CompletionResultSet resultSet) { addKeywordAsLookup(resultSet, RETURN); } - public static void addIntoKeyword(@Nonnull CompletionResultSet resultSet) { + public static void addIntoKeyword(@NotNull CompletionResultSet resultSet) { addKeywordAsLookup(resultSet, INTO); } - public static void addWithinKeyword(@Nonnull CompletionResultSet resultSet) { + public static void addWithinKeyword(@NotNull CompletionResultSet resultSet) { addKeywordAsLookup(resultSet, WITHIN); } - public static void addForKeyword(@Nonnull CompletionResultSet resultSet) { + public static void addForKeyword(@NotNull CompletionResultSet resultSet) { addKeywordAsLookup(resultSet, FOR); } - public static void addOnKeyword(@Nonnull CompletionResultSet resultSet) { + public static void addOnKeyword(@NotNull CompletionResultSet resultSet) { addKeywordAsLookup(resultSet, ON); } - public static void addSetKeyword(@Nonnull CompletionResultSet resultSet) { + public static void addSetKeyword(@NotNull CompletionResultSet resultSet) { addKeywordAsLookup(resultSet, SET); } - public static void addOrKeyword(@Nonnull CompletionResultSet resultSet) { + public static void addOrKeyword(@NotNull CompletionResultSet resultSet) { addKeywordAsLookup(resultSet, OR); } - public static void addAsKeyword(@Nonnull CompletionResultSet resultSet) { + public static void addAsKeyword(@NotNull CompletionResultSet resultSet) { addKeywordAsLookup(resultSet, AS); } - public static void addBeginKeyword(@Nonnull CompletionResultSet resultSet) { + public static void addBeginKeyword(@NotNull CompletionResultSet resultSet) { addKeywordAsLookup(resultSet, BEGIN); } - public static void addEndKeyword(@Nonnull CompletionResultSet resultSet) { + public static void addEndKeyword(@NotNull CompletionResultSet resultSet) { addKeywordAsLookup(resultSet, END); } - public static void addOfKeyword(@Nonnull CompletionResultSet resultSet) { + public static void addOfKeyword(@NotNull CompletionResultSet resultSet) { addKeywordAsLookup(resultSet, OF); } - public static void addUnidirectionalKeyword(@Nonnull CompletionResultSet resultSet) { + public static void addUnidirectionalKeyword(@NotNull CompletionResultSet resultSet) { addKeywordAsLookup(resultSet, UNIDIRECTIONAL); } - public static void addAsKeywordWithDummyAlias(@Nonnull CompletionResultSet resultSet) { + public static void addAsKeywordWithDummyAlias(@NotNull CompletionResultSet resultSet) { addKeywordAsLookup(resultSet, AS_WITH_ALIAS); } - public static void addEnterYourExpressionClause(@Nonnull CompletionResultSet resultSet) { + public static void addEnterYourExpressionClause(@NotNull CompletionResultSet resultSet) { addKeywordAsLookup(resultSet, ENTER_YOUR_EXPRESSION); } - public static void addComma(@Nonnull CompletionResultSet resultSet) { + public static void addComma(@NotNull CompletionResultSet resultSet) { addKeywordAsLookup(resultSet, COMMA_SYMBOL); } - public static void addSemicolon(@Nonnull CompletionResultSet resultSet) { + public static void addSemicolon(@NotNull CompletionResultSet resultSet) { addKeywordAsLookup(resultSet, SEMI_COLON_SYMBOL); } - public static void addPerKeyword(@Nonnull CompletionResultSet resultSet) { + public static void addPerKeyword(@NotNull CompletionResultSet resultSet) { addKeywordAsLookup(resultSet, PER); } - public static void addOutputEventTypeKeywords(@Nonnull CompletionResultSet resultSet) { + public static void addOutputEventTypeKeywords(@NotNull CompletionResultSet resultSet) { addKeywordAsLookup(resultSet, (ALL_EVENTS)); addKeywordAsLookup(resultSet, (EXPIRED_EVENTS)); addKeywordAsLookup(resultSet, (CURRENT_EVENTS)); } - public static void addLanguageTypesKeywords(@Nonnull CompletionResultSet resultSet) { + public static void addLanguageTypesKeywords(@NotNull CompletionResultSet resultSet) { addKeywordAsLookup(resultSet, JAVASCRIPT); addKeywordAsLookup(resultSet, R); addKeywordAsLookup(resultSet, SCALA); } - public static void addFilterSuggestion(@Nonnull CompletionResultSet resultSet) { + public static void addFilterSuggestion(@NotNull CompletionResultSet resultSet) { addKeywordAsLookup(resultSet, EXPRESSION_WITH_HASH); addKeywordAsLookup(resultSet, EXPRESSION_WITHOUT_HASH); } - public static void addStreamFunctions(@Nonnull CompletionResultSet resultSet) { + public static void addStreamFunctions(@NotNull CompletionResultSet resultSet) { addKeywordAsLookup(resultSet, LOG); } - public static void addWithKeywordAndParentheses(@Nonnull CompletionResultSet resultSet) { + public static void addWithKeywordAndParentheses(@NotNull CompletionResultSet resultSet) { addKeywordAsLookup(resultSet, WITH_AND_PARENTHESES); } - public static void addWindowTypesWithWindowKeyword(@Nonnull CompletionResultSet resultSet) { + public static void addWindowTypesWithWindowKeyword(@NotNull CompletionResultSet resultSet) { resultSet.addElement(PrioritizedLookupElement.withPriority(LENGTH_WITH_WINDOW, VALUE_TYPES_PRIORITY)); resultSet.addElement(PrioritizedLookupElement.withPriority(LENGTHBATCH_WITH_WINDOW, VALUE_TYPES_PRIORITY)); resultSet.addElement(PrioritizedLookupElement.withPriority(SORT_WITH_WINDOW, VALUE_TYPES_PRIORITY)); @@ -883,7 +883,7 @@ public static void addWindowTypesWithWindowKeyword(@Nonnull CompletionResultSet resultSet.addElement(PrioritizedLookupElement.withPriority(EXTERNALTIME_WITH_WINDOW, VALUE_TYPES_PRIORITY)); } - public static void addSuggestionsRelatedToJoins(@Nonnull CompletionResultSet resultSet) { + public static void addSuggestionsRelatedToJoins(@NotNull CompletionResultSet resultSet) { addKeywordAsLookup(resultSet, LEFT_OUTER_JOIN); addKeywordAsLookup(resultSet, RIGHT_OUTER_JOIN); addKeywordAsLookup(resultSet, FULL_OUTER_JOIN); @@ -892,7 +892,7 @@ public static void addSuggestionsRelatedToJoins(@Nonnull CompletionResultSet res addKeywordAsLookup(resultSet, JOIN); } - public static void onWithExpressionKeyword(@Nonnull CompletionResultSet resultSet) { + public static void onWithExpressionKeyword(@NotNull CompletionResultSet resultSet) { addKeywordAsLookup(resultSet, ON_WITH_EXPRESSION); } @@ -901,7 +901,7 @@ public static void onWithExpressionKeyword(@Nonnull CompletionResultSet resultSe * * @param resultSet result list which is used to add lookups */ - public static void addWindowProcessorTypesAsLookups(@Nonnull CompletionResultSet resultSet) { + public static void addWindowProcessorTypesAsLookups(@NotNull CompletionResultSet resultSet) { resultSet.addElement(PrioritizedLookupElement.withPriority(LENGTH, VALUE_TYPES_PRIORITY)); resultSet.addElement(PrioritizedLookupElement.withPriority(LENGTHBATCH, VALUE_TYPES_PRIORITY)); resultSet.addElement(PrioritizedLookupElement.withPriority(SORT, VALUE_TYPES_PRIORITY)); @@ -915,13 +915,13 @@ public static void addWindowProcessorTypesAsLookups(@Nonnull CompletionResultSet resultSet.addElement(PrioritizedLookupElement.withPriority(EXTERNALTIME, VALUE_TYPES_PRIORITY)); } - public static void addValueKeywords(@Nonnull CompletionResultSet resultSet) { + public static void addValueKeywords(@NotNull CompletionResultSet resultSet) { addKeywordAsLookup(resultSet, TRUE); addKeywordAsLookup(resultSet, FALSE); addKeywordAsLookup(resultSet, NULL); } - @Nonnull + @NotNull public static List createValueKeywords() { List lookupElements = new LinkedList<>(); lookupElements.add(createKeywordAsLookup(TRUE)); @@ -930,8 +930,8 @@ public static List createValueKeywords() { return lookupElements; } - @Nonnull - private static LookupElement createSourceLookupElement(@Nonnull PsiElement element) { + @NotNull + private static LookupElement createSourceLookupElement(@NotNull PsiElement element) { String definitionType = "Source"; if (PsiTreeUtil.getParentOfType(element, StreamDefinitionNode.class) != null) { definitionType = "Stream"; @@ -948,8 +948,8 @@ private static LookupElement createSourceLookupElement(@Nonnull PsiElement eleme } - @Nonnull - public static List createSourceLookupElements(@Nonnull Object[] streamIdNodes) { + @NotNull + public static List createSourceLookupElements(@NotNull Object[] streamIdNodes) { List lookupElements = new LinkedList<>(); for (Object streamIdNode : streamIdNodes) { PsiElement psiElement = (PsiElement) streamIdNode; @@ -959,15 +959,15 @@ public static List createSourceLookupElements(@Nonnull Object[] s return lookupElements; } - @Nonnull - private static LookupElement createEventTableLookupElement(@Nonnull PsiElement element) { + @NotNull + private static LookupElement createEventTableLookupElement(@NotNull PsiElement element) { LookupElementBuilder builder = LookupElementBuilder.create(element.getText()) .withTypeText("Event Table").withIcon(SiddhiIcons.METHOD); return PrioritizedLookupElement.withPriority(builder, VARIABLE_PRIORITY); } - @Nonnull - public static List createEventTableLookupElements(@Nonnull Object[] streamIdNodes) { + @NotNull + public static List createEventTableLookupElements(@NotNull Object[] streamIdNodes) { List lookupElements = new LinkedList<>(); for (Object streamIdNode : streamIdNodes) { PsiElement psiElement = (PsiElement) streamIdNode; @@ -977,15 +977,15 @@ public static List createEventTableLookupElements(@Nonnull Object return lookupElements; } - @Nonnull - private static LookupElement createAttributeNameLookupElement(@Nonnull PsiElement element) { + @NotNull + private static LookupElement createAttributeNameLookupElement(@NotNull PsiElement element) { LookupElementBuilder builder = LookupElementBuilder.create(element.getText()) .withTypeText("Attribute Name").withIcon(SiddhiIcons.PROPERTY); return PrioritizedLookupElement.withPriority(builder, VARIABLE_PRIORITY); } - @Nonnull - public static List createAttributeNameLookupElements(@Nonnull Object[] attributeNameNodes) { + @NotNull + public static List createAttributeNameLookupElements(@NotNull Object[] attributeNameNodes) { List lookupElements = new LinkedList<>(); for (Object attributeNameNode : attributeNameNodes) { PsiElement psiElement = (PsiElement) attributeNameNode; diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/completion/SiddhiKeywordsCompletionContributor.java b/src/main/java/org/wso2/siddhi/plugins/idea/completion/SiddhiKeywordsCompletionContributor.java index 57478bc..27bb9b9 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/completion/SiddhiKeywordsCompletionContributor.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/completion/SiddhiKeywordsCompletionContributor.java @@ -25,6 +25,7 @@ import com.intellij.psi.impl.source.tree.LeafPsiElement; import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.PsiTreeUtil; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.SiddhiTypes; import org.wso2.siddhi.plugins.idea.completion.executionelements.partition.PartitionCompletionContributor; import org.wso2.siddhi.plugins.idea.completion.executionelements.query.QueryCompletionContributor; @@ -46,8 +47,6 @@ import org.wso2.siddhi.plugins.idea.psi.TriggerNameNode; import org.wso2.siddhi.plugins.idea.psi.WindowDefinitionNode; -import javax.annotation.Nonnull; - import static org.wso2.siddhi.plugins.idea.completion.SiddhiCompletionUtils.addAfterATSymbolLookups; import static org.wso2.siddhi.plugins.idea.completion.SiddhiCompletionUtils.addAtKeyword; import static org.wso2.siddhi.plugins.idea.completion.SiddhiCompletionUtils.addDefineTypesAsLookups; @@ -68,7 +67,7 @@ public class SiddhiKeywordsCompletionContributor extends CompletionContributor { @Override - public void fillCompletionVariants(@Nonnull CompletionParameters parameters, @Nonnull CompletionResultSet result) { + public void fillCompletionVariants(@NotNull CompletionParameters parameters, @NotNull CompletionResultSet result) { PsiElement element = parameters.getPosition(); if (!(element instanceof LeafPsiElement)) { return; @@ -176,7 +175,7 @@ && isEndOfAQueryOutput(prevPreVisibleSibling, prevPrePreVisibleSibling)) { } //TODO: Restructure definition related completions - private void windowDefinitionRelatedKeywordCompletion(@Nonnull CompletionResultSet result, PsiElement element, + private void windowDefinitionRelatedKeywordCompletion(@NotNull CompletionResultSet result, PsiElement element, PsiElement prevVisibleSibling, IElementType prevVisibleSiblingElementType) { if (getPreviousVisibleSiblingSkippingComments(prevVisibleSibling) != null) { @@ -195,7 +194,7 @@ private void windowDefinitionRelatedKeywordCompletion(@Nonnull CompletionResultS } } - private void functionDefinitionRelatedKeywordCompletion(@Nonnull CompletionResultSet result, PsiElement element, + private void functionDefinitionRelatedKeywordCompletion(@NotNull CompletionResultSet result, PsiElement element, PsiElement prevPreVisibleSibling, IElementType prevVisibleSiblingElementType) { if (PsiTreeUtil.getParentOfType(element, LanguageNameNode.class) != null @@ -224,7 +223,7 @@ private void functionDefinitionRelatedKeywordCompletion(@Nonnull CompletionResul } } - private void executionElementRelatedKeywordCompletion(@Nonnull CompletionResultSet result, PsiElement element, + private void executionElementRelatedKeywordCompletion(@NotNull CompletionResultSet result, PsiElement element, PsiElement prevVisibleSibling, IElementType prevVisibleSiblingElementType, PsiElement prevPreVisibleSibling) { diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/completion/executionelements/partition/PartitionCompletionContributor.java b/src/main/java/org/wso2/siddhi/plugins/idea/completion/executionelements/partition/PartitionCompletionContributor.java index afeaae8..ee2796d 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/completion/executionelements/partition/PartitionCompletionContributor.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/completion/executionelements/partition/PartitionCompletionContributor.java @@ -20,6 +20,7 @@ import com.intellij.psi.impl.source.tree.LeafPsiElement; import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.PsiTreeUtil; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.SiddhiTypes; import org.wso2.siddhi.plugins.idea.psi.DeleteFromTableNode; import org.wso2.siddhi.plugins.idea.psi.ExpressionNode; @@ -31,8 +32,6 @@ import org.wso2.siddhi.plugins.idea.psi.UpdateOrInsertIntoNode; import org.wso2.siddhi.plugins.idea.psi.UpdateTableNode; -import javax.annotation.Nonnull; - import static org.wso2.siddhi.plugins.idea.completion.SiddhiCompletionUtils.addAsKeyword; import static org.wso2.siddhi.plugins.idea.completion.SiddhiCompletionUtils.addBeginKeyword; import static org.wso2.siddhi.plugins.idea.completion.SiddhiCompletionUtils.addEndKeyword; @@ -51,7 +50,7 @@ */ public class PartitionCompletionContributor { - public static void partitionCompletion(@Nonnull CompletionResultSet result, PsiElement element, + public static void partitionCompletion(@NotNull CompletionResultSet result, PsiElement element, PsiElement prevVisibleSibling, IElementType prevVisibleSiblingElementType, PsiElement prevPrevVisibleSibling) { @@ -146,7 +145,7 @@ public static boolean isEndOfAQueryOutput(PsiElement prevSibling, PsiElement pre } public static IElementType getElementTypeOfPreviousVisibleSiblingOfGivenNode(PsiElement element, - @Nonnull Class aClass) { + @NotNull Class aClass) { PsiElement prevSiblingOfGivenNode = getPrevSiblingOfGivenType(element, aClass); IElementType prevSiblingOfExpressionNodeElementType = null; if (prevSiblingOfGivenNode != null) { @@ -155,7 +154,7 @@ public static IElementType getElementTypeOfPreviousVisibleSiblingOfGivenNode(Psi return prevSiblingOfExpressionNodeElementType; } - public static PsiElement getPrevSiblingOfGivenType(PsiElement element, @Nonnull Class aClass) { + public static PsiElement getPrevSiblingOfGivenType(PsiElement element, @NotNull Class aClass) { PsiElement givenNodeElement = PsiTreeUtil.getParentOfType(element, aClass); PsiElement prevSiblingOfGivenNode = null; if (givenNodeElement != null) { diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/completion/executionelements/query/QueryCompletionContributor.java b/src/main/java/org/wso2/siddhi/plugins/idea/completion/executionelements/query/QueryCompletionContributor.java index b219692..5fe16f8 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/completion/executionelements/query/QueryCompletionContributor.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/completion/executionelements/query/QueryCompletionContributor.java @@ -20,6 +20,7 @@ import com.intellij.psi.impl.source.tree.LeafPsiElement; import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.PsiTreeUtil; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.SiddhiTypes; import org.wso2.siddhi.plugins.idea.psi.AnonymousStreamNode; import org.wso2.siddhi.plugins.idea.psi.AttributeReferenceNode; @@ -32,8 +33,6 @@ import org.wso2.siddhi.plugins.idea.psi.QuerySectionNode; import org.wso2.siddhi.plugins.idea.psi.TimeValueNode; -import javax.annotation.Nonnull; - import static org.wso2.siddhi.plugins.idea.completion.SiddhiCompletionUtils.addBeginingOfQueryOutputKeywords; import static org.wso2.siddhi.plugins.idea.completion.SiddhiCompletionUtils.addHavingKeyword; import static org.wso2.siddhi.plugins.idea.completion.SiddhiCompletionUtils.addIntoKeyword; @@ -49,7 +48,7 @@ */ public class QueryCompletionContributor { - public static void queryCompletion(@Nonnull CompletionResultSet result, PsiElement element, + public static void queryCompletion(@NotNull CompletionResultSet result, PsiElement element, PsiElement prevVisibleSibling, IElementType prevVisibleSiblingElementType, PsiElement prevPreVisibleSibling) { diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/completion/executionelements/query/QueryInputCompletionContributor.java b/src/main/java/org/wso2/siddhi/plugins/idea/completion/executionelements/query/QueryInputCompletionContributor.java index 719f797..a415a23 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/completion/executionelements/query/QueryInputCompletionContributor.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/completion/executionelements/query/QueryInputCompletionContributor.java @@ -20,6 +20,7 @@ import com.intellij.psi.impl.source.tree.LeafPsiElement; import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.PsiTreeUtil; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.SiddhiTypes; import org.wso2.siddhi.plugins.idea.psi.AliasNode; import org.wso2.siddhi.plugins.idea.psi.AnonymousStreamNode; @@ -42,8 +43,6 @@ import org.wso2.siddhi.plugins.idea.psi.WindowNode; import org.wso2.siddhi.plugins.idea.psi.WithinTimeRangeNode; -import javax.annotation.Nonnull; - import static org.wso2.siddhi.plugins.idea.completion.SiddhiCompletionUtils.addAsKeywordWithDummyAlias; import static org.wso2.siddhi.plugins.idea.completion.SiddhiCompletionUtils.addComma; import static org.wso2.siddhi.plugins.idea.completion.SiddhiCompletionUtils.addEnterYourExpressionClause; @@ -65,7 +64,7 @@ */ public class QueryInputCompletionContributor { - public static void queryInputCompletion(@Nonnull CompletionResultSet result, PsiElement element, + public static void queryInputCompletion(@NotNull CompletionResultSet result, PsiElement element, PsiElement prevVisibleSibling, IElementType prevVisibleSiblingElementType, PsiElement prevPreVisibleSibling) { @@ -105,7 +104,7 @@ public static void queryInputCompletion(@Nonnull CompletionResultSet result, Psi } } - private static void standardStreamCompletion(@Nonnull CompletionResultSet result, PsiElement element, + private static void standardStreamCompletion(@NotNull CompletionResultSet result, PsiElement element, PsiElement prevVisibleSibling, IElementType prevVisibleSiblingElementType, PsiElement prevPreVisibleSibling) { @@ -161,7 +160,7 @@ private static void standardStreamCompletion(@Nonnull CompletionResultSet result } } - private static void joinStreamCompletion(@Nonnull CompletionResultSet result, PsiElement element, + private static void joinStreamCompletion(@NotNull CompletionResultSet result, PsiElement element, PsiElement prevVisibleSibling, IElementType prevVisibleSiblingElementType, PsiElement prevPreVisibleSibling) { diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/completion/executionelements/query/QueryOutputCompletionContributor.java b/src/main/java/org/wso2/siddhi/plugins/idea/completion/executionelements/query/QueryOutputCompletionContributor.java index c98f89f..0fe7757 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/completion/executionelements/query/QueryOutputCompletionContributor.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/completion/executionelements/query/QueryOutputCompletionContributor.java @@ -20,6 +20,7 @@ import com.intellij.psi.impl.source.tree.LeafPsiElement; import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.PsiTreeUtil; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.SiddhiTypes; import org.wso2.siddhi.plugins.idea.psi.DeleteFromTableNode; import org.wso2.siddhi.plugins.idea.psi.OutputEventTypeNode; @@ -31,8 +32,6 @@ import org.wso2.siddhi.plugins.idea.psi.UpdateOrInsertIntoNode; import org.wso2.siddhi.plugins.idea.psi.UpdateTableNode; -import javax.annotation.Nonnull; - import static org.wso2.siddhi.plugins.idea.completion.SiddhiCompletionUtils.addForKeyword; import static org.wso2.siddhi.plugins.idea.completion.SiddhiCompletionUtils.addIntoKeyword; import static org.wso2.siddhi.plugins.idea.completion.SiddhiCompletionUtils.addOnKeyword; @@ -45,7 +44,7 @@ */ public class QueryOutputCompletionContributor { - public static void queryOutputCompletion(@Nonnull CompletionResultSet result, PsiElement element, + public static void queryOutputCompletion(@NotNull CompletionResultSet result, PsiElement element, PsiElement prevVisibleSibling, IElementType prevVisibleSiblingElementType, PsiElement prevPreVisibleSibling) { diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/completion/executionelements/query/QuerySectionCompletionContributor.java b/src/main/java/org/wso2/siddhi/plugins/idea/completion/executionelements/query/QuerySectionCompletionContributor.java index 4530994..40625f1 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/completion/executionelements/query/QuerySectionCompletionContributor.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/completion/executionelements/query/QuerySectionCompletionContributor.java @@ -19,12 +19,11 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.PsiTreeUtil; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.SiddhiTypes; import org.wso2.siddhi.plugins.idea.psi.OutputAttributeNode; import org.wso2.siddhi.plugins.idea.psi.QuerySectionNode; -import javax.annotation.Nonnull; - import static org.wso2.siddhi.plugins.idea.completion.SiddhiCompletionUtils.addBeginingOfQueryOutputKeywords; import static org.wso2.siddhi.plugins.idea.completion.SiddhiCompletionUtils.addByKeyword; @@ -33,7 +32,7 @@ */ public class QuerySectionCompletionContributor { - public static void querySectionCompletion(@Nonnull CompletionResultSet result, PsiElement element, + public static void querySectionCompletion(@NotNull CompletionResultSet result, PsiElement element, PsiElement prevVisibleSibling, IElementType prevVisibleSiblingElementType) { // Suggestions related to QuerySectionNode diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/completion/util/KeywordCompletionUtils.java b/src/main/java/org/wso2/siddhi/plugins/idea/completion/util/KeywordCompletionUtils.java index 24cba51..e6771d3 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/completion/util/KeywordCompletionUtils.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/completion/util/KeywordCompletionUtils.java @@ -20,6 +20,7 @@ import com.intellij.psi.impl.source.tree.LeafPsiElement; import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.PsiTreeUtil; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.SiddhiTypes; import org.wso2.siddhi.plugins.idea.psi.AttributeReferenceNode; @@ -30,15 +31,13 @@ import org.wso2.siddhi.plugins.idea.psi.NameNode; import org.wso2.siddhi.plugins.idea.psi.NullCheckNode; -import javax.annotation.Nonnull; - /** * Defines utility methods used for code completions. */ public class KeywordCompletionUtils { @Nullable - public static PsiElement getPreviousVisibleSiblingSkippingComments(@Nonnull PsiElement currentElement) { + public static PsiElement getPreviousVisibleSiblingSkippingComments(@NotNull PsiElement currentElement) { PsiElement prevVisibleSibling = PsiTreeUtil.prevVisibleLeaf(currentElement); if (prevVisibleSibling instanceof PsiComment) { prevVisibleSibling = getPreviousVisibleSiblingSkippingComments(prevVisibleSibling); @@ -50,7 +49,7 @@ public static PsiElement getPreviousVisibleSiblingSkippingComments(@Nonnull PsiE } @Nullable - public static PsiElement getNextVisibleSiblingSkippingComments(@Nonnull PsiElement currentElement) { + public static PsiElement getNextVisibleSiblingSkippingComments(@NotNull PsiElement currentElement) { PsiElement prevVisibleSibling = PsiTreeUtil.nextVisibleLeaf(currentElement); if (prevVisibleSibling instanceof PsiComment) { prevVisibleSibling = getNextVisibleSiblingSkippingComments(prevVisibleSibling); @@ -61,14 +60,14 @@ public static PsiElement getNextVisibleSiblingSkippingComments(@Nonnull PsiEleme return prevVisibleSibling; } - public static Boolean isExpression(@Nonnull PsiElement element) { + public static Boolean isExpression(@NotNull PsiElement element) { if (PsiTreeUtil.getParentOfType(element, ExpressionNode.class) != null) { return isMathOperation(element); } return false; } - public static Boolean isMathOperation(@Nonnull PsiElement element) { + public static Boolean isMathOperation(@NotNull PsiElement element) { if (PsiTreeUtil.getParentOfType(element, MathOperationNode.class) != null || PsiTreeUtil.getParentOfType(element, NullCheckNode.class) != null || PsiTreeUtil.getParentOfType(element, NameNode.class) != null || diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/configuration/ListenableHideableDecorator.java b/src/main/java/org/wso2/siddhi/plugins/idea/configuration/ListenableHideableDecorator.java index 4811e7a..4c2663a 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/configuration/ListenableHideableDecorator.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/configuration/ListenableHideableDecorator.java @@ -18,9 +18,9 @@ import com.intellij.ui.HideableDecorator; import com.intellij.util.containers.ContainerUtil; +import org.jetbrains.annotations.NotNull; import java.util.Collection; -import javax.annotation.Nonnull; import javax.swing.JComponent; import javax.swing.JPanel; @@ -31,13 +31,13 @@ class ListenableHideableDecorator extends HideableDecorator { private final Collection myListeners = ContainerUtil.newSmartList(); - public ListenableHideableDecorator(@Nonnull JPanel panel, @Nonnull String displayName, @Nonnull JComponent + public ListenableHideableDecorator(@NotNull JPanel panel, @NotNull String displayName, @NotNull JComponent content) { super(panel, displayName, false); setContentComponent(content); } - public void addListener(@Nonnull MyListener listener) { + public void addListener(@NotNull MyListener listener) { myListeners.add(listener); } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/configuration/SiddhiConfigurableProvider.java b/src/main/java/org/wso2/siddhi/plugins/idea/configuration/SiddhiConfigurableProvider.java index 7b25feb..71b2628 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/configuration/SiddhiConfigurableProvider.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/configuration/SiddhiConfigurableProvider.java @@ -23,19 +23,18 @@ import com.intellij.openapi.options.UnnamedConfigurable; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.Nls; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import javax.annotation.Nonnull; - /** * Provide items for "Project Settings" and "IDE Settings" groups correspondingly in the "Settings" dialog. */ public class SiddhiConfigurableProvider extends ConfigurableProvider { - @Nonnull + @NotNull private final Project myProject; - public SiddhiConfigurableProvider(@Nonnull Project project) { + public SiddhiConfigurableProvider(@NotNull Project project) { myProject = project; } @@ -60,7 +59,7 @@ protected Configurable[] buildConfigurables() { return myConfigurables; } - @Nonnull + @NotNull @Override public String getId() { return "Siddhi"; @@ -90,11 +89,11 @@ public void disposeUIResources() { */ public static class SiddhiProjectSettingsConfigurable extends SiddhiModuleAwareConfigurable { - public SiddhiProjectSettingsConfigurable(@Nonnull Project project) { + public SiddhiProjectSettingsConfigurable(@NotNull Project project) { super(project, "Project Settings", null); } - @Nonnull + @NotNull @Override protected UnnamedConfigurable createModuleConfigurable(Module module) { return new SiddhiModuleSettingsConfigurable(module, false); diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/configuration/SiddhiLibrariesConfigurable.java b/src/main/java/org/wso2/siddhi/plugins/idea/configuration/SiddhiLibrariesConfigurable.java index 494ece8..207cc9c 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/configuration/SiddhiLibrariesConfigurable.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/configuration/SiddhiLibrariesConfigurable.java @@ -35,6 +35,7 @@ import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.Nls; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.project.SiddhiApplicationLibrariesService; import org.wso2.siddhi.plugins.idea.project.SiddhiLibrariesService; @@ -43,7 +44,6 @@ import java.util.Collection; import java.util.List; import java.util.stream.Collectors; -import javax.annotation.Nonnull; import javax.swing.JComponent; import javax.swing.JList; import javax.swing.JPanel; @@ -55,7 +55,7 @@ */ public class SiddhiLibrariesConfigurable implements SearchableConfigurable, Configurable.NoScroll { - @Nonnull + @NotNull private final String myDisplayName; private final SiddhiLibrariesService myLibrariesService; private final String[] myReadOnlyPaths; @@ -64,7 +64,7 @@ public class SiddhiLibrariesConfigurable implements SearchableConfigurable, Conf private final JPanel myPanel = new JPanel(new BorderLayout()); private final CollectionListModel myListModel = new CollectionListModel<>(); - public SiddhiLibrariesConfigurable(@Nonnull String displayName, @Nonnull SiddhiLibrariesService + public SiddhiLibrariesConfigurable(@NotNull String displayName, @NotNull SiddhiLibrariesService librariesService, String... urls) { myDisplayName = displayName; @@ -74,7 +74,7 @@ public SiddhiLibrariesConfigurable(@Nonnull String displayName, @Nonnull SiddhiL JBList filesList = new JBList(myListModel); filesList.setCellRenderer(new ColoredListCellRenderer() { @Override - protected void customizeCellRenderer(@Nonnull JList list, Object value, int index, boolean selected, + protected void customizeCellRenderer(@NotNull JList list, Object value, int index, boolean selected, boolean hasFocus) { ListItem item = (ListItem) value; String url = item.url; @@ -221,7 +221,7 @@ public void disposeUIResources() { myListModel.removeAll(); } - @Nonnull + @NotNull @Nls @Override public String getDisplayName() { @@ -234,7 +234,7 @@ public String getHelpTopic() { return null; } - @Nonnull + @NotNull private Collection getUserDefinedUrls() { Collection libraryUrls = ContainerUtil.newArrayList(); for (ListItem item : myListModel.getItems()) { @@ -245,7 +245,7 @@ private Collection getUserDefinedUrls() { return libraryUrls; } - @Nonnull + @NotNull @Override public String getId() { return "siddhi.libraries"; diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/configuration/SiddhiLibrariesConfigurableProvider.java b/src/main/java/org/wso2/siddhi/plugins/idea/configuration/SiddhiLibrariesConfigurableProvider.java index 6a855d1..ee89158 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/configuration/SiddhiLibrariesConfigurableProvider.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/configuration/SiddhiLibrariesConfigurableProvider.java @@ -33,6 +33,7 @@ import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.JBUI; import org.jetbrains.annotations.Nls; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.project.SiddhiApplicationLibrariesService; import org.wso2.siddhi.plugins.idea.project.SiddhiProjectLibrariesService; @@ -43,7 +44,6 @@ import java.util.Collection; import java.util.List; import java.util.Locale; -import javax.annotation.Nonnull; import javax.swing.JComponent; import javax.swing.JPanel; @@ -53,10 +53,10 @@ */ public class SiddhiLibrariesConfigurableProvider extends ConfigurableProvider { - @Nonnull + @NotNull private final Project myProject; - public SiddhiLibrariesConfigurableProvider(@Nonnull Project project) { + public SiddhiLibrariesConfigurableProvider(@NotNull Project project) { myProject = project; } @@ -111,7 +111,7 @@ public JComponent createComponent() { return rootPanel; } - @Nonnull + @NotNull @Override protected List createConfigurables() { List result = ContainerUtil.newArrayList(); @@ -127,7 +127,7 @@ protected List createConfigurables() { return result; } - @Nonnull + @NotNull @Nls @Override public String getDisplayName() { @@ -140,7 +140,7 @@ public String getHelpTopic() { return null; } - @Nonnull + @NotNull private GridConstraints configurableConstrains(int i) { return new GridConstraints(i, 0, 1, 1, GridConstraints.ANCHOR_NORTHEAST, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_GROW | GridConstraints.SIZEPOLICY_WANT_GROW | @@ -149,16 +149,16 @@ private GridConstraints configurableConstrains(int i) { null, null, null); } - private boolean isConfigurableExpanded(int index, @Nonnull Configurable configurable) { + private boolean isConfigurableExpanded(int index, @NotNull Configurable configurable) { return PropertiesComponent.getInstance(myProject) .getBoolean(configurableExpandedPropertyKey(configurable), index < 2); } - private void storeConfigurableExpandedProperty(@Nonnull String storeKey, @Nonnull Boolean value) { + private void storeConfigurableExpandedProperty(@NotNull String storeKey, @NotNull Boolean value) { PropertiesComponent.getInstance(myProject).setValue(storeKey, value.toString()); } - private String configurableExpandedPropertyKey(@Nonnull Configurable configurable) { + private String configurableExpandedPropertyKey(@NotNull Configurable configurable) { String keyName = "configurable " + configurable.getDisplayName() + " is expanded".toLowerCase(Locale.US); return StringUtil.replaceChar(keyName, ' ', '.'); @@ -167,16 +167,16 @@ private String configurableExpandedPropertyKey(@Nonnull Configurable configurabl class MyHideableDecoratorListener extends ListenableHideableDecorator.MyListener { private final GridLayoutManager myLayoutManager; private final JPanel myHideablePanel; - @Nonnull + @NotNull private final String myStoreKey; private final Spacer mySpacer; private final Collection myHideableDecorators; - public MyHideableDecoratorListener(@Nonnull GridLayoutManager layoutManager, - @Nonnull JPanel hideablePanel, - @Nonnull Spacer spacer, - @Nonnull Collection hideableDecorators, - @Nonnull String storeKey) { + public MyHideableDecoratorListener(@NotNull GridLayoutManager layoutManager, + @NotNull JPanel hideablePanel, + @NotNull Spacer spacer, + @NotNull Collection hideableDecorators, + @NotNull String storeKey) { myLayoutManager = layoutManager; myHideablePanel = hideablePanel; myStoreKey = storeKey; @@ -223,7 +223,7 @@ private boolean isAllDecoratorsCollapsed() { }; } - public static void showModulesConfigurable(@Nonnull Project project) { + public static void showModulesConfigurable(@NotNull Project project) { ApplicationManager.getApplication().assertIsDispatchThread(); if (!project.isDisposed()) { Configurable configurable = new SiddhiLibrariesConfigurableProvider(project).createConfigurable(true); diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/configuration/SiddhiModuleAwareConfigurable.java b/src/main/java/org/wso2/siddhi/plugins/idea/configuration/SiddhiModuleAwareConfigurable.java index c450191..eabd692 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/configuration/SiddhiModuleAwareConfigurable.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/configuration/SiddhiModuleAwareConfigurable.java @@ -19,21 +19,20 @@ import com.intellij.application.options.ModuleAwareProjectConfigurable; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.sdk.SiddhiSdkService; -import javax.annotation.Nonnull; - /** * Checks whether configuration is suitable as a module. */ public abstract class SiddhiModuleAwareConfigurable extends ModuleAwareProjectConfigurable { - public SiddhiModuleAwareConfigurable(@Nonnull Project project, String displayName, String helpTopic) { + public SiddhiModuleAwareConfigurable(@NotNull Project project, String displayName, String helpTopic) { super(project, displayName, helpTopic); } @Override - protected boolean isSuitableForModule(@Nonnull Module module) { + protected boolean isSuitableForModule(@NotNull Module module) { if (module.isDisposed()) { return false; } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/configuration/SiddhiModuleEditorsProvider.java b/src/main/java/org/wso2/siddhi/plugins/idea/configuration/SiddhiModuleEditorsProvider.java index 9c6f055..f1fc3aa 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/configuration/SiddhiModuleEditorsProvider.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/configuration/SiddhiModuleEditorsProvider.java @@ -26,10 +26,10 @@ import com.intellij.openapi.roots.ui.configuration.ModuleConfigurationState; import com.intellij.openapi.roots.ui.configuration.OutputEditor; import com.intellij.util.containers.ContainerUtil; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.SiddhiModuleType; import java.util.List; -import javax.annotation.Nonnull; import javax.swing.JComponent; /** @@ -38,7 +38,7 @@ public class SiddhiModuleEditorsProvider implements ModuleConfigurationEditorProvider { @Override - public ModuleConfigurationEditor[] createEditors(@Nonnull ModuleConfigurationState state) { + public ModuleConfigurationEditor[] createEditors(@NotNull ModuleConfigurationState state) { ModifiableRootModel rootModel = state.getRootModel(); Module module = rootModel.getModule(); if (!(ModuleType.get(module) instanceof SiddhiModuleType)) { diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/configuration/SiddhiModuleSettingsConfigurable.java b/src/main/java/org/wso2/siddhi/plugins/idea/configuration/SiddhiModuleSettingsConfigurable.java index d2cd9cb..a04353a 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/configuration/SiddhiModuleSettingsConfigurable.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/configuration/SiddhiModuleSettingsConfigurable.java @@ -18,27 +18,26 @@ import com.intellij.openapi.module.Module; import com.intellij.openapi.options.ConfigurableBase; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.project.SiddhiModuleSettings; -import javax.annotation.Nonnull; - /** * Provide module items for "Project Settings" and "IDE Settings" groups correspondingly in the "Settings" dialog. */ public class SiddhiModuleSettingsConfigurable extends ConfigurableBase { - @Nonnull + @NotNull private final Module myModule; private final boolean myDialogMode; - public SiddhiModuleSettingsConfigurable(@Nonnull Module module, boolean dialogMode) { + public SiddhiModuleSettingsConfigurable(@NotNull Module module, boolean dialogMode) { super("Siddhi.project.settings", "Siddhi Project Settings", null); myModule = module; myDialogMode = dialogMode; } - @Nonnull + @NotNull @Override protected SiddhiModuleSettings getSettings() { return SiddhiModuleSettings.getInstance(myModule); diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/configuration/SiddhiModuleSettingsUI.java b/src/main/java/org/wso2/siddhi/plugins/idea/configuration/SiddhiModuleSettingsUI.java index d1a59e6..4d11e79 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/configuration/SiddhiModuleSettingsUI.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/configuration/SiddhiModuleSettingsUI.java @@ -21,10 +21,10 @@ import com.intellij.openapi.options.ConfigurableUi; import com.intellij.openapi.options.ConfigurationException; import com.intellij.util.ui.UIUtil; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.project.SiddhiModuleSettings; import java.awt.Dimension; -import javax.annotation.Nonnull; import javax.swing.JComponent; import javax.swing.JPanel; @@ -35,26 +35,26 @@ public class SiddhiModuleSettingsUI implements ConfigurableUi[] getBreakpointHandlers() { return new XBreakpointHandler[]{myInBreakPointHandler, myOutBreakPointHandler}; } - @Nonnull + @NotNull @Override public XDebuggerEditorsProvider getEditorsProvider() { return myEditorsProvider; @@ -259,7 +259,7 @@ public XSmartStepIntoHandler getSmartStepIntoHandler() { } @Override - public void runToPosition(@Nonnull XSourcePosition position, @Nullable XSuspendContext context) { + public void runToPosition(@NotNull XSourcePosition position, @Nullable XSuspendContext context) { } @Override @@ -335,7 +335,7 @@ private void doSetBreakpoints() { } } - private XBreakpoint findBreakPoint(@Nonnull BreakPoint breakPoint) { + private XBreakpoint findBreakPoint(@NotNull BreakPoint breakPoint) { String fileName = breakPoint.getFileName(); int lineNumber = breakPoint.getLineNumber(); @@ -375,7 +375,7 @@ public HyperlinkListener getCurrentStateHyperlinkListener() { return super.getCurrentStateHyperlinkListener(); } - @Nonnull + @NotNull @Override public XDebugTabLayouter createTabLayouter() { return super.createTabLayouter(); @@ -388,9 +388,9 @@ public XDebuggerEvaluator getEvaluator() { } @Override - public void registerAdditionalActions(@Nonnull DefaultActionGroup leftToolbar, - @Nonnull DefaultActionGroup topToolbar, - @Nonnull DefaultActionGroup settings) { + public void registerAdditionalActions(@NotNull DefaultActionGroup leftToolbar, + @NotNull DefaultActionGroup topToolbar, + @NotNull DefaultActionGroup settings) { topToolbar.removeAll(); topToolbar.add(ActionManager.getInstance().getAction(XDebuggerActions.SHOW_EXECUTION_POINT)); topToolbar.add(ActionManager.getInstance().getAction(XDebuggerActions.STEP_OVER)); @@ -446,7 +446,7 @@ private class SiddhiInBreakpointHandler extends XBreakpointHandler breakpoint) { + public void registerBreakpoint(@NotNull XLineBreakpoint breakpoint) { XSourcePosition breakpointPosition = breakpoint.getSourcePosition(); if (breakpointPosition == null) { return; @@ -481,7 +481,7 @@ public void registerBreakpoint(@Nonnull XLineBreakpoint breakpoint, + public void unregisterBreakpoint(@NotNull XLineBreakpoint breakpoint, boolean temporary) { XSourcePosition breakpointPosition = breakpoint.getSourcePosition(); if (breakpointPosition == null) { @@ -491,7 +491,7 @@ public void unregisterBreakpoint(@Nonnull XLineBreakpoint breakpoint) { + void sendRemovedBreakpoint(@NotNull XLineBreakpoint breakpoint) { XSourcePosition breakpointPosition = breakpoint.getSourcePosition(); if (breakpointPosition == null) { return; @@ -563,7 +563,7 @@ private class SiddhiOutBreakpointHandler extends XBreakpointHandler breakpoint) { + public void registerBreakpoint(@NotNull XLineBreakpoint breakpoint) { XSourcePosition breakpointPosition = breakpoint.getSourcePosition(); if (breakpointPosition == null) { return; @@ -604,7 +604,7 @@ private boolean isAQueryOutputBeginningKeyword(IElementType elementType) { } @Override - public void unregisterBreakpoint(@Nonnull XLineBreakpoint breakpoint, + public void unregisterBreakpoint(@NotNull XLineBreakpoint breakpoint, boolean temporary) { XSourcePosition breakpointPosition = breakpoint.getSourcePosition(); if (breakpointPosition == null) { @@ -614,7 +614,7 @@ public void unregisterBreakpoint(@Nonnull XLineBreakpoint breakpoint) { + void sendRemovedBreakpoint(@NotNull XLineBreakpoint breakpoint) { XSourcePosition breakpointPosition = breakpoint.getSourcePosition(); if (breakpointPosition == null) { return; diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/debugger/SiddhiDebuggerEditorsProvider.java b/src/main/java/org/wso2/siddhi/plugins/idea/debugger/SiddhiDebuggerEditorsProvider.java index 105e3a9..a2030ae 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/debugger/SiddhiDebuggerEditorsProvider.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/debugger/SiddhiDebuggerEditorsProvider.java @@ -21,23 +21,22 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.xdebugger.evaluation.XDebuggerEditorsProviderBase; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.SiddhiFileType; -import javax.annotation.Nonnull; - /** * Provides a debugger editor for siddhi. */ public class SiddhiDebuggerEditorsProvider extends XDebuggerEditorsProviderBase { @Override - protected PsiFile createExpressionCodeFragment(@Nonnull Project project, @Nonnull String text, + protected PsiFile createExpressionCodeFragment(@NotNull Project project, @NotNull String text, @Nullable PsiElement context, boolean isPhysical) { return null; } - @Nonnull + @NotNull @Override public FileType getFileType() { return SiddhiFileType.INSTANCE; diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/debugger/SiddhiStackFrame.java b/src/main/java/org/wso2/siddhi/plugins/idea/debugger/SiddhiStackFrame.java index 590fe18..a8e9ac8 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/debugger/SiddhiStackFrame.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/debugger/SiddhiStackFrame.java @@ -29,13 +29,13 @@ import com.intellij.xdebugger.frame.XCompositeNode; import com.intellij.xdebugger.frame.XStackFrame; import com.intellij.xdebugger.frame.XValueChildrenList; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.json.JSONObject; import org.wso2.siddhi.plugins.idea.debugger.dto.Frame; import java.util.HashMap; import java.util.Map; -import javax.annotation.Nonnull; /** * Represents a frame of execution stack. The selected frame is shown in 'Variables' panel of 'Debug' tool window. @@ -45,7 +45,7 @@ public class SiddhiStackFrame extends XStackFrame { private final SiddhiDebugProcess myProcess; private final Frame myFrame; - SiddhiStackFrame(@Nonnull SiddhiDebugProcess process, @Nonnull Frame frame) { + SiddhiStackFrame(@NotNull SiddhiDebugProcess process, @NotNull Frame frame) { myProcess = process; myFrame = frame; } @@ -86,7 +86,7 @@ private VirtualFile findFile() { } } - private String constructFilePath(@Nonnull String projectBasePath, @Nonnull String fileName) { + private String constructFilePath(@NotNull String projectBasePath, @NotNull String fileName) { StringBuilder stringBuilder = new StringBuilder(projectBasePath).append("/"); stringBuilder = stringBuilder.append(fileName); return stringBuilder.toString(); @@ -96,7 +96,7 @@ private String constructFilePath(@Nonnull String projectBasePath, @Nonnull Strin * Customizes the stack name in the Frames sub window in Debug window. */ @Override - public void customizePresentation(@Nonnull ColoredTextContainer component) { + public void customizePresentation(@NotNull ColoredTextContainer component) { super.customizePresentation(component); component.append(" at ", SimpleTextAttributes.REGULAR_ATTRIBUTES); component.append(myFrame.getFrameName() + " : ", SimpleTextAttributes.REGULAR_BOLD_ATTRIBUTES); @@ -110,7 +110,7 @@ public void customizePresentation(@Nonnull ColoredTextContainer component) { * Adds variables in the current stack to the node. */ @Override - public void computeChildren(@Nonnull XCompositeNode node) { + public void computeChildren(@NotNull XCompositeNode node) { Map queryStateMap = myFrame.getQueryState(); Object eventInfo = myFrame.getEventInfo(); diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/debugger/SiddhiSuspendContext.java b/src/main/java/org/wso2/siddhi/plugins/idea/debugger/SiddhiSuspendContext.java index a2734f6..891cd5c 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/debugger/SiddhiSuspendContext.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/debugger/SiddhiSuspendContext.java @@ -20,13 +20,13 @@ import com.intellij.xdebugger.frame.XExecutionStack; import com.intellij.xdebugger.frame.XStackFrame; import com.intellij.xdebugger.frame.XSuspendContext; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.debugger.dto.Frame; import org.wso2.siddhi.plugins.idea.debugger.dto.Message; import java.util.ArrayList; import java.util.List; -import javax.annotation.Nonnull; /** * Represents a suspended state of a debug process. @@ -34,10 +34,10 @@ public class SiddhiSuspendContext extends XSuspendContext { private static final String DEFAULT_THREAD_ID = "01"; - @Nonnull + @NotNull private final SiddhiExecutionStack myStack; - public SiddhiSuspendContext(@Nonnull SiddhiDebugProcess process, @Nonnull Message message) { + public SiddhiSuspendContext(@NotNull SiddhiDebugProcess process, @NotNull Message message) { String fileName = message.getLocation().getFileName(); String frameName = message.getQueryName(); @@ -58,7 +58,7 @@ public XExecutionStack getActiveExecutionStack() { return myStack; } - @Nonnull + @NotNull @Override public XExecutionStack[] getExecutionStacks() { return new XExecutionStack[]{myStack}; @@ -67,12 +67,12 @@ public XExecutionStack[] getExecutionStacks() { static class SiddhiExecutionStack extends XExecutionStack { private final String threadId; - @Nonnull + @NotNull private final SiddhiDebugProcess myProcess; - @Nonnull + @NotNull private final List myStack; - public SiddhiExecutionStack(@Nonnull SiddhiDebugProcess process, List frames) { + public SiddhiExecutionStack(@NotNull SiddhiDebugProcess process, List frames) { super("Thread #" + DEFAULT_THREAD_ID); this.threadId = DEFAULT_THREAD_ID; this.myProcess = process; @@ -89,7 +89,7 @@ public XStackFrame getTopFrame() { } @Override - public void computeStackFrames(int firstFrameIndex, @Nonnull XStackFrameContainer container) { + public void computeStackFrames(int firstFrameIndex, @NotNull XStackFrameContainer container) { container.addStackFrames(myStack, true); } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/debugger/SiddhiWebSocketConnector.java b/src/main/java/org/wso2/siddhi/plugins/idea/debugger/SiddhiWebSocketConnector.java index 04da4db..a18584d 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/debugger/SiddhiWebSocketConnector.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/debugger/SiddhiWebSocketConnector.java @@ -17,11 +17,11 @@ package org.wso2.siddhi.plugins.idea.debugger; import com.intellij.openapi.diagnostic.Logger; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.debugger.client.WebSocketClient; import org.wso2.siddhi.plugins.idea.debugger.protocol.Command; import java.net.URISyntaxException; -import javax.annotation.Nonnull; import javax.net.ssl.SSLException; /** @@ -38,7 +38,7 @@ public class SiddhiWebSocketConnector { private String myAddress; private ConnectionState myConnectionState; - public SiddhiWebSocketConnector(@Nonnull String address) { + public SiddhiWebSocketConnector(@NotNull String address) { myAddress = address; myConnectionState = ConnectionState.NOT_CONNECTED; } @@ -53,12 +53,12 @@ void createConnection(Callback callback) { } } - @Nonnull + @NotNull private String getUri() { return DEBUG_PROTOCOL + myAddress + DEBUG_WEB_SOCKET_PATH; } - @Nonnull + @NotNull public String getDebugServerAddress() { return myAddress; } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/debugger/SiddhiXValue.java b/src/main/java/org/wso2/siddhi/plugins/idea/debugger/SiddhiXValue.java index f4eaa4e..3e3a42c 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/debugger/SiddhiXValue.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/debugger/SiddhiXValue.java @@ -40,12 +40,12 @@ import com.intellij.xdebugger.frame.presentation.XStringValuePresentation; import com.intellij.xdebugger.frame.presentation.XValuePresentation; import com.intellij.xdebugger.impl.ui.tree.nodes.XValueNodeImpl; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.json.JSONArray; import org.json.JSONObject; import org.wso2.siddhi.plugins.idea.highlighter.SiddhiSyntaxHighlightingColors; -import javax.annotation.Nonnull; import javax.swing.Icon; /** @@ -53,16 +53,16 @@ */ public class SiddhiXValue extends XNamedValue { - @Nonnull + @NotNull private final SiddhiDebugProcess myProcess; - @Nonnull + @NotNull private final Object myValue; - @Nonnull + @NotNull private final String myFrameName; @Nullable private final Icon myIcon; - SiddhiXValue(@Nonnull SiddhiDebugProcess process, @Nonnull String frameName, @Nonnull String key, @Nonnull Object + SiddhiXValue(@NotNull SiddhiDebugProcess process, @NotNull String frameName, @NotNull String key, @NotNull Object value, @Nullable Icon icon) { super(key); myProcess = process; @@ -72,7 +72,7 @@ public class SiddhiXValue extends XNamedValue { } @Override - public void computePresentation(@Nonnull XValueNode node, @Nonnull XValuePlace place) { + public void computePresentation(@NotNull XValueNode node, @NotNull XValuePlace place) { if (myValue instanceof JSONObject || myValue instanceof JSONArray) { node.setPresentation(myIcon, getName(), "", true); } else if (myValue instanceof String) { @@ -85,7 +85,7 @@ public void computePresentation(@Nonnull XValueNode node, @Nonnull XValuePlace p } else if (myValue instanceof Boolean) { node.setPresentation(AllIcons.Nodes.Property, new XValuePresentation() { @Override - public void renderValue(@Nonnull XValueTextRenderer renderer) { + public void renderValue(@NotNull XValueTextRenderer renderer) { renderer.renderValue(myValue.toString(), SiddhiSyntaxHighlightingColors.KEYWORD); } }, false); @@ -95,7 +95,7 @@ public void renderValue(@Nonnull XValueTextRenderer renderer) { } @Override - public void computeChildren(@Nonnull XCompositeNode node) { + public void computeChildren(@NotNull XCompositeNode node) { if (myValue instanceof JSONObject) { JSONObject jsonObject = (JSONObject) this.myValue; @@ -125,13 +125,13 @@ public void computeChildren(@Nonnull XCompositeNode node) { } @Nullable - private static PsiElement findTargetElement(@Nonnull Project project, @Nonnull XSourcePosition position, - @Nonnull Editor editor, @Nonnull String name) { + private static PsiElement findTargetElement(@NotNull Project project, @NotNull XSourcePosition position, + @NotNull Editor editor, @NotNull String name) { return null; } @Override - public void computeSourcePosition(@Nonnull XNavigatable navigatable) { + public void computeSourcePosition(@NotNull XNavigatable navigatable) { readActionInPooledThread(new Runnable() { @Override @@ -167,14 +167,14 @@ private XSourcePosition findPosition() { }); } - private static void readActionInPooledThread(@Nonnull Runnable runnable) { + private static void readActionInPooledThread(@NotNull Runnable runnable) { ApplicationManager.getApplication().executeOnPooledThread(() -> ApplicationManager.getApplication().runReadAction(runnable)); } - @Nonnull + @NotNull @Override - public ThreeState computeInlineDebuggerData(@Nonnull XInlineDebuggerDataCallback callback) { + public ThreeState computeInlineDebuggerData(@NotNull XInlineDebuggerDataCallback callback) { computeSourcePosition(callback::computed); return ThreeState.YES; } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/debugger/breakpoint/SiddhiBreakPointTypeIN.java b/src/main/java/org/wso2/siddhi/plugins/idea/debugger/breakpoint/SiddhiBreakPointTypeIN.java index 9f944f5..dbdea2a 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/debugger/breakpoint/SiddhiBreakPointTypeIN.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/debugger/breakpoint/SiddhiBreakPointTypeIN.java @@ -26,6 +26,7 @@ import com.intellij.util.Processor; import com.intellij.xdebugger.XDebuggerUtil; import com.intellij.xdebugger.breakpoints.XLineBreakpointType; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.SiddhiFileType; import org.wso2.siddhi.plugins.idea.SiddhiTypes; @@ -35,8 +36,6 @@ import org.wso2.siddhi.plugins.idea.psi.QueryInputNode; import org.wso2.siddhi.plugins.idea.psi.QueryNode; -import javax.annotation.Nonnull; - import static org.wso2.siddhi.plugins.idea.completion.util.KeywordCompletionUtils.getNextVisibleSiblingSkippingComments; /** @@ -53,17 +52,17 @@ protected SiddhiBreakPointTypeIN() { @Nullable @Override - public SiddhiBreakpointProperties createBreakpointProperties(@Nonnull VirtualFile file, int line) { + public SiddhiBreakpointProperties createBreakpointProperties(@NotNull VirtualFile file, int line) { return new SiddhiBreakpointProperties(); } @Override - public boolean canPutAt(@Nonnull VirtualFile file, int line, @Nonnull Project project) { + public boolean canPutAt(@NotNull VirtualFile file, int line, @NotNull Project project) { return line >= 0 && file.getFileType() == SiddhiFileType.INSTANCE && isLineBreakpointAvailable(file, line, project); } - private static boolean isLineBreakpointAvailable(@Nonnull VirtualFile file, int line, @Nonnull Project project) { + private static boolean isLineBreakpointAvailable(@NotNull VirtualFile file, int line, @NotNull Project project) { Document document = FileDocumentManager.getInstance().getDocument(file); if (document == null || document.getLineEndOffset(line) == document.getLineStartOffset(line)) { return false; @@ -79,7 +78,7 @@ private static final class Checker implements Processor { private int counter = 0; @Override - public boolean process(@Nonnull PsiElement element) { + public boolean process(@NotNull PsiElement element) { if (PsiTreeUtil.nextVisibleLeaf(element) != null) { PsiElement nextVisibleSibling = getNextVisibleSiblingSkippingComments(element); IElementType elementType = element.getNode().getElementType(); diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/debugger/breakpoint/SiddhiBreakPointTypeOUT.java b/src/main/java/org/wso2/siddhi/plugins/idea/debugger/breakpoint/SiddhiBreakPointTypeOUT.java index a7dbd88..f4a7ad3 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/debugger/breakpoint/SiddhiBreakPointTypeOUT.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/debugger/breakpoint/SiddhiBreakPointTypeOUT.java @@ -26,6 +26,7 @@ import com.intellij.util.Processor; import com.intellij.xdebugger.XDebuggerUtil; import com.intellij.xdebugger.breakpoints.XLineBreakpointType; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.SiddhiFileType; import org.wso2.siddhi.plugins.idea.SiddhiTypes; @@ -33,8 +34,6 @@ import org.wso2.siddhi.plugins.idea.psi.PartitionNode; import org.wso2.siddhi.plugins.idea.psi.QueryOutputNode; -import javax.annotation.Nonnull; - import static org.wso2.siddhi.plugins.idea.completion.util.KeywordCompletionUtils.getNextVisibleSiblingSkippingComments; /** @@ -51,17 +50,17 @@ protected SiddhiBreakPointTypeOUT() { @Nullable @Override - public SiddhiBreakpointProperties createBreakpointProperties(@Nonnull VirtualFile file, int line) { + public SiddhiBreakpointProperties createBreakpointProperties(@NotNull VirtualFile file, int line) { return new SiddhiBreakpointProperties(); } @Override - public boolean canPutAt(@Nonnull VirtualFile file, int line, @Nonnull Project project) { + public boolean canPutAt(@NotNull VirtualFile file, int line, @NotNull Project project) { return line >= 0 && file.getFileType() == SiddhiFileType.INSTANCE && isLineBreakpointAvailable(file, line, project); } - private static boolean isLineBreakpointAvailable(@Nonnull VirtualFile file, int line, @Nonnull Project project) { + private static boolean isLineBreakpointAvailable(@NotNull VirtualFile file, int line, @NotNull Project project) { Document document = FileDocumentManager.getInstance().getDocument(file); if (document == null || document.getLineEndOffset(line) == document.getLineStartOffset(line)) { return false; @@ -77,7 +76,7 @@ private static final class Checker implements Processor { private int counter = 0; @Override - public boolean process(@Nonnull PsiElement element) { + public boolean process(@NotNull PsiElement element) { if (PsiTreeUtil.nextVisibleLeaf(element) != null) { PsiElement nextVisibleSibling = getNextVisibleSiblingSkippingComments(element); IElementType elementType = element.getNode().getElementType(); diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/editor/SiddhiFoldingBuilder.java b/src/main/java/org/wso2/siddhi/plugins/idea/editor/SiddhiFoldingBuilder.java index 2685f29..94b0817 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/editor/SiddhiFoldingBuilder.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/editor/SiddhiFoldingBuilder.java @@ -25,13 +25,13 @@ import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.psi.QueryInputNode; import org.wso2.siddhi.plugins.idea.psi.QueryNode; import org.wso2.siddhi.plugins.idea.psi.SiddhiFile; import java.util.Collection; import java.util.List; -import javax.annotation.Nonnull; /** * Builds custom folding regions. @@ -39,15 +39,15 @@ public class SiddhiFoldingBuilder extends CustomFoldingBuilder implements DumbAware { @Override - protected void buildLanguageFoldRegions(@Nonnull List descriptors, @Nonnull PsiElement root, - @Nonnull Document document, boolean quick) { + protected void buildLanguageFoldRegions(@NotNull List descriptors, @NotNull PsiElement root, + @NotNull Document document, boolean quick) { if (!(root instanceof SiddhiFile)) { return; } buildQueryFoldRegions(descriptors, root); } - private void buildQueryFoldRegions(@Nonnull List descriptors, @Nonnull PsiElement root) { + private void buildQueryFoldRegions(@NotNull List descriptors, @NotNull PsiElement root) { // Get all the query input nodes. Collection queryNodes = PsiTreeUtil.findChildrenOfType(root, QueryNode .class); @@ -63,7 +63,7 @@ private void buildQueryFoldRegions(@Nonnull List descriptors, } } - private void addFoldingDescriptor(@Nonnull List descriptors, PsiElement node, + private void addFoldingDescriptor(@NotNull List descriptors, PsiElement node, PsiElement bodyNode) { // Calculate the start and end offsets. int startOffset = bodyNode.getTextRange().getStartOffset(); @@ -73,12 +73,12 @@ private void addFoldingDescriptor(@Nonnull List descriptors, } @Override - protected String getLanguagePlaceholderText(@Nonnull ASTNode node, @Nonnull TextRange range) { + protected String getLanguagePlaceholderText(@NotNull ASTNode node, @NotNull TextRange range) { return "..."; } @Override - protected boolean isRegionCollapsedByDefault(@Nonnull ASTNode node) { + protected boolean isRegionCollapsedByDefault(@NotNull ASTNode node) { return false; } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/formatter/SiddhiBlock.java b/src/main/java/org/wso2/siddhi/plugins/idea/formatter/SiddhiBlock.java index f3549dc..3361d36 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/formatter/SiddhiBlock.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/formatter/SiddhiBlock.java @@ -27,11 +27,11 @@ import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.formatter.common.AbstractBlock; import com.intellij.psi.tree.IElementType; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.ArrayList; import java.util.List; -import javax.annotation.Nonnull; import static org.wso2.siddhi.plugins.idea.SiddhiTypes.MULTILINE_COMMENT; @@ -42,7 +42,7 @@ public class SiddhiBlock extends AbstractBlock { private SpacingBuilder spacingBuilder; - @Nonnull + @NotNull private final ASTNode node; @Nullable private final Alignment alignment; @@ -50,16 +50,16 @@ public class SiddhiBlock extends AbstractBlock { private final Indent indent; @Nullable private final Wrap wrap; - @Nonnull + @NotNull private final CodeStyleSettings mySettings; - @Nonnull + @NotNull private final SpacingBuilder mySpacingBuilder; @Nullable private List mySubBlocks; - protected SiddhiBlock(@Nonnull ASTNode node, @Nullable Alignment alignment, @Nullable Indent indent, - @Nullable Wrap wrap, @Nonnull CodeStyleSettings settings, SpacingBuilder spacingBuilder) { + protected SiddhiBlock(@NotNull ASTNode node, @Nullable Alignment alignment, @Nullable Indent indent, + @Nullable Wrap wrap, @NotNull CodeStyleSettings settings, SpacingBuilder spacingBuilder) { super(node, wrap, alignment); this.node = node; @@ -111,17 +111,17 @@ protected List buildChildren() { return blocks; } - private static boolean isADefinitionElement(@Nonnull final IElementType parentElementType) { + private static boolean isADefinitionElement(@NotNull final IElementType parentElementType) { //TODO:provide implementation return false; } - private static boolean isInsideADefinitionElement(@Nonnull final IElementType childElementType) { + private static boolean isInsideADefinitionElement(@NotNull final IElementType childElementType) { //TODO:provide implementation return false; } - private static boolean isACodeBlock(@Nonnull final IElementType parentElementType) { + private static boolean isACodeBlock(@NotNull final IElementType parentElementType) { //TODO:provide implementation return false; } @@ -133,7 +133,7 @@ public Indent getIndent() { @Nullable @Override - public Spacing getSpacing(@Nullable Block child1, @Nonnull Block child2) { + public Spacing getSpacing(@Nullable Block child1, @NotNull Block child2) { return spacingBuilder.getSpacing(this, child1, child2); } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/formatter/SiddhiEnterBetweenBracesHandler.java b/src/main/java/org/wso2/siddhi/plugins/idea/formatter/SiddhiEnterBetweenBracesHandler.java index 74a15d2..abba8e9 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/formatter/SiddhiEnterBetweenBracesHandler.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/formatter/SiddhiEnterBetweenBracesHandler.java @@ -28,18 +28,17 @@ import com.intellij.psi.PsiWhiteSpace; import com.intellij.psi.impl.source.tree.LeafPsiElement; import com.intellij.psi.tree.IElementType; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.SiddhiLanguage; import org.wso2.siddhi.plugins.idea.SiddhiTypes; -import javax.annotation.Nonnull; - /** * Handles how to perform when the enter is pressed between braces. */ public class SiddhiEnterBetweenBracesHandler extends EnterBetweenBracesHandler { @Override - public Result postProcessEnter(@Nonnull PsiFile file, @Nonnull Editor editor, @Nonnull DataContext dataContext) { + public Result postProcessEnter(@NotNull PsiFile file, @NotNull Editor editor, @NotNull DataContext dataContext) { if (!file.getLanguage().is(SiddhiLanguage.INSTANCE)) { return Result.Continue; } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/formatter/SiddhiFormattingModelBuilder.java b/src/main/java/org/wso2/siddhi/plugins/idea/formatter/SiddhiFormattingModelBuilder.java index 93baaff..f65d390 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/formatter/SiddhiFormattingModelBuilder.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/formatter/SiddhiFormattingModelBuilder.java @@ -26,11 +26,10 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.codeStyle.CodeStyleSettings; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.SiddhiLanguage; -import javax.annotation.Nonnull; - import static org.wso2.siddhi.plugins.idea.SiddhiTypes.ALL; import static org.wso2.siddhi.plugins.idea.SiddhiTypes.AS; import static org.wso2.siddhi.plugins.idea.SiddhiTypes.AT; @@ -60,7 +59,7 @@ */ public class SiddhiFormattingModelBuilder implements FormattingModelBuilder { - @Nonnull + @NotNull @Override public FormattingModel createModel(PsiElement element, CodeStyleSettings settings) { SiddhiBlock rootBlock = new SiddhiBlock( diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/formatter/settings/SiddhiCodeStyleConfigurable.java b/src/main/java/org/wso2/siddhi/plugins/idea/formatter/settings/SiddhiCodeStyleConfigurable.java index 9957da5..70a4ec5 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/formatter/settings/SiddhiCodeStyleConfigurable.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/formatter/settings/SiddhiCodeStyleConfigurable.java @@ -20,20 +20,19 @@ import com.intellij.application.options.CodeStyleAbstractPanel; import com.intellij.application.options.TabbedLanguageCodeStylePanel; import com.intellij.psi.codeStyle.CodeStyleSettings; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.SiddhiLanguage; -import javax.annotation.Nonnull; - /** * Defines configurations for code styles in siddhi. */ public class SiddhiCodeStyleConfigurable extends CodeStyleAbstractConfigurable { - public SiddhiCodeStyleConfigurable(@Nonnull CodeStyleSettings settings, CodeStyleSettings cloneSettings) { + public SiddhiCodeStyleConfigurable(@NotNull CodeStyleSettings settings, CodeStyleSettings cloneSettings) { super(settings, cloneSettings, "Siddhi"); } - @Nonnull + @NotNull @Override protected CodeStyleAbstractPanel createPanel(CodeStyleSettings settings) { return new SiddhiCodeStyleMainPanel(getCurrentSettings(), settings); diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/formatter/settings/SiddhiCodeStyleSettingsProvider.java b/src/main/java/org/wso2/siddhi/plugins/idea/formatter/settings/SiddhiCodeStyleSettingsProvider.java index edeec4a..845bbba 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/formatter/settings/SiddhiCodeStyleSettingsProvider.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/formatter/settings/SiddhiCodeStyleSettingsProvider.java @@ -19,8 +19,7 @@ import com.intellij.openapi.options.Configurable; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CodeStyleSettingsProvider; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * Provides settings for code styles in siddhi. @@ -32,9 +31,9 @@ public String getConfigurableDisplayName() { return "Siddhi"; } - @Nonnull + @NotNull @Override - public Configurable createSettingsPage(@Nonnull CodeStyleSettings settings, CodeStyleSettings originalSettings) { + public Configurable createSettingsPage(@NotNull CodeStyleSettings settings, CodeStyleSettings originalSettings) { return new SiddhiCodeStyleConfigurable(settings, originalSettings); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/formatter/settings/SiddhiLanguageCodeStyleSettingsProvider.java b/src/main/java/org/wso2/siddhi/plugins/idea/formatter/settings/SiddhiLanguageCodeStyleSettingsProvider.java index 393b29c..0634631 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/formatter/settings/SiddhiLanguageCodeStyleSettingsProvider.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/formatter/settings/SiddhiLanguageCodeStyleSettingsProvider.java @@ -21,10 +21,9 @@ import com.intellij.lang.Language; import com.intellij.psi.codeStyle.CommonCodeStyleSettings; import com.intellij.psi.codeStyle.LanguageCodeStyleSettingsProvider; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.SiddhiLanguage; -import javax.annotation.Nonnull; - /** * Defines code styles for siddhi. */ @@ -40,15 +39,15 @@ public class SiddhiLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSe "select sensorId, avg(temperature) as avgTemp\n" + "insert into outputStream;"; - @Nonnull + @NotNull @Override public Language getLanguage() { return SiddhiLanguage.INSTANCE; } - @Nonnull + @NotNull @Override - public String getCodeSample(@Nonnull SettingsType settingsType) { + public String getCodeSample(@NotNull SettingsType settingsType) { return DEFAULT_CODE_SAMPLE; } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/highlighter/SiddhiColorSettingsPage.java b/src/main/java/org/wso2/siddhi/plugins/idea/highlighter/SiddhiColorSettingsPage.java index 8c5e08c..0ba4be8 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/highlighter/SiddhiColorSettingsPage.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/highlighter/SiddhiColorSettingsPage.java @@ -21,11 +21,11 @@ import com.intellij.openapi.options.colors.AttributesDescriptor; import com.intellij.openapi.options.colors.ColorDescriptor; import com.intellij.openapi.options.colors.ColorSettingsPage; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.SiddhiIcons; import java.util.Map; -import javax.annotation.Nonnull; import javax.swing.Icon; /** @@ -50,13 +50,13 @@ public Icon getIcon() { return SiddhiIcons.ICON; } - @Nonnull + @NotNull @Override public SyntaxHighlighter getHighlighter() { return new SiddhiSyntaxHighlighter(); } - @Nonnull + @NotNull @Override public String getDemoText() { return "define stream TempStream (deviceID long, roomNo int, temp double);" + @@ -71,20 +71,20 @@ public Map getAdditionalHighlightingTagToDescriptorMa return null; } - @Nonnull + @NotNull @Override public AttributesDescriptor[] getAttributeDescriptors() { AttributesDescriptor[] descriptorsCopy = DESCRIPTORS; return descriptorsCopy; } - @Nonnull + @NotNull @Override public ColorDescriptor[] getColorDescriptors() { return ColorDescriptor.EMPTY_ARRAY; } - @Nonnull + @NotNull @Override public String getDisplayName() { return "Siddhi"; diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/highlighter/SiddhiSyntaxHighlighter.java b/src/main/java/org/wso2/siddhi/plugins/idea/highlighter/SiddhiSyntaxHighlighter.java index 0bd8c1f..5e6cb0f 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/highlighter/SiddhiSyntaxHighlighter.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/highlighter/SiddhiSyntaxHighlighter.java @@ -22,13 +22,13 @@ import com.intellij.psi.tree.IElementType; import org.antlr.jetbrains.adaptor.lexer.ANTLRLexerAdaptor; import org.antlr.jetbrains.adaptor.lexer.TokenIElementType; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.SiddhiLanguage; import org.wso2.siddhi.plugins.idea.SiddhiParserDefinition; import org.wso2.siddhi.plugins.idea.grammar.SiddhiQLLexer; import java.util.HashMap; import java.util.Map; -import javax.annotation.Nonnull; /** * A highlighter is really just a mapping from token type to @@ -68,13 +68,13 @@ public class SiddhiSyntaxHighlighter extends SyntaxHighlighterBase { fillMap(ATTRIBUTES, SiddhiParserDefinition.SYMBOLS, SiddhiSyntaxHighlightingColors.SYMBOLS); } - @Nonnull + @NotNull public Lexer getHighlightingLexer() { SiddhiQLLexer lexer = new SiddhiQLLexer(null); return new ANTLRLexerAdaptor(SiddhiLanguage.INSTANCE, lexer); } - @Nonnull + @NotNull public TextAttributesKey[] getTokenHighlights(IElementType tokenType) { if (!(tokenType instanceof TokenIElementType)) { return EMPTY_KEYS; diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/highlighter/SiddhiSyntaxHighlighterFactory.java b/src/main/java/org/wso2/siddhi/plugins/idea/highlighter/SiddhiSyntaxHighlighterFactory.java index 2af6529..75d6d6a 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/highlighter/SiddhiSyntaxHighlighterFactory.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/highlighter/SiddhiSyntaxHighlighterFactory.java @@ -20,16 +20,15 @@ import com.intellij.openapi.fileTypes.SyntaxHighlighterFactory; import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import javax.annotation.Nonnull; - /** * Returns syntax highlighter for the Siddhi language. */ public class SiddhiSyntaxHighlighterFactory extends SyntaxHighlighterFactory { - @Nonnull + @NotNull @Override public SyntaxHighlighter getSyntaxHighlighter(@Nullable Project project, @Nullable VirtualFile virtualFile) { return new SiddhiSyntaxHighlighter(); diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/inspections/WrongModuleTypeNotificationProvider.java b/src/main/java/org/wso2/siddhi/plugins/idea/inspections/WrongModuleTypeNotificationProvider.java index a8b9417..d8424dd 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/inspections/WrongModuleTypeNotificationProvider.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/inspections/WrongModuleTypeNotificationProvider.java @@ -28,11 +28,11 @@ import com.intellij.ui.EditorNotificationPanel; import com.intellij.ui.EditorNotifications; import com.intellij.util.containers.ContainerUtil; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.SiddhiFileType; import org.wso2.siddhi.plugins.idea.sdk.SiddhiSdkService; import java.util.Set; -import javax.annotation.Nonnull; /** * Defines the notifications for the wrong module type. @@ -45,18 +45,18 @@ public class WrongModuleTypeNotificationProvider extends EditorNotifications.Pro private final Project myProject; - public WrongModuleTypeNotificationProvider(@Nonnull Project project) { + public WrongModuleTypeNotificationProvider(@NotNull Project project) { myProject = project; } - @Nonnull + @NotNull @Override public Key getKey() { return KEY; } @Override - public EditorNotificationPanel createNotificationPanel(@Nonnull VirtualFile file, @Nonnull FileEditor fileEditor) { + public EditorNotificationPanel createNotificationPanel(@NotNull VirtualFile file, @NotNull FileEditor fileEditor) { if (file.getFileType() != SiddhiFileType.INSTANCE) { return null; } @@ -66,15 +66,15 @@ public EditorNotificationPanel createNotificationPanel(@Nonnull VirtualFile file || getIgnoredModules(myProject).contains(module.getName()) ? null : createPanel(myProject, module); } - @Nonnull - private static EditorNotificationPanel createPanel(@Nonnull Project project, @Nonnull Module module) { + @NotNull + private static EditorNotificationPanel createPanel(@NotNull Project project, @NotNull Module module) { EditorNotificationPanel panel = new EditorNotificationPanel(); panel.setText("'" + module.getName() + "' is not a Siddhi Module, some code insight might not work here"); return panel; } - @Nonnull - private static Set getIgnoredModules(@Nonnull Project project) { + @NotNull + private static Set getIgnoredModules(@NotNull Project project) { String value = PropertiesComponent.getInstance(project).getValue(DONT_ASK_TO_CHANGE_MODULE_TYPE_KEY, ""); return ContainerUtil.newLinkedHashSet(StringUtil.split(value, ",")); } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/project/SiddhiApplicationLibrariesService.java b/src/main/java/org/wso2/siddhi/plugins/idea/project/SiddhiApplicationLibrariesService.java index 949e664..0bf373b 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/project/SiddhiApplicationLibrariesService.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/project/SiddhiApplicationLibrariesService.java @@ -21,11 +21,10 @@ import com.intellij.openapi.components.State; import com.intellij.openapi.components.Storage; import com.intellij.openapi.components.StoragePathMacros; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.SiddhiConstants; import org.wso2.siddhi.plugins.idea.sdk.SiddhiSdkUtil; -import javax.annotation.Nonnull; - /** * Defines siddhi application library service. */ @@ -37,7 +36,7 @@ public class SiddhiApplicationLibrariesService extends SiddhiLibrariesService { - @Nonnull + @NotNull @Override protected SiddhiApplicationLibrariesState createState() { return new SiddhiApplicationLibrariesState(); diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/project/SiddhiLibrariesService.java b/src/main/java/org/wso2/siddhi/plugins/idea/project/SiddhiLibrariesService.java index 35a7641..0a439f6 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/project/SiddhiLibrariesService.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/project/SiddhiLibrariesService.java @@ -27,12 +27,12 @@ import com.intellij.util.containers.ContainerUtil; import com.intellij.util.messages.Topic; import com.intellij.util.xmlb.XmlSerializerUtil; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.Arrays; import java.util.Collection; import java.util.Set; -import javax.annotation.Nonnull; /** * Defines siddhi library service. @@ -45,7 +45,7 @@ public class SiddhiLibrariesService extends Simple LibrariesListener.class); protected final T myState = createState(); - @Nonnull + @NotNull @Override public T getState() { return myState; @@ -56,21 +56,21 @@ public void loadState(T state) { XmlSerializerUtil.copyBean(state, myState); } - @Nonnull + @NotNull protected T createState() { //noinspection unchecked return (T) new SiddhiLibraryState(); } - @Nonnull - public static Collection getUserDefinedLibraries(@Nonnull Module module) { + @NotNull + public static Collection getUserDefinedLibraries(@NotNull Module module) { Set result = ContainerUtil.newLinkedHashSet(); result.addAll(getUserDefinedLibraries(module.getProject())); return result; } - @Nonnull - public static Collection getUserDefinedLibraries(@Nonnull Project project) { + @NotNull + public static Collection getUserDefinedLibraries(@NotNull Project project) { Set result = ContainerUtil.newLinkedHashSet(); result.addAll(siddhiRootsFromUrls(SiddhiProjectLibrariesService.getInstance(project) .getLibraryRootUrls())); @@ -78,23 +78,23 @@ public static Collection getUserDefinedLibraries(@Nonnull return result; } - @Nonnull + @NotNull private static Collection getUserDefinedLibraries() { return siddhiRootsFromUrls(SiddhiApplicationLibrariesService.getInstance().getLibraryRootUrls()); } - @Nonnull - public static ModificationTracker[] getModificationTrackers(@Nonnull Project project, @Nullable Module module) { + @NotNull + public static ModificationTracker[] getModificationTrackers(@NotNull Project project, @Nullable Module module) { assert module != null; return new ModificationTracker[]{SiddhiProjectLibrariesService.getInstance(module.getProject()), SiddhiApplicationLibrariesService.getInstance()}; } - public void setLibraryRootUrls(@Nonnull String... libraryRootUrls) { + public void setLibraryRootUrls(@NotNull String... libraryRootUrls) { setLibraryRootUrls(Arrays.asList(libraryRootUrls)); } - public void setLibraryRootUrls(@Nonnull Collection libraryRootUrls) { + public void setLibraryRootUrls(@NotNull Collection libraryRootUrls) { if (!myState.getUrls().equals(libraryRootUrls)) { myState.setUrls(libraryRootUrls); incModificationCount(); @@ -103,13 +103,13 @@ public void setLibraryRootUrls(@Nonnull Collection libraryRootUrls) { } } - @Nonnull + @NotNull public Collection getLibraryRootUrls() { return myState.getUrls(); } - @Nonnull - private static Collection siddhiRootsFromUrls(@Nonnull Collection urls) { + @NotNull + private static Collection siddhiRootsFromUrls(@NotNull Collection urls) { return ContainerUtil.mapNotNull(urls, url -> VirtualFileManager.getInstance().findFileByUrl(url)); } @@ -117,6 +117,6 @@ private static Collection siddhiRootsFromUrls(@Nonnull Co * Interface for libraries listener. */ public interface LibrariesListener { - void librariesChanged(@Nonnull Collection newRootUrls); + void librariesChanged(@NotNull Collection newRootUrls); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/project/SiddhiLibraryState.java b/src/main/java/org/wso2/siddhi/plugins/idea/project/SiddhiLibraryState.java index af1fb88..e583c46 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/project/SiddhiLibraryState.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/project/SiddhiLibraryState.java @@ -17,24 +17,24 @@ package org.wso2.siddhi.plugins.idea.project; import com.intellij.util.containers.ContainerUtil; +import org.jetbrains.annotations.NotNull; import java.util.Collection; -import javax.annotation.Nonnull; /** * Defines siddhi library state. */ public class SiddhiLibraryState { - @Nonnull + @NotNull private Collection myUrls = ContainerUtil.newArrayList(); - @Nonnull + @NotNull public Collection getUrls() { return myUrls; } - public void setUrls(@Nonnull Collection urls) { + public void setUrls(@NotNull Collection urls) { myUrls = urls; } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/project/SiddhiModuleLibrariesInitializer.java b/src/main/java/org/wso2/siddhi/plugins/idea/project/SiddhiModuleLibrariesInitializer.java index 2910340..5ed530c 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/project/SiddhiModuleLibrariesInitializer.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/project/SiddhiModuleLibrariesInitializer.java @@ -49,6 +49,7 @@ import com.intellij.util.Alarm; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.messages.MessageBusConnection; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.TestOnly; import org.wso2.siddhi.plugins.idea.SiddhiConstants; import org.wso2.siddhi.plugins.idea.configuration.SiddhiLibrariesConfigurableProvider; @@ -58,7 +59,6 @@ import java.util.Collection; import java.util.List; import java.util.Set; -import javax.annotation.Nonnull; import javax.swing.event.HyperlinkEvent; /** @@ -76,18 +76,18 @@ public class SiddhiModuleLibrariesInitializer implements ModuleComponent { private final MessageBusConnection myConnection; private boolean myModuleInitialized; - @Nonnull + @NotNull private final Set myLastHandledSiddhiPathSourcesRoots = ContainerUtil.newHashSet(); - @Nonnull + @NotNull private final Set myLastHandledExclusions = ContainerUtil.newHashSet(); - @Nonnull + @NotNull private final Set myWatchedRequests = ContainerUtil.newHashSet(); - @Nonnull + @NotNull private final Module myModule; @TestOnly - public static void setTestingMode(@Nonnull Disposable disposable) { + public static void setTestingMode(@NotNull Disposable disposable) { isTestingMode = true; Disposer.register(disposable, () -> { //noinspection AssignmentToStaticFieldFromInstanceMethod @@ -95,7 +95,7 @@ public static void setTestingMode(@Nonnull Disposable disposable) { }); } - public SiddhiModuleLibrariesInitializer(@Nonnull Module module) { + public SiddhiModuleLibrariesInitializer(@NotNull Module module) { myModule = module; myAlarm = ApplicationManager.getApplication().isUnitTestMode() ? new Alarm() : new Alarm(Alarm.ThreadToUse.POOLED_THREAD, myModule); @@ -131,7 +131,7 @@ private void scheduleUpdate(int delay) { } } - private void attachLibraries(@Nonnull Collection libraryRoots, Set exclusions) { + private void attachLibraries(@NotNull Collection libraryRoots, Set exclusions) { ApplicationManager.getApplication().assertIsDispatchThread(); if (!libraryRoots.isEmpty()) { @@ -162,7 +162,7 @@ private String getLibraryName() { return SIDDHI_LIB_NAME + " <" + myModule.getName() + ">"; } - private static void fillLibrary(@Nonnull Library library, @Nonnull Collection libraryRoots, + private static void fillLibrary(@NotNull Library library, @NotNull Collection libraryRoots, Set exclusions) { ApplicationManager.getApplication().assertWriteAccessAllowed(); @@ -211,7 +211,7 @@ private void removeLibraryIfNeeded() { } } - private static void showNotification(@Nonnull Project project) { + private static void showNotification(@NotNull Project project) { PropertiesComponent propertiesComponent = PropertiesComponent.getInstance(); PropertiesComponent projectPropertiesComponent = PropertiesComponent.getInstance(project); boolean shownAlready; @@ -227,7 +227,7 @@ private static void showNotification(@Nonnull Project project) { if (!shownAlready) { NotificationListener.Adapter notificationListener = new NotificationListener.Adapter() { @Override - protected void hyperlinkActivated(@Nonnull Notification notification, @Nonnull HyperlinkEvent event) { + protected void hyperlinkActivated(@NotNull Notification notification, @NotNull HyperlinkEvent event) { if (event.getEventType() == HyperlinkEvent.EventType.ACTIVATED && "configure".equals(event.getDescription())) { SiddhiLibrariesConfigurableProvider.showModulesConfigurable(project); @@ -269,7 +269,7 @@ public void projectClosed() { disposeComponent(); } - @Nonnull + @NotNull @Override public String getComponentName() { return getClass().getName(); @@ -324,7 +324,7 @@ public void run() { } } - @Nonnull + @NotNull private static Collection gatherIncludeRoots(Collection siddhiPathSourcesRoots, Set excludeRoots) { Collection includeRoots = ContainerUtil.newHashSet(); diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/project/SiddhiModuleSettings.java b/src/main/java/org/wso2/siddhi/plugins/idea/project/SiddhiModuleSettings.java index 4999e7b..7e481d1 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/project/SiddhiModuleSettings.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/project/SiddhiModuleSettings.java @@ -29,12 +29,11 @@ import com.intellij.psi.impl.source.resolve.ResolveCache; import com.intellij.util.messages.Topic; import com.intellij.util.xmlb.XmlSerializerUtil; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.SiddhiConstants; import org.wso2.siddhi.plugins.idea.configuration.SiddhiConfigurableProvider; import org.wso2.siddhi.plugins.idea.configuration.SiddhiModuleSettingsConfigurable; -import javax.annotation.Nonnull; - /** * Provides siddhi module settings. */ @@ -48,17 +47,17 @@ public class SiddhiModuleSettings implements public static final Topic TOPIC = Topic.create("build target changed", BuildTargetListener.class); - @Nonnull + @NotNull private final SiddhiModuleSettingsState myState = new SiddhiModuleSettingsState(); - @Nonnull + @NotNull private final Module myModule; - public SiddhiModuleSettings(@Nonnull Module module) { + public SiddhiModuleSettings(@NotNull Module module) { myModule = module; } - public static SiddhiModuleSettings getInstance(@Nonnull Module module) { + public static SiddhiModuleSettings getInstance(@NotNull Module module) { return ModuleServiceManager.getService(module, SiddhiModuleSettings.class); } @@ -70,7 +69,7 @@ private void cleanResolveCaches() { } } - @Nonnull + @NotNull @Override public SiddhiModuleSettingsState getState() { return myState; @@ -85,14 +84,14 @@ public void loadState(SiddhiModuleSettingsState state) { * Interface for build target listener. */ public interface BuildTargetListener { - void changed(@Nonnull Module module); + void changed(@NotNull Module module); } static class SiddhiModuleSettingsState { } - public static void showModulesConfigurable(@Nonnull Project project) { + public static void showModulesConfigurable(@NotNull Project project) { ApplicationManager.getApplication().assertIsDispatchThread(); if (!project.isDisposed()) { ShowSettingsUtil.getInstance().editConfigurable(project, new SiddhiConfigurableProvider @@ -100,7 +99,7 @@ public static void showModulesConfigurable(@Nonnull Project project) { } } - public static void showModulesConfigurable(@Nonnull Module module) { + public static void showModulesConfigurable(@NotNull Module module) { ApplicationManager.getApplication().assertIsDispatchThread(); if (!module.isDisposed()) { ShowSettingsUtil.getInstance().editConfigurable(module.getProject(), diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/project/SiddhiProjectExtension.java b/src/main/java/org/wso2/siddhi/plugins/idea/project/SiddhiProjectExtension.java index c0929fb..b4801ef 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/project/SiddhiProjectExtension.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/project/SiddhiProjectExtension.java @@ -28,11 +28,10 @@ import com.intellij.openapi.roots.ProjectExtension; import com.intellij.openapi.util.AsyncResult; import org.jdom.Element; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.sdk.SiddhiSdkService; -import javax.annotation.Nonnull; - /** * Defines the extension for siddhi project. */ @@ -66,12 +65,12 @@ public void projectSdkChanged(@Nullable Sdk sdk) { } @Override - public void readExternal(@Nonnull Element element) { + public void readExternal(@NotNull Element element) { // We don't have any use of this method at the moment. } @Override - public void writeExternal(@Nonnull Element element) { + public void writeExternal(@NotNull Element element) { // We don't have any use of this method at the moment. } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/project/SiddhiProjectLibrariesService.java b/src/main/java/org/wso2/siddhi/plugins/idea/project/SiddhiProjectLibrariesService.java index 2b71146..e8308ff 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/project/SiddhiProjectLibrariesService.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/project/SiddhiProjectLibrariesService.java @@ -22,10 +22,9 @@ import com.intellij.openapi.components.StoragePathMacros; import com.intellij.openapi.components.StorageScheme; import com.intellij.openapi.project.Project; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.SiddhiConstants; -import javax.annotation.Nonnull; - /** * Provides siddhi project library service. */ @@ -38,7 +37,7 @@ } ) public class SiddhiProjectLibrariesService extends SiddhiLibrariesService { - public static SiddhiProjectLibrariesService getInstance(@Nonnull Project project) { + public static SiddhiProjectLibrariesService getInstance(@NotNull Project project) { return ServiceManager.getService(project, SiddhiProjectLibrariesService.class); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/project/SiddhiProjectStructureDetector.java b/src/main/java/org/wso2/siddhi/plugins/idea/project/SiddhiProjectStructureDetector.java index ca97195..fb607a0 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/project/SiddhiProjectStructureDetector.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/project/SiddhiProjectStructureDetector.java @@ -24,6 +24,7 @@ import com.intellij.ide.util.projectWizard.importSources.DetectedSourceRoot; import com.intellij.ide.util.projectWizard.importSources.ProjectFromSourcesBuilder; import com.intellij.ide.util.projectWizard.importSources.ProjectStructureDetector; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.SiddhiModuleType; import org.wso2.siddhi.plugins.idea.sdk.SiddhiSdkType; @@ -32,7 +33,6 @@ import java.util.Collections; import java.util.LinkedList; import java.util.List; -import javax.annotation.Nonnull; import javax.swing.Icon; /** @@ -41,14 +41,14 @@ */ public class SiddhiProjectStructureDetector extends ProjectStructureDetector { - @Nonnull + @NotNull @Override - public DirectoryProcessingResult detectRoots(@Nonnull File dir, @Nonnull File[] children, @Nonnull File base, - @Nonnull List result) { + public DirectoryProcessingResult detectRoots(@NotNull File dir, @NotNull File[] children, @NotNull File base, + @NotNull List result) { // There can be only one project root, it is the directory that the user selects. result.add(new DetectedProjectRoot(base) { - @Nonnull + @NotNull @Override public String getRootTypeName() { return "Siddhi"; @@ -58,9 +58,9 @@ public String getRootTypeName() { } @Override - public void setupProjectStructure(@Nonnull Collection roots, - @Nonnull ProjectDescriptor projectDescriptor, - @Nonnull ProjectFromSourcesBuilder builder) { + public void setupProjectStructure(@NotNull Collection roots, + @NotNull ProjectDescriptor projectDescriptor, + @NotNull ProjectFromSourcesBuilder builder) { // If there are no roots detected, we don't need to process anything. if (roots.isEmpty()) { return; @@ -71,7 +71,7 @@ public void setupProjectStructure(@Nonnull Collection roots // We need to create a source root element as well. This is used when we create the module descriptor. DetectedSourceRoot detectedSourceRoot = new DetectedSourceRoot(projectRoot.getDirectory(), "") { - @Nonnull + @NotNull @Override public String getRootTypeName() { return "Siddhi"; @@ -87,9 +87,9 @@ public String getRootTypeName() { projectDescriptor.setModules(moduleDescriptors); } - @Nonnull + @NotNull @Override - public List createWizardSteps(@Nonnull ProjectFromSourcesBuilder builder, + public List createWizardSteps(@NotNull ProjectFromSourcesBuilder builder, ProjectDescriptor projectDescriptor, Icon stepIcon) { ProjectJdkForModuleStep projectJdkForModuleStep = new ProjectJdkForModuleStep(builder.getContext(), SiddhiSdkType.getInstance()); diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/AggregationDefinitionNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/AggregationDefinitionNode.java index 9fbdafd..3b89bcb 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/AggregationDefinitionNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/AggregationDefinitionNode.java @@ -20,18 +20,17 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiNamedElement; import org.antlr.jetbrains.adaptor.psi.IdentifierDefSubtree; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.SiddhiTypes; import org.wso2.siddhi.plugins.idea.psi.scopes.ParameterContainer; import org.wso2.siddhi.plugins.idea.psi.scopes.TopLevelDefinition; -import javax.annotation.Nonnull; - /** * Represents aggregation_definition rule in parser. */ public class AggregationDefinitionNode extends IdentifierDefSubtree implements TopLevelDefinition, ParameterContainer { - public AggregationDefinitionNode(@Nonnull ASTNode node) { + public AggregationDefinitionNode(@NotNull ASTNode node) { super(node, SiddhiTypes.IDENTIFIER); } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/AliasNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/AliasNode.java index 43049c1..d3b000b 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/AliasNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/AliasNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents alias rule in parser. */ public class AliasNode extends ANTLRPsiNode { - public AliasNode(@Nonnull ASTNode node) { + public AliasNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/AnnotationElementNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/AnnotationElementNode.java index 4f8f0c6..9937122 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/AnnotationElementNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/AnnotationElementNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents annotation_element rule in parser. */ public class AnnotationElementNode extends ANTLRPsiNode { - public AnnotationElementNode(@Nonnull ASTNode node) { + public AnnotationElementNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/AnnotationNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/AnnotationNode.java index 0c60289..9c794d1 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/AnnotationNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/AnnotationNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents annotation rule in parser. */ public class AnnotationNode extends ANTLRPsiNode { - public AnnotationNode(@Nonnull ASTNode node) { + public AnnotationNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/AnonymousStreamNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/AnonymousStreamNode.java index 3c51796..c03f314 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/AnonymousStreamNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/AnonymousStreamNode.java @@ -17,14 +17,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents anonymous_stream rule in parser. */ public class AnonymousStreamNode extends ANTLRPsiNode { - public AnonymousStreamNode(@Nonnull ASTNode node) { + public AnonymousStreamNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/AppAnnotationNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/AppAnnotationNode.java index 52bc9a3..c2add0b 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/AppAnnotationNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/AppAnnotationNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents app_annotation rule in parser. */ public class AppAnnotationNode extends ANTLRPsiNode { - public AppAnnotationNode(@Nonnull ASTNode node) { + public AppAnnotationNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/AttributeNameNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/AttributeNameNode.java index bc1d8bd..96b34df 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/AttributeNameNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/AttributeNameNode.java @@ -19,12 +19,12 @@ import com.intellij.lang.ASTNode; import com.intellij.navigation.ItemPresentation; import org.antlr.jetbrains.adaptor.psi.IdentifierDefSubtree; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.SiddhiIcons; import org.wso2.siddhi.plugins.idea.SiddhiTypes; import org.wso2.siddhi.plugins.idea.psi.impl.SiddhiItemPresentation; -import javax.annotation.Nonnull; import javax.swing.Icon; /** @@ -32,7 +32,7 @@ */ public class AttributeNameNode extends IdentifierDefSubtree { - public AttributeNameNode(@Nonnull ASTNode node) { + public AttributeNameNode(@NotNull ASTNode node) { super(node, SiddhiTypes.IDENTIFIER); } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/AttributeNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/AttributeNode.java index 0cb6a7a..0bdb9ab 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/AttributeNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/AttributeNode.java @@ -17,14 +17,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents attribute rule in parser. */ public class AttributeNode extends ANTLRPsiNode { - public AttributeNode(@Nonnull ASTNode node) { + public AttributeNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/AttributeReferenceNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/AttributeReferenceNode.java index ee4e313..457e7e6 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/AttributeReferenceNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/AttributeReferenceNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents attribute_reference rule in parser. */ public class AttributeReferenceNode extends ANTLRPsiNode { - public AttributeReferenceNode(@Nonnull ASTNode node) { + public AttributeReferenceNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/AttributeTypeNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/AttributeTypeNode.java index 1b6211b..dec2b31 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/AttributeTypeNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/AttributeTypeNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents attribute_type rule in parser. */ public class AttributeTypeNode extends ANTLRPsiNode { - public AttributeTypeNode(@Nonnull ASTNode node) { + public AttributeTypeNode(@NotNull ASTNode node) { super(node); } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/BasicSourceNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/BasicSourceNode.java index c835ff9..0dd93e4 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/BasicSourceNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/BasicSourceNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents basic_source rule in parser. */ public class BasicSourceNode extends ANTLRPsiNode { - public BasicSourceNode(@Nonnull ASTNode node) { + public BasicSourceNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/BasicSourceStreamHandlerNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/BasicSourceStreamHandlerNode.java index a3727a1..d4cec7d 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/BasicSourceStreamHandlerNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/BasicSourceStreamHandlerNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents basic_stream_handler rule in parser. */ public class BasicSourceStreamHandlerNode extends ANTLRPsiNode { - public BasicSourceStreamHandlerNode(@Nonnull ASTNode node) { + public BasicSourceStreamHandlerNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/BasicSourceStreamHandlersNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/BasicSourceStreamHandlersNode.java index 27e08ad..9c5c3ea 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/BasicSourceStreamHandlersNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/BasicSourceStreamHandlersNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents basic_stream_handlers rule in parser. */ public class BasicSourceStreamHandlersNode extends ANTLRPsiNode { - public BasicSourceStreamHandlersNode(@Nonnull ASTNode node) { + public BasicSourceStreamHandlersNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/ConstantValueNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/ConstantValueNode.java index eb1b3a2..5102dc3 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/ConstantValueNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/ConstantValueNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents constant_value rule in parser. */ public class ConstantValueNode extends ANTLRPsiNode { - public ConstantValueNode(@Nonnull ASTNode node) { + public ConstantValueNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/DefinitionElementNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/DefinitionElementNode.java index 464d55f..5bdc053 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/DefinitionElementNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/DefinitionElementNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents definition_element rule in parser. */ public class DefinitionElementNode extends ANTLRPsiNode { - public DefinitionElementNode(@Nonnull ASTNode node) { + public DefinitionElementNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/DefinitionElementWithExecutionElementNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/DefinitionElementWithExecutionElementNode.java index 55a914d..384a392 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/DefinitionElementWithExecutionElementNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/DefinitionElementWithExecutionElementNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents definition_element_with_execution rule in parser. */ public class DefinitionElementWithExecutionElementNode extends ANTLRPsiNode { - public DefinitionElementWithExecutionElementNode(@Nonnull ASTNode node) { + public DefinitionElementWithExecutionElementNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/DeleteFromTableNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/DeleteFromTableNode.java index 0135b0e..714e3c6 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/DeleteFromTableNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/DeleteFromTableNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents delete_from_table rule in parser. */ public class DeleteFromTableNode extends ANTLRPsiNode { - public DeleteFromTableNode(@Nonnull ASTNode node) { + public DeleteFromTableNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/EndPatternNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/EndPatternNode.java index 86d1d96..01b59d3 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/EndPatternNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/EndPatternNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents end_pattern rule in parser. */ public class EndPatternNode extends ANTLRPsiNode { - public EndPatternNode(@Nonnull ASTNode node) { + public EndPatternNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/ExecutionElementNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/ExecutionElementNode.java index 2cbaee2..a927f1a 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/ExecutionElementNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/ExecutionElementNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents execution_element rule in parser. */ public class ExecutionElementNode extends ANTLRPsiNode { - public ExecutionElementNode(@Nonnull ASTNode node) { + public ExecutionElementNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/ExpressionNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/ExpressionNode.java index d646797..aa9273f 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/ExpressionNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/ExpressionNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents expression rule in parser. */ public class ExpressionNode extends ANTLRPsiNode { - public ExpressionNode(@Nonnull ASTNode node) { + public ExpressionNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/FilterNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/FilterNode.java index e831ae1..be35f98 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/FilterNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/FilterNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents filter rule in parser. */ public class FilterNode extends ANTLRPsiNode { - public FilterNode(@Nonnull ASTNode node) { + public FilterNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/FunctionBodyNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/FunctionBodyNode.java index 09ecc77..0ab99db 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/FunctionBodyNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/FunctionBodyNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents function_body rule in parser. */ public class FunctionBodyNode extends ANTLRPsiNode { - public FunctionBodyNode(@Nonnull ASTNode node) { + public FunctionBodyNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/FunctionDefinitionNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/FunctionDefinitionNode.java index f6b3dc3..73aeac2 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/FunctionDefinitionNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/FunctionDefinitionNode.java @@ -20,18 +20,17 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiNamedElement; import org.antlr.jetbrains.adaptor.psi.IdentifierDefSubtree; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.SiddhiTypes; import org.wso2.siddhi.plugins.idea.psi.scopes.ParameterContainer; import org.wso2.siddhi.plugins.idea.psi.scopes.TopLevelDefinition; -import javax.annotation.Nonnull; - /** * ANTLRPsiNode which represents function_definition rule in parser. */ public class FunctionDefinitionNode extends IdentifierDefSubtree implements TopLevelDefinition, ParameterContainer { - public FunctionDefinitionNode(@Nonnull ASTNode node) { + public FunctionDefinitionNode(@NotNull ASTNode node) { super(node, SiddhiTypes.IDENTIFIER); } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/FunctionIdNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/FunctionIdNode.java index ca1c097..4f7ac9b 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/FunctionIdNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/FunctionIdNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents function_id rule in parser. */ public class FunctionIdNode extends ANTLRPsiNode { - public FunctionIdNode(@Nonnull ASTNode node) { + public FunctionIdNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/FunctionNameNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/FunctionNameNode.java index 083c059..af7d837 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/FunctionNameNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/FunctionNameNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents function_name rule in parser. */ public class FunctionNameNode extends ANTLRPsiNode { - public FunctionNameNode(@Nonnull ASTNode node) { + public FunctionNameNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/FunctionOperationNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/FunctionOperationNode.java index de565fd..1e22f26 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/FunctionOperationNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/FunctionOperationNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents function_operation rule in parser. */ public class FunctionOperationNode extends ANTLRPsiNode { - public FunctionOperationNode(@Nonnull ASTNode node) { + public FunctionOperationNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/GroupByNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/GroupByNode.java index 76050ec..ba4bfeb 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/GroupByNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/GroupByNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents group_by rule in parser. */ public class GroupByNode extends ANTLRPsiNode { - public GroupByNode(@Nonnull ASTNode node) { + public GroupByNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/HavingNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/HavingNode.java index b5ae9a7..0c1d7db 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/HavingNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/HavingNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents having rule in parser. */ public class HavingNode extends ANTLRPsiNode { - public HavingNode(@Nonnull ASTNode node) { + public HavingNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/IdNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/IdNode.java index 66f36a4..0929c73 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/IdNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/IdNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents id rule in parser. */ public class IdNode extends ANTLRPsiNode { - public IdNode(@Nonnull ASTNode node) { + public IdNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/IdentifierPSINode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/IdentifierPSINode.java index fc0c9ec..bf243cb 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/IdentifierPSINode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/IdentifierPSINode.java @@ -29,6 +29,7 @@ import org.antlr.jetbrains.adaptor.psi.IdentifierDefSubtree; import org.antlr.jetbrains.adaptor.psi.Trees; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.SiddhiLanguage; import org.wso2.siddhi.plugins.idea.SiddhiTypes; @@ -36,8 +37,6 @@ import org.wso2.siddhi.plugins.idea.psi.references.StreamIdReference; import org.wso2.siddhi.plugins.idea.psi.references.TargetReference; -import javax.annotation.Nonnull; - /** * ANTLRPsiNode which represents identifiers in siddhi file. */ @@ -58,7 +57,7 @@ public String getName() { * replace. */ @Override - public PsiElement setName(@NonNls @Nonnull String name) throws IncorrectOperationException { + public PsiElement setName(@NonNls @NotNull String name) throws IncorrectOperationException { if (getParent() == null) { return this; } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/JoinNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/JoinNode.java index c3c7f67..8bdd986 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/JoinNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/JoinNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents join rule in parser. */ public class JoinNode extends ANTLRPsiNode { - public JoinNode(@Nonnull ASTNode node) { + public JoinNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/JoinSourceNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/JoinSourceNode.java index 74825f3..6d81809 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/JoinSourceNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/JoinSourceNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents join_source rule in parser. */ public class JoinSourceNode extends ANTLRPsiNode { - public JoinSourceNode(@Nonnull ASTNode node) { + public JoinSourceNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/JoinStreamNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/JoinStreamNode.java index 0b51807..c5d1019 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/JoinStreamNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/JoinStreamNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents join_stream rule in parser. */ public class JoinStreamNode extends ANTLRPsiNode { - public JoinStreamNode(@Nonnull ASTNode node) { + public JoinStreamNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/LanguageNameNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/LanguageNameNode.java index 83dc550..f890fea 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/LanguageNameNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/LanguageNameNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents language_name rule in parser. */ public class LanguageNameNode extends ANTLRPsiNode { - public LanguageNameNode(@Nonnull ASTNode node) { + public LanguageNameNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/LeftSourceNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/LeftSourceNode.java index 189c70b..17fd0b8 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/LeftSourceNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/LeftSourceNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents left_source rule in parser. */ public class LeftSourceNode extends ANTLRPsiNode { - public LeftSourceNode(@Nonnull ASTNode node) { + public LeftSourceNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/LeftUnidirectionalJoinNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/LeftUnidirectionalJoinNode.java index 8a27c72..8d7b8d1 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/LeftUnidirectionalJoinNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/LeftUnidirectionalJoinNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents left_unidirectional_join rule in parser. */ public class LeftUnidirectionalJoinNode extends ANTLRPsiNode { - public LeftUnidirectionalJoinNode(@Nonnull ASTNode node) { + public LeftUnidirectionalJoinNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/MathOperationNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/MathOperationNode.java index 4cb9bfe..06ae0d9 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/MathOperationNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/MathOperationNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents math_operation rule in parser. */ public class MathOperationNode extends ANTLRPsiNode { - public MathOperationNode(@Nonnull ASTNode node) { + public MathOperationNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/NameNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/NameNode.java index b05fa80..0a75200 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/NameNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/NameNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents name rule in parser. */ public class NameNode extends ANTLRPsiNode { - public NameNode(@Nonnull ASTNode node) { + public NameNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/NullCheckNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/NullCheckNode.java index a12e588..de63aeb 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/NullCheckNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/NullCheckNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents null_check rule in parser. */ public class NullCheckNode extends ANTLRPsiNode { - public NullCheckNode(@Nonnull ASTNode node) { + public NullCheckNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/OnWithExpressionNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/OnWithExpressionNode.java index bfea985..933b18d 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/OnWithExpressionNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/OnWithExpressionNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents on_with_expression rule in parser. */ public class OnWithExpressionNode extends ANTLRPsiNode { - public OnWithExpressionNode(@Nonnull ASTNode node) { + public OnWithExpressionNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/OutputAttributeNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/OutputAttributeNode.java index dd56418..1cbe4eb 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/OutputAttributeNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/OutputAttributeNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents out_attribute rule in parser. */ public class OutputAttributeNode extends ANTLRPsiNode { - public OutputAttributeNode(@Nonnull ASTNode node) { + public OutputAttributeNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/OutputEventTypeNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/OutputEventTypeNode.java index 0b7146d..8af9d0c 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/OutputEventTypeNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/OutputEventTypeNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents output_event_type rule in parser. */ public class OutputEventTypeNode extends ANTLRPsiNode { - public OutputEventTypeNode(@Nonnull ASTNode node) { + public OutputEventTypeNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/OutputRateNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/OutputRateNode.java index dd34c8d..160f896 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/OutputRateNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/OutputRateNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents output_rate rule in parser. */ public class OutputRateNode extends ANTLRPsiNode { - public OutputRateNode(@Nonnull ASTNode node) { + public OutputRateNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/ParseNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/ParseNode.java index 0c1c09d..227fb72 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/ParseNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/ParseNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents parse rule in parser. */ public class ParseNode extends ANTLRPsiNode { - public ParseNode(@Nonnull ASTNode node) { + public ParseNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/PartitionNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/PartitionNode.java index 5f82bfa..9593ea0 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/PartitionNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/PartitionNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents partition rule in parser. */ public class PartitionNode extends ANTLRPsiNode { - public PartitionNode(@Nonnull ASTNode node) { + public PartitionNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/PartitionWithStreamNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/PartitionWithStreamNode.java index 1d616d2..724693e 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/PartitionWithStreamNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/PartitionWithStreamNode.java @@ -17,14 +17,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents partition_with_stream rule in parser. */ public class PartitionWithStreamNode extends ANTLRPsiNode { - public PartitionWithStreamNode(@Nonnull ASTNode node) { + public PartitionWithStreamNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/PerNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/PerNode.java index a9d17ed..f07b90c 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/PerNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/PerNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents per rule in parser. */ public class PerNode extends ANTLRPsiNode { - public PerNode(@Nonnull ASTNode node) { + public PerNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/PostWindowHandlerNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/PostWindowHandlerNode.java index c0e8a43..baee69e 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/PostWindowHandlerNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/PostWindowHandlerNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents post_window_handler rule in parser. */ public class PostWindowHandlerNode extends ANTLRPsiNode { - public PostWindowHandlerNode(@Nonnull ASTNode node) { + public PostWindowHandlerNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/PreWindowHandlerNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/PreWindowHandlerNode.java index 0e73338..9f0f9a0 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/PreWindowHandlerNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/PreWindowHandlerNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents pre_window_handler rule in parser. */ public class PreWindowHandlerNode extends ANTLRPsiNode { - public PreWindowHandlerNode(@Nonnull ASTNode node) { + public PreWindowHandlerNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/QueryInputNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/QueryInputNode.java index d84906c..59aef99 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/QueryInputNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/QueryInputNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents query_input rule in parser. */ public class QueryInputNode extends ANTLRPsiNode { - public QueryInputNode(@Nonnull ASTNode node) { + public QueryInputNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/QueryNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/QueryNode.java index 0341427..af174ee 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/QueryNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/QueryNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents query_node rule in parser. */ public class QueryNode extends ANTLRPsiNode { - public QueryNode(@Nonnull ASTNode node) { + public QueryNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/QueryOutputNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/QueryOutputNode.java index 43208f1..e057ce6 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/QueryOutputNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/QueryOutputNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents query_output rule in parser. */ public class QueryOutputNode extends ANTLRPsiNode { - public QueryOutputNode(@Nonnull ASTNode node) { + public QueryOutputNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/QuerySectionNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/QuerySectionNode.java index 419dabe..7d1bd0a 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/QuerySectionNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/QuerySectionNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents query_section rule in parser. */ public class QuerySectionNode extends ANTLRPsiNode { - public QuerySectionNode(@Nonnull ASTNode node) { + public QuerySectionNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/RightSourceNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/RightSourceNode.java index c1b633b..25e2b4b 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/RightSourceNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/RightSourceNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents right_source rule in parser. */ public class RightSourceNode extends ANTLRPsiNode { - public RightSourceNode(@Nonnull ASTNode node) { + public RightSourceNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/RightUnidirectionalOrNormalJoinNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/RightUnidirectionalOrNormalJoinNode.java index 91e2fb5..a2f07f8 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/RightUnidirectionalOrNormalJoinNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/RightUnidirectionalOrNormalJoinNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents right_unidirectional_or_normal_join rule in parser. */ public class RightUnidirectionalOrNormalJoinNode extends ANTLRPsiNode { - public RightUnidirectionalOrNormalJoinNode(@Nonnull ASTNode node) { + public RightUnidirectionalOrNormalJoinNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/SiddhiAppNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/SiddhiAppNode.java index f312998..660d232 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/SiddhiAppNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/SiddhiAppNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents siddhi_app rule in parser. */ public class SiddhiAppNode extends ANTLRPsiNode { - public SiddhiAppNode(@Nonnull ASTNode node) { + public SiddhiAppNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/SiddhiFile.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/SiddhiFile.java index 1a0648a..6092749 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/SiddhiFile.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/SiddhiFile.java @@ -22,22 +22,21 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiNamedElement; import org.antlr.jetbrains.adaptor.psi.ScopeNode; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.SiddhiFileType; import org.wso2.siddhi.plugins.idea.SiddhiLanguage; -import javax.annotation.Nonnull; - /** * PsiFileBase which represents Siddhi File. */ public class SiddhiFile extends PsiFileBase implements ScopeNode { - public SiddhiFile(@Nonnull FileViewProvider viewProvider) { + public SiddhiFile(@NotNull FileViewProvider viewProvider) { super(viewProvider, SiddhiLanguage.INSTANCE); } - @Nonnull + @NotNull @Override public FileType getFileType() { return SiddhiFileType.INSTANCE; diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/SignedIntValueNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/SignedIntValueNode.java index 6671436..83bad1f 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/SignedIntValueNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/SignedIntValueNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents signed_int_value rule in parser. */ public class SignedIntValueNode extends ANTLRPsiNode { - public SignedIntValueNode(@Nonnull ASTNode node) { + public SignedIntValueNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/SourceNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/SourceNode.java index 96ceef5..91da881 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/SourceNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/SourceNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents source rule in parser. */ public class SourceNode extends ANTLRPsiNode { - public SourceNode(@Nonnull ASTNode node) { + public SourceNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/StandardStreamNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/StandardStreamNode.java index 0686e1f..b450b33 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/StandardStreamNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/StandardStreamNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents standard_stream rule in parser. */ public class StandardStreamNode extends ANTLRPsiNode { - public StandardStreamNode(@Nonnull ASTNode node) { + public StandardStreamNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/StartPatternNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/StartPatternNode.java index 5b4b9bd..183b0db 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/StartPatternNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/StartPatternNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents start_pattern rule in parser. */ public class StartPatternNode extends ANTLRPsiNode { - public StartPatternNode(@Nonnull ASTNode node) { + public StartPatternNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/StreamDefinitionNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/StreamDefinitionNode.java index 44c595a..b1ee5fe 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/StreamDefinitionNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/StreamDefinitionNode.java @@ -20,19 +20,18 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiNamedElement; import org.antlr.jetbrains.adaptor.psi.IdentifierDefSubtree; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.SiddhiTypes; import org.wso2.siddhi.plugins.idea.psi.scopes.ParameterContainer; import org.wso2.siddhi.plugins.idea.psi.scopes.TopLevelDefinition; -import javax.annotation.Nonnull; - /** * Represents stream_definition rule in parser. */ public class StreamDefinitionNode extends IdentifierDefSubtree implements TopLevelDefinition, ParameterContainer { - public StreamDefinitionNode(@Nonnull ASTNode node) { + public StreamDefinitionNode(@NotNull ASTNode node) { super(node, SiddhiTypes.IDENTIFIER); } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/StreamFunctionNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/StreamFunctionNode.java index 22efcec..27a0192 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/StreamFunctionNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/StreamFunctionNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents stream_function rule in parser. */ public class StreamFunctionNode extends ANTLRPsiNode { - public StreamFunctionNode(@Nonnull ASTNode node) { + public StreamFunctionNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/StreamIdNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/StreamIdNode.java index 2c9d3a6..6afd6ea 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/StreamIdNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/StreamIdNode.java @@ -18,16 +18,15 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.IdentifierDefSubtree; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.SiddhiTypes; -import javax.annotation.Nonnull; - /** * ANTLRPsiNode which represents stream_id rule in parser. */ public class StreamIdNode extends IdentifierDefSubtree { - public StreamIdNode(@Nonnull ASTNode node) { + public StreamIdNode(@NotNull ASTNode node) { super(node, SiddhiTypes.IDENTIFIER); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/StringValueNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/StringValueNode.java index 2a44345..9f35b97 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/StringValueNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/StringValueNode.java @@ -17,14 +17,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents string_value rule in parser. */ public class StringValueNode extends ANTLRPsiNode { - public StringValueNode(@Nonnull ASTNode node) { + public StringValueNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/TableDefinitionNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/TableDefinitionNode.java index 232dba9..bd19c4a 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/TableDefinitionNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/TableDefinitionNode.java @@ -20,18 +20,17 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiNamedElement; import org.antlr.jetbrains.adaptor.psi.IdentifierDefSubtree; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.SiddhiTypes; import org.wso2.siddhi.plugins.idea.psi.scopes.ParameterContainer; import org.wso2.siddhi.plugins.idea.psi.scopes.TopLevelDefinition; -import javax.annotation.Nonnull; - /** * Represents table_definition rule in parser. */ public class TableDefinitionNode extends IdentifierDefSubtree implements TopLevelDefinition, ParameterContainer { - public TableDefinitionNode(@Nonnull ASTNode node) { + public TableDefinitionNode(@NotNull ASTNode node) { super(node, SiddhiTypes.IDENTIFIER); } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/TargetNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/TargetNode.java index 173104f..5009340 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/TargetNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/TargetNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents target rule in parser. */ public class TargetNode extends ANTLRPsiNode { - public TargetNode(@Nonnull ASTNode node) { + public TargetNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/TimeValueNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/TimeValueNode.java index 5b8dd38..033765f 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/TimeValueNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/TimeValueNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents time_value rule in parser. */ public class TimeValueNode extends ANTLRPsiNode { - public TimeValueNode(@Nonnull ASTNode node) { + public TimeValueNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/TriggerDefinitionNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/TriggerDefinitionNode.java index 87d6250..10c7196 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/TriggerDefinitionNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/TriggerDefinitionNode.java @@ -20,18 +20,17 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiNamedElement; import org.antlr.jetbrains.adaptor.psi.IdentifierDefSubtree; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.SiddhiTypes; import org.wso2.siddhi.plugins.idea.psi.scopes.ParameterContainer; import org.wso2.siddhi.plugins.idea.psi.scopes.TopLevelDefinition; -import javax.annotation.Nonnull; - /** * Represents trigger_definition rule in parser. */ public class TriggerDefinitionNode extends IdentifierDefSubtree implements TopLevelDefinition, ParameterContainer { - public TriggerDefinitionNode(@Nonnull ASTNode node) { + public TriggerDefinitionNode(@NotNull ASTNode node) { super(node, SiddhiTypes.IDENTIFIER); } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/TriggerNameNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/TriggerNameNode.java index 5761e28..c6cd616 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/TriggerNameNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/TriggerNameNode.java @@ -19,14 +19,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents trigger_name rule in parser. */ public class TriggerNameNode extends ANTLRPsiNode { - public TriggerNameNode(@Nonnull ASTNode node) { + public TriggerNameNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/UpdateOrInsertIntoNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/UpdateOrInsertIntoNode.java index 77b9e37..2a53f43 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/UpdateOrInsertIntoNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/UpdateOrInsertIntoNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents update_or_insert_into rule in parser. */ public class UpdateOrInsertIntoNode extends ANTLRPsiNode { - public UpdateOrInsertIntoNode(@Nonnull ASTNode node) { + public UpdateOrInsertIntoNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/UpdateTableNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/UpdateTableNode.java index 499c366..415f3e2 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/UpdateTableNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/UpdateTableNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents update_table rule in parser. */ public class UpdateTableNode extends ANTLRPsiNode { - public UpdateTableNode(@Nonnull ASTNode node) { + public UpdateTableNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/WindowDefinitionNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/WindowDefinitionNode.java index 5f0837f..5cf1978 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/WindowDefinitionNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/WindowDefinitionNode.java @@ -20,18 +20,17 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiNamedElement; import org.antlr.jetbrains.adaptor.psi.IdentifierDefSubtree; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.SiddhiTypes; import org.wso2.siddhi.plugins.idea.psi.scopes.ParameterContainer; import org.wso2.siddhi.plugins.idea.psi.scopes.TopLevelDefinition; -import javax.annotation.Nonnull; - /** * Represents window_definition rule in parser. */ public class WindowDefinitionNode extends IdentifierDefSubtree implements TopLevelDefinition, ParameterContainer { - public WindowDefinitionNode(@Nonnull ASTNode node) { + public WindowDefinitionNode(@NotNull ASTNode node) { super(node, SiddhiTypes.IDENTIFIER); } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/WindowNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/WindowNode.java index 6e7d983..c98793b 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/WindowNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/WindowNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents window rule in parser. */ public class WindowNode extends ANTLRPsiNode { - public WindowNode(@Nonnull ASTNode node) { + public WindowNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/WithinTimeRangeNode.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/WithinTimeRangeNode.java index 4db9169..054d08f 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/WithinTimeRangeNode.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/WithinTimeRangeNode.java @@ -18,14 +18,13 @@ import com.intellij.lang.ASTNode; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ANTLRPsiNode which represents within_time_range rule in parser. */ public class WithinTimeRangeNode extends ANTLRPsiNode { - public WithinTimeRangeNode(@Nonnull ASTNode node) { + public WithinTimeRangeNode(@NotNull ASTNode node) { super(node); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/references/AttributeNameReference.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/references/AttributeNameReference.java index 5f31ce2..22b52bf 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/references/AttributeNameReference.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/references/AttributeNameReference.java @@ -22,6 +22,7 @@ import com.intellij.psi.impl.source.tree.LeafPsiElement; import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.PsiTreeUtil; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.SiddhiTypes; import org.wso2.siddhi.plugins.idea.completion.SiddhiCompletionUtils; @@ -35,14 +36,13 @@ import java.util.Arrays; import java.util.List; -import javax.annotation.Nonnull; /** * Provides element reference for attributes. */ public class AttributeNameReference extends SiddhiElementReference { - public AttributeNameReference(@Nonnull IdentifierPSINode element) { + public AttributeNameReference(@NotNull IdentifierPSINode element) { super(element); } @@ -52,7 +52,7 @@ public PsiElement resolve() { return super.resolve(); } - @Nonnull + @NotNull @Override public Object[] getVariants() { // TODO: resolve attribute types for streams created in the output stream in query output diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/references/SiddhiElementReference.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/references/SiddhiElementReference.java index 2747a0b..39e47b8 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/references/SiddhiElementReference.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/references/SiddhiElementReference.java @@ -21,17 +21,16 @@ import com.intellij.psi.PsiReferenceBase; import com.intellij.util.IncorrectOperationException; import org.antlr.jetbrains.adaptor.psi.ScopeNode; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.psi.IdentifierPSINode; -import javax.annotation.Nonnull; - /** * Provides element references. */ public abstract class SiddhiElementReference extends PsiReferenceBase { - public SiddhiElementReference(@Nonnull IdentifierPSINode element) { + public SiddhiElementReference(@NotNull IdentifierPSINode element) { /* WARNING: You must send up the text range or you get this error: "Cannot find manipulator for PsiElement(ID) in org.antlr.jetbrains.sample.SampleElementRef"... when you click on an identifier. During rename you get this diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/references/StreamIdReference.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/references/StreamIdReference.java index e701e32..75d0c71 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/references/StreamIdReference.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/references/StreamIdReference.java @@ -21,6 +21,7 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.impl.source.tree.LeafPsiElement; import com.intellij.psi.util.PsiTreeUtil; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.SiddhiTypes; import org.wso2.siddhi.plugins.idea.completion.SiddhiCompletionUtils; @@ -35,14 +36,13 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.annotation.Nonnull; /** * Provides element reference for stream ids. */ public class StreamIdReference extends SiddhiElementReference { - public StreamIdReference(@Nonnull IdentifierPSINode element) { + public StreamIdReference(@NotNull IdentifierPSINode element) { super(element); } @@ -52,7 +52,7 @@ public PsiElement resolve() { return super.resolve(); } - @Nonnull + @NotNull @Override public Object[] getVariants() { IdentifierPSINode identifier = getElement(); diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/psi/references/TargetReference.java b/src/main/java/org/wso2/siddhi/plugins/idea/psi/references/TargetReference.java index 3a788f6..2f53faa 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/psi/references/TargetReference.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/psi/references/TargetReference.java @@ -20,6 +20,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiTreeUtil; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.completion.SiddhiCompletionUtils; import org.wso2.siddhi.plugins.idea.psi.IdentifierPSINode; @@ -30,14 +31,13 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.annotation.Nonnull; /** * Provides element reference for target. */ public class TargetReference extends SiddhiElementReference { - public TargetReference(@Nonnull IdentifierPSINode element) { + public TargetReference(@NotNull IdentifierPSINode element) { super(element); } @@ -50,7 +50,7 @@ public PsiElement resolve() { /** * In this method only the table names are filtered and make lookups elements. **/ - @Nonnull + @NotNull @Override public Object[] getVariants() { IdentifierPSINode identifier = getElement(); diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/SiddhiConsoleFilter.java b/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/SiddhiConsoleFilter.java index 873dc13..531eb22 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/SiddhiConsoleFilter.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/SiddhiConsoleFilter.java @@ -33,13 +33,13 @@ import com.intellij.util.ObjectUtils; import com.intellij.util.PathUtil; import com.intellij.util.containers.ContainerUtil; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.Collection; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.Nonnull; /** * Defines console filter for siddhi. @@ -50,7 +50,7 @@ public class SiddhiConsoleFilter implements Filter { "(?=[:\\s]|$).*"); private static final Pattern SIDDHI_FILE_PATTERN = Pattern.compile("\\((\\w+\\.siddhi)\\)"); - @Nonnull + @NotNull private final Project myProject; @Nullable private final Module myModule; @@ -58,11 +58,11 @@ public class SiddhiConsoleFilter implements Filter { private final String myWorkingDirectoryUrl; @SuppressWarnings("unused") //used by pico container - public SiddhiConsoleFilter(@Nonnull Project project) { + public SiddhiConsoleFilter(@NotNull Project project) { this(project, null, null); } - public SiddhiConsoleFilter(@Nonnull Project project, @Nullable Module module, + public SiddhiConsoleFilter(@NotNull Project project, @Nullable Module module, @Nullable String workingDirectoryUrl) { myProject = project; myModule = module; @@ -71,7 +71,7 @@ public SiddhiConsoleFilter(@Nonnull Project project, @Nullable Module module, } @Override - public Result applyFilter(@Nonnull String line, int entireLength) { + public Result applyFilter(@NotNull String line, int entireLength) { Matcher matcher = MESSAGE_PATTERN.matcher(line); if (!matcher.find()) { Matcher fileMatcher = SIDDHI_FILE_PATTERN.matcher(line); @@ -137,16 +137,16 @@ public Result applyFilter(@Nonnull String line, int entireLength) { return createResult(line, entireLength, startOffset, endOffset, lineNumber, columnNumber, virtualFile); } - @Nonnull - private Result createResult(@Nonnull String line, int entireLength, int startOffset, int endOffset, int lineNumber, - int columnNumber, @Nonnull VirtualFile virtualFile) { + @NotNull + private Result createResult(@NotNull String line, int entireLength, int startOffset, int endOffset, int lineNumber, + int columnNumber, @NotNull VirtualFile virtualFile) { HyperlinkInfo hyperlinkInfo = new OpenFileHyperlinkInfo(myProject, virtualFile, lineNumber, columnNumber); int lineStart = entireLength - line.length(); return new Result(lineStart + startOffset, lineStart + endOffset, hyperlinkInfo); } @Nullable - private VirtualFile findSingleFile(@Nonnull String fileName) { + private VirtualFile findSingleFile(@NotNull String fileName) { if (PathUtil.isValidFileName(fileName)) { Collection files = FilenameIndex.getVirtualFilesByName(myProject, fileName, GlobalSearchScope.allScope(myProject)); @@ -158,7 +158,7 @@ private VirtualFile findSingleFile(@Nonnull String fileName) { } @Nullable - private VirtualFile findInSiddhiPath(@Nonnull String fileName) { + private VirtualFile findInSiddhiPath(@NotNull String fileName) { return null; } @@ -170,12 +170,12 @@ public static class SiddhiGetHyperlinkInfo implements HyperlinkInfo { private final String myPackageName; private final Module myModule; - public SiddhiGetHyperlinkInfo(@Nonnull String packageName, @Nonnull Module module) { + public SiddhiGetHyperlinkInfo(@NotNull String packageName, @NotNull Module module) { myPackageName = packageName; myModule = module; } - @Nonnull + @NotNull public String getPackageName() { return myPackageName; } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/SiddhiDebugger.java b/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/SiddhiDebugger.java index 668e386..8f8ceaa 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/SiddhiDebugger.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/SiddhiDebugger.java @@ -32,6 +32,7 @@ import com.intellij.xdebugger.XDebugProcessStarter; import com.intellij.xdebugger.XDebugSession; import com.intellij.xdebugger.XDebuggerManager; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.debugger.SiddhiDebugProcess; import org.wso2.siddhi.plugins.idea.debugger.SiddhiWebSocketConnector; @@ -42,7 +43,6 @@ import java.io.IOException; import java.net.ServerSocket; -import javax.annotation.Nonnull; /** * Creates a debugger for siddhi. @@ -51,21 +51,21 @@ public class SiddhiDebugger extends GenericProgramRunner { private static final String ID = "SiddhiDebugger"; - @Nonnull + @NotNull @Override public String getRunnerId() { return ID; } @Override - public boolean canRun(@Nonnull String executorId, @Nonnull RunProfile profile) { + public boolean canRun(@NotNull String executorId, @NotNull RunProfile profile) { return DefaultDebugExecutor.EXECUTOR_ID.equals(executorId) && profile instanceof SiddhiRunConfigurationBase; } @Nullable @Override - protected RunContentDescriptor doExecute(@Nonnull RunProfileState state, - @Nonnull ExecutionEnvironment env) throws ExecutionException { + protected RunContentDescriptor doExecute(@NotNull RunProfileState state, + @NotNull ExecutionEnvironment env) throws ExecutionException { if (state instanceof SiddhiApplicationRunningState) { FileDocumentManager.getInstance().saveAllDocuments(); SiddhiHistoryProcessListener historyProcessListener = new SiddhiHistoryProcessListener(); @@ -78,9 +78,9 @@ protected RunContentDescriptor doExecute(@Nonnull RunProfileState state, return XDebuggerManager.getInstance(env.getProject()).startSession(env, new XDebugProcessStarter() { - @Nonnull + @NotNull @Override - public XDebugProcess start(@Nonnull XDebugSession session) throws ExecutionException { + public XDebugProcess start(@NotNull XDebugSession session) throws ExecutionException { // Get the host address. String address = NetUtils.getLocalHostString() + ":" + port; // Create a new connector. This will be used to communicate with the debugger. @@ -97,9 +97,9 @@ public XDebugProcess start(@Nonnull XDebugSession session) throws ExecutionExcep FileDocumentManager.getInstance().saveAllDocuments(); return XDebuggerManager.getInstance(env.getProject()).startSession(env, new XDebugProcessStarter() { - @Nonnull + @NotNull @Override - public XDebugProcess start(@Nonnull XDebugSession session) throws ExecutionException { + public XDebugProcess start(@NotNull XDebugSession session) throws ExecutionException { // Get the remote host address. String address = getRemoteAddress(env); if (address == null || address.isEmpty()) { @@ -114,7 +114,7 @@ public XDebugProcess start(@Nonnull XDebugSession session) throws ExecutionExcep return null; } - private ExecutionResult getExecutionResults(@Nonnull RunProfileState state, @Nonnull ExecutionEnvironment env) + private ExecutionResult getExecutionResults(@NotNull RunProfileState state, @NotNull ExecutionEnvironment env) throws ExecutionException { // Start debugger. ExecutionResult executionResult = state.execute(env.getExecutor(), new SiddhiDebugger()); @@ -125,7 +125,7 @@ private ExecutionResult getExecutionResults(@Nonnull RunProfileState state, @Non } @Nullable - private String getRemoteAddress(@Nonnull ExecutionEnvironment env) { + private String getRemoteAddress(@NotNull ExecutionEnvironment env) { RunnerAndConfigurationSettings runnerAndConfigurationSettings = env.getRunnerAndConfigurationSettings(); if (runnerAndConfigurationSettings == null) { return null; diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/SiddhiRunConfiguration.java b/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/SiddhiRunConfiguration.java index f724cc5..f623a5a 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/SiddhiRunConfiguration.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/SiddhiRunConfiguration.java @@ -27,10 +27,9 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.PsiManager; import org.jdom.Element; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.psi.SiddhiFile; -import javax.annotation.Nonnull; - /** * Defines run configuration with main. * @param @@ -43,12 +42,12 @@ public abstract class SiddhiRunConfiguration exten private static final String REMOTE_DEBUGGING_HOST_ATTRIBUTE_NAME = "remoteDebuggingHost"; private static final String REMOTE_DEBUGGING_PORT_ATTRIBUTE_NAME = "remoteDebuggingPort"; - @Nonnull + @NotNull private String myFilePath = ""; private String myInputFilePath = ""; - @Nonnull + @NotNull private String remoteDebugHost = ""; - @Nonnull + @NotNull private String remoteDebugPort = ""; public SiddhiRunConfiguration(String name, SiddhiModuleBasedConfiguration configurationModule, @@ -58,7 +57,7 @@ public SiddhiRunConfiguration(String name, SiddhiModuleBasedConfiguration config } @Override - public void readExternal(@Nonnull Element element) throws InvalidDataException { + public void readExternal(@NotNull Element element) throws InvalidDataException { super.readExternal(element); myFilePath = StringUtil.notNullize(JDOMExternalizerUtil.getFirstChildValueAttribute(element, FILE_PATH_ATTRIBUTE_NAME)); @@ -94,12 +93,12 @@ protected void checkBaseConfiguration() throws RuntimeConfigurationException { super.checkConfiguration(); } - @Nonnull + @NotNull public String getFilePath() { return myFilePath; } - public void setFilePath(@Nonnull String filePath) { + public void setFilePath(@NotNull String filePath) { myFilePath = filePath; } @@ -107,25 +106,25 @@ public String getInputFilePath() { return myInputFilePath; } - public void setInputFilePath(@Nonnull String inputFilePath) { + public void setInputFilePath(@NotNull String inputFilePath) { myInputFilePath = inputFilePath; } - @Nonnull + @NotNull public String getRemoteDebugHost() { return remoteDebugHost; } - public void setRemoteDebugHost(@Nonnull String remoteDebugHost) { + public void setRemoteDebugHost(@NotNull String remoteDebugHost) { this.remoteDebugHost = remoteDebugHost; } - @Nonnull + @NotNull public String getRemoteDebugPort() { return remoteDebugPort; } - public void setRemoteDebugPort(@Nonnull String remoteDebugPort) { + public void setRemoteDebugPort(@NotNull String remoteDebugPort) { this.remoteDebugPort = remoteDebugPort; } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/SiddhiRunConfigurationBase.java b/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/SiddhiRunConfigurationBase.java index 96718ea..638222c 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/SiddhiRunConfigurationBase.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/SiddhiRunConfigurationBase.java @@ -40,13 +40,13 @@ import com.intellij.util.PathUtil; import com.intellij.util.containers.ContainerUtil; import org.jdom.Element; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.sdk.SiddhiSdkService; import org.wso2.siddhi.plugins.idea.sdk.SiddhiSdkUtil; import java.util.Collection; import java.util.Map; -import javax.annotation.Nonnull; /** * Provides run configuration base for siddhi. @@ -61,14 +61,14 @@ public abstract class SiddhiRunConfigurationBase myCustomEnvironment = ContainerUtil.newHashMap(); private boolean myPassParentEnvironment = true; @@ -96,12 +96,12 @@ public SiddhiRunConfigurationBase(String name, SiddhiModuleBasedConfiguration co @Nullable @Override - public RunProfileState getState(@Nonnull Executor executor, @Nonnull ExecutionEnvironment environment) + public RunProfileState getState(@NotNull Executor executor, @NotNull ExecutionEnvironment environment) throws ExecutionException { return createRunningState(environment); } - @Nonnull + @NotNull @Override public Collection getValidModules() { return SiddhiSdkUtil.getSiddhiModules(getProject()); @@ -141,14 +141,14 @@ public void writeExternal(Element element) throws WriteExternalException { } } - protected void addNonEmptyElement(@Nonnull Element element, @Nonnull String attributeName, @Nullable String value) { + protected void addNonEmptyElement(@NotNull Element element, @NotNull String attributeName, @Nullable String value) { if (StringUtil.isNotEmpty(value)) { JDOMExternalizerUtil.addElementWithValueAttribute(element, attributeName, value); } } @Override - public void readExternal(@Nonnull Element element) throws InvalidDataException { + public void readExternal(@NotNull Element element) throws InvalidDataException { super.readExternal(element); readModule(element); mySiddhiParams = StringUtil.notNullize(JDOMExternalizerUtil.getFirstChildValueAttribute(element, @@ -166,7 +166,7 @@ public void readExternal(@Nonnull Element element) throws InvalidDataException { myPassParentEnvironment = passEnvValue == null || Boolean.valueOf(passEnvValue); } - @Nonnull + @NotNull private RunningState createRunningState(ExecutionEnvironment env) throws ExecutionException { SiddhiModuleBasedConfiguration configuration = getConfigurationModule(); Module module = configuration.getModule(); @@ -177,7 +177,7 @@ private RunningState createRunningState(ExecutionEnvironment env) throws Executi } @Nullable - protected VirtualFile findFile(@Nonnull String filePath) { + protected VirtualFile findFile(@NotNull String filePath) { VirtualFile virtualFile = VirtualFileManager.getInstance().findFileByUrl(VfsUtilCore.pathToUrl(filePath)); if (virtualFile == null) { String path = FileUtil.join(getWorkingDirectory(), filePath); @@ -186,33 +186,33 @@ protected VirtualFile findFile(@Nonnull String filePath) { return virtualFile; } - @Nonnull + @NotNull protected abstract RunningState newRunningState(ExecutionEnvironment env, Module module); - @Nonnull + @NotNull public String getSiddhiToolParams() { return mySiddhiParams; } - @Nonnull + @NotNull public String getParams() { return myParams; } - public void setSiddhiParams(@Nonnull String params) { + public void setSiddhiParams(@NotNull String params) { mySiddhiParams = params; } - public void setParams(@Nonnull String params) { + public void setParams(@NotNull String params) { myParams = params; } - @Nonnull + @NotNull public Map getCustomEnvironment() { return myCustomEnvironment; } - public void setCustomEnvironment(@Nonnull Map customEnvironment) { + public void setCustomEnvironment(@NotNull Map customEnvironment) { myCustomEnvironment.clear(); myCustomEnvironment.putAll(customEnvironment); } @@ -225,17 +225,17 @@ public boolean isPassParentEnvironment() { return myPassParentEnvironment; } - @Nonnull + @NotNull public String getWorkingDirectory() { return myWorkingDirectory; } - @Nonnull + @NotNull public String getWorkingDirectoryUrl() { return VfsUtilCore.pathToUrl(myWorkingDirectory); } - public void setWorkingDirectory(@Nonnull String workingDirectory) { + public void setWorkingDirectory(@NotNull String workingDirectory) { myWorkingDirectory = workingDirectory; } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/SiddhiRunConfigurationProducerBase.java b/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/SiddhiRunConfigurationProducerBase.java index e64da15..a71ea42 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/SiddhiRunConfigurationProducerBase.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/SiddhiRunConfigurationProducerBase.java @@ -26,12 +26,11 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.psi.SiddhiFile; import org.wso2.siddhi.plugins.idea.runconfig.application.SiddhiApplicationConfiguration; -import javax.annotation.Nonnull; - /** * Provides run configuration producer base for siddhi. * @param @@ -39,12 +38,12 @@ public abstract class SiddhiRunConfigurationProducerBase extends RunConfigurationProducer implements Cloneable { - protected SiddhiRunConfigurationProducerBase(@Nonnull ConfigurationType configurationType) { + protected SiddhiRunConfigurationProducerBase(@NotNull ConfigurationType configurationType) { super(configurationType); } @Override - protected boolean setupConfigurationFromContext(@Nonnull T configuration, @Nonnull ConfigurationContext context, + protected boolean setupConfigurationFromContext(@NotNull T configuration, @NotNull ConfigurationContext context, Ref sourceElement) { PsiFile file = getFileFromContext(context); if (file == null) { @@ -79,11 +78,11 @@ protected boolean setupConfigurationFromContext(@Nonnull T configuration, @Nonnu return false; } - @Nonnull - protected abstract String getConfigurationName(@Nonnull PsiFile file); + @NotNull + protected abstract String getConfigurationName(@NotNull PsiFile file); @Override - public boolean isConfigurationFromContext(@Nonnull T configuration, ConfigurationContext context) { + public boolean isConfigurationFromContext(@NotNull T configuration, ConfigurationContext context) { SiddhiFile file = getFileFromContext(context); return file != null && FileUtil.pathsEqual(configuration.getFilePath(), file.getVirtualFile().getPath()); } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/SiddhiRunUtil.java b/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/SiddhiRunUtil.java index 0d28f81..971474c 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/SiddhiRunUtil.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/SiddhiRunUtil.java @@ -39,6 +39,7 @@ import com.intellij.psi.PsiManager; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.SiddhiConstants; import org.wso2.siddhi.plugins.idea.SiddhiFileType; @@ -46,7 +47,6 @@ import java.util.Collection; import java.util.Map; -import javax.annotation.Nonnull; /** * Utility class for siddhi run. @@ -78,12 +78,12 @@ static PsiElement getContextElement(@Nullable ConfigurationContext context) { return psiElement; } - public static void installSiddhiWithWorkingDirectoryChooser(Project project, @Nonnull TextFieldWithBrowseButton + public static void installSiddhiWithWorkingDirectoryChooser(Project project, @NotNull TextFieldWithBrowseButton fileField) { installWorkingDirectoryChooser(project, fileField); } - private static void installWorkingDirectoryChooser(@Nonnull Project project, @Nonnull ComponentWithBrowseButton + private static void installWorkingDirectoryChooser(@NotNull Project project, @NotNull ComponentWithBrowseButton field) { FileChooserDescriptor chooseDirectoryDescriptor = FileChooserDescriptorFactory.createSingleFolderDescriptor(); @@ -101,13 +101,13 @@ private static void installWorkingDirectoryChooser(@Nonnull Project project, @No } public static void installSiddhiWithSiddhiFileChooser(Project project, - @Nonnull TextFieldWithBrowseButton fileField) { + @NotNull TextFieldWithBrowseButton fileField) { installFileChooser(project, fileField, file -> isRunnableSiddhiFile(PsiManager.getInstance(project).findFile(file))); } public static void installSiddhiWithFileChooser(Project project, - @Nonnull TextFieldWithBrowseButton fileField) { + @NotNull TextFieldWithBrowseButton fileField) { installFileChooser(project, fileField, null); } @@ -123,7 +123,7 @@ private static boolean hasExecutionElements(PsiFile file) { return executionElementNodes.toArray().length > 0; } - private static void installFileChooser(@Nonnull Project project, @Nonnull ComponentWithBrowseButton field, + private static void installFileChooser(@NotNull Project project, @NotNull ComponentWithBrowseButton field, @Nullable Condition fileFilter) { FileChooserDescriptor chooseDirectoryDescriptor = FileChooserDescriptorFactory.createSingleFileDescriptor(SiddhiFileType.INSTANCE); @@ -141,8 +141,8 @@ private static void installFileChooser(@Nonnull Project project, @Nonnull Compon } } - public static void printSiddhiEnvVariables(@Nonnull GeneralCommandLine commandLine, - @Nonnull ProcessHandler handler) { + public static void printSiddhiEnvVariables(@NotNull GeneralCommandLine commandLine, + @NotNull ProcessHandler handler) { Map environment = commandLine.getEnvironment(); // Todo - Add SIDDHI_REPOSITORY handler.notifyTextAvailable("SIDDHI_REPOSITORY=" + StringUtil.nullize(environment.get @@ -150,7 +150,7 @@ public static void printSiddhiEnvVariables(@Nonnull GeneralCommandLine commandLi } @Nullable - public static VirtualFile findByPath(@Nonnull String path, @Nonnull Project project) { + public static VirtualFile findByPath(@NotNull String path, @NotNull Project project) { String systemIndependentPath = FileUtil.toSystemIndependentName(path); VirtualFile projectBaseDir = project.getBaseDir(); if (systemIndependentPath.isEmpty()) { diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/SiddhiRunner.java b/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/SiddhiRunner.java index 9a990bd..3d11ebe 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/SiddhiRunner.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/SiddhiRunner.java @@ -19,10 +19,9 @@ import com.intellij.execution.configurations.RunProfile; import com.intellij.execution.executors.DefaultRunExecutor; import com.intellij.execution.runners.DefaultProgramRunner; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.runconfig.application.SiddhiApplicationConfiguration; -import javax.annotation.Nonnull; - /** * Default program runner for siddhi. */ @@ -30,14 +29,14 @@ public class SiddhiRunner extends DefaultProgramRunner { private static final String ID = "SiddhiRunner"; - @Nonnull + @NotNull @Override public String getRunnerId() { return ID; } @Override - public boolean canRun(@Nonnull String executorId, @Nonnull RunProfile profile) { + public boolean canRun(@NotNull String executorId, @NotNull RunProfile profile) { // We don't need to run Siddhi Remote configuration, we only debug using it. return DefaultRunExecutor.EXECUTOR_ID.equals(executorId) && profile instanceof SiddhiApplicationConfiguration; diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/SiddhiRunningState.java b/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/SiddhiRunningState.java index 9c7ed00..5c1873b 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/SiddhiRunningState.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/SiddhiRunningState.java @@ -24,28 +24,27 @@ import com.intellij.execution.process.ProcessTerminatedListener; import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.openapi.module.Module; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.util.SiddhiExecutor; -import javax.annotation.Nonnull; - /** * Defines siddhi running state. * @param */ public abstract class SiddhiRunningState> extends CommandLineState { - @Nonnull + @NotNull private final Module myModule; - @Nonnull + @NotNull public T getConfiguration() { return myConfiguration; } - @Nonnull + @NotNull protected final T myConfiguration; - public SiddhiRunningState(@Nonnull ExecutionEnvironment env, @Nonnull Module module, @Nonnull T configuration) { + public SiddhiRunningState(@NotNull ExecutionEnvironment env, @NotNull Module module, @NotNull T configuration) { super(env); myModule = module; myConfiguration = configuration; @@ -53,7 +52,7 @@ public SiddhiRunningState(@Nonnull ExecutionEnvironment env, @Nonnull Module mod myConfiguration.getWorkingDirectoryUrl())); } - @Nonnull + @NotNull @Override protected ProcessHandler startProcess() throws ExecutionException { SiddhiExecutor executor = patchExecutor(createCommonExecutor()); @@ -65,14 +64,14 @@ protected ProcessHandler startProcess() throws ExecutionException { return handler; } - @Nonnull + @NotNull private SiddhiExecutor createCommonExecutor() { return SiddhiExecutor.in(myModule).withWorkDirectory(myConfiguration.getWorkingDirectory()) .withExtraEnvironment(myConfiguration.getCustomEnvironment()) .withPassParentEnvironment(myConfiguration.isPassParentEnvironment()); } - protected SiddhiExecutor patchExecutor(@Nonnull SiddhiExecutor executor) throws ExecutionException { + protected SiddhiExecutor patchExecutor(@NotNull SiddhiExecutor executor) throws ExecutionException { return executor; } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/application/SiddhiApplicationConfiguration.java b/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/application/SiddhiApplicationConfiguration.java index 763df84..b5897c0 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/application/SiddhiApplicationConfiguration.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/application/SiddhiApplicationConfiguration.java @@ -29,12 +29,11 @@ import com.intellij.openapi.util.WriteExternalException; import com.intellij.openapi.util.text.StringUtil; import org.jdom.Element; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.runconfig.SiddhiModuleBasedConfiguration; import org.wso2.siddhi.plugins.idea.runconfig.SiddhiRunConfiguration; import org.wso2.siddhi.plugins.idea.runconfig.ui.SiddhiApplicationSettingsEditor; -import javax.annotation.Nonnull; - /** * Defines siddhi application configuration. */ @@ -42,12 +41,12 @@ public class SiddhiApplicationConfiguration extends SiddhiRunConfiguration { public SiddhiApplicationConfiguration(Project project, String name, - @Nonnull ConfigurationType configurationType) { + @NotNull ConfigurationType configurationType) { super(name, new SiddhiModuleBasedConfiguration(project), configurationType.getConfigurationFactories()[0]); } @Override - public void readExternal(@Nonnull Element element) throws InvalidDataException { + public void readExternal(@NotNull Element element) throws InvalidDataException { super.readExternal(element); } @@ -56,23 +55,23 @@ public void writeExternal(Element element) throws WriteExternalException { super.writeExternal(element); } - @Nonnull + @NotNull @Override protected ModuleBasedConfiguration createInstance() { return new SiddhiApplicationConfiguration(getProject(), getName(), SiddhiApplicationRunConfigurationType.getInstance()); } - @Nonnull + @NotNull @Override public SettingsEditor getConfigurationEditor() { return new SiddhiApplicationSettingsEditor(getProject()); } - @Nonnull + @NotNull @Override - protected SiddhiApplicationRunningState newRunningState(@Nonnull ExecutionEnvironment env, - @Nonnull Module module) { + protected SiddhiApplicationRunningState newRunningState(@NotNull ExecutionEnvironment env, + @NotNull Module module) { return new SiddhiApplicationRunningState(env, module, this); } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/application/SiddhiApplicationRunConfigurationProducer.java b/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/application/SiddhiApplicationRunConfigurationProducer.java index 2547d3a..8b0c326 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/application/SiddhiApplicationRunConfigurationProducer.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/application/SiddhiApplicationRunConfigurationProducer.java @@ -17,10 +17,9 @@ package org.wso2.siddhi.plugins.idea.runconfig.application; import com.intellij.psi.PsiFile; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.runconfig.SiddhiRunConfigurationProducerBase; -import javax.annotation.Nonnull; - /** * Produce siddhi application run configuration. */ @@ -31,9 +30,9 @@ public SiddhiApplicationRunConfigurationProducer() { super(SiddhiApplicationRunConfigurationType.getInstance()); } - @Nonnull + @NotNull @Override - protected String getConfigurationName(@Nonnull PsiFile file) { + protected String getConfigurationName(@NotNull PsiFile file) { try { return file.getName(); } catch (NullPointerException e) { diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/application/SiddhiApplicationRunConfigurationType.java b/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/application/SiddhiApplicationRunConfigurationType.java index b575ed9..bd38433 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/application/SiddhiApplicationRunConfigurationType.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/application/SiddhiApplicationRunConfigurationType.java @@ -20,12 +20,11 @@ import com.intellij.execution.configurations.RunConfiguration; import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.project.Project; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.SiddhiConstants; import org.wso2.siddhi.plugins.idea.SiddhiIcons; import org.wso2.siddhi.plugins.idea.runconfig.SiddhiConfigurationFactoryBase; -import javax.annotation.Nonnull; - /** * Defines sidddhi application run configuration type. */ @@ -36,14 +35,14 @@ public SiddhiApplicationRunConfigurationType() { "Siddhi Application Run Configuration", SiddhiIcons.APPLICATION_RUN); addFactory(new SiddhiConfigurationFactoryBase(this) { @Override - @Nonnull - public RunConfiguration createTemplateConfiguration(@Nonnull Project project) { + @NotNull + public RunConfiguration createTemplateConfiguration(@NotNull Project project) { return new SiddhiApplicationConfiguration(project, SiddhiConstants.SIDDHI, getInstance()); } }); } - @Nonnull + @NotNull public static SiddhiApplicationRunConfigurationType getInstance() { return Extensions.findExtension(CONFIGURATION_TYPE_EP, SiddhiApplicationRunConfigurationType.class); } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/application/SiddhiApplicationRunningState.java b/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/application/SiddhiApplicationRunningState.java index 2529935..4a2a7e3 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/application/SiddhiApplicationRunningState.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/application/SiddhiApplicationRunningState.java @@ -23,13 +23,12 @@ import com.intellij.execution.process.ProcessHandler; import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.openapi.module.Module; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.runconfig.SiddhiRunningState; import org.wso2.siddhi.plugins.idea.util.SiddhiExecutor; import org.wso2.siddhi.plugins.idea.util.SiddhiHistoryProcessListener; -import javax.annotation.Nonnull; - /** * Defines siddhi application running state. */ @@ -39,12 +38,12 @@ public class SiddhiApplicationRunningState extends SiddhiRunningState getConfigurationEditor() { return new SiddhiRemoteSettingsEditor(getProject()); } - @Nonnull + @NotNull @Override - protected SiddhiRemoteRunningState newRunningState(@Nonnull ExecutionEnvironment env, @Nonnull Module module) { + protected SiddhiRemoteRunningState newRunningState(@NotNull ExecutionEnvironment env, @NotNull Module module) { return new SiddhiRemoteRunningState(env, module, this); } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/remote/SiddhiRemoteRunConfigurationProducer.java b/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/remote/SiddhiRemoteRunConfigurationProducer.java index 9d8f02d..cedad34 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/remote/SiddhiRemoteRunConfigurationProducer.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/remote/SiddhiRemoteRunConfigurationProducer.java @@ -17,10 +17,9 @@ package org.wso2.siddhi.plugins.idea.runconfig.remote; import com.intellij.psi.PsiFile; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.runconfig.SiddhiRunConfigurationProducerBase; -import javax.annotation.Nonnull; - /** * Produce siddhi remote run configuration. */ @@ -31,9 +30,9 @@ public SiddhiRemoteRunConfigurationProducer() { super(SiddhiRemoteRunConfigurationType.getInstance()); } - @Nonnull + @NotNull @Override - protected String getConfigurationName(@Nonnull PsiFile file) { + protected String getConfigurationName(@NotNull PsiFile file) { try { return file.getName(); } catch (NullPointerException e) { diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/remote/SiddhiRemoteRunConfigurationType.java b/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/remote/SiddhiRemoteRunConfigurationType.java index 1c613b4..be8ebf2 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/remote/SiddhiRemoteRunConfigurationType.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/remote/SiddhiRemoteRunConfigurationType.java @@ -20,12 +20,11 @@ import com.intellij.execution.configurations.RunConfiguration; import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.project.Project; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.SiddhiConstants; import org.wso2.siddhi.plugins.idea.SiddhiIcons; import org.wso2.siddhi.plugins.idea.runconfig.SiddhiConfigurationFactoryBase; -import javax.annotation.Nonnull; - /** * Defines siddhi remote run configuration type. */ @@ -38,14 +37,14 @@ public SiddhiRemoteRunConfigurationType() { addFactory(new SiddhiConfigurationFactoryBase(this) { @Override - @Nonnull - public RunConfiguration createTemplateConfiguration(@Nonnull Project project) { + @NotNull + public RunConfiguration createTemplateConfiguration(@NotNull Project project) { return new SiddhiRemoteConfiguration(project, SiddhiConstants.SIDDHI, getInstance()); } }); } - @Nonnull + @NotNull public static SiddhiRemoteRunConfigurationType getInstance() { return Extensions.findExtension(CONFIGURATION_TYPE_EP, SiddhiRemoteRunConfigurationType.class); } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/remote/SiddhiRemoteRunningState.java b/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/remote/SiddhiRemoteRunningState.java index 3798d5d..96ee42c 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/remote/SiddhiRemoteRunningState.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/remote/SiddhiRemoteRunningState.java @@ -18,17 +18,16 @@ import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.openapi.module.Module; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.runconfig.SiddhiRunningState; -import javax.annotation.Nonnull; - /** * Defines siddhi remote running state. */ public class SiddhiRemoteRunningState extends SiddhiRunningState { - SiddhiRemoteRunningState(@Nonnull ExecutionEnvironment env, @Nonnull Module module, - @Nonnull SiddhiRemoteConfiguration configuration) { + SiddhiRemoteRunningState(@NotNull ExecutionEnvironment env, @NotNull Module module, + @NotNull SiddhiRemoteConfiguration configuration) { super(env, module, configuration); } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/ui/SiddhiApplicationSettingsEditor.java b/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/ui/SiddhiApplicationSettingsEditor.java index 2d08b4c..007e908 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/ui/SiddhiApplicationSettingsEditor.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/ui/SiddhiApplicationSettingsEditor.java @@ -23,10 +23,10 @@ import com.intellij.openapi.ui.LabeledComponent; import com.intellij.openapi.ui.TextFieldWithBrowseButton; import com.intellij.ui.RawCommandLineEditor; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.runconfig.SiddhiRunUtil; import org.wso2.siddhi.plugins.idea.runconfig.application.SiddhiApplicationConfiguration; -import javax.annotation.Nonnull; import javax.swing.JComponent; import javax.swing.JPanel; @@ -51,7 +51,7 @@ public SiddhiApplicationSettingsEditor(Project project) { } @Override - protected void resetEditorFrom(@Nonnull SiddhiApplicationConfiguration configuration) { + protected void resetEditorFrom(@NotNull SiddhiApplicationConfiguration configuration) { myFileField.getComponent().setText(configuration.getFilePath()); myEventInputFile.getComponent().setText(configuration.getInputFilePath()); @@ -64,7 +64,7 @@ protected void resetEditorFrom(@Nonnull SiddhiApplicationConfiguration configura } @Override - protected void applyEditorTo(@Nonnull SiddhiApplicationConfiguration configuration) + protected void applyEditorTo(@NotNull SiddhiApplicationConfiguration configuration) throws ConfigurationException { configuration.setFilePath(myFileField.getComponent().getText()); configuration.setInputFilePath(myEventInputFile.getComponent().getText()); @@ -77,7 +77,7 @@ protected void applyEditorTo(@Nonnull SiddhiApplicationConfiguration configurati myWorkingDirectoryField.setVisible(true); } - @Nonnull + @NotNull @Override protected JComponent createEditor() { return myPanel; diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/ui/SiddhiRemoteSettingsEditor.java b/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/ui/SiddhiRemoteSettingsEditor.java index 7e22aa0..90670e8 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/ui/SiddhiRemoteSettingsEditor.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/runconfig/ui/SiddhiRemoteSettingsEditor.java @@ -24,10 +24,10 @@ import com.intellij.openapi.ui.TextFieldWithBrowseButton; import com.intellij.ui.EditorTextField; import com.intellij.ui.RawCommandLineEditor; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.runconfig.SiddhiRunUtil; import org.wso2.siddhi.plugins.idea.runconfig.remote.SiddhiRemoteConfiguration; -import javax.annotation.Nonnull; import javax.swing.JComponent; import javax.swing.JLabel; import javax.swing.JPanel; @@ -54,7 +54,7 @@ public SiddhiRemoteSettingsEditor(Project project) { } @Override - protected void resetEditorFrom(@Nonnull SiddhiRemoteConfiguration configuration) { + protected void resetEditorFrom(@NotNull SiddhiRemoteConfiguration configuration) { myFileField.getComponent().setText(configuration.getFilePath()); myModulesComboBox.getComponent().setModules(configuration.getValidModules()); myModulesComboBox.getComponent().setSelectedModule(configuration.getConfigurationModule().getModule()); @@ -67,7 +67,7 @@ protected void resetEditorFrom(@Nonnull SiddhiRemoteConfiguration configuration) } @Override - protected void applyEditorTo(@Nonnull SiddhiRemoteConfiguration configuration) + protected void applyEditorTo(@NotNull SiddhiRemoteConfiguration configuration) throws ConfigurationException { configuration.setFilePath(myFileField.getComponent().getText()); configuration.setModule(myModulesComboBox.getComponent().getSelectedModule()); @@ -78,7 +78,7 @@ protected void applyEditorTo(@Nonnull SiddhiRemoteConfiguration configuration) configuration.setRemoteDebugPort(myPort.getComponent().getText().trim()); } - @Nonnull + @NotNull @Override protected JComponent createEditor() { return myPanel; diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/sdk/SiddhiEnvironmentUtil.java b/src/main/java/org/wso2/siddhi/plugins/idea/sdk/SiddhiEnvironmentUtil.java index 875dc0a..a68421a 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/sdk/SiddhiEnvironmentUtil.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/sdk/SiddhiEnvironmentUtil.java @@ -21,11 +21,10 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.util.EnvironmentUtil; import com.intellij.util.PathUtil; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.SiddhiConstants; -import javax.annotation.Nonnull; - /** * Defines utility methods related to siddhi environment. */ @@ -34,8 +33,8 @@ public class SiddhiEnvironmentUtil { private SiddhiEnvironmentUtil() { } - @Nonnull - public static String getBinaryFileNameForPath(@Nonnull String path) { + @NotNull + public static String getBinaryFileNameForPath(@NotNull String path) { String resultBinaryName = FileUtil.getNameWithoutExtension(PathUtil.getFileName(path)); return SystemInfo.isWindows ? resultBinaryName + ".bat" : resultBinaryName; } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/sdk/SiddhiPathModificationTracker.java b/src/main/java/org/wso2/siddhi/plugins/idea/sdk/SiddhiPathModificationTracker.java index 78434ac..85fee84 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/sdk/SiddhiPathModificationTracker.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/sdk/SiddhiPathModificationTracker.java @@ -27,11 +27,11 @@ import com.intellij.openapi.vfs.VirtualFileMoveEvent; import com.intellij.util.SystemProperties; import com.intellij.util.containers.ContainerUtil; +import org.jetbrains.annotations.NotNull; import java.io.File; import java.util.Collection; import java.util.Set; -import javax.annotation.Nonnull; /** * Defines a path modification tracker for siddhi. @@ -56,22 +56,22 @@ public SiddhiPathModificationTracker() { VirtualFileManager.getInstance().addVirtualFileListener(new VirtualFileAdapter() { @Override - public void fileCreated(@Nonnull VirtualFileEvent event) { + public void fileCreated(@NotNull VirtualFileEvent event) { handleEvent(event); } @Override - public void fileDeleted(@Nonnull VirtualFileEvent event) { + public void fileDeleted(@NotNull VirtualFileEvent event) { handleEvent(event); } @Override - public void fileMoved(@Nonnull VirtualFileMoveEvent event) { + public void fileMoved(@NotNull VirtualFileMoveEvent event) { handleEvent(event); } @Override - public void fileCopied(@Nonnull VirtualFileCopyEvent event) { + public void fileCopied(@NotNull VirtualFileCopyEvent event) { handleEvent(event); } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/sdk/SiddhiSdkLibraryPresentationProvider.java b/src/main/java/org/wso2/siddhi/plugins/idea/sdk/SiddhiSdkLibraryPresentationProvider.java index ec24033..c21c666 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/sdk/SiddhiSdkLibraryPresentationProvider.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/sdk/SiddhiSdkLibraryPresentationProvider.java @@ -20,11 +20,11 @@ import com.intellij.openapi.roots.libraries.LibraryKind; import com.intellij.openapi.roots.libraries.LibraryPresentationProvider; import com.intellij.openapi.vfs.VirtualFile; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.SiddhiIcons; import java.util.List; -import javax.annotation.Nonnull; import javax.swing.Icon; /** @@ -46,7 +46,7 @@ public Icon getIcon() { @Override @Nullable - public DummyLibraryProperties detect(@Nonnull List classesRoots) { + public DummyLibraryProperties detect(@NotNull List classesRoots) { return null; } } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/sdk/SiddhiSdkService.java b/src/main/java/org/wso2/siddhi/plugins/idea/sdk/SiddhiSdkService.java index 0a6a12d..0ead0a7 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/sdk/SiddhiSdkService.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/sdk/SiddhiSdkService.java @@ -34,13 +34,13 @@ import com.intellij.util.ObjectUtils; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.SiddhiConstants; import org.wso2.siddhi.plugins.idea.SiddhiModuleType; import java.io.File; import java.util.Set; -import javax.annotation.Nonnull; /** * Defines sdk service for siddhi. @@ -52,11 +52,11 @@ public class SiddhiSdkService extends SimpleModificationTracker { "linux_arm"); private Project myProject; - protected SiddhiSdkService(@Nonnull Project project) { + protected SiddhiSdkService(@NotNull Project project) { myProject = project; } - public static SiddhiSdkService getInstance(@Nonnull Project project) { + public static SiddhiSdkService getInstance(@NotNull Project project) { return ServiceManager.getService(project, SiddhiSdkService.class); } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/sdk/SiddhiSdkType.java b/src/main/java/org/wso2/siddhi/plugins/idea/sdk/SiddhiSdkType.java index 1c1f4d4..207aeaa 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/sdk/SiddhiSdkType.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/sdk/SiddhiSdkType.java @@ -26,11 +26,11 @@ import com.intellij.openapi.vfs.VirtualFile; import org.jdom.Element; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.SiddhiIcons; import java.io.File; -import javax.annotation.Nonnull; import javax.swing.Icon; /** @@ -42,18 +42,18 @@ public SiddhiSdkType() { super("Siddhi SDK"); } - @Nonnull + @NotNull public static SiddhiSdkType getInstance() { return SdkType.findInstance(SiddhiSdkType.class); } - @Nonnull + @NotNull @Override public Icon getIcon() { return SiddhiIcons.ICON; } - @Nonnull + @NotNull @Override public Icon getIconForAddAction() { return getIcon(); @@ -67,7 +67,7 @@ public String suggestHomePath() { } @Override - public boolean isValidSdkHome(@Nonnull String path) { + public boolean isValidSdkHome(@NotNull String path) { SiddhiSdkService.LOG.debug("Validating sdk path: " + path); String executablePath = SiddhiSdkService.getSiddhiExecutablePath(path); if (executablePath == null) { @@ -85,15 +85,15 @@ public boolean isValidSdkHome(@Nonnull String path) { return false; } - @Nonnull + @NotNull @Override - public String adjustSelectedSdkHome(@Nonnull String homePath) { + public String adjustSelectedSdkHome(@NotNull String homePath) { return ""; } - @Nonnull + @NotNull @Override - public String suggestSdkName(@Nullable String currentSdkName, @Nonnull String sdkHome) { + public String suggestSdkName(@Nullable String currentSdkName, @NotNull String sdkHome) { String version = getVersionString(sdkHome); if (version == null) { return "Unknown Siddhi-SDK version at " + sdkHome; @@ -103,28 +103,28 @@ public String suggestSdkName(@Nullable String currentSdkName, @Nonnull String sd @Nullable @Override - public String getVersionString(@Nonnull String sdkHome) { + public String getVersionString(@NotNull String sdkHome) { return SiddhiSdkUtil.retrieveSiddhiVersion(sdkHome); } @Nullable @Override - public String getDefaultDocumentationUrl(@Nonnull Sdk sdk) { + public String getDefaultDocumentationUrl(@NotNull Sdk sdk) { return null; } @Nullable @Override - public AdditionalDataConfigurable createAdditionalDataConfigurable(@Nonnull SdkModel sdkModel, @Nonnull + public AdditionalDataConfigurable createAdditionalDataConfigurable(@NotNull SdkModel sdkModel, @NotNull SdkModificator sdkModificator) { return null; } @Override - public void saveAdditionalData(@Nonnull SdkAdditionalData additionalData, @Nonnull Element additional) { + public void saveAdditionalData(@NotNull SdkAdditionalData additionalData, @NotNull Element additional) { } - @Nonnull + @NotNull @NonNls @Override public String getPresentableName() { @@ -132,7 +132,7 @@ public String getPresentableName() { } @Override - public void setupSdkPaths(@Nonnull Sdk sdk) { + public void setupSdkPaths(@NotNull Sdk sdk) { String versionString = sdk.getVersionString(); if (versionString == null) { throw new RuntimeException("SDK version is not defined"); diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/sdk/SiddhiSdkUtil.java b/src/main/java/org/wso2/siddhi/plugins/idea/sdk/SiddhiSdkUtil.java index fe2befd..152bc45 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/sdk/SiddhiSdkUtil.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/sdk/SiddhiSdkUtil.java @@ -31,11 +31,10 @@ import com.intellij.openapi.vfs.VfsUtilCore; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileManager; -import com.intellij.psi.util.CachedValueProvider; -import com.intellij.psi.util.CachedValuesManager; import com.intellij.util.Function; import com.intellij.util.ObjectUtils; import com.intellij.util.containers.ContainerUtil; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.SiddhiConstants; import org.wso2.siddhi.plugins.idea.project.SiddhiApplicationLibrariesService; @@ -45,13 +44,9 @@ import java.io.IOException; import java.util.Collection; import java.util.Collections; -import java.util.LinkedHashSet; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.Nonnull; - -import static com.intellij.util.containers.ContainerUtil.newLinkedHashSet; /** * Defines utility methods for sdk. @@ -106,7 +101,7 @@ private static String suggestSdkDirectoryPathFromEnv() { } @Nullable - public static String retrieveSiddhiVersion(@Nonnull String sdkPath) { + public static String retrieveSiddhiVersion(@NotNull String sdkPath) { try { VirtualFile sdkRoot = VirtualFileManager.getInstance().findFileByUrl(VfsUtilCore.pathToUrl(sdkPath)); if (sdkRoot != null) { @@ -137,7 +132,7 @@ public static String retrieveSiddhiVersion(@Nonnull String sdkPath) { } @Nullable - private static String parseSiddhiVersion(@Nonnull String text) { + private static String parseSiddhiVersion(@NotNull String text) { Matcher matcher = SIDDHI_VERSION_PATTERN.matcher(text); if (matcher.find()) { return matcher.group(1); @@ -145,22 +140,22 @@ private static String parseSiddhiVersion(@Nonnull String text) { return null; } - @Nonnull - public static Collection getSdkDirectoriesToAttach(@Nonnull String sdkPath, @Nonnull String + @NotNull + public static Collection getSdkDirectoriesToAttach(@NotNull String sdkPath, @NotNull String versionString) { return ContainerUtil.createMaybeSingletonList(getSdkSrcDir(sdkPath, versionString)); } @Nullable - private static VirtualFile getSdkSrcDir(@Nonnull String sdkPath, @Nonnull String sdkVersion) { + private static VirtualFile getSdkSrcDir(@NotNull String sdkPath, @NotNull String sdkVersion) { String srcPath = getSrcLocation(sdkVersion); VirtualFile file = VirtualFileManager.getInstance().findFileByUrl( VfsUtilCore.pathToUrl(FileUtil.join(sdkPath, srcPath))); return file != null && file.isDirectory() ? file : null; } - @Nonnull - private static String getSrcLocation(@Nonnull String version) { + @NotNull + private static String getSrcLocation(@NotNull String version) { return "src"; } @@ -189,19 +184,19 @@ public static String getSiddhiExecutablePath(Project project, Module module) { return ""; } - @Nonnull + @NotNull public static Collection getSiddhiPathsRootsFromEnvironment() { return SiddhiPathModificationTracker.getSiddhiEnvironmentPathRoots(); } - @Nonnull - private static List getInnerSiddhiPathSources(@Nonnull Project project, @Nullable Module module) { + @NotNull + private static List getInnerSiddhiPathSources(@NotNull Project project, @Nullable Module module) { return ContainerUtil.mapNotNull(getSiddhiPathRoots(project, module), new RetrieveSubDirectoryOrSelfFunction("src")); } - @Nonnull - public static Collection getSiddhiPathRoots(@Nonnull Project project, @Nullable Module module) { + @NotNull + public static Collection getSiddhiPathRoots(@NotNull Project project, @Nullable Module module) { Collection roots = ContainerUtil.newArrayList(); if (SiddhiApplicationLibrariesService.getInstance().isUseSiddhiPathFromSystemEnvironment()) { roots.addAll(getSiddhiPathsRootsFromEnvironment()); @@ -212,10 +207,10 @@ public static Collection getSiddhiPathRoots(@Nonnull Project projec } private static class RetrieveSubDirectoryOrSelfFunction implements Function { - @Nonnull + @NotNull private final String mySubdirName; - public RetrieveSubDirectoryOrSelfFunction(@Nonnull String subdirName) { + public RetrieveSubDirectoryOrSelfFunction(@NotNull String subdirName) { mySubdirName = subdirName; } @@ -226,8 +221,8 @@ public VirtualFile fun(VirtualFile file) { } } - @Nonnull - public static Collection getSiddhiModules(@Nonnull Project project) { + @NotNull + public static Collection getSiddhiModules(@NotNull Project project) { if (project.isDefault()) { return Collections.emptyList(); } @@ -236,21 +231,7 @@ public static Collection getSiddhiModules(@Nonnull Project project) { } @Nullable - private static VirtualFile getSdkSrcDir(@Nonnull Project project, @Nullable Module module) { - if (module != null) { - return CachedValuesManager.getManager(project).getCachedValue(module, () -> { - SiddhiSdkService sdkService = SiddhiSdkService.getInstance(module.getProject()); - return CachedValueProvider.Result.create(getInnerSdkSrcDir(sdkService, module), sdkService); - }); - } - return CachedValuesManager.getManager(project).getCachedValue(project, () -> { - SiddhiSdkService sdkService = SiddhiSdkService.getInstance(project); - return CachedValueProvider.Result.create(getInnerSdkSrcDir(sdkService, null), sdkService); - }); - } - - @Nullable - private static VirtualFile getInnerSdkSrcDir(@Nonnull SiddhiSdkService sdkService, @Nullable Module module) { + private static VirtualFile getInnerSdkSrcDir(@NotNull SiddhiSdkService sdkService, @Nullable Module module) { String sdkHomePath = sdkService.getSdkHomePath(module); String sdkVersionString = sdkService.getSdkVersion(module); return sdkHomePath != null && sdkVersionString != null ? getSdkSrcDir(sdkHomePath, sdkVersionString) : null; diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/spellchecker/SiddhiIdentifierTokenizer.java b/src/main/java/org/wso2/siddhi/plugins/idea/spellchecker/SiddhiIdentifierTokenizer.java index 7bbb131..9ce3304 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/spellchecker/SiddhiIdentifierTokenizer.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/spellchecker/SiddhiIdentifierTokenizer.java @@ -19,8 +19,7 @@ import com.intellij.psi.PsiNameIdentifierOwner; import com.intellij.spellchecker.tokenizer.TokenConsumer; import com.intellij.spellchecker.tokenizer.Tokenizer; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * Defines identifier tokenizer for siddhi. @@ -28,7 +27,7 @@ public class SiddhiIdentifierTokenizer extends Tokenizer { @Override - public void tokenize(@Nonnull PsiNameIdentifierOwner element, TokenConsumer consumer) { + public void tokenize(@NotNull PsiNameIdentifierOwner element, TokenConsumer consumer) { // Do nothing here. This is used to prevent adding multiple fix suggestions (Rename To, etc) to the code. // Otherwise one suggestion will be added when the identifier is processed, another will be added when the // parent node of the identifier is processed. diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/spellchecker/SiddhiSpellcheckingStrategy.java b/src/main/java/org/wso2/siddhi/plugins/idea/spellchecker/SiddhiSpellcheckingStrategy.java index d321051..9b6ad94 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/spellchecker/SiddhiSpellcheckingStrategy.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/spellchecker/SiddhiSpellcheckingStrategy.java @@ -19,11 +19,10 @@ import com.intellij.psi.PsiElement; import com.intellij.spellchecker.tokenizer.SpellcheckingStrategy; import com.intellij.spellchecker.tokenizer.Tokenizer; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.SiddhiTypes; import org.wso2.siddhi.plugins.idea.psi.IdentifierPSINode; -import javax.annotation.Nonnull; - /** * Defines spell checking strategy. */ @@ -31,7 +30,7 @@ public class SiddhiSpellcheckingStrategy extends SpellcheckingStrategy { private final SiddhiIdentifierTokenizer identifierTokenizer = new SiddhiIdentifierTokenizer(); - @Nonnull + @NotNull @Override public Tokenizer getTokenizer(PsiElement element) { if (element instanceof IdentifierPSINode) { diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/structureview/SiddhiStructureViewElement.java b/src/main/java/org/wso2/siddhi/plugins/idea/structureview/SiddhiStructureViewElement.java index 1c07d01..3a109ba 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/structureview/SiddhiStructureViewElement.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/structureview/SiddhiStructureViewElement.java @@ -24,6 +24,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiNamedElement; import com.intellij.psi.util.PsiTreeUtil; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.psi.AggregationDefinitionNode; import org.wso2.siddhi.plugins.idea.psi.ExecutionElementNode; import org.wso2.siddhi.plugins.idea.psi.FunctionDefinitionNode; @@ -36,7 +37,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import javax.annotation.Nonnull; /** * An element in the structure view tree model. @@ -71,7 +71,7 @@ public boolean canNavigateToSource() { return element instanceof NavigationItem && ((NavigationItem) element).canNavigateToSource(); } - @Nonnull + @NotNull @Override public String getAlphaSortKey() { String s = element instanceof PsiNamedElement ? ((PsiNamedElement) element).getName() : null; @@ -81,13 +81,13 @@ public String getAlphaSortKey() { return s; } - @Nonnull + @NotNull @Override public ItemPresentation getPresentation() { return new SiddhiItemPresentation(element); } - @Nonnull + @NotNull @Override public TreeElement[] getChildren() { if (element instanceof SiddhiFile) { diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/structureview/SiddhiStructureViewFactory.java b/src/main/java/org/wso2/siddhi/plugins/idea/structureview/SiddhiStructureViewFactory.java index 1f4a56b..dcb6b90 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/structureview/SiddhiStructureViewFactory.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/structureview/SiddhiStructureViewFactory.java @@ -22,11 +22,10 @@ import com.intellij.lang.PsiStructureViewFactory; import com.intellij.openapi.editor.Editor; import com.intellij.psi.PsiFile; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.psi.SiddhiFile; -import javax.annotation.Nonnull; - /** * Defines structure view factory for siddhi. */ @@ -37,7 +36,7 @@ public class SiddhiStructureViewFactory implements PsiStructureViewFactory { public StructureViewBuilder getStructureViewBuilder(final PsiFile psiFile) { return new TreeBasedStructureViewBuilder() { - @Nonnull + @NotNull @Override public StructureViewModel createStructureViewModel(@Nullable Editor editor) { return new SiddhiStructureViewModel((SiddhiFile) psiFile); diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/structureview/SiddhiStructureViewModel.java b/src/main/java/org/wso2/siddhi/plugins/idea/structureview/SiddhiStructureViewModel.java index 1133a5b..ecfb9b9 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/structureview/SiddhiStructureViewModel.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/structureview/SiddhiStructureViewModel.java @@ -20,6 +20,7 @@ import com.intellij.ide.structureView.StructureViewModelBase; import com.intellij.ide.structureView.StructureViewTreeElement; import com.intellij.ide.util.treeView.smartTree.Sorter; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.psi.AggregationDefinitionNode; import org.wso2.siddhi.plugins.idea.psi.ExecutionElementNode; import org.wso2.siddhi.plugins.idea.psi.FunctionDefinitionNode; @@ -29,8 +30,6 @@ import org.wso2.siddhi.plugins.idea.psi.TriggerDefinitionNode; import org.wso2.siddhi.plugins.idea.psi.WindowDefinitionNode; -import javax.annotation.Nonnull; - /** * Defines the model for the data displayed in the standard structure view or file structure * popup component. The model of the standard structure view is represented as a tree of elements. @@ -42,7 +41,7 @@ public class SiddhiStructureViewModel extends StructureViewModelBase super(root, new SiddhiStructureViewRootElement(root)); } - @Nonnull + @NotNull public Sorter[] getSorters() { return new Sorter[]{Sorter.ALPHA_SORTER}; } @@ -62,7 +61,7 @@ public boolean isAlwaysShowsPlus(StructureViewTreeElement element) { || value instanceof TableDefinitionNode || value instanceof AggregationDefinitionNode; } - @Nonnull + @NotNull @Override protected Class[] getSuitableClasses() { return super.getSuitableClasses(); diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/structureview/SiddhiStructureViewRootElement.java b/src/main/java/org/wso2/siddhi/plugins/idea/structureview/SiddhiStructureViewRootElement.java index 7f42599..7c0740d 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/structureview/SiddhiStructureViewRootElement.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/structureview/SiddhiStructureViewRootElement.java @@ -18,8 +18,7 @@ import com.intellij.navigation.ItemPresentation; import com.intellij.psi.PsiFile; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * Defines structure view root element for siddhi. @@ -30,7 +29,7 @@ public class SiddhiStructureViewRootElement extends SiddhiStructureViewElement { super(element); } - @Nonnull + @NotNull @Override public ItemPresentation getPresentation() { return new SiddhiRootPresentation((PsiFile) element); diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/ui/SiddhiNotification.java b/src/main/java/org/wso2/siddhi/plugins/idea/ui/SiddhiNotification.java index 4de5d69..4c0cee9 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/ui/SiddhiNotification.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/ui/SiddhiNotification.java @@ -21,10 +21,9 @@ import com.intellij.notification.NotificationType; import com.intellij.notification.Notifications; import com.intellij.openapi.components.ApplicationComponent; +import org.jetbrains.annotations.NotNull; import org.wso2.siddhi.plugins.idea.SiddhiConstants; -import javax.annotation.Nonnull; - /** * Provides notifications. */ @@ -59,7 +58,7 @@ public void disposeComponent() { } - @Nonnull + @NotNull @Override public String getComponentName() { return getClass().getName(); diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/usage/SiddhiFindUsageProvider.java b/src/main/java/org/wso2/siddhi/plugins/idea/usage/SiddhiFindUsageProvider.java index c5dd688..7f8fb34 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/usage/SiddhiFindUsageProvider.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/usage/SiddhiFindUsageProvider.java @@ -21,11 +21,10 @@ import com.intellij.psi.PsiElement; import org.antlr.jetbrains.adaptor.lexer.RuleIElementType; import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.psi.IdentifierPSINode; -import javax.annotation.Nonnull; - import static org.wso2.siddhi.plugins.idea.grammar.SiddhiQLParser.RULE_definition_aggregation; import static org.wso2.siddhi.plugins.idea.grammar.SiddhiQLParser.RULE_definition_function; import static org.wso2.siddhi.plugins.idea.grammar.SiddhiQLParser.RULE_definition_stream; @@ -46,19 +45,19 @@ public WordsScanner getWordsScanner() { } @Override - public boolean canFindUsagesFor(@Nonnull PsiElement psiElement) { + public boolean canFindUsagesFor(@NotNull PsiElement psiElement) { return psiElement instanceof IdentifierPSINode; } @Nullable @Override - public String getHelpId(@Nonnull PsiElement psiElement) { + public String getHelpId(@NotNull PsiElement psiElement) { return null; } - @Nonnull + @NotNull @Override - public String getType(@Nonnull PsiElement element) { + public String getType(@NotNull PsiElement element) { if (!(element.getParent() instanceof ANTLRPsiNode)) { return ""; } @@ -84,15 +83,15 @@ public String getType(@Nonnull PsiElement element) { return ""; } - @Nonnull + @NotNull @Override - public String getDescriptiveName(@Nonnull PsiElement element) { + public String getDescriptiveName(@NotNull PsiElement element) { return element.getText(); } - @Nonnull + @NotNull @Override - public String getNodeText(@Nonnull PsiElement element, boolean useFullName) { + public String getNodeText(@NotNull PsiElement element, boolean useFullName) { String text = element.getText(); return text; } diff --git a/src/main/java/org/wso2/siddhi/plugins/idea/util/SiddhiExecutor.java b/src/main/java/org/wso2/siddhi/plugins/idea/util/SiddhiExecutor.java index b9e8e9a..4f83607 100644 --- a/src/main/java/org/wso2/siddhi/plugins/idea/util/SiddhiExecutor.java +++ b/src/main/java/org/wso2/siddhi/plugins/idea/util/SiddhiExecutor.java @@ -49,6 +49,7 @@ import com.intellij.util.EnvironmentUtil; import com.intellij.util.ObjectUtils; import com.intellij.util.containers.ContainerUtil; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.wso2.siddhi.plugins.idea.SiddhiConstants; import org.wso2.siddhi.plugins.idea.runconfig.SiddhiConsoleFilter; @@ -59,7 +60,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Map; -import javax.annotation.Nonnull; /** * Defines an executor for siddhi. @@ -67,13 +67,13 @@ public class SiddhiExecutor { private static final Logger LOGGER = Logger.getInstance(SiddhiExecutor.class); - @Nonnull + @NotNull private final Map myExtraEnvironment = ContainerUtil.newHashMap(); - @Nonnull + @NotNull private final ParametersList myParameterList = new ParametersList(); - @Nonnull + @NotNull private final ProcessOutput myProcessOutput = new ProcessOutput(); - @Nonnull + @NotNull private final Project myProject; @Nullable private final Module myModule; @@ -97,83 +97,83 @@ public class SiddhiExecutor { private OSProcessHandler myProcessHandler; private final Collection myProcessListeners = ContainerUtil.newArrayList(); - private SiddhiExecutor(@Nonnull Project project, @Nullable Module module) { + private SiddhiExecutor(@NotNull Project project, @Nullable Module module) { myProject = project; myModule = module; } - public static SiddhiExecutor in(@Nonnull Project project, @Nullable Module module) { + public static SiddhiExecutor in(@NotNull Project project, @Nullable Module module) { return module != null ? in(module) : in(project); } - @Nonnull - private static SiddhiExecutor in(@Nonnull Project project) { + @NotNull + private static SiddhiExecutor in(@NotNull Project project) { return new SiddhiExecutor(project, null); } - @Nonnull - public static SiddhiExecutor in(@Nonnull Module module) { + @NotNull + public static SiddhiExecutor in(@NotNull Module module) { Project project = module.getProject(); return new SiddhiExecutor(project, module); } - @Nonnull + @NotNull public SiddhiExecutor withPresentableName(@Nullable String presentableName) { myPresentableName = presentableName; return this; } - @Nonnull + @NotNull public SiddhiExecutor withExePath(@Nullable String exePath) { myExePath = exePath; return this; } - @Nonnull + @NotNull public SiddhiExecutor withWorkDirectory(@Nullable String workDirectory) { myWorkDirectory = workDirectory; return this; } - @Nonnull + @NotNull public SiddhiExecutor withSiddhiPath(@Nullable String siddhiPath) { mySiddhiPath = siddhiPath; return this; } - @Nonnull + @NotNull public SiddhiExecutor withEnvPath(@Nullable String envPath) { myEnvPath = envPath; return this; } - public SiddhiExecutor withProcessListener(@Nonnull ProcessListener listener) { + public SiddhiExecutor withProcessListener(@NotNull ProcessListener listener) { myProcessListeners.add(listener); return this; } - @Nonnull - public SiddhiExecutor withExtraEnvironment(@Nonnull Map environment) { + @NotNull + public SiddhiExecutor withExtraEnvironment(@NotNull Map environment) { myExtraEnvironment.putAll(environment); return this; } - @Nonnull + @NotNull public SiddhiExecutor withPassParentEnvironment(boolean passParentEnvironment) { myParentEnvironmentType = passParentEnvironment ? GeneralCommandLine.ParentEnvironmentType.CONSOLE : GeneralCommandLine.ParentEnvironmentType.NONE; return this; } - @Nonnull - public SiddhiExecutor withParameterString(@Nonnull String parameterString) { + @NotNull + public SiddhiExecutor withParameterString(@NotNull String parameterString) { myParameterList.addParametersString(parameterString); return this; } - @Nonnull - public SiddhiExecutor withParameters(@Nonnull String... parameters) { + @NotNull + public SiddhiExecutor withParameters(@NotNull String... parameters) { myParameterList.addAll(parameters); return this; } @@ -183,19 +183,19 @@ public SiddhiExecutor showSiddhiEnvVariables(boolean show) { return this; } - @Nonnull + @NotNull public SiddhiExecutor showOutputOnError() { myShowOutputOnError = true; return this; } - @Nonnull + @NotNull public SiddhiExecutor disablePty() { myPtyDisabled = true; return this; } - @Nonnull + @NotNull public SiddhiExecutor showNotifications(boolean onError, boolean onSuccess) { myShowNotificationsOnError = onError; myShowNotificationsOnSuccess = onSuccess; @@ -229,7 +229,7 @@ public void startNotify() { CapturingProcessAdapter processAdapter = new CapturingProcessAdapter(myProcessOutput) { @Override - public void processTerminated(@Nonnull ProcessEvent event) { + public void processTerminated(@NotNull ProcessEvent event) { super.processTerminated(event); boolean success = event.getExitCode() == 0 && myProcessOutput.getStderr().isEmpty(); boolean nothingToShow = myProcessOutput.getStdout().isEmpty() @@ -278,7 +278,7 @@ public void executeWithProgress(boolean modal) { executeWithProgress(modal, Consumer.EMPTY_CONSUMER); } - private void executeWithProgress(boolean modal, @Nonnull Consumer consumer) { + private void executeWithProgress(boolean modal, @NotNull Consumer consumer) { ProgressManager.getInstance().run(new Task.Backgroundable(myProject, getPresentableName(), true) { private boolean doNotStart; @@ -303,7 +303,7 @@ public boolean isConditionalModal() { } @Override - public void run(@Nonnull ProgressIndicator indicator) { + public void run(@NotNull ProgressIndicator indicator) { if (doNotStart || myProject == null || myProject.isDisposed()) { return; } @@ -318,7 +318,7 @@ private ProcessHandler getProcessHandler() { return myProcessHandler; } - private void showNotification(@Nonnull String message, NotificationType type) { + private void showNotification(@NotNull String message, NotificationType type) { ApplicationManager.getApplication().invokeLater(() -> { String title = getPresentableName(); Notifications.Bus.notify(SiddhiConstants.SIDDHI_EXECUTION_NOTIFICATION_GROUP @@ -326,8 +326,8 @@ private void showNotification(@Nonnull String message, NotificationType type) { }); } - private void showOutput(@Nonnull OSProcessHandler originalHandler, - @Nonnull SiddhiHistoryProcessListener historyProcessListener) { + private void showOutput(@NotNull OSProcessHandler originalHandler, + @NotNull SiddhiHistoryProcessListener historyProcessListener) { if (myShowOutputOnError) { BaseOSProcessHandler outputHandler = new KillableColoredProcessHandler(originalHandler.getProcess(), null); RunContentExecutor runContentExecutor = new RunContentExecutor(myProject, outputHandler) @@ -344,7 +344,7 @@ private void showOutput(@Nonnull OSProcessHandler originalHandler, } } - @Nonnull + @NotNull public GeneralCommandLine createCommandLine() throws ExecutionException { GeneralCommandLine commandLine = !myPtyDisabled && PtyCommandLine.isEnabled() ? new PtyCommandLine() : new GeneralCommandLine(); @@ -365,7 +365,7 @@ public GeneralCommandLine createCommandLine() throws ExecutionException { return commandLine; } - @Nonnull + @NotNull private String getPresentableName() { return ObjectUtils.notNull(myPresentableName, "Siddhi Executor"); }