Repository: tomee Updated Branches: refs/heads/tomee-1.7.x 75c645bd6 -> ef907c6a3
PMD fixes Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/ef907c6a Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/ef907c6a Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/ef907c6a Branch: refs/heads/tomee-1.7.x Commit: ef907c6a3a3f9cc6b3487f3a3d60c1ee2a851b0f Parents: 75c645b Author: Jonathan Gallimore <[email protected]> Authored: Thu Jul 6 11:53:38 2017 +0100 Committer: Jonathan Gallimore <[email protected]> Committed: Thu Jul 6 11:53:38 2017 +0100 ---------------------------------------------------------------------- .../apache/openejb/core/mdb/MdbContainer.java | 9 +-------- .../apache/openejb/dyni/DynamicSubclass.java | 2 +- .../activemq/ActiveMQResourceAdapter.java | 21 -------------------- 3 files changed, 2 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/ef907c6a/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 f7e485e..77eaa8a 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 @@ -80,10 +80,7 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicBoolean; import static javax.management.MBeanOperationInfo.ACTION; -import static org.apache.openejb.core.transaction.EjbTransactionUtil.afterInvoke; -import static org.apache.openejb.core.transaction.EjbTransactionUtil.createTransactionPolicy; -import static org.apache.openejb.core.transaction.EjbTransactionUtil.handleApplicationException; -import static org.apache.openejb.core.transaction.EjbTransactionUtil.handleSystemException; +import static org.apache.openejb.core.transaction.EjbTransactionUtil.*; public class MdbContainer implements RpcContainer { private static final Logger logger = Logger.getInstance(LogCategory.OPENEJB, "org.apache.openejb.util.resources"); @@ -228,10 +225,6 @@ public class MdbContainer implements RpcContainer { } } - private static String getOrDefault(final Map<String, String> map, final String key, final String defaultValue) { - return map.get(key) != null ? map.get(key) : defaultValue; - } - private ActivationSpec createActivationSpec(final BeanContext beanContext) throws OpenEJBException { try { // initialize the object recipe http://git-wip-us.apache.org/repos/asf/tomee/blob/ef907c6a/container/openejb-core/src/main/java/org/apache/openejb/dyni/DynamicSubclass.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/dyni/DynamicSubclass.java b/container/openejb-core/src/main/java/org/apache/openejb/dyni/DynamicSubclass.java index b409a06..507d80d 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/dyni/DynamicSubclass.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/dyni/DynamicSubclass.java @@ -64,7 +64,7 @@ public class DynamicSubclass implements Opcodes { return createSubclass(abstractClass, cl, false); } - public static Class createSubclass(final Class<?> abstractClass, final ClassLoader cl, boolean proxyNonAbstractMethods) { + public static Class createSubclass(final Class<?> abstractClass, final ClassLoader cl, final boolean proxyNonAbstractMethods) { final String proxyName = getSubclassName(abstractClass); try { http://git-wip-us.apache.org/repos/asf/tomee/blob/ef907c6a/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java index c469e44..8880875 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java @@ -18,28 +18,19 @@ package org.apache.openejb.resource.activemq; import org.apache.activemq.broker.BrokerService; -import org.apache.activemq.ra.ActiveMQEndpointActivationKey; -import org.apache.activemq.ra.ActiveMQEndpointWorker; -import org.apache.openejb.BeanContext; -import org.apache.openejb.core.mdb.MdbContainer; import org.apache.openejb.util.Duration; import org.apache.openejb.util.LogCategory; import org.apache.openejb.util.Logger; import org.apache.openejb.util.URISupport; import org.apache.openejb.util.URLs; -import org.apache.openejb.util.reflection.Reflections; -import javax.management.ObjectName; -import javax.resource.ResourceException; import javax.resource.spi.BootstrapContext; import javax.resource.spi.ResourceAdapterInternalException; import java.lang.reflect.Method; import java.net.URISyntaxException; import java.util.Collection; import java.util.Iterator; -import java.util.Map; import java.util.Properties; -import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; @SuppressWarnings("UnusedDeclaration") @@ -49,7 +40,6 @@ public class ActiveMQResourceAdapter extends org.apache.activemq.ra.ActiveMQReso private String useDatabaseLock; private String startupTimeout = "60000"; private BootstrapContext bootstrapContext; - private final Map<BeanContext, ObjectName> mbeanNames = new ConcurrentHashMap<BeanContext, ObjectName>(); public String getDataSource() { return dataSource; @@ -152,17 +142,6 @@ public class ActiveMQResourceAdapter extends org.apache.activemq.ra.ActiveMQReso } } - private ActiveMQEndpointWorker getWorker(final BeanContext beanContext) throws ResourceException { - final Map<ActiveMQEndpointActivationKey, ActiveMQEndpointWorker> workers = Map.class.cast(Reflections.get( - MdbContainer.class.cast(beanContext.getContainer()).getResourceAdapter(), "endpointWorkers")); - for (final Map.Entry<ActiveMQEndpointActivationKey, ActiveMQEndpointWorker> entry : workers.entrySet()) { - if (entry.getKey().getMessageEndpointFactory() == beanContext.getContainerData()) { - return entry.getValue(); - } - } - throw new IllegalStateException("No worker for " + beanContext.getDeploymentID()); - } - @Override public BootstrapContext getBootstrapContext() { return this.bootstrapContext;
