You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2020/02/24 22:40:14 UTC
[maven] branch MNG-6656 updated: [MNG-6656] Fix checkstyle errors
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-6656
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/MNG-6656 by this push:
new 0a8d8e6 [MNG-6656] Fix checkstyle errors
0a8d8e6 is described below
commit 0a8d8e655be77065171643e66927a24d306e08ea
Author: rfscholte <rf...@apache.org>
AuthorDate: Mon Feb 24 23:40:05 2020 +0100
[MNG-6656] Fix checkstyle errors
---
.../java/org/apache/maven/project/DefaultProjectBuilder.java | 3 ++-
.../src/main/java/org/apache/maven/project/ReactorModelPool.java | 6 ++++--
.../test/java/org/apache/maven/project/PomConstructionTest.java | 4 ----
.../maven/model/building/DefaultBuildPomXMLFilterFactory.java | 2 +-
.../org/apache/maven/model/building/DefaultModelBuilder.java | 9 +++------
.../org/apache/maven/model/building/ModelSourceTransformer.java | 3 ++-
.../apache/maven/xml/sax/filter/ReactorDependencyXMLFilter.java | 4 ++--
7 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
index 68bab45..53ecfb7 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
@@ -661,7 +661,8 @@ public class DefaultProjectBuilder
}
- private void populateReactorModelPool( ReactorModelPool.Builder reactorModelPool, List<InterimResult> interimResults )
+ private void populateReactorModelPool( ReactorModelPool.Builder reactorModelPool,
+ List<InterimResult> interimResults )
{
for ( InterimResult interimResult : interimResults )
{
diff --git a/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java b/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java
index 048a091..741b150 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java
@@ -54,13 +54,15 @@ class ReactorModelPool
* @throws IllegalStateException if version was null and multiple modules share the same groupId + artifactId
* @throws NoSuchElementException if model could not be found
*/
- public Model get( String groupId, String artifactId, String version ) throws IllegalStateException, NoSuchElementException
+ public Model get( String groupId, String artifactId, String version )
+ throws IllegalStateException, NoSuchElementException
{
// TODO DefaultModelBuilder.readParentExternally still tries to use the ReactorModelPool, should be fixed
// For now, use getOrDefault/orElse instead of get
return modelsByGa.getOrDefault( new GAKey( groupId, artifactId ), Collections.emptyList() ).stream()
.filter( m -> version == null || version.equals( m.getVersion() ) )
- .reduce( ( a, b ) -> {
+ .reduce( ( a, b ) ->
+ {
throw new IllegalStateException( "Multiple modules with key "
+ a.getGroupId() + ':' + a.getArtifactId() );
} ).orElse( null );
diff --git a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
index a639a38..bde7ee3 100644
--- a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
@@ -1882,10 +1882,6 @@ public class PomConstructionTest
repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManagerFactory().newInstance( repoSession, localRepo ) );
config.setRepositorySession( repoSession );
- sessionScope.seed( MavenSession.class, new MavenSession( getContainer(),
- config.getRepositorySession(),
- new DefaultMavenExecutionRequest(), null ) );
-
return new PomTestWrapper( pomFile, projectBuilder.build( pomFile, config ).getProject() );
}
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultBuildPomXMLFilterFactory.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultBuildPomXMLFilterFactory.java
index cc7b3b3..5fcf44f 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultBuildPomXMLFilterFactory.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultBuildPomXMLFilterFactory.java
@@ -70,7 +70,7 @@ public class DefaultBuildPomXMLFilterFactory extends BuildPomXMLFilterFactory
@Override
protected BiFunction<String, String, String> getDependencyKeyToVersionMapper()
{
- return (g,a) -> Optional.ofNullable( context.getRawModel( g, a ) )
+ return (g, a) -> Optional.ofNullable( context.getRawModel( g, a ) )
.map( m -> toVersion( m ) )
.orElse( null );
}
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index 4e71eb2..5231acc 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -40,8 +40,6 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Provider;
import javax.inject.Singleton;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
@@ -96,7 +94,6 @@ import org.apache.maven.xml.sax.filter.BuildPomXMLFilterListener;
import org.codehaus.plexus.interpolation.MapBasedValueSource;
import org.codehaus.plexus.interpolation.StringSearchInterpolator;
import org.eclipse.sisu.Nullable;
-import org.xml.sax.SAXException;
/**
* @author Benjamin Bentmann
@@ -677,9 +674,7 @@ public class DefaultModelBuilder
.setMessage( "Non-readable POM " + modelSource.getLocation() + ": " + msg ).setException( e ) );
throw problems.newModelBuildingException();
}
-
model.setPomFile( pomFile );
-
problems.setSource( model );
modelValidator.validateFileModel( model, request, problems );
@@ -689,7 +684,9 @@ public class DefaultModelBuilder
{
try
{
- Model rawModel = modelProcessor.read( pomFile, Collections.singletonMap( "transformerContext", buildPomXMLFilterFactory ) );
+ Model rawModel =
+ modelProcessor.read( pomFile,
+ Collections.singletonMap( "transformerContext", buildPomXMLFilterFactory ) );
model.setPomFile( pomFile );
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSourceTransformer.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSourceTransformer.java
index b505039..3d215f4 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSourceTransformer.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSourceTransformer.java
@@ -35,5 +35,6 @@ import org.xml.sax.SAXException;
*/
public interface ModelSourceTransformer
{
- InputStream transform( Path pomFile, TransformerContext context ) throws IOException, TransformerConfigurationException, SAXException, ParserConfigurationException;
+ InputStream transform( Path pomFile, TransformerContext context )
+ throws IOException, TransformerConfigurationException, SAXException, ParserConfigurationException;
}
diff --git a/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/ReactorDependencyXMLFilter.java b/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/ReactorDependencyXMLFilter.java
index 6bc2663..6f80f5a 100644
--- a/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/ReactorDependencyXMLFilter.java
+++ b/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/ReactorDependencyXMLFilter.java
@@ -1,7 +1,5 @@
package org.apache.maven.xml.sax.filter;
-import java.util.function.BiFunction;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,6 +19,8 @@ import java.util.function.BiFunction;
* under the License.
*/
+import java.util.function.BiFunction;
+
import org.apache.maven.xml.sax.SAXEventUtils;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;