This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-invoker.git
commit 3c2ceacdb6b6949cab4ec78fe15e3d4b3bcd857c Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Mon Nov 16 22:12:54 2026 +0000 Use System.lineSeparator(), @Override and try-with-resources --- .../shared/invoker/DefaultInvocationRequest.java | 73 ++++++++++++++++++++++ .../shared/invoker/DefaultInvocationResult.java | 2 + .../maven/shared/invoker/DefaultInvoker.java | 14 +++++ .../maven/shared/invoker/PrintStreamHandler.java | 1 + .../maven/shared/invoker/PrintStreamLogger.java | 17 +++++ 5 files changed, 107 insertions(+) diff --git a/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationRequest.java b/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationRequest.java index 05d1af8..9fcefad 100644 --- a/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationRequest.java +++ b/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationRequest.java @@ -128,16 +128,19 @@ public class DefaultInvocationRequest implements InvocationRequest { * * @return a {@link java.io.File} object. */ + @Override public File getBaseDirectory() { return basedir; } /** {@inheritDoc} */ + @Override public File getBaseDirectory(File defaultDirectory) { return basedir == null ? defaultDirectory : basedir; } /** {@inheritDoc} */ + @Override public InvocationOutputHandler getErrorHandler(InvocationOutputHandler defaultHandler) { return errorHandler == null ? defaultHandler : errorHandler; } @@ -147,6 +150,7 @@ public class DefaultInvocationRequest implements InvocationRequest { * * @return a ReactorFailureBehavior object. */ + @Override public ReactorFailureBehavior getReactorFailureBehavior() { return failureBehavior; } @@ -156,21 +160,25 @@ public class DefaultInvocationRequest implements InvocationRequest { * * @return a {@link java.util.List} object. */ + @Override public List<String> getGoals() { return goals; } /** {@inheritDoc} */ + @Override public InputStream getInputStream(InputStream defaultStream) { return inputStream == null ? defaultStream : inputStream; } /** {@inheritDoc} */ + @Override public File getLocalRepositoryDirectory(File defaultDirectory) { return localRepository == null ? defaultDirectory : localRepository; } /** {@inheritDoc} */ + @Override public InvocationOutputHandler getOutputHandler(InvocationOutputHandler defaultHandler) { return outputHandler == null ? defaultHandler : outputHandler; } @@ -180,6 +188,7 @@ public class DefaultInvocationRequest implements InvocationRequest { * * @return a {@link java.io.File} object. */ + @Override public File getPomFile() { return pomFile; } @@ -189,6 +198,7 @@ public class DefaultInvocationRequest implements InvocationRequest { * * @return a {@link java.util.Properties} object. */ + @Override public Properties getProperties() { return properties; } @@ -198,6 +208,7 @@ public class DefaultInvocationRequest implements InvocationRequest { * * @return a boolean. */ + @Override public boolean isDebug() { return debug; } @@ -207,6 +218,7 @@ public class DefaultInvocationRequest implements InvocationRequest { * * @return a boolean. */ + @Override public boolean isBatchMode() { return interactive; } @@ -216,6 +228,7 @@ public class DefaultInvocationRequest implements InvocationRequest { * * @return a boolean. */ + @Override public boolean isOffline() { return offline; } @@ -225,6 +238,7 @@ public class DefaultInvocationRequest implements InvocationRequest { * * @return a boolean. */ + @Override public boolean isShowErrors() { return showErrors; } @@ -234,10 +248,12 @@ public class DefaultInvocationRequest implements InvocationRequest { * * @return a boolean. */ + @Override public boolean isUpdateSnapshots() { return updateSnapshotsPolicy == UpdateSnapshotsPolicy.ALWAYS; } + @Override public UpdateSnapshotsPolicy getUpdateSnapshotsPolicy() { return updateSnapshotsPolicy; } @@ -247,29 +263,34 @@ public class DefaultInvocationRequest implements InvocationRequest { * * @return a boolean. */ + @Override public boolean isRecursive() { return recursive; } /** {@inheritDoc} */ + @Override public InvocationRequest setRecursive(boolean recursive) { this.recursive = recursive; return this; } /** {@inheritDoc} */ + @Override public InvocationRequest setBaseDirectory(File basedir) { this.basedir = basedir; return this; } /** {@inheritDoc} */ + @Override public InvocationRequest setDebug(boolean debug) { this.debug = debug; return this; } /** {@inheritDoc} */ + @Override public InvocationRequest setErrorHandler(InvocationOutputHandler errorHandler) { this.errorHandler = errorHandler; return this; @@ -281,66 +302,77 @@ public class DefaultInvocationRequest implements InvocationRequest { * @param failureBehavior a ReactorFailureBehavior object. * @return a {@link org.apache.maven.shared.invoker.InvocationRequest} object. */ + @Override public InvocationRequest setReactorFailureBehavior(ReactorFailureBehavior failureBehavior) { this.failureBehavior = failureBehavior; return this; } /** {@inheritDoc} */ + @Override public InvocationRequest setGoals(List<String> goals) { this.goals = goals; return this; } /** {@inheritDoc} */ + @Override public InvocationRequest setInputStream(InputStream inputStream) { this.inputStream = inputStream; return this; } /** {@inheritDoc} */ + @Override public InvocationRequest setBatchMode(boolean interactive) { this.interactive = interactive; return this; } /** {@inheritDoc} */ + @Override public InvocationRequest setLocalRepositoryDirectory(File localRepository) { this.localRepository = localRepository; return this; } /** {@inheritDoc} */ + @Override public InvocationRequest setOffline(boolean offline) { this.offline = offline; return this; } /** {@inheritDoc} */ + @Override public InvocationRequest setOutputHandler(InvocationOutputHandler outputHandler) { this.outputHandler = outputHandler; return this; } /** {@inheritDoc} */ + @Override public InvocationRequest setPomFile(File pomFile) { this.pomFile = pomFile; return this; } /** {@inheritDoc} */ + @Override public InvocationRequest setProperties(Properties properties) { this.properties = properties; return this; } /** {@inheritDoc} */ + @Override public InvocationRequest setShowErrors(boolean showErrors) { this.showErrors = showErrors; return this; } /** {@inheritDoc} */ + @Override public InvocationRequest setUpdateSnapshots(boolean updateSnapshots) { return setUpdateSnapshotsPolicy(updateSnapshots ? UpdateSnapshotsPolicy.ALWAYS : UpdateSnapshotsPolicy.DEFAULT); } @@ -357,11 +389,13 @@ public class DefaultInvocationRequest implements InvocationRequest { * @see MavenCommandLineBuilder#setShellEnvironment(InvocationRequest, Commandline) * @return a boolean. */ + @Override public boolean isShellEnvironmentInherited() { return shellEnvironmentInherited; } /** {@inheritDoc} */ + @Override public InvocationRequest setShellEnvironmentInherited(boolean shellEnvironmentInherited) { this.shellEnvironmentInherited = shellEnvironmentInherited; return this; @@ -372,11 +406,13 @@ public class DefaultInvocationRequest implements InvocationRequest { * * @return a {@link java.io.File} object. */ + @Override public File getJavaHome() { return javaHome; } /** {@inheritDoc} */ + @Override public InvocationRequest setJavaHome(File javaHome) { this.javaHome = javaHome; return this; @@ -387,11 +423,13 @@ public class DefaultInvocationRequest implements InvocationRequest { * * @return a {@link java.io.File} object. */ + @Override public File getUserSettingsFile() { return userSettings; } /** {@inheritDoc} */ + @Override public InvocationRequest setUserSettingsFile(File userSettings) { this.userSettings = userSettings; return this; @@ -402,11 +440,13 @@ public class DefaultInvocationRequest implements InvocationRequest { * * @return a {@link java.io.File} object. */ + @Override public File getGlobalSettingsFile() { return globalSettings; } /** {@inheritDoc} */ + @Override public InvocationRequest setGlobalSettingsFile(File globalSettings) { this.globalSettings = globalSettings; return this; @@ -417,11 +457,13 @@ public class DefaultInvocationRequest implements InvocationRequest { * * @return a {@link java.io.File} object. */ + @Override public File getToolchainsFile() { return toolchains; } /** {@inheritDoc} */ + @Override public InvocationRequest setToolchainsFile(File toolchains) { this.toolchains = toolchains; return this; @@ -432,11 +474,13 @@ public class DefaultInvocationRequest implements InvocationRequest { * * @return a {@link java.io.File} object. */ + @Override public File getGlobalToolchainsFile() { return globalToolchains; } /** {@inheritDoc} */ + @Override public InvocationRequest setGlobalToolchainsFile(File toolchains) { this.globalToolchains = toolchains; return this; @@ -447,6 +491,7 @@ public class DefaultInvocationRequest implements InvocationRequest { * * @return a CheckSumPolicy object. */ + @Override public CheckSumPolicy getGlobalChecksumPolicy() { return globalChecksumPolicy; } @@ -457,6 +502,7 @@ public class DefaultInvocationRequest implements InvocationRequest { * @param globalChecksumPolicy a CheckSumPolicy object. * @return a {@link org.apache.maven.shared.invoker.InvocationRequest} object. */ + @Override public InvocationRequest setGlobalChecksumPolicy(CheckSumPolicy globalChecksumPolicy) { this.globalChecksumPolicy = globalChecksumPolicy; return this; @@ -467,6 +513,7 @@ public class DefaultInvocationRequest implements InvocationRequest { * * @return a {@link java.lang.String} object. */ + @Override public String getPomFileName() { return pomFilename; } @@ -483,11 +530,13 @@ public class DefaultInvocationRequest implements InvocationRequest { return this; } + @Override public List<String> getArgs() { return args; } /** {@inheritDoc} */ + @Override public InvocationRequest setPomFileName(String pomFilename) { this.pomFilename = pomFilename; return this; @@ -498,11 +547,13 @@ public class DefaultInvocationRequest implements InvocationRequest { * * @return a {@link java.util.List} object. */ + @Override public List<String> getProfiles() { return profiles; } /** {@inheritDoc} */ + @Override public InvocationRequest setProfiles(List<String> profiles) { this.profiles = profiles; return this; @@ -513,17 +564,20 @@ public class DefaultInvocationRequest implements InvocationRequest { * * @return a boolean. */ + @Override public boolean isNonPluginUpdates() { return nonPluginUpdates; } /** {@inheritDoc} */ + @Override public InvocationRequest setNonPluginUpdates(boolean nonPluginUpdates) { this.nonPluginUpdates = nonPluginUpdates; return this; } /** {@inheritDoc} */ + @Override public InvocationRequest addShellEnvironment(String name, String value) { if (this.shellEnvironments == null) { this.shellEnvironments = new HashMap<>(); @@ -537,6 +591,7 @@ public class DefaultInvocationRequest implements InvocationRequest { * * @return a {@link java.util.Map} object. */ + @Override public Map<String, String> getShellEnvironments() { return shellEnvironments == null ? Collections.<String, String>emptyMap() : shellEnvironments; } @@ -546,11 +601,13 @@ public class DefaultInvocationRequest implements InvocationRequest { * * @return a {@link java.lang.String} object. */ + @Override public String getMavenOpts() { return mavenOpts; } /** {@inheritDoc} */ + @Override public InvocationRequest setMavenOpts(String mavenOpts) { this.mavenOpts = mavenOpts; return this; @@ -562,11 +619,13 @@ public class DefaultInvocationRequest implements InvocationRequest { * @see org.apache.maven.shared.invoker.InvocationRequest#isShowVersion() * @return a boolean. */ + @Override public boolean isShowVersion() { return this.showVersion; } /** {@inheritDoc} */ + @Override public InvocationRequest setShowVersion(boolean showVersion) { this.showVersion = showVersion; return this; @@ -577,11 +636,13 @@ public class DefaultInvocationRequest implements InvocationRequest { * * @return a {@link java.lang.String} object. */ + @Override public String getThreads() { return threads; } /** {@inheritDoc} */ + @Override public InvocationRequest setThreads(String threads) { this.threads = threads; return this; @@ -592,11 +653,13 @@ public class DefaultInvocationRequest implements InvocationRequest { * * @return a {@link java.util.List} object. */ + @Override public List<String> getProjects() { return projects; } /** {@inheritDoc} */ + @Override public InvocationRequest setProjects(List<String> projects) { this.projects = projects; return this; @@ -607,11 +670,13 @@ public class DefaultInvocationRequest implements InvocationRequest { * * @return a boolean. */ + @Override public boolean isAlsoMake() { return alsoMake; } /** {@inheritDoc} */ + @Override public InvocationRequest setAlsoMake(boolean alsoMake) { this.alsoMake = alsoMake; return this; @@ -622,11 +687,13 @@ public class DefaultInvocationRequest implements InvocationRequest { * * @return a boolean. */ + @Override public boolean isAlsoMakeDependents() { return alsoMakeDependents; } /** {@inheritDoc} */ + @Override public InvocationRequest setAlsoMakeDependents(boolean alsoMakeDependents) { this.alsoMakeDependents = alsoMakeDependents; return this; @@ -637,17 +704,20 @@ public class DefaultInvocationRequest implements InvocationRequest { * * @return a {@link java.lang.String} object. */ + @Override public String getResumeFrom() { return resumeFrom; } /** {@inheritDoc} */ + @Override public InvocationRequest setResumeFrom(String resumeFrom) { this.resumeFrom = resumeFrom; return this; } /** {@inheritDoc} */ + @Override public InvocationRequest setBuilder(String id) { this.builderId = id; return this; @@ -658,6 +728,7 @@ public class DefaultInvocationRequest implements InvocationRequest { * * @return a {@link java.lang.String} object. */ + @Override public String getBuilder() { return this.builderId; } @@ -680,11 +751,13 @@ public class DefaultInvocationRequest implements InvocationRequest { * @return a boolean. * @since 3.1.0 */ + @Override public boolean isQuiet() { return quiet; } /** {@inheritDoc} */ + @Override public InvocationRequest setQuiet(boolean quiet) { this.quiet = quiet; return this; diff --git a/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationResult.java b/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationResult.java index eacf564..8d2eeea 100644 --- a/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationResult.java +++ b/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationResult.java @@ -56,6 +56,7 @@ public final class DefaultInvocationResult implements InvocationResult { * * @return a int. */ + @Override public int getExitCode() { return exitCode; } @@ -65,6 +66,7 @@ public final class DefaultInvocationResult implements InvocationResult { * * @return a {@link org.apache.maven.shared.utils.cli.CommandLineException} object. */ + @Override public CommandLineException getExecutionException() { return executionException; } diff --git a/src/main/java/org/apache/maven/shared/invoker/DefaultInvoker.java b/src/main/java/org/apache/maven/shared/invoker/DefaultInvoker.java index 5cf4088..1384901 100644 --- a/src/main/java/org/apache/maven/shared/invoker/DefaultInvoker.java +++ b/src/main/java/org/apache/maven/shared/invoker/DefaultInvoker.java @@ -70,6 +70,7 @@ public class DefaultInvoker implements Invoker { private InvocationOutputHandler errorHandler = DEFAULT_OUTPUT_HANDLER; /** {@inheritDoc} */ + @Override public InvocationResult execute(InvocationRequest request) throws MavenInvocationException { MavenCommandLineBuilder cliBuilder = new MavenCommandLineBuilder() { @Override @@ -196,6 +197,7 @@ public class DefaultInvoker implements Invoker { * * @return a {@link java.io.File} object. */ + @Override public File getLocalRepositoryDirectory() { return localRepositoryDirectory; } @@ -205,17 +207,20 @@ public class DefaultInvoker implements Invoker { * * @return a {@link org.apache.maven.shared.invoker.InvokerLogger} object. */ + @Override public InvokerLogger getLogger() { return logger; } /** {@inheritDoc} */ + @Override public Invoker setLocalRepositoryDirectory(File localRepositoryDirectory) { this.localRepositoryDirectory = localRepositoryDirectory; return this; } /** {@inheritDoc} */ + @Override public Invoker setLogger(InvokerLogger logger) { this.logger = logger != null ? logger : DEFAULT_LOGGER; return this; @@ -226,11 +231,13 @@ public class DefaultInvoker implements Invoker { * * @return a {@link java.io.File} object. */ + @Override public File getWorkingDirectory() { return workingDirectory; } /** {@inheritDoc} */ + @Override public Invoker setWorkingDirectory(File workingDirectory) { this.workingDirectory = workingDirectory; return this; @@ -241,11 +248,13 @@ public class DefaultInvoker implements Invoker { * * @return a {@link java.io.File} object. */ + @Override public File getMavenHome() { return mavenHome; } /** {@inheritDoc} */ + @Override public Invoker setMavenHome(File mavenHome) { this.mavenHome = mavenHome; @@ -257,29 +266,34 @@ public class DefaultInvoker implements Invoker { * * @return a {@link java.io.File} object. */ + @Override public File getMavenExecutable() { return mavenExecutable; } /** {@inheritDoc} */ + @Override public Invoker setMavenExecutable(File mavenExecutable) { this.mavenExecutable = mavenExecutable; return this; } /** {@inheritDoc} */ + @Override public Invoker setErrorHandler(InvocationOutputHandler errorHandler) { this.errorHandler = errorHandler; return this; } /** {@inheritDoc} */ + @Override public Invoker setInputStream(InputStream inputStream) { this.inputStream = inputStream; return this; } /** {@inheritDoc} */ + @Override public Invoker setOutputHandler(InvocationOutputHandler outputHandler) { this.outputHandler = outputHandler; return this; diff --git a/src/main/java/org/apache/maven/shared/invoker/PrintStreamHandler.java b/src/main/java/org/apache/maven/shared/invoker/PrintStreamHandler.java index 26db723..bacc28b 100644 --- a/src/main/java/org/apache/maven/shared/invoker/PrintStreamHandler.java +++ b/src/main/java/org/apache/maven/shared/invoker/PrintStreamHandler.java @@ -59,6 +59,7 @@ public class PrintStreamHandler implements InvocationOutputHandler { } /** {@inheritDoc} */ + @Override public void consumeLine(String line) { if (line == null) { out.println(); diff --git a/src/main/java/org/apache/maven/shared/invoker/PrintStreamLogger.java b/src/main/java/org/apache/maven/shared/invoker/PrintStreamLogger.java index 7468cfb..fefe093 100644 --- a/src/main/java/org/apache/maven/shared/invoker/PrintStreamLogger.java +++ b/src/main/java/org/apache/maven/shared/invoker/PrintStreamLogger.java @@ -128,51 +128,61 @@ public class PrintStreamLogger implements InvokerLogger { } /** {@inheritDoc} */ + @Override public void debug(String message) { log(DEBUG, message, null); } /** {@inheritDoc} */ + @Override public void debug(String message, Throwable throwable) { log(DEBUG, message, throwable); } /** {@inheritDoc} */ + @Override public void info(String message) { log(INFO, message, null); } /** {@inheritDoc} */ + @Override public void info(String message, Throwable throwable) { log(INFO, message, throwable); } /** {@inheritDoc} */ + @Override public void warn(String message) { log(WARN, message, null); } /** {@inheritDoc} */ + @Override public void warn(String message, Throwable throwable) { log(WARN, message, throwable); } /** {@inheritDoc} */ + @Override public void error(String message) { log(ERROR, message, null); } /** {@inheritDoc} */ + @Override public void error(String message, Throwable throwable) { log(ERROR, message, throwable); } /** {@inheritDoc} */ + @Override public void fatalError(String message) { log(FATAL, message, null); } /** {@inheritDoc} */ + @Override public void fatalError(String message, Throwable throwable) { log(FATAL, message, throwable); } @@ -182,6 +192,7 @@ public class PrintStreamLogger implements InvokerLogger { * * @return a boolean. */ + @Override public boolean isDebugEnabled() { return threshold >= DEBUG; } @@ -191,6 +202,7 @@ public class PrintStreamLogger implements InvokerLogger { * * @return a boolean. */ + @Override public boolean isErrorEnabled() { return threshold >= ERROR; } @@ -200,6 +212,7 @@ public class PrintStreamLogger implements InvokerLogger { * * @return a boolean. */ + @Override public boolean isFatalErrorEnabled() { return threshold >= FATAL; } @@ -209,6 +222,7 @@ public class PrintStreamLogger implements InvokerLogger { * * @return a boolean. */ + @Override public boolean isInfoEnabled() { return threshold >= INFO; } @@ -218,6 +232,7 @@ public class PrintStreamLogger implements InvokerLogger { * * @return a boolean. */ + @Override public boolean isWarnEnabled() { return threshold >= WARN; } @@ -227,11 +242,13 @@ public class PrintStreamLogger implements InvokerLogger { * * @return a int. */ + @Override public int getThreshold() { return threshold; } /** {@inheritDoc} */ + @Override public void setThreshold(int threshold) { this.threshold = threshold; }
