Skip to content

Replace readonly @Parameter annotations for components with @Inject #5224

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

Open
HannesWell wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Replace readonly @Parameter annotations for components with @Inject #5224

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
15 changes: 8 additions & 7 deletions ...atform-configuration/src/main/java/org/eclipse/tycho/target/MirrorTargetPlatformMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@
import java.util.UUID;
import java.util.stream.Collectors;

import javax.inject.Inject;

import org.apache.maven.plugin.AbstractMojo;
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 Down Expand Up @@ -63,7 +64,7 @@ public class MirrorTargetPlatformMojo extends AbstractMojo {

private static final SiteXMLAction CATEGORY_FACTORY = new SiteXMLAction((URI) null, (String) null);

@Parameter(property = "project", readonly = true)
@Inject
private MavenProject project;

@Parameter(defaultValue = "${project.build.directory}/target-platform-repository")
Expand Down Expand Up @@ -104,19 +105,19 @@ public class MirrorTargetPlatformMojo extends AbstractMojo {
@Parameter
private SlicingOptions options;

@Component
@Inject
private TargetPlatformService platformService;

@Component
@Inject
private MirrorApplicationService mirrorService;

@Component
@Inject
private ReactorRepositoryManager repositoryManager;

@Component
@Inject
private IProvisioningAgent agent;

@Component
@Inject
private InstallableUnitSlicer installableUnitSlicer;

@Override
Expand Down
8 changes: 4 additions & 4 deletions target-platform-configuration/src/main/java/org/eclipse/tycho/target/TargetPlatformMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
*******************************************************************************/
package org.eclipse.tycho.target;

import javax.inject.Inject;

import org.apache.maven.plugin.AbstractMojo;
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.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.eclipse.tycho.ReactorProject;
import org.eclipse.tycho.TargetPlatformService;
Expand All @@ -30,10 +30,10 @@ public class TargetPlatformMojo extends AbstractMojo {
private static final String TARGET_PLATFORM_MOJO_EXECUTED = "TargetPlatformMojo.executed";

// TODO site doc (including steps & parameters handled in afterProjectsRead?)
@Parameter(property = "project", readonly = true)
@Inject
private MavenProject project;

@Component
@Inject
private TargetPlatformService platformService;

@Override
Expand Down
14 changes: 5 additions & 9 deletions tycho-apitools-plugin/src/main/java/org/eclipse/tycho/apitools/ApiAnalysisMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,16 @@
import java.util.function.Function;
import java.util.stream.Collectors;

import javax.inject.Inject;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException;

import org.apache.maven.artifact.Artifact;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Repository;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.logging.Log;
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 Down Expand Up @@ -79,7 +78,7 @@ public class ApiAnalysisMojo extends AbstractMojo {
@Parameter(property = "plugin.artifacts")
protected List<Artifact> pluginArtifacts;

@Parameter(property = "project", readonly = true)
@Inject
private MavenProject project;

@Parameter(defaultValue = "eclipse-plugin")
Expand All @@ -100,9 +99,6 @@ public class ApiAnalysisMojo extends AbstractMojo {
@Parameter()
private Repository apiToolsRepository;

@Parameter(property = "session", readonly = true, required = true)
private MavenSession session;

@Parameter
private Map<String, String> properties;

Expand Down Expand Up @@ -159,13 +155,13 @@ public class ApiAnalysisMojo extends AbstractMojo {
@Parameter(defaultValue = "true", property = "tycho.apitools.runAsJob")
private boolean runAsJob;

@Component
@Inject
private EclipseWorkspaceManager workspaceManager;

@Component
@Inject
private TychoProjectManager projectManager;

@Component
@Inject
private ApiApplicationResolver applicationResolver;

@Override
Expand Down
4 changes: 3 additions & 1 deletion tycho-apitools-plugin/src/main/java/org/eclipse/tycho/apitools/ApiFileGenerationMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
import java.util.jar.JarFile;
import java.util.stream.Collectors;

import javax.inject.Inject;

import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
Expand All @@ -41,7 +43,7 @@
@Mojo(name = "generate", defaultPhase = LifecyclePhase.PROCESS_CLASSES, threadSafe = true)
public class ApiFileGenerationMojo extends AbstractMojo {

@Parameter(property = "project", readonly = true)
@Inject
protected MavenProject project;

@Parameter(defaultValue = "${project.build.directory}")
Expand Down
10 changes: 4 additions & 6 deletions tycho-baseline-plugin/src/main/java/org/eclipse/tycho/baseline/BaselineMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@
import java.util.Optional;
import java.util.stream.Collectors;

import javax.inject.Inject;

import org.apache.maven.artifact.Artifact;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Repository;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
Expand Down Expand Up @@ -59,13 +60,10 @@ public class BaselineMojo extends AbstractMojo implements BaselineContext {
@Parameter(property = "baselines", name = "baselines")
private List<Repository> baselines;

@Component
@Inject
private P2RepositoryManager repositoryManager;

@Parameter(property = "session", readonly = true)
private MavenSession session;

@Parameter(property = "project", readonly = true)
@Inject
protected MavenProject project;

/**
Expand Down
6 changes: 4 additions & 2 deletions tycho-baseline-plugin/src/main/java/org/eclipse/tycho/baseline/DependencyCheckMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
import java.util.function.Function;
import java.util.stream.Collectors;

import javax.inject.Inject;

import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
Expand Down Expand Up @@ -83,10 +85,10 @@
@Mojo(defaultPhase = LifecyclePhase.VERIFY, name = "check-dependencies", threadSafe = true, requiresProject = true)
public class DependencyCheckMojo extends AbstractMojo {

@Parameter(property = "project", readonly = true)
@Inject
private MavenProject project;

@Parameter(property = "session", readonly = true)
@Inject
private MavenSession session;

@Parameter(defaultValue = "${project.build.directory}/versionProblems.md", property = "tycho.dependency.check.report")
Expand Down
12 changes: 4 additions & 8 deletions tycho-bnd-plugin/src/main/java/org/eclipse/tycho/bnd/mojos/AbstractBndMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,10 @@
import java.util.List;
import java.util.stream.Collectors;

import org.apache.maven.execution.MavenSession;
import javax.inject.Inject;

import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.eclipse.tycho.bnd.MavenReactorRepository;

Expand All @@ -28,13 +27,10 @@

public abstract class AbstractBndMojo extends AbstractMojo {

@Parameter(property = "project", readonly = true)
@Inject
protected MavenProject mavenProject;

@Parameter(property = "session", readonly = true)
protected MavenSession session;

@Component
@Inject
protected MavenReactorRepository mavenReactorRepository;

protected Workspace getWorkspace() throws MojoFailureException {
Expand Down
14 changes: 7 additions & 7 deletions tycho-bnd-plugin/src/main/java/org/eclipse/tycho/bnd/mojos/GenerateManifestMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@
import java.util.regex.Matcher;
import java.util.stream.Collectors;

import javax.inject.Inject;

import org.apache.maven.artifact.Artifact;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.logging.Log;
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;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProject;
import org.eclipse.tycho.ArtifactKey;
Expand Down Expand Up @@ -72,18 +72,18 @@ public class GenerateManifestMojo extends AbstractMojo {
return true;
};

@Component
@Inject
private BndPluginManager bndPluginManager;

@Parameter(property = "project", readonly = true)
@Inject
protected MavenProject mavenProject;

@Parameter(property = "session", readonly = true)
@Inject
protected MavenSession session;

@Component
@Inject
private PluginRealmHelper pluginRealmHelper;
@Component
@Inject
private TychoProjectManager projectManager;

@Override
Expand Down
22 changes: 12 additions & 10 deletions tycho-compiler-plugin/src/main/java/org/eclipse/tycho/compiler/AbstractOsgiCompilerMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;

import javax.inject.Inject;

import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.repository.ArtifactRepository;
Expand Down Expand Up @@ -116,7 +118,7 @@ public abstract class AbstractOsgiCompilerMojo extends AbstractCompilerMojo impl

private static final String PREFS_FILE_PATH = ".settings" + File.separator + "org.eclipse.jdt.core.prefs";

@Parameter(property = "project", readonly = true)
@Inject
protected MavenProject project;

/**
Expand All @@ -131,7 +133,7 @@ public abstract class AbstractOsgiCompilerMojo extends AbstractCompilerMojo impl
@Parameter
private Dependency[] extraClasspathElements;

@Parameter(property = "session", readonly = true)
@Inject
private MavenSession session;

/**
Expand Down Expand Up @@ -185,7 +187,7 @@ public abstract class AbstractOsgiCompilerMojo extends AbstractCompilerMojo impl
@Parameter(defaultValue = "SYSTEM")
private JDKUsage useJDK;

@Component
@Inject
private ToolchainManagerPrivate toolChainManager;

/**
Expand Down Expand Up @@ -264,7 +266,7 @@ public abstract class AbstractOsgiCompilerMojo extends AbstractCompilerMojo impl
@Component(role = TychoProject.class)
private Map<String, TychoProject> projectTypes;

@Component
@Inject
private BundleReader bundleReader;

/**
Expand Down Expand Up @@ -326,19 +328,19 @@ public abstract class AbstractOsgiCompilerMojo extends AbstractCompilerMojo impl
@Parameter
private String log;

@Component
@Inject
ToolchainProvider toolchainProvider;

@Component
@Inject
private ToolchainManager toolchainManager;

@Component
@Inject
private PluginRealmHelper pluginRealmHelper;

@Component
@Inject
private Logger logger;

@Component
@Inject
private MavenDependenciesResolver dependenciesResolver;

private ExecutionEnvironment[] manifestBREEs;
Expand All @@ -349,7 +351,7 @@ public abstract class AbstractOsgiCompilerMojo extends AbstractCompilerMojo impl

private List<String> currentExcludes;

@Component
@Inject
private TychoProjectManager tychoProjectManager;

private Integer currentRelease;
Expand Down
5 changes: 3 additions & 2 deletions tycho-compiler-plugin/src/main/java/org/eclipse/tycho/compiler/ValidateClassPathMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,14 @@

import java.util.Map;

import javax.inject.Inject;

import org.apache.maven.plugin.AbstractMojo;
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;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProject;
import org.eclipse.tycho.ReactorProject;
Expand All @@ -36,7 +37,7 @@
@Mojo(name = "validate-classpath", defaultPhase = LifecyclePhase.VALIDATE, requiresDependencyResolution = ResolutionScope.COMPILE, threadSafe = true)
public class ValidateClassPathMojo extends AbstractMojo {

@Parameter(property = "project", readonly = true)
@Inject
private MavenProject project;

@Component(role = TychoProject.class)
Expand Down
6 changes: 4 additions & 2 deletions tycho-core/src/main/java/org/eclipse/tycho/core/maven/AbstractP2Mojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@

import java.util.List;

import javax.inject.Inject;

import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugins.annotations.Component;
Expand All @@ -31,10 +33,10 @@

public abstract class AbstractP2Mojo extends AbstractMojo {

@Parameter(property = "session", readonly = true)
@Inject
private MavenSession session;

@Parameter(property = "project", readonly = true)
@Inject
private MavenProject project;

@Parameter(property = TychoProperties.BUILD_QUALIFIER)
Expand Down
Loading
Loading