You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2016/10/31 23:36:05 UTC
maven-resolver git commit: Avoid implicit type casts to long or float
Repository: maven-resolver
Updated Branches:
refs/heads/master b36a2bff2 -> 03d574822
Avoid implicit type casts to long or float
Project: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/03d57482
Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/03d57482
Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/03d57482
Branch: refs/heads/master
Commit: 03d5748228e3635fc2c1b98f17b381cfc61f1ac5
Parents: b36a2bf
Author: Michael Osipov <mi...@apache.org>
Authored: Tue Nov 1 00:35:27 2016 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Tue Nov 1 00:35:27 2016 +0100
----------------------------------------------------------------------
.../eclipse/aether/transfer/TransferEvent.java | 8 +-
.../aether/transfer/TransferResource.java | 4 +-
.../aether/DefaultRepositoryCacheTest.java | 2 +-
.../eclipse/aether/DefaultSessionDataTest.java | 2 +-
.../basic/BasicRepositoryConnector.java | 2 +-
.../connector/basic/ChecksumCalculator.java | 4 +-
.../aether/connector/basic/PartialFile.java | 6 +-
.../aether/connector/basic/PartialFileTest.java | 14 +--
.../internal/impl/DefaultFileProcessor.java | 4 +-
.../impl/DefaultUpdateCheckManager.java | 8 +-
.../impl/DefaultVersionFilterContext.java | 8 +-
.../EnhancedLocalRepositoryManagerFactory.java | 2 +-
.../internal/impl/TrackingFileManager.java | 2 +-
.../internal/impl/DefaultFileProcessorTest.java | 4 +-
.../impl/DefaultUpdateCheckManagerTest.java | 8 +-
.../EnhancedLocalRepositoryManagerTest.java | 6 +-
.../internal/impl/StaticUpdateCheckManager.java | 4 +-
.../transport/AbstractTransporter.java | 2 +-
.../internal/test/util/TestFileProcessor.java | 2 +-
.../internal/test/util/TestFileUtils.java | 2 +-
.../classpath/ClasspathTransporterTest.java | 20 ++--
.../transport/file/FileTransporterTest.java | 48 ++++----
.../aether/transport/http/HttpTransporter.java | 12 +-
.../transport/http/HttpTransporterFactory.java | 2 +-
.../aether/transport/http/HttpServer.java | 10 +-
.../transport/http/HttpTransporterTest.java | 118 +++++++++----------
.../wagon/WagonTransporterFactory.java | 2 +-
.../wagon/AbstractWagonTransporterTest.java | 40 +++----
.../eclipse/aether/util/ConfigUtilsTest.java | 10 +-
29 files changed, 178 insertions(+), 178 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/03d57482/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/TransferEvent.java
----------------------------------------------------------------------
diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/TransferEvent.java b/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/TransferEvent.java
index 1599a82..a78b6e3 100644
--- a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/TransferEvent.java
+++ b/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/TransferEvent.java
@@ -300,7 +300,7 @@ public final class TransferEvent
{
case INITIATED:
case STARTED:
- transferredBytes = 0;
+ transferredBytes = 0L;
default:
}
return this;
@@ -352,7 +352,7 @@ public final class TransferEvent
*/
public Builder setTransferredBytes( long transferredBytes )
{
- if ( transferredBytes < 0 )
+ if ( transferredBytes < 0L )
{
throw new IllegalArgumentException( "number of transferred bytes cannot be negative" );
}
@@ -362,14 +362,14 @@ public final class TransferEvent
/**
* Increments the total number of bytes that have been transferred so far during the download/upload.
- *
+ *
* @param transferredBytes The number of bytes that have been transferred since the last event, must not be
* negative.
* @return This event builder for chaining, never {@code null}.
*/
public Builder addTransferredBytes( long transferredBytes )
{
- if ( transferredBytes < 0 )
+ if ( transferredBytes < 0L )
{
throw new IllegalArgumentException( "number of transferred bytes cannot be negative" );
}
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/03d57482/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/TransferResource.java
----------------------------------------------------------------------
diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/TransferResource.java b/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/TransferResource.java
index 3395f38..f2e2135 100644
--- a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/TransferResource.java
+++ b/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/TransferResource.java
@@ -41,7 +41,7 @@ public final class TransferResource
private final RequestTrace trace;
- private long contentLength = -1;
+ private long contentLength = -1L;
private long resumeOffset;
@@ -186,7 +186,7 @@ public final class TransferResource
*/
public TransferResource setResumeOffset( long resumeOffset )
{
- if ( resumeOffset < 0 )
+ if ( resumeOffset < 0L )
{
throw new IllegalArgumentException( "resume offset cannot be negative" );
}
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/03d57482/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultRepositoryCacheTest.java
----------------------------------------------------------------------
diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultRepositoryCacheTest.java b/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultRepositoryCacheTest.java
index ad5dfc5..067320e 100644
--- a/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultRepositoryCacheTest.java
+++ b/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultRepositoryCacheTest.java
@@ -68,7 +68,7 @@ public class DefaultRepositoryCacheTest
assertNull( get( key ) );
}
- @Test( timeout = 10000 )
+ @Test( timeout = 10000L )
public void testConcurrency()
throws Exception
{
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/03d57482/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultSessionDataTest.java
----------------------------------------------------------------------
diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultSessionDataTest.java b/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultSessionDataTest.java
index 58f3649..3b886e5 100644
--- a/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultSessionDataTest.java
+++ b/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultSessionDataTest.java
@@ -94,7 +94,7 @@ public class DefaultSessionDataTest
assertNull( get( key ) );
}
- @Test( timeout = 10000 )
+ @Test( timeout = 10000L )
public void testConcurrency()
throws Exception
{
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/03d57482/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnector.java
----------------------------------------------------------------------
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 4d8a8cf..4f2e37e 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
@@ -166,7 +166,7 @@ final class BasicRepositoryConnector
if ( executor == null )
{
executor =
- new ThreadPoolExecutor( maxThreads, maxThreads, 3, TimeUnit.SECONDS,
+ new ThreadPoolExecutor( maxThreads, maxThreads, 3L, TimeUnit.SECONDS,
new LinkedBlockingQueue<Runnable>(),
new WorkerThreadFactory( getClass().getSimpleName() + '-'
+ repository.getHost() + '-' ) );
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/03d57482/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumCalculator.java
----------------------------------------------------------------------
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 89ba6f0..03868d3 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
@@ -135,7 +135,7 @@ final class ChecksumCalculator
{
checksum.reset();
}
- if ( dataOffset <= 0 )
+ if ( dataOffset <= 0L )
{
return;
}
@@ -144,7 +144,7 @@ final class ChecksumCalculator
FileInputStream fis = new FileInputStream( targetFile );
try
{
- long total = 0;
+ long total = 0L;
ByteBuffer buffer = ByteBuffer.allocate( 1024 * 32 );
for ( byte[] array = buffer.array(); total < dataOffset; )
{
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/03d57482/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/PartialFile.java
----------------------------------------------------------------------
diff --git a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/PartialFile.java b/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/PartialFile.java
index 217ab5e..5a93a2c 100644
--- a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/PartialFile.java
+++ b/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/PartialFile.java
@@ -75,7 +75,7 @@ final class PartialFile
boolean interrupted = false;
try
{
- for ( long lastLength = -1, lastTime = 0;; )
+ for ( long lastLength = -1L, lastTime = 0L;; )
{
FileLock lock = tryLock( lockFile );
if ( lock != null )
@@ -87,7 +87,7 @@ final class PartialFile
long currentTime = System.currentTimeMillis();
if ( currentLength != lastLength )
{
- if ( lastLength < 0 )
+ if ( lastLength < 0L )
{
concurrent[0] = true;
/*
@@ -109,7 +109,7 @@ final class PartialFile
try
{
- Thread.sleep( 100 );
+ Thread.sleep( 100L );
}
catch ( InterruptedException e )
{
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/03d57482/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/PartialFileTest.java
----------------------------------------------------------------------
diff --git a/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/PartialFileTest.java b/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/PartialFileTest.java
index edfeee9..c6fd022 100644
--- a/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/PartialFileTest.java
+++ b/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/PartialFileTest.java
@@ -111,7 +111,7 @@ public class PartialFileTest
{
for ( long start = System.currentTimeMillis(); System.currentTimeMillis() - start < sleep; )
{
- Thread.sleep( 10 );
+ Thread.sleep( 10L );
}
fos.write( 65 );
fos.flush();
@@ -168,7 +168,7 @@ public class PartialFileTest
throws Exception
{
PartialFile.Factory factory =
- new PartialFile.Factory( resumeThreshold >= 0, resumeThreshold, requestTimeout,
+ new PartialFile.Factory( resumeThreshold >= 0L, resumeThreshold, requestTimeout,
new TestLoggerFactory().getLogger( "" ) );
PartialFile partFile = factory.newInstance( dstFile, remoteAccessChecker );
if ( partFile != null )
@@ -257,7 +257,7 @@ public class PartialFileTest
partialFile.close();
}
- @Test( timeout = 10000 )
+ @Test( timeout = 10000L )
public void testResumeConcurrently_RequestTimeout()
throws Exception
{
@@ -276,12 +276,12 @@ public class PartialFileTest
writer.join();
}
- @Test( timeout = 10000 )
+ @Test( timeout = 10000L )
public void testResumeConcurrently_AwaitCompletion_ConcurrentWriterSucceeds()
throws Exception
{
assumeTrue( PROPER_LOCK_SUPPORT );
- assertTrue( dstFile.setLastModified( System.currentTimeMillis() - 60 * 1000 ) );
+ assertTrue( dstFile.setLastModified( System.currentTimeMillis() - 60L * 1000L ) );
ConcurrentWriter writer = new ConcurrentWriter( dstFile, 100, 10 );
assertNull( newPartialFile( 0, 500 ) );
writer.join();
@@ -289,7 +289,7 @@ public class PartialFileTest
assertEquals( 1, remoteAccessChecker.invocations );
}
- @Test( timeout = 10000 )
+ @Test( timeout = 10000L )
public void testResumeConcurrently_AwaitCompletion_ConcurrentWriterFails()
throws Exception
{
@@ -304,7 +304,7 @@ public class PartialFileTest
assertEquals( 1, remoteAccessChecker.invocations );
}
- @Test( timeout = 10000 )
+ @Test( timeout = 10000L )
public void testResumeConcurrently_CheckRemoteAccess()
throws Exception
{
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/03d57482/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultFileProcessor.java
----------------------------------------------------------------------
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultFileProcessor.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultFileProcessor.java
index 5f3e5c3..389a806 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultFileProcessor.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultFileProcessor.java
@@ -155,7 +155,7 @@ public class DefaultFileProcessor
public long copy( File source, File target, ProgressListener listener )
throws IOException
{
- long total = 0;
+ long total = 0L;
InputStream fis = null;
OutputStream fos = null;
@@ -211,7 +211,7 @@ public class DefaultFileProcessor
private long copy( OutputStream os, InputStream is, ProgressListener listener )
throws IOException
{
- long total = 0;
+ long total = 0L;
ByteBuffer buffer = ByteBuffer.allocate( 1024 * 32 );
byte[] array = buffer.array();
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/03d57482/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManager.java
----------------------------------------------------------------------
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManager.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManager.java
index eb4eff9..8a07e84 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManager.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManager.java
@@ -159,7 +159,7 @@ public class DefaultUpdateCheckManager
else
{
// this is the first attempt ever
- lastUpdated = 0;
+ lastUpdated = 0L;
}
}
else if ( error.length() <= 0 )
@@ -174,7 +174,7 @@ public class DefaultUpdateCheckManager
lastUpdated = getLastUpdated( props, transferKey );
}
- if ( lastUpdated == 0 )
+ if ( lastUpdated == 0L )
{
check.setRequired( true );
}
@@ -296,7 +296,7 @@ public class DefaultUpdateCheckManager
else
{
// this is the first attempt ever
- lastUpdated = 0;
+ lastUpdated = 0L;
}
}
else if ( error.length() <= 0 )
@@ -311,7 +311,7 @@ public class DefaultUpdateCheckManager
lastUpdated = getLastUpdated( props, transferKey );
}
- if ( lastUpdated == 0 )
+ if ( lastUpdated == 0L )
{
check.setRequired( true );
}
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/03d57482/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultVersionFilterContext.java
----------------------------------------------------------------------
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultVersionFilterContext.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultVersionFilterContext.java
index 2007368..1ce4437 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultVersionFilterContext.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultVersionFilterContext.java
@@ -72,7 +72,7 @@ final class DefaultVersionFilterContext
{
for ( int i = count - 1; i >= 0; i-- )
{
- deleted[i] = 0;
+ deleted[i] = (byte) 0;
}
}
}
@@ -166,7 +166,7 @@ final class DefaultVersionFilterContext
private void advance()
{
- for ( next = index + 1; next < size && deleted[next] != 0; next++ )
+ for ( next = index + 1; next < size && deleted[next] != (byte) 0; next++ )
{
// just advancing index
}
@@ -198,11 +198,11 @@ final class DefaultVersionFilterContext
{
throw new ConcurrentModificationException();
}
- if ( index < 0 || deleted[index] == 1 )
+ if ( index < 0 || deleted[index] == (byte) 1 )
{
throw new IllegalStateException();
}
- deleted[index] = 1;
+ deleted[index] = (byte) 1;
count = --DefaultVersionFilterContext.this.count;
}
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/03d57482/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerFactory.java
----------------------------------------------------------------------
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerFactory.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerFactory.java
index cfd2013..904c840 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerFactory.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerFactory.java
@@ -47,7 +47,7 @@ public class EnhancedLocalRepositoryManagerFactory
private Logger logger = NullLoggerFactory.LOGGER;
- private float priority = 10;
+ private float priority = 10.0f;
public EnhancedLocalRepositoryManagerFactory()
{
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/03d57482/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/TrackingFileManager.java
----------------------------------------------------------------------
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/TrackingFileManager.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/TrackingFileManager.java
index 9b17e3a..79a14b6 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/TrackingFileManager.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/TrackingFileManager.java
@@ -221,7 +221,7 @@ class TrackingFileManager
}
try
{
- Thread.sleep( 50 );
+ Thread.sleep( 50L );
}
catch ( InterruptedException e1 )
{
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/03d57482/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultFileProcessorTest.java
----------------------------------------------------------------------
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultFileProcessorTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultFileProcessorTest.java
index 3f8ab5e..7b48230 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultFileProcessorTest.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultFileProcessorTest.java
@@ -98,7 +98,7 @@ public class DefaultFileProcessorTest
File target = new File( targetDir, "testCopyEmptyFile" );
target.delete();
fileProcessor.copy( file, target );
- assertTrue( "empty file was not copied", target.exists() && target.length() == 0 );
+ assertTrue( "empty file was not copied", target.exists() && target.length() == 0L );
target.delete();
}
@@ -120,7 +120,7 @@ public class DefaultFileProcessorTest
};
fileProcessor.copy( file, target, listener );
assertTrue( "file was not created", target.isFile() );
- assertEquals( "file was not fully copied", 4, target.length() );
+ assertEquals( "file was not fully copied", 4L, target.length() );
assertEquals( "listener not called", 4, progressed.intValue() );
target.delete();
}
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/03d57482/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java
----------------------------------------------------------------------
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java
index 43ccd54..85e76ef 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java
@@ -53,7 +53,7 @@ import org.junit.Test;
public class DefaultUpdateCheckManagerTest
{
- private static final int HOUR = 60 * 60 * 1000;
+ private static final long HOUR = 60L * 60L * 1000L;
private DefaultUpdateCheckManager manager;
@@ -543,7 +543,7 @@ public class DefaultUpdateCheckManagerTest
throws Exception
{
UpdateCheck<Artifact, ArtifactTransferException> check = newArtifactCheck();
- long fifteenMinutes = new Date().getTime() - ( 15 * 60 * 1000 );
+ long fifteenMinutes = new Date().getTime() - ( 15L * 60L * 1000L );
check.getFile().setLastModified( fifteenMinutes );
// time is truncated on setLastModfied
fifteenMinutes = check.getFile().lastModified();
@@ -553,7 +553,7 @@ public class DefaultUpdateCheckManagerTest
assertEquals( true, check.isRequired() );
// just checked
- check.setLocalLastUpdated( 0 );
+ check.setLocalLastUpdated( 0L );
long lastUpdate = new Date().getTime();
check.getFile().setLastModified( lastUpdate );
lastUpdate = check.getFile().lastModified();
@@ -562,7 +562,7 @@ public class DefaultUpdateCheckManagerTest
assertEquals( false, check.isRequired() );
// no local file, no repo timestamp
- check.setLocalLastUpdated( 0 );
+ check.setLocalLastUpdated( 0L );
check.getFile().delete();
manager.checkArtifact( session, check );
assertEquals( true, check.isRequired() );
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/03d57482/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerTest.java
----------------------------------------------------------------------
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerTest.java
index 41bf542..32a4222 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerTest.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerTest.java
@@ -131,13 +131,13 @@ public class EnhancedLocalRepositoryManagerTest
String path = manager.getPathForRemoteArtifact( artifact, repository, testContext );
return copy( artifact, path );
}
-
+
private long copy( Metadata metadata, String path )
throws IOException
{
if ( metadata.getFile() == null )
{
- return -1;
+ return -1L;
}
return TestFileUtils.copyFile( metadata.getFile(), new File( basedir, path ) );
}
@@ -147,7 +147,7 @@ public class EnhancedLocalRepositoryManagerTest
{
if ( artifact.getFile() == null )
{
- return -1;
+ return -1L;
}
File artifactFile = new File( basedir, path );
return TestFileUtils.copyFile( artifact.getFile(), artifactFile );
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/03d57482/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StaticUpdateCheckManager.java
----------------------------------------------------------------------
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StaticUpdateCheckManager.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StaticUpdateCheckManager.java
index 7810089..334d544 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StaticUpdateCheckManager.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StaticUpdateCheckManager.java
@@ -60,7 +60,7 @@ class StaticUpdateCheckManager
{
check.setRequired( checkRequired );
- if ( check.getLocalLastUpdated() != 0 && localUpToDate )
+ if ( check.getLocalLastUpdated() != 0L && localUpToDate )
{
check.setRequired( false );
}
@@ -74,7 +74,7 @@ class StaticUpdateCheckManager
{
check.setRequired( checkRequired );
- if ( check.getLocalLastUpdated() != 0 && localUpToDate )
+ if ( check.getLocalLastUpdated() != 0L && localUpToDate )
{
check.setRequired( false );
}
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/03d57482/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/AbstractTransporter.java
----------------------------------------------------------------------
diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/AbstractTransporter.java b/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/AbstractTransporter.java
index acad985..21488a1 100644
--- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/AbstractTransporter.java
+++ b/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/AbstractTransporter.java
@@ -99,7 +99,7 @@ public abstract class AbstractTransporter
try
{
os = task.newOutputStream( resume );
- task.getListener().transportStarted( resume ? task.getResumeOffset() : 0, length );
+ task.getListener().transportStarted( resume ? task.getResumeOffset() : 0L, length );
copy( os, is, task.getListener() );
os.close();
os = null;
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/03d57482/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestFileProcessor.java
----------------------------------------------------------------------
diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestFileProcessor.java b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestFileProcessor.java
index d74f417..7c99171 100644
--- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestFileProcessor.java
+++ b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestFileProcessor.java
@@ -171,7 +171,7 @@ public class TestFileProcessor
private long copy( OutputStream os, InputStream is, ProgressListener listener )
throws IOException
{
- long total = 0;
+ long total = 0L;
ByteBuffer buffer = ByteBuffer.allocate( 1024 * 32 );
byte[] array = buffer.array();
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/03d57482/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestFileUtils.java
----------------------------------------------------------------------
diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestFileUtils.java b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestFileUtils.java
index 5d69a1c..a1715b5 100644
--- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestFileUtils.java
+++ b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestFileUtils.java
@@ -209,7 +209,7 @@ public class TestFileUtils
fos = new BufferedOutputStream( new FileOutputStream( target ) );
- long total = 0;
+ long total = 0L;
for ( byte[] buffer = new byte[ 1024 * 32 ];; )
{
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/03d57482/maven-resolver-transport-classpath/src/test/java/org/eclipse/aether/transport/classpath/ClasspathTransporterTest.java
----------------------------------------------------------------------
diff --git a/maven-resolver-transport-classpath/src/test/java/org/eclipse/aether/transport/classpath/ClasspathTransporterTest.java b/maven-resolver-transport-classpath/src/test/java/org/eclipse/aether/transport/classpath/ClasspathTransporterTest.java
index 6022cb2..0f7647c 100644
--- a/maven-resolver-transport-classpath/src/test/java/org/eclipse/aether/transport/classpath/ClasspathTransporterTest.java
+++ b/maven-resolver-transport-classpath/src/test/java/org/eclipse/aether/transport/classpath/ClasspathTransporterTest.java
@@ -144,8 +144,8 @@ public class ClasspathTransporterTest
GetTask task = new GetTask( URI.create( "file.txt" ) ).setListener( listener );
transporter.get( task );
assertEquals( "test", task.getDataString() );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 4, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 4L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertTrue( "Count: " + listener.progressedCount, listener.progressedCount > 0 );
assertEquals( task.getDataString(), new String( listener.baos.toByteArray(), StandardCharsets.UTF_8 ) );
@@ -160,8 +160,8 @@ public class ClasspathTransporterTest
GetTask task = new GetTask( URI.create( "file.txt" ) ).setDataFile( file ).setListener( listener );
transporter.get( task );
assertEquals( "test", TestFileUtils.readString( file ) );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 4, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 4L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertTrue( "Count: " + listener.progressedCount, listener.progressedCount > 0 );
assertEquals( "test", new String( listener.baos.toByteArray(), StandardCharsets.UTF_8 ) );
@@ -176,8 +176,8 @@ public class ClasspathTransporterTest
GetTask task = new GetTask( URI.create( "empty.txt" ) ).setDataFile( file ).setListener( listener );
transporter.get( task );
assertEquals( "", TestFileUtils.readString( file ) );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 0, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 0L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertEquals( 0, listener.progressedCount );
assertEquals( "", new String( listener.baos.toByteArray(), StandardCharsets.UTF_8 ) );
@@ -269,8 +269,8 @@ public class ClasspathTransporterTest
{
assertEquals( Transporter.ERROR_OTHER, transporter.classify( e ) );
}
- assertEquals( 0, listener.dataOffset );
- assertEquals( 4, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 4L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertEquals( 0, listener.progressedCount );
}
@@ -291,8 +291,8 @@ public class ClasspathTransporterTest
{
assertEquals( Transporter.ERROR_OTHER, transporter.classify( e ) );
}
- assertEquals( 0, listener.dataOffset );
- assertEquals( 4, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 4L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertEquals( 1, listener.progressedCount );
}
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/03d57482/maven-resolver-transport-file/src/test/java/org/eclipse/aether/transport/file/FileTransporterTest.java
----------------------------------------------------------------------
diff --git a/maven-resolver-transport-file/src/test/java/org/eclipse/aether/transport/file/FileTransporterTest.java b/maven-resolver-transport-file/src/test/java/org/eclipse/aether/transport/file/FileTransporterTest.java
index b4bf066..dd65bf0 100644
--- a/maven-resolver-transport-file/src/test/java/org/eclipse/aether/transport/file/FileTransporterTest.java
+++ b/maven-resolver-transport-file/src/test/java/org/eclipse/aether/transport/file/FileTransporterTest.java
@@ -150,8 +150,8 @@ public class FileTransporterTest
GetTask task = new GetTask( URI.create( "file.txt" ) ).setListener( listener );
transporter.get( task );
assertEquals( "test", task.getDataString() );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 4, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 4L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertTrue( "Count: " + listener.progressedCount, listener.progressedCount > 0 );
assertEquals( task.getDataString(), new String( listener.baos.toByteArray(), StandardCharsets.UTF_8 ) );
@@ -166,8 +166,8 @@ public class FileTransporterTest
GetTask task = new GetTask( URI.create( "file.txt" ) ).setDataFile( file ).setListener( listener );
transporter.get( task );
assertEquals( "test", TestFileUtils.readString( file ) );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 4, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 4L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertTrue( "Count: " + listener.progressedCount, listener.progressedCount > 0 );
assertEquals( "test", new String( listener.baos.toByteArray(), StandardCharsets.UTF_8 ) );
@@ -182,8 +182,8 @@ public class FileTransporterTest
GetTask task = new GetTask( URI.create( "empty.txt" ) ).setDataFile( file ).setListener( listener );
transporter.get( task );
assertEquals( "", TestFileUtils.readString( file ) );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 0, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 0L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertEquals( 0, listener.progressedCount );
assertEquals( "", new String( listener.baos.toByteArray(), StandardCharsets.UTF_8 ) );
@@ -275,8 +275,8 @@ public class FileTransporterTest
{
assertEquals( Transporter.ERROR_OTHER, transporter.classify( e ) );
}
- assertEquals( 0, listener.dataOffset );
- assertEquals( 4, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 4L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertEquals( 0, listener.progressedCount );
}
@@ -297,8 +297,8 @@ public class FileTransporterTest
{
assertEquals( Transporter.ERROR_OTHER, transporter.classify( e ) );
}
- assertEquals( 0, listener.dataOffset );
- assertEquals( 4, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 4L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertEquals( 1, listener.progressedCount );
}
@@ -310,8 +310,8 @@ public class FileTransporterTest
RecordingTransportListener listener = new RecordingTransportListener();
PutTask task = new PutTask( URI.create( "file.txt" ) ).setListener( listener ).setDataString( "upload" );
transporter.put( task );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 6, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 6L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertTrue( "Count: " + listener.progressedCount, listener.progressedCount > 0 );
assertEquals( "upload", TestFileUtils.readString( new File( repoDir, "file.txt" ) ) );
@@ -325,8 +325,8 @@ public class FileTransporterTest
RecordingTransportListener listener = new RecordingTransportListener();
PutTask task = new PutTask( URI.create( "file.txt" ) ).setListener( listener ).setDataFile( file );
transporter.put( task );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 6, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 6L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertTrue( "Count: " + listener.progressedCount, listener.progressedCount > 0 );
assertEquals( "upload", TestFileUtils.readString( new File( repoDir, "file.txt" ) ) );
@@ -339,8 +339,8 @@ public class FileTransporterTest
RecordingTransportListener listener = new RecordingTransportListener();
PutTask task = new PutTask( URI.create( "file.txt" ) ).setListener( listener );
transporter.put( task );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 0, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 0L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertEquals( 0, listener.progressedCount );
assertEquals( "", TestFileUtils.readString( new File( repoDir, "file.txt" ) ) );
@@ -354,8 +354,8 @@ public class FileTransporterTest
PutTask task =
new PutTask( URI.create( "dir/sub/dir/file.txt" ) ).setListener( listener ).setDataString( "upload" );
transporter.put( task );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 6, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 6L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertTrue( "Count: " + listener.progressedCount, listener.progressedCount > 0 );
assertEquals( "upload", TestFileUtils.readString( new File( repoDir, "dir/sub/dir/file.txt" ) ) );
@@ -368,8 +368,8 @@ public class FileTransporterTest
RecordingTransportListener listener = new RecordingTransportListener();
PutTask task = new PutTask( URI.create( "some%20space.txt" ) ).setListener( listener ).setDataString( "OK" );
transporter.put( task );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 2, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 2L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertTrue( "Count: " + listener.progressedCount, listener.progressedCount > 0 );
assertEquals( "OK", TestFileUtils.readString( new File( repoDir, "some space.txt" ) ) );
@@ -421,8 +421,8 @@ public class FileTransporterTest
{
assertEquals( Transporter.ERROR_OTHER, transporter.classify( e ) );
}
- assertEquals( 0, listener.dataOffset );
- assertEquals( 6, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 6L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertEquals( 0, listener.progressedCount );
assertFalse( new File( repoDir, "file.txt" ).exists() );
@@ -444,8 +444,8 @@ public class FileTransporterTest
{
assertEquals( Transporter.ERROR_OTHER, transporter.classify( e ) );
}
- assertEquals( 0, listener.dataOffset );
- assertEquals( 6, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 6L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertEquals( 1, listener.progressedCount );
assertFalse( new File( repoDir, "file.txt" ).exists() );
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/03d57482/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporter.java
----------------------------------------------------------------------
diff --git a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporter.java b/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporter.java
index 169bb12..47b8d2e 100644
--- a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporter.java
+++ b/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporter.java
@@ -509,11 +509,11 @@ final class HttpTransporter
private <T extends HttpUriRequest> T resume( T request, GetTask task )
{
long resumeOffset = task.getResumeOffset();
- if ( resumeOffset > 0 && task.getDataFile() != null )
+ if ( resumeOffset > 0L && task.getDataFile() != null )
{
request.setHeader( HttpHeaders.RANGE, "bytes=" + Long.toString( resumeOffset ) + '-' );
request.setHeader( HttpHeaders.IF_UNMODIFIED_SINCE,
- DateUtils.formatDate( new Date( task.getDataFile().lastModified() - 60 * 1000 ) ) );
+ DateUtils.formatDate( new Date( task.getDataFile().lastModified() - 60L * 1000L ) ) );
request.setHeader( HttpHeaders.ACCEPT_ENCODING, "identity" );
}
return request;
@@ -556,7 +556,7 @@ final class HttpTransporter
entity = new ByteArrayEntity( new byte[0] );
}
- long offset = 0, length = entity.getContentLength();
+ long offset = 0L, length = entity.getContentLength();
String range = getHeader( response, HttpHeaders.CONTENT_RANGE );
if ( range != null )
{
@@ -566,8 +566,8 @@ final class HttpTransporter
throw new IOException( "Invalid Content-Range header for partial download: " + range );
}
offset = Long.parseLong( m.group( 1 ) );
- length = Long.parseLong( m.group( 2 ) ) + 1;
- if ( offset < 0 || offset >= length || ( offset > 0 && offset != task.getResumeOffset() ) )
+ length = Long.parseLong( m.group( 2 ) ) + 1L;
+ if ( offset < 0L || offset >= length || ( offset > 0L && offset != task.getResumeOffset() ) )
{
throw new IOException( "Invalid Content-Range header for partial download from offset "
+ task.getResumeOffset() + ": " + range );
@@ -575,7 +575,7 @@ final class HttpTransporter
}
InputStream is = entity.getContent();
- utilGet( task, is, true, length, offset > 0 );
+ utilGet( task, is, true, length, offset > 0L );
extractChecksums( response );
}
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/03d57482/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporterFactory.java
----------------------------------------------------------------------
diff --git a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporterFactory.java b/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporterFactory.java
index e9a9bfd..77d2141 100644
--- a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporterFactory.java
+++ b/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporterFactory.java
@@ -44,7 +44,7 @@ public final class HttpTransporterFactory
private Logger logger = NullLoggerFactory.LOGGER;
- private float priority = 5;
+ private float priority = 5.0f;
/**
* Creates an (uninitialized) instance of this transporter factory. <em>Note:</em> In case of manual instantiation
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/03d57482/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpServer.java
----------------------------------------------------------------------
diff --git a/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpServer.java b/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpServer.java
index 6dc36e1..cc85f39 100644
--- a/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpServer.java
+++ b/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpServer.java
@@ -371,7 +371,7 @@ public class HttpServer
response.setStatus( HttpServletResponse.SC_PRECONDITION_FAILED );
return;
}
- long offset = 0;
+ long offset = 0L;
String range = request.getHeader( HttpHeaders.RANGE );
if ( range != null && rangeSupport )
{
@@ -392,12 +392,12 @@ public class HttpServer
return;
}
}
- response.setStatus( ( offset > 0 ) ? HttpServletResponse.SC_PARTIAL_CONTENT : HttpServletResponse.SC_OK );
+ response.setStatus( ( offset > 0L ) ? HttpServletResponse.SC_PARTIAL_CONTENT : HttpServletResponse.SC_OK );
response.setDateHeader( HttpHeaders.LAST_MODIFIED, file.lastModified() );
response.setHeader( HttpHeaders.CONTENT_LENGTH, Long.toString( file.length() - offset ) );
- if ( offset > 0 )
+ if ( offset > 0L )
{
- response.setHeader( HttpHeaders.CONTENT_RANGE, "bytes " + offset + "-" + ( file.length() - 1 )
+ response.setHeader( HttpHeaders.CONTENT_RANGE, "bytes " + offset + "-" + ( file.length() - 1L )
+ "/" + file.length() );
}
if ( checksumHeader != null )
@@ -417,7 +417,7 @@ public class HttpServer
FileInputStream is = new FileInputStream( file );
try
{
- if ( offset > 0 )
+ if ( offset > 0L )
{
long skipped = is.skip( offset );
while ( skipped < offset && is.read() >= 0 )
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/03d57482/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpTransporterTest.java
----------------------------------------------------------------------
diff --git a/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpTransporterTest.java b/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpTransporterTest.java
index 4b3e08f..7ca6bb0 100644
--- a/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpTransporterTest.java
+++ b/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpTransporterTest.java
@@ -276,8 +276,8 @@ public class HttpTransporterTest
GetTask task = new GetTask( URI.create( "repo/file.txt" ) ).setListener( listener );
transporter.get( task );
assertEquals( "test", task.getDataString() );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 4, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 4L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertTrue( "Count: " + listener.progressedCount, listener.progressedCount > 0 );
assertEquals( task.getDataString(), new String( listener.baos.toByteArray(), StandardCharsets.UTF_8 ) );
@@ -292,8 +292,8 @@ public class HttpTransporterTest
GetTask task = new GetTask( URI.create( "repo/file.txt" ) ).setDataFile( file ).setListener( listener );
transporter.get( task );
assertEquals( "test", TestFileUtils.readString( file ) );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 4, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 4L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertTrue( "Count: " + listener.progressedCount, listener.progressedCount > 0 );
assertEquals( "test", new String( listener.baos.toByteArray(), StandardCharsets.UTF_8 ) );
@@ -308,8 +308,8 @@ public class HttpTransporterTest
GetTask task = new GetTask( URI.create( "repo/empty.txt" ) ).setDataFile( file ).setListener( listener );
transporter.get( task );
assertEquals( "", TestFileUtils.readString( file ) );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 0, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 0L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertEquals( 0, listener.progressedCount );
assertEquals( "", new String( listener.baos.toByteArray(), StandardCharsets.UTF_8 ) );
@@ -335,8 +335,8 @@ public class HttpTransporterTest
GetTask task = new GetTask( URI.create( "repo/file.txt" ) ).setListener( listener );
transporter.get( task );
assertEquals( "test", task.getDataString() );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 4, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 4L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertTrue( "Count: " + listener.progressedCount, listener.progressedCount > 0 );
assertEquals( task.getDataString(), new String( listener.baos.toByteArray(), StandardCharsets.UTF_8 ) );
@@ -371,8 +371,8 @@ public class HttpTransporterTest
GetTask task = new GetTask( URI.create( "repo/file.txt" ) ).setListener( listener );
transporter.get( task );
assertEquals( "test", task.getDataString() );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 4, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 4L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertTrue( "Count: " + listener.progressedCount, listener.progressedCount > 0 );
assertEquals( task.getDataString(), new String( listener.baos.toByteArray(), StandardCharsets.UTF_8 ) );
@@ -407,8 +407,8 @@ public class HttpTransporterTest
GetTask task = new GetTask( URI.create( "repo/file.txt" ) ).setListener( listener );
transporter.get( task );
assertEquals( "test", task.getDataString() );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 4, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 4L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertTrue( "Count: " + listener.progressedCount, listener.progressedCount > 0 );
assertEquals( task.getDataString(), new String( listener.baos.toByteArray(), StandardCharsets.UTF_8 ) );
@@ -424,8 +424,8 @@ public class HttpTransporterTest
( (HttpTransporter) transporter ).getState().setWebDav( true );
transporter.get( task );
assertEquals( "test", task.getDataString() );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 4, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 4L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertTrue( "Count: " + listener.progressedCount, listener.progressedCount > 0 );
assertEquals( task.getDataString(), new String( listener.baos.toByteArray(), StandardCharsets.UTF_8 ) );
@@ -441,8 +441,8 @@ public class HttpTransporterTest
GetTask task = new GetTask( URI.create( "redirect/file.txt?scheme=https" ) ).setListener( listener );
transporter.get( task );
assertEquals( "test", task.getDataString() );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 4, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 4L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertTrue( "Count: " + listener.progressedCount, listener.progressedCount > 0 );
assertEquals( task.getDataString(), new String( listener.baos.toByteArray(), StandardCharsets.UTF_8 ) );
@@ -457,8 +457,8 @@ public class HttpTransporterTest
GetTask task = new GetTask( URI.create( "repo/resume.txt" ) ).setDataFile( file, true ).setListener( listener );
transporter.get( task );
assertEquals( "resumable", TestFileUtils.readString( file ) );
- assertEquals( 1, listener.startedCount );
- assertEquals( 2, listener.dataOffset );
+ assertEquals( 1L, listener.startedCount );
+ assertEquals( 2L, listener.dataOffset );
assertEquals( 9, listener.dataLength );
assertTrue( "Count: " + listener.progressedCount, listener.progressedCount > 0 );
assertEquals( "sumable", new String( listener.baos.toByteArray(), StandardCharsets.UTF_8 ) );
@@ -474,8 +474,8 @@ public class HttpTransporterTest
GetTask task = new GetTask( URI.create( "repo/resume.txt" ) ).setDataFile( file, true ).setListener( listener );
transporter.get( task );
assertEquals( "resumable", TestFileUtils.readString( file ) );
- assertEquals( 1, listener.startedCount );
- assertEquals( 0, listener.dataOffset );
+ assertEquals( 1L, listener.startedCount );
+ assertEquals( 0L, listener.dataOffset );
assertEquals( 9, listener.dataLength );
assertTrue( "Count: " + listener.progressedCount, listener.progressedCount > 0 );
assertEquals( "resumable", new String( listener.baos.toByteArray(), StandardCharsets.UTF_8 ) );
@@ -491,8 +491,8 @@ public class HttpTransporterTest
GetTask task = new GetTask( URI.create( "repo/resume.txt" ) ).setDataFile( file, true ).setListener( listener );
transporter.get( task );
assertEquals( "resumable", TestFileUtils.readString( file ) );
- assertEquals( 1, listener.startedCount );
- assertEquals( 0, listener.dataOffset );
+ assertEquals( 1L, listener.startedCount );
+ assertEquals( 0L, listener.dataOffset );
assertEquals( 9, listener.dataLength );
assertTrue( "Count: " + listener.progressedCount, listener.progressedCount > 0 );
assertEquals( "resumable", new String( listener.baos.toByteArray(), StandardCharsets.UTF_8 ) );
@@ -569,8 +569,8 @@ public class HttpTransporterTest
{
assertEquals( Transporter.ERROR_OTHER, transporter.classify( e ) );
}
- assertEquals( 0, listener.dataOffset );
- assertEquals( 4, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 4L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertEquals( 0, listener.progressedCount );
}
@@ -591,8 +591,8 @@ public class HttpTransporterTest
{
assertEquals( Transporter.ERROR_OTHER, transporter.classify( e ) );
}
- assertEquals( 0, listener.dataOffset );
- assertEquals( 4, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 4L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertEquals( 1, listener.progressedCount );
}
@@ -604,8 +604,8 @@ public class HttpTransporterTest
RecordingTransportListener listener = new RecordingTransportListener();
PutTask task = new PutTask( URI.create( "repo/file.txt" ) ).setListener( listener ).setDataString( "upload" );
transporter.put( task );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 6, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 6L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertTrue( "Count: " + listener.progressedCount, listener.progressedCount > 0 );
assertEquals( "upload", TestFileUtils.readString( new File( repoDir, "file.txt" ) ) );
@@ -619,8 +619,8 @@ public class HttpTransporterTest
RecordingTransportListener listener = new RecordingTransportListener();
PutTask task = new PutTask( URI.create( "repo/file.txt" ) ).setListener( listener ).setDataFile( file );
transporter.put( task );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 6, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 6L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertTrue( "Count: " + listener.progressedCount, listener.progressedCount > 0 );
assertEquals( "upload", TestFileUtils.readString( new File( repoDir, "file.txt" ) ) );
@@ -633,8 +633,8 @@ public class HttpTransporterTest
RecordingTransportListener listener = new RecordingTransportListener();
PutTask task = new PutTask( URI.create( "repo/file.txt" ) ).setListener( listener );
transporter.put( task );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 0, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 0L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertEquals( 0, listener.progressedCount );
assertEquals( "", TestFileUtils.readString( new File( repoDir, "file.txt" ) ) );
@@ -648,8 +648,8 @@ public class HttpTransporterTest
PutTask task =
new PutTask( URI.create( "repo/some%20space.txt" ) ).setListener( listener ).setDataString( "OK" );
transporter.put( task );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 2, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 2L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertTrue( "Count: " + listener.progressedCount, listener.progressedCount > 0 );
assertEquals( "OK", TestFileUtils.readString( new File( repoDir, "some space.txt" ) ) );
@@ -665,8 +665,8 @@ public class HttpTransporterTest
RecordingTransportListener listener = new RecordingTransportListener();
PutTask task = new PutTask( URI.create( "repo/file.txt" ) ).setListener( listener ).setDataString( "upload" );
transporter.put( task );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 6, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 6L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertTrue( "Count: " + listener.progressedCount, listener.progressedCount > 0 );
assertEquals( "upload", TestFileUtils.readString( new File( repoDir, "file.txt" ) ) );
@@ -683,8 +683,8 @@ public class HttpTransporterTest
RecordingTransportListener listener = new RecordingTransportListener();
PutTask task = new PutTask( URI.create( "repo/file.txt" ) ).setListener( listener ).setDataString( "upload" );
transporter.put( task );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 6, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 6L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertTrue( "Count: " + listener.progressedCount, listener.progressedCount > 0 );
assertEquals( "upload", TestFileUtils.readString( new File( repoDir, "file.txt" ) ) );
@@ -701,8 +701,8 @@ public class HttpTransporterTest
RecordingTransportListener listener = new RecordingTransportListener();
PutTask task = new PutTask( URI.create( "repo/file.txt" ) ).setListener( listener ).setDataString( "upload" );
transporter.put( task );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 6, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 6L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertTrue( "Count: " + listener.progressedCount, listener.progressedCount > 0 );
assertEquals( "upload", TestFileUtils.readString( new File( repoDir, "file.txt" ) ) );
@@ -722,8 +722,8 @@ public class HttpTransporterTest
RecordingTransportListener listener = new RecordingTransportListener();
PutTask task = new PutTask( URI.create( "repo/file.txt" ) ).setListener( listener ).setDataString( "upload" );
transporter.put( task );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 6, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 6L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertTrue( "Count: " + listener.progressedCount, listener.progressedCount > 0 );
assertEquals( "upload", TestFileUtils.readString( new File( repoDir, "file.txt" ) ) );
@@ -761,8 +761,8 @@ public class HttpTransporterTest
RecordingTransportListener listener = new RecordingTransportListener();
PutTask task = new PutTask( URI.create( "repo/file.txt" ) ).setListener( listener ).setDataString( "upload" );
transporter.put( task );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 6, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 6L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertTrue( "Count: " + listener.progressedCount, listener.progressedCount > 0 );
assertEquals( "upload", TestFileUtils.readString( new File( repoDir, "file.txt" ) ) );
@@ -802,8 +802,8 @@ public class HttpTransporterTest
RecordingTransportListener listener = new RecordingTransportListener();
PutTask task = new PutTask( URI.create( "repo/file.txt" ) ).setListener( listener ).setDataString( "upload" );
transporter.put( task );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 6, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 6L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertTrue( "Count: " + listener.progressedCount, listener.progressedCount > 0 );
assertEquals( "upload", TestFileUtils.readString( new File( repoDir, "file.txt" ) ) );
@@ -818,8 +818,8 @@ public class HttpTransporterTest
PutTask task =
new PutTask( URI.create( "repo/dir1/dir2/file.txt" ) ).setListener( listener ).setDataString( "upload" );
transporter.put( task );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 6, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 6L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertTrue( "Count: " + listener.progressedCount, listener.progressedCount > 0 );
assertEquals( "upload", TestFileUtils.readString( new File( repoDir, "dir1/dir2/file.txt" ) ) );
@@ -846,8 +846,8 @@ public class HttpTransporterTest
PutTask task =
new PutTask( URI.create( "repo/dir1/dir2/file.txt" ) ).setListener( listener ).setDataString( "upload" );
transporter.put( task );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 6, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 6L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertTrue( "Count: " + listener.progressedCount, listener.progressedCount > 0 );
assertEquals( "upload", TestFileUtils.readString( new File( repoDir, "dir1/dir2/file.txt" ) ) );
@@ -880,8 +880,8 @@ public class HttpTransporterTest
PutTask task =
new PutTask( URI.create( "repo/dir1/dir2/file.txt" ) ).setListener( listener ).setDataString( "upload" );
transporter.put( task );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 6, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 6L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertTrue( "Count: " + listener.progressedCount, listener.progressedCount > 0 );
assertEquals( "upload", TestFileUtils.readString( new File( repoDir, "dir1/dir2/file.txt" ) ) );
@@ -937,8 +937,8 @@ public class HttpTransporterTest
{
assertEquals( Transporter.ERROR_OTHER, transporter.classify( e ) );
}
- assertEquals( 0, listener.dataOffset );
- assertEquals( 6, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 6L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertEquals( 0, listener.progressedCount );
}
@@ -959,8 +959,8 @@ public class HttpTransporterTest
{
assertEquals( Transporter.ERROR_OTHER, transporter.classify( e ) );
}
- assertEquals( 0, listener.dataOffset );
- assertEquals( 6, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 6L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertEquals( 1, listener.progressedCount );
}
@@ -980,7 +980,7 @@ public class HttpTransporterTest
assertEquals( 1, listener.startedCount );
}
- @Test( timeout = 20000 )
+ @Test( timeout = 20000L )
public void testConcurrency()
throws Exception
{
@@ -1027,7 +1027,7 @@ public class HttpTransporterTest
assertNull( String.valueOf( error.get() ), error.get() );
}
- @Test( timeout = 1000 )
+ @Test( timeout = 1000L )
public void testConnectTimeout()
throws Exception
{
@@ -1049,7 +1049,7 @@ public class HttpTransporterTest
}
}
- @Test( timeout = 1000 )
+ @Test( timeout = 1000L )
public void testRequestTimeout()
throws Exception
{
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/03d57482/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporterFactory.java
----------------------------------------------------------------------
diff --git a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporterFactory.java b/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporterFactory.java
index 490acac..bff3406 100644
--- a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporterFactory.java
+++ b/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporterFactory.java
@@ -49,7 +49,7 @@ public final class WagonTransporterFactory
private WagonConfigurator wagonConfigurator;
- private float priority = -1;
+ private float priority = -1.0f;
/**
* Creates an (uninitialized) instance of this transporter factory. <em>Note:</em> In case of manual instantiation
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/03d57482/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/AbstractWagonTransporterTest.java
----------------------------------------------------------------------
diff --git a/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/AbstractWagonTransporterTest.java b/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/AbstractWagonTransporterTest.java
index 5a168d1..2a58de3 100644
--- a/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/AbstractWagonTransporterTest.java
+++ b/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/AbstractWagonTransporterTest.java
@@ -192,8 +192,8 @@ public abstract class AbstractWagonTransporterTest
GetTask task = new GetTask( URI.create( "file.txt" ) ).setListener( listener );
transporter.get( task );
assertEquals( "test", task.getDataString() );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 4, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 4L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertTrue( "Count: " + listener.progressedCount, listener.progressedCount > 0 );
assertEquals( task.getDataString(), new String( listener.baos.toByteArray(), StandardCharsets.UTF_8 ) );
@@ -208,8 +208,8 @@ public abstract class AbstractWagonTransporterTest
GetTask task = new GetTask( URI.create( "file.txt" ) ).setDataFile( file ).setListener( listener );
transporter.get( task );
assertEquals( "test", TestFileUtils.readString( file ) );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 4, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 4L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertTrue( "Count: " + listener.progressedCount, listener.progressedCount > 0 );
assertEquals( "test", new String( listener.baos.toByteArray(), StandardCharsets.UTF_8 ) );
@@ -225,8 +225,8 @@ public abstract class AbstractWagonTransporterTest
GetTask task = new GetTask( URI.create( "empty.txt" ) ).setDataFile( file ).setListener( listener );
transporter.get( task );
assertEquals( "", TestFileUtils.readString( file ) );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 0, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 0L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertEquals( 0, listener.progressedCount );
assertEquals( "", new String( listener.baos.toByteArray(), StandardCharsets.UTF_8 ) );
@@ -311,8 +311,8 @@ public abstract class AbstractWagonTransporterTest
{
assertEquals( Transporter.ERROR_OTHER, transporter.classify( e ) );
}
- assertEquals( 0, listener.dataOffset );
- assertEquals( 4, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 4L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertEquals( 1, listener.progressedCount );
}
@@ -324,8 +324,8 @@ public abstract class AbstractWagonTransporterTest
RecordingTransportListener listener = new RecordingTransportListener();
PutTask task = new PutTask( URI.create( "file.txt" ) ).setListener( listener ).setDataString( "upload" );
transporter.put( task );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 6, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 6L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertTrue( "Count: " + listener.progressedCount, listener.progressedCount > 0 );
assertEquals( "upload", fs.get( "file.txt" ) );
@@ -339,8 +339,8 @@ public abstract class AbstractWagonTransporterTest
RecordingTransportListener listener = new RecordingTransportListener();
PutTask task = new PutTask( URI.create( "file.txt" ) ).setListener( listener ).setDataFile( file );
transporter.put( task );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 6, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 6L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertTrue( "Count: " + listener.progressedCount, listener.progressedCount > 0 );
assertEquals( "upload", fs.get( "file.txt" ) );
@@ -353,8 +353,8 @@ public abstract class AbstractWagonTransporterTest
RecordingTransportListener listener = new RecordingTransportListener();
PutTask task = new PutTask( URI.create( "file.txt" ) ).setListener( listener );
transporter.put( task );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 0, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 0L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertEquals( 0, listener.progressedCount );
assertEquals( "", fs.get( "file.txt" ) );
@@ -368,8 +368,8 @@ public abstract class AbstractWagonTransporterTest
PutTask task =
new PutTask( URI.create( "dir/sub/dir/file.txt" ) ).setListener( listener ).setDataString( "upload" );
transporter.put( task );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 6, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 6L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertTrue( "Count: " + listener.progressedCount, listener.progressedCount > 0 );
assertEquals( "upload", fs.get( "dir/sub/dir/file.txt" ) );
@@ -382,8 +382,8 @@ public abstract class AbstractWagonTransporterTest
RecordingTransportListener listener = new RecordingTransportListener();
PutTask task = new PutTask( URI.create( "some%20space.txt" ) ).setListener( listener ).setDataString( "OK" );
transporter.put( task );
- assertEquals( 0, listener.dataOffset );
- assertEquals( 2, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 2L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertTrue( "Count: " + listener.progressedCount, listener.progressedCount > 0 );
assertEquals( "OK", fs.get( "some space.txt" ) );
@@ -444,8 +444,8 @@ public abstract class AbstractWagonTransporterTest
{
assertEquals( Transporter.ERROR_OTHER, transporter.classify( e ) );
}
- assertEquals( 0, listener.dataOffset );
- assertEquals( 6, listener.dataLength );
+ assertEquals( 0L, listener.dataOffset );
+ assertEquals( 6L, listener.dataLength );
assertEquals( 1, listener.startedCount );
assertEquals( 1, listener.progressedCount );
}
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/03d57482/maven-resolver-util/src/test/java/org/eclipse/aether/util/ConfigUtilsTest.java
----------------------------------------------------------------------
diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/ConfigUtilsTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/ConfigUtilsTest.java
index 9218031..912e55a 100644
--- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/ConfigUtilsTest.java
+++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/ConfigUtilsTest.java
@@ -186,16 +186,16 @@ public class ConfigUtilsTest
public void testGetLong_Default()
{
config.put( "no-long", new Object() );
- assertEquals( -17, ConfigUtils.getLong( config, -17L, "no-value" ) );
- assertEquals( 43, ConfigUtils.getLong( config, 43L, "no-long" ) );
+ assertEquals( -17L, ConfigUtils.getLong( config, -17L, "no-value" ) );
+ assertEquals( 43L, ConfigUtils.getLong( config, 43L, "no-long" ) );
}
@Test
public void testGetLong_AlternativeKeys()
{
config.put( "no-long", "text" );
- config.put( "some-long", 23 );
- assertEquals( 23, ConfigUtils.getLong( config, 0, "no-long", "some-long" ) );
+ config.put( "some-long", 23L );
+ assertEquals( 23L, ConfigUtils.getLong( config, 0, "no-long", "some-long" ) );
}
@Test
@@ -240,7 +240,7 @@ public class ConfigUtilsTest
@Test
public void testGetFloat_NumberConversion()
{
- config.put( "some-number", -1234 );
+ config.put( "some-number", -1234f );
assertEquals( -1234f, ConfigUtils.getFloat( config, 0, "some-number" ), 0.1f );
}