You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2020/01/25 23:54:53 UTC
[maven] 03/04: Simplify some code
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch simplify_code
in repository https://gitbox.apache.org/repos/asf/maven.git
commit c3b26347b196e428d05904356615bdc787058a00
Author: Lipmanpoi <ch...@foxmal.com>
AuthorDate: Sat Aug 17 01:44:56 2019 +0800
Simplify some code
Closes #279
---
.../plugin/version/PluginVersionResolutionException.java | 12 ++++++------
.../org/apache/maven/repository/ArtifactTransferEvent.java | 6 +-----
.../maven/cli/transfer/AbstractMavenTransferListener.java | 2 +-
.../org/apache/maven/model/building/DefaultModelBuilder.java | 8 ++++----
4 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java
index dd14b30..c1b5ccf 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java
@@ -82,29 +82,29 @@ public class PluginVersionResolutionException
private static String format( LocalRepository localRepository, List<RemoteRepository> remoteRepositories )
{
- String repos = "[";
+ StringBuilder repos = new StringBuilder( "[" );
if ( localRepository != null )
{
- repos += localRepository.getId() + " (" + localRepository.getBasedir() + ")";
+ repos.append( localRepository.getId() ).append( " (" ).append( localRepository.getBasedir() ).append( ")" );
}
if ( remoteRepositories != null && !remoteRepositories.isEmpty() )
{
for ( RemoteRepository repository : remoteRepositories )
{
- repos += ", ";
+ repos.append( ", " );
if ( repository != null )
{
- repos += repository.getId() + " (" + repository.getUrl() + ")";
+ repos.append( repository.getId() ).append( " (" ).append( repository.getUrl() ).append( ")" );
}
}
}
- repos += "]";
+ repos.append( "]" );
- return repos;
+ return repos.toString();
}
}
diff --git a/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java b/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java
index c8150ec..2b28a06 100644
--- a/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java
+++ b/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java
@@ -330,11 +330,7 @@ public class ArtifactTransferEvent
{
return false;
}
- else if ( !source.equals( other.source ) )
- {
- return false;
- }
- return true;
+ else return source.equals(other.source);
}
}
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java
index 984902e..72bffc3 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java
@@ -192,7 +192,7 @@ public abstract class AbstractMavenTransferListener
public String formatProgress( long progressedSize, long size )
{
Validate.isTrue( progressedSize >= 0L, "progressed file size cannot be negative: %s", progressedSize );
- Validate.isTrue( size >= 0L && progressedSize <= size || size < 0L,
+ Validate.isTrue( size < 0L || progressedSize <= size,
"progressed file size cannot be greater than size: %s > %s", progressedSize, size );
if ( size >= 0L && progressedSize != size )
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 6676d3a..2d01e126 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
@@ -360,15 +360,15 @@ public class DefaultModelBuilder
}
else if ( !parentIds.add( parentData.getId() ) )
{
- String message = "The parents form a cycle: ";
+ StringBuilder message = new StringBuilder( "The parents form a cycle: " );
for ( String modelId : parentIds )
{
- message += modelId + " -> ";
+ message.append( modelId ).append( " -> " );
}
- message += parentData.getId();
+ message.append( parentData.getId() );
problems.add( new ModelProblemCollectorRequest( ModelProblem.Severity.FATAL, ModelProblem.Version.BASE )
- .setMessage( message ) );
+ .setMessage( message.toString() ) );
throw problems.newModelBuildingException();
}