Resource Adapter: consider {} as an empty configuration to be overrid…

…den with default values
datastax · Aug 13, 2021 · e59d6d0 · e59d6d0
1 parent ea6d849
commit e59d6d0
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 7 deletions.
diff --git a/pulsar-jms-integration-tests/pom.xml b/pulsar-jms-integration-tests/pom.xml
@@ -27,7 +27,7 @@
   <artifactId>pulsar-jms-integration-tests</artifactId>
   <packaging>jar</packaging>
   <name>Pulsar JMS Integration Tests</name>
-  <properties />
+  <properties/>
   <dependencies>
     <dependency>
       <groupId>com.datastax.oss</groupId>

diff --git a/resource-adapter-tests/pom.xml b/resource-adapter-tests/pom.xml
@@ -27,7 +27,7 @@
   <artifactId>pulsar-jms-resource-adapter-tests</artifactId>
   <packaging>jar</packaging>
   <name>Pulsar JMS Resource Adapter Tests for Jakarta EE Containers</name>
-  <properties />
+  <properties/>
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>

diff --git a/resource-adapter/src/main/java/com/datastax/oss/pulsar/jms/rar/PulsarActivationSpec.java b/resource-adapter/src/main/java/com/datastax/oss/pulsar/jms/rar/PulsarActivationSpec.java
@@ -212,7 +212,9 @@ public String toString() {
   }
 
   public String getMergedConfiguration(String configuration) {
-    if (this.configuration == null || this.configuration.trim().isEmpty()) {
+    if (this.configuration == null
+        || this.configuration.trim().isEmpty()
+        || this.configuration.replace(" ", "").equals("{}")) { // empty "{}"
       return configuration;
     } else {
       return this.configuration;

diff --git a/...adapter/src/main/java/com/datastax/oss/pulsar/jms/rar/PulsarManagedConnectionFactory.java b/...adapter/src/main/java/com/datastax/oss/pulsar/jms/rar/PulsarManagedConnectionFactory.java
@@ -60,7 +60,9 @@ public void setResourceAdapter(ResourceAdapter resourceAdapter) throws ResourceE
   }
 
   String getMergedConfiguration() {
-    if (this.configuration == null || this.configuration.trim().isEmpty()) {
+    if (this.configuration == null
+        || this.configuration.trim().isEmpty()
+        || this.configuration.replace(" ", "").equals("{}")) { // empty "{}") {
       return resourceAdapter.getConfiguration();
     } else {
       return configuration;

diff --git a/resource-adapter/src/main/java/com/datastax/oss/pulsar/jms/rar/PulsarResourceAdapter.java b/resource-adapter/src/main/java/com/datastax/oss/pulsar/jms/rar/PulsarResourceAdapter.java
@@ -92,10 +92,14 @@ public void endpointActivation(
       MessageEndpointFactory messageEndpointFactory, ActivationSpec activationSpec)
       throws ResourceException {
     try {
-      log.info("Activate endpoint {} {}", activationSpec, messageEndpointFactory);
       PulsarActivationSpec pulsarActivationSpec = (PulsarActivationSpec) activationSpec;
-      PulsarConnectionFactory connectionFactory =
-          getPulsarConnectionFactory(pulsarActivationSpec.getMergedConfiguration(configuration));
+      String mergedConfiguration = pulsarActivationSpec.getMergedConfiguration(configuration);
+      log.info(
+          "Activate endpoint {} {} configuration {}",
+          activationSpec,
+          messageEndpointFactory,
+          mergedConfiguration);
+      PulsarConnectionFactory connectionFactory = getPulsarConnectionFactory(mergedConfiguration);
       PulsarMessageEndpoint endpoint =
           buildMessageEndpoint(messageEndpointFactory, pulsarActivationSpec, connectionFactory);
       endpoints.add(endpoint);

diff --git a/resource-adapter/src/test/java/com/datastax/oss/pulsar/jms/rar/PulsarActivationSpecTest.java b/resource-adapter/src/test/java/com/datastax/oss/pulsar/jms/rar/PulsarActivationSpecTest.java
@@ -138,5 +138,13 @@ public void testMergeConfiguration() throws Exception {
     spec.setConfiguration(null);
     assertEquals("bar", spec.getMergedConfiguration("bar"));
     assertEquals(null, spec.getConfiguration());
+
+    spec.setConfiguration("{}");
+    assertEquals("bar", spec.getMergedConfiguration("bar"));
+    assertEquals("{}", spec.getConfiguration());
+
+    spec.setConfiguration("{   }");
+    assertEquals("bar", spec.getMergedConfiguration("bar"));
+    assertEquals("{   }", spec.getConfiguration());
   }
 }
diff --git a/...ter/src/test/java/com/datastax/oss/pulsar/jms/rar/PulsarManagedConnectionFactoryTest.java b/...ter/src/test/java/com/datastax/oss/pulsar/jms/rar/PulsarManagedConnectionFactoryTest.java
@@ -50,6 +50,14 @@ public void testMergeConfiguration() throws Exception {
     assertEquals("bar", spec.getMergedConfiguration());
     assertEquals(null, spec.getConfiguration());
 
+    spec.setConfiguration("{}");
+    assertEquals("bar", spec.getMergedConfiguration());
+    assertEquals("{}", spec.getConfiguration());
+
+    spec.setConfiguration("{   }");
+    assertEquals("bar", spec.getMergedConfiguration());
+    assertEquals("{   }", spec.getConfiguration());
+
     PrintWriter useless = new PrintWriter(new StringWriter());
     spec.setLogWriter(useless);
     assertSame(useless, spec.getLogWriter());