Merge pull request #3653 from pferraro/master

WFCORE-4376 Fix deprecation warnings resulting from the improper deprecation of AbstractCapability.

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

@@ -1499,7 +1499,7 @@ public void registerCapability(RuntimeCapability capability) {
         registerCapability(capability, activeStep, null);
     }
 
-    void registerCapability(RuntimeCapability capability, Step step, String attribute) {
+    void registerCapability(RuntimeCapability<?> capability, Step step, String attribute) {
         assert isControllingThread();
         assertStageModel(currentStage);
         ensureLocalCapabilityRegistry();
@@ -1614,7 +1614,7 @@ void removeCapability(String capabilityName, Step step) {
         CapabilityScope context = createCapabilityContext(step.address);
         RuntimeCapabilityRegistration capReg = managementModel.getCapabilityRegistry().removeCapability(capabilityName, context, step.address);
         if (capReg != null) {
-            RuntimeCapability capability = capReg.getCapability();
+            RuntimeCapability<?> capability = capReg.getCapability();
             for (String required : capability.getRequirements()) {
                 removeRequirement(required, context, step);
             }
@@ -1994,7 +1994,7 @@ private RuntimeRequirementRegistration createRequirementRegistration(String requ
         return new RuntimeRequirementRegistration(required, dependent, context, rp, runtimeOnly);
     }
 
-    private RuntimeCapabilityRegistration createCapabilityRegistration(RuntimeCapability capability, Step step, String attribute) {
+    private RuntimeCapabilityRegistration createCapabilityRegistration(RuntimeCapability<?> capability, Step step, String attribute) {
         CapabilityScope context = createCapabilityContext(step.address);
         RegistrationPoint rp = new RegistrationPoint(step.address, attribute);
         return new RuntimeCapabilityRegistration(capability, context, rp);

controller/src/main/java/org/jboss/as/controller/capability/RuntimeCapability.java

@@ -300,6 +300,46 @@ private ServiceName getServiceName() {
         return additionalPackages;
     }
 
+    @Override
+    public String getName() {
+        return super.getName();
+    }
+
+    @Override
+    public Set<String> getRequirements() {
+        return super.getRequirements();
+    }
+
+    @Override
+    public boolean isDynamicallyNamed() {
+        return super.isDynamicallyNamed();
+    }
+
+    @Override
+    public String getDynamicName(String dynamicNameElement) {
+        return super.getDynamicName(dynamicNameElement);
+    }
+
+    @Override
+    public String getDynamicName(PathAddress address) {
+        return super.getDynamicName(address);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return super.equals(o);
+    }
+
+    @Override
+    public int hashCode() {
+        return super.hashCode();
+    }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
+
     /**
      * Builder for a {@link RuntimeCapability}.
      *

controller/src/main/java/org/jboss/as/controller/capability/registry/CapabilityRegistration.java

@@ -38,7 +38,7 @@
  *
  * @author Brian Stansberry (c) 2014 Red Hat Inc.
  */
-public class CapabilityRegistration<C extends Capability> implements Comparable<CapabilityRegistration> {
+public class CapabilityRegistration<C extends Capability> implements Comparable<CapabilityRegistration<C>> {
 
     private final Map<PathAddress, RegistrationPoint> registrationPoints = new LinkedHashMap<>();
     private final C capability;

controller/src/main/java/org/jboss/as/controller/capability/registry/RuntimeCapabilityRegistration.java

@@ -31,9 +31,9 @@
  *
  * @author Brian Stansberry (c) 2014 Red Hat Inc.
  */
-public class RuntimeCapabilityRegistration extends CapabilityRegistration<RuntimeCapability> {
+public class RuntimeCapabilityRegistration extends CapabilityRegistration<RuntimeCapability<?>> {
 
-    public RuntimeCapabilityRegistration(RuntimeCapability capability, CapabilityScope context, RegistrationPoint registrationPoint) {
+    public RuntimeCapabilityRegistration(RuntimeCapability<?> capability, CapabilityScope context, RegistrationPoint registrationPoint) {
         super(capability, context, registrationPoint);
     }
 

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

@@ -814,8 +814,7 @@ private void addRequiredCapabilities(ModelNode feature,
                     }
                 }
                 // WFLY-4164 record the fixed requirements of the registration's capabilities
-                Set<RuntimeCapability> regCaps = registration.getCapabilities();
-                for (RuntimeCapability regCap : regCaps) {
+                for (RuntimeCapability<?> regCap : registration.getCapabilities()) {
                     for (String capReq : regCap.getRequirements()) {
                         if (!required.containsKey(capReq)) {
                             ModelNode capability = new ModelNode();