Auto-created pull request into develop from feature/improve-tests

amazon-sns-java-messaging-lib-template/src/main/java/com/amazon/sns/messaging/lib/concurrent/ThreadFactoryProvider.java

@@ -20,6 +20,8 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
 import java.util.function.Supplier;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -28,6 +30,7 @@
 import lombok.NoArgsConstructor;
 import lombok.SneakyThrows;
 
+// @formatter:off
 /**
  * Provides {@link ThreadFactory} instances, selecting between virtual thread
  * factories (Java 21+) and default thread factories based on the runtime Java
@@ -39,6 +42,21 @@ public final class ThreadFactoryProvider {
   /** Class logger. */
   private static final Logger LOGGER = LoggerFactory.getLogger(ThreadFactoryProvider.class);
 
+  /**
+   * Regex that extracts the major version number from a {@code java.version} string.
+   *
+   * <table border="1">
+   *   <tr><th>Input</th><th>Group 1</th></tr>
+   *   <tr><td>{@code "21"}</td><td>{@code "21"}</td></tr>
+   *   <tr><td>{@code "21.0.1"}</td><td>{@code "21"}</td></tr>
+   *   <tr><td>{@code "17.0.9+9"}</td><td>{@code "17"}</td></tr>
+   *   <tr><td>{@code "11-ea"}</td><td>{@code "11"}</td></tr>
+   *   <tr><td>{@code "1.8.0_302"}</td><td>{@code "8"}</td></tr>
+   * </table>
+   *
+   */
+  private static final Pattern JAVA_VERSION_PATTERN = Pattern.compile("^(?:1\\.)?(\\d+)");
+
   /**
    * Cached supplier of the appropriate thread factory for the runtime Java
    * version.
@@ -94,17 +112,15 @@ private static ThreadFactory getVirtualThreadFactory() {
    * @return the major Java version number
    */
   private static int getJavaVersion() {
-    String version = System.getProperty("java.version");
+    final String version = System.getProperty("java.version");
+    final Matcher matcher = JAVA_VERSION_PATTERN.matcher(version);
 
-    if (version.startsWith("1.")) {
-      version = version.substring(2);
+    if (!matcher.find()) {
+      throw new IllegalStateException("Unable to parse java.version: " + version);
     }
 
-    final int dotPos = version.indexOf('.');
-    final int dashPos = version.indexOf('-');
-    final int endIndex = dotPos > -1 ? dotPos : dashPos > -1 ? dashPos : 1;
-
-    return Integer.parseInt(version.substring(0, endIndex));
+    return Integer.parseInt(matcher.group(1));
   }
 
-}
+}
+// @formatter:on

amazon-sns-java-messaging-lib-template/src/main/java/com/amazon/sns/messaging/lib/core/AbstractMessageAttributes.java

@@ -21,7 +21,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Objects;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import org.slf4j.Logger;
@@ -34,7 +34,7 @@
  *
  * @param <V> the message attribute value type (SDK-specific)
  */
-@SuppressWarnings("java:S6204")
+@SuppressWarnings({ "java:S6204", "java:S2629" })
 abstract class AbstractMessageAttributes<V> {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(AbstractMessageAttributes.class);
@@ -85,7 +85,7 @@ public Map<String, V> messageAttributes(final Map<String, Object> messageHeaders
       } else {
         LOGGER.warn(
           "Message header '{}' has unsupported value type {} and will not be sent as a message attribute",
-          key, Objects.isNull(value) ? "null" : value.getClass().getName()
+          key, Optional.ofNullable(value).map(Object::getClass).map(Class::getName).orElse("null")
         );
       }
     }