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 2019/04/25 06:33:45 UTC
[maven-resolver] 01/02: [MRESOLVER-88] Code style fixes
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MRESOLVER-88
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
commit e21028fe6777a3714cac240de8c0061ffd79160a
Author: Sylwester Lachiewicz <sl...@gmail.com>
AuthorDate: Thu Oct 11 10:51:46 2018 +0200
[MRESOLVER-88] Code style fixes
---
.../java/org/eclipse/aether/graph/DefaultDependencyNode.java | 10 ++++++----
.../java/org/eclipse/aether/repository/RemoteRepository.java | 6 ++++--
.../eclipse/aether/resolution/ArtifactDescriptorResult.java | 3 ++-
.../org/eclipse/aether/transfer/ChecksumFailureException.java | 3 ++-
.../eclipse/aether/internal/test/util/TestVersionRange.java | 3 ++-
.../aether/util/graph/transformer/ConflictResolver.java | 9 ++++++---
.../aether/util/graph/version/HighestVersionFilter.java | 3 ++-
.../org/eclipse/aether/util/version/GenericVersionRange.java | 3 ++-
.../org/eclipse/aether/util/version/UnionVersionRange.java | 3 ++-
9 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/graph/DefaultDependencyNode.java b/maven-resolver-api/src/main/java/org/eclipse/aether/graph/DefaultDependencyNode.java
index c0c767a..234f442 100644
--- a/maven-resolver-api/src/main/java/org/eclipse/aether/graph/DefaultDependencyNode.java
+++ b/maven-resolver-api/src/main/java/org/eclipse/aether/graph/DefaultDependencyNode.java
@@ -70,8 +70,9 @@ public final class DefaultDependencyNode
{
this.dependency = dependency;
artifact = ( dependency != null ) ? dependency.getArtifact() : null;
- children = new ArrayList<>( 0 );
- aliases = relocations = Collections.emptyList();
+ children = new ArrayList<DependencyNode>( 0 );
+ aliases = Collections.emptyList();
+ relocations = Collections.emptyList();
repositories = Collections.emptyList();
context = "";
data = Collections.emptyMap();
@@ -87,8 +88,9 @@ public final class DefaultDependencyNode
public DefaultDependencyNode( Artifact artifact )
{
this.artifact = artifact;
- children = new ArrayList<>( 0 );
- aliases = relocations = Collections.emptyList();
+ children = new ArrayList<DependencyNode>( 0 );
+ aliases = Collections.emptyList();
+ relocations = Collections.emptyList();
repositories = Collections.emptyList();
context = "";
data = Collections.emptyMap();
diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/RemoteRepository.java b/maven-resolver-api/src/main/java/org/eclipse/aether/repository/RemoteRepository.java
index f20461e..eb57588 100644
--- a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/RemoteRepository.java
+++ b/maven-resolver-api/src/main/java/org/eclipse/aether/repository/RemoteRepository.java
@@ -104,7 +104,8 @@ public final class RemoteRepository
}
else
{
- protocol = host = "";
+ protocol = "";
+ host = "";
}
}
@@ -427,7 +428,8 @@ public final class RemoteRepository
*/
public Builder setPolicy( RepositoryPolicy policy )
{
- this.releasePolicy = this.snapshotPolicy = ( policy != null ) ? policy : DEFAULT_POLICY;
+ this.releasePolicy = ( policy != null ) ? policy : DEFAULT_POLICY;
+ this.snapshotPolicy = ( policy != null ) ? policy : DEFAULT_POLICY;
if ( prototype != null )
{
delta( RELEASES, this.releasePolicy, prototype.getPolicy( false ) );
diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorResult.java b/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorResult.java
index 0af4f6f..490b57e 100644
--- a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorResult.java
+++ b/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorResult.java
@@ -73,7 +73,8 @@ public final class ArtifactDescriptorResult
exceptions = Collections.emptyList();
relocations = Collections.emptyList();
aliases = Collections.emptyList();
- dependencies = managedDependencies = Collections.emptyList();
+ dependencies = Collections.emptyList();
+ managedDependencies = Collections.emptyList();
repositories = Collections.emptyList();
properties = Collections.emptyMap();
}
diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/ChecksumFailureException.java b/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/ChecksumFailureException.java
index 1dbc6b0..43944b6 100644
--- a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/ChecksumFailureException.java
+++ b/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/ChecksumFailureException.java
@@ -93,7 +93,8 @@ public class ChecksumFailureException
public ChecksumFailureException( boolean retryWorthy, String message, Throwable cause )
{
super( message, cause );
- expected = actual = "";
+ expected = "";
+ actual = "";
this.retryWorthy = retryWorthy;
}
diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionRange.java b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionRange.java
index 52fb45d..750a63f 100644
--- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionRange.java
+++ b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionRange.java
@@ -91,7 +91,8 @@ final class TestVersionRange
+ ", single version must be surrounded by []" );
}
- lowerBound = upperBound = new TestVersion( process.trim() );
+ lowerBound = new TestVersion( process.trim() );
+ upperBound = new TestVersion( process.trim() );
}
else
{
diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictResolver.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictResolver.java
index cd6cdf2..168d80d 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictResolver.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictResolver.java
@@ -519,7 +519,8 @@ public final class ConflictResolver
void prepare( Object conflictId, Collection<Object> cyclicPredecessors )
{
- currentId = conflictCtx.conflictId = conflictId;
+ currentId = conflictId;
+ conflictCtx.conflictId = conflictId;
conflictCtx.winner = null;
conflictCtx.scope = null;
conflictCtx.optional = null;
@@ -710,7 +711,8 @@ public final class ConflictResolver
private void scopes( int parent, Dependency child )
{
scopeCtx.parentScope = ( parent > 0 ) ? parentScopes.get( parent - 1 ) : null;
- scopeCtx.derivedScope = scopeCtx.childScope = scope( child );
+ scopeCtx.derivedScope = scope( child );
+ scopeCtx.childScope = scope( child );
}
private String scope( Dependency dependency )
@@ -760,7 +762,8 @@ public final class ConflictResolver
public ScopeContext( String parentScope, String childScope )
{
this.parentScope = ( parentScope != null ) ? parentScope : "";
- derivedScope = this.childScope = ( childScope != null ) ? childScope : "";
+ derivedScope = ( childScope != null ) ? childScope : "";
+ this.childScope = ( childScope != null ) ? childScope : "";
}
/**
diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/version/HighestVersionFilter.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/version/HighestVersionFilter.java
index 902e08d..0731c46 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/version/HighestVersionFilter.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/version/HighestVersionFilter.java
@@ -45,7 +45,8 @@ public final class HighestVersionFilter
for ( boolean hasNext = it.hasNext(); hasNext; )
{
it.next();
- if ( hasNext = it.hasNext() )
+ hasNext = it.hasNext();
+ if ( hasNext )
{
it.remove();
}
diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersionRange.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersionRange.java
index 660cc7a..bd7cc34 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersionRange.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersionRange.java
@@ -99,7 +99,8 @@ final class GenericVersionRange
}
else
{
- lowerBound = upperBound = parse( version );
+ lowerBound = parse( version );
+ upperBound = lowerBound ;
}
}
else
diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/UnionVersionRange.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/UnionVersionRange.java
index 42757cb..b9fec1e 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/UnionVersionRange.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/UnionVersionRange.java
@@ -64,7 +64,8 @@ final class UnionVersionRange
if ( ranges == null || ranges.isEmpty() )
{
this.ranges = Collections.emptySet();
- lowerBound = upperBound = null;
+ lowerBound = null;
+ upperBound = null;
}
else
{