Merge branch 'release/c4.0' into release/c4.1

.gitignore

@@ -5,4 +5,5 @@ target/
 .idea
 *.iml
 dependency-reduced-pom.xml
+.idea/
 

CHANGES.md

@@ -1,12 +1,12 @@
 # Changes
 
-## Version 3.0.0
-* Build with Cassandra 4.1.2 (only flavor ecaudit_c4.1)
-
-## Version 2.12.0
+## Version 3.1.0 (unreleased)
 
+* Add Audit Prepare statements - #226
 * Test with java11 (only flavor ecaudit_c4.0) - #214
-* Audit Prepare statements
+
+## Version 3.0.0
+* Build with Cassandra 4.1.2 (only flavor ecaudit_c4.1)
 
 ## Version 2.11.0
 

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

@@ -98,6 +98,7 @@ public void testBasicStatement()
 
         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 testPrepareStatement()
     {
@@ -109,6 +110,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()
     {

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

@@ -109,7 +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");