diff --git a/sdks/java/io/solace/src/main/java/org/apache/beam/sdk/io/solace/broker/SempBasicAuthClientExecutor.java b/sdks/java/io/solace/src/main/java/org/apache/beam/sdk/io/solace/broker/SempBasicAuthClientExecutor.java
index 08034a8a520c..965fc8741374 100644
--- a/sdks/java/io/solace/src/main/java/org/apache/beam/sdk/io/solace/broker/SempBasicAuthClientExecutor.java
+++ b/sdks/java/io/solace/src/main/java/org/apache/beam/sdk/io/solace/broker/SempBasicAuthClientExecutor.java
@@ -84,7 +84,7 @@ public SempBasicAuthClientExecutor(
     this.password = password;
     this.requestFactory = httpRequestFactory;
     this.cookieManagerKey = new CookieManagerKey(this.baseUrl, this.username);
-    COOKIE_MANAGER_MAP.putIfAbsent(this.cookieManagerKey, new CookieManager());
+    COOKIE_MANAGER_MAP.computeIfAbsent(this.cookieManagerKey, key -> new CookieManager());
   }
 
   public boolean isQueueNonExclusive(String queueName) throws IOException {
diff --git a/sdks/java/io/solace/src/main/java/org/apache/beam/sdk/io/solace/write/AddShardKeyDoFn.java b/sdks/java/io/solace/src/main/java/org/apache/beam/sdk/io/solace/write/AddShardKeyDoFn.java
index 12d8a8507d8a..c55d37942c72 100644
--- a/sdks/java/io/solace/src/main/java/org/apache/beam/sdk/io/solace/write/AddShardKeyDoFn.java
+++ b/sdks/java/io/solace/src/main/java/org/apache/beam/sdk/io/solace/write/AddShardKeyDoFn.java
@@ -23,8 +23,9 @@
 import org.apache.beam.sdk.values.KV;
 
 /**
- * This class a pseudo-key with a given cardinality. The downstream steps will use state {@literal
- * &} timers to distribute the data and control for the number of parallel workers used for writing.
+ * This class adds pseudo-key with a given cardinality. The downstream steps will use state
+ * {@literal &} timers to distribute the data and control for the number of parallel workers used
+ * for writing.
  */
 @Internal
 public class AddShardKeyDoFn extends DoFn<Solace.Record, KV<Integer, Solace.Record>> {