Adapt naming strategy changes to 2.x branch

References #513

Author: acogoluegnes

src/main/java/com/rabbitmq/jms/admin/NamingStrategy.java

@@ -11,7 +11,7 @@
  * <p>A custom implementation can be used to customize the name of some entities (e.g. for security
  * reasons), but implementators must be prepared to API changes.
  *
- * @since 3.4.0
+ * @since 2.11.0
  * @see RMQConnectionFactory#setNamingStrategy(NamingStrategy)
  */
 public interface NamingStrategy extends Serializable {

src/main/java/com/rabbitmq/jms/admin/RMQConnectionFactory.java

@@ -1224,22 +1224,23 @@ public void setValidateSubscriptionNames(boolean validateSubscriptionNames) {
     this.validateSubscriptionNames = validateSubscriptionNames;
   }
 
-    /**
-     * Naming strategy for AMQP entities.
-     *
-     * <p>Most applications should not worry about this setting, the default is fine.
-     *
-     * <p>Note {@link NamingStrategy} is not considered a public and stable API.
-     *
-     * @param namingStrategy naming strategy
-     * @see NamingStrategy
-     */
-    public void setNamingStrategy(NamingStrategy namingStrategy) {
-      if (namingStrategy == null) {
-        throw new IllegalArgumentException("Naming strategy cannot be null");
-      }
-      this.namingStrategy = namingStrategy;
+  /**
+   * Naming strategy for AMQP entities.
+   *
+   * <p>Most applications should not worry about this setting, the default is fine.
+   *
+   * <p>Note {@link NamingStrategy} is not considered a public and stable API.
+   *
+   * @param namingStrategy naming strategy
+   * @see NamingStrategy
+   * @since 2.11.0
+   */
+  public void setNamingStrategy(NamingStrategy namingStrategy) {
+    if (namingStrategy == null) {
+      throw new IllegalArgumentException("Naming strategy cannot be null");
     }
+    this.namingStrategy = namingStrategy;
+  }
 
     @FunctionalInterface
     private interface ConnectionCreator {

src/test/java/com/rabbitmq/TestUtils.java

@@ -150,7 +150,7 @@ public interface ExceptionBooleanSupplier {
 
   }
 
-  public static Connection amqpConnection(jakarta.jms.Connection connection) {
+  public static Connection amqpConnection(javax.jms.Connection connection) {
     try {
       Field connectionField = RMQConnection.class.getDeclaredField("rabbitConnection");
       connectionField.setAccessible(true);

src/test/java/com/rabbitmq/integration/tests/NamingStrategyIT.java

@@ -7,11 +7,14 @@
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.jms.admin.NamingStrategy;
 import com.rabbitmq.jms.admin.RMQConnectionFactory;
-import jakarta.jms.*;
 import java.io.IOException;
 import java.lang.reflect.Proxy;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import javax.jms.Connection;
+import javax.jms.MessageConsumer;
+import javax.jms.Session;
+import javax.jms.Topic;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;