[MNG-6869] Formatting

apache · mthmulders · Dec 7, 2022 · Dec 7, 2022 · Dec 7, 2022 · Dec 22, 2022
commit fbbcc20cb810e8a183b53b6181e0a1d2c21c14e1
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -1280,18  1280,21 @@ private String determineLocalRepositoryPath(final CliRequest cliRequest) {
         final MavenExecutionRequest request = cliRequest.getRequest();
         if ( cliRequest.commandLine.hasOption( CLIManager.INSTALLATION_STATUS ) )
         {
-            try {
-                return Files.createTempDirectory("mvn-status").toAbsolutePath().toString();
-            } catch (IOException ioe) {
-                final Logger logger = slf4jLoggerFactory.getLogger(getClass().getName());
-                logger.debug("Could not create temporary local repository", ioe);
-                logger.warn("Artifact resolution test is less accurate as it may user earlier resolution results.");
             try
             {
                 return Files.createTempDirectory( "mvn-status" ).toAbsolutePath().toString();
             }
             catch ( IOException ioe )
             {
                 final Logger logger = slf4jLoggerFactory.getLogger( getClass().getName() );
                 logger.debug( "Could not create temporary local repository", ioe );
                 logger.warn( "Artifact resolution test is less accurate as it may user earlier resolution results." );
             }
         }
         else
         {
-            String userDefinedLocalRepo = request.getUserProperties().getProperty(MavenCli.LOCAL_REPO_PROPERTY);
-            if (userDefinedLocalRepo != null)
             String userDefinedLocalRepo = request.getUserProperties().getProperty( MavenCli.LOCAL_REPO_PROPERTY );
             if ( userDefinedLocalRepo != null )
             {
                 return userDefinedLocalRepo;
             }

diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenStatusCommand.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenStatusCommand.java
@@ -74,7  74,7 @@ public class MavenStatusCommand
      * artifact. The Apache Maven artifact was chosen as it eventually, be it by proxy, mirror or directly, will be
      * gathered from the central repository. The version is chosen arbitrarily since any listed should work.
      */
-    private static final Artifact artifact = new DefaultArtifact(
     private static final Artifact APACHE_MAVEN_ARTIFACT = new DefaultArtifact(
             "org.apache.maven",
             "apache-maven",
             null,
@@ -100,7  100,7 @@ public MavenStatusCommand( final PlexusContainer container ) throws ComponentLoo
         sessionScope = container.lookup( SessionScope.class );
     }
 
-    public List<String> verify(CliRequest cliRequest )
     public List<String> verify( CliRequest cliRequest )
             throws Exception
     {
         // Populate the cliRequest with defaults and user settings
@@ -204,44  204,53 @@ private List<String> verifyArtifactResolution( final MavenExecutionRequest maven
         final Session session = this.defaultSessionFactory.getSession(
                 new MavenSession(
                         container,
-                        repoSession.newRepositorySession(mavenExecutionRequest),
                         repoSession.newRepositorySession( mavenExecutionRequest ),
                         mavenExecutionRequest,
                         new DefaultMavenExecutionResult()
                 )
         );
 
         sessionScope.enter();
-        try {
-            sessionScope.seed(DefaultSession.class, (DefaultSession) session);
         try
         {
             sessionScope.seed( DefaultSession.class, (DefaultSession) session );
 
-            final ArtifactCoordinate artifactCoordinate = new DefaultArtifactCoordinate(session, artifact);
-            final ArtifactResolverResult resolverResult = artifactResolver.resolve(session, Collections.singleton(artifactCoordinate));
             ArtifactCoordinate artifactCoordinate = new DefaultArtifactCoordinate( session, APACHE_MAVEN_ARTIFACT );
             ArtifactResolverResult resolverResult = artifactResolver.resolve( session,
                     Collections.singleton( artifactCoordinate ) );
 
-            resolverResult.getArtifacts().forEach((key, value) -> {
-                logger.debug("Successfully resolved {} to {}", key.toString(), value.toString());
-            });
             resolverResult.getArtifacts().forEach( ( key, value ) ->
                 logger.debug( "Successfully resolved {} to {}", key.toString(), value.toString() )
             );
 
             return Collections.emptyList();
-        } catch (ArtifactResolverException are) {
-            return extractErrorMessagesFromArtifactResolverException(are);
-        } finally {
         }
         catch ( ArtifactResolverException are )
         {
             return extractErrorMessagesFromArtifactResolverException( are );
         }
         finally
         {
             sessionScope.exit();
         }
     }
 
-    private List<String> extractErrorMessagesFromArtifactResolverException(final Exception exception) {
     private List<String> extractErrorMessagesFromArtifactResolverException( final Exception exception )
     {
         final boolean isArtifactResolutionException = exception.getCause() instanceof ArtifactResolutionException;
-        if (isArtifactResolutionException)
         if ( isArtifactResolutionException )
         {
             final ArtifactResolutionException are = ( ArtifactResolutionException ) exception.getCause();
             return are.getResults().stream()
                     .map( ArtifactResult::getExceptions )
                     .flatMap( List::stream )
                     .map( ArtifactNotFoundException.class::cast )
                     .map( Throwable::getMessage )
                     .collect( Collectors.toList() );
         }
         else
         {
-            final ArtifactResolutionException are = (ArtifactResolutionException) exception.getCause();
-            return (are).getResults().stream()
-                    .map(ArtifactResult::getExceptions)
-                    .flatMap(List::stream)
-                    .map(ArtifactNotFoundException.class::cast)
-                    .map(Throwable::getMessage)
-                    .collect(Collectors.toList());
-        } else {
-            return Collections.singletonList(exception.getMessage());
             return Collections.singletonList( exception.getMessage() );
         }
     }