You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2022/01/19 10:04:58 UTC
[maven-resolver] branch checksums updated: Renames
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch checksums
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
The following commit(s) were added to refs/heads/checksums by this push:
new 4dcf844 Renames
4dcf844 is described below
commit 4dcf844066289ed8c3835aac288c3bbf80cfd9dc
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Wed Jan 19 11:04:48 2022 +0100
Renames
---
.../connector/basic/BasicRepositoryConnector.java | 22 +++++++++++-----------
.../aether/connector/basic/ChecksumCalculator.java | 14 +++++++-------
.../aether/connector/basic/ChecksumValidator.java | 18 +++++++++---------
.../connector/basic/ChecksumCalculatorTest.java | 6 +++---
.../impl/Maven2RepositoryLayoutFactory.java | 6 +++---
5 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnector.java b/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnector.java
index 9037498..e2581a8 100644
--- a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnector.java
+++ b/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnector.java
@@ -517,12 +517,12 @@ final class BasicRepositoryConnector
private final FileTransformer fileTransformer;
- private final Collection<RepositoryLayout.ChecksumLocation> checksums;
+ private final Collection<RepositoryLayout.ChecksumLocation> checksumLocations;
- PutTaskRunner( URI path, File file, List<RepositoryLayout.ChecksumLocation> checksums,
+ PutTaskRunner( URI path, File file, List<RepositoryLayout.ChecksumLocation> checksumLocations,
TransferTransportListener<?> listener )
{
- this( path, file, null, checksums, listener );
+ this( path, file, null, checksumLocations, listener );
}
/**
@@ -532,17 +532,17 @@ final class BasicRepositoryConnector
* @param path
* @param file
* @param fileTransformer
- * @param checksums
+ * @param checksumLocations
* @param listener
*/
PutTaskRunner( URI path, File file, FileTransformer fileTransformer,
- List<RepositoryLayout.ChecksumLocation> checksums,
+ List<RepositoryLayout.ChecksumLocation> checksumLocations,
TransferTransportListener<?> listener )
{
super( path, listener );
this.file = requireNonNull( file, "source file cannot be null" );
this.fileTransformer = fileTransformer;
- this.checksums = safe( checksums );
+ this.checksumLocations = safe( checksumLocations );
}
@SuppressWarnings( "checkstyle:innerassignment" )
@@ -581,14 +581,14 @@ final class BasicRepositoryConnector
*/
private void uploadChecksums( File file, byte[] bytes )
{
- if ( checksums.isEmpty() )
+ if ( checksumLocations.isEmpty() )
{
return;
}
try
{
ArrayList<ChecksumAlgorithmFactory> algorithms = new ArrayList<>();
- for ( RepositoryLayout.ChecksumLocation checksumLocation : checksums )
+ for ( RepositoryLayout.ChecksumLocation checksumLocation : checksumLocations )
{
algorithms.add( checksumLocation.getChecksumAlgorithmFactory() );
}
@@ -603,10 +603,10 @@ final class BasicRepositoryConnector
sumsByAlgo = ChecksumAlgorithmHelper.calculate( file, algorithms );
}
- for ( RepositoryLayout.ChecksumLocation checksum : checksums )
+ for ( RepositoryLayout.ChecksumLocation checksumLocation : checksumLocations )
{
- uploadChecksum( checksum.getLocation(),
- sumsByAlgo.get( checksum.getChecksumAlgorithmFactory().getName() ) );
+ uploadChecksum( checksumLocation.getLocation(),
+ sumsByAlgo.get( checksumLocation.getChecksumAlgorithmFactory().getName() ) );
}
}
catch ( IOException e )
diff --git a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumCalculator.java b/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumCalculator.java
index a658a1d..2cda272 100644
--- a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumCalculator.java
+++ b/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumCalculator.java
@@ -91,25 +91,25 @@ final class ChecksumCalculator
private final File targetFile;
public static ChecksumCalculator newInstance( File targetFile,
- Collection<RepositoryLayout.ChecksumLocation> checksums )
+ Collection<RepositoryLayout.ChecksumLocation> checksumLocations )
{
- if ( checksums == null || checksums.isEmpty() )
+ if ( checksumLocations == null || checksumLocations.isEmpty() )
{
return null;
}
- return new ChecksumCalculator( targetFile, checksums );
+ return new ChecksumCalculator( targetFile, checksumLocations );
}
private ChecksumCalculator( File targetFile,
- Collection<RepositoryLayout.ChecksumLocation> checksums )
+ Collection<RepositoryLayout.ChecksumLocation> checksumLocations )
{
this.checksums = new ArrayList<>();
Set<String> algos = new HashSet<>();
- for ( RepositoryLayout.ChecksumLocation checksum : checksums )
+ for ( RepositoryLayout.ChecksumLocation checksumLocation : checksumLocations )
{
- if ( algos.add( checksum.getChecksumAlgorithmFactory().getName() ) )
+ if ( algos.add( checksumLocation.getChecksumAlgorithmFactory().getName() ) )
{
- this.checksums.add( new Checksum( checksum.getChecksumAlgorithmFactory() ) );
+ this.checksums.add( new Checksum( checksumLocation.getChecksumAlgorithmFactory() ) );
}
}
this.targetFile = targetFile;
diff --git a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumValidator.java b/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumValidator.java
index ce9b955..b08d69e 100644
--- a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumValidator.java
+++ b/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumValidator.java
@@ -62,7 +62,7 @@ final class ChecksumValidator
private final ChecksumPolicy checksumPolicy;
- private final Collection<ChecksumLocation> checksums;
+ private final Collection<ChecksumLocation> checksumLocations;
private final Map<File, Object> checksumFiles;
@@ -70,14 +70,14 @@ final class ChecksumValidator
FileProcessor fileProcessor,
ChecksumFetcher checksumFetcher,
ChecksumPolicy checksumPolicy,
- Collection<ChecksumLocation> checksums )
+ Collection<ChecksumLocation> checksumLocations )
{
this.dataFile = dataFile;
this.tempFiles = new HashSet<>();
this.fileProcessor = fileProcessor;
this.checksumFetcher = checksumFetcher;
this.checksumPolicy = checksumPolicy;
- this.checksums = checksums;
+ this.checksumLocations = checksumLocations;
this.checksumFiles = new HashMap<>();
}
@@ -85,7 +85,7 @@ final class ChecksumValidator
{
if ( checksumPolicy != null )
{
- return ChecksumCalculator.newInstance( targetFile, checksums );
+ return ChecksumCalculator.newInstance( targetFile, checksumLocations );
}
return null;
}
@@ -119,7 +119,7 @@ final class ChecksumValidator
{
continue;
}
- ChecksumLocation checksumLocation = checksums.stream()
+ ChecksumLocation checksumLocation = checksumLocations.stream()
.filter( a -> a.getChecksumAlgorithmFactory().getName().equals( algo ) )
.findFirst()
.orElse( null );
@@ -149,9 +149,9 @@ final class ChecksumValidator
private boolean validateExternalChecksums( Map<String, ?> actualChecksums )
throws ChecksumFailureException
{
- for ( ChecksumLocation checksum : checksums )
+ for ( ChecksumLocation checksumLocation : checksumLocations )
{
- ChecksumAlgorithmFactory factory = checksum.getChecksumAlgorithmFactory();
+ ChecksumAlgorithmFactory factory = checksumLocation.getChecksumAlgorithmFactory();
Object calculated = actualChecksums.get( factory.getName() );
if ( calculated instanceof Exception )
{
@@ -161,11 +161,11 @@ final class ChecksumValidator
}
try
{
- File checksumFile = getChecksumFile( checksum.getChecksumAlgorithmFactory() );
+ File checksumFile = getChecksumFile( checksumLocation.getChecksumAlgorithmFactory() );
File tmp = createTempFile( checksumFile );
try
{
- if ( !checksumFetcher.fetchChecksum( checksum.getLocation(), tmp ) )
+ if ( !checksumFetcher.fetchChecksum( checksumLocation.getLocation(), tmp ) )
{
continue;
}
diff --git a/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumCalculatorTest.java b/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumCalculatorTest.java
index d8bcee3..818de7c 100644
--- a/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumCalculatorTest.java
+++ b/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumCalculatorTest.java
@@ -48,12 +48,12 @@ public class ChecksumCalculatorTest
private ChecksumCalculator newCalculator( String... algos )
{
- List<RepositoryLayout.ChecksumLocation> checksums = new ArrayList<>();
+ List<RepositoryLayout.ChecksumLocation> checksumLocations = new ArrayList<>();
for ( String algo : algos )
{
- checksums.add( new RepositoryLayout.ChecksumLocation( URI.create( "irrelevant" ), selector.select( algo ) ) );
+ checksumLocations.add( new RepositoryLayout.ChecksumLocation( URI.create( "irrelevant" ), selector.select( algo ) ) );
}
- return ChecksumCalculator.newInstance( file, checksums );
+ return ChecksumCalculator.newInstance( file, checksumLocations );
}
private ByteBuffer toBuffer( String data )
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactory.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactory.java
index b50e3d8..9e4e873 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactory.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactory.java
@@ -218,12 +218,12 @@ public final class Maven2RepositoryLayoutFactory
private List<ChecksumLocation> getChecksums( URI location )
{
- List<ChecksumLocation> checksums = new ArrayList<>( checksumAlgorithms.size() );
+ List<ChecksumLocation> checksumLocations = new ArrayList<>( checksumAlgorithms.size() );
for ( ChecksumAlgorithmFactory checksumAlgorithmFactory : checksumAlgorithms )
{
- checksums.add( ChecksumLocation.forLocation( location, checksumAlgorithmFactory ) );
+ checksumLocations.add( ChecksumLocation.forLocation( location, checksumAlgorithmFactory ) );
}
- return checksums;
+ return checksumLocations;
}
}