You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2019/12/10 19:01:00 UTC
[maven] branch REMOVE_DEPRECATED updated: Reformatted.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch REMOVE_DEPRECATED
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/REMOVE_DEPRECATED by this push:
new 03b5eae Reformatted.
03b5eae is described below
commit 03b5eaefadfb1726c5b66e76e03bb7e893bb2193
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Tue Dec 10 20:00:49 2019 +0100
Reformatted.
---
.../maven/project/DefaultProjectBuilder.java | 4 +-
.../org/apache/maven/project/ProjectBuilder.java | 3 +-
.../apache/maven/project/ProjectModelResolver.java | 65 +++++++++++-----------
.../maven/model/building/DefaultModelBuilder.java | 4 +-
.../maven/model/resolution/ModelResolver.java | 21 +++----
.../repository/internal/DefaultModelResolver.java | 6 +-
6 files changed, 49 insertions(+), 54 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 2787a21..58e16cb 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
@@ -132,11 +132,11 @@ public class DefaultProjectBuilder
}
@Override
- public ProjectBuildingResult build(Source modelSource, ProjectBuildingRequest request )
+ public ProjectBuildingResult build( Source modelSource, ProjectBuildingRequest request )
throws ProjectBuildingException
{
return build( null, modelSource,
- new InternalConfig( request, null, useGlobalModelCache() ? getModelCache() : null ) );
+ new InternalConfig( request, null, useGlobalModelCache() ? getModelCache() : null ) );
}
private ProjectBuildingResult build( File pomFile, Source modelSource, InternalConfig config )
diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java
index fdc3202..2dacc62 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java
@@ -74,10 +74,9 @@ public interface ProjectBuilder
* @param request The project building request that holds further parameters, must not be {@code null}.
* @return The result of the project building, never {@code null}.
* @throws ProjectBuildingException If the project descriptor could not be successfully built.
- *
* @see org.apache.maven.model.building.ModelSource2
*/
- ProjectBuildingResult build(Source modelSource, ProjectBuildingRequest request )
+ ProjectBuildingResult build( Source modelSource, ProjectBuildingRequest request )
throws ProjectBuildingException;
/**
diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
index a2be5a1..529d298 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
@@ -49,7 +49,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
-
/**
* A model resolver to assist building of projects. This resolver gives priority to those repositories that have been
* declared in the POM.
@@ -117,7 +116,7 @@ public class ProjectModelResolver
public void addRepository( Repository repository )
throws InvalidRepositoryException
{
- addRepository( repository, false );
+ addRepository( repository, false );
}
@Override
@@ -141,8 +140,8 @@ public class ProjectModelResolver
if ( ProjectBuildingRequest.RepositoryMerging.REQUEST_DOMINANT.equals( repositoryMerging ) )
{
- repositories = remoteRepositoryManager.aggregateRepositories( session, repositories, newRepositories,
- true );
+ repositories =
+ remoteRepositoryManager.aggregateRepositories( session, repositories, newRepositories, true );
}
else
{
@@ -155,10 +154,10 @@ public class ProjectModelResolver
private static void removeMatchingRepository( Iterable<RemoteRepository> repositories, final String id )
{
- Iterator iterator = repositories.iterator( );
+ Iterator iterator = repositories.iterator();
while ( iterator.hasNext() )
{
- RemoteRepository next = ( RemoteRepository ) iterator.next();
+ RemoteRepository next = (RemoteRepository) iterator.next();
if ( next.getId().equals( id ) )
{
iterator.remove();
@@ -171,7 +170,7 @@ public class ProjectModelResolver
return new ProjectModelResolver( this );
}
- public Source resolveModel(String groupId, String artifactId, String version )
+ public Source resolveModel( String groupId, String artifactId, String version )
throws UnresolvableModelException
{
File pomFile = null;
@@ -203,13 +202,13 @@ public class ProjectModelResolver
}
@Override
- public Source resolveModel(final Parent parent )
+ public Source resolveModel( final Parent parent )
throws UnresolvableModelException
{
try
{
- final Artifact artifact = new DefaultArtifact( parent.getGroupId(), parent.getArtifactId(), "", "pom",
- parent.getVersion() );
+ final Artifact artifact =
+ new DefaultArtifact( parent.getGroupId(), parent.getArtifactId(), "", "pom", parent.getVersion() );
final VersionRangeRequest versionRangeRequest = new VersionRangeRequest( artifact, repositories, context );
versionRangeRequest.setTrace( trace );
@@ -218,22 +217,24 @@ public class ProjectModelResolver
if ( versionRangeResult.getHighestVersion() == null )
{
- throw new UnresolvableModelException(
- String.format( "No versions matched the requested parent version range '%s'",
- parent.getVersion() ),
- parent.getGroupId(), parent.getArtifactId(), parent.getVersion() );
+ throw new UnresolvableModelException(
+ String.format( "No versions matched the requested parent version range '%s'",
+ parent.getVersion() ),
+ parent.getGroupId(), parent.getArtifactId(),
+ parent.getVersion() );
}
if ( versionRangeResult.getVersionConstraint() != null
- && versionRangeResult.getVersionConstraint().getRange() != null
- && versionRangeResult.getVersionConstraint().getRange().getUpperBound() == null )
+ && versionRangeResult.getVersionConstraint().getRange() != null
+ && versionRangeResult.getVersionConstraint().getRange().getUpperBound() == null )
{
// Message below is checked for in the MNG-2199 core IT.
- throw new UnresolvableModelException(
- String.format( "The requested parent version range '%s' does not specify an upper bound",
- parent.getVersion() ),
- parent.getGroupId(), parent.getArtifactId(), parent.getVersion() );
+ throw new UnresolvableModelException(
+ String.format( "The requested parent version range '%s' does not specify an upper bound",
+ parent.getVersion() ),
+ parent.getGroupId(), parent.getArtifactId(),
+ parent.getVersion() );
}
@@ -250,7 +251,7 @@ public class ProjectModelResolver
}
@Override
- public Source resolveModel(final Dependency dependency )
+ public Source resolveModel( final Dependency dependency )
throws UnresolvableModelException
{
try
@@ -265,22 +266,24 @@ public class ProjectModelResolver
if ( versionRangeResult.getHighestVersion() == null )
{
- throw new UnresolvableModelException(
- String.format( "No versions matched the requested dependency version range '%s'",
- dependency.getVersion() ),
- dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion() );
+ throw new UnresolvableModelException(
+ String.format( "No versions matched the requested dependency version range '%s'",
+ dependency.getVersion() ),
+ dependency.getGroupId(), dependency.getArtifactId(),
+ dependency.getVersion() );
}
if ( versionRangeResult.getVersionConstraint() != null
- && versionRangeResult.getVersionConstraint().getRange() != null
- && versionRangeResult.getVersionConstraint().getRange().getUpperBound() == null )
+ && versionRangeResult.getVersionConstraint().getRange() != null
+ && versionRangeResult.getVersionConstraint().getRange().getUpperBound() == null )
{
// Message below is checked for in the MNG-4463 core IT.
- throw new UnresolvableModelException(
- String.format( "The requested dependency version range '%s' does not specify an upper bound",
- dependency.getVersion() ),
- dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion() );
+ throw new UnresolvableModelException(
+ String.format( "The requested dependency version range '%s' does not specify an upper bound",
+ dependency.getVersion() ),
+ dependency.getGroupId(), dependency.getArtifactId(),
+ dependency.getVersion() );
}
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 1910c4d..1856457 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
@@ -821,8 +821,8 @@ public class DefaultModelBuilder
return interpolatedModel;
}
- private ModelData readParent(Model childModel, Source childSource, ModelBuildingRequest request,
- DefaultModelProblemCollector problems )
+ private ModelData readParent( Model childModel, Source childSource, ModelBuildingRequest request,
+ DefaultModelProblemCollector problems )
throws ModelBuildingException
{
ModelData parentData;
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java b/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java
index 01aee4d..dac05bd 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java
@@ -43,7 +43,7 @@ public interface ModelResolver
* @return The source of the requested POM, never {@code null}.
* @throws UnresolvableModelException If the POM could not be resolved from any configured repository.
*/
- Source resolveModel(String groupId, String artifactId, String version )
+ Source resolveModel( String groupId, String artifactId, String version )
throws UnresolvableModelException;
/**
@@ -51,17 +51,14 @@ public interface ModelResolver
* <p>
* Unlike the {@link #resolveModel(java.lang.String, java.lang.String, java.lang.String)} method, this method
* supports version ranges and updates the given {@code parent} instance to match the returned {@code ModelSource}.
- * If {@code parent} declares a version range, the version corresponding to the returned {@code ModelSource} will
- * be set on the given {@code parent}.
+ * If {@code parent} declares a version range, the version corresponding to the returned {@code ModelSource} will be
+ * set on the given {@code parent}.
* </p>
*
* @param parent The parent coordinates to resolve, must not be {@code null}.
- *
* @return The source of the requested POM, never {@code null}.
- *
* @throws UnresolvableModelException If the POM could not be resolved from any configured repository.
* @since 3.2.2
- *
* @see Parent#clone()
*/
Source resolveModel( Parent parent )
@@ -77,12 +74,9 @@ public interface ModelResolver
* </p>
*
* @param dependency The dependency coordinates to resolve, must not be {@code null}.
- *
* @return The source of the requested POM, never {@code null}.
- *
* @throws UnresolvableModelException If the POM could not be resolved from any configured repository.
* @since 3.5.0
- *
* @see Dependency#clone()
*/
Source resolveModel( Dependency dependency )
@@ -102,16 +96,15 @@ public interface ModelResolver
/**
* Adds a repository to use for subsequent resolution requests. The order in which repositories are added matters,
* repositories that were added first should also be searched first. When multiple repositories with the same
- * identifier are added, then the value of the replace argument is determines the behaviour.
- *
- * If replace is false than any existing repository with the same Id will remain in use. If replace
- * is true the new repository replaces the original.
+ * identifier are added, then the value of the replace argument is determines the behaviour. If replace is false
+ * than any existing repository with the same Id will remain in use. If replace is true the new repository replaces
+ * the original.
*
* @param repository The repository to add to the internal search chain, must not be {@code null}.
* @throws InvalidRepositoryException If the repository could not be added (e.g. due to invalid URL or layout).
*/
void addRepository( Repository repository, boolean replace )
- throws InvalidRepositoryException;
+ throws InvalidRepositoryException;
/**
* Clones this resolver for usage in a forked resolution process. In general, implementors need not provide a deep
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
index 9120be3..0c0b901 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
@@ -160,7 +160,7 @@ class DefaultModelResolver
}
@Override
- public Source resolveModel(String groupId, String artifactId, String version )
+ public Source resolveModel( String groupId, String artifactId, String version )
throws UnresolvableModelException
{
Artifact pomArtifact = new DefaultArtifact( groupId, artifactId, "", "pom", version );
@@ -182,7 +182,7 @@ class DefaultModelResolver
}
@Override
- public Source resolveModel(final Parent parent )
+ public Source resolveModel( final Parent parent )
throws UnresolvableModelException
{
try
@@ -230,7 +230,7 @@ class DefaultModelResolver
}
@Override
- public Source resolveModel(final Dependency dependency )
+ public Source resolveModel( final Dependency dependency )
throws UnresolvableModelException
{
try