#226 fix formatting issues

ecaudit/src/main/java/com/ericsson/bss/cassandra/ecaudit/AuditAdapter.java

@@ -108,6 +108,7 @@ public void auditRegular(String operation, ClientState state, Status status, lon
             auditor.audit(logEntry);
         }
     }
+
     /**
      * Audit a regular CQL statement.
      *
@@ -132,6 +133,7 @@ public void auditPrepare(String operation, ClientState state, Status status, lon
             auditor.audit(logEntry);
         }
     }
+
     /**
      * Audit a prepared statement.
      *

ecaudit/src/main/java/com/ericsson/bss/cassandra/ecaudit/config/AuditConfig.java

@@ -131,6 +131,7 @@ public void setWhitelistCacheActiveUpdate(boolean whitelistCacheActiveUpdate)
         loadConfigIfNeeded();
         yamlConfig.setWhitelistCacheActiveUpdate(whitelistCacheActiveUpdate);
     }
+
     public boolean isSuppressPrepareStatements()
     {
         loadConfigIfNeeded();

ecaudit/src/main/java/com/ericsson/bss/cassandra/ecaudit/config/AuditYamlConfig.java

@@ -171,11 +171,11 @@ public void setWhitelistCacheActiveUpdate(Boolean whitelistCacheActiveUpdate)
     {
         this.whitelist_cache_active_update = whitelistCacheActiveUpdate;
     }
+
     public Boolean isSuppressPrepareStatements()
     {
         return suppress_prepare_statements == null
                ? Boolean.TRUE
                : suppress_prepare_statements;
     }
-
 }

ecaudit/src/main/java/com/ericsson/bss/cassandra/ecaudit/entry/suppressor/PrepareAuditOperation.java

@@ -35,6 +35,7 @@ public String getOperationString()
     {
         return operationString;
     }
+
     @Override
     public String getNakedOperationString()
     {

ecaudit/src/main/java/com/ericsson/bss/cassandra/ecaudit/filter/role/RoleAuditFilter.java

@@ -77,7 +77,6 @@ public void setup()
     @Override
     public boolean shouldLogPrepareStatements() { return true; }
 
-
     /**
      * Returns true if the supplied log entry's role or any other role granted to it (directly or indirectly) is
      * white-listed for the log entry's specified operations and resource.

ecaudit/src/main/java/com/ericsson/bss/cassandra/ecaudit/filter/yamlandrole/YamlAndRoleAuditFilter.java

@@ -57,10 +57,10 @@ public void setup()
         yamlFilter.setup();
         roleFilter.setup();
     }
+
     @Override
     public boolean shouldLogPrepareStatements()
     {
         return yamlFilter.shouldLogPrepareStatements();
     }
-
 }

ecaudit/src/test/java/com/ericsson/bss/cassandra/ecaudit/handler/TestAuditQueryHandler.java

@@ -147,9 +147,6 @@ public void testPrepareAndGetPrepared()
         verify(mockHandler, times(1)).prepare(eq(query), eq(mockClientState), eq(customPayload));
         verify(mockHandler, times(1)).getPrepared(eq(statementId));
         verify(mockAdapter, times(1)).auditPrepare(eq(query), eq(mockClientState), eq(Status.ATTEMPT), longThat(isCloseToNow()));
-
-
-
     }
 
     @Test

integration-test-query-logger/src/test/java/com/ericsson/bss/cassandra/ecaudit/integration/querylogger/ITQueryLogger.java

@@ -108,8 +108,6 @@ public void testPrepareStatement()
         session.execute(prepared.bind(42, "Kalle"));
         assertThat(getLogEntries()).containsOnly( "client:'127.0.0.1'|user:'anonymous'|status:'ATTEMPT'|operation:'Prepared: INSERT INTO school.students (key, value) VALUES (?, ?)'",
                                                   "client:'127.0.0.1'|user:'anonymous'|status:'ATTEMPT'|operation:'INSERT INTO school.students (key, value) VALUES (?, ?)[42, 'Kalle']'");
-
-//      assertThat(getLogEntries()).containsOnly("client:'127.0.0.1'|user:'anonymous'|status:'ATTEMPT'|operation:'INSERT INTO school.students (key, value) VALUES (?, ?)[42, 'Kalle']'");
     }
     @Test
     public void testFailedPrepareStatement()
@@ -121,10 +119,8 @@ public void testFailedPrepareStatement()
 
         assertThat(getLogEntries()).containsOnly( "client:'127.0.0.1'|user:'anonymous'|status:'ATTEMPT'|operation:'Prepared: INSERT INTO school.invalidestudents (key, value) VALUES (?, ?)'",
                                                   "client:'127.0.0.1'|user:'anonymous'|status:'FAILED'|operation:'Prepared: INSERT INTO school.invalidestudents (key, value) VALUES (?, ?)'");
-
-//        verify(mockAuditAppender, never() ).doAppend(loggingEventCaptor.capture());
-
     }
+
     @Test
     public void testGrantFails()
     {

integration-test-query-logger/src/test/java/com/ericsson/bss/cassandra/ecaudit/integration/querylogger/PrepareAuditQueryLogger.java

@@ -97,6 +97,7 @@ public void testPrepareStatement()
         assertThat(getLogEntries()).containsOnly( "client:'127.0.0.1'|user:'anonymous'|status:'ATTEMPT'|operation:'Prepared: INSERT INTO school.students (key, value) VALUES (?, ?)'",
                                                   "client:'127.0.0.1'|user:'anonymous'|status:'ATTEMPT'|operation:'INSERT INTO school.students (key, value) VALUES (?, ?)[42, 'Kalle']'");
     }
+
     @Test
     public void testFailedPrepareStatement()
     {
@@ -108,8 +109,7 @@ public void testFailedPrepareStatement()
         assertThat(getLogEntries()).containsOnly( "client:'127.0.0.1'|user:'anonymous'|status:'ATTEMPT'|operation:'Prepared: INSERT INTO school.invalidestudents (key, value) VALUES (?, ?)'",
                                                   "client:'127.0.0.1'|user:'anonymous'|status:'FAILED'|operation:'Prepared: INSERT INTO school.invalidestudents (key, value) VALUES (?, ?)'");
     }
-
-
+
     private void givenTable(String keyspace, String table)
     {
         session.execute("CREATE KEYSPACE IF NOT EXISTS " + keyspace + " WITH REPLICATION = {'class' : 'SimpleStrategy', 'replication_factor' : 1} AND DURABLE_WRITES = false");