Run Checkstyle on Travis

dwitry · dwitry · commit 90af2e9e8a79 · 2019-08-12T11:30:46.000+03:00
* Fix errors that accumulated while Checkstyle was not enabled
* Disable `OperatorWrap` as it complicated to match IntelliJ IDEA autoformatting and Checkstyle expected behaviour
diff --git a/.travis.yml b/.travis.yml
@@ -18,4 +18,4 @@ deploy:
     branch: master
     tags: true
 script:
-  - ./gradlew clean test
+  - ./gradlew clean check
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
@@ -94,7 +94,6 @@
         <module name="MethodParamPad"/>
         <module name="NoWhitespaceAfter"/>
         <module name="NoWhitespaceBefore"/>
-        <module name="OperatorWrap"/>
         <module name="ParenPad"/>
         <module name="TypecastParenPad"/>
         <module name="WhitespaceAfter"/>
diff --git a/language/cypher/src/main/java/com/neueda/jetbrains/plugin/graphdb/language/cypher/editor/CypherParameterInfoHandler.java b/language/cypher/src/main/java/com/neueda/jetbrains/plugin/graphdb/language/cypher/editor/CypherParameterInfoHandler.java
@@ -1,12 +1,7 @@
 package com.neueda.jetbrains.plugin.graphdb.language.cypher.editor;
 
 import com.intellij.codeInsight.lookup.LookupElement;
-import com.intellij.lang.parameterInfo.CreateParameterInfoContext;
-import com.intellij.lang.parameterInfo.ParameterInfoContext;
-import com.intellij.lang.parameterInfo.ParameterInfoHandlerWithTabActionSupport;
-import com.intellij.lang.parameterInfo.ParameterInfoUIContext;
-import com.intellij.lang.parameterInfo.ParameterInfoUtils;
-import com.intellij.lang.parameterInfo.UpdateParameterInfoContext;
+import com.intellij.lang.parameterInfo.*;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.util.PsiTreeUtil;
@@ -20,7 +15,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 
diff --git a/ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/console/params/ParametersPanel.java b/ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/console/params/ParametersPanel.java
@@ -120,7 +120,9 @@ private void setupEditor(Project project) {
     }
 
     private void setupFileSpecificEditor(Project project, VirtualFile cypherFile) {
-        if (project == null || cypherFile == null) return;
+        if (project == null || cypherFile == null) {
+            return;
+        }
         try {
             String params = FileUtil.getParams(cypherFile);
             LightVirtualFile lightVirtualFile = new LightVirtualFile("", JsonFileType.INSTANCE, params);
@@ -129,8 +131,9 @@ private void setupFileSpecificEditor(Project project, VirtualFile cypherFile) {
             VirtualFileManager.getInstance().addVirtualFileListener(new VirtualFileListener() {
                 @Override
                 public void contentsChanged(@NotNull VirtualFileEvent event) {
-                    if (event.getFile().equals(cypherFile) && document != null)
+                    if (event.getFile().equals(cypherFile) && document != null) {
                         FileUtil.setParams(cypherFile, document.getText());
+                    }
                 }
             });
             JLabel jLabel = new JLabel("<html>Parameters for data source <b>" +
@@ -139,7 +142,9 @@ public void contentsChanged(@NotNull VirtualFileEvent event) {
             jLabel.setToolTipText("Enter parameters in JSON format. Will be applied to <b>" + getTabTitle(cypherFile) +
                     "</b> data source when executed");
             fileSpecificParamEditor.setHeaderComponent(jLabel);
-            if (document != null) setInitialContent(document);
+            if (document != null) {
+                setInitialContent(document);
+            }
             graphConsoleView.getFileSpecificParametersTab().add(fileSpecificParamEditor.getComponent(), BorderLayout.CENTER);
         } catch (Throwable e) {
             Throwables.throwIfUnchecked(e);
diff --git a/ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/console/params/ParametersService.java b/ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/console/params/ParametersService.java
@@ -46,12 +46,14 @@ public Map<String, Object> getParameters(PsiElement element) throws Exception {
         Map<String, Object> allParameters = new HashMap<>();
         if (isValidParametersMap(parametersProvider.getFileSpecificParametersJson())) {
             Map<String, Object> parsedFileSpecific = MAPPER.readValue(parametersProvider.getFileSpecificParametersJson(),
-                    new TypeReference<Map<String, Object>>() {});
+                    new TypeReference<Map<String, Object>>() {
+                    });
             parsedFileSpecific.forEach(allParameters::putIfAbsent);
         }
         if (isValidParametersMap(parametersProvider.getGlobalParametersJson())) {
             Map<String, Object> parsedGlobal = MAPPER.readValue(parametersProvider.getGlobalParametersJson(),
-                    new TypeReference<Map<String, Object>>() {});
+                    new TypeReference<Map<String, Object>>() {
+                    });
             parsedGlobal.forEach(allParameters::putIfAbsent);
         }
         return extractQueryParameters(element, allParameters);
diff --git a/ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/util/FileUtil.java b/ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/util/FileUtil.java
@@ -71,7 +71,8 @@ public static void setParams(VirtualFile file, String params) {
         if (file instanceof NewVirtualFile) {
             try (DataOutputStream os = QUERY_PARAMS_FILE_ATTRIBUTE.writeAttribute(file)) {
                 IOUtil.writeString(StringUtil.notNullize(params), os);
-            } catch (IOException e) {}
+            } catch (IOException e) {
+            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,8 @@ public static void setParams(VirtualFile file, String params) {`
`71`	`71`	`if (file instanceof NewVirtualFile) {`
`72`	`72`	`try (DataOutputStream os = QUERY_PARAMS_FILE_ATTRIBUTE.writeAttribute(file)) {`
`73`	`73`	`IOUtil.writeString(StringUtil.notNullize(params), os);`
`74`		`- } catch (IOException e) {}`
	`74`	`+ } catch (IOException e) {`
	`75`	`+ }`
`75`	`76`	`}`
`76`	`77`	`}`
`77`	`78`