WFLY-4218 Fix EJB3 Compiler Warnings

The EJB3 subsystem contains quite a few compiler warnings that are easy
to fix (raw types, unused imports, unused variables, deprecated code).

Issue: WFLY-4218
https://issues.jboss.org/browse/WFLY-4218

ee/src/main/java/org/jboss/as/ee/subsystem/ManagedExecutorServiceAdd.java

@@ -23,6 +23,7 @@
 
 import org.glassfish.enterprise.concurrent.AbstractManagedExecutorService;
 import org.glassfish.enterprise.concurrent.ContextServiceImpl;
+import org.glassfish.enterprise.concurrent.ManagedExecutorServiceAdapter;
 import org.glassfish.enterprise.concurrent.ManagedThreadFactoryImpl;
 import org.jboss.as.controller.AbstractAddStepHandler;
 import org.jboss.as.controller.OperationContext;
@@ -66,7 +67,7 @@ protected void performRuntime(OperationContext context, ModelNode operation, Mod
         final AbstractManagedExecutorService.RejectPolicy rejectPolicy = AbstractManagedExecutorService.RejectPolicy.valueOf(ManagedExecutorServiceResourceDefinition.REJECT_POLICY_AD.resolveModelAttribute(context, model).asString());
 
         final ManagedExecutorServiceService service = new ManagedExecutorServiceService(name, jndiName, hungTaskThreshold, longRunningTasks, coreThreads, maxThreads, keepAliveTime, keepAliveTimeUnit, threadLifeTime, queueLength, rejectPolicy);
-        final ServiceBuilder serviceBuilder = context.getServiceTarget().addService(ConcurrentServiceNames.getManagedExecutorServiceServiceName(name), service);
+        final ServiceBuilder<ManagedExecutorServiceAdapter> serviceBuilder = context.getServiceTarget().addService(ConcurrentServiceNames.getManagedExecutorServiceServiceName(name), service);
 
         boolean rcPresent = context.getOriginalRootResource().hasChild(PathElement.pathElement(ModelDescriptionConstants.SUBSYSTEM, RequestControllerExtension.SUBSYSTEM_NAME));
         String contextService = null;

ee/src/main/java/org/jboss/as/ee/subsystem/ManagedScheduledExecutorServiceAdd.java

@@ -21,8 +21,11 @@
  */
 package org.jboss.as.ee.subsystem;
 
+import java.util.concurrent.TimeUnit;
+
 import org.glassfish.enterprise.concurrent.AbstractManagedExecutorService;
 import org.glassfish.enterprise.concurrent.ContextServiceImpl;
+import org.glassfish.enterprise.concurrent.ManagedScheduledExecutorServiceAdapter;
 import org.glassfish.enterprise.concurrent.ManagedThreadFactoryImpl;
 import org.jboss.as.controller.AbstractAddStepHandler;
 import org.jboss.as.controller.OperationContext;
@@ -37,8 +40,6 @@
 import org.wildfly.extension.requestcontroller.RequestController;
 import org.wildfly.extension.requestcontroller.RequestControllerExtension;
 
-import java.util.concurrent.TimeUnit;
-
 /**
  * @author Eduardo Martins
  */
@@ -67,7 +68,7 @@ protected void performRuntime(OperationContext context, ModelNode operation, Mod
         final AbstractManagedExecutorService.RejectPolicy rejectPolicy = AbstractManagedExecutorService.RejectPolicy.valueOf(ManagedScheduledExecutorServiceResourceDefinition.REJECT_POLICY_AD.resolveModelAttribute(context, model).asString());
 
         final ManagedScheduledExecutorServiceService service = new ManagedScheduledExecutorServiceService(name, jndiName, hungTaskThreshold, longRunningTasks, coreThreads, keepAliveTime, keepAliveTimeUnit, threadLifeTime, rejectPolicy);
-        final ServiceBuilder serviceBuilder = context.getServiceTarget().addService(ConcurrentServiceNames.getManagedScheduledExecutorServiceServiceName(name), service);
+        final ServiceBuilder<ManagedScheduledExecutorServiceAdapter> serviceBuilder = context.getServiceTarget().addService(ConcurrentServiceNames.getManagedScheduledExecutorServiceServiceName(name), service);
 
         String contextService = null;
         if(model.hasDefined(ManagedScheduledExecutorServiceResourceDefinition.CONTEXT_SERVICE)) {

ee/src/main/java/org/jboss/as/ee/subsystem/ManagedThreadFactoryAdd.java

@@ -22,6 +22,7 @@
 package org.jboss.as.ee.subsystem;
 
 import org.glassfish.enterprise.concurrent.ContextServiceImpl;
+import org.glassfish.enterprise.concurrent.ManagedThreadFactoryImpl;
 import org.jboss.as.controller.AbstractAddStepHandler;
 import org.jboss.as.controller.OperationContext;
 import org.jboss.as.controller.OperationFailedException;
@@ -51,7 +52,7 @@ protected void performRuntime(OperationContext context, ModelNode operation, Mod
         final int priority = ManagedThreadFactoryResourceDefinition.PRIORITY_AD.resolveModelAttribute(context, model).asInt();
 
         final ManagedThreadFactoryService service = new ManagedThreadFactoryService(name, jndiName, priority);
-        final ServiceBuilder serviceBuilder = context.getServiceTarget().addService(ConcurrentServiceNames.getManagedThreadFactoryServiceName(name), service);
+        final ServiceBuilder<ManagedThreadFactoryImpl> serviceBuilder = context.getServiceTarget().addService(ConcurrentServiceNames.getManagedThreadFactoryServiceName(name), service);
         String contextService = null;
         if(model.hasDefined(ManagedThreadFactoryResourceDefinition.CONTEXT_SERVICE)) {
             contextService = ManagedThreadFactoryResourceDefinition.CONTEXT_SERVICE_AD.resolveModelAttribute(context, model).asString();

ejb3/src/main/java/org/jboss/as/ejb3/component/EJBContainerInterceptorsViewConfigurator.java

@@ -52,7 +52,6 @@
 import org.jboss.invocation.InterceptorFactoryContext;
 import org.jboss.invocation.Interceptors;
 import org.jboss.invocation.proxy.MethodIdentifier;
-import org.jboss.logging.Logger;
 import org.jboss.msc.value.CachedValue;
 import org.jboss.msc.value.ConstructedValue;
 import org.jboss.msc.value.Value;
@@ -79,8 +78,7 @@
  */
 public class EJBContainerInterceptorsViewConfigurator implements ViewConfigurator {
 
-    private static final Logger logger = Logger.getLogger(EJBContainerInterceptorsViewConfigurator.class);
-    private static final Class[] EMPTY_CLASS_ARRAY = new Class[0];
+    private static final Class<?>[] EMPTY_CLASS_ARRAY = new Class[0];
 
     public static final EJBContainerInterceptorsViewConfigurator INSTANCE = new EJBContainerInterceptorsViewConfigurator();
 
@@ -233,7 +231,6 @@ private class InterceptorClassDescriptionTraversal extends ClassDescriptionTrave
         private final EJBComponentDescription ejbComponentDescription;
         private final DeploymentReflectionIndex deploymentReflectionIndex;
         private final Class<?> interceptorClass;
-        private final String interceptorClassName;
 
         private final List<InterceptorFactory> aroundInvokeInterceptorFactories = new ArrayList<InterceptorFactory>();
         private final List<InterceptorFactory> aroundTimeoutInterceptorFactories = new ArrayList<InterceptorFactory>();
@@ -247,7 +244,6 @@ private class InterceptorClassDescriptionTraversal extends ClassDescriptionTrave
             this.deploymentReflectionIndex = deploymentUnit.getAttachment(REFLECTION_INDEX);
             this.moduleDescription = deploymentUnit.getAttachment(Attachments.EE_MODULE_DESCRIPTION);
             this.interceptorClass = interceptorClass;
-            this.interceptorClassName = interceptorClass.getName();
 
         }
 

ejb3/src/main/java/org/jboss/as/ejb3/component/allowedmethods/AllowedMethodsInformation.java

@@ -170,14 +170,6 @@ public DeniedSyncMethodKey(CurrentSynchronizationCallback.CallbackType callbackT
             this.methodType = methodType;
         }
 
-        public CurrentSynchronizationCallback.CallbackType getCallbackType() {
-            return callbackType;
-        }
-
-        public MethodType getMethodType() {
-            return methodType;
-        }
-
         @Override
         public boolean equals(Object o) {
             if (this == o) return true;

ejb3/src/main/java/org/jboss/as/ejb3/component/entity/EntityBeanComponent.java

@@ -62,7 +62,7 @@ public class EntityBeanComponent extends EJBComponent implements PooledComponent
     private final Class<EJBLocalHome> localHomeClass;
     private final Class<EJBLocalObject> localClass;
     private final Class<EJBObject> remoteClass;
-    private final Class<Object> primaryKeyClass;
+    private final Class<?> primaryKeyClass;
     private final Boolean optimisticLocking;
 
     private final Method ejbStoreMethod;
@@ -201,7 +201,7 @@ public Class<EJBObject> getRemoteClass() {
         return remoteClass;
     }
 
-    public Class<Object> getPrimaryKeyClass() {
+    public Class<?> getPrimaryKeyClass() {
         return primaryKeyClass;
     }
 

ejb3/src/main/java/org/jboss/as/ejb3/component/entity/EntityBeanComponentCreateService.java

@@ -55,7 +55,7 @@ public class EntityBeanComponentCreateService extends EJBComponentCreateService
     private final Class<EJBLocalHome> localHomeClass;
     private final Class<EJBObject> remoteClass;
     private final Class<EJBLocalObject> localClass;
-    private final Class<Object> primaryKeyClass;
+    private final Class<?> primaryKeyClass;
     private final Method ejbStoreMethod;
     private final Method ejbLoadMethod;
     private final Method ejbActivateMethod;
@@ -80,7 +80,7 @@ public EntityBeanComponentCreateService(final ComponentConfiguration componentCo
         localHomeClass = (Class<EJBLocalHome>) load(classLoader, beanMetaData.getLocalHome());
         localClass = (Class<EJBLocalObject>) load(classLoader, beanMetaData.getLocal());
         remoteClass = (Class<EJBObject>) load(classLoader, beanMetaData.getRemote());
-        primaryKeyClass = (Class<Object>) load(classLoader, beanMetaData.getPrimKeyClass());
+        primaryKeyClass = (Class<?>) load(classLoader, beanMetaData.getPrimKeyClass());
 
         final ClassLoader classLoader1 = componentConfiguration.getModuleClassLoader();
         final InterceptorFactory tcclInterceptorFactory = new ImmediateInterceptorFactory(new ContextClassLoaderInterceptor(classLoader1));
@@ -174,7 +174,7 @@ public Class<EJBLocalObject> getLocalClass() {
         return localClass;
     }
 
-    public Class<Object> getPrimaryKeyClass() {
+    public Class<?> getPrimaryKeyClass() {
         return primaryKeyClass;
     }
 

ejb3/src/main/java/org/jboss/as/ejb3/component/entity/interceptors/EntityBeanHomeFinderInterceptorFactory.java

@@ -102,7 +102,7 @@ public Object processInvocation(final InterceptorContext context) throws Excepti
     protected Object prepareResults(final InterceptorContext context, final Object result, final EntityBeanComponent component) throws Exception {
         switch (returnType) {
             case COLLECTION: {
-                Collection keys = (Collection) result;
+                Collection<?> keys = (Collection<?>) result;
                 final Set<Object> results = new LinkedHashSet<Object>();
                 if (keys != null) {
                     for (Object key : keys) {
@@ -112,7 +112,7 @@ protected Object prepareResults(final InterceptorContext context, final Object r
                 return results;
             }
             case ENUMERATION: {
-                Enumeration keys = (Enumeration) result;
+                Enumeration<?> keys = (Enumeration<?>) result;
                 final Set<Object> results = new LinkedHashSet<Object>();
                 if (keys != null) {
                     while (keys.hasMoreElements()) {

ejb3/src/main/java/org/jboss/as/ejb3/component/entity/interceptors/EntityBeanHomeMethodInterceptorFactory.java

@@ -59,7 +59,6 @@ public Object processInvocation(final InterceptorContext context) throws Excepti
 
                 //grab a bean from the pool to invoke the business method on
                 final EntityBeanComponentInstance instance = component.acquireUnAssociatedInstance();
-                final Object result;
                 final InvocationType invocationType = context.getPrivateData(InvocationType.class);
                 try {
                     context.putPrivateData(InvocationType.class, InvocationType.HOME_METHOD);

ejb3/src/main/java/org/jboss/as/ejb3/component/interceptors/AsyncInvocationTask.java

@@ -34,7 +34,7 @@
  *
 * @author Stuart Douglas
 */
-public abstract class AsyncInvocationTask implements Runnable, Future {
+public abstract class AsyncInvocationTask implements Runnable, Future<Object> {
     private final CancellationFlag cancelledFlag;
 
     private volatile boolean running = false;

ejb3/src/main/java/org/jboss/as/ejb3/component/messagedriven/MessageDrivenComponent.java

@@ -27,7 +27,6 @@
 
 import javax.resource.ResourceException;
 import javax.resource.spi.ActivationSpec;
-import javax.resource.spi.ResourceAdapter;
 import javax.resource.spi.endpoint.MessageEndpointFactory;
 import javax.transaction.TransactionManager;
 
@@ -67,10 +66,8 @@ public class MessageDrivenComponent extends EJBComponent implements PooledCompon
     private final SuspendController suspendController;
     private final ActivationSpec activationSpec;
     private final MessageEndpointFactory endpointFactory;
-    private final Class<?> messageListenerInterface;
     private final ClassLoader classLoader;
     private volatile boolean deliveryActive;
-    private ResourceAdapter resourceAdapter;
     private Endpoint endpoint;
     private String activationName;
 
@@ -92,11 +89,6 @@ public void preSuspend(ServerActivityCallback listener) {
             listener.done();
         }
 
-        @Deprecated
-        public void suspened(ServerActivityCallback listener) {
-            suspended(listener);
-        }
-
         public void suspended(ServerActivityCallback listener) {
             listener.done();
         }
@@ -142,7 +134,6 @@ public void destroy(MessageDrivenComponentInstance obj) {
         this.classLoader = ejbComponentCreateService.getModuleClassLoader();
         this.suspendController = ejbComponentCreateService.getSuspendControllerInjectedValue().getValue();
         this.activationSpec = activationSpec;
-        this.messageListenerInterface = messageListenerInterface;
         final ClassLoader componentClassLoader = doPrivileged(new GetClassLoaderAction(ejbComponentCreateService.getComponentClass()));
         final MessageEndpointService<?> service = new MessageEndpointService<Object>() {
             @Override
@@ -204,10 +195,6 @@ public String getPoolName() {
         return poolName;
     }
 
-    protected void setResourceAdapter(ResourceAdapter resourceAdapter) {
-        this.resourceAdapter = resourceAdapter;
-    }
-
     void setEndpoint(final Endpoint endpoint) {
         this.endpoint = endpoint;
     }

ejb3/src/main/java/org/jboss/as/ejb3/component/messagedriven/MessageDrivenComponentCreateService.java

@@ -99,9 +99,6 @@ protected BasicComponent createComponent() {
 
         final ActivationSpec activationSpec = getEndpointDeployer().createActivationSpecs(activeResourceAdapterName, messageListenerInterface, activationProps, getDeploymentClassLoader());
         final MessageDrivenComponent component = new MessageDrivenComponent(this, messageListenerInterface, activationSpec, deliveryActive);
-        // set the resource adapter
-        final ResourceAdapter resourceAdapter = this.resourceAdapterInjectedValue.getValue();
-        component.setResourceAdapter(resourceAdapter);
         // set the endpoint
         final EJBUtilities ejbUtilities = this.ejbUtilitiesInjectedValue.getValue();
         final Endpoint endpoint = ejbUtilities.getEndpoint(activeResourceAdapterName);

ejb3/src/main/java/org/jboss/as/ejb3/component/singleton/SingletonComponentDescription.java

@@ -42,7 +42,6 @@
 import org.jboss.as.ee.component.serialization.WriteReplaceInterface;
 import org.jboss.as.ee.metadata.MetadataCompleteMarker;
 import org.jboss.as.ejb3.logging.EjbLogger;
-import org.jboss.as.ejb3.component.DefaultAccessTimeoutService;
 import org.jboss.as.ejb3.component.EJBViewDescription;
 import org.jboss.as.ejb3.component.MethodIntf;
 import org.jboss.as.ejb3.component.interceptors.ComponentTypeIdentityInterceptorFactory;
@@ -78,8 +77,6 @@ public class SingletonComponentDescription extends SessionBeanComponentDescripti
 
     private final List<ServiceName> dependsOn = new ArrayList<ServiceName>();
 
-    private DefaultAccessTimeoutService defaultAccessTimeoutProvider;
-
     /**
      * Construct a new instance.
      *

ejb3/src/main/java/org/jboss/as/ejb3/concurrency/ContainerManagedConcurrencyInterceptor.java

@@ -25,7 +25,6 @@
 import org.jboss.as.ejb3.logging.EjbLogger;
 import org.jboss.invocation.Interceptor;
 import org.jboss.invocation.InterceptorContext;
-import org.jboss.logging.Logger;
 
 import javax.ejb.LockType;
 import javax.interceptor.InvocationContext;
@@ -40,11 +39,6 @@
  */
 public class ContainerManagedConcurrencyInterceptor implements Interceptor {
 
-    /**
-     * Logger
-     */
-    private static final Logger logger = Logger.getLogger(ContainerManagedConcurrencyInterceptor.class);
-
     /**
      * A spec compliant {@link org.jboss.as.ejb3.concurrency.EJBReadWriteLock}
      */

ejb3/src/main/java/org/jboss/as/ejb3/context/CurrentInvocationContext.java

@@ -38,10 +38,6 @@ public static InterceptorContext get() {
         return current;
     }
 
-    public static <T extends InterceptorContext> T get(Class<T> expectedType) {
-        return expectedType.cast(get());
-    }
-
     public static EJBContextImpl getEjbContext() {
         final InterceptorContext context = get();
         if(context == null) {

ejb3/src/main/java/org/jboss/as/ejb3/deployment/processors/AnnotatedEJBComponentDescriptionDeploymentUnitProcessor.java

@@ -25,7 +25,6 @@
 import org.jboss.as.server.deployment.DeploymentUnitProcessingException;
 import org.jboss.as.server.deployment.DeploymentUnitProcessor;
 import org.jboss.as.server.deployment.annotation.CompositeIndex;
-import org.jboss.logging.Logger;
 import org.jboss.metadata.ejb.spec.EnterpriseBeanMetaData;
 
 /**
@@ -34,7 +33,7 @@
  * @author <a href="mailto:cdewolf@redhat.com">Carlo de Wolf</a>
  */
 public class AnnotatedEJBComponentDescriptionDeploymentUnitProcessor extends AbstractDeploymentUnitProcessor implements DeploymentUnitProcessor {
-    private static final Logger logger = Logger.getLogger(AnnotatedEJBComponentDescriptionDeploymentUnitProcessor.class);
+
     private final EJBComponentDescriptionFactory[] factories;
 
     /**

ejb3/src/main/java/org/jboss/as/ejb3/deployment/processors/EJBComponentDescriptionFactory.java

@@ -21,25 +21,23 @@
  */
 package org.jboss.as.ejb3.deployment.processors;
 
+import static org.jboss.as.ejb3.deployment.processors.AbstractDeploymentUnitProcessor.getEjbJarDescription;
+
 import org.jboss.as.ee.component.Attachments;
 import org.jboss.as.ejb3.component.EJBComponentDescription;
 import org.jboss.as.ejb3.deployment.EjbDeploymentAttachmentKeys;
 import org.jboss.as.ejb3.deployment.EjbJarDescription;
 import org.jboss.as.server.deployment.DeploymentUnit;
 import org.jboss.as.server.deployment.DeploymentUnitProcessingException;
 import org.jboss.as.server.deployment.annotation.CompositeIndex;
-import org.jboss.logging.Logger;
 import org.jboss.metadata.ejb.spec.EjbJarMetaData;
 import org.jboss.metadata.ejb.spec.EnterpriseBeanMetaData;
 import org.jboss.metadata.ejb.spec.EnterpriseBeansMetaData;
 
-import static org.jboss.as.ejb3.deployment.processors.AbstractDeploymentUnitProcessor.getEjbJarDescription;
-
 /**
  * @author <a href="mailto:cdewolf@redhat.com">Carlo de Wolf</a>
  */
 public abstract class EJBComponentDescriptionFactory {
-    private static final Logger logger = Logger.getLogger(EJBComponentDescriptionFactory.class);
 
     /**
      * If this is an appclient we want to make the components as not installable, so we can still look up which EJB's are in

ejb3/src/main/java/org/jboss/as/ejb3/deployment/processors/EjbManagementDeploymentUnitProcessor.java

@@ -103,7 +103,7 @@ public void undeploy(DeploymentUnit deploymentUnit) {
     private void installManagementResource(ComponentConfiguration configuration, DeploymentUnit deploymentUnit) {
         final EJBComponentType type = EJBComponentType.getComponentType(configuration);
         PathAddress addr = getComponentAddress(type, configuration, deploymentUnit);
-        final AbstractEJBComponentRuntimeHandler handler = type.getRuntimeHandler();
+        final AbstractEJBComponentRuntimeHandler<?> handler = type.getRuntimeHandler();
         handler.registerComponent(addr, configuration.getComponentDescription().getStartServiceName());
         deploymentUnit.addToAttachmentList(EjbDeploymentAttachmentKeys.MANAGED_COMPONENTS, new InstalledComponent(type, addr));
         deploymentUnit.createDeploymentSubModel(EJB3Extension.SUBSYSTEM_NAME, addr.getLastElement());

ejb3/src/main/java/org/jboss/as/ejb3/deployment/processors/EjbResourceInjectionAnnotationProcessor.java

@@ -203,7 +203,6 @@ private class EJBResourceWrapper {
         private final String beanInterface;
         private final String beanName;
         private final String lookup;
-        private final String description;
         private final PropertyReplacer propertyReplacer;
 
         public EJBResourceWrapper(AnnotationInstance annotation, PropertyReplacer propertyReplacer) {
@@ -217,7 +216,6 @@ public EJBResourceWrapper(AnnotationInstance annotation, PropertyReplacer proper
                 lookupValue = stringValueOrNull(annotation, "mappedName");
             }
             this.lookup = lookupValue;
-            description = stringValueOrNull(annotation, "description");
         }
 
         private String name() {
@@ -236,10 +234,6 @@ private String lookup() {
             return lookup;
         }
 
-        private String description() {
-            return description;
-        }
-
         private String stringValueOrNull(final AnnotationInstance annotation, final String attribute) {
             final AnnotationValue value = annotation.value(attribute);
             return (value != null) ? propertyReplacer.replaceProperties(value.asString()) : null;