From 485a9555020d36fb10d24c5971def5d1616a6d53 Mon Sep 17 00:00:00 2001
From: Sylwester Lachiewicz <slachiewicz@gmail.com>
Date: Sat, 6 Jan 2024 20:33:27 +0100
Subject: [PATCH] Reformat code with spotless plugin

---
 pom.xml                                       |  84 ++-
 .../mojo/cassandra/AbstractCassandraMojo.java | 556 +++++++++---------
 .../mojo/cassandra/AbstractCqlExecMojo.java   |  24 +-
 .../mojo/cassandra/AbstractCqlLoadMojo.java   |  25 +-
 .../AbstractSchemaCassandraMojo.java          |  18 +-
 .../mojo/cassandra/CassandraMonitor.java      |  68 +--
 .../mojo/cassandra/CleanupCassandraMojo.java  |  28 +-
 .../mojo/cassandra/CompactCassandraMojo.java  |  28 +-
 .../mojo/cassandra/ConsoleScanner.java        |  66 +--
 .../mojo/cassandra/CqlExecCassandraMojo.java  | 132 ++---
 .../mojo/cassandra/CqlExecutionException.java |  16 +-
 .../codehaus/mojo/cassandra/CqlOperation.java |   1 -
 .../mojo/cassandra/DeleteCassandraMojo.java   |  30 +-
 .../cassandra/DropColumnFamiliesMojo.java     |  20 +-
 .../mojo/cassandra/FlushCassandraMojo.java    |  27 +-
 .../mojo/cassandra/LoadCassandraMojo.java     |   9 +-
 .../mojo/cassandra/MavenLogOutputStream.java  |  10 +-
 .../mojo/cassandra/RepairCassandraMojo.java   |  28 +-
 .../mojo/cassandra/RunCassandraMojo.java      |  70 +--
 .../cassandra/StartCassandraClusterMojo.java  | 134 ++---
 .../mojo/cassandra/StartCassandraMojo.java    |  67 +--
 .../cassandra/StopCassandraClusterMojo.java   |  37 +-
 .../mojo/cassandra/StopCassandraMojo.java     |  25 +-
 .../mojo/cassandra/TruncateCassandraMojo.java |  42 +-
 .../org/codehaus/mojo/cassandra/Utils.java    |  73 +--
 .../cassandra/AbstractCqlExecMojoTest.java    |  15 +-
 .../CqlExecCassandraMojoBuilder.java          |   4 +-
 .../CqlExecCassandraMojoPowerMockTest.java    |  28 +-
 .../cassandra/CqlExecCassandraMojoTest.java   |  35 +-
 .../cassandra/CqlExecutionExceptionTest.java  |  31 +-
 30 files changed, 770 insertions(+), 961 deletions(-)

diff --git a/pom.xml b/pom.xml
index faceddc..b8fd3a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
@@ -18,7 +17,6 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
@@ -34,8 +32,8 @@ under the License.
 
   <name>Mojo's Cassandra Maven Plugin</name>
   <description>The Mojo Projects plugin for Apache Maven to allow launching a local Apache Cassandra instance from a Maven build</description>
-  <inceptionYear>2011</inceptionYear>
   <url>https://www.mojohaus.org/cassandra-maven-plugin/</url>
+  <inceptionYear>2011</inceptionYear>
   <licenses>
     <license>
       <name>Apache License 2</name>
@@ -88,8 +86,8 @@ under the License.
   <scm>
     <connection>scm:git:https://github.com/mojohaus/cassandra-maven-plugin.git</connection>
     <developerConnection>scm:git:https://github.com/mojohaus/cassandra-maven-plugin.git</developerConnection>
-    <url>https://github.com/mojohaus/cassandra-maven-plugin</url>
     <tag>HEAD</tag>
+    <url>https://github.com/mojohaus/cassandra-maven-plugin</url>
   </scm>
   <issueManagement>
     <system>github</system>
@@ -106,6 +104,16 @@ under the License.
     <project.build.outputTimestamp>2023-12-31T19:39:02Z</project.build.outputTimestamp>
   </properties>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>${slf4jVersion}</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cassandra</groupId>
@@ -278,32 +286,6 @@ under the License.
   </dependencies>
 
   <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>integration-test</goal>
-              <goal>verify</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <!-- fake triggering to download plugin for its and cache populated -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>cpu-count</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
     <pluginManagement>
       <plugins>
         <plugin>
@@ -335,18 +317,34 @@ under the License.
         </plugin>
       </plugins>
     </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>integration-test</goal>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <!-- fake triggering to download plugin for its and cache populated -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>cpu-count</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
   </build>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <version>${slf4jVersion}</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
   <profiles>
     <profile>
       <!-- run integration tests
@@ -400,8 +398,7 @@ under the License.
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-surefire-plugin</artifactId>
               <configuration>
-                <argLine>
-                  -Djdk.attach.allowAttachSelf=true
+                <argLine>-Djdk.attach.allowAttachSelf=true
                   --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED
                   --add-exports=java.base/jdk.internal.ref=ALL-UNNAMED
                   --add-exports=java.base/sun.nio.ch=ALL-UNNAMED
@@ -423,8 +420,7 @@ under the License.
                   --add-opens=java.base/java.util.concurrent=ALL-UNNAMED
                   --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED
                   --add-opens=java.base/java.util=ALL-UNNAMED
-                  --add-opens=java.xml/jdk.xml.internal=ALL-UNNAMED
-                </argLine>
+                  --add-opens=java.xml/jdk.xml.internal=ALL-UNNAMED</argLine>
               </configuration>
             </plugin>
           </plugins>
diff --git a/src/main/java/org/codehaus/mojo/cassandra/AbstractCassandraMojo.java b/src/main/java/org/codehaus/mojo/cassandra/AbstractCassandraMojo.java
index 4259e84..b97692a 100644
--- a/src/main/java/org/codehaus/mojo/cassandra/AbstractCassandraMojo.java
+++ b/src/main/java/org/codehaus/mojo/cassandra/AbstractCassandraMojo.java
@@ -18,21 +18,6 @@
  */
 package org.codehaus.mojo.cassandra;
 
-import org.apache.commons.exec.CommandLine;
-import org.apache.commons.exec.OS;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.ArtifactUtils;
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.toolchain.Toolchain;
-import org.apache.maven.toolchain.ToolchainManager;
-import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.StringUtils;
-
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -48,14 +33,27 @@
 import java.util.jar.JarOutputStream;
 import java.util.jar.Manifest;
 
+import org.apache.commons.exec.CommandLine;
+import org.apache.commons.exec.OS;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.ArtifactUtils;
+import org.apache.maven.execution.MavenSession;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.toolchain.Toolchain;
+import org.apache.maven.toolchain.ToolchainManager;
+import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.StringUtils;
+
 /**
  * Base class for all the Cassandra Maven Plugin goals.
  *
  * @author stephenc
  */
-public abstract class AbstractCassandraMojo
-    extends AbstractMojo
-{
+public abstract class AbstractCassandraMojo extends AbstractMojo {
     /**
      * The directory to hold cassandra's database.
      */
@@ -133,7 +131,7 @@ public abstract class AbstractCassandraMojo
      * Port to listen to for the JMX interface.
      *
      */
-    @Parameter( property="cassandra.jmxPort", defaultValue="7199")
+    @Parameter(property = "cassandra.jmxPort", defaultValue = "7199")
     protected int jmxPort;
 
     /**
@@ -141,16 +139,16 @@ public abstract class AbstractCassandraMojo
      *
      * @since 2.0.0-1
      */
-    @Parameter(property="cassandra.nativeTransportPort", defaultValue="9042")
+    @Parameter(property = "cassandra.nativeTransportPort", defaultValue = "9042")
     protected int nativeTransportPort;
 
     /**
-     * Enable or disable the native transport server. Currently, only the Thrift 
+     * Enable or disable the native transport server. Currently, only the Thrift
      * server is started by default because the native transport is considered beta.
      *
      * @since 2.0.0-1
      */
-    @Parameter( property="cassandra.startNativeTransport", defaultValue="true")
+    @Parameter(property = "cassandra.startNativeTransport", defaultValue = "true")
     protected boolean startNativeTransport;
 
     /**
@@ -169,42 +167,42 @@ public abstract class AbstractCassandraMojo
      * Do not change this unless you really know what you are doing.
      *
      */
-    @Parameter(defaultValue="127.0.0.1")
+    @Parameter(defaultValue = "127.0.0.1")
     protected String listenAddress;
 
     /**
      * Port to listen to for the Storage interface.
      *
      */
-    @Parameter(property="cassandra.storagePort", defaultValue="7000")
+    @Parameter(property = "cassandra.storagePort", defaultValue = "7000")
     protected int storagePort;
 
     /**
      * Port to listen to for receiving the stop command over
      *
      */
-    @Parameter(property="cassandra.stopPort", defaultValue="8081")
+    @Parameter(property = "cassandra.stopPort", defaultValue = "8081")
     protected int stopPort;
 
     /**
      * Key to be provided when stopping cassandra
      *
      */
-    @Parameter(property="cassandra.stopKey", defaultValue="cassandra-maven-plugin")
+    @Parameter(property = "cassandra.stopKey", defaultValue = "cassandra-maven-plugin")
     protected String stopKey;
 
     /**
      * Number of megabytes to limit the cassandra JVM to.
      *
      */
-    @Parameter(property="cassandra.maxMemory", defaultValue="512")
+    @Parameter(property = "cassandra.maxMemory", defaultValue = "512")
     protected int maxMemory;
 
     /**
      * The keyspace against which individual operations will be executed
      *
      */
-    @Parameter(property="cassandra.keyspace")
+    @Parameter(property = "cassandra.keyspace")
     protected String keyspace;
 
     /**
@@ -219,7 +217,7 @@ public abstract class AbstractCassandraMojo
      *
      * @since 3.5
      */
-    @Parameter(defaultValue="ERROR")
+    @Parameter(defaultValue = "ERROR")
     protected String logLevel;
 
     /**
@@ -230,13 +228,10 @@ public abstract class AbstractCassandraMojo
      * @param mainClass The main class to run.
      * @throws java.io.IOException if something went wrong.
      */
-    protected void createCassandraJar( File jarFile, String mainClass )
-        throws IOException
-    {
-        createCassandraJar( jarFile, mainClass, cassandraDir );
+    protected void createCassandraJar(File jarFile, String mainClass) throws IOException {
+        createCassandraJar(jarFile, mainClass, cassandraDir);
     }
 
-
     protected boolean useJdk11Options() {
         return false;
     }
@@ -249,69 +244,61 @@ protected boolean useJdk11Options() {
      * @param mainClass The main class to run.
      * @throws java.io.IOException if something went wrong.
      */
-    protected void createCassandraJar( File jarFile, String mainClass, File cassandraDir )
-        throws IOException
-    {
-        File conf = new File( cassandraDir, "conf" );
+    protected void createCassandraJar(File jarFile, String mainClass, File cassandraDir) throws IOException {
+        File conf = new File(cassandraDir, "conf");
 
         try (FileOutputStream fos = new FileOutputStream(jarFile);
-             JarOutputStream jos = new JarOutputStream(fos))
-        {
-            jos.setLevel( JarOutputStream.STORED );
-            jos.putNextEntry( new JarEntry( "META-INF/MANIFEST.MF" ) );
+                JarOutputStream jos = new JarOutputStream(fos)) {
+            jos.setLevel(JarOutputStream.STORED);
+            jos.putNextEntry(new JarEntry("META-INF/MANIFEST.MF"));
 
             Manifest man = new Manifest();
 
             // we can't use StringUtils.join here since we need to add a '/' to
             // the end of directory entries - otherwise the jvm will ignore them.
             StringBuilder cp = new StringBuilder();
-            cp.append( new URL( conf.toURI().toASCIIString() ).toExternalForm() );
-            cp.append( ' ' );
-            getLog().debug( "Adding plugin artifact: " + ArtifactUtils.versionlessKey( pluginArtifact ) +
-                                " to the classpath" );
-            cp.append( new URL( pluginArtifact.getFile().toURI().toASCIIString() ).toExternalForm() );
-            cp.append( ' ' );
-
-            for ( Artifact artifact : this.pluginDependencies )
-            {
-                getLog().debug( "Adding plugin dependency artifact: " + ArtifactUtils.versionlessKey(artifact) +
-                                    " to the classpath" );
+            cp.append(new URL(conf.toURI().toASCIIString()).toExternalForm());
+            cp.append(' ');
+            getLog().debug("Adding plugin artifact: " + ArtifactUtils.versionlessKey(pluginArtifact)
+                    + " to the classpath");
+            cp.append(new URL(pluginArtifact.getFile().toURI().toASCIIString()).toExternalForm());
+            cp.append(' ');
+
+            for (Artifact artifact : this.pluginDependencies) {
+                getLog().debug("Adding plugin dependency artifact: " + ArtifactUtils.versionlessKey(artifact)
+                        + " to the classpath");
                 // NOTE: if File points to a directory, this entry MUST end in '/'.
-                cp.append( new URL( artifact.getFile().toURI().toASCIIString() ).toExternalForm() );
-                cp.append( ' ' );
+                cp.append(new URL(artifact.getFile().toURI().toASCIIString()).toExternalForm());
+                cp.append(' ');
             }
 
-            if ( addMainClasspath || addTestClasspath )
-            {
-                if ( addTestClasspath )
-                {
-                    getLog().debug( "Adding: " + testClassesDirectory + " to the classpath" );
-                    cp.append( new URL( testClassesDirectory.toURI().toASCIIString() ).toExternalForm() );
-                    cp.append( ' ' );
+            if (addMainClasspath || addTestClasspath) {
+                if (addTestClasspath) {
+                    getLog().debug("Adding: " + testClassesDirectory + " to the classpath");
+                    cp.append(new URL(testClassesDirectory.toURI().toASCIIString()).toExternalForm());
+                    cp.append(' ');
                 }
-                if ( addMainClasspath )
-                {
-                    getLog().debug( "Adding: " + classesDirectory + " to the classpath" );
-                    cp.append( new URL( classesDirectory.toURI().toASCIIString() ).toExternalForm() );
-                    cp.append( ' ' );
+                if (addMainClasspath) {
+                    getLog().debug("Adding: " + classesDirectory + " to the classpath");
+                    cp.append(new URL(classesDirectory.toURI().toASCIIString()).toExternalForm());
+                    cp.append(' ');
                 }
-                for ( Artifact artifact : (Set<Artifact>) this.project.getArtifacts() )
-                {
-                    if ( "jar".equals( artifact.getType() ) && !Artifact.SCOPE_PROVIDED.equals( artifact.getScope() )
-                        && ( !Artifact.SCOPE_TEST.equals( artifact.getScope() ) || addTestClasspath ) )
-                    {
-                        getLog().debug( "Adding dependency: " + ArtifactUtils.versionlessKey( artifact ) +
-                                            " to the classpath" );
+                for (Artifact artifact : (Set<Artifact>) this.project.getArtifacts()) {
+                    if ("jar".equals(artifact.getType())
+                            && !Artifact.SCOPE_PROVIDED.equals(artifact.getScope())
+                            && (!Artifact.SCOPE_TEST.equals(artifact.getScope()) || addTestClasspath)) {
+                        getLog().debug("Adding dependency: " + ArtifactUtils.versionlessKey(artifact)
+                                + " to the classpath");
                         // NOTE: if File points to a directory, this entry MUST end in '/'.
-                        cp.append( new URL( artifact.getFile().toURI().toASCIIString() ).toExternalForm() );
-                        cp.append( ' ' );
+                        cp.append(new URL(artifact.getFile().toURI().toASCIIString()).toExternalForm());
+                        cp.append(' ');
                     }
                 }
             }
 
-            man.getMainAttributes().putValue( "Manifest-Version", "1.0" );
-            man.getMainAttributes().putValue( "Class-Path", cp.toString().trim() );
-            man.getMainAttributes().putValue( "Main-Class", mainClass );
+            man.getMainAttributes().putValue("Manifest-Version", "1.0");
+            man.getMainAttributes().putValue("Class-Path", cp.toString().trim());
+            man.getMainAttributes().putValue("Main-Class", mainClass);
 
             man.write(jos);
         }
@@ -322,10 +309,8 @@ protected void createCassandraJar( File jarFile, String mainClass, File cassandr
      *
      * @throws IOException if something goes wrong.
      */
-    protected void createCassandraHome()
-        throws IOException
-    {
-        createCassandraHome( cassandraDir, listenAddress, rpcAddress, null, new String[]{ listenAddress } );
+    protected void createCassandraHome() throws IOException {
+        createCassandraHome(cassandraDir, listenAddress, rpcAddress, null, new String[] {listenAddress});
     }
 
     /**
@@ -334,62 +319,60 @@ protected void createCassandraHome()
      * @param cassandraDir the cassandra home directory.
      * @throws IOException if something goes wrong.
      */
-    protected void createCassandraHome( File cassandraDir, String listenAddress, String rpcAddress,
-                                        BigInteger initialToken, String[] seeds )
-        throws IOException
-    {
-        File bin = new File( cassandraDir, "bin" );
-        File conf = new File( cassandraDir, "conf" );
-        File data = new File( cassandraDir, "data" );
-        File commitlog = new File( cassandraDir, "commitlog" );
-        File cdcRawDirectory = new File( cassandraDir, "cdcRawDirectory");
+    protected void createCassandraHome(
+            File cassandraDir, String listenAddress, String rpcAddress, BigInteger initialToken, String[] seeds)
+            throws IOException {
+        File bin = new File(cassandraDir, "bin");
+        File conf = new File(cassandraDir, "conf");
+        File data = new File(cassandraDir, "data");
+        File commitlog = new File(cassandraDir, "commitlog");
+        File cdcRawDirectory = new File(cassandraDir, "cdcRawDirectory");
         if (!Files.exists(cdcRawDirectory.toPath())) {
             Files.createDirectories(cdcRawDirectory.toPath());
         }
-        File savedCaches = new File( cassandraDir, "saved_caches" );
-        for ( File dir : Arrays.asList( cassandraDir, bin, conf, data, commitlog, savedCaches ) )
-        {
-            if ( dir.isFile() )
-            {
-                getLog().debug( "Deleting file " + dir + " as we need to create a directory with the same name." );
-                if ( !dir.delete() )
-                {
-                    getLog().warn( "Could not delete file " + dir );
+        File savedCaches = new File(cassandraDir, "saved_caches");
+        for (File dir : Arrays.asList(cassandraDir, bin, conf, data, commitlog, savedCaches)) {
+            if (dir.isFile()) {
+                getLog().debug("Deleting file " + dir + " as we need to create a directory with the same name.");
+                if (!dir.delete()) {
+                    getLog().warn("Could not delete file " + dir);
                 }
             }
-            if ( !dir.isDirectory() )
-            {
-                getLog().debug( "Creating directory " + dir + " as it does not exist." );
-                if ( !dir.mkdirs() )
-                {
-                    getLog().warn( "Could not create directory " + dir );
+            if (!dir.isDirectory()) {
+                getLog().debug("Creating directory " + dir + " as it does not exist.");
+                if (!dir.mkdirs()) {
+                    getLog().warn("Could not create directory " + dir);
                 }
             }
         }
-        File cassandraYaml = new File( conf, "cassandra.yaml" );
-        if ( Utils.shouldGenerateResource( project, cassandraYaml ) )
-        {
-            getLog().debug( ( cassandraYaml.isFile() ? "Updating " : "Creating " ) + cassandraYaml );
-            createCassandraYaml( cassandraYaml, data, commitlog, savedCaches, listenAddress, rpcAddress, initialToken,
-                                 seeds, cdcRawDirectory );
+        File cassandraYaml = new File(conf, "cassandra.yaml");
+        if (Utils.shouldGenerateResource(project, cassandraYaml)) {
+            getLog().debug((cassandraYaml.isFile() ? "Updating " : "Creating ") + cassandraYaml);
+            createCassandraYaml(
+                    cassandraYaml,
+                    data,
+                    commitlog,
+                    savedCaches,
+                    listenAddress,
+                    rpcAddress,
+                    initialToken,
+                    seeds,
+                    cdcRawDirectory);
         }
-        File log4jServerConfig = new File( conf, "log4j-server.xml" );
-        if ( Utils.shouldGenerateResource( project, log4jServerConfig ) )
-        {
-            getLog().debug( ( log4jServerConfig.isFile() ? "Updating " : "Creating " ) + log4jServerConfig );
-            FileUtils.copyURLToFile( getClass().getResource("/log4j2.xml"), log4jServerConfig );
+        File log4jServerConfig = new File(conf, "log4j-server.xml");
+        if (Utils.shouldGenerateResource(project, log4jServerConfig)) {
+            getLog().debug((log4jServerConfig.isFile() ? "Updating " : "Creating ") + log4jServerConfig);
+            FileUtils.copyURLToFile(getClass().getResource("/log4j2.xml"), log4jServerConfig);
         }
-        File log4jClientConfig = new File( conf, "log4j-client.xml" );
-        if ( Utils.shouldGenerateResource( project, log4jClientConfig ) )
-        {
-            getLog().debug( ( log4jClientConfig.isFile() ? "Updating " : "Creating " ) + log4jClientConfig );
-            FileUtils.copyURLToFile( getClass().getResource("/log4j2.xml"), log4jClientConfig );
+        File log4jClientConfig = new File(conf, "log4j-client.xml");
+        if (Utils.shouldGenerateResource(project, log4jClientConfig)) {
+            getLog().debug((log4jClientConfig.isFile() ? "Updating " : "Creating ") + log4jClientConfig);
+            FileUtils.copyURLToFile(getClass().getResource("/log4j2.xml"), log4jClientConfig);
         }
-        File cassandraJar = new File( bin, "cassandra.jar" );
-        if ( Utils.shouldGenerateResource( project, cassandraJar ) )
-        {
-            getLog().debug( ( cassandraJar.isFile() ? "Updating " : "Creating " ) + cassandraJar );
-            createCassandraJar( cassandraJar, CassandraMonitor.class.getName(), cassandraDir );
+        File cassandraJar = new File(bin, "cassandra.jar");
+        if (Utils.shouldGenerateResource(project, cassandraJar)) {
+            getLog().debug((cassandraJar.isFile() ? "Updating " : "Creating ") + cassandraJar);
+            createCassandraJar(cassandraJar, CassandraMonitor.class.getName(), cassandraDir);
         }
         /*
         File nodetoolJar = new File( bin, "nodetool.jar" );
@@ -410,11 +393,18 @@ protected void createCassandraHome( File cassandraDir, String listenAddress, Str
      * @param savedCaches   The saved caches directory.
      * @throws IOException If something went wrong.
      */
-    private void createCassandraYaml( File cassandraYaml, File data, File commitlog, File savedCaches, File cdcRawDirectory )
-        throws IOException
-    {
-        createCassandraYaml( cassandraYaml, data, commitlog, savedCaches, listenAddress, rpcAddress, null,
-                             new String[]{ listenAddress }, cdcRawDirectory);
+    private void createCassandraYaml(
+            File cassandraYaml, File data, File commitlog, File savedCaches, File cdcRawDirectory) throws IOException {
+        createCassandraYaml(
+                cassandraYaml,
+                data,
+                commitlog,
+                savedCaches,
+                listenAddress,
+                rpcAddress,
+                null,
+                new String[] {listenAddress},
+                cdcRawDirectory);
     }
 
     /**
@@ -429,42 +419,50 @@ private void createCassandraYaml( File cassandraYaml, File data, File commitlog,
      * @param seeds         The seeds.
      * @throws IOException If something went wrong.
      */
-    private void createCassandraYaml( File cassandraYaml, File data, File commitlog, File savedCaches,
-                                      String listenAddress, String rpcAddress, BigInteger initialToken, String[] seeds,
-                                      File cdcRawDirectory)
-        throws IOException
-    {
-        String defaults = IOUtil.toString( getClass().getResourceAsStream( "/cassandra.yaml" ) );
+    private void createCassandraYaml(
+            File cassandraYaml,
+            File data,
+            File commitlog,
+            File savedCaches,
+            String listenAddress,
+            String rpcAddress,
+            BigInteger initialToken,
+            String[] seeds,
+            File cdcRawDirectory)
+            throws IOException {
+        String defaults = IOUtil.toString(getClass().getResourceAsStream("/cassandra.yaml"));
         StringBuilder config = new StringBuilder();
-        config.append( "data_file_directories:\n" ).append( "    - " ).append( data.getAbsolutePath() ).append( "\n" );
-        config.append( "commitlog_directory: " ).append( commitlog ).append( "\n" );
-        config.append( "cdc_raw_directory: " ).append( cdcRawDirectory ).append( "\n" );
-        config.append( "saved_caches_directory: " ).append( savedCaches ).append( "\n" );
-        config.append( "initial_token: " ).append(
-            initialToken == null || "null".equals( initialToken ) ? "" : initialToken.toString() ).append( "\n" );
-        config.append( "listen_address: " ).append( listenAddress ).append( "\n" );
-        config.append( "storage_port: " ).append( storagePort ).append( "\n" );
-        config.append( "rpc_address: " ).append( rpcAddress ).append( "\n" );
-        config.append( "native_transport_port: " ).append( nativeTransportPort ).append( "\n" );
-        config.append( "start_native_transport: " ).append( startNativeTransport ).append( "\n" );
-        if ( seeds != null )
-        {
-            config.append( "seed_provider: " ).append( "\n" );
-            config.append( "    - class_name: org.apache.cassandra.locator.SimpleSeedProvider" ).append( "\n" );
-            config.append( "      parameters:" ).append( "\n" );
+        config.append("data_file_directories:\n")
+                .append("    - ")
+                .append(data.getAbsolutePath())
+                .append("\n");
+        config.append("commitlog_directory: ").append(commitlog).append("\n");
+        config.append("cdc_raw_directory: ").append(cdcRawDirectory).append("\n");
+        config.append("saved_caches_directory: ").append(savedCaches).append("\n");
+        config.append("initial_token: ")
+                .append(initialToken == null || "null".equals(initialToken) ? "" : initialToken.toString())
+                .append("\n");
+        config.append("listen_address: ").append(listenAddress).append("\n");
+        config.append("storage_port: ").append(storagePort).append("\n");
+        config.append("rpc_address: ").append(rpcAddress).append("\n");
+        config.append("native_transport_port: ").append(nativeTransportPort).append("\n");
+        config.append("start_native_transport: ").append(startNativeTransport).append("\n");
+        if (seeds != null) {
+            config.append("seed_provider: ").append("\n");
+            config.append("    - class_name: org.apache.cassandra.locator.SimpleSeedProvider")
+                    .append("\n");
+            config.append("      parameters:").append("\n");
             String sep = "          - seeds: \"";
-            for ( int i = 0; i < seeds.length; i++ )
-            {
-                config.append( sep ).append( seeds[i] );
+            for (int i = 0; i < seeds.length; i++) {
+                config.append(sep).append(seeds[i]);
                 sep = ", ";
             }
-            if ( sep.length() == 2 )
-            {
-                config.append( "\"" ).append( "\n" );
+            if (sep.length() == 2) {
+                config.append("\"").append("\n");
             }
         }
-        FileUtils.fileWrite( cassandraYaml.getAbsolutePath(),
-                             Utils.merge( Utils.merge( defaults, yaml ), config.toString() ) );
+        FileUtils.fileWrite(
+                cassandraYaml.getAbsolutePath(), Utils.merge(Utils.merge(defaults, yaml), config.toString()));
     }
 
     /**
@@ -472,25 +470,20 @@ private void createCassandraYaml( File cassandraYaml, File data, File commitlog,
      *
      * @return the Java toolchain.
      */
-    protected Toolchain getToolchain()
-    {
+    protected Toolchain getToolchain() {
         Toolchain tc = null;
 
-        try
-        {
-            if ( session != null ) // session is null in tests..
+        try {
+            if (session != null) // session is null in tests..
             {
                 ToolchainManager toolchainManager =
-                    (ToolchainManager) session.getContainer().lookup( ToolchainManager.ROLE );
+                        (ToolchainManager) session.getContainer().lookup(ToolchainManager.ROLE);
 
-                if ( toolchainManager != null )
-                {
-                    tc = toolchainManager.getToolchainFromBuildContext( "jdk", session );
+                if (toolchainManager != null) {
+                    tc = toolchainManager.getToolchainFromBuildContext("jdk", session);
                 }
             }
-        }
-        catch ( ComponentLookupException componentLookupException )
-        {
+        } catch (ComponentLookupException componentLookupException) {
             // just ignore, could happen in pre-2.0.9 builds..
         }
         return tc;
@@ -501,34 +494,26 @@ protected Toolchain getToolchain()
      *
      * @return a {@link CommandLine} to launch Java.
      */
-    protected CommandLine newJavaCommandLine()
-    {
+    protected CommandLine newJavaCommandLine() {
         String exec = null;
         Toolchain tc = getToolchain();
 
         // if the file doesn't exist & toolchain is null, java is probably in the PATH...
         // we should probably also test for isFile and canExecute, but the second one is only
         // available in SDK 6.
-        if ( tc != null )
-        {
-            getLog().info( "Toolchain in cassandra-maven-plugin: " + tc );
-            exec = tc.findTool( "java" );
-        }
-        else
-        {
-            if ( OS.isFamilyWindows() )
-            {
+        if (tc != null) {
+            getLog().info("Toolchain in cassandra-maven-plugin: " + tc);
+            exec = tc.findTool("java");
+        } else {
+            if (OS.isFamilyWindows()) {
                 String ex = "java.exe";
                 // now try to figure the path from PATH, PATHEXT env vars
                 // if bat file, wrap in cmd /c
-                String path = System.getenv( "PATH" );
-                if ( path != null )
-                {
-                    for ( String elem : StringUtils.split( path, File.pathSeparator ) )
-                    {
-                        File f = new File( new File( elem ), ex );
-                        if ( f.exists() )
-                        {
+                String path = System.getenv("PATH");
+                if (path != null) {
+                    for (String elem : StringUtils.split(path, File.pathSeparator)) {
+                        File f = new File(new File(elem), ex);
+                        if (f.exists()) {
                             exec = ex;
                             break;
                         }
@@ -537,12 +522,11 @@ protected CommandLine newJavaCommandLine()
             }
         }
 
-        if ( exec == null )
-        {
+        if (exec == null) {
             exec = "java";
         }
 
-        return new CommandLine( exec );
+        return new CommandLine(exec);
     }
 
     /**
@@ -550,10 +534,9 @@ protected CommandLine newJavaCommandLine()
      *
      * @return the environment required when launching Cassandra or the CLI tools.
      */
-    protected Map<String, String> createEnvironmentVars()
-    {
+    protected Map<String, String> createEnvironmentVars() {
         Map<String, String> enviro = new HashMap(System.getenv());
-        enviro.put( "CASSANDRA_CONF", new File( cassandraDir, "conf" ).getAbsolutePath() );
+        enviro.put("CASSANDRA_CONF", new File(cassandraDir, "conf").getAbsolutePath());
         return enviro;
     }
 
@@ -563,11 +546,9 @@ protected Map<String, String> createEnvironmentVars()
      * @return the command line to launch the cassandra server.
      * @throws IOException if there are issues creating the cassandra home directory.
      */
-    protected CommandLine newServiceCommandLine()
-        throws IOException
-    {
-        return newServiceCommandLine( cassandraDir, listenAddress, rpcAddress, null, new String[]{ listenAddress },
-                                      true, jmxPort );
+    protected CommandLine newServiceCommandLine() throws IOException {
+        return newServiceCommandLine(
+                cassandraDir, listenAddress, rpcAddress, null, new String[] {listenAddress}, true, jmxPort);
     }
 
     /**
@@ -576,76 +557,82 @@ protected CommandLine newServiceCommandLine()
      * @return the command line to launch the cassandra server.
      * @throws IOException if there are issues creating the cassandra home directory.
      */
-    protected CommandLine newServiceCommandLine( File cassandraDir, String listenAddress, String rpcAddress,
-                                                 BigInteger initialToken, String[] seeds, boolean jmxRemoteEnabled,
-                                                 int jmxPort )
-        throws IOException
-    {
-        createCassandraHome( cassandraDir, listenAddress, rpcAddress, initialToken, seeds );
+    protected CommandLine newServiceCommandLine(
+            File cassandraDir,
+            String listenAddress,
+            String rpcAddress,
+            BigInteger initialToken,
+            String[] seeds,
+            boolean jmxRemoteEnabled,
+            int jmxPort)
+            throws IOException {
+        createCassandraHome(cassandraDir, listenAddress, rpcAddress, initialToken, seeds);
         CommandLine commandLine = newJavaCommandLine();
-        commandLine.addArgument( "-Xmx" + maxMemory + "m" );
-
-        if (useJdk11Options())
-        {
-            commandLine.addArgument( "-Djdk.attach.allowAttachSelf=true" );
-            commandLine.addArgument( "--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED" );
-            commandLine.addArgument( "--add-exports=java.base/jdk.internal.ref=ALL-UNNAMED" );
-            commandLine.addArgument( "--add-exports=java.base/sun.nio.ch=ALL-UNNAMED" );
-            commandLine.addArgument( "--add-exports=java.management.rmi/com.sun.jmx.remote.internal.rmi=ALL-UNNAMED" );
-            commandLine.addArgument( "--add-exports=java.rmi/sun.rmi.registry=ALL-UNNAMED" );
-            commandLine.addArgument( "--add-exports=java.rmi/sun.rmi.server=ALL-UNNAMED" );
-            commandLine.addArgument( "--add-exports=java.sql/java.sql=ALL-UNNAMED" );
-            commandLine.addArgument( "--add-opens=java.base/java.lang.module=ALL-UNNAMED" );
-            commandLine.addArgument( "--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED" );
-            commandLine.addArgument( "--add-opens=java.base/jdk.internal.ref=ALL-UNNAMED" );
-            commandLine.addArgument( "--add-opens=java.base/jdk.internal.reflect=ALL-UNNAMED" );
-            commandLine.addArgument( "--add-opens=java.base/jdk.internal.math=ALL-UNNAMED" );
-            commandLine.addArgument( "--add-opens=java.base/jdk.internal.module=ALL-UNNAMED" );
-            commandLine.addArgument( "--add-opens=java.base/jdk.internal.util.jar=ALL-UNNAMED" );
-            commandLine.addArgument( "--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED" );
-            commandLine.addArgument( "--add-opens=java.base/java.io=ALL-UNNAMED" );
-            commandLine.addArgument( "--add-opens=java.base/java.nio=ALL-UNNAMED" );
-            commandLine.addArgument( "--add-opens=java.base/sun.nio.ch=ALL-UNNAMED" );
-            commandLine.addArgument( "--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" );
-            commandLine.addArgument( "--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" );
-            commandLine.addArgument( "--add-opens=java.base/java.util=ALL-UNNAMED" );
-            commandLine.addArgument( "--add-opens=java.xml/jdk.xml.internal=ALL-UNNAMED" );
+        commandLine.addArgument("-Xmx" + maxMemory + "m");
+
+        if (useJdk11Options()) {
+            commandLine.addArgument("-Djdk.attach.allowAttachSelf=true");
+            commandLine.addArgument("--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED");
+            commandLine.addArgument("--add-exports=java.base/jdk.internal.ref=ALL-UNNAMED");
+            commandLine.addArgument("--add-exports=java.base/sun.nio.ch=ALL-UNNAMED");
+            commandLine.addArgument("--add-exports=java.management.rmi/com.sun.jmx.remote.internal.rmi=ALL-UNNAMED");
+            commandLine.addArgument("--add-exports=java.rmi/sun.rmi.registry=ALL-UNNAMED");
+            commandLine.addArgument("--add-exports=java.rmi/sun.rmi.server=ALL-UNNAMED");
+            commandLine.addArgument("--add-exports=java.sql/java.sql=ALL-UNNAMED");
+            commandLine.addArgument("--add-opens=java.base/java.lang.module=ALL-UNNAMED");
+            commandLine.addArgument("--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED");
+            commandLine.addArgument("--add-opens=java.base/jdk.internal.ref=ALL-UNNAMED");
+            commandLine.addArgument("--add-opens=java.base/jdk.internal.reflect=ALL-UNNAMED");
+            commandLine.addArgument("--add-opens=java.base/jdk.internal.math=ALL-UNNAMED");
+            commandLine.addArgument("--add-opens=java.base/jdk.internal.module=ALL-UNNAMED");
+            commandLine.addArgument("--add-opens=java.base/jdk.internal.util.jar=ALL-UNNAMED");
+            commandLine.addArgument("--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED");
+            commandLine.addArgument("--add-opens=java.base/java.io=ALL-UNNAMED");
+            commandLine.addArgument("--add-opens=java.base/java.nio=ALL-UNNAMED");
+            commandLine.addArgument("--add-opens=java.base/sun.nio.ch=ALL-UNNAMED");
+            commandLine.addArgument("--add-opens=java.base/java.util.concurrent=ALL-UNNAMED");
+            commandLine.addArgument("--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED");
+            commandLine.addArgument("--add-opens=java.base/java.util=ALL-UNNAMED");
+            commandLine.addArgument("--add-opens=java.xml/jdk.xml.internal=ALL-UNNAMED");
         }
 
-        //Only value should be quoted so we have to do it ourselves explicitly and disable additional quotation of whole
-        //argument because it causes errors during launch. Also URLEncode.encode on value seems to work correctly too,
-        //it is done for log4j.configuration during toURL().toString() conversion.
-        commandLine.addArgument( "-Dcassandra.storagedir=" + org.apache.commons.exec.util.StringUtils.quoteArgument(cassandraDir.getAbsolutePath()), false);
-        if ( stopKey != null && stopPort > 0 && stopPort < 65536 )
-        {
-            commandLine.addArgument( "-D" + CassandraMonitor.KEY_PROPERTY_NAME + "=" + stopKey );
-            commandLine.addArgument( "-D" + CassandraMonitor.PORT_PROPERTY_NAME + "=" + stopPort );
-            commandLine.addArgument( "-D" + CassandraMonitor.HOST_PROPERTY_NAME + "=" + listenAddress );
+        // Only value should be quoted so we have to do it ourselves explicitly and disable additional quotation of
+        // whole
+        // argument because it causes errors during launch. Also URLEncode.encode on value seems to work correctly too,
+        // it is done for log4j.configuration during toURL().toString() conversion.
+        commandLine.addArgument(
+                "-Dcassandra.storagedir="
+                        + org.apache.commons.exec.util.StringUtils.quoteArgument(cassandraDir.getAbsolutePath()),
+                false);
+        if (stopKey != null && stopPort > 0 && stopPort < 65536) {
+            commandLine.addArgument("-D" + CassandraMonitor.KEY_PROPERTY_NAME + "=" + stopKey);
+            commandLine.addArgument("-D" + CassandraMonitor.PORT_PROPERTY_NAME + "=" + stopPort);
+            commandLine.addArgument("-D" + CassandraMonitor.HOST_PROPERTY_NAME + "=" + listenAddress);
         }
-        String log4jConfigurationFile = System.getProperty("log4j.configurationFile", new File( new File( cassandraDir, "conf" ),
-                                                                      "log4j-server.xml" ).toURI().toURL().toString());
-        commandLine.addArgument( "-Dlog4j.configurationFile=" + log4jConfigurationFile );
-        commandLine.addArgument( "-Dcom.sun.management.jmxremote=" + jmxRemoteEnabled );
-        commandLine.addArgument( "-DcassandraLogLevel=" + logLevel );
-        if ( jmxRemoteEnabled )
-        {
-            commandLine.addArgument( "-Dcom.sun.management.jmxremote.port=" + jmxPort );
-            commandLine.addArgument( "-Dcom.sun.management.jmxremote.ssl=false" );
-            commandLine.addArgument( "-Dcom.sun.management.jmxremote.authenticate=false" );
+        String log4jConfigurationFile = System.getProperty(
+                "log4j.configurationFile",
+                new File(new File(cassandraDir, "conf"), "log4j-server.xml")
+                        .toURI()
+                        .toURL()
+                        .toString());
+        commandLine.addArgument("-Dlog4j.configurationFile=" + log4jConfigurationFile);
+        commandLine.addArgument("-Dcom.sun.management.jmxremote=" + jmxRemoteEnabled);
+        commandLine.addArgument("-DcassandraLogLevel=" + logLevel);
+        if (jmxRemoteEnabled) {
+            commandLine.addArgument("-Dcom.sun.management.jmxremote.port=" + jmxPort);
+            commandLine.addArgument("-Dcom.sun.management.jmxremote.ssl=false");
+            commandLine.addArgument("-Dcom.sun.management.jmxremote.authenticate=false");
         }
 
-        if ( systemPropertyVariables != null && !systemPropertyVariables.isEmpty() )
-        {
-            for ( Map.Entry<String, String> entry : systemPropertyVariables.entrySet() )
-            {
-                commandLine.addArgument( "-D" + entry.getKey() + "=" + entry.getValue() );
+        if (systemPropertyVariables != null && !systemPropertyVariables.isEmpty()) {
+            for (Map.Entry<String, String> entry : systemPropertyVariables.entrySet()) {
+                commandLine.addArgument("-D" + entry.getKey() + "=" + entry.getValue());
             }
         }
 
-        commandLine.addArgument( "-jar" );
+        commandLine.addArgument("-jar");
         // It seems that java cannot handle quoted jar file names...
-        commandLine.addArgument( new File( new File( cassandraDir, "bin" ), "cassandra.jar" ).getAbsolutePath(),
-                                 false );
+        commandLine.addArgument(new File(new File(cassandraDir, "bin"), "cassandra.jar").getAbsolutePath(), false);
 
         return commandLine;
     }
@@ -657,19 +644,17 @@ protected CommandLine newServiceCommandLine( File cassandraDir, String listenAdd
      * @return the {@link CommandLine} to launch {@code nodetool} with the supplied arguments.
      * @throws IOException if there are issues creating the cassandra home directory.
      */
-    protected CommandLine newNodetoolCommandLine( String... args )
-        throws IOException
-    {
+    protected CommandLine newNodetoolCommandLine(String... args) throws IOException {
         createCassandraHome();
         CommandLine commandLine = newJavaCommandLine();
-        commandLine.addArgument( "-jar" );
+        commandLine.addArgument("-jar");
         // It seems that java cannot handle quoted jar file names...
-        commandLine.addArgument( new File( new File( cassandraDir, "bin" ), "nodetool.jar" ).getAbsolutePath(), false );
-        commandLine.addArgument( "--host" );
-        commandLine.addArgument( "127.0.0.1" );
-        commandLine.addArgument( "--port" );
-        commandLine.addArgument( Integer.toString( jmxPort ) );
-        commandLine.addArguments( args );
+        commandLine.addArgument(new File(new File(cassandraDir, "bin"), "nodetool.jar").getAbsolutePath(), false);
+        commandLine.addArgument("--host");
+        commandLine.addArgument("127.0.0.1");
+        commandLine.addArgument("--port");
+        commandLine.addArgument(Integer.toString(jmxPort));
+        commandLine.addArguments(args);
         return commandLine;
     }
 
@@ -679,25 +664,20 @@ protected CommandLine newNodetoolCommandLine( String... args )
      * @param file the file to convert to a path string.
      * @return the path string.
      */
-    private static String toPathString( File file )
-    {
+    private static String toPathString(File file) {
         String path = file.getAbsolutePath();
-        boolean hasSpaces = path.indexOf( ' ' ) != -1;
-        boolean hasDoubleQuotes = path.indexOf( '\"' ) != -1;
-        boolean hasSingleQuotes = path.indexOf( '\'' ) != -1;
-        if ( !( hasSpaces || hasDoubleQuotes || hasSingleQuotes ) )
-        {
+        boolean hasSpaces = path.indexOf(' ') != -1;
+        boolean hasDoubleQuotes = path.indexOf('\"') != -1;
+        boolean hasSingleQuotes = path.indexOf('\'') != -1;
+        if (!(hasSpaces || hasDoubleQuotes || hasSingleQuotes)) {
             return path;
         }
-        if ( !hasDoubleQuotes )
-        {
+        if (!hasDoubleQuotes) {
             return '\"' + path + '\"';
         }
-        if ( !hasSingleQuotes )
-        {
+        if (!hasSingleQuotes) {
             return '\'' + path + '\'';
         }
-        return '\"' + StringUtils.escape( path, new char[]{ '\"' }, '\'' ) + '\"';
+        return '\"' + StringUtils.escape(path, new char[] {'\"'}, '\'') + '\"';
     }
-
 }
diff --git a/src/main/java/org/codehaus/mojo/cassandra/AbstractCqlExecMojo.java b/src/main/java/org/codehaus/mojo/cassandra/AbstractCqlExecMojo.java
index 82b282d..ec0baa2 100644
--- a/src/main/java/org/codehaus/mojo/cassandra/AbstractCqlExecMojo.java
+++ b/src/main/java/org/codehaus/mojo/cassandra/AbstractCqlExecMojo.java
@@ -1,10 +1,10 @@
 package org.codehaus.mojo.cassandra;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.io.FileInputStream;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -27,14 +27,13 @@
  *
  * @author sparhomenko
  */
-public abstract class AbstractCqlExecMojo extends AbstractCassandraMojo
-{
+public abstract class AbstractCqlExecMojo extends AbstractCassandraMojo {
     /**
      * Version of CQL to use
      *
      * @since 1.2.1-2
      */
-    @Parameter(property="cql.version", defaultValue = "3.11.12")
+    @Parameter(property = "cql.version", defaultValue = "3.11.12")
     private String cqlVersion = "3.11.12";
 
     /**
@@ -42,7 +41,7 @@ public abstract class AbstractCqlExecMojo extends AbstractCassandraMojo
      *
      * @since 3.6
      */
-    @Parameter(property="cql.encoding")
+    @Parameter(property = "cql.encoding")
     protected String cqlEncoding = Charset.defaultCharset().name();
 
     /**
@@ -56,21 +55,16 @@ public abstract class AbstractCqlExecMojo extends AbstractCassandraMojo
     @Parameter(defaultValue = "false")
     protected boolean useCqlLexer = false;
 
-    protected String readFile(File file) throws MojoExecutionException
-    {
-        if (!file.isFile() || !file.exists())
-        {
+    protected String readFile(File file) throws MojoExecutionException {
+        if (!file.isFile() || !file.exists()) {
             throw new MojoExecutionException("script " + file + " does not exist.");
         }
 
-        try (InputStreamReader r = new InputStreamReader(new FileInputStream(file), cqlEncoding))
-        {
+        try (InputStreamReader r = new InputStreamReader(new FileInputStream(file), cqlEncoding)) {
             return IOUtil.toString(r);
-        } catch (FileNotFoundException e)
-        {
+        } catch (FileNotFoundException e) {
             throw new MojoExecutionException("Cql file '" + file + "' was deleted before I could read it", e);
-        } catch (IOException e)
-        {
+        } catch (IOException e) {
             throw new MojoExecutionException("Could not parse or load cql file", e);
         }
     }
diff --git a/src/main/java/org/codehaus/mojo/cassandra/AbstractCqlLoadMojo.java b/src/main/java/org/codehaus/mojo/cassandra/AbstractCqlLoadMojo.java
index 09d8e3e..c9cf8f1 100644
--- a/src/main/java/org/codehaus/mojo/cassandra/AbstractCqlLoadMojo.java
+++ b/src/main/java/org/codehaus/mojo/cassandra/AbstractCqlLoadMojo.java
@@ -10,38 +10,31 @@
  *
  * @author sparhomenko
  */
-public abstract class AbstractCqlLoadMojo extends AbstractCqlExecMojo
-{
+public abstract class AbstractCqlLoadMojo extends AbstractCqlExecMojo {
     /**
      * The CQL file to load.
      *
      */
-    @Parameter(defaultValue="${basedir}/src/cassandra/cql/load.cql")
+    @Parameter(defaultValue = "${basedir}/src/cassandra/cql/load.cql")
     private File script;
 
     /**
      * Whether to ignore errors when loading the script.
      *
      */
-    @Parameter(property="cassandra.load.failure.ignore")
+    @Parameter(property = "cassandra.load.failure.ignore")
     private boolean loadFailureIgnore;
 
-    protected void execCqlFile() throws MojoExecutionException
-    {
-        if (script != null)
-        {
+    protected void execCqlFile() throws MojoExecutionException {
+        if (script != null) {
             getLog().info("Running " + script + "...");
-            try
-            {
+            try {
                 executeCql(readFile(script));
                 getLog().info("Finished " + script + ".");
-            } catch (MojoExecutionException e)
-            {
-                if (loadFailureIgnore)
-                {
+            } catch (MojoExecutionException e) {
+                if (loadFailureIgnore) {
                     getLog().error("Script execution failed with " + e.getMessage() + ". Ignoring.");
-                } else
-                {
+                } else {
                     throw e;
                 }
             }
diff --git a/src/main/java/org/codehaus/mojo/cassandra/AbstractSchemaCassandraMojo.java b/src/main/java/org/codehaus/mojo/cassandra/AbstractSchemaCassandraMojo.java
index 231a3e9..de9de35 100644
--- a/src/main/java/org/codehaus/mojo/cassandra/AbstractSchemaCassandraMojo.java
+++ b/src/main/java/org/codehaus/mojo/cassandra/AbstractSchemaCassandraMojo.java
@@ -8,27 +8,23 @@
  * with the system_* API methods. Manages the Cql connection and delegates to
  * executeOperation on the implementation. Implementations must still implement
  * the execute method of the parent Mojo.
- * 
+ *
  * @author zznate
  */
 public abstract class AbstractSchemaCassandraMojo extends AbstractCassandraMojo {
-               
-    
+
     protected abstract void parseArguments() throws IllegalArgumentException;
 
     protected abstract CqlOperation buildOperation();
-    
+
     /**
-     * Parses the arguments then calls 
+     * Parses the arguments then calls
      */
     @Override
-    public void execute() throws MojoExecutionException, MojoFailureException 
-    {
-        try 
-        {
+    public void execute() throws MojoExecutionException, MojoFailureException {
+        try {
             parseArguments();
-        } catch (IllegalArgumentException iae) 
-        {
+        } catch (IllegalArgumentException iae) {
             throw new MojoExecutionException(iae.getMessage());
         }
         Utils.executeCql(buildOperation());
diff --git a/src/main/java/org/codehaus/mojo/cassandra/CassandraMonitor.java b/src/main/java/org/codehaus/mojo/cassandra/CassandraMonitor.java
index 5e40651..8db1b90 100644
--- a/src/main/java/org/codehaus/mojo/cassandra/CassandraMonitor.java
+++ b/src/main/java/org/codehaus/mojo/cassandra/CassandraMonitor.java
@@ -18,9 +18,6 @@
  */
 package org.codehaus.mojo.cassandra;
 
-
-import org.apache.cassandra.service.CassandraDaemon;
-
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.LineNumberReader;
@@ -28,13 +25,14 @@
 import java.net.ServerSocket;
 import java.net.Socket;
 
+import org.apache.cassandra.service.CassandraDaemon;
+
 /**
  * A Monitor for controlling the Cassandra process.
  *
  * @author stephenc
  */
-public class CassandraMonitor extends Thread
-{
+public class CassandraMonitor extends Thread {
     public static final String HOST_PROPERTY_NAME = "STOP.HOST";
 
     public static final String PORT_PROPERTY_NAME = "STOP.PORT";
@@ -52,8 +50,7 @@ public class CassandraMonitor extends Thread
      * @param key  the key to require.
      * @throws IOException if something goes wrong.
      */
-    public CassandraMonitor(String address, int port, String key) throws IOException
-    {
+    public CassandraMonitor(String address, int port, String key) throws IOException {
         this.key = key;
         serverSocket = new ServerSocket(port, 1, InetAddress.getByName(address));
         serverSocket.setReuseAddress(true);
@@ -62,63 +59,46 @@ public CassandraMonitor(String address, int port, String key) throws IOException
     /**
      * {@inheritDoc}
      */
-    public void run()
-    {
-        while (serverSocket != null)
-        {
+    public void run() {
+        while (serverSocket != null) {
             Socket socket = null;
-            try
-            {
+            try {
                 socket = serverSocket.accept();
                 socket.setSoLinger(false, 0);
                 LineNumberReader lin = new LineNumberReader(new InputStreamReader(socket.getInputStream()));
                 String key = lin.readLine();
-                if (this.key.equals(key))
-                {
+                if (this.key.equals(key)) {
                     String cmd = lin.readLine();
-                    if ("stop".equals(cmd))
-                    {
-                        try
-                        {
+                    if ("stop".equals(cmd)) {
+                        try {
                             socket.close();
-                        } catch (IOException e)
-                        {
+                        } catch (IOException e) {
                             // ignore
                         }
-                        try
-                        {
+                        try {
                             socket.close();
-                        } catch (IOException e)
-                        {
+                        } catch (IOException e) {
                             // ignore
                         }
-                        try
-                        {
+                        try {
                             serverSocket.close();
-                        } catch (IOException e)
-                        {
+                        } catch (IOException e) {
                             // ignore
                         }
                         serverSocket = null;
                         System.out.println("Killing Cassandra");
                         System.exit(0);
-                    } else
-                    {
+                    } else {
                         System.out.println("Unsupported monitor operation.");
                     }
                 }
-            } catch (IOException e)
-            {
+            } catch (IOException e) {
                 e.printStackTrace();
-            } finally
-            {
-                if (socket != null)
-                {
-                    try
-                    {
+            } finally {
+                if (socket != null) {
+                    try {
                         socket.close();
-                    } catch (IOException e)
-                    {
+                    } catch (IOException e) {
                         // ignore
                     }
                 }
@@ -133,13 +113,11 @@ public void run()
      * @param args the command line arguments.
      * @throws IOException if something goes wrong.
      */
-    public static void main(String[] args) throws IOException
-    {
+    public static void main(String[] args) throws IOException {
         String host = System.getProperty(HOST_PROPERTY_NAME, "127.0.0.1");
         String property = System.getProperty(PORT_PROPERTY_NAME);
         String key = System.getProperty(KEY_PROPERTY_NAME);
-        if (property != null && key != null)
-        {
+        if (property != null && key != null) {
             int port = Integer.parseInt(property);
             CassandraMonitor monitor = new CassandraMonitor(host, port, key);
             monitor.setDaemon(true);
diff --git a/src/main/java/org/codehaus/mojo/cassandra/CleanupCassandraMojo.java b/src/main/java/org/codehaus/mojo/cassandra/CleanupCassandraMojo.java
index 2c977bb..44b649b 100644
--- a/src/main/java/org/codehaus/mojo/cassandra/CleanupCassandraMojo.java
+++ b/src/main/java/org/codehaus/mojo/cassandra/CleanupCassandraMojo.java
@@ -18,15 +18,14 @@
  */
 package org.codehaus.mojo.cassandra;
 
-import org.apache.commons.exec.*;
+import java.io.IOException;
+import java.util.Map;
 
+import org.apache.commons.exec.*;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.Mojo;
 
-import java.io.IOException;
-import java.util.Map;
-
 /**
  * Runs {@code nodetool cleanup} on a Cassandra instance.
  *
@@ -34,20 +33,16 @@
  *
  */
 @Mojo(name = "cleanup", threadSafe = true)
-public class CleanupCassandraMojo extends AbstractCassandraMojo
-{
+public class CleanupCassandraMojo extends AbstractCassandraMojo {
     /**
      * {@inheritDoc}
      */
-    public void execute() throws MojoExecutionException, MojoFailureException
-    {
-        if (skip)
-        {
+    public void execute() throws MojoExecutionException, MojoFailureException {
+        if (skip) {
             getLog().info("Skipping cassandra: cassandra.skip==true");
             return;
         }
-        try
-        {
+        try {
             Map<String, String> environment = createEnvironmentVars();
             CommandLine commandLine = newNodetoolCommandLine("cleanup");
 
@@ -58,8 +53,7 @@ public void execute() throws MojoExecutionException, MojoFailureException
             LogOutputStream stdout = new MavenLogOutputStream(getLog());
             LogOutputStream stderr = new MavenLogOutputStream(getLog());
 
-            try
-            {
+            try {
                 getLog().debug("Executing command line: " + commandLine);
 
                 exec.setStreamHandler(new PumpStreamHandler(stdout, stderr, System.in));
@@ -67,12 +61,10 @@ public void execute() throws MojoExecutionException, MojoFailureException
                 exec.execute(commandLine, environment);
 
                 getLog().info("Cleanup triggered.");
-            } catch (IOException e)
-            {
+            } catch (IOException e) {
                 throw new MojoExecutionException("Command execution failed.", e);
             }
-        } catch (IOException e)
-        {
+        } catch (IOException e) {
             throw new MojoExecutionException(e.getLocalizedMessage(), e);
         }
     }
diff --git a/src/main/java/org/codehaus/mojo/cassandra/CompactCassandraMojo.java b/src/main/java/org/codehaus/mojo/cassandra/CompactCassandraMojo.java
index f6a7eeb..baa5963 100644
--- a/src/main/java/org/codehaus/mojo/cassandra/CompactCassandraMojo.java
+++ b/src/main/java/org/codehaus/mojo/cassandra/CompactCassandraMojo.java
@@ -18,15 +18,14 @@
  */
 package org.codehaus.mojo.cassandra;
 
-import org.apache.commons.exec.*;
+import java.io.IOException;
+import java.util.Map;
 
+import org.apache.commons.exec.*;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.Mojo;
 
-import java.io.IOException;
-import java.util.Map;
-
 /**
  * Runs {@code nodetool compact} on a Cassandra instance.
  *
@@ -34,20 +33,16 @@
  *
  */
 @Mojo(name = "compact", threadSafe = true)
-public class CompactCassandraMojo extends AbstractCassandraMojo
-{
+public class CompactCassandraMojo extends AbstractCassandraMojo {
     /**
      * {@inheritDoc}
      */
-    public void execute() throws MojoExecutionException, MojoFailureException
-    {
-        if (skip)
-        {
+    public void execute() throws MojoExecutionException, MojoFailureException {
+        if (skip) {
             getLog().info("Skipping cassandra: cassandra.skip==true");
             return;
         }
-        try
-        {
+        try {
             Map<String, String> environment = createEnvironmentVars();
             CommandLine commandLine = newNodetoolCommandLine("compact");
 
@@ -58,8 +53,7 @@ public void execute() throws MojoExecutionException, MojoFailureException
             LogOutputStream stdout = new MavenLogOutputStream(getLog());
             LogOutputStream stderr = new MavenLogOutputStream(getLog());
 
-            try
-            {
+            try {
                 getLog().debug("Executing command line: " + commandLine);
 
                 exec.setStreamHandler(new PumpStreamHandler(stdout, stderr, System.in));
@@ -67,12 +61,10 @@ public void execute() throws MojoExecutionException, MojoFailureException
                 exec.execute(commandLine, environment);
 
                 getLog().info("Compact triggered.");
-            } catch (IOException e)
-            {
+            } catch (IOException e) {
                 throw new MojoExecutionException("Command execution failed.", e);
             }
-        } catch (IOException e)
-        {
+        } catch (IOException e) {
             throw new MojoExecutionException(e.getLocalizedMessage(), e);
         }
     }
diff --git a/src/main/java/org/codehaus/mojo/cassandra/ConsoleScanner.java b/src/main/java/org/codehaus/mojo/cassandra/ConsoleScanner.java
index 983c810..a0c901b 100644
--- a/src/main/java/org/codehaus/mojo/cassandra/ConsoleScanner.java
+++ b/src/main/java/org/codehaus/mojo/cassandra/ConsoleScanner.java
@@ -25,90 +25,68 @@
  *
  * @author stephenc
  */
-public class ConsoleScanner extends Thread
-{
+public class ConsoleScanner extends Thread {
     private final Object lock = new Object();
 
     private boolean finished = false;
 
-    public ConsoleScanner()
-    {
+    public ConsoleScanner() {
         setName("Console scanner");
         setDaemon(true);
     }
 
     @Override
-    public void run()
-    {
-        try
-        {
-            while (!isFinished())
-            {
+    public void run() {
+        try {
+            while (!isFinished()) {
                 checkSystemInput();
                 getSomeSleep();
             }
-        } catch (IOException e)
-        {
+        } catch (IOException e) {
             // ignore
-        } finally
-        {
+        } finally {
             finish();
         }
     }
 
-    public boolean isFinished()
-    {
-        synchronized (lock)
-        {
+    public boolean isFinished() {
+        synchronized (lock) {
             return finished;
         }
     }
 
-    private void getSomeSleep()
-    {
-        try
-        {
+    private void getSomeSleep() {
+        try {
             Thread.sleep(500);
-        } catch (InterruptedException e)
-        {
+        } catch (InterruptedException e) {
             // ignore
         }
     }
 
-    private void checkSystemInput() throws IOException
-    {
-        while (System.in.available() > 0)
-        {
+    private void checkSystemInput() throws IOException {
+        while (System.in.available() > 0) {
             int input = System.in.read();
-            if (input >= 0)
-            {
+            if (input >= 0) {
                 char c = (char) input;
-                if (c == '\n')
-                {
+                if (c == '\n') {
                     finish();
                 }
-            } else
-            {
+            } else {
                 finish();
             }
         }
     }
 
-    public void finish()
-    {
-        synchronized (lock)
-        {
+    public void finish() {
+        synchronized (lock) {
             finished = true;
             lock.notifyAll();
         }
     }
 
-    public void waitForFinished() throws InterruptedException
-    {
-        synchronized (lock)
-        {
-            while (!finished)
-            {
+    public void waitForFinished() throws InterruptedException {
+        synchronized (lock) {
+            while (!finished) {
                 lock.wait();
             }
         }
diff --git a/src/main/java/org/codehaus/mojo/cassandra/CqlExecCassandraMojo.java b/src/main/java/org/codehaus/mojo/cassandra/CqlExecCassandraMojo.java
index 2889674..e06cdf6 100644
--- a/src/main/java/org/codehaus/mojo/cassandra/CqlExecCassandraMojo.java
+++ b/src/main/java/org/codehaus/mojo/cassandra/CqlExecCassandraMojo.java
@@ -23,82 +23,78 @@
 @Mojo(name = "cql-exec", threadSafe = true, defaultPhase = LifecyclePhase.PRE_INTEGRATION_TEST)
 public class CqlExecCassandraMojo extends AbstractCqlExecMojo {
 
-  /**
-   * The CQL script which will be executed
-   */
-  @Parameter(property="cassandra.cql.script", defaultValue="${basedir}/src/cassandra/cql/exec.cql")
-  protected File cqlScript;
+    /**
+     * The CQL script which will be executed
+     */
+    @Parameter(property = "cassandra.cql.script", defaultValue = "${basedir}/src/cassandra/cql/exec.cql")
+    protected File cqlScript;
 
-  /**
-   * The CQL statement to execute singularly
-   *
-   */
-  @Parameter(property="cql.statement")
-  protected String cqlStatement;
+    /**
+     * The CQL statement to execute singularly
+     *
+     */
+    @Parameter(property = "cql.statement")
+    protected String cqlStatement;
 
-  /**
-   * Expected type of the column value
-   */
-  @Parameter(property="cql.defaultValidator")
-  protected String defaultValidator = "BytesType";
+    /**
+     * Expected type of the column value
+     */
+    @Parameter(property = "cql.defaultValidator")
+    protected String defaultValidator = "BytesType";
 
-  /**
-   * Expected type of the key
-   *
-   */
-  @Parameter(property="cql.keyValidator")
-  protected String keyValidator = "BytesType";
+    /**
+     * Expected type of the key
+     *
+     */
+    @Parameter(property = "cql.keyValidator")
+    protected String keyValidator = "BytesType";
 
-  /**
-   * Expected type of the column name
-   *
-   */
-  @Parameter(property="cql.comparator")
-  protected String comparator = "BytesType";
+    /**
+     * Expected type of the column name
+     *
+     */
+    @Parameter(property = "cql.comparator")
+    protected String comparator = "BytesType";
 
-  private AbstractType<?> comparatorVal;
-  private AbstractType<?> keyValidatorVal;
-  private AbstractType<?> defaultValidatorVal;
+    private AbstractType<?> comparatorVal;
+    private AbstractType<?> keyValidatorVal;
+    private AbstractType<?> defaultValidatorVal;
 
-  @Override
-  public void execute() throws MojoExecutionException, MojoFailureException {
-      if (skip)
-      {
-          getLog().info("Skipping cassandra: cassandra.skip==true");
-          return;
-      }
-      try
-      {
-          comparatorVal = TypeParser.parse(comparator);
-          keyValidatorVal = TypeParser.parse(keyValidator);
-          defaultValidatorVal = TypeParser.parse(defaultValidator);
+    @Override
+    public void execute() throws MojoExecutionException, MojoFailureException {
+        if (skip) {
+            getLog().info("Skipping cassandra: cassandra.skip==true");
+            return;
+        }
+        try {
+            comparatorVal = TypeParser.parse(comparator);
+            keyValidatorVal = TypeParser.parse(keyValidator);
+            defaultValidatorVal = TypeParser.parse(defaultValidator);
 
-      } catch (ConfigurationException | SyntaxException e)
-      {
-        throw new MojoExecutionException("Could not parse comparator value: " + comparator, e);
-      }
-      if (cqlScript != null && cqlScript.isFile())
-      {
-          cqlStatement = readFile(cqlScript);
-      }
+        } catch (ConfigurationException | SyntaxException e) {
+            throw new MojoExecutionException("Could not parse comparator value: " + comparator, e);
+        }
+        if (cqlScript != null && cqlScript.isFile()) {
+            cqlStatement = readFile(cqlScript);
+        }
 
-      printResults(executeCql(cqlStatement));
-  }
+        printResults(executeCql(cqlStatement));
+    }
 
-  /*
-   * Encapsulate print of CqlResult. Uses specified configuration options to format results
-   */
-  private void printResults(List<Row> results) {
-      // TODO fix ghetto formatting
-      getLog().info("-----------------------------------------------");
-      for (Row result : results) {
-          printRow(result);
-      }
-  }
+    /*
+     * Encapsulate print of CqlResult. Uses specified configuration options to format results
+     */
+    private void printResults(List<Row> results) {
+        // TODO fix ghetto formatting
+        getLog().info("-----------------------------------------------");
+        for (Row result : results) {
+            printRow(result);
+        }
+    }
 
-  private void printRow(Row row) {
-      getLog().info("-----------------------------------------------");
-      getLog().info(row.getFormattedContents());
-      getLog().info("-----------------------------------------------");
-  }
+    private void printRow(Row row) {
+        getLog().info("-----------------------------------------------");
+        getLog().info(row.getFormattedContents());
+        getLog().info("-----------------------------------------------");
+    }
 }
diff --git a/src/main/java/org/codehaus/mojo/cassandra/CqlExecutionException.java b/src/main/java/org/codehaus/mojo/cassandra/CqlExecutionException.java
index 156baa7..702634c 100644
--- a/src/main/java/org/codehaus/mojo/cassandra/CqlExecutionException.java
+++ b/src/main/java/org/codehaus/mojo/cassandra/CqlExecutionException.java
@@ -1,8 +1,8 @@
 package org.codehaus.mojo.cassandra;
 
 import com.datastax.oss.driver.api.core.AllNodesFailedException;
-import com.datastax.oss.driver.api.core.DriverExecutionException;
 import com.datastax.oss.driver.api.core.DriverException;
+import com.datastax.oss.driver.api.core.DriverExecutionException;
 import com.datastax.oss.driver.api.core.DriverTimeoutException;
 import com.datastax.oss.driver.api.core.InvalidKeyspaceException;
 import com.datastax.oss.driver.api.core.servererrors.CoordinatorException;
@@ -31,23 +31,23 @@ public CqlExecutionException(Throwable t) {
         super(ERR_MSG + deduceExceptionMessage(t), t);
     }
 
-
     private static String deduceExceptionMessage(Throwable t) {
         StringBuilder msg = new StringBuilder("Details: ");
         if (t instanceof AllNodesFailedException)
-            msg.append("AllNodesFailedException, the query failed on all the coordinators it was tried on. ").append(((AllNodesFailedException) t).getAllErrors());
+            msg.append("AllNodesFailedException, the query failed on all the coordinators it was tried on. ")
+                    .append(((AllNodesFailedException) t).getAllErrors());
         else if (t instanceof CoordinatorException)
-            msg.append("CoordinatorException, got a server-side error thrown by the coordinator node in response to the query. ").append(t.getCause());
+            msg.append(
+                            "CoordinatorException, got a server-side error thrown by the coordinator node in response to the query. ")
+                    .append(t.getCause());
         else if (t instanceof DriverExecutionException)
             msg.append("DriverExecutionException, Query failed due to an underlying checked Exception");
-        else if (t instanceof DriverTimeoutException)
-            msg.append("DriverTimeoutException, Query timed out");
+        else if (t instanceof DriverTimeoutException) msg.append("DriverTimeoutException, Query timed out");
         else if (t instanceof InvalidKeyspaceException)
             msg.append("InvalidKeyspaceException, Provided Keyspace is invalid");
         else if (t instanceof DriverException)
             msg.append("Datastax Driver Exception: ").append(t.getCause());
-        else
-            msg.append("n/a");
+        else msg.append("n/a");
         return msg.toString();
     }
 }
diff --git a/src/main/java/org/codehaus/mojo/cassandra/CqlOperation.java b/src/main/java/org/codehaus/mojo/cassandra/CqlOperation.java
index c36464c..8c41b69 100644
--- a/src/main/java/org/codehaus/mojo/cassandra/CqlOperation.java
+++ b/src/main/java/org/codehaus/mojo/cassandra/CqlOperation.java
@@ -1,7 +1,6 @@
 package org.codehaus.mojo.cassandra;
 
 import com.datastax.oss.driver.api.core.CqlSession;
-import com.datastax.oss.driver.api.core.DriverException;
 
 public abstract class CqlOperation {
 
diff --git a/src/main/java/org/codehaus/mojo/cassandra/DeleteCassandraMojo.java b/src/main/java/org/codehaus/mojo/cassandra/DeleteCassandraMojo.java
index ca041a1..021c56d 100644
--- a/src/main/java/org/codehaus/mojo/cassandra/DeleteCassandraMojo.java
+++ b/src/main/java/org/codehaus/mojo/cassandra/DeleteCassandraMojo.java
@@ -18,6 +18,9 @@
  */
 package org.codehaus.mojo.cassandra;
 
+import java.io.File;
+import java.io.IOException;
+
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
@@ -25,9 +28,6 @@
 import org.apache.maven.plugins.annotations.Parameter;
 import org.codehaus.plexus.util.FileUtils;
 
-import java.io.File;
-import java.io.IOException;
-
 /**
  * Deletes the Cassandra home directory that we create for running Cassandra.
  *
@@ -35,20 +35,19 @@
  *
  */
 @Mojo(name = "delete", threadSafe = true)
-public class DeleteCassandraMojo extends AbstractMojo
-{
+public class DeleteCassandraMojo extends AbstractMojo {
     /**
      * The directory to hold cassandra's database.
      *
      */
-    @Parameter(defaultValue="${project.build.directory}/cassandra")
+    @Parameter(defaultValue = "${project.build.directory}/cassandra")
     protected File cassandraDir;
 
     /**
      * Skip the execution.
      *
      */
-    @Parameter(property="cassandra.skip", defaultValue="false")
+    @Parameter(property = "cassandra.skip", defaultValue = "false")
     private boolean skip;
 
     /**
@@ -56,27 +55,22 @@ public class DeleteCassandraMojo extends AbstractMojo
      *
      * @since 2.0.0-1
      */
-    @Parameter(property="cassandra.failOnError", defaultValue="true")
+    @Parameter(property = "cassandra.failOnError", defaultValue = "true")
     protected boolean failOnError;
 
     /**
      * {@inheritDoc}
      */
-    public void execute() throws MojoExecutionException, MojoFailureException
-    {
-        if (skip)
-        {
+    public void execute() throws MojoExecutionException, MojoFailureException {
+        if (skip) {
             getLog().info("Skipping cassandra: cassandra.skip==true");
             return;
         }
-        try
-        {
+        try {
             getLog().info("Deleting " + cassandraDir.getAbsolutePath());
             FileUtils.deleteDirectory(cassandraDir);
-        } catch (IOException e)
-        {
-            if (failOnError)
-            {
+        } catch (IOException e) {
+            if (failOnError) {
                 throw new MojoFailureException(e.getLocalizedMessage(), e);
             }
             getLog().warn("Failed to delete " + cassandraDir.getAbsolutePath(), e);
diff --git a/src/main/java/org/codehaus/mojo/cassandra/DropColumnFamiliesMojo.java b/src/main/java/org/codehaus/mojo/cassandra/DropColumnFamiliesMojo.java
index a86e685..652ab5e 100644
--- a/src/main/java/org/codehaus/mojo/cassandra/DropColumnFamiliesMojo.java
+++ b/src/main/java/org/codehaus/mojo/cassandra/DropColumnFamiliesMojo.java
@@ -9,9 +9,9 @@
 import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.dropTable;
 
 /**
- * Drop the specified ColumnFamilies or, if no arguments are given, 
- * the specified Keyspace 
- * 
+ * Drop the specified ColumnFamilies or, if no arguments are given,
+ * the specified Keyspace
+ *
  * @author zznate
  *
  */
@@ -19,10 +19,10 @@
 public class DropColumnFamiliesMojo extends AbstractSchemaCassandraMojo {
 
     /**
-     * The one or more comma-delimited ColumnFamilies against to be dropped. 
+     * The one or more comma-delimited ColumnFamilies against to be dropped.
      * If not specified, the Keyspace will be dropped.
      */
-    @Parameter(property="cassandra.columnFamilies")
+    @Parameter(property = "cassandra.columnFamilies")
     protected String columnFamilies;
 
     @Override
@@ -34,15 +34,13 @@ protected CqlOperation buildOperation() {
 
     private String[] columnFamilyList;
 
-    protected void parseArguments() throws IllegalArgumentException
-    {
-        if (StringUtils.isNotBlank(keyspace)) 
-        {
+    protected void parseArguments() throws IllegalArgumentException {
+        if (StringUtils.isNotBlank(keyspace)) {
             // keyspace is a required parameter but somebody could provide -Dkeyspace=
             // which would cause issues
             throw new IllegalArgumentException("The keyspace to drop column families from cannot be empty");
         }
-    
+
         columnFamilyList = StringUtils.split(columnFamilies, ',');
     }
 
@@ -53,7 +51,7 @@ public DropTableOperation(String rpcAddress, int nativeTransportPort) {
         }
 
         @Override
-        public void executeOperation(CqlSession cqlSession) throws CqlExecutionException{
+        public void executeOperation(CqlSession cqlSession) throws CqlExecutionException {
             try {
                 if (columnFamilyList != null && columnFamilyList.length > 0) {
                     for (String s : columnFamilyList) {
diff --git a/src/main/java/org/codehaus/mojo/cassandra/FlushCassandraMojo.java b/src/main/java/org/codehaus/mojo/cassandra/FlushCassandraMojo.java
index 8da9464..7f208d7 100644
--- a/src/main/java/org/codehaus/mojo/cassandra/FlushCassandraMojo.java
+++ b/src/main/java/org/codehaus/mojo/cassandra/FlushCassandraMojo.java
@@ -18,6 +18,9 @@
  */
 package org.codehaus.mojo.cassandra;
 
+import java.io.IOException;
+import java.util.Map;
+
 import org.apache.commons.exec.CommandLine;
 import org.apache.commons.exec.DefaultExecutor;
 import org.apache.commons.exec.Executor;
@@ -28,9 +31,6 @@
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.Mojo;
 
-import java.io.IOException;
-import java.util.Map;
-
 /**
  * Runs {@code nodetool flush} on a Cassandra instance.
  *
@@ -38,20 +38,16 @@
  *
  */
 @Mojo(name = "flush", threadSafe = true)
-public class FlushCassandraMojo extends AbstractCassandraMojo
-{
+public class FlushCassandraMojo extends AbstractCassandraMojo {
     /**
      * {@inheritDoc}
      */
-    public void execute() throws MojoExecutionException, MojoFailureException
-    {
-        if (skip)
-        {
+    public void execute() throws MojoExecutionException, MojoFailureException {
+        if (skip) {
             getLog().info("Skipping cassandra: cassandra.skip==true");
             return;
         }
-        try
-        {
+        try {
             Map environment = createEnvironmentVars();
             CommandLine commandLine = newNodetoolCommandLine("flush");
 
@@ -62,8 +58,7 @@ public void execute() throws MojoExecutionException, MojoFailureException
             LogOutputStream stdout = new MavenLogOutputStream(getLog());
             LogOutputStream stderr = new MavenLogOutputStream(getLog());
 
-            try
-            {
+            try {
                 getLog().debug("Executing command line: " + commandLine);
 
                 exec.setStreamHandler(new PumpStreamHandler(stdout, stderr, System.in));
@@ -71,12 +66,10 @@ public void execute() throws MojoExecutionException, MojoFailureException
                 exec.execute(commandLine, environment);
 
                 getLog().info("Flush triggered.");
-            } catch (IOException e)
-            {
+            } catch (IOException e) {
                 throw new MojoExecutionException("Command execution failed.", e);
             }
-        } catch (IOException e)
-        {
+        } catch (IOException e) {
             throw new MojoExecutionException(e.getLocalizedMessage(), e);
         }
     }
diff --git a/src/main/java/org/codehaus/mojo/cassandra/LoadCassandraMojo.java b/src/main/java/org/codehaus/mojo/cassandra/LoadCassandraMojo.java
index 436119c..5692298 100644
--- a/src/main/java/org/codehaus/mojo/cassandra/LoadCassandraMojo.java
+++ b/src/main/java/org/codehaus/mojo/cassandra/LoadCassandraMojo.java
@@ -29,15 +29,12 @@
  * @author stephenc
  */
 @Mojo(name = "load", threadSafe = true, defaultPhase = LifecyclePhase.PRE_INTEGRATION_TEST)
-public class LoadCassandraMojo extends AbstractCqlLoadMojo
-{
+public class LoadCassandraMojo extends AbstractCqlLoadMojo {
     /**
      * {@inheritDoc}
      */
-    public void execute() throws MojoExecutionException, MojoFailureException
-    {
-        if (skip)
-        {
+    public void execute() throws MojoExecutionException, MojoFailureException {
+        if (skip) {
             getLog().info("Skipping cassandra: cassandra.skip==true");
             return;
         }
diff --git a/src/main/java/org/codehaus/mojo/cassandra/MavenLogOutputStream.java b/src/main/java/org/codehaus/mojo/cassandra/MavenLogOutputStream.java
index d126eae..1087779 100644
--- a/src/main/java/org/codehaus/mojo/cassandra/MavenLogOutputStream.java
+++ b/src/main/java/org/codehaus/mojo/cassandra/MavenLogOutputStream.java
@@ -19,7 +19,6 @@
 package org.codehaus.mojo.cassandra;
 
 import org.apache.commons.exec.LogOutputStream;
-
 import org.apache.maven.plugin.logging.Log;
 
 /**
@@ -27,8 +26,7 @@
  *
  * @author stephenc
  */
-class MavenLogOutputStream extends LogOutputStream
-{
+class MavenLogOutputStream extends LogOutputStream {
     private final Log outputLog;
 
     /**
@@ -36,16 +34,14 @@ class MavenLogOutputStream extends LogOutputStream
      *
      * @param outputLog the {@link Log} to send output.
      */
-    public MavenLogOutputStream(Log outputLog)
-    {
+    public MavenLogOutputStream(Log outputLog) {
         this.outputLog = outputLog;
     }
 
     /**
      * {@inheritDoc}
      */
-    protected void processLine(String line, int level)
-    {
+    protected void processLine(String line, int level) {
         outputLog.info(line);
     }
 }
diff --git a/src/main/java/org/codehaus/mojo/cassandra/RepairCassandraMojo.java b/src/main/java/org/codehaus/mojo/cassandra/RepairCassandraMojo.java
index cc68fd6..63e7fab 100644
--- a/src/main/java/org/codehaus/mojo/cassandra/RepairCassandraMojo.java
+++ b/src/main/java/org/codehaus/mojo/cassandra/RepairCassandraMojo.java
@@ -18,35 +18,30 @@
  */
 package org.codehaus.mojo.cassandra;
 
-import org.apache.commons.exec.*;
+import java.io.IOException;
+import java.util.Map;
 
+import org.apache.commons.exec.*;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.Mojo;
 
-import java.io.IOException;
-import java.util.Map;
-
 /**
  * Runs {@code nodetool repair} on a Cassandra instance.
  *
  * @author stephenc
  */
 @Mojo(name = "repair", threadSafe = true)
-public class RepairCassandraMojo extends AbstractCassandraMojo
-{
+public class RepairCassandraMojo extends AbstractCassandraMojo {
     /**
      * {@inheritDoc}
      */
-    public void execute() throws MojoExecutionException, MojoFailureException
-    {
-        if (skip)
-        {
+    public void execute() throws MojoExecutionException, MojoFailureException {
+        if (skip) {
             getLog().info("Skipping cassandra: cassandra.skip==true");
             return;
         }
-        try
-        {
+        try {
             Map<String, String> environment = createEnvironmentVars();
             CommandLine commandLine = newNodetoolCommandLine("repair");
 
@@ -57,8 +52,7 @@ public void execute() throws MojoExecutionException, MojoFailureException
             LogOutputStream stdout = new MavenLogOutputStream(getLog());
             LogOutputStream stderr = new MavenLogOutputStream(getLog());
 
-            try
-            {
+            try {
                 getLog().debug("Executing command line: " + commandLine);
 
                 exec.setStreamHandler(new PumpStreamHandler(stdout, stderr, System.in));
@@ -66,12 +60,10 @@ public void execute() throws MojoExecutionException, MojoFailureException
                 exec.execute(commandLine, environment);
 
                 getLog().info("Repair triggered.");
-            } catch (IOException e)
-            {
+            } catch (IOException e) {
                 throw new MojoExecutionException("Command execution failed.", e);
             }
-        } catch (IOException e)
-        {
+        } catch (IOException e) {
             throw new MojoExecutionException(e.getLocalizedMessage(), e);
         }
     }
diff --git a/src/main/java/org/codehaus/mojo/cassandra/RunCassandraMojo.java b/src/main/java/org/codehaus/mojo/cassandra/RunCassandraMojo.java
index c6919e3..2f8f39e 100644
--- a/src/main/java/org/codehaus/mojo/cassandra/RunCassandraMojo.java
+++ b/src/main/java/org/codehaus/mojo/cassandra/RunCassandraMojo.java
@@ -33,14 +33,12 @@
  *
  */
 @Mojo(name = "run", threadSafe = true)
-public class RunCassandraMojo
-    extends AbstractCqlLoadMojo
-{
+public class RunCassandraMojo extends AbstractCqlLoadMojo {
     /**
      * When {@code true}, if this is a clean start then the load script will be applied automatically.
      *
      */
-    @Parameter(property="cassandra.load.after.first.start", defaultValue="true")
+    @Parameter(property = "cassandra.load.after.first.start", defaultValue = "true")
     private boolean loadAfterFirstStart;
 
     /**
@@ -48,7 +46,7 @@ public class RunCassandraMojo
      *
      * @since 1.2.1-2
      */
-    @Parameter(property="cassandra.cu.load.failure.ignore")
+    @Parameter(property = "cassandra.cu.load.failure.ignore")
     private boolean cuLoadFailureIgnore;
 
     /**
@@ -56,69 +54,51 @@ public class RunCassandraMojo
      *
      * @since 1.2.1-2
      */
-    @Parameter(property="cassandra.cu.load.after.first.start", defaultValue="true")
+    @Parameter(property = "cassandra.cu.load.after.first.start", defaultValue = "true")
     private boolean cuLoadAfterFirstStart;
 
     /**
      * {@inheritDoc}
      */
-    public void execute()
-        throws MojoExecutionException, MojoFailureException
-    {
-        if ( skip )
-        {
-            getLog().info( "Skipping cassandra: cassandra.skip==true" );
+    public void execute() throws MojoExecutionException, MojoFailureException {
+        if (skip) {
+            getLog().info("Skipping cassandra: cassandra.skip==true");
             return;
         }
         long timeStamp = System.currentTimeMillis();
         boolean isClean = !cassandraDir.isDirectory();
-        getLog().debug(
-            ( isClean ? "First start of Cassandra instance in " : "Re-using existing Cassandra instance in " )
-                + cassandraDir.getAbsolutePath() );
-        try
-        {
-            DefaultExecuteResultHandler execHandler =
-                Utils.startCassandraServer( cassandraDir, newServiceCommandLine(), createEnvironmentVars(), getLog() );
-            try
-            {
-                getLog().info( "Waiting for Cassandra to start..." );
-                Utils.waitUntilStarted( rpcAddress, nativeTransportPort, 0, getLog() );
+        getLog().debug((isClean ? "First start of Cassandra instance in " : "Re-using existing Cassandra instance in ")
+                + cassandraDir.getAbsolutePath());
+        try {
+            DefaultExecuteResultHandler execHandler = Utils.startCassandraServer(
+                    cassandraDir, newServiceCommandLine(), createEnvironmentVars(), getLog());
+            try {
+                getLog().info("Waiting for Cassandra to start...");
+                Utils.waitUntilStarted(rpcAddress, nativeTransportPort, 0, getLog());
 
-                if ( isClean && loadAfterFirstStart)
-                {
+                if (isClean && loadAfterFirstStart) {
                     execCqlFile();
                 }
 
-                getLog().info(
-                    "Cassandra started in " + ( ( System.currentTimeMillis() - timeStamp ) / 100L ) / 10.0 + "s" );
+                getLog().info("Cassandra started in " + ((System.currentTimeMillis() - timeStamp) / 100L) / 10.0 + "s");
                 ConsoleScanner consoleScanner = new ConsoleScanner();
                 consoleScanner.start();
-                getLog().info( "Hit ENTER on the console to stop Cassandra and continue the build." );
-                try
-                {
+                getLog().info("Hit ENTER on the console to stop Cassandra and continue the build.");
+                try {
                     consoleScanner.waitForFinished();
-                }
-                catch ( InterruptedException e )
-                {
+                } catch (InterruptedException e) {
                     // ignore
                 }
-            }
-            finally
-            {
+            } finally {
                 Utils.stopCassandraServer(rpcAddress, nativeTransportPort, listenAddress, stopPort, stopKey, getLog());
-                try
-                {
+                try {
                     execHandler.waitFor();
-                }
-                catch ( InterruptedException e )
-                {
+                } catch (InterruptedException e) {
                     // ignore
                 }
             }
-        }
-        catch ( IOException e )
-        {
-            throw new MojoExecutionException( e.getLocalizedMessage(), e );
+        } catch (IOException e) {
+            throw new MojoExecutionException(e.getLocalizedMessage(), e);
         }
     }
 }
diff --git a/src/main/java/org/codehaus/mojo/cassandra/StartCassandraClusterMojo.java b/src/main/java/org/codehaus/mojo/cassandra/StartCassandraClusterMojo.java
index a8d8a5e..5e156c9 100644
--- a/src/main/java/org/codehaus/mojo/cassandra/StartCassandraClusterMojo.java
+++ b/src/main/java/org/codehaus/mojo/cassandra/StartCassandraClusterMojo.java
@@ -18,17 +18,17 @@
  */
 package org.codehaus.mojo.cassandra;
 
+import java.io.File;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.Arrays;
+
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 
-import java.io.File;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.Arrays;
-
 /**
  * Starts a Cassandra instance in the background.
  *
@@ -36,22 +36,20 @@
  *
  */
 @Mojo(name = "start-cluster", threadSafe = true, defaultPhase = LifecyclePhase.PRE_INTEGRATION_TEST)
-public class StartCassandraClusterMojo
-    extends AbstractCqlLoadMojo
-{
+public class StartCassandraClusterMojo extends AbstractCqlLoadMojo {
     /**
      * How long to wait for Cassandra to be started before finishing the goal. A value of 0 will wait indefinately. A
      * value of -1 will not wait at all.
      *
      */
-    @Parameter(defaultValue="180")
+    @Parameter(defaultValue = "180")
     protected int startWaitSeconds;
 
     /**
      * When {@code true}, if this is a clean start then the load script will be applied automatically.
      *
      */
-    @Parameter( property="cassandra.load.after.first.start", defaultValue="true")
+    @Parameter(property = "cassandra.load.after.first.start", defaultValue = "true")
     private boolean loadAfterFirstStart;
 
     /**
@@ -59,7 +57,7 @@ public class StartCassandraClusterMojo
      *
      * @since 1.2.1-2
      */
-    @Parameter(property="cassandra.cu.load.failure.ignore")
+    @Parameter(property = "cassandra.cu.load.failure.ignore")
     private boolean cuLoadFailureIgnore;
 
     /**
@@ -67,14 +65,14 @@ public class StartCassandraClusterMojo
      *
      * @since 1.2.1-2
      */
-    @Parameter(property="cassandra.cu.load.after.first.start", defaultValue="true")
+    @Parameter(property = "cassandra.cu.load.after.first.start", defaultValue = "true")
     private boolean cuLoadAfterFirstStart;
 
     /**
      * The number of nodes in the cluster.
      *
      */
-    @Parameter(property="cassandra.cluster.size", defaultValue="4")
+    @Parameter(property = "cassandra.cluster.size", defaultValue = "4")
     private int clusterSize;
 
     /**
@@ -83,96 +81,92 @@ public class StartCassandraClusterMojo
      *
      * @since 3.7
      */
-    @Parameter(property="cassandra.addJdk11Options", defaultValue="false")
+    @Parameter(property = "cassandra.addJdk11Options", defaultValue = "false")
     protected boolean addJdk11Options;
 
     @Override
-    protected boolean useJdk11Options( )
-    {
+    protected boolean useJdk11Options() {
         return addJdk11Options;
     }
 
     /**
      * {@inheritDoc}
      */
-    public void execute()
-        throws MojoExecutionException, MojoFailureException
-    {
-        if ( skip )
-        {
-            getLog().info( "Skipping cassandra: cassandra.skip==true" );
+    public void execute() throws MojoExecutionException, MojoFailureException {
+        if (skip) {
+            getLog().info("Skipping cassandra: cassandra.skip==true");
             return;
         }
-        if ( clusterSize < 1 )
-        {
+        if (clusterSize < 1) {
             throw new MojoExecutionException(
-                "Invalid cluster size of " + clusterSize + " specified. Must be at least 1" );
+                    "Invalid cluster size of " + clusterSize + " specified. Must be at least 1");
         }
-        if ( clusterSize > 254 )
-        {
+        if (clusterSize > 254) {
             throw new MojoExecutionException(
-                "Invalid cluster size of " + clusterSize + " specified. Must be less than 254" );
+                    "Invalid cluster size of " + clusterSize + " specified. Must be less than 254");
         }
         File[] cassandraDir = new File[clusterSize];
         BigInteger[] initialToken = new BigInteger[clusterSize];
         String[] listenAddress = new String[clusterSize];
         boolean isClean = true;
-        for ( int node = 0; node < clusterSize; node++ )
-        {
-            listenAddress[node] = "127.0.0." + ( node + 1 );
-            initialToken[node] = BigInteger.valueOf( 2 ).pow( 127 ).multiply( BigInteger.valueOf( node ) ).divide(
-                BigInteger.valueOf( clusterSize ) );
+        for (int node = 0; node < clusterSize; node++) {
+            listenAddress[node] = "127.0.0." + (node + 1);
+            initialToken[node] = BigInteger.valueOf(2)
+                    .pow(127)
+                    .multiply(BigInteger.valueOf(node))
+                    .divide(BigInteger.valueOf(clusterSize));
             cassandraDir[node] =
-                new File( this.cassandraDir.getParent(), this.cassandraDir.getName() + "-node" + ( node + 1 ) );
-            if ( isClean && cassandraDir[node].isDirectory() )
-            {
-                getLog().debug( "Re-using existing Cassandra cluster in " + cassandraDir[node].getAbsolutePath() );
+                    new File(this.cassandraDir.getParent(), this.cassandraDir.getName() + "-node" + (node + 1));
+            if (isClean && cassandraDir[node].isDirectory()) {
+                getLog().debug("Re-using existing Cassandra cluster in " + cassandraDir[node].getAbsolutePath());
                 isClean = false;
             }
         }
         long timeStamp = System.currentTimeMillis();
-        if ( isClean )
-        {
-            getLog().debug( "First start of Cassandra cluster in " + Arrays.asList( cassandraDir ) );
+        if (isClean) {
+            getLog().debug("First start of Cassandra cluster in " + Arrays.asList(cassandraDir));
         }
-        try
-        {
-            for ( int node = 0; node < clusterSize; node++ )
-            {
-                getLog().info( "Starting for Cassandra Node " + ( node + 1 ) + "..." );
-                Utils.startCassandraServer( cassandraDir[node],
-                                            newServiceCommandLine( cassandraDir[node], listenAddress[node],
-                                                                   listenAddress[node], initialToken[node],
-                                                                   listenAddress, node == 0, node == 0 ? jmxPort : 0 ),
-                                            createEnvironmentVars(), getLog() );
+        try {
+            for (int node = 0; node < clusterSize; node++) {
+                getLog().info("Starting for Cassandra Node " + (node + 1) + "...");
+                Utils.startCassandraServer(
+                        cassandraDir[node],
+                        newServiceCommandLine(
+                                cassandraDir[node],
+                                listenAddress[node],
+                                listenAddress[node],
+                                initialToken[node],
+                                listenAddress,
+                                node == 0,
+                                node == 0 ? jmxPort : 0),
+                        createEnvironmentVars(),
+                        getLog());
             }
 
-            if ( startWaitSeconds >= 0 )
-            {
-                for ( int node = 0; node < clusterSize; node++ )
-                {
-                    getLog().info( "Waiting for Cassandra Node " + ( node + 1 ) + " to start..." );
-                    boolean started =
-                        Utils.waitUntilStarted( listenAddress[node], nativeTransportPort, startWaitSeconds, getLog() );
-                    if ( !started )
-                    {
-                        Utils.stopCassandraServer( listenAddress[node], nativeTransportPort, listenAddress[node], stopPort, stopKey,
-                                                   getLog() );
-                        throw new MojoFailureException( "Cassandra failed to start within " + startWaitSeconds + "s" );
+            if (startWaitSeconds >= 0) {
+                for (int node = 0; node < clusterSize; node++) {
+                    getLog().info("Waiting for Cassandra Node " + (node + 1) + " to start...");
+                    boolean started = Utils.waitUntilStarted(
+                            listenAddress[node], nativeTransportPort, startWaitSeconds, getLog());
+                    if (!started) {
+                        Utils.stopCassandraServer(
+                                listenAddress[node],
+                                nativeTransportPort,
+                                listenAddress[node],
+                                stopPort,
+                                stopKey,
+                                getLog());
+                        throw new MojoFailureException("Cassandra failed to start within " + startWaitSeconds + "s");
                     }
                 }
             }
-            if ( isClean && loadAfterFirstStart)
-            {
+            if (isClean && loadAfterFirstStart) {
                 execCqlFile();
             }
 
-            getLog().info(
-                "Cassandra started in " + ( ( System.currentTimeMillis() - timeStamp ) / 100L ) / 10.0 + "s" );
-        }
-        catch ( IOException e )
-        {
-            throw new MojoExecutionException( e.getLocalizedMessage(), e );
+            getLog().info("Cassandra started in " + ((System.currentTimeMillis() - timeStamp) / 100L) / 10.0 + "s");
+        } catch (IOException e) {
+            throw new MojoExecutionException(e.getLocalizedMessage(), e);
         }
     }
 }
diff --git a/src/main/java/org/codehaus/mojo/cassandra/StartCassandraMojo.java b/src/main/java/org/codehaus/mojo/cassandra/StartCassandraMojo.java
index 9a9444a..5e02207 100644
--- a/src/main/java/org/codehaus/mojo/cassandra/StartCassandraMojo.java
+++ b/src/main/java/org/codehaus/mojo/cassandra/StartCassandraMojo.java
@@ -18,14 +18,14 @@
  */
 package org.codehaus.mojo.cassandra;
 
+import java.io.IOException;
+
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 
-import java.io.IOException;
-
 /**
  * Starts a Cassandra instance in the background.
  *
@@ -33,22 +33,20 @@
  *
  */
 @Mojo(name = "start", threadSafe = true, defaultPhase = LifecyclePhase.PRE_INTEGRATION_TEST)
-public class StartCassandraMojo
-    extends AbstractCqlLoadMojo
-{
+public class StartCassandraMojo extends AbstractCqlLoadMojo {
     /**
      * How long to wait for Cassandra to be started before finishing the goal. A value of 0 will wait indefinitely. A
      * value of -1 will not wait at all.
      *
      */
-    @Parameter( defaultValue="180")
+    @Parameter(defaultValue = "180")
     protected int startWaitSeconds;
 
     /**
      * When {@code true}, if this is a clean start then the load script will be applied automatically.
      *
      */
-    @Parameter(property="cassandra.load.after.first.start", defaultValue="true")
+    @Parameter(property = "cassandra.load.after.first.start", defaultValue = "true")
     private boolean loadAfterFirstStart;
 
     /**
@@ -56,7 +54,7 @@ public class StartCassandraMojo
      *
      * @since 1.2.1-2
      */
-    @Parameter(property="cassandra.cu.load.failure.ignore")
+    @Parameter(property = "cassandra.cu.load.failure.ignore")
     private boolean cuLoadFailureIgnore;
 
     /**
@@ -64,7 +62,7 @@ public class StartCassandraMojo
      *
      * @since 1.2.1-2
      */
-    @Parameter(property="cassandra.cu.load.after.first.start", defaultValue="true")
+    @Parameter(property = "cassandra.cu.load.after.first.start", defaultValue = "true")
     private boolean cuLoadAfterFirstStart;
 
     /**
@@ -73,56 +71,45 @@ public class StartCassandraMojo
      *
      * @since 3.7
      */
-    @Parameter ( property="cassandra.addJdk11Options", defaultValue="false")
+    @Parameter(property = "cassandra.addJdk11Options", defaultValue = "false")
     protected boolean addJdk11Options;
 
     @Override
-    protected boolean useJdk11Options( )
-    {
+    protected boolean useJdk11Options() {
         return addJdk11Options;
     }
 
     /**
      * {@inheritDoc}
      */
-    public void execute()
-        throws MojoExecutionException, MojoFailureException
-    {
-        if ( skip )
-        {
-            getLog().info( "Skipping cassandra: cassandra.skip==true" );
+    public void execute() throws MojoExecutionException, MojoFailureException {
+        if (skip) {
+            getLog().info("Skipping cassandra: cassandra.skip==true");
             return;
         }
         long timeStamp = System.currentTimeMillis();
         boolean isClean = !cassandraDir.isDirectory();
-        getLog().debug(
-            ( isClean ? "First start of Cassandra instance in " : "Re-using existing Cassandra instance in " )
-                + cassandraDir.getAbsolutePath() );
-        try
-        {
-            Utils.startCassandraServer( cassandraDir, newServiceCommandLine(), createEnvironmentVars(), getLog() );
+        getLog().debug((isClean ? "First start of Cassandra instance in " : "Re-using existing Cassandra instance in ")
+                + cassandraDir.getAbsolutePath());
+        try {
+            Utils.startCassandraServer(cassandraDir, newServiceCommandLine(), createEnvironmentVars(), getLog());
 
-            if ( startWaitSeconds >= 0 )
-            {
-                getLog().info( "Waiting for Cassandra to start..." );
-                boolean started = Utils.waitUntilStarted( rpcAddress, nativeTransportPort, startWaitSeconds, getLog() );
-                if ( !started )
-                {
-                    Utils.stopCassandraServer( rpcAddress, nativeTransportPort, listenAddress, stopPort, stopKey, getLog() );
-                    throw new MojoFailureException( "Cassandra failed to start within " + startWaitSeconds + "s" );
+            if (startWaitSeconds >= 0) {
+                getLog().info("Waiting for Cassandra to start...");
+                boolean started = Utils.waitUntilStarted(rpcAddress, nativeTransportPort, startWaitSeconds, getLog());
+                if (!started) {
+                    Utils.stopCassandraServer(
+                            rpcAddress, nativeTransportPort, listenAddress, stopPort, stopKey, getLog());
+                    throw new MojoFailureException("Cassandra failed to start within " + startWaitSeconds + "s");
                 }
             }
-            if ( isClean && loadAfterFirstStart)
-            {
+            if (isClean && loadAfterFirstStart) {
                 execCqlFile();
             }
 
-            getLog().info(
-                "Cassandra started in " + ( ( System.currentTimeMillis() - timeStamp ) / 100L ) / 10.0 + "s" );
-        }
-        catch ( IOException e )
-        {
-            throw new MojoExecutionException( e.getLocalizedMessage(), e );
+            getLog().info("Cassandra started in " + ((System.currentTimeMillis() - timeStamp) / 100L) / 10.0 + "s");
+        } catch (IOException e) {
+            throw new MojoExecutionException(e.getLocalizedMessage(), e);
         }
     }
 }
diff --git a/src/main/java/org/codehaus/mojo/cassandra/StopCassandraClusterMojo.java b/src/main/java/org/codehaus/mojo/cassandra/StopCassandraClusterMojo.java
index 9fe4573..eebe649 100644
--- a/src/main/java/org/codehaus/mojo/cassandra/StopCassandraClusterMojo.java
+++ b/src/main/java/org/codehaus/mojo/cassandra/StopCassandraClusterMojo.java
@@ -32,13 +32,12 @@
  *
  */
 @Mojo(name = "stop-cluster", threadSafe = true, defaultPhase = LifecyclePhase.POST_INTEGRATION_TEST)
-public class StopCassandraClusterMojo extends AbstractMojo
-{
+public class StopCassandraClusterMojo extends AbstractMojo {
     /**
      * Skip the execution.
      *
      */
-    @Parameter(property="cassandra.skip", defaultValue="false")
+    @Parameter(property = "cassandra.skip", defaultValue = "false")
     private boolean skip;
 
     /**
@@ -46,64 +45,62 @@ public class StopCassandraClusterMojo extends AbstractMojo
      *
      *
      */
-    @Parameter(property="cassandra.stopPort", defaultValue="8081", required = true)
+    @Parameter(property = "cassandra.stopPort", defaultValue = "8081", required = true)
     protected int stopPort;
 
     /**
      * Key to provide when stopping cassandra
      *
      */
-    @Parameter(property="cassandra.stopKey", defaultValue="cassandra-maven-plugin", required = true)
+    @Parameter(property = "cassandra.stopKey", defaultValue = "cassandra-maven-plugin", required = true)
     protected String stopKey;
 
     /**
      * Address to use for the RPC interface. Do not change this unless you really know what you are doing.
      *
      */
-    @Parameter(defaultValue="127.0.0.1")
+    @Parameter(defaultValue = "127.0.0.1")
     private String rpcAddress;
 
     /**
      * port for the CQL native transport to listen for clients on.
      *
      */
-    @Parameter(property="cassandra.nativeTransportPort", defaultValue="9042")
+    @Parameter(property = "cassandra.nativeTransportPort", defaultValue = "9042")
     protected int nativeTransportPort;
 
     /**
      * The number of nodes in the cluster.
      *
      */
-    @Parameter(property="cassandra.cluster.size", defaultValue="4")
+    @Parameter(property = "cassandra.cluster.size", defaultValue = "4")
     private int clusterSize;
 
     /**
      * {@inheritDoc}
      */
-    public void execute() throws MojoExecutionException, MojoFailureException
-    {
-        if (skip)
-        {
+    public void execute() throws MojoExecutionException, MojoFailureException {
+        if (skip) {
             getLog().info("Skipping cassandra: cassandra.skip==true");
             return;
         }
-        if (stopPort <= 0)
-        {
+        if (stopPort <= 0) {
             throw new MojoExecutionException("Please specify a valid port");
         }
-        if (stopKey == null)
-        {
+        if (stopKey == null) {
             throw new MojoExecutionException("Please specify a valid stopKey");
         }
         if (clusterSize < 1) {
-            throw new MojoExecutionException("Invalid cluster size of " + clusterSize + " specified. Must be at least 1");
+            throw new MojoExecutionException(
+                    "Invalid cluster size of " + clusterSize + " specified. Must be at least 1");
         }
         if (clusterSize > 254) {
-            throw new MojoExecutionException("Invalid cluster size of " + clusterSize + " specified. Must be less than 254");
+            throw new MojoExecutionException(
+                    "Invalid cluster size of " + clusterSize + " specified. Must be less than 254");
         }
         for (int node = 0; node < clusterSize; node++) {
-            Utils.stopCassandraServer("127.0.0." + (node + 1), nativeTransportPort, "127.0.0." + (node + 1), stopPort, stopKey, getLog());
+            Utils.stopCassandraServer(
+                    "127.0.0." + (node + 1), nativeTransportPort, "127.0.0." + (node + 1), stopPort, stopKey, getLog());
         }
-
     }
 }
diff --git a/src/main/java/org/codehaus/mojo/cassandra/StopCassandraMojo.java b/src/main/java/org/codehaus/mojo/cassandra/StopCassandraMojo.java
index d3b269a..3883a5e 100644
--- a/src/main/java/org/codehaus/mojo/cassandra/StopCassandraMojo.java
+++ b/src/main/java/org/codehaus/mojo/cassandra/StopCassandraMojo.java
@@ -32,13 +32,12 @@
  *
  */
 @Mojo(name = "stop", threadSafe = true, defaultPhase = LifecyclePhase.POST_INTEGRATION_TEST)
-public class StopCassandraMojo extends AbstractMojo
-{
+public class StopCassandraMojo extends AbstractMojo {
     /**
      * Skip the execution.
      *
      */
-    @Parameter(property="cassandra.skip", defaultValue="false")
+    @Parameter(property = "cassandra.skip", defaultValue = "false")
     private boolean skip;
 
     /**
@@ -46,28 +45,28 @@ public class StopCassandraMojo extends AbstractMojo
      *
      *
      */
-    @Parameter(property="cassandra.stopPort", defaultValue="8081", required = true)
+    @Parameter(property = "cassandra.stopPort", defaultValue = "8081", required = true)
     protected int stopPort;
 
     /**
      * Key to provide when stopping cassandra
      *
      */
-    @Parameter(property="cassandra.stopKey", defaultValue="cassandra-maven-plugin", required = true)
+    @Parameter(property = "cassandra.stopKey", defaultValue = "cassandra-maven-plugin", required = true)
     protected String stopKey;
 
     /**
      * Address to use for the RPC interface. Do not change this unless you really know what you are doing.
      *
      */
-    @Parameter(defaultValue="127.0.0.1")
+    @Parameter(defaultValue = "127.0.0.1")
     private String rpcAddress;
 
     /**
      * port for the CQL native transport to listen for clients on.
      *
      */
-    @Parameter(property="cassandra.nativeTransportPort", defaultValue="9042")
+    @Parameter(property = "cassandra.nativeTransportPort", defaultValue = "9042")
     protected int nativeTransportPort;
 
     /**
@@ -90,19 +89,15 @@ public class StopCassandraMojo extends AbstractMojo
     /**
      * {@inheritDoc}
      */
-    public void execute() throws MojoExecutionException, MojoFailureException
-    {
-        if (skip)
-        {
+    public void execute() throws MojoExecutionException, MojoFailureException {
+        if (skip) {
             getLog().info("Skipping cassandra: cassandra.skip==true");
             return;
         }
-        if (stopPort <= 0)
-        {
+        if (stopPort <= 0) {
             throw new MojoExecutionException("Please specify a valid port");
         }
-        if (stopKey == null)
-        {
+        if (stopKey == null) {
             throw new MojoExecutionException("Please specify a valid stopKey");
         }
 
diff --git a/src/main/java/org/codehaus/mojo/cassandra/TruncateCassandraMojo.java b/src/main/java/org/codehaus/mojo/cassandra/TruncateCassandraMojo.java
index d6a480d..11b67a7 100644
--- a/src/main/java/org/codehaus/mojo/cassandra/TruncateCassandraMojo.java
+++ b/src/main/java/org/codehaus/mojo/cassandra/TruncateCassandraMojo.java
@@ -1,5 +1,8 @@
 package org.codehaus.mojo.cassandra;
 
+import java.io.IOException;
+import java.util.concurrent.TimeoutException;
+
 import org.apache.cassandra.exceptions.UnavailableException;
 import org.apache.cassandra.service.StorageProxy;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -7,47 +10,36 @@
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 
-import java.io.IOException;
-import java.util.concurrent.TimeoutException;
-
 /**
- * Executes the truncate command against the specified keyspace. 
- * Currently doing so via StorageProxy as a discussion point. 
+ * Executes the truncate command against the specified keyspace.
+ * Currently doing so via StorageProxy as a discussion point.
  *
  * @author zznate
  */
 @Mojo(name = "truncate", threadSafe = true)
-public class TruncateCassandraMojo extends AbstractCassandraMojo 
-{
+public class TruncateCassandraMojo extends AbstractCassandraMojo {
 
     @Parameter(property = "cassandra.keyspace", required = true)
     protected String keyspace;
-    
-    @Parameter(property="cassandra.columnFamily", required = true)
+
+    @Parameter(property = "cassandra.columnFamily", required = true)
     protected String columnFamily;
-    
+
     @Override
-    public void execute() throws MojoExecutionException, MojoFailureException 
-    {
-        try 
-        {      
+    public void execute() throws MojoExecutionException, MojoFailureException {
+        try {
             createCassandraHome();
             getLog().debug("Truncating Column Family \"" + columnFamily + "\" in Keyspace \"" + keyspace + "\"...");
             StorageProxy.truncateBlocking(keyspace, columnFamily);
             getLog().info("Truncated Column Family \"" + columnFamily + "\" in Keyspace \"" + keyspace + "\"...");
-        } catch (UnavailableException ue)
-        {
-            throw new MojoExecutionException("Host(s) must be up in order for a truncate operation to be successful.", ue);
-        } catch (TimeoutException te) 
-        {
+        } catch (UnavailableException ue) {
+            throw new MojoExecutionException(
+                    "Host(s) must be up in order for a truncate operation to be successful.", ue);
+        } catch (TimeoutException te) {
             throw new MojoExecutionException("Host did not reply for truncate operation.", te);
-        } catch (IOException ioe) 
-        {
+        } catch (IOException ioe) {
             // unlikely in our case
-            throw new MojoExecutionException("Could not construct truncate message",ioe);
+            throw new MojoExecutionException("Could not construct truncate message", ioe);
         }
     }
-    
-
-
 }
diff --git a/src/main/java/org/codehaus/mojo/cassandra/Utils.java b/src/main/java/org/codehaus/mojo/cassandra/Utils.java
index 6406bd1..4076825 100644
--- a/src/main/java/org/codehaus/mojo/cassandra/Utils.java
+++ b/src/main/java/org/codehaus/mojo/cassandra/Utils.java
@@ -18,42 +18,38 @@
  */
 package org.codehaus.mojo.cassandra;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.ConnectException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
 import com.datastax.oss.driver.api.core.AllNodesFailedException;
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.CqlSessionBuilder;
 import com.datastax.oss.driver.api.core.DriverException;
 import com.datastax.oss.driver.api.core.DriverTimeoutException;
-
 import org.apache.commons.exec.*;
-
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.util.StringUtils;
 import org.yaml.snakeyaml.Yaml;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.ConnectException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
 /**
  * Utility classes for interacting with Cassandra.
  *
  * @author stephenc
  */
-public final class Utils
-{
+public final class Utils {
     /**
      * Do not instantiate.
      */
-    private Utils()
-    {
+    private Utils() {
         throw new IllegalAccessError("Utility class");
     }
 
@@ -66,7 +62,8 @@ private Utils()
      * @param stopKey             The key to stop with,
      * @param log                 The log to write to.
      */
-    static void stopCassandraServer(String rpcAddress, int nativeTransportPort, String stopAddress, int stopPort, String stopKey, Log log) {
+    static void stopCassandraServer(
+            String rpcAddress, int nativeTransportPort, String stopAddress, int stopPort, String stopKey, Log log) {
         try {
             Socket s = new Socket(InetAddress.getByName(stopAddress), stopPort);
             s.setSoLinger(false, 0);
@@ -117,13 +114,10 @@ static void stopCassandraServer(String rpcAddress, int nativeTransportPort, Stri
      * @return The {@link ExecuteResultHandler} for the started process.
      * @throws MojoExecutionException if something went wrong.
      */
-    protected static DefaultExecuteResultHandler startCassandraServer(File cassandraDir, CommandLine commandLine,
-                                                                      Map environment, Log log)
-            throws MojoExecutionException
-    {
+    protected static DefaultExecuteResultHandler startCassandraServer(
+            File cassandraDir, CommandLine commandLine, Map environment, Log log) throws MojoExecutionException {
 
-        try
-        {
+        try {
             Executor exec = new DefaultExecutor();
             DefaultExecuteResultHandler execHandler = new DefaultExecuteResultHandler();
             exec.setWorkingDirectory(cassandraDir);
@@ -139,11 +133,9 @@ protected static DefaultExecuteResultHandler startCassandraServer(File cassandra
             exec.execute(commandLine, environment, execHandler);
 
             return execHandler;
-        } catch (ExecuteException e)
-        {
+        } catch (ExecuteException e) {
             throw new MojoExecutionException("Command execution failed.", e);
-        } catch (IOException e)
-        {
+        } catch (IOException e) {
             throw new MojoExecutionException("Command execution failed.", e);
         }
     }
@@ -155,16 +147,13 @@ protected static DefaultExecuteResultHandler startCassandraServer(File cassandra
      * @param resource the resource to query.
      * @return {@code true} if the resource is not a file, does not exist or is older than the project file.
      */
-    static boolean shouldGenerateResource(MavenProject project, File resource)
-    {
-        if (!resource.isFile())
-        {
+    static boolean shouldGenerateResource(MavenProject project, File resource) {
+        if (!resource.isFile()) {
             return true;
         }
         long resourceLM = resource.lastModified();
         long projectLM = project.getFile().lastModified();
-        if (Long.signum(resourceLM) == Long.signum(projectLM))
-        {
+        if (Long.signum(resourceLM) == Long.signum(projectLM)) {
             // the two dates are in the same epoch or else the universe is lasting a really long time.
             return resourceLM < projectLM;
         }
@@ -179,21 +168,17 @@ static boolean shouldGenerateResource(MavenProject project, File resource)
      * @param glossYaml the Yaml to overide the base with.
      * @return the resulting Yaml.
      */
-    public static String merge(String baseYaml, String glossYaml)
-    {
-        if (StringUtils.isBlank(glossYaml))
-        {
+    public static String merge(String baseYaml, String glossYaml) {
+        if (StringUtils.isBlank(glossYaml)) {
             return baseYaml;
         }
-        if (StringUtils.isBlank(baseYaml))
-        {
+        if (StringUtils.isBlank(baseYaml)) {
             return glossYaml;
         }
         Yaml yaml = new Yaml();
         Map<String, Object> baseMap = (Map<String, Object>) yaml.load(baseYaml);
         Map<String, Object> glossMap = (Map<String, Object>) yaml.load(glossYaml);
-        for (Map.Entry<String, Object> glossEntry : glossMap.entrySet())
-        {
+        for (Map.Entry<String, Object> glossEntry : glossMap.entrySet()) {
             baseMap.put(glossEntry.getKey(), glossEntry.getValue());
         }
         return yaml.dump(baseMap);
@@ -209,7 +194,8 @@ public static String merge(String baseYaml, String glossYaml)
      * @return {@code true} if Cassandra is started.
      * @throws MojoExecutionException if something went wrong.
      */
-    static boolean waitUntilStarted(String rpcAddress, int nativeTransportPort, int startWaitSeconds, Log log) throws MojoExecutionException {
+    static boolean waitUntilStarted(String rpcAddress, int nativeTransportPort, int startWaitSeconds, Log log)
+            throws MojoExecutionException {
         long maxWaiting = System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(startWaitSeconds);
         while (startWaitSeconds == 0 || System.currentTimeMillis() < maxWaiting) {
             try (CqlSession cqlSession = CqlSession.builder()
@@ -241,7 +227,8 @@ static boolean waitUntilStarted(String rpcAddress, int nativeTransportPort, int
      */
     public static void executeCql(CqlOperation cqlOperation) throws MojoExecutionException {
         CqlSessionBuilder cqlSessionBuilder = CqlSession.builder()
-                .addContactPoint(new InetSocketAddress(cqlOperation.getRpcAddress(), cqlOperation.getNativeTransportPort()))
+                .addContactPoint(
+                        new InetSocketAddress(cqlOperation.getRpcAddress(), cqlOperation.getNativeTransportPort()))
                 .withLocalDatacenter("datacenter1");
         if (StringUtils.isNotBlank(cqlOperation.getKeyspace())) {
             cqlSessionBuilder.withKeyspace(cqlOperation.getKeyspace());
diff --git a/src/test/java/org/codehaus/mojo/cassandra/AbstractCqlExecMojoTest.java b/src/test/java/org/codehaus/mojo/cassandra/AbstractCqlExecMojoTest.java
index 009dcf5..63272c2 100644
--- a/src/test/java/org/codehaus/mojo/cassandra/AbstractCqlExecMojoTest.java
+++ b/src/test/java/org/codehaus/mojo/cassandra/AbstractCqlExecMojoTest.java
@@ -9,27 +9,24 @@ public class AbstractCqlExecMojoTest {
     @Test
     public void splitStatementsUsingCqlLexerWithSemicolonTest() {
         assertThat(AbstractCqlExecMojo.splitStatementsUsingCqlLexer(
-                "SELECT * FROM tbl1 WHERE col1 = 'abc1;def1';SELECT * FROM tbl2 WHERE col2 = 'abc2;def2';"))
-                .containsExactly("SELECT * FROM tbl1 WHERE col1 = 'abc1;def1';",
-                        "SELECT * FROM tbl2 WHERE col2 = 'abc2;def2';");
+                        "SELECT * FROM tbl1 WHERE col1 = 'abc1;def1';SELECT * FROM tbl2 WHERE col2 = 'abc2;def2';"))
+                .containsExactly(
+                        "SELECT * FROM tbl1 WHERE col1 = 'abc1;def1';", "SELECT * FROM tbl2 WHERE col2 = 'abc2;def2';");
     }
 
     @Test
     public void splitStatementsUsingCqlLexerWithCommentTest() {
-        assertThat(AbstractCqlExecMojo.splitStatementsUsingCqlLexer(
-                "--\nSELECT * FROM tbl1 WHERE col1 = '--';"))
+        assertThat(AbstractCqlExecMojo.splitStatementsUsingCqlLexer("--\nSELECT * FROM tbl1 WHERE col1 = '--';"))
                 .hasSize(1)
                 .containsExactly("SELECT * FROM tbl1 WHERE col1 = '--';");
     }
 
     @Test
     public void splitStatementsUsingCqlLexerWithEmptyInput() {
-        assertThat(AbstractCqlExecMojo.splitStatementsUsingCqlLexer(""))
-                .hasSize(0);
+        assertThat(AbstractCqlExecMojo.splitStatementsUsingCqlLexer("")).hasSize(0);
 
         assertThat(AbstractCqlExecMojo.splitStatementsUsingCqlLexer(";;;"))
                 .hasSize(3)
                 .containsExactly(";", ";", ";");
     }
-
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/codehaus/mojo/cassandra/CqlExecCassandraMojoBuilder.java b/src/test/java/org/codehaus/mojo/cassandra/CqlExecCassandraMojoBuilder.java
index e24f516..f80c02f 100644
--- a/src/test/java/org/codehaus/mojo/cassandra/CqlExecCassandraMojoBuilder.java
+++ b/src/test/java/org/codehaus/mojo/cassandra/CqlExecCassandraMojoBuilder.java
@@ -1,9 +1,9 @@
 package org.codehaus.mojo.cassandra;
 
-import org.apache.maven.plugin.logging.Log;
-
 import java.io.File;
 
+import org.apache.maven.plugin.logging.Log;
+
 class CqlExecCassandraMojoBuilder {
     private final CqlExecCassandraMojo cqlExecCassandraMojo;
 
diff --git a/src/test/java/org/codehaus/mojo/cassandra/CqlExecCassandraMojoPowerMockTest.java b/src/test/java/org/codehaus/mojo/cassandra/CqlExecCassandraMojoPowerMockTest.java
index 0fceb12..bc7458c 100644
--- a/src/test/java/org/codehaus/mojo/cassandra/CqlExecCassandraMojoPowerMockTest.java
+++ b/src/test/java/org/codehaus/mojo/cassandra/CqlExecCassandraMojoPowerMockTest.java
@@ -1,5 +1,12 @@
 package org.codehaus.mojo.cassandra;
 
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URISyntaxException;
+import java.util.concurrent.atomic.AtomicReference;
+
 import com.datastax.oss.driver.api.core.DriverExecutionException;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
@@ -10,13 +17,6 @@
 import org.mockito.ArgumentMatchers;
 import org.mockito.MockedStatic;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URISyntaxException;
-import java.util.concurrent.atomic.AtomicReference;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.*;
@@ -24,7 +24,8 @@
 
 public class CqlExecCassandraMojoPowerMockTest {
 
-    private final static String CQL_STATEMENT = "CREATE KEYSPACE identifier WITH replication = {'class': 'SimpleStrategy'}";
+    private static final String CQL_STATEMENT =
+            "CREATE KEYSPACE identifier WITH replication = {'class': 'SimpleStrategy'}";
 
     private CqlExecCassandraMojoBuilder builder;
 
@@ -39,8 +40,7 @@ public void should_fail_if_file_not_found_occurs_when_reading_cql_script() {
             mocked.when(() -> IOUtil.toString(ArgumentMatchers.any(InputStreamReader.class)))
                     .thenThrow(new FileNotFoundException());
 
-            builder.cqlScript(file("emptyfile.cql")).build()
-                    .execute();
+            builder.cqlScript(file("emptyfile.cql")).build().execute();
 
             fail();
         } catch (MojoExecutionException e) {
@@ -54,7 +54,8 @@ public void should_fail_if_file_not_found_occurs_when_reading_cql_script() {
 
     @Test
     public void should_fail_if_io_error_occurs_when_reading_cql_script() {
-        CqlExecCassandraMojo cqlExecCassandraMojo = builder.cqlScript(file("emptyfile.cql")).build();
+        CqlExecCassandraMojo cqlExecCassandraMojo =
+                builder.cqlScript(file("emptyfile.cql")).build();
         try (MockedStatic<IOUtil> mocked = mockStatic(IOUtil.class)) {
             mocked.when(() -> IOUtil.toString(ArgumentMatchers.any(InputStreamReader.class)))
                     .thenThrow(new IOException());
@@ -74,7 +75,7 @@ public void should_use_default_cql_version() throws MojoExecutionException, Mojo
         final AtomicReference<CqlOperation> cqlOperation = new AtomicReference<>();
         try (MockedStatic<Utils> mocked = mockStatic(Utils.class)) {
             mocked.when(() -> Utils.executeCql(ArgumentMatchers.any(CqlOperation.class)))
-                    .thenAnswer( a -> {
+                    .thenAnswer(a -> {
                         cqlOperation.set(a.getArgument(0));
                         return doesNothing();
                     });
@@ -95,8 +96,7 @@ public void should_use_custom_keyspace() throws MojoExecutionException, MojoFail
                         return doesNothing();
                     });
 
-            builder.keyspace("identifier").cqlStatement(CQL_STATEMENT).build()
-                    .execute();
+            builder.keyspace("identifier").cqlStatement(CQL_STATEMENT).build().execute();
 
             assertThat(cqlOperation.get().getKeyspace()).isEqualTo("identifier");
         }
diff --git a/src/test/java/org/codehaus/mojo/cassandra/CqlExecCassandraMojoTest.java b/src/test/java/org/codehaus/mojo/cassandra/CqlExecCassandraMojoTest.java
index 33196f6..24a46ef 100644
--- a/src/test/java/org/codehaus/mojo/cassandra/CqlExecCassandraMojoTest.java
+++ b/src/test/java/org/codehaus/mojo/cassandra/CqlExecCassandraMojoTest.java
@@ -1,5 +1,7 @@
 package org.codehaus.mojo.cassandra;
 
+import java.util.logging.Level;
+
 import org.apache.cassandra.exceptions.ConfigurationException;
 import org.apache.cassandra.exceptions.SyntaxException;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -12,8 +14,6 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import java.util.logging.Level;
-
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static org.junit.Assert.assertEquals;
@@ -48,7 +48,8 @@ public void should_do_nothing_when_skip() {
 
     @Test
     public void should_fail_when_comparator_type_parser_class_does_not_exist() {
-        CqlExecCassandraMojo cqlExecCassandraMojo = builder.comparator("NonExistingComparator").build();
+        CqlExecCassandraMojo cqlExecCassandraMojo =
+                builder.comparator("NonExistingComparator").build();
 
         try {
             cqlExecCassandraMojo.execute();
@@ -62,7 +63,8 @@ public void should_fail_when_comparator_type_parser_class_does_not_exist() {
 
     @Test
     public void should_fail_when_comparator_type_parser_leads_to_syntax_error() {
-        CqlExecCassandraMojo cqlExecCassandraMojo = builder.comparator("BytesType(`").build();
+        CqlExecCassandraMojo cqlExecCassandraMojo =
+                builder.comparator("BytesType(`").build();
 
         try {
             cqlExecCassandraMojo.execute();
@@ -75,26 +77,36 @@ public void should_fail_when_comparator_type_parser_leads_to_syntax_error() {
     }
 
     @Test
-    public void should_give_comparator_error_message_when_key_validator_fails() { // TODO should be should_fail_when_key_validator_type_parser_class_does_not_exist
-        CqlExecCassandraMojo cqlExecCassandraMojo = builder.keyValidator("NonExistingComparator").build();
+    public void should_give_comparator_error_message_when_key_validator_fails() { // TODO should be
+        // should_fail_when_key_validator_type_parser_class_does_not_exist
+        CqlExecCassandraMojo cqlExecCassandraMojo =
+                builder.keyValidator("NonExistingComparator").build();
 
         try {
             cqlExecCassandraMojo.execute();
         } catch (MojoExecutionException e) {
-            assertEquals("Could not parse comparator value: BytesType", e.getMessage()); // TODO should be: assertEquals("Could not parse key validator value: NonExistingComparator", e.getMessage());
+            assertEquals(
+                    "Could not parse comparator value: BytesType",
+                    e.getMessage()); // TODO should be: assertEquals("Could not parse key validator value:
+            // NonExistingComparator", e.getMessage());
         } catch (MojoFailureException e) {
             fail(e.getMessage());
         }
     }
 
     @Test
-    public void should_give_comparator_error_message_when_default_validator_fails() { // TODO should be should_fail_when_default_comparator_type_parser_leads_to_syntax_error
-        CqlExecCassandraMojo cqlExecCassandraMojo = builder.defaultValidator("BytesType(`").build();
+    public void should_give_comparator_error_message_when_default_validator_fails() { // TODO should be
+        // should_fail_when_default_comparator_type_parser_leads_to_syntax_error
+        CqlExecCassandraMojo cqlExecCassandraMojo =
+                builder.defaultValidator("BytesType(`").build();
 
         try {
             cqlExecCassandraMojo.execute();
         } catch (MojoExecutionException e) {
-            assertEquals("Could not parse comparator value: BytesType", e.getMessage()); // TODO should be: assertEquals("Could not parse default validator value: BytesType(`", e.getMessage());
+            assertEquals(
+                    "Could not parse comparator value: BytesType",
+                    e.getMessage()); // TODO should be: assertEquals("Could not parse default validator value:
+            // BytesType(`", e.getMessage());
         } catch (MojoFailureException e) {
             fail(e.getMessage());
         }
@@ -135,5 +147,4 @@ private void assertLog(Level level, String expectedContent) {
         }
         assertEquals(expectedContent, content.getValue());
     }
-
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/codehaus/mojo/cassandra/CqlExecutionExceptionTest.java b/src/test/java/org/codehaus/mojo/cassandra/CqlExecutionExceptionTest.java
index b179495..a1e9297 100644
--- a/src/test/java/org/codehaus/mojo/cassandra/CqlExecutionExceptionTest.java
+++ b/src/test/java/org/codehaus/mojo/cassandra/CqlExecutionExceptionTest.java
@@ -1,5 +1,8 @@
 package org.codehaus.mojo.cassandra;
 
+import java.util.List;
+import java.util.Map;
+
 import com.datastax.oss.driver.api.core.AllNodesFailedException;
 import com.datastax.oss.driver.api.core.DriverExecutionException;
 import com.datastax.oss.driver.api.core.DriverTimeoutException;
@@ -7,12 +10,8 @@
 import com.datastax.oss.driver.api.core.UnsupportedProtocolVersionException;
 import com.datastax.oss.driver.api.core.metadata.Node;
 import com.datastax.oss.driver.api.core.servererrors.ServerError;
-
 import org.junit.Test;
 
-import java.util.List;
-import java.util.Map;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class CqlExecutionExceptionTest {
@@ -29,7 +28,7 @@ public void should_not_give_some_details_if_there_is_a_message() {
 
         assertThat(exception)
                 .hasMessage("There was a problem calling Apache Cassandra's Cql API. additional message")
-        .hasCause(null);
+                .hasCause(null);
     }
 
     @Test
@@ -45,12 +44,13 @@ public void should_not_give_any_details_if_cause_is_not_handled() {
 
     @Test
     public void should_give_details_if_cause_is_all_nodes_failed_exception() {
-        Throwable cause = AllNodesFailedException.fromErrors((List<Map.Entry<Node, Throwable>>)null);
+        Throwable cause = AllNodesFailedException.fromErrors((List<Map.Entry<Node, Throwable>>) null);
 
         CqlExecutionException exception = new CqlExecutionException(cause);
 
         assertThat(exception)
-                .hasMessage("There was a problem calling Apache Cassandra's Cql API. Details: AllNodesFailedException, the query failed on all the coordinators it was tried on. {}")
+                .hasMessage(
+                        "There was a problem calling Apache Cassandra's Cql API. Details: AllNodesFailedException, the query failed on all the coordinators it was tried on. {}")
                 .hasCause(cause);
     }
 
@@ -59,7 +59,8 @@ public void should_give_details_if_cause_is_coordinator_exception() {
         Throwable cause = new ServerError(null, "Server Error");
         CqlExecutionException exception = new CqlExecutionException(cause);
         assertThat(exception)
-                .hasMessage("There was a problem calling Apache Cassandra's Cql API. Details: CoordinatorException, got a server-side error thrown by the coordinator node in response to the query. null")
+                .hasMessage(
+                        "There was a problem calling Apache Cassandra's Cql API. Details: CoordinatorException, got a server-side error thrown by the coordinator node in response to the query. null")
                 .hasCause(cause);
     }
 
@@ -69,7 +70,8 @@ public void should_give_details_if_cause_is_driver_execution_exception() {
 
         CqlExecutionException exception = new CqlExecutionException(cause);
         assertThat(exception)
-                .hasMessage("There was a problem calling Apache Cassandra's Cql API. Details: DriverExecutionException, Query failed due to an underlying checked Exception")
+                .hasMessage(
+                        "There was a problem calling Apache Cassandra's Cql API. Details: DriverExecutionException, Query failed due to an underlying checked Exception")
                 .hasCause(cause);
     }
 
@@ -79,7 +81,8 @@ public void should_give_details_if_cause_is_driver_timeout_exception() {
 
         CqlExecutionException exception = new CqlExecutionException(cause);
         assertThat(exception)
-                .hasMessage("There was a problem calling Apache Cassandra's Cql API. Details: DriverTimeoutException, Query timed out")
+                .hasMessage(
+                        "There was a problem calling Apache Cassandra's Cql API. Details: DriverTimeoutException, Query timed out")
                 .hasCause(cause);
     }
 
@@ -89,7 +92,8 @@ public void should_give_details_if_cause_is_invalid_keyspace_exception() {
 
         CqlExecutionException exception = new CqlExecutionException(cause);
         assertThat(exception)
-                .hasMessage("There was a problem calling Apache Cassandra's Cql API. Details: InvalidKeyspaceException, Provided Keyspace is invalid")
+                .hasMessage(
+                        "There was a problem calling Apache Cassandra's Cql API. Details: InvalidKeyspaceException, Provided Keyspace is invalid")
                 .hasCause(cause);
     }
 
@@ -99,7 +103,8 @@ public void should_give_details_if_cause_is_datastax_driver_exception() {
 
         CqlExecutionException exception = new CqlExecutionException(cause);
         assertThat(exception)
-                .hasMessage("There was a problem calling Apache Cassandra's Cql API. Details: Datastax Driver Exception: null")
+                .hasMessage(
+                        "There was a problem calling Apache Cassandra's Cql API. Details: Datastax Driver Exception: null")
                 .hasCause(cause);
     }
-}
\ No newline at end of file
+}