Don't use deprecated apis & code cleanup

 get rid of bunch of compiler warnings

controller/src/main/java/org/jboss/as/controller/AbstractAttributeDefinitionBuilder.java

@@ -36,6 +36,7 @@
  *
  * @author Tomaz Cerar
  */
+@SuppressWarnings("unchecked")
 public abstract class AbstractAttributeDefinitionBuilder<BUILDER extends AbstractAttributeDefinitionBuilder, ATTRIBUTE extends AttributeDefinition> {
 
     protected final String name;
@@ -133,7 +134,7 @@ public BUILDER setValidator(ParameterValidator validator) {
      * by the {@link org.jboss.as.controller.AttributeDefinition} and instead let operation handlers validate using more complex logic
      * (e.g. checking for {@link #setAlternatives(String...) alternatives}.
      *
-     * @param validateNull {@code true} if additional validation should be performed; {@false} otherwise
+     * @param validateNull {@code true} if additional validation should be performed; {@code false} otherwise
      */
     public BUILDER setValidateNull(boolean validateNull) {
         this.validateNull = validateNull;

controller/src/main/java/org/jboss/as/controller/AbstractControllerService.java

@@ -117,6 +117,7 @@ private static int getBootStackSize() {
      * @param prepareStep             the prepare step to prepend to operation execution
      * @param expressionResolver      the expression resolver
      */
+    @Deprecated
     protected AbstractControllerService(final ProcessType processType, final RunningModeControl runningModeControl,
                                         final ConfigurationPersister configurationPersister,
                                         final ControlledProcessState processState, final DescriptionProvider rootDescriptionProvider,

controller/src/main/java/org/jboss/as/controller/AbstractOperationContext.java

@@ -57,6 +57,7 @@
  *
  * @author <a href="mailto:david.lloyd@redhat.com">David M. Lloyd</a>
  */
+@SuppressWarnings("deprecation")
 abstract class AbstractOperationContext implements OperationContext {
 
     static final ThreadLocal<Thread> controllingThread = new ThreadLocal<Thread>();

controller/src/main/java/org/jboss/as/controller/OperationContextImpl.java

@@ -77,6 +77,7 @@
  *
  * @author <a href="mailto:david.lloyd@redhat.com">David M. Lloyd</a>
  */
+@SuppressWarnings("deprecation")
 final class OperationContextImpl extends AbstractOperationContext {
 
     private static final Object NULL = new Object();

controller/src/main/java/org/jboss/as/controller/ParallelBootOperationContext.java

@@ -44,6 +44,7 @@
  *
  * @author Brian Stansberry (c) 2011 Red Hat Inc.
  */
+@SuppressWarnings("deprecation")
 class ParallelBootOperationContext extends AbstractOperationContext {
 
     private final OperationContext primaryContext;

controller/src/main/java/org/jboss/as/controller/descriptions/NonResolvingResourceDescriptionResolver.java

@@ -33,7 +33,11 @@
  *
  * @author <a href="mailto:tomaz.cerar@redhat.com">Tomaz Cerar</a> (c) 2012 Red Hat Inc.
  */
-public class NonResolvingResourceDescriptionResolver implements ResourceDescriptionResolver {
+public class NonResolvingResourceDescriptionResolver extends StandardResourceDescriptionResolver {
+    public NonResolvingResourceDescriptionResolver() {
+        super("", "", NonResolvingResourceDescriptionResolver.class.getClassLoader());
+    }
+
     @Override
     public ResourceBundle getResourceBundle(Locale locale) {
         return new ResourceBundle() {
@@ -113,4 +117,5 @@ public String getOperationDeprecatedDescription(String operationName, Locale loc
     public String getOperationParameterDeprecatedDescription(String operationName, String paramName, Locale locale, ResourceBundle bundle) {
         return operationName;
     }
+
 }

controller/src/main/java/org/jboss/as/controller/descriptions/common/CommonDescriptions.java

@@ -44,24 +44,6 @@
 @Deprecated
 public class CommonDescriptions {
 
-    /**
-     * default describe operation description,
-     * here just for  binary compatibility with external extensions
-     * @param locale
-     * @return
-     */
-    @Deprecated
-    public static ModelNode getSubsystemDescribeOperation(final Locale locale) {
-        final ResourceBundle bundle = getResourceBundle(locale);
-        final ModelNode root = new ModelNode();
-        root.get(OPERATION_NAME).set(ADD);
-        root.get(DESCRIPTION).set(bundle.getString("subsystem.describe"));
-        root.get(REPLY_PROPERTIES, TYPE).set(ModelType.LIST);
-        root.get(REPLY_PROPERTIES, VALUE_TYPE).set(ModelType.OBJECT);
-        return root;
-    }
-
-
     public static ModelNode getDescriptionOnlyOperation(final ResourceBundle bundle, final String operationName, final String descriptionPrefix) {
 
         final ModelNode node = new ModelNode();
@@ -130,10 +112,4 @@ public static ModelNode getNoArgSimpleListReplyOperation(final ResourceBundle bu
         return result;
     }
 
-    private static ResourceBundle getResourceBundle(Locale locale) {
-        if (locale == null) {
-            locale = Locale.getDefault();
-        }
-        return ResourceBundle.getBundle(ControllerResolver.RESOURCE_NAME, locale);
-    }
 }

controller/src/main/java/org/jboss/as/controller/extension/ExtensionAddHandler.java

@@ -27,6 +27,7 @@
 import org.jboss.as.controller.OperationFailedException;
 import org.jboss.as.controller.OperationStepHandler;
 import org.jboss.as.controller.PathAddress;
+import org.jboss.as.controller.operations.common.Util;
 import org.jboss.dmr.ModelNode;
 import org.jboss.modules.Module;
 import org.jboss.modules.ModuleIdentifier;
@@ -41,13 +42,6 @@ public class ExtensionAddHandler implements OperationStepHandler {
 
     public static final String OPERATION_NAME = ADD;
 
-    public static ModelNode getAddExtensionOperation(ModelNode address) {
-        ModelNode op = new ModelNode();
-        op.get(OP).set(OPERATION_NAME);
-        op.get(OP_ADDR).set(address);
-        return op;
-    }
-
     private final ExtensionRegistry extensionRegistry;
     private final boolean parallelBoot;
     private final boolean standalone;

controller/src/main/java/org/jboss/as/controller/extension/ExtensionRemoveHandler.java

@@ -52,7 +52,7 @@ protected void performRemove(OperationContext context, ModelNode operation, Mode
         super.performRemove(context, operation, model);
         final PathAddress address = PathAddress.pathAddress(operation.get(OP_ADDR));
         String module = address.getLastElement().getValue();
-        extensionRegistry.removeExtension(context.getRootResource(), module);
+        extensionRegistry.removeExtension(context.readResourceFromRoot(PathAddress.EMPTY_ADDRESS), module);
     }
 
     @Override

controller/src/main/java/org/jboss/as/controller/interfaces/AbstractInterfaceCriteria.java

@@ -63,7 +63,7 @@ public Map<NetworkInterface, Set<InetAddress>> getAcceptableAddresses(final Map<
         Map<NetworkInterface, Set<InetAddress>> result = new HashMap<NetworkInterface, Set<InetAddress>>();
         for (Map.Entry<NetworkInterface, Set<InetAddress>> entry : candidates.entrySet()) {
             NetworkInterface ni = entry.getKey();
-            HashSet addresses = null;
+            HashSet<InetAddress> addresses = null;
             for (InetAddress address : entry.getValue()) {
                 InetAddress accepted = isAcceptable(ni, address);
                 if (accepted != null) {
@@ -87,22 +87,4 @@ public static Map<NetworkInterface, Set<InetAddress>> cloneCandidates(final Map<
         }
         return clone;
     }
-
-    /**
-     * A little toString utility for NetworkInterface since its version seems to add the hardware address and this corrupts
-     * logging output.
-     *
-     * @param iface The interface to convert to string format.
-     * @return toString for NetworkInterface
-     */
-    static String toString(NetworkInterface iface) {
-        StringBuilder sb = new StringBuilder("NetworkInterface(");
-        sb.append("name:");
-        sb.append(iface.getName());
-        sb.append("(");
-        sb.append(iface.getDisplayName());
-        sb.append("), addresses:");
-        sb.append(iface.getInterfaceAddresses());
-        return sb.toString();
-    }
 }

controller/src/main/java/org/jboss/as/controller/operations/common/InterfaceAddHandler.java

@@ -45,17 +45,6 @@
 public class InterfaceAddHandler extends AbstractAddStepHandler {
 
 
-    @Deprecated
-    public static ModelNode getAddInterfaceOperation(ModelNode address, ModelNode criteria) {
-        ModelNode op = Util.getEmptyOperation(ADD, address);
-        for (final AttributeDefinition def : InterfaceDefinition.ROOT_ATTRIBUTES) {
-            if(criteria.hasDefined(def.getName())) {
-                op.get(def.getName()).set(criteria.get(def.getName()));
-            }
-        }
-        return op;
-    }
-
     public static final InterfaceAddHandler NAMED_INSTANCE = new InterfaceAddHandler(false);
     public static final InterfaceAddHandler SPECIFIED_INSTANCE = new InterfaceAddHandler(true);
 

controller/src/main/java/org/jboss/as/controller/operations/common/SocketBindingAddHandler.java

@@ -45,10 +45,8 @@ public class SocketBindingAddHandler extends AbstractAddStepHandler {
 
     public static final String OPERATION_NAME = ADD;
 
-    public static ModelNode getOperation(ModelNode address, ModelNode socketBinding) {
-        ModelNode op = new ModelNode();
-        op.get(OP).set(OPERATION_NAME);
-        op.get(OP_ADDR).set(address);
+    public static ModelNode getOperation(PathAddress address, ModelNode socketBinding) {
+        ModelNode op = Util.createAddOperation(address);
         if (socketBinding.get(INTERFACE).isDefined()) {
             op.get(INTERFACE).set(socketBinding.get(INTERFACE));
         }

controller/src/main/java/org/jboss/as/controller/operations/global/WriteAttributeHandlers.java

@@ -53,6 +53,7 @@ public class WriteAttributeHandlers {
 
     /** @deprecated use {@link AbstractWriteAttributeHandler} */
     @Deprecated
+    @SuppressWarnings("deprecation")
     public static class WriteAttributeOperationHandler implements OperationStepHandler {
         public static WriteAttributeOperationHandler INSTANCE = new WriteAttributeOperationHandler();
 

controller/src/main/java/org/jboss/as/controller/persistence/AbstractConfigurationPersister.java

@@ -41,6 +41,7 @@
  *
  * @author Brian Stansberry
  */
+@SuppressWarnings("deprecation")
 public abstract class AbstractConfigurationPersister implements ExtensibleConfigurationPersister {
 
     private final XMLElementWriter<ModelMarshallingContext> rootDeparser;

controller/src/main/java/org/jboss/as/controller/registry/AbstractResourceRegistration.java

@@ -52,6 +52,7 @@
  *
  * @author <a href="mailto:david.lloyd@redhat.com">David M. Lloyd</a>
  */
+@SuppressWarnings("deprecation")
 abstract class AbstractResourceRegistration implements ManagementResourceRegistration {
 
     private final String valueString;

controller/src/main/java/org/jboss/as/controller/registry/AliasResourceRegistration.java

@@ -48,6 +48,7 @@
  *
  * @author Kabir Khan
  */
+@SuppressWarnings("deprecation")
 final class AliasResourceRegistration extends AbstractResourceRegistration implements DescriptionProvider {
 
     private final AliasEntry aliasEntry;

controller/src/main/java/org/jboss/as/controller/registry/ConcreteResourceRegistration.java

@@ -47,6 +47,7 @@
 import org.jboss.as.controller.registry.OperationEntry.EntryType;
 import org.jboss.dmr.ModelNode;
 
+@SuppressWarnings("deprecation")
 final class ConcreteResourceRegistration extends AbstractResourceRegistration {
 
     @SuppressWarnings("unused")

controller/src/main/java/org/jboss/as/controller/registry/OperationEntry.java

@@ -34,7 +34,7 @@
  */
 public final class OperationEntry {
     public enum EntryType {
-        PUBLIC, PRIVATE;
+        PUBLIC, PRIVATE
     }
 
     /** Flags to indicate special characteristics of an operation */

controller/src/main/java/org/jboss/as/controller/registry/ProxyControllerRegistration.java

@@ -46,6 +46,7 @@
 /**
  * @author <a href="mailto:david.lloyd@redhat.com">David M. Lloyd</a>
  */
+@SuppressWarnings("deprecation")
 final class ProxyControllerRegistration extends AbstractResourceRegistration implements DescriptionProvider {
 
     private final ProxyController proxyController;

controller/src/main/java/org/jboss/as/controller/remote/BlockingQueueOperationListener.java

@@ -31,7 +31,6 @@
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -163,7 +162,7 @@ public boolean isFailed() {
 
         @Override
         public AsyncFuture<ModelNode> getFinalResult() {
-            return new CompletedResult(finalResult);
+            return new CompletedResult<ModelNode>(finalResult);
         }
 
         @Override

controller/src/main/java/org/jboss/as/controller/services/path/PathAddHandler.java

@@ -30,6 +30,7 @@
 import org.jboss.as.controller.PathAddress;
 import org.jboss.as.controller.ServiceVerificationHandler;
 import org.jboss.as.controller.SimpleAttributeDefinition;
+import org.jboss.as.controller.operations.common.Util;
 import org.jboss.as.controller.registry.Resource;
 import org.jboss.as.controller.services.path.PathManager.Event;
 import org.jboss.as.controller.services.path.PathManagerService.PathEventContextImpl;
@@ -46,10 +47,8 @@ public class PathAddHandler implements OperationStepHandler {
 
     public static final String OPERATION_NAME = ADD;
 
-    public static ModelNode getAddPathOperation(ModelNode address, ModelNode path, ModelNode relativeTo) {
-        ModelNode op = new ModelNode();
-        op.get(OP).set(OPERATION_NAME);
-        op.get(OP_ADDR).set(address);
+    public static ModelNode getAddPathOperation(PathAddress address, ModelNode path, ModelNode relativeTo) {
+        ModelNode op = Util.createAddOperation(address);
         if (path.isDefined()) {
             op.get(PATH_SPECIFIED.getName()).set(path);
         }

controller/src/test/java/org/jboss/as/controller/TestModelControllerService.java

@@ -30,17 +30,18 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.jboss.as.controller.descriptions.DescriptionProvider;
+import org.jboss.as.controller.descriptions.NonResolvingResourceDescriptionResolver;
 import org.jboss.as.controller.persistence.ConfigurationPersister;
 import org.jboss.as.controller.persistence.NullConfigurationPersister;
 import org.jboss.dmr.ModelNode;
 import org.jboss.msc.service.StartContext;
 import org.jboss.msc.service.StartException;
 
 /**
-* A simple {@code Service<ModelController>} base class for use in unit tests.
-*
-* @author Brian Stansberry (c) 2012 Red Hat Inc.
-*/
+ * A simple {@code Service<ModelController>} base class for use in unit tests.
+ *
+ * @author Brian Stansberry (c) 2012 Red Hat Inc.
+ */
 public abstract class TestModelControllerService extends AbstractControllerService {
 
     private final ControlledProcessState processState;
@@ -52,7 +53,14 @@ protected TestModelControllerService() {
     }
 
     protected TestModelControllerService(final ConfigurationPersister configurationPersister, final ControlledProcessState processState) {
-        this(ProcessType.EMBEDDED_SERVER, configurationPersister, processState, DESC_PROVIDER);
+        this(ProcessType.EMBEDDED_SERVER, configurationPersister, processState,
+                ResourceBuilder.Factory.create(PathElement.pathElement("root"), new NonResolvingResourceDescriptionResolver()).build());
+    }
+
+    protected TestModelControllerService(final ProcessType processType, final ConfigurationPersister configurationPersister, final ControlledProcessState processState,
+                                         final ResourceDefinition rootDescriptionProvider) {
+        super(processType, new RunningModeControl(RunningMode.NORMAL), configurationPersister, processState, rootDescriptionProvider, null, ExpressionResolver.DEFAULT);
+        this.processState = processState;
     }
 
     protected TestModelControllerService(final ProcessType processType, final ConfigurationPersister configurationPersister, final ControlledProcessState processState,
@@ -82,7 +90,7 @@ public void start(StartContext context) throws StartException {
     }
 
     @Override
-    protected void bootThreadDone()  {
+    protected void bootThreadDone() {
         super.bootThreadDone();
         latch.countDown();
     }

controller/src/test/java/org/jboss/as/controller/services/path/PathsTestCase.java

@@ -22,10 +22,6 @@
 package org.jboss.as.controller.services.path;
 
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADD;
-import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.CHILDREN;
-import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.DESCRIPTION;
-import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.MIN_OCCURS;
-import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.MODEL_DESCRIPTION;
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.NAME;
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OPERATIONS;
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR;
@@ -43,14 +39,12 @@
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
-import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
 import junit.framework.Assert;
 import org.jboss.as.controller.OperationFailedException;
-import org.jboss.as.controller.descriptions.DescriptionProvider;
 import org.jboss.as.controller.operations.global.GlobalOperationHandlers;
 import org.jboss.as.controller.registry.ManagementResourceRegistration;
 import org.jboss.as.controller.registry.Resource;
@@ -804,21 +798,6 @@ private ModelNode readResource() throws Exception {
         return executeForResult(operation);
     }
 
-    @Override
-    protected DescriptionProvider getRootDescriptionProvider() {
-        return new DescriptionProvider() {
-            @Override
-            public ModelNode getModelDescription(Locale locale) {
-                ModelNode node = new ModelNode();
-                node.get(DESCRIPTION).set("The root node of the test management API");
-                node.get(CHILDREN, PATH, DESCRIPTION).set("A list of paths");
-                node.get(CHILDREN, PATH, MIN_OCCURS).set(0);
-                node.get(CHILDREN, PATH, MODEL_DESCRIPTION);
-                return node;
-            }
-        };
-    }
-
     @Override
     protected void initModel(Resource rootResource, ManagementResourceRegistration registration) {
         pathManagerService = new PathManagerService() {