Merge branch 'release/c4.1'

Ericsson · Oct 31, 2023 · a1b866b · a1b866b
2 parents 0335c7d + 112fab4
commit a1b866b
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,5 @@ target/
 .idea
 *.iml
 dependency-reduced-pom.xml
+.idea/
 
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,15 +1,12 @@
 # Changes
 
-## Not released yet
+## Version 3.1.0 (unreleased)
+* Add Audit Prepare statements - #226
 * Build with Cassandra 5.0-alpha1 (only flavor ecaudit_c5.0)
 
 ## Version 3.0.0
 * Build with Cassandra 4.1.2 (only flavor ecaudit_c4.1)
-
-## Version 2.12.0
-
 * Test with java11 (only flavor ecaudit_c4.0) - #214
-* Audit Prepare statements
 
 ## Version 2.11.0
 

diff --git a/...in/java/com/ericsson/bss/cassandra/ecaudit/filter/yamlandrole/YamlAndRoleAuditFilter.java b/...in/java/com/ericsson/bss/cassandra/ecaudit/filter/yamlandrole/YamlAndRoleAuditFilter.java
@@ -57,6 +57,7 @@ public void setup()
         yamlFilter.setup();
         roleFilter.setup();
     }
+
     @Override
     public boolean shouldLogPrepareStatements()
     {

diff --git a/...a/com/ericsson/bss/cassandra/ecaudit/integration/querylogger/PrepareAuditQueryLogger.java b/...a/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");

diff --git a/test-utils/src/main/java/com/ericsson/bss/cassandra/ecaudit/test/mode/ClientInitializer.java b/test-utils/src/main/java/com/ericsson/bss/cassandra/ecaudit/test/mode/ClientInitializer.java
@@ -37,6 +37,7 @@ private ClientInitializer()
 
     public static void beforeClass()
     {
+        // This method is used by multiple tests, so lenient() is required for tests that don't require the when statements
         DatabaseDescriptor.clientInitialization(true);
         DatabaseDescriptor.setAuthenticator(mock(IAuthenticator.class));
         lenient().when(authorizerMock.bulkLoader()).thenReturn(Collections::emptyMap);