Apply mono repo code style.

Author: loveleif

config/checkstyle/checkstyle.xml

@@ -97,9 +97,12 @@
     <module name="GenericWhitespace"/>
     <module name="ExplicitInitialization"/>
 
+    <!-- Included in mono repo but not worth it to introduce here at this moment
     <module name="IllegalImport">
       <property name="illegalPkgs" value="junit.framework"/>
     </module>
+    -->
+
     <module name="LocalVariableName">
       <property name="allowOneCharVarInForLoop" value="true"/>
     </module>

cypher-shell/src/integration-test/java/org/neo4j/shell/MainIntegrationTest.java

@@ -1,22 +1,45 @@
+/*
+ * Copyright (c) 2002-2020 "Neo4j,"
+ * Neo4j Sweden AB [http://neo4j.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Neo4j is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package org.neo4j.shell;
 
 import org.neo4j.shell.prettyprint.LinePrinter;
 import org.neo4j.shell.prettyprint.OutputFormatter;
 
-public class StringLinePrinter implements LinePrinter {
+public class StringLinePrinter implements LinePrinter
+{
 
     private StringBuilder sb = new StringBuilder();
 
     @Override
-    public void printOut(String line) {
-        sb.append(line).append(OutputFormatter.NEWLINE);
+    public void printOut( String line )
+    {
+        sb.append( line ).append( OutputFormatter.NEWLINE );
     }
 
-    public void clear() {
-        sb.setLength(0);
+    public void clear()
+    {
+        sb.setLength( 0 );
     }
 
-    public String output() {
+    public String output()
+    {
         return sb.toString();
     }
 }

cypher-shell/src/integration-test/java/org/neo4j/shell/StringLinePrinter.java

@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2002-2020 "Neo4j,"
+ * Neo4j Sweden AB [http://neo4j.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Neo4j is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package org.neo4j.shell.commands;
 
 import org.junit.Before;
@@ -13,23 +32,26 @@
 import org.neo4j.shell.exception.CommandException;
 import org.neo4j.shell.prettyprint.PrettyConfig;
 
-public class CypherShellFailureIntegrationTest extends CypherShellIntegrationTest {
+public class CypherShellFailureIntegrationTest extends CypherShellIntegrationTest
+{
     @Rule
     public final ExpectedException thrown = ExpectedException.none();
 
     private StringLinePrinter linePrinter = new StringLinePrinter();
 
     @Before
-    public void setUp() {
+    public void setUp()
+    {
         linePrinter.clear();
-        shell = new CypherShell(linePrinter, new PrettyConfig(Format.VERBOSE, true, 1000), false, new ShellParameterMap());
+        shell = new CypherShell( linePrinter, new PrettyConfig( Format.VERBOSE, true, 1000 ), false, new ShellParameterMap() );
     }
 
     @Test
-    public void cypherWithNoPasswordShouldReturnValidError() throws CommandException {
-        thrown.expect(AuthenticationException.class);
-        thrown.expectMessage("The client is unauthorized due to authentication failure.");
+    public void cypherWithNoPasswordShouldReturnValidError() throws CommandException
+    {
+        thrown.expect( AuthenticationException.class );
+        thrown.expectMessage( "The client is unauthorized due to authentication failure." );
 
-        connect("");
+        connect( "" );
     }
 }

cypher-shell/src/integration-test/java/org/neo4j/shell/commands/CypherShellFailureIntegrationTest.java

@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2002-2020 "Neo4j,"
+ * Neo4j Sweden AB [http://neo4j.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Neo4j is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package org.neo4j.shell.commands;
 
 import org.neo4j.shell.ConnectionConfig;
@@ -11,7 +30,8 @@ abstract class CypherShellIntegrationTest
 {
     CypherShell shell;
 
-    void connect(String password) throws CommandException {
+    void connect( String password ) throws CommandException
+    {
         shell.connect( new ConnectionConfig( "bolt", "localhost", 7687, "neo4j", password, Encryption.DEFAULT, ABSENT_DB_NAME ) );
     }
 }

cypher-shell/src/integration-test/java/org/neo4j/shell/commands/CypherShellIntegrationTest.java

@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2002-2020 "Neo4j,"
+ * Neo4j Sweden AB [http://neo4j.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Neo4j is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package org.neo4j.shell.commands;
 
 import org.junit.After;

cypher-shell/src/integration-test/java/org/neo4j/shell/commands/CypherShellMultiDatabaseIntegrationTest.java

@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2002-2020 "Neo4j,"
+ * Neo4j Sweden AB [http://neo4j.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Neo4j is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package org.neo4j.shell.commands;
 
 import org.junit.After;
@@ -16,72 +35,74 @@
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.greaterThanOrEqualTo;
-import static org.junit.Assume.assumeThat;
-import static org.junit.Assert.assertEquals;
 import static org.neo4j.shell.prettyprint.OutputFormatter.NEWLINE;
-import static org.neo4j.shell.util.Versions.version;
 
-public class CypherShellPlainIntegrationTest extends CypherShellIntegrationTest {
+public class CypherShellPlainIntegrationTest extends CypherShellIntegrationTest
+{
     @Rule
     public final ExpectedException thrown = ExpectedException.none();
 
     private StringLinePrinter linePrinter = new StringLinePrinter();
 
     @Before
-    public void setUp() throws Exception {
+    public void setUp() throws Exception
+    {
         linePrinter.clear();
-        shell = new CypherShell(linePrinter, new PrettyConfig(Format.PLAIN, true, 1000), false, new ShellParameterMap());
+        shell = new CypherShell( linePrinter, new PrettyConfig( Format.PLAIN, true, 1000 ), false, new ShellParameterMap() );
         connect( "neo" );
     }
 
     @After
-    public void tearDown() throws Exception {
-        shell.execute("MATCH (n) DETACH DELETE (n)");
+    public void tearDown() throws Exception
+    {
+        shell.execute( "MATCH (n) DETACH DELETE (n)" );
     }
 
     @Test
-    public void periodicCommitWorks() throws CommandException {
-        shell.execute("USING PERIODIC COMMIT\n" +
-                "LOAD CSV FROM 'https://neo4j.com/docs/cypher-refcard/3.2/csv/artists.csv' AS line\n" +
-                "CREATE (:Artist {name: line[1], year: toInteger(line[2])});");
+    public void periodicCommitWorks() throws CommandException
+    {
+        shell.execute( "USING PERIODIC COMMIT\n" +
+                       "LOAD CSV FROM 'https://neo4j.com/docs/cypher-refcard/3.2/csv/artists.csv' AS line\n" +
+                       "CREATE (:Artist {name: line[1], year: toInteger(line[2])});" );
         linePrinter.clear();
 
-        shell.execute("MATCH (a:Artist) WHERE a.name = 'Europe' RETURN a.name");
+        shell.execute( "MATCH (a:Artist) WHERE a.name = 'Europe' RETURN a.name" );
 
-        assertThat(linePrinter.output(), containsString("a.name"+ NEWLINE+"\"Europe\""));
+        assertThat( linePrinter.output(), containsString( "a.name" + NEWLINE + "\"Europe\"" ) );
     }
 
     @Test
-    public void cypherWithProfileStatements() throws CommandException {
+    public void cypherWithProfileStatements() throws CommandException
+    {
         //when
-        shell.execute("CYPHER RUNTIME=INTERPRETED PROFILE RETURN null");
+        shell.execute( "CYPHER RUNTIME=INTERPRETED PROFILE RETURN null" );
 
         //then
         String actual = linePrinter.output();
         //      This assertion checks everything except for time and cypher
-        assertThat(actual, containsString("Plan: \"PROFILE\""));
-        assertThat(actual, containsString("Statement: \"READ_ONLY\""));
-        assertThat(actual, containsString("Planner: \"COST\""));
-        assertThat(actual, containsString("Runtime: \"INTERPRETED\""));
-        assertThat(actual, containsString("DbHits: 0"));
-        assertThat(actual, containsString("Rows: 1"));
-        assertThat(actual, containsString("null"));
-        assertThat(actual, containsString("NULL"));
+        assertThat( actual, containsString( "Plan: \"PROFILE\"" ) );
+        assertThat( actual, containsString( "Statement: \"READ_ONLY\"" ) );
+        assertThat( actual, containsString( "Planner: \"COST\"" ) );
+        assertThat( actual, containsString( "Runtime: \"INTERPRETED\"" ) );
+        assertThat( actual, containsString( "DbHits: 0" ) );
+        assertThat( actual, containsString( "Rows: 1" ) );
+        assertThat( actual, containsString( "null" ) );
+        assertThat( actual, containsString( "NULL" ) );
     }
 
     @Test
-    public void cypherWithExplainStatements() throws CommandException {
+    public void cypherWithExplainStatements() throws CommandException
+    {
         //when
-        shell.execute("CYPHER RUNTIME=INTERPRETED EXPLAIN RETURN null");
+        shell.execute( "CYPHER RUNTIME=INTERPRETED EXPLAIN RETURN null" );
 
         //then
         String actual = linePrinter.output();
         //      This assertion checks everything except for time and cypher
-        assertThat(actual, containsString("Plan: \"EXPLAIN\""));
-        assertThat(actual, containsString("Statement: \"READ_ONLY\""));
-        assertThat(actual, containsString("Planner: \"COST\""));
-        assertThat(actual, containsString("Runtime: \"INTERPRETED\""));
+        assertThat( actual, containsString( "Plan: \"EXPLAIN\"" ) );
+        assertThat( actual, containsString( "Statement: \"READ_ONLY\"" ) );
+        assertThat( actual, containsString( "Planner: \"COST\"" ) );
+        assertThat( actual, containsString( "Runtime: \"INTERPRETED\"" ) );
     }
 
     @Test
@@ -90,15 +111,15 @@ public void shouldUseParamFromCLIArgs() throws EvaluationException, CommandExcep
         // given a CLI arg
         ShellParameterMap parameterMap = new ShellParameterMap();
         parameterMap.setParameter( "foo", "'bar'" );
-        shell = new CypherShell( linePrinter, new PrettyConfig( Format.PLAIN, true, 1000), false, parameterMap );
+        shell = new CypherShell( linePrinter, new PrettyConfig( Format.PLAIN, true, 1000 ), false, parameterMap );
         connect( "neo" );
 
         //when
-        shell.execute("CYPHER RETURN $foo");
+        shell.execute( "CYPHER RETURN $foo" );
 
         //then
         String actual = linePrinter.output();
-        assertThat(actual, containsString("$foo"));
-        assertThat(actual, containsString("bar"));
+        assertThat( actual, containsString( "$foo" ) );
+        assertThat( actual, containsString( "bar" ) );
     }
 }