PMD fixes
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/8b2ef1f4 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/8b2ef1f4 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/8b2ef1f4 Branch: refs/heads/tomee-1.7.x Commit: 8b2ef1f4a2e4dbc4a9c14e9b36a187d85c40ffee Parents: ed35354 Author: Jonathan Gallimore <[email protected]> Authored: Thu Jan 18 12:39:28 2018 +0000 Committer: Jonathan Gallimore <[email protected]> Committed: Thu Jan 18 12:39:28 2018 +0000 ---------------------------------------------------------------------- .../openejb/assembler/classic/Assembler.java | 2 +- .../core/mdb/AbstractEndpointHandler.java | 2 +- .../openejb/core/mdb/EndpointFactory.java | 2 +- .../openejb/core/mdb/MdbContainerFactory.java | 30 ++++++++++---------- .../org/apache/openejb/core/mdb/MdbContext.java | 2 +- .../openejb/core/mdb/MdbInstanceManager.java | 13 +++------ .../openejb/core/mdb/PoolEndpointHandler.java | 5 +--- 7 files changed, 24 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/8b2ef1f4/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java index 997f94f..aed78ea 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java @@ -2370,7 +2370,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A if (undeployException.getCauses().size() > 0) { // logging causes here otherwise it will be eaten in later logs. - for (Throwable cause : undeployException.getCauses()) { + for (final Throwable cause : undeployException.getCauses()) { logger.error("undeployException original cause", cause); } throw undeployException; http://git-wip-us.apache.org/repos/asf/tomee/blob/8b2ef1f4/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/AbstractEndpointHandler.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/AbstractEndpointHandler.java b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/AbstractEndpointHandler.java index 67cdc46..f8f8f08 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/AbstractEndpointHandler.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/AbstractEndpointHandler.java @@ -36,7 +36,7 @@ abstract class AbstractEndpointHandler implements InvocationHandler, MessageEndp protected final BaseMdbContainer container; - AbstractEndpointHandler(BaseMdbContainer container) { + AbstractEndpointHandler(final BaseMdbContainer container) { this.container = container; } http://git-wip-us.apache.org/repos/asf/tomee/blob/8b2ef1f4/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointFactory.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointFactory.java index cc0b0e2..7dbb1d1 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointFactory.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointFactory.java @@ -47,7 +47,7 @@ public class EndpointFactory implements MessageEndpointFactory { private final Class<?> proxy; private final boolean usePool; - public EndpointFactory(final ActivationSpec activationSpec, final BaseMdbContainer container, final BeanContext beanContext, final MdbInstanceFactory instanceFactory, final MdbInstanceManager instanceManager, final XAResourceWrapper xaResourceWrapper, boolean usePool) { + public EndpointFactory(final ActivationSpec activationSpec, final BaseMdbContainer container, final BeanContext beanContext, final MdbInstanceFactory instanceFactory, final MdbInstanceManager instanceManager, final XAResourceWrapper xaResourceWrapper, final boolean usePool) { this.activationSpec = activationSpec; this.container = container; this.beanContext = beanContext; http://git-wip-us.apache.org/repos/asf/tomee/blob/8b2ef1f4/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainerFactory.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainerFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainerFactory.java index 86b6ce9..4a6088f 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainerFactory.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainerFactory.java @@ -37,7 +37,7 @@ public class MdbContainerFactory { private Duration closeTimeout; private Pool.Builder poolBuilder = new Pool.Builder(); private int callbackThreads = 5; - private boolean useOneSchedulerThreadByBean = false; + private boolean useOneSchedulerThreadByBean; private int evictionThreads = 1; private boolean pool; private Properties properties = new Properties(); @@ -48,7 +48,7 @@ public class MdbContainerFactory { return id; } - public void setId(Object id) { + public void setId(final Object id) { this.id = id; } @@ -56,7 +56,7 @@ public class MdbContainerFactory { return securityService; } - public void setSecurityService(SecurityService securityService) { + public void setSecurityService(final SecurityService securityService) { this.securityService = securityService; } @@ -64,7 +64,7 @@ public class MdbContainerFactory { return resourceAdapter; } - public void setResourceAdapter(ResourceAdapter resourceAdapter) { + public void setResourceAdapter(final ResourceAdapter resourceAdapter) { this.resourceAdapter = resourceAdapter; } @@ -72,7 +72,7 @@ public class MdbContainerFactory { return messageListenerInterface; } - public void setMessageListenerInterface(Class messageListenerInterface) { + public void setMessageListenerInterface(final Class messageListenerInterface) { this.messageListenerInterface = messageListenerInterface; } @@ -80,7 +80,7 @@ public class MdbContainerFactory { return activationSpecClass; } - public void setActivationSpecClass(Class activationSpecClass) { + public void setActivationSpecClass(final Class activationSpecClass) { this.activationSpecClass = activationSpecClass; } @@ -92,7 +92,7 @@ public class MdbContainerFactory { * @deprecated use MaxSize */ @Deprecated - public void setInstanceLimit(int instanceLimit) { + public void setInstanceLimit(final int instanceLimit) { setMaxSize(instanceLimit); } @@ -109,7 +109,7 @@ public class MdbContainerFactory { return failOnUnknownActivationSpec; } - public void setFailOnUnknownActivationSpec(boolean failOnUnknownActivationSpec) { + public void setFailOnUnknownActivationSpec(final boolean failOnUnknownActivationSpec) { this.failOnUnknownActivationSpec = failOnUnknownActivationSpec; } @@ -117,7 +117,7 @@ public class MdbContainerFactory { return accessTimeout; } - public void setAccessTimeout(Duration accessTimeout) { + public void setAccessTimeout(final Duration accessTimeout) { this.accessTimeout = accessTimeout; } @@ -125,7 +125,7 @@ public class MdbContainerFactory { return closeTimeout; } - public void setCloseTimeout(Duration closeTimeout) { + public void setCloseTimeout(final Duration closeTimeout) { this.closeTimeout = closeTimeout; } @@ -133,7 +133,7 @@ public class MdbContainerFactory { return poolBuilder; } - public void setPoolBuilder(Pool.Builder poolBuilder) { + public void setPoolBuilder(final Pool.Builder poolBuilder) { this.poolBuilder = poolBuilder; } @@ -141,7 +141,7 @@ public class MdbContainerFactory { return callbackThreads; } - public void setCallbackThreads(int callbackThreads) { + public void setCallbackThreads(final int callbackThreads) { this.callbackThreads = callbackThreads; } @@ -149,7 +149,7 @@ public class MdbContainerFactory { return useOneSchedulerThreadByBean; } - public void setUseOneSchedulerThreadByBean(boolean useOneSchedulerThreadByBean) { + public void setUseOneSchedulerThreadByBean(final boolean useOneSchedulerThreadByBean) { this.useOneSchedulerThreadByBean = useOneSchedulerThreadByBean; } @@ -157,7 +157,7 @@ public class MdbContainerFactory { return evictionThreads; } - public void setEvictionThreads(int evictionThreads) { + public void setEvictionThreads(final int evictionThreads) { this.evictionThreads = evictionThreads; } @@ -197,7 +197,7 @@ public class MdbContainerFactory { return pool; } - public void setPool(boolean pool) { + public void setPool(final boolean pool) { this.pool = pool; } http://git-wip-us.apache.org/repos/asf/tomee/blob/8b2ef1f4/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContext.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContext.java b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContext.java index 09fa639..fae25c4 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContext.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContext.java @@ -32,7 +32,7 @@ import java.io.IOException; * @version $Rev$ $Date$ */ public class MdbContext extends BaseContext implements MessageDrivenContext, Flushable { - private Flushable flushable = null; + private Flushable flushable; public MdbContext(final SecurityService securityService) { super(securityService); http://git-wip-us.apache.org/repos/asf/tomee/blob/8b2ef1f4/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceManager.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceManager.java b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceManager.java index 3355e21..2c6ee67 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceManager.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceManager.java @@ -79,7 +79,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.RejectedExecutionHandler; import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; @@ -129,12 +128,8 @@ public class MdbInstanceManager { this.poolBuilder = poolBuilder; this.scheduledExecutor = ses; - if (ScheduledThreadPoolExecutor.class.isInstance(ses) && !ScheduledThreadPoolExecutor.class.cast(ses).getRemoveOnCancelPolicy()) { - ScheduledThreadPoolExecutor.class.cast(ses).setRemoveOnCancelPolicy(true); - } - if (accessTimeout.getUnit() == null) { - accessTimeout.setUnit(TimeUnit.MILLISECONDS); + accessTimeout.setUnit(MILLISECONDS); } final int qsize = callbackThreads > 1 ? callbackThreads - 1 : 1; @@ -191,12 +186,12 @@ public class MdbInstanceManager { builder.setScheduledExecutor(scheduledExecutor); final int min = builder.getMin(); - final long maxAge = builder.getMaxAge().getTime(TimeUnit.MILLISECONDS); + final long maxAge = builder.getMaxAge().getTime(MILLISECONDS); final double maxAgeOffset = builder.getMaxAgeOffset(); final Data data = new Data(builder.build(), accessTimeout, closeTimeout); - MdbContext mdbContext = new MdbContext(securityService, new Flushable() { + final MdbContext mdbContext = new MdbContext(securityService, new Flushable() { @Override public void flush() throws IOException { data.flush(); @@ -684,7 +679,7 @@ public class MdbInstanceManager { return baseContext; } - public void setBaseContext(BaseContext baseContext) { + public void setBaseContext(final BaseContext baseContext) { this.baseContext = baseContext; } } http://git-wip-us.apache.org/repos/asf/tomee/blob/8b2ef1f4/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/PoolEndpointHandler.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/PoolEndpointHandler.java b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/PoolEndpointHandler.java index d67b28d..f12b391 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/PoolEndpointHandler.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/PoolEndpointHandler.java @@ -37,14 +37,11 @@ public class PoolEndpointHandler extends AbstractEndpointHandler { private final MdbInstanceManager instanceManager; private final XAResource xaResource; - private ThreadContext callContext; - public PoolEndpointHandler(final BaseMdbContainer container, final BeanContext deployment, final MdbInstanceManager instanceManager, final XAResource xaResource) throws UnavailableException { super(container); this.deployment = deployment; this.instanceManager = instanceManager; this.xaResource = xaResource; - this.callContext = ThreadContext.getThreadContext(); } @Override @@ -76,7 +73,7 @@ public class PoolEndpointHandler extends AbstractEndpointHandler { } @Override - protected void recreateInstance(boolean exceptionAlreadyThrown) throws UnavailableException { + protected void recreateInstance(final boolean exceptionAlreadyThrown) throws UnavailableException { }
