make ThreadLocal usage static as per recommendations (#1441)

Co-authored-by: McKerrell, Graeme <Graeme_McKerrell@McAfee.com> Co-authored-by: Aaron Klish <aklish@gmail.com>
yahoo · Jul 14, 2020 · 2925b68 · 2925b68
1 parent cafbd29
commit 2925b68
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/elide-core/src/main/java/com/yahoo/elide/audit/AuditLogger.java b/elide-core/src/main/java/com/yahoo/elide/audit/AuditLogger.java
@@ -17,20 +17,17 @@
  * This class uses ThreadLocal list to be thread safe.
  */
 public abstract class AuditLogger {
-    protected final ThreadLocal<List<LogMessage>> messages;
-
-    public AuditLogger() {
-        messages = ThreadLocal.withInitial(ArrayList::new);
-    }
+    protected static final ThreadLocal<List<LogMessage>> MESSAGES =
+        ThreadLocal.withInitial(ArrayList::new);
 
     public void log(LogMessage message) {
-        messages.get().add(message);
+        MESSAGES.get().add(message);
     }
 
     public abstract void commit(RequestScope requestScope) throws IOException;
 
     public void clear() {
-        List<LogMessage> remainingMessages = messages.get();
+        List<LogMessage> remainingMessages = MESSAGES.get();
         if (remainingMessages != null) {
             remainingMessages.clear();
         }

diff --git a/elide-core/src/main/java/com/yahoo/elide/audit/Slf4jLogger.java b/elide-core/src/main/java/com/yahoo/elide/audit/Slf4jLogger.java
@@ -20,11 +20,11 @@ public class Slf4jLogger extends AuditLogger {
     @Override
     public void commit(RequestScope requestScope) throws IOException {
         try {
-            for (LogMessage message : messages.get()) {
+            for (LogMessage message : MESSAGES.get()) {
                 log.info("{} {} {}", System.currentTimeMillis(), message.getOperationCode(), message.getMessage());
             }
         } finally {
-            messages.get().clear();
+            MESSAGES.get().clear();
         }
     }
 }
diff --git a/elide-core/src/test/java/com/yahoo/elide/audit/TestAuditLogger.java b/elide-core/src/test/java/com/yahoo/elide/audit/TestAuditLogger.java
@@ -17,6 +17,6 @@ public void commit(RequestScope requestScope) throws IOException {
     }
 
     public List<LogMessage> getMessages() {
-        return new ArrayList<>(this.messages.get());
+        return new ArrayList<>(this.MESSAGES.get());
     }
 }
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/PersistentResourceTest.java b/elide-core/src/test/java/com/yahoo/elide/core/PersistentResourceTest.java
@@ -1800,6 +1800,7 @@ public void testFieldLevelAudit() throws Exception {
         assertEquals("UPDATE Child 5 Parent 7", message.getMessage(), "Logging template should match");
 
         assertEquals(1, message.getOperationCode(), "Operation code should match");
+        logger.clear(); // tidy up this thread's messages
     }
 
     @Test
@@ -1823,6 +1824,7 @@ public void testClassLevelAudit() throws Exception {
         assertEquals("CREATE Child 5 Parent 7", message.getMessage(), "Logging template should match");
 
         assertEquals(0, message.getOperationCode(), "Operation code should match");
+        logger.clear(); // tidy up this thread's messages
     }
 
     @Test

diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/audit/InMemoryLogger.java b/elide-integration-tests/src/test/java/com/yahoo/elide/audit/InMemoryLogger.java
@@ -21,7 +21,7 @@ public class InMemoryLogger extends AuditLogger {
 
     @Override
     public void commit(RequestScope requestScope) throws IOException {
-        for (LogMessage message : messages.get()) {
+        for (LogMessage message : MESSAGES.get()) {
             if (message.getChangeSpec().isPresent()) {
                 logMessages.add(changeSpecToString(message.getChangeSpec().get()));
             }