Skip to content

Replace Component annotation by constructor injection #573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
slawekjaranowski merged 1 commit into from
Oct 25, 2025
Merged

Replace Component annotation by constructor injection #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
import org.apache.maven.shared.utils.StringUtils;
import org.codehaus.plexus.archiver.jar.JarArchiver;
import org.codehaus.plexus.archiver.manager.ArchiverManager;
import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;

/**
* Contains common jobs for WAR mojos.
Expand Down Expand Up @@ -387,16 +388,23 @@ public abstract class AbstractWarMojo extends AbstractMojo {
private final MavenResourcesFiltering mavenResourcesFiltering;

protected AbstractWarMojo(
JarArchiver jarArchiver,
ArtifactFactory artifactFactory,
ArchiverManager archiverManager,
MavenFileFilter mavenFileFilter,
MavenResourcesFiltering mavenResourcesFiltering) {
this.jarArchiver = jarArchiver;
this.artifactFactory = artifactFactory;
this.archiverManager = archiverManager;
this.mavenFileFilter = mavenFileFilter;
this.mavenResourcesFiltering = mavenResourcesFiltering;
try {
this.jarArchiver = (JarArchiver) archiverManager.getArchiver("jar");
} catch (NoSuchArchiverException e) {
throw new IllegalStateException("Cannot find jar archiver", e);
}
}

public ArchiverManager getArchiverManager() {
return archiverManager;
}

/**
Expand Down
9 changes: 3 additions & 6 deletions src/main/java/org/apache/maven/plugins/war/WarExplodedMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
package org.apache.maven.plugins.war;

import javax.inject.Inject;
import javax.inject.Named;

import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.plugin.MojoExecutionException;
Expand All @@ -29,7 +28,6 @@
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.shared.filtering.MavenFileFilter;
import org.apache.maven.shared.filtering.MavenResourcesFiltering;
import org.codehaus.plexus.archiver.jar.JarArchiver;
import org.codehaus.plexus.archiver.manager.ArchiverManager;

/**
Expand All @@ -43,12 +41,11 @@
public class WarExplodedMojo extends AbstractWarMojo {
@Inject
public WarExplodedMojo(
JarArchiver jarArchiver,
ArtifactFactory artifactFactory,
ArchiverManager archiverManager,
@Named("default") MavenFileFilter mavenFileFilter,
@Named("default") MavenResourcesFiltering mavenResourcesFiltering) {
super(jarArchiver, artifactFactory, archiverManager, mavenFileFilter, mavenResourcesFiltering);
MavenFileFilter mavenFileFilter,
MavenResourcesFiltering mavenResourcesFiltering) {
super(artifactFactory, archiverManager, mavenFileFilter, mavenResourcesFiltering);
}

@Override
Expand Down
9 changes: 3 additions & 6 deletions src/main/java/org/apache/maven/plugins/war/WarInPlaceMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
package org.apache.maven.plugins.war;

import javax.inject.Inject;
import javax.inject.Named;

import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.plugin.MojoExecutionException;
Expand All @@ -28,7 +27,6 @@
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.shared.filtering.MavenFileFilter;
import org.apache.maven.shared.filtering.MavenResourcesFiltering;
import org.codehaus.plexus.archiver.jar.JarArchiver;
import org.codehaus.plexus.archiver.manager.ArchiverManager;

/**
Expand All @@ -39,12 +37,11 @@ public class WarInPlaceMojo extends AbstractWarMojo {

@Inject
public WarInPlaceMojo(
JarArchiver jarArchiver,
ArtifactFactory artifactFactory,
ArchiverManager archiverManager,
@Named("default") MavenFileFilter mavenFileFilter,
@Named("default") MavenResourcesFiltering mavenResourcesFiltering) {
super(jarArchiver, artifactFactory, archiverManager, mavenFileFilter, mavenResourcesFiltering);
MavenFileFilter mavenFileFilter,
MavenResourcesFiltering mavenResourcesFiltering) {
super(artifactFactory, archiverManager, mavenFileFilter, mavenResourcesFiltering);
}

@Override
Expand Down
49 changes: 14 additions & 35 deletions src/main/java/org/apache/maven/plugins/war/WarMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
package org.apache.maven.plugins.war;

import javax.inject.Inject;
import javax.inject.Named;

import java.io.File;
import java.io.IOException;
Expand All @@ -35,7 +34,6 @@
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
Expand All @@ -44,11 +42,10 @@
import org.apache.maven.project.MavenProjectHelper;
import org.apache.maven.shared.filtering.MavenFileFilter;
import org.apache.maven.shared.filtering.MavenResourcesFiltering;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.jar.JarArchiver;
import org.codehaus.plexus.archiver.jar.ManifestException;
import org.codehaus.plexus.archiver.manager.ArchiverManager;
import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
import org.codehaus.plexus.archiver.war.WarArchiver;
import org.codehaus.plexus.util.FileUtils;

Expand Down Expand Up @@ -82,15 +79,6 @@ public class WarMojo extends AbstractWarMojo {
@Parameter
private String classifier;

/**
* The WAR archiver.
*/
@Component(role = Archiver.class, hint = "war")
private WarArchiver warArchiver;

@Component
private MavenProjectHelper projectHelper;

/**
* Whether this is the main artifact being built. Set to <code>false</code> if you don't want to install or deploy
* it to the local repository instead of the default one in an execution.
Expand Down Expand Up @@ -140,14 +128,17 @@ public class WarMojo extends AbstractWarMojo {
@Parameter(property = "maven.war.skip", defaultValue = "false")
private boolean skip;

private final MavenProjectHelper projectHelper;

@Inject
public WarMojo(
JarArchiver jarArchiver,
ArtifactFactory artifactFactory,
ArchiverManager archiverManager,
@Named("default") MavenFileFilter mavenFileFilter,
@Named("default") MavenResourcesFiltering mavenResourcesFiltering) {
super(jarArchiver, artifactFactory, archiverManager, mavenFileFilter, mavenResourcesFiltering);
MavenFileFilter mavenFileFilter,
MavenResourcesFiltering mavenResourcesFiltering,
MavenProjectHelper projectHelper) {
super(artifactFactory, archiverManager, mavenFileFilter, mavenResourcesFiltering);
this.projectHelper = projectHelper;
}

// ----------------------------------------------------------------------
Expand Down Expand Up @@ -199,6 +190,7 @@ private void performPackaging(File warFile)

MavenArchiver archiver = new MavenArchiver();

WarArchiver warArchiver = getWarArchiver();
archiver.setArchiver(warArchiver);

archiver.setCreatedBy("Maven WAR Plugin", "org.apache.maven.plugins", "maven-war-plugin");
Expand Down Expand Up @@ -390,18 +382,12 @@ public void setWarName(String warName) {
this.warName = warName;
}

/**
* @return {@link #warArchiver}
*/
public WarArchiver getWarArchiver() {
return warArchiver;
}

/**
* @param warArchiver {@link #warArchiver}
*/
public void setWarArchiver(WarArchiver warArchiver) {
this.warArchiver = warArchiver;
try {
return (WarArchiver) getArchiverManager().getArchiver("war");
} catch (NoSuchArchiverException e) {
throw new IllegalStateException("Cannot find war archiver", e);
}
}

/**
Expand All @@ -411,13 +397,6 @@ public MavenProjectHelper getProjectHelper() {
return projectHelper;
}

/**
* @param projectHelper {@link #projectHelper}
*/
public void setProjectHelper(MavenProjectHelper projectHelper) {
this.projectHelper = projectHelper;
}

/**
* @return {@link #primaryArtifact}
*/
Expand Down