[AS7-6781] Make non-final constants final; reduce visibility in some …

…cases
jbossas · Mar 25, 2013 · a823dea · a823dea
1 parent 396713a
commit a823dea
Show file tree

Hide file tree

Showing 61 changed files with 144 additions and 151 deletions.
diff --git a/...src/main/java/org/jboss/as/appclient/deployment/ApplicationClientDependencyProcessor.java b/...src/main/java/org/jboss/as/appclient/deployment/ApplicationClientDependencyProcessor.java
@@ -49,8 +49,8 @@
  */
 public class ApplicationClientDependencyProcessor implements DeploymentUnitProcessor {
 
-    public static ModuleIdentifier CORBA_ID = ModuleIdentifier.create("org.omg.api");
+    public static final ModuleIdentifier CORBA_ID = ModuleIdentifier.create("org.omg.api");
-    public static ModuleIdentifier XNIO = ModuleIdentifier.create("org.jboss.xnio");
+    public static final ModuleIdentifier XNIO = ModuleIdentifier.create("org.jboss.xnio");
 
 
     public ApplicationClientDependencyProcessor() {

diff --git a/cli/src/main/java/org/jboss/as/cli/parsing/arguments/ArgumentValueState.java b/cli/src/main/java/org/jboss/as/cli/parsing/arguments/ArgumentValueState.java
@@ -36,7 +36,7 @@ public class ArgumentValueState extends DefaultParsingState {
 
     public static final String ID = "ARG_VALUE";
 
-    public static ArgumentValueState INSTANCE = new ArgumentValueState();
+    public static final ArgumentValueState INSTANCE = new ArgumentValueState();
 
     public ArgumentValueState() {
         super(ID);

diff --git a/...c/main/java/org/jboss/as/connector/dynamicresource/operations/ClearStatisticsHandler.java b/...c/main/java/org/jboss/as/connector/dynamicresource/operations/ClearStatisticsHandler.java
@@ -44,7 +44,7 @@
  */
 public class ClearStatisticsHandler implements OperationStepHandler {
 
-    public static OperationDefinition DEFINITION = new SimpleOperationDefinitionBuilder(Constants.CLEAR_STATISTICS, ResourceAdaptersExtension.getResourceDescriptionResolver(CONNECTIONDEFINITIONS_NAME))
+    public static final OperationDefinition DEFINITION = new SimpleOperationDefinitionBuilder(Constants.CLEAR_STATISTICS, ResourceAdaptersExtension.getResourceDescriptionResolver(CONNECTIONDEFINITIONS_NAME))
             .build();
 
     private final List<StatisticsPlugin> stats;

diff --git a/connector/src/main/java/org/jboss/as/connector/subsystems/common/pool/Constants.java b/connector/src/main/java/org/jboss/as/connector/subsystems/common/pool/Constants.java
@@ -80,7 +80,7 @@ public class Constants {
 
     public static final SimpleAttributeDefinition POOL_USE_STRICT_MIN = new SimpleAttributeDefinition(POOL_USE_STRICT_MIN_NAME, CommonPool.Tag.USE_STRICT_MIN.getLocalName(), new ModelNode(Defaults.USE_STRICT_MIN), ModelType.BOOLEAN, true, true, MeasurementUnit.NONE);
 
-    public static SimpleAttributeDefinition POOL_FLUSH_STRATEGY = new SimpleAttributeDefinitionBuilder(FLUSH_STRATEGY_NAME, ModelType.STRING)
+    public static final SimpleAttributeDefinition POOL_FLUSH_STRATEGY = new SimpleAttributeDefinitionBuilder(FLUSH_STRATEGY_NAME, ModelType.STRING)
             .setDefaultValue(new ModelNode(Defaults.FLUSH_STRATEGY.getName()))
             .setXmlName(CommonPool.Tag.FLUSH_STRATEGY.getLocalName())
             .setAllowNull(true)

diff --git a/...c/main/java/org/jboss/as/connector/subsystems/common/pool/PoolConfigurationRWHandler.java b/...c/main/java/org/jboss/as/connector/subsystems/common/pool/PoolConfigurationRWHandler.java
@@ -68,7 +68,7 @@ public class PoolConfigurationRWHandler {
 
     // TODO this seems to just do what the default handler does, so registering it is probably unnecessary
     public static class PoolConfigurationReadHandler implements OperationStepHandler {
-        public static PoolConfigurationReadHandler INSTANCE = new PoolConfigurationReadHandler();
+        public static final PoolConfigurationReadHandler INSTANCE = new PoolConfigurationReadHandler();
 
         public void execute(OperationContext context, ModelNode operation) throws OperationFailedException {
             final String parameterName = operation.require(NAME).asString();
@@ -151,7 +151,7 @@ private void updatePoolConfigs(List<PoolConfiguration> poolConfigs, String param
     }
 
     public static class LocalAndXaDataSourcePoolConfigurationWriteHandler extends PoolConfigurationWriteHandler {
-        public static LocalAndXaDataSourcePoolConfigurationWriteHandler INSTANCE = new LocalAndXaDataSourcePoolConfigurationWriteHandler();
+        public static final LocalAndXaDataSourcePoolConfigurationWriteHandler INSTANCE = new LocalAndXaDataSourcePoolConfigurationWriteHandler();
 
         protected LocalAndXaDataSourcePoolConfigurationWriteHandler() {
             super();
@@ -175,7 +175,7 @@ protected List<PoolConfiguration> getMatchingPoolConfigs(String jndiName, Manage
     }
 
     public static class RaPoolConfigurationWriteHandler extends PoolConfigurationWriteHandler {
-        public static RaPoolConfigurationWriteHandler INSTANCE = new RaPoolConfigurationWriteHandler();
+        public static final RaPoolConfigurationWriteHandler INSTANCE = new RaPoolConfigurationWriteHandler();
 
         protected RaPoolConfigurationWriteHandler() {
             super();

diff --git a/connector/src/main/java/org/jboss/as/connector/subsystems/common/pool/PoolOperations.java b/connector/src/main/java/org/jboss/as/connector/subsystems/common/pool/PoolOperations.java
@@ -99,8 +99,8 @@ public void execute(OperationContext context, ModelNode operation) throws Operat
     protected abstract ModelNode invokeCommandOn(Pool pool) throws Exception;
 
     public static class FlushIdleConnectionInPool extends PoolOperations {
-        public static FlushIdleConnectionInPool DS_INSTANCE = new FlushIdleConnectionInPool(new DsPoolMatcher());
+        public static final FlushIdleConnectionInPool DS_INSTANCE = new FlushIdleConnectionInPool(new DsPoolMatcher());
-        public static FlushIdleConnectionInPool RA_INSTANCE = new FlushIdleConnectionInPool(new RaPoolMatcher());
+        public static final FlushIdleConnectionInPool RA_INSTANCE = new FlushIdleConnectionInPool(new RaPoolMatcher());
 
         protected FlushIdleConnectionInPool(PoolMatcher matcher) {
             super(matcher);
@@ -115,8 +115,8 @@ protected ModelNode invokeCommandOn(Pool pool) {
     }
 
     public static class FlushAllConnectionInPool extends PoolOperations {
-        public static FlushAllConnectionInPool DS_INSTANCE = new FlushAllConnectionInPool(new DsPoolMatcher());
+        public static final FlushAllConnectionInPool DS_INSTANCE = new FlushAllConnectionInPool(new DsPoolMatcher());
-        public static FlushAllConnectionInPool RA_INSTANCE = new FlushAllConnectionInPool(new RaPoolMatcher());
+        public static final FlushAllConnectionInPool RA_INSTANCE = new FlushAllConnectionInPool(new RaPoolMatcher());
 
         protected FlushAllConnectionInPool(PoolMatcher matcher) {
             super(matcher);
@@ -131,8 +131,8 @@ protected ModelNode invokeCommandOn(Pool pool) {
     }
 
     public static class TestConnectionInPool extends PoolOperations {
-        public static TestConnectionInPool DS_INSTANCE = new TestConnectionInPool(new DsPoolMatcher());
+        public static final TestConnectionInPool DS_INSTANCE = new TestConnectionInPool(new DsPoolMatcher());
-        public static TestConnectionInPool RA_INSTANCE = new TestConnectionInPool(new RaPoolMatcher());
+        public static final TestConnectionInPool RA_INSTANCE = new TestConnectionInPool(new RaPoolMatcher());
 
         protected TestConnectionInPool(PoolMatcher matcher) {
             super(matcher);

diff --git a/connector/src/main/java/org/jboss/as/connector/subsystems/jca/JcaExtension.java b/connector/src/main/java/org/jboss/as/connector/subsystems/jca/JcaExtension.java
@@ -68,7 +68,7 @@
  */
 public class JcaExtension implements Extension {
 
-    public static String SUBSYSTEM_NAME = "jca";
+    public static final String SUBSYSTEM_NAME = "jca";
 
     private static final int MANAGEMENT_API_MAJOR_VERSION = 1;
     private static final int MANAGEMENT_API_MINOR_VERSION = 2;

diff --git a/controller/src/main/java/org/jboss/as/controller/CaseParameterCorrector.java b/controller/src/main/java/org/jboss/as/controller/CaseParameterCorrector.java
@@ -38,7 +38,7 @@ public class CaseParameterCorrector {
     /**
      * Converts the string value of the {@code newValue} into uppercase only if the value is not already in uppercase.
      */
-    public static ParameterCorrector TO_UPPER = new ParameterCorrector() {
+    public static final ParameterCorrector TO_UPPER = new ParameterCorrector() {
         @Override
         public ModelNode correct(final ModelNode newValue, final ModelNode currentValue) {
             if (newValue.getType() == ModelType.UNDEFINED) {
@@ -59,7 +59,7 @@ public ModelNode correct(final ModelNode newValue, final ModelNode currentValue)
     /**
      * Converts the string value of the {@code newValue} into lowercase only if the value is not already in lowercase.
      */
-    public static ParameterCorrector TO_LOWER = new ParameterCorrector() {
+    public static final ParameterCorrector TO_LOWER = new ParameterCorrector() {
         @Override
         public ModelNode correct(final ModelNode newValue, final ModelNode currentValue) {
             if (newValue.getType() == ModelType.UNDEFINED) {

diff --git a/controller/src/main/java/org/jboss/as/controller/MapAttributeDefinition.java b/controller/src/main/java/org/jboss/as/controller/MapAttributeDefinition.java
@@ -230,7 +230,7 @@ protected ModelNode convertParameterElementExpressions(ModelNode parameterElemen
         return isAllowExpression() ? convertStringExpression(parameterElementValue) : parameterElementValue;
     }
 
-    public static ParameterCorrector LIST_TO_MAP_CORRECTOR = new ParameterCorrector() {
+    public static final ParameterCorrector LIST_TO_MAP_CORRECTOR = new ParameterCorrector() {
         public ModelNode correct(ModelNode newValue, ModelNode currentValue) {
             if (newValue.isDefined()) {
                 if (newValue.getType() == ModelType.LIST) {

diff --git a/controller/src/main/java/org/jboss/as/controller/PropagatingCorrector.java b/controller/src/main/java/org/jboss/as/controller/PropagatingCorrector.java
@@ -36,7 +36,7 @@
  */
 public class PropagatingCorrector implements ParameterCorrector {
 
-    public static PropagatingCorrector INSTANCE = new PropagatingCorrector();
+    public static final PropagatingCorrector INSTANCE = new PropagatingCorrector();
 
     /* (non-Javadoc)
      * @see org.jboss.as.controller.AttributeValueCorrector#correct(org.jboss.dmr.ModelNode, org.jboss.dmr.ModelNode)

diff --git a/controller/src/main/java/org/jboss/as/controller/operations/OperationAttachments.java b/controller/src/main/java/org/jboss/as/controller/operations/OperationAttachments.java
@@ -32,7 +32,7 @@
 public class OperationAttachments {
 
 
-    public static OperationContext.AttachmentKey<List<DomainOperationTransformer>> SLAVE_SERVER_OPERATION_TRANSFORMERS = OperationContext.AttachmentKey.create(List.class);
+    public static final OperationContext.AttachmentKey<List<DomainOperationTransformer>> SLAVE_SERVER_OPERATION_TRANSFORMERS = OperationContext.AttachmentKey.create(List.class);
 
 
     private OperationAttachments() {

diff --git a/...ler/src/main/java/org/jboss/as/controller/operations/common/ValidateOperationHandler.java b/...ler/src/main/java/org/jboss/as/controller/operations/common/ValidateOperationHandler.java
@@ -52,8 +52,8 @@
  */
 public class ValidateOperationHandler implements OperationStepHandler {
 
-    public static ValidateOperationHandler INSTANCE = new ValidateOperationHandler(false);
+    public static final ValidateOperationHandler INSTANCE = new ValidateOperationHandler(false);
-    public static ValidateOperationHandler SLAVE_HC_INSTANCE = new ValidateOperationHandler(true);
+    public static final ValidateOperationHandler SLAVE_HC_INSTANCE = new ValidateOperationHandler(true);
 
     private static final SimpleAttributeDefinition VALUE = new SimpleAttributeDefinitionBuilder(ModelDescriptionConstants.VALUE, ModelType.OBJECT)
             .setAllowNull(false)

diff --git a/controller/src/main/java/org/jboss/as/controller/registry/OperationTransformerRegistry.java b/controller/src/main/java/org/jboss/as/controller/registry/OperationTransformerRegistry.java
@@ -423,17 +423,17 @@ public boolean isInherited() {
 
     }
 
-    static OperationTransformer FORWARD_TRANSFORMER = new OperationTransformer() {
+    static final OperationTransformer FORWARD_TRANSFORMER = new OperationTransformer() {
 
         @Override
         public TransformedOperation transformOperation(TransformationContext context, PathAddress address, ModelNode operation) {
             return new TransformedOperation(operation, OperationResultTransformer.ORIGINAL_RESULT);
         }
     };
 
-    static OperationTransformer DISCARD_TRANSFORMER = OperationTransformer.DISCARD;
+    static final OperationTransformer DISCARD_TRANSFORMER = OperationTransformer.DISCARD;
 
-    public static OperationTransformerEntry DISCARD = new OperationTransformerEntry(DISCARD_TRANSFORMER, true);
+    public static final OperationTransformerEntry DISCARD = new OperationTransformerEntry(DISCARD_TRANSFORMER, true);
-    public static OperationTransformerEntry FORWARD = new OperationTransformerEntry(FORWARD_TRANSFORMER, false);
+    public static final OperationTransformerEntry FORWARD = new OperationTransformerEntry(FORWARD_TRANSFORMER, false);
 
 }
diff --git a/controller/src/main/java/org/jboss/as/controller/registry/PlaceholderResource.java b/controller/src/main/java/org/jboss/as/controller/registry/PlaceholderResource.java
@@ -41,7 +41,7 @@
 public class PlaceholderResource implements Resource {
 
     private static final ModelNode MODEL = new ModelNode();
-    public static PlaceholderResource INSTANCE = new PlaceholderResource();
+    public static final PlaceholderResource INSTANCE = new PlaceholderResource();
 
     static {
         MODEL.protect();

diff --git a/controller/src/main/java/org/jboss/as/controller/registry/Resource.java b/controller/src/main/java/org/jboss/as/controller/registry/Resource.java
@@ -186,7 +186,7 @@ public static Resource create() {
 
     public static class Tools {
 
-        public static ResourceFilter ALL_BUT_RUNTIME_AND_PROXIES_FILTER = new ResourceFilter() {
+        public static final ResourceFilter ALL_BUT_RUNTIME_AND_PROXIES_FILTER = new ResourceFilter() {
             @Override
             public boolean accepts(PathAddress address, Resource resource) {
                 if(resource.isRuntime() || resource.isProxy()) {

diff --git a/.../java/org/jboss/as/domain/controller/operations/coordination/ServerOperationResolver.java b/.../java/org/jboss/as/domain/controller/operations/coordination/ServerOperationResolver.java
@@ -91,7 +91,7 @@
  */
 public class ServerOperationResolver {
 
-    public static AttachmentKey<Set<ModelNode>> DONT_PROPAGATE_TO_SERVERS_ATTACHMENT = AttachmentKey.create(Set.class);
+    public static final AttachmentKey<Set<ModelNode>> DONT_PROPAGATE_TO_SERVERS_ATTACHMENT = AttachmentKey.create(Set.class);
 
     private enum DomainKey {
 

diff --git a/...ler/src/main/java/org/jboss/as/domain/controller/resources/ProfileResourceDefinition.java b/...ler/src/main/java/org/jboss/as/domain/controller/resources/ProfileResourceDefinition.java
@@ -42,7 +42,7 @@
 /**
  * @author <a href="kabir.khan@jboss.com">Kabir Khan</a>
  */
-public class ProfileResourceDefinition extends SimpleResourceDefinition {
+class ProfileResourceDefinition extends SimpleResourceDefinition {
 
     private static OperationDefinition DESCRIBE = new SimpleOperationDefinitionBuilder(ModelDescriptionConstants.DESCRIBE, DomainResolver.getResolver(PROFILE, false))
             .setReplyType(ModelType.LIST)
@@ -52,7 +52,7 @@ public class ProfileResourceDefinition extends SimpleResourceDefinition {
             .build();
 
     //This attribute exists in 7.1.2 and 7.1.3 but was always nillable
-    public static SimpleAttributeDefinition NAME = new SimpleAttributeDefinitionBuilder(ModelDescriptionConstants.NAME, ModelType.STRING)
+    private static final SimpleAttributeDefinition NAME = new SimpleAttributeDefinitionBuilder(ModelDescriptionConstants.NAME, ModelType.STRING)
             .setValidator(new StringLengthValidator(1, true))
             .setAllowNull(true)
             .setResourceOnly()

diff --git a/host-controller/src/main/java/org/jboss/as/host/controller/ManagedServer.java b/host-controller/src/main/java/org/jboss/as/host/controller/ManagedServer.java
@@ -91,17 +91,17 @@ class ManagedServer {
     /**
      * Prefix applied to a server's name to create it's process name.
      */
-    public static String SERVER_PROCESS_NAME_PREFIX = "Server:";
+    private static final String SERVER_PROCESS_NAME_PREFIX = "Server:";
 
-    public static String getServerProcessName(String serverName) {
+    static String getServerProcessName(String serverName) {
         return SERVER_PROCESS_NAME_PREFIX + serverName;
     }
 
-    public static boolean isServerProcess(String serverProcessName) {
+    static boolean isServerProcess(String serverProcessName) {
         return serverProcessName.startsWith(SERVER_PROCESS_NAME_PREFIX);
     }
 
-    public static String getServerName(String serverProcessName) {
+    static String getServerName(String serverProcessName) {
         return serverProcessName.substring(SERVER_PROCESS_NAME_PREFIX.length());
     }
 
@@ -612,7 +612,7 @@ private static InternalState nextState(final InternalState state, final Internal
     /**
      * The managed server boot configuration.
      */
-    public interface ManagedServerBootConfiguration {
+    interface ManagedServerBootConfiguration {
         /**
          * Get the server launch environment.
          *

diff --git a/.../src/main/java/org/jboss/as/host/controller/model/host/CoreServiceResourceDefinition.java b/.../src/main/java/org/jboss/as/host/controller/model/host/CoreServiceResourceDefinition.java
@@ -33,8 +33,9 @@
 /**
  * @author <a href="mailto:tomaz.cerar@redhat.com">Tomaz Cerar</a> (c) 2012 Red Hat Inc.
  */
-public class CoreServiceResourceDefinition extends SimpleResourceDefinition {
+class CoreServiceResourceDefinition extends SimpleResourceDefinition {
-    public static CoreServiceResourceDefinition INSTANCE = new CoreServiceResourceDefinition();
+
+    static final CoreServiceResourceDefinition INSTANCE = new CoreServiceResourceDefinition();
 
     private CoreServiceResourceDefinition() {
         super(PathElement.pathElement(CORE_SERVICE, MANAGEMENT), HostModelUtil.getResourceDescriptionResolver("core", "management"));

diff --git a/jacorb/src/main/java/org/jboss/as/jacorb/deployment/JacORBDependencyProcessor.java b/jacorb/src/main/java/org/jboss/as/jacorb/deployment/JacORBDependencyProcessor.java
@@ -36,9 +36,9 @@
  * @author Stuart Douglas
  */
 public class JacORBDependencyProcessor implements DeploymentUnitProcessor {
-    public static ModuleIdentifier CORBA_ID = ModuleIdentifier.create("org.omg.api");
+    public static final ModuleIdentifier CORBA_ID = ModuleIdentifier.create("org.omg.api");
-    public static ModuleIdentifier JAVAX_RMI_API_ID = ModuleIdentifier.create("javax.rmi.api");
+    public static final ModuleIdentifier JAVAX_RMI_API_ID = ModuleIdentifier.create("javax.rmi.api");
-    public static ModuleIdentifier JACORB_ID = ModuleIdentifier.create("org.jacorb");
+    public static final ModuleIdentifier JACORB_ID = ModuleIdentifier.create("org.jacorb");
 
 
     @Override

diff --git a/jaxrs/src/main/java/org/jboss/as/jaxrs/deployment/JaxrsDependencyProcessor.java b/jaxrs/src/main/java/org/jboss/as/jaxrs/deployment/JaxrsDependencyProcessor.java
@@ -41,24 +41,24 @@
  */
 public class JaxrsDependencyProcessor implements DeploymentUnitProcessor {
 
-    public static ModuleIdentifier RESTEASY_ATOM = ModuleIdentifier.create("org.jboss.resteasy.resteasy-atom-provider");
+    public static final ModuleIdentifier RESTEASY_ATOM = ModuleIdentifier.create("org.jboss.resteasy.resteasy-atom-provider");
-    public static ModuleIdentifier RESTEASY_CDI = ModuleIdentifier.create("org.jboss.resteasy.resteasy-cdi");
+    public static final ModuleIdentifier RESTEASY_CDI = ModuleIdentifier.create("org.jboss.resteasy.resteasy-cdi");
-    public static ModuleIdentifier RESTEASY_HIBERNATE_VALIDATOR = ModuleIdentifier.create("org.jboss.resteasy.resteasy-hibernatevalidator-provider");
+    public static final ModuleIdentifier RESTEASY_HIBERNATE_VALIDATOR = ModuleIdentifier.create("org.jboss.resteasy.resteasy-hibernatevalidator-provider");
-    public static ModuleIdentifier RESTEASY_JAXRS = ModuleIdentifier.create("org.jboss.resteasy.resteasy-jaxrs");
+    public static final ModuleIdentifier RESTEASY_JAXRS = ModuleIdentifier.create("org.jboss.resteasy.resteasy-jaxrs");
-    public static ModuleIdentifier RESTEASY_JAXB = ModuleIdentifier.create("org.jboss.resteasy.resteasy-jaxb-provider");
+    public static final ModuleIdentifier RESTEASY_JAXB = ModuleIdentifier.create("org.jboss.resteasy.resteasy-jaxb-provider");
-    public static ModuleIdentifier RESTEASY_JACKSON = ModuleIdentifier.create("org.jboss.resteasy.resteasy-jackson-provider");
+    public static final ModuleIdentifier RESTEASY_JACKSON = ModuleIdentifier.create("org.jboss.resteasy.resteasy-jackson-provider");
-    public static ModuleIdentifier RESTEASY_JETTISON = ModuleIdentifier.create("org.jboss.resteasy.resteasy-jettison-provider");
+    public static final ModuleIdentifier RESTEASY_JETTISON = ModuleIdentifier.create("org.jboss.resteasy.resteasy-jettison-provider");
-    public static ModuleIdentifier RESTEASY_JSAPI = ModuleIdentifier.create("org.jboss.resteasy.resteasy-jsapi");
+    public static final ModuleIdentifier RESTEASY_JSAPI = ModuleIdentifier.create("org.jboss.resteasy.resteasy-jsapi");
-    public static ModuleIdentifier RESTEASY_MULTIPART = ModuleIdentifier.create("org.jboss.resteasy.resteasy-multipart-provider");
+    public static final ModuleIdentifier RESTEASY_MULTIPART = ModuleIdentifier.create("org.jboss.resteasy.resteasy-multipart-provider");
-    public static ModuleIdentifier RESTEASY_YAML = ModuleIdentifier.create("org.jboss.resteasy.resteasy-yaml-provider");
+    public static final ModuleIdentifier RESTEASY_YAML = ModuleIdentifier.create("org.jboss.resteasy.resteasy-yaml-provider");
-    public static ModuleIdentifier JAXB_API = ModuleIdentifier.create("javax.xml.bind.api");
+    public static final ModuleIdentifier JAXB_API = ModuleIdentifier.create("javax.xml.bind.api");
 
     /**
      * We include this so that jackson annotations will be available, otherwise they will be ignored which leads
      * to confusing behaviour.
      *
      */
-    public static ModuleIdentifier JACKSON_CORE_ASL = ModuleIdentifier.create("org.codehaus.jackson.jackson-core-asl");
+    public static final ModuleIdentifier JACKSON_CORE_ASL = ModuleIdentifier.create("org.codehaus.jackson.jackson-core-asl");
 
     public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitProcessingException {
         final DeploymentUnit deploymentUnit = phaseContext.getDeploymentUnit();

diff --git a/jdr/jboss-as-jdr/src/main/java/org/jboss/as/jdr/vfs/Filters.java b/jdr/jboss-as-jdr/src/main/java/org/jboss/as/jdr/vfs/Filters.java
@@ -37,7 +37,7 @@
  */
 public class Filters {
 
-    public static VirtualFileFilter TRUE = MatchAllVirtualFileFilter.INSTANCE;
+    public static final VirtualFileFilter TRUE = MatchAllVirtualFileFilter.INSTANCE;
 
     public static VirtualFileFilter not(final VirtualFileFilter filter) {
         return new VirtualFileFilter() {

diff --git a/jpa/core/src/main/java/org/jboss/as/jpa/container/NonTxEmCloser.java b/jpa/core/src/main/java/org/jboss/as/jpa/container/NonTxEmCloser.java
@@ -39,7 +39,7 @@ public class NonTxEmCloser {
      * Each thread will have its own list of SB invocations in progress.
      * Key = scoped persistence unit name
      */
-    public static ThreadLocalStack<Map<String, EntityManager>> nonTxStack = new ThreadLocalStack<Map<String, EntityManager>>();
+    public static final ThreadLocalStack<Map<String, EntityManager>> nonTxStack = new ThreadLocalStack<Map<String, EntityManager>>();
 
     /**
      * entered new session bean invocation, start new collection for tracking transactional entity managers created