[
https://issues.apache.org/jira/browse/MNG-7443?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17561410#comment-17561410
]
ASF GitHub Bot commented on MNG-7443:
-------------------------------------
michael-o commented on code in PR #701:
URL: https://github.com/apache/maven/pull/701#discussion_r911843890
##########
maven-core/src/main/java/org/apache/maven/graph/ProjectSelector.java:
##########
@@ -0,0 +1,144 @@
+package org.apache.maven.graph;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.MavenExecutionException;
+import org.apache.maven.execution.MavenExecutionRequest;
+import org.apache.maven.project.MavenProject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
+public final class ProjectSelector
+{
+ private static final Logger LOGGER = LoggerFactory.getLogger(
ProjectSelector.class );
+
+ public Set<MavenProject> getRequiredProjectsBySelectors(
MavenExecutionRequest request, List<MavenProject> projects,
+ Set<String>
projectSelectors )
+ throws MavenExecutionException
+ {
+ Set<MavenProject> selectedProjects = new LinkedHashSet<>();
+ File baseDirectory = getBaseDirectoryFromRequest( request );
+ for ( String selector : projectSelectors )
+ {
+ Optional<MavenProject> optSelectedProject = findOptionalProject(
projects, baseDirectory, selector );
+ if ( !optSelectedProject.isPresent() )
+ {
+ String message = "Could not find the selected project in the
reactor: " + selector;
+ throw new MavenExecutionException( message, request.getPom() );
+ }
+
+ MavenProject selectedProject = optSelectedProject.get();
+
+ selectedProjects.add( selectedProject );
+
+ List<MavenProject> children =
selectedProject.getCollectedProjects();
+ if ( children != null && request.isRecursive() )
+ {
+ selectedProjects.addAll( children );
+ }
+ }
+
+ return selectedProjects;
+ }
+
+ public Set<MavenProject> getOptionalProjectsBySelectors(
MavenExecutionRequest request, List<MavenProject> projects,
+ Set<String>
projectSelectors )
+ {
+ Set<MavenProject> resolvedOptionalProjects = new LinkedHashSet<>();
+ Set<String> unresolvedOptionalSelectors = new HashSet<>();
+ File baseDirectory = getBaseDirectoryFromRequest( request );
+ for ( String selector : projectSelectors )
+ {
+ Optional<MavenProject> optSelectedProject = findOptionalProject(
projects, baseDirectory, selector );
+ if ( optSelectedProject.isPresent() )
+ {
+ resolvedOptionalProjects.add( optSelectedProject.get() );
+ }
+ else
+ {
+ unresolvedOptionalSelectors.add( selector );
+ }
+ }
+
+ if ( !unresolvedOptionalSelectors.isEmpty() )
+ {
+ String message = String.format( "The requested optional projects
[%s] do not exist.",
+ String.join( ",", unresolvedOptionalSelectors ) );
+ LOGGER.info( message );
+ }
+
+ return resolvedOptionalProjects;
+ }
+
+ private Optional<MavenProject> findOptionalProject( List<MavenProject>
projects, File reactorDirectory,
+ String selector )
+ {
+ return projects.stream()
+ .filter( project -> isMatchingProject( project, selector,
reactorDirectory ) )
+ .findFirst();
+ }
+
+ File getBaseDirectoryFromRequest( MavenExecutionRequest request )
+ {
+ return request.getBaseDirectory() != null ? new File(
request.getBaseDirectory() ) : null;
+ }
+
+ boolean isMatchingProject( MavenProject project, String selector, File
reactorDirectory )
+ {
+ // [groupId]:artifactId
+ if ( selector.indexOf( ':' ) >= 0 )
Review Comment:
If you don't need the position, use `contains()`
> Consistent logging between optional projects and optional profiles
> ------------------------------------------------------------------
>
> Key: MNG-7443
> URL: https://issues.apache.org/jira/browse/MNG-7443
> Project: Maven
> Issue Type: Improvement
> Components: Core, Logging
> Affects Versions: 4.0.0-alpha-1
> Reporter: Giovanni van der Schelde
> Priority: Minor
> Attachments: example.png
>
>
> Maven 4 introduces optional profiles and optional projects. However, the
> feedback provided to the user on whether a project or profile has been
> skipped is inconsistent between the two (see image attached).
> For profiles, it will be logged twice: before and after the build.
> For projects, it will be logged once: before the build.
> The idea would be to log the information for skipped optional projects after
> the build as well.
> !example.png!
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
