create activation test
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/6a0d6390 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/6a0d6390 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/6a0d6390 Branch: refs/heads/master Commit: 6a0d6390e6c776486b98924333fd9bd356ec45ee Parents: 2092622 Author: Otavio Santana <[email protected]> Authored: Tue Jul 11 16:30:06 2017 -0300 Committer: Otavio Santana <[email protected]> Committed: Tue Jul 11 16:30:06 2017 -0300 ---------------------------------------------------------------------- .../apache/openejb/core/mdb/MdbContainer.java | 21 +++++++++++--------- .../activemq/ActivationContainerTest.java | 17 +++------------- 2 files changed, 15 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/6a0d6390/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java index 5bbcb94..aed6ee7 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java @@ -246,13 +246,7 @@ public class MdbContainer implements RpcContainer { objectRecipe.allow(Option.IGNORE_MISSING_PROPERTIES); objectRecipe.disallow(Option.FIELD_INJECTION); - final Properties containerActivationProperties = new Properties(); - addActivationProperties(containerActivationProperties, "activation.", properties); - addActivationProperties(containerActivationProperties, "mdb.container." + containerID + ".activation.", SystemInstance.get().getProperties()); - for (final String propertyName : containerActivationProperties.stringPropertyNames()) { - objectRecipe.setMethodProperty(propertyName, containerActivationProperties.getProperty(propertyName)); - } final Map<String, String> beanContextActivationProperties = beanContext.getActivationProperties(); final Map<String, String> activationProperties = beanContextActivationProperties; @@ -261,6 +255,14 @@ public class MdbContainer implements RpcContainer { } objectRecipe.setMethodProperty("beanClass", beanContext.getBeanClass()); + final Properties containerActivationProperties = new Properties(); + addActivationProperties(containerActivationProperties, "activation.", properties); + addActivationProperties(containerActivationProperties, "mdb.container." + containerID + ".activation.", SystemInstance.get().getProperties()); + + for (final String propertyName : containerActivationProperties.stringPropertyNames()) { + objectRecipe.setMethodProperty(propertyName, containerActivationProperties.getProperty(propertyName)); + } + // create the activationSpec final ActivationSpec activationSpec = (ActivationSpec) objectRecipe.create(activationSpecClass.getClassLoader()); @@ -271,6 +273,7 @@ public class MdbContainer implements RpcContainer { unusedProperties.remove("destinationLookup"); unusedProperties.remove("connectionFactoryLookup"); unusedProperties.remove("beanClass"); + if (!unusedProperties.isEmpty()) { final String text = "No setter found for the activation spec properties: " + unusedProperties; if (failOnUnknownActivationSpec) { @@ -310,7 +313,7 @@ public class MdbContainer implements RpcContainer { private void addActivationProperties(final Properties target, final String prefix, final Properties source) { for (final String propertyName : source.stringPropertyNames()) { - if (! propertyName.startsWith(prefix)) continue; + if (!propertyName.startsWith(prefix)) continue; final String activationPropertyName = propertyName.substring(prefix.length()); target.setProperty(activationPropertyName, source.getProperty(propertyName)); @@ -629,7 +632,7 @@ public class MdbContainer implements RpcContainer { } public void start() throws ResourceException { - if (! started.compareAndSet(false, true)) { + if (!started.compareAndSet(false, true)) { return; } @@ -645,7 +648,7 @@ public class MdbContainer implements RpcContainer { } public void stop() { - if (! started.compareAndSet(true, false)) { + if (!started.compareAndSet(true, false)) { return; } http://git-wip-us.apache.org/repos/asf/tomee/blob/6a0d6390/container/openejb-core/src/test/java/org/apache/openejb/activemq/ActivationContainerTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/activemq/ActivationContainerTest.java b/container/openejb-core/src/test/java/org/apache/openejb/activemq/ActivationContainerTest.java index 24d8a97..cc35275 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/activemq/ActivationContainerTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/activemq/ActivationContainerTest.java @@ -38,15 +38,12 @@ import javax.jms.MessageProducer; import javax.jms.Queue; import javax.jms.Session; import javax.jms.TextMessage; -import javax.jms.XAConnection; import javax.jms.XAConnectionFactory; import java.util.Properties; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import static org.hamcrest.CoreMatchers.instanceOf; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; @RunWith(ApplicationComposer.class) @@ -65,6 +62,7 @@ public class ActivationContainerTest { .p("mdbs", "new://Container?type=MESSAGE") .p("mdbs.ResourceAdapter", "amq") + .p("mdbs.activation.destination", "target") .p("cf", "new://Resource?type=" + ConnectionFactory.class.getName()) .p("cf.ResourceAdapter", "amq") @@ -95,7 +93,7 @@ public class ActivationContainerTest { } @Test - public void standardCode() throws Exception { + public void test() throws Exception { assertNotNull(cf); @@ -103,14 +101,6 @@ public class ActivationContainerTest { testConnection(connection); } - @Test - public void xaCode() throws Exception { - assertNotNull(xacf); - - final Connection connection = xacf.createXAConnection(); - assertThat(connection, instanceOf(XAConnection.class)); - testConnection(connection); - } private void testConnection(final Connection connection) throws JMSException, InterruptedException { try { @@ -128,8 +118,7 @@ public class ActivationContainerTest { } @MessageDriven(activationConfig = { - @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"), - @ActivationConfigProperty(propertyName = "destination", propertyValue = "target") + @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue") }) public static class Listener implements MessageListener { public static CountDownLatch latch;
