Suppress atomic update warnings in IntelliJ IDEA

olim7t · olim7t · commit 7404f4956f2b · 2019-07-31T16:57:21.000-07:00
diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/channel/InFlightHandler.java b/core/src/main/java/com/datastax/oss/driver/internal/core/channel/InFlightHandler.java
@@ -227,7 +227,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
         wasInFlight = false;
         callback = orphaned.get(streamId);
         if (callback == null) {
-          LOG.trace("[{}] Got response on unknown stream id {}, skipping", streamId);
+          LOG.trace("[{}] Got response on unknown stream id {}, skipping", logPrefix, streamId);
           return;
         }
       }
diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/channel/StreamIdGenerator.java b/core/src/main/java/com/datastax/oss/driver/internal/core/channel/StreamIdGenerator.java
@@ -39,7 +39,8 @@ class StreamIdGenerator {
     this.availableIds = this.maxAvailableIds;
   }
 
-  @SuppressWarnings("NonAtomicVolatileUpdate") // see explanation in class Javadoc
+  // safe because a given instance is always called from the same I/O thread
+  @SuppressWarnings({"NonAtomicVolatileUpdate", "NonAtomicOperationOnVolatileField"})
   int acquire() {
     int id = ids.nextClearBit(0);
     if (id >= maxAvailableIds) {
@@ -50,7 +51,7 @@ int acquire() {
     return id;
   }
 
-  @SuppressWarnings("NonAtomicVolatileUpdate")
+  @SuppressWarnings({"NonAtomicVolatileUpdate", "NonAtomicOperationOnVolatileField"})
   void release(int id) {
     if (ids.get(id)) {
       availableIds++;
diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/NodeStateManager.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/NodeStateManager.java
@@ -124,7 +124,7 @@ private void markInitialized() {
     }
 
     // Updates to DefaultNode's volatile fields are confined to the admin thread
-    @SuppressWarnings("NonAtomicVolatileUpdate")
+    @SuppressWarnings({"NonAtomicVolatileUpdate", "NonAtomicOperationOnVolatileField"})
     private void onChannelEvent(ChannelEvent event) {
       assert adminExecutor.inEventLoop();
       if (closeWasCalled) {
diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/session/throttling/SettableNanoClock.java b/core/src/test/java/com/datastax/oss/driver/internal/core/session/throttling/SettableNanoClock.java
@@ -25,7 +25,7 @@ public long nanoTime() {
   }
 
   // This is racy, but in our tests it's never read concurrently
-  @SuppressWarnings("NonAtomicVolatileUpdate")
+  @SuppressWarnings({"NonAtomicVolatileUpdate", "NonAtomicOperationOnVolatileField"})
   void add(long increment) {
     nanoTime += increment;
   }

Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception`
`227`	`227`	`wasInFlight = false;`
`228`	`228`	`callback = orphaned.get(streamId);`
`229`	`229`	`if (callback == null) {`
`230`		`- LOG.trace("[{}] Got response on unknown stream id {}, skipping", streamId);`
	`230`	`+ LOG.trace("[{}] Got response on unknown stream id {}, skipping", logPrefix, streamId);`
`231`	`231`	`return;`
`232`	`232`	`}`
`233`	`233`	`}`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ private void markInitialized() {`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`// Updates to DefaultNode's volatile fields are confined to the admin thread`
`127`		`- @SuppressWarnings("NonAtomicVolatileUpdate")`
	`127`	`+ @SuppressWarnings({"NonAtomicVolatileUpdate", "NonAtomicOperationOnVolatileField"})`
`128`	`128`	`private void onChannelEvent(ChannelEvent event) {`
`129`	`129`	`assert adminExecutor.inEventLoop();`
`130`	`130`	`if (closeWasCalled) {`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public long nanoTime() {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`// This is racy, but in our tests it's never read concurrently`
`28`		`- @SuppressWarnings("NonAtomicVolatileUpdate")`
	`28`	`+ @SuppressWarnings({"NonAtomicVolatileUpdate", "NonAtomicOperationOnVolatileField"})`
`29`	`29`	`void add(long increment) {`
`30`	`30`	`nanoTime += increment;`
`31`	`31`	`}`