This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch utils
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/utils by this push:
new f714ef4b06 Make methods private
f714ef4b06 is described below
commit f714ef4b06c941dd6f45acc69b2ffadce4cd9c74
Author: Elliotte Rusty Harold <elh...@ibiblio.org>
AuthorDate: Sat Jan 11 08:10:52 2025 -0500
Make methods private
---
.../org/apache/maven/cling/invoker/BaseParser.java | 15 ++++++++++++-
.../apache/maven/cling/invoker/InvokerUtils.java | 25 ++--------------------
.../maven/cling/invoker/mvn/MavenInvoker.java | 15 ++++++++++++-
3 files changed, 30 insertions(+), 25 deletions(-)
diff --git
a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/BaseParser.java
b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/BaseParser.java
index 8bb2c5079b..99c2595cf6 100644
---
a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/BaseParser.java
+++
b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/BaseParser.java
@@ -33,6 +33,7 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Properties;
+import java.util.ServiceLoader;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -44,6 +45,7 @@ import org.apache.maven.api.cli.Parser;
import org.apache.maven.api.cli.ParserException;
import org.apache.maven.api.cli.ParserRequest;
import org.apache.maven.api.cli.extensions.CoreExtension;
+import org.apache.maven.api.services.model.RootLocator;
import org.apache.maven.cling.internal.extension.io.CoreExtensionsStaxReader;
import org.apache.maven.cling.props.MavenPropertiesLoader;
import org.apache.maven.cling.utils.CLIReportingUtils;
@@ -59,6 +61,17 @@ import static
org.apache.maven.cling.invoker.InvokerUtils.toMap;
public abstract class BaseParser implements Parser {
+ @Nullable
+ private static Path findRoot( Path topDirectory ) {
+ requireNonNull(topDirectory, "topDirectory");
+ Path rootDirectory =
+ ServiceLoader.load(
RootLocator.class).iterator().next().findRoot(topDirectory);
+ if (rootDirectory != null) {
+ return getCanonicalPath(rootDirectory);
+ }
+ return null;
+ }
+
@SuppressWarnings("VisibilityModifier")
public static class LocalContext {
public final ParserRequest parserRequest;
@@ -216,7 +229,7 @@ public abstract class BaseParser implements Parser {
@Nullable
protected Path getRootDirectory(LocalContext context) throws
ParserException {
- return InvokerUtils.findRoot(context.topDirectory);
+ return findRoot(context.topDirectory);
}
protected Map<String, String> populateSystemProperties(LocalContext
context) throws ParserException {
diff --git
a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/InvokerUtils.java
b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/InvokerUtils.java
index 1f0b683a39..5cbb4c0e25 100644
---
a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/InvokerUtils.java
+++
b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/InvokerUtils.java
@@ -23,14 +23,10 @@ import java.nio.file.Path;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import java.util.Optional;
import java.util.Properties;
-import java.util.ServiceLoader;
import java.util.function.Function;
import org.apache.maven.api.annotations.Nonnull;
-import org.apache.maven.api.annotations.Nullable;
-import org.apache.maven.api.services.model.RootLocator;
import org.apache.maven.cling.logging.Slf4jConfiguration;
import org.apache.maven.execution.MavenExecutionRequest;
import org.codehaus.plexus.interpolation.AbstractValueSource;
@@ -41,7 +37,8 @@ import org.codehaus.plexus.logging.Logger;
import static java.util.Objects.requireNonNull;
/**
- * Various utilities.
+ * Various mostly internal utilities used in org.apache.maven.cling.invoker
and its subpackages.
+ * Not documented, tested, or intended for external uses.
*/
public final class InvokerUtils {
private InvokerUtils() {}
@@ -150,22 +147,4 @@ public final class InvokerUtils {
};
}
- @Nullable
- public static Path findRoot(Path topDirectory) {
- requireNonNull(topDirectory, "topDirectory");
- Path rootDirectory =
-
ServiceLoader.load(RootLocator.class).iterator().next().findRoot(topDirectory);
- if (rootDirectory != null) {
- return getCanonicalPath(rootDirectory);
- }
- return null;
- }
-
- @Nonnull
- public static Path findMandatoryRoot(Path topDirectory) {
- requireNonNull(topDirectory, "topDirectory");
- return getCanonicalPath(Optional.ofNullable(
-
ServiceLoader.load(RootLocator.class).iterator().next().findMandatoryRoot(topDirectory))
- .orElseThrow());
- }
}
diff --git
a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/MavenInvoker.java
b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/MavenInvoker.java
index 555abad8a9..0415ea4bbb 100644
---
a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/MavenInvoker.java
+++
b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/MavenInvoker.java
@@ -25,6 +25,8 @@ import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
+import java.util.ServiceLoader;
import java.util.function.Consumer;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -33,6 +35,7 @@ import org.apache.maven.InternalErrorException;
import org.apache.maven.Maven;
import org.apache.maven.api.Constants;
import org.apache.maven.api.MonotonicClock;
+import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.annotations.Nullable;
import org.apache.maven.api.cli.InvokerException;
import org.apache.maven.api.cli.InvokerRequest;
@@ -45,6 +48,7 @@ import org.apache.maven.api.services.ToolchainsBuilder;
import org.apache.maven.api.services.ToolchainsBuilderRequest;
import org.apache.maven.api.services.ToolchainsBuilderResult;
import org.apache.maven.api.services.model.ModelProcessor;
+import org.apache.maven.api.services.model.RootLocator;
import org.apache.maven.cling.event.ExecutionEventLogger;
import org.apache.maven.cling.invoker.InvokerUtils;
import org.apache.maven.cling.invoker.LookupContext;
@@ -72,6 +76,7 @@ import org.eclipse.aether.DefaultRepositoryCache;
import org.eclipse.aether.transfer.TransferListener;
import static java.util.Comparator.comparing;
+import static java.util.Objects.requireNonNull;
/**
* The Maven invoker, that expects whole Maven on classpath and invokes it.
@@ -85,6 +90,14 @@ public class MavenInvoker extends
LookupInvoker<MavenContext> {
super(protoLookup, contextConsumer);
}
+ @Nonnull
+ private static Path findMandatoryRoot( Path topDirectory ) {
+ requireNonNull(topDirectory, "topDirectory");
+ return InvokerUtils.getCanonicalPath( Optional.ofNullable(
+ ServiceLoader.load(
RootLocator.class).iterator().next().findMandatoryRoot(topDirectory))
+ .orElseThrow());
+ }
+
@Override
protected MavenContext createContext(InvokerRequest invokerRequest) throws
InvokerException {
return new MavenContext(invokerRequest);
@@ -252,7 +265,7 @@ public class MavenInvoker extends
LookupInvoker<MavenContext> {
// project present, but we could not determine rootDirectory:
extra work needed
if (context.invokerRequest.rootDirectory().isEmpty()) {
- Path rootDirectory =
InvokerUtils.findMandatoryRoot(context.invokerRequest.topDirectory());
+ Path rootDirectory =
findMandatoryRoot(context.invokerRequest.topDirectory());
request.setMultiModuleProjectDirectory(rootDirectory.toFile());
request.setRootDirectory(rootDirectory);
}
