Merge pull request #6407 from yersan/WFCORE-7185

[WFCORE-7185] Remove deprecated ModuleIdentifier

Author: bstansberry

security-manager/src/main/java/org/wildfly/extension/security/manager/deployment/PermissionsParser.java

@@ -17,7 +17,6 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
-import org.jboss.modules.ModuleIdentifier;
 import org.jboss.modules.ModuleLoader;
 import org.jboss.modules.security.PermissionFactory;
 import org.wildfly.extension.security.manager.DeferredPermissionFactory;
@@ -31,16 +30,6 @@
  */
 public class PermissionsParser {
 
-    // TODO remove this as soon as the full WF testsuite use of it is updated to use the string variant
-    /**
-     * @deprecated use {@link #parse(XMLStreamReader, ModuleLoader, String)}
-     */
-    @Deprecated(forRemoval = true)
-    public static List<PermissionFactory> parse(final XMLStreamReader reader, final ModuleLoader loader, final ModuleIdentifier identifier)
-            throws XMLStreamException {
-        return parse(reader,loader, identifier.toString());
-    }
-
     /**
      * Parse the contents exposed by a reader into a list of {@link PermissionFactory} instances.
      * @param reader reader of a {@code permissions.xml} or {@code jboss-permissions.xml} descriptor. Cannot be {@code null}.

server/src/main/java/org/jboss/as/server/deployment/Attachments.java

@@ -30,7 +30,6 @@
 import org.jboss.as.server.moduleservice.ServiceModuleLoader;
 import org.jboss.jandex.Index;
 import org.jboss.modules.Module;
-import org.jboss.modules.ModuleIdentifier;
 import org.jboss.msc.service.ServiceName;
 import org.jboss.msc.service.ServiceTarget;
 import org.jboss.vfs.VirtualFile;
@@ -236,14 +235,6 @@ public final class Attachments {
     //
     // CONFIGURE
     //
-    /**
-     * The module identifier.
-     *
-     * @deprecated use {@link #MODULE_NAME}
-     */
-    @Deprecated(forRemoval = true)
-    public static final AttachmentKey<ModuleIdentifier> MODULE_IDENTIFIER = AttachmentKey.create(ModuleIdentifier.class);
-
     /**
      * The canonical name of the module.
      */

server/src/main/java/org/jboss/as/server/deployment/module/ModuleAliasChecker.java

@@ -9,7 +9,6 @@
 
 import org.jboss.as.server.logging.ServerLogger;
 import org.jboss.modules.Module;
-import org.jboss.modules.ModuleIdentifier;
 import org.jboss.modules.ModuleLoadException;
 import org.jboss.modules.ModuleLoader;
 
@@ -71,22 +70,6 @@ public static void checkModuleAliasesForDependencies(List<ModuleDependency> depe
         }
     }
 
-    /**
-     * Check whether the identifier passed as an argument represents an Alias and if so, log a warning describing that the alias
-     * can be replaced with its target module.
-     *
-     * @param identifiers    List of identifiers we want to verify.
-     * @param context        The context to use in the log message to give more information about from where this module identifier has
-     * @param deploymentName Deployment name where the dependencies are meant to be.
-     * @deprecated Iterate over all the identifiers and call {@link #checkModuleAliasesForExclusion(String, MessageContext, String)}
-     */
-    @Deprecated(forRemoval = true, since = "28.0.0")
-    public static void checkModuleAliasesForExclusions(List<ModuleIdentifier> identifiers, MessageContext context, String deploymentName) {
-        for (ModuleIdentifier identifier : identifiers) {
-            checkModuleAlias(context, deploymentName, identifier.toString(), true);
-        }
-    }
-
     /**
      * Check whether the module identifier passed as an argument represents an exclusion Alias and if so, log a warning describing that the alias
      * can be replaced with its target module.

server/src/main/java/org/jboss/as/server/deployment/module/ModuleDependency.java

@@ -12,7 +12,6 @@
 import java.util.Optional;
 
 import org.jboss.as.controller.ModuleIdentifierUtil;
-import org.jboss.modules.ModuleIdentifier;
 import org.jboss.modules.ModuleLoader;
 import org.jboss.modules.filter.PathFilter;
 
@@ -169,41 +168,6 @@ public ModuleDependency(final ModuleLoader moduleLoader, final String identifier
         this(moduleLoader, ModuleIdentifierUtil.parseCanonicalModuleIdentifier(identifier), reason, optional, export, importServices, userSpecified);
     }
 
-    /**
-     * Construct a new instance.
-     *
-     * @param moduleLoader the module loader of the dependency (if {@code null}, then use the default server module loader)
-     * @param identifier the module identifier
-     * @param optional {@code true} if this is an optional dependency
-     * @param export {@code true} if resources should be exported by default
-     * @param importServices  {@code true} if the dependent module should be able to load services from the dependency
-     * @param userSpecified {@code true} if this dependency was specified by the user, {@code false} if it was automatically added
-     *
-     * @deprecated Use a {@link Builder} or {@link ModuleDependency(ModuleLoader, String, boolean, boolean, boolean, boolean)}
-     */
-    @Deprecated(forRemoval = true)
-    public ModuleDependency(final ModuleLoader moduleLoader, final ModuleIdentifier identifier, final boolean optional, final boolean export, final boolean importServices, final boolean userSpecified) {
-        this(moduleLoader, identifier, optional, export, importServices, userSpecified, null);
-    }
-
-    /**
-     * Construct a new instance.
-     *
-     * @param moduleLoader the module loader of the dependency (if {@code null}, then use the default server module loader)
-     * @param identifier the module identifier
-     * @param optional {@code true} if this is an optional dependency
-     * @param export {@code true} if resources should be exported by default
-     * @param importServices {@code true} if the dependent module should be able to load services from the dependency
-     * @param userSpecified {@code true} if this dependency was specified by the user, {@code false} if it was automatically added
-     * @param reason reason for adding implicit module dependency
-     *
-     * @deprecated Use a {@link Builder}
-     */
-    @Deprecated(forRemoval = true)
-    public ModuleDependency(final ModuleLoader moduleLoader, final ModuleIdentifier identifier, final boolean optional, final boolean export, final boolean importServices, final boolean userSpecified, String reason) {
-        this(moduleLoader, identifier.toString(), reason, optional, export, importServices, userSpecified);
-    }
-
     private ModuleDependency(final ModuleLoader moduleLoader, final String identifier, String reason, final boolean optional, final boolean export, final boolean importServices, final boolean userSpecified) {
         this.identifier = identifier;
         this.optional = optional;
@@ -218,12 +182,6 @@ public ModuleLoader getModuleLoader() {
         return moduleLoader;
     }
 
-    /** @deprecated use {@link #getDependencyModule()} */
-    @Deprecated(forRemoval = true)
-    public ModuleIdentifier getIdentifier() {
-        return ModuleIdentifier.fromString(identifier);
-    }
-
     /**
      * Gets the name of the module upon which there is a dependency.
      *

server/src/main/java/org/jboss/as/server/deployment/module/ModuleIdentifierProcessor.java

@@ -10,7 +10,6 @@
 import org.jboss.as.server.deployment.DeploymentUnitProcessingException;
 import org.jboss.as.server.deployment.DeploymentUnitProcessor;
 import org.jboss.as.server.moduleservice.ServiceModuleLoader;
-import org.jboss.modules.ModuleIdentifier;
 import org.jboss.vfs.VirtualFile;
 
 /**
@@ -31,22 +30,6 @@ public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitPro
         deploymentUnit.putAttachment(Attachments.MODULE_NAME, moduleIdentifier);
     }
 
-    /**
-     * Create a module identifier for the deployment.
-     *
-     * @param deploymentUnitName The name of the deployment unit
-     * @param deploymentRoot     The deployment root
-     * @param topLevelDeployment The top level deployment
-     * @param toplevelRoot       The top level root
-     * @param topLevel           {@code true} if the deployment is a top level deployment, {@code false} otherwise
-     * @return the module identifier that represents the deployment
-     * @deprecated Use {@link #createModuleIdentifierAsString(String, ResourceRoot, DeploymentUnit, VirtualFile, boolean)} instead
-     */
-    @Deprecated(forRemoval = true, since = "28.0.0")
-    public static ModuleIdentifier createModuleIdentifier(final String deploymentUnitName, final ResourceRoot deploymentRoot, final DeploymentUnit topLevelDeployment, final VirtualFile toplevelRoot, final boolean topLevel) {
-        return ModuleIdentifier.create(createModuleIdentifierAsString(deploymentUnitName, deploymentRoot, topLevelDeployment, toplevelRoot, topLevel));
-    }
-
     /**
      * Create a module identifier for the deployment.
      *

server/src/main/java/org/jboss/as/server/deployment/module/ModuleSpecification.java

@@ -16,11 +16,9 @@
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
 
 import org.jboss.as.server.deployment.SimpleAttachable;
 import org.jboss.modules.DependencySpec;
-import org.jboss.modules.ModuleIdentifier;
 import org.jboss.modules.ResourceLoaderSpec;
 import org.jboss.modules.security.PermissionFactory;
 
@@ -204,17 +202,6 @@ public Set<ModuleDependency> getSystemDependenciesSet() {
         return Collections.unmodifiableSet(systemDependenciesSet);
     }
 
-    /**
-     * Records that a module with the given identifier should be excluded from use as a system or local dependency.
-     * @param exclusion the module to exclude. Cannot be {@code null}
-     *
-     * @deprecated use {@link #addModuleExclusion(String)}
-     */
-    @Deprecated(forRemoval = true)
-    public void addExclusion(final ModuleIdentifier exclusion) {
-        addModuleExclusion(exclusion.toString());
-    }
-
     /**
      * Records that a module with the given name should be excluded from use as a system or local dependency.
      * @param exclusion the module to exclude. Cannot be {@code null}
@@ -249,20 +236,6 @@ public void addModuleExclusion(final String exclusion) {
         }
     }
 
-    /**
-     * Records a collection of modules as being {@link #addModuleExclusion(String) excluded}.
-     * @param exclusions the identifiers of the modules to exclude. Cannot be {@code null}
-     *
-     * @deprecated iterate over the exclusions and call {@link #addModuleExclusion(String)}
-     */
-    @Deprecated(forRemoval = true)
-    public void addExclusions(final Iterable<ModuleIdentifier> exclusions) {
-        for (final ModuleIdentifier exclusion : exclusions) {
-            addExclusion(exclusion);
-        }
-    }
-
-
     /**
      * Local dependencies are dependencies on other parts of the deployment, such as a class-path entry
      *
@@ -368,18 +341,6 @@ public void setLocalLast(final boolean localLast) {
         this.localLast = localLast;
     }
 
-    /**
-     * Record that another module is an alias for this module.
-     * @param moduleIdentifier the identifier of the alias module. Cannot be {@code null}
-     *
-     * @deprecated use {@link #addModuleAlias(String)}
-     */
-    @Deprecated(forRemoval = true)
-    @SuppressWarnings("unused")
-    public void addAlias(final ModuleIdentifier moduleIdentifier) {
-        addModuleAlias(moduleIdentifier.toString());
-    }
-
     /**
      * Record that another module is an alias for this module.
      * @param moduleIdentifier the identifier of the alias module. Cannot be {@code null}
@@ -388,30 +349,6 @@ public void addModuleAlias(final String moduleIdentifier) {
         aliases.add(moduleIdentifier);
     }
 
-    /**
-     * Record that a collection of other modules are aliases for this module.
-     * @param moduleIdentifiers the identifiers of the alias modules. Cannot be {@code null}
-     *
-     * @deprecated iterate over the identifiers and call {@link #addModuleAlias(String)}
-     */
-    @Deprecated(forRemoval = true)
-    public void addAliases(final Collection<ModuleIdentifier> moduleIdentifiers) {
-        for (ModuleIdentifier id : moduleIdentifiers) {
-            addModuleAlias(id.toString());
-        }
-    }
-
-    /**
-     * Gets the identifiers of modules that are aliases for this module.
-     * @return the identifiers. Will not return {@code null}
-     *
-     * @deprecated use {@link #getModuleAliases()}
-     */
-    @Deprecated(forRemoval = true)
-    public List<ModuleIdentifier> getAliases() {
-        return aliases.stream().map(ModuleIdentifier::fromString).collect(Collectors.toList());
-    }
-
     /**
      * Gets the names of modules that are aliases for this module.
      * @return the names. Will not return {@code null}
@@ -458,19 +395,6 @@ public List<PermissionFactory> getPermissionFactories() {
         return permissionFactories;
     }
 
-    /**
-     * Gets the identifiers of dependencies that {@link #addModuleExclusion(String) were meant to be excluded} but which were
-     * never recorded as a dependency.
-     *
-     * @return the names. Will not return {@code null}
-     *
-     * @deprecated use {@link #getFictitiousExcludedDependencies()}
-     */
-    @Deprecated(forRemoval = true)
-    public Set<ModuleIdentifier> getNonexistentExcludedDependencies() {
-        return getFictitiousExcludedDependencies().stream().map(ModuleIdentifier::fromString).collect(Collectors.toSet());
-    }
-
     /**
      * Gets the names of dependencies that  {@link #addModuleExclusion(String) were meant to be excluded} but which were
      * never recorded as a dependency.

server/src/main/java/org/jboss/as/server/deployment/module/descriptor/ModuleStructureSpec.java

@@ -15,7 +15,6 @@
 import org.jboss.as.server.deployment.module.ModuleDependency;
 import org.jboss.as.server.deployment.module.ResourceRoot;
 import org.jboss.modules.DependencySpec;
-import org.jboss.modules.ModuleIdentifier;
 
 /**
  * @author Stuart Douglas
@@ -27,7 +26,7 @@ class ModuleStructureSpec {
     private final List<DependencySpec> systemDependencies = new ArrayList<>();
     private final List<ResourceRoot> resourceRoots = new ArrayList<>();
     private final List<FilterSpecification> exportFilters = new ArrayList<>();
-    private final List<ModuleIdentifier> exclusions = new ArrayList<>();
+    private final List<String> exclusions = new ArrayList<>();
     private final List<String> classTransformers = new ArrayList<>();
     private final List<String> aliases = new ArrayList<>();
     private final List<String> annotationModules = new ArrayList<>();
@@ -76,17 +75,6 @@ public List<DependencySpec> getSystemDependencies() {
         return Collections.unmodifiableList(systemDependencies);
     }
 
-    /**
-     * Adds an alias to the module structure spec.
-     *
-     * @param dependency the alias identifier
-     * @deprecated use {@link #addAlias(String)} instead
-     */
-    @Deprecated(forRemoval = true, since = "28.0.0")
-    public void addAlias(final ModuleIdentifier dependency) {
-        aliases.add(dependency.toString());
-    }
-
     /**
      * Adds an alias to the module structure spec.
      *
@@ -96,16 +84,6 @@ public void addAlias(final String dependency) {
         aliases.add(dependency);
     }
 
-    /**
-     * Returns the aliases of this module spec.
-     * @return an unmodifiable list with the aliases of this module spec
-     * @deprecated use {@link #getAliasesList()} instead
-     */
-    @Deprecated(forRemoval = true, since = "28.0.0")
-    public List<ModuleIdentifier> getAliases() {
-        return aliases.stream().map(ModuleIdentifier::fromString).collect(Collectors.toUnmodifiableList());
-    }
-
     /**
      * Returns the aliases of this module spec.
      * @return an unmodifiable list with the aliases of this module spec
@@ -122,26 +100,16 @@ public List<String> getAnnotationModules() {
         return Collections.unmodifiableList(annotationModules);
     }
 
-    /**
-     * Returns list of exclusions.
-     * @return the exclusions
-     * @deprecated use {@link #getExclusionsList()} instead
-     */
-    @Deprecated(forRemoval = true, since = "28.0.0")
-    public List<ModuleIdentifier> getExclusions() {
-        return exclusions;
-    }
-
     /**
      * Returns the exclusions of this module spec. Use {@link #addExclusion(String)} to add new exclusions.
      * @return an unmodifiable list with the exclusions of this module spec.
      */
     public List<String> getExclusionsList() {
-        return exclusions.stream().map(ModuleIdentifier::toString).collect(Collectors.toUnmodifiableList());
+        return exclusions.stream().collect(Collectors.toUnmodifiableList());
     }
 
     public void addExclusion(String identifier) {
-        this.exclusions.add(ModuleIdentifier.fromString(identifier));
+        this.exclusions.add(identifier);
     }
 
     public List<FilterSpecification> getExportFilters() {