You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ah...@apache.org on 2013/06/14 10:11:32 UTC
[06/10] git commit: Code cleanup - Various code simplifications (tests, loops, …)
Code cleanup - Various code simplifications (tests, loops, …)
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/9e5183f0
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/9e5183f0
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/9e5183f0
Branch: refs/heads/master
Commit: 9e5183f0ad9dc2bdbf0feaabd9c70a4d26b79382
Parents: 87a5532
Author: Arnaud Héritier <ah...@apache.org>
Authored: Tue Jun 11 22:09:51 2013 +0200
Committer: Arnaud Héritier <ah...@apache.org>
Committed: Tue Jun 11 22:09:51 2013 +0200
----------------------------------------------------------------------
.../maven/artifact/versioning/Restriction.java | 6 +-----
.../metadata/DefaultRepositoryMetadataManager.java | 9 +--------
.../StringSearchModelInterpolator.java | 1 -
.../apache/maven/repository/MetadataGraphNode.java | 2 +-
.../resolver/DefaultArtifactResolverTest.java | 2 +-
.../resolver/filter/ExclusionSetFilter.java | 6 +-----
.../maven/lifecycle/internal/DependencyContext.java | 9 ++-------
.../internal/DefaultPluginVersionResolver.java | 1 -
.../maven/project/artifact/MavenMetadataSource.java | 16 ++++------------
.../model/validation/DefaultModelValidator.java | 8 ++------
.../maven/plugin/descriptor/MojoDescriptor.java | 6 +-----
11 files changed, 14 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/9e5183f0/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java
index 5787def..d73d7ea 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java
@@ -170,12 +170,8 @@ public class Restriction
return false;
}
- if ( upperBoundInclusive != restriction.upperBoundInclusive )
- {
- return false;
- }
+ return upperBoundInclusive == restriction.upperBoundInclusive;
- return true;
}
public String toString()
http://git-wip-us.apache.org/repos/asf/maven/blob/9e5183f0/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
index cbdcf07..c94d24c 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
@@ -122,14 +122,7 @@ public class DefaultRepositoryMetadataManager
+ ") in favor of local copy" );
}
}
- else if ( updateCheckManager.isUpdateRequired( metadata, repository, file ) )
- {
- update = true;
- }
- else
- {
- update = false;
- }
+ else update = updateCheckManager.isUpdateRequired( metadata, repository, file );
if ( update )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/9e5183f0/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
index 68f282b..1ef5579 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
@@ -288,7 +288,6 @@ public class StringSearchModelInterpolator
+ cls.getName()
+ "; it is an unmodifiable collection." );
}
- continue;
}
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/9e5183f0/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraphNode.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraphNode.java b/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraphNode.java
index 22394e7..c8b9ab4 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraphNode.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraphNode.java
@@ -80,7 +80,7 @@ public class MetadataGraphNode
return metadata == null;
}
- return metadata == null ? false : metadata.toString().equals( node2.metadata.toString() );
+ return metadata != null && metadata.toString().equals( node2.metadata.toString() );
}
else
{
http://git-wip-us.apache.org/repos/asf/maven/blob/9e5183f0/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java
index 8e7b284..40d94c2 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java
@@ -68,7 +68,7 @@ public class DefaultArtifactResolverTest
// we want to see all top-level thread groups
ThreadGroup tg = Thread.currentThread().getThreadGroup();
- while ( !( tg.getParent() != null ) )
+ while ( tg.getParent() == null )
{
tg = tg.getParent();
}
http://git-wip-us.apache.org/repos/asf/maven/blob/9e5183f0/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java
index 7d8740b..45ce845 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java
@@ -54,12 +54,8 @@ public class ExclusionSetFilter
id = artifact.getGroupId() + ':' + id;
- if ( excludes.contains( id ) )
- {
- return false;
- }
+ return !excludes.contains( id );
- return true;
}
@Override
http://git-wip-us.apache.org/repos/asf/maven/blob/9e5183f0/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java
index 54e5756..bed9a73 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java
@@ -92,13 +92,8 @@ public class DependencyContext
public boolean isResolutionRequiredForCurrentProject()
{
- if ( lastDependencyArtifacts != project.getDependencyArtifacts()
- || ( lastDependencyArtifacts != null && lastDependencyArtifactCount != lastDependencyArtifacts.size() ) )
- {
- return true;
-
- }
- return false;
+ return lastDependencyArtifacts != project.getDependencyArtifacts() || ( lastDependencyArtifacts != null
+ && lastDependencyArtifactCount != lastDependencyArtifacts.size() );
}
public boolean isResolutionRequiredForAggregatedProjects( Collection<String> scopesToCollect,
http://git-wip-us.apache.org/repos/asf/maven/blob/9e5183f0/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
index 95e0ba8..5efa809 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
@@ -196,7 +196,6 @@ public class DefaultPluginVersionResolver
}
catch ( InvalidVersionSpecificationException e )
{
- continue;
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/9e5183f0/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
index d56fdc6..002134b 100644
--- a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
+++ b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
@@ -734,12 +734,8 @@ public class MavenMetadataSource
{
return true;
}
- if ( e.getCause() instanceof org.eclipse.aether.resolution.ArtifactResolutionException
- && e.getCause().getCause() instanceof ArtifactNotFoundException )
- {
- return true;
- }
- return false;
+ return e.getCause() instanceof org.eclipse.aether.resolution.ArtifactResolutionException
+ && e.getCause().getCause() instanceof ArtifactNotFoundException;
}
private boolean isNonTransferrablePom( Exception e )
@@ -748,12 +744,8 @@ public class MavenMetadataSource
{
return true;
}
- if ( e.getCause() instanceof org.eclipse.aether.resolution.ArtifactResolutionException
- && !( e.getCause().getCause() instanceof ArtifactNotFoundException ) )
- {
- return true;
- }
- return false;
+ return e.getCause() instanceof org.eclipse.aether.resolution.ArtifactResolutionException
+ && !( e.getCause().getCause() instanceof ArtifactNotFoundException );
}
private Properties getSystemProperties()
http://git-wip-us.apache.org/repos/asf/maven/blob/9e5183f0/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
index a1dbb47..67d255f 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
@@ -781,13 +781,9 @@ public class DefaultModelValidator
return false;
}
- if ( !validateBannedCharacters( fieldName, problems, severity, version, string, sourceHint, tracker,
- ILLEGAL_VERSION_CHARS ) )
- {
- return false;
- }
+ return validateBannedCharacters( fieldName, problems, severity, version, string, sourceHint, tracker,
+ ILLEGAL_VERSION_CHARS );
- return true;
}
private boolean validate20ProperSnapshotVersion( String fieldName, ModelProblemCollector problems, Severity severity, Version version,
http://git-wip-us.apache.org/repos/asf/maven/blob/9e5183f0/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
----------------------------------------------------------------------
diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
index 8c3d9da..f084b13 100644
--- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
+++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
@@ -545,12 +545,8 @@ public class MojoDescriptor
return false;
}
- if ( !compareObjects( getGoal(), other.getGoal() ) )
- {
- return false;
- }
+ return compareObjects( getGoal(), other.getGoal() );
- return true;
}
return false;