You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2015/03/23 04:57:58 UTC
archiva git commit: use more java 1.7 for file io
Repository: archiva
Updated Branches:
refs/heads/master 81411e352 -> a6c73dcde
use more java 1.7 for file io
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/a6c73dcd
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/a6c73dcd
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/a6c73dcd
Branch: refs/heads/master
Commit: a6c73dcde2a11d763a576edff292f9361a2fdb16
Parents: 81411e3
Author: Olivier Lamy <ol...@apache.org>
Authored: Mon Mar 23 14:57:49 2015 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Mon Mar 23 14:57:49 2015 +1100
----------------------------------------------------------------------
.../archiva/checksum/ChecksummedFile.java | 5 +++-
.../core/ArtifactMissingChecksumsConsumer.java | 2 +-
.../ArtifactMissingChecksumsConsumerTest.java | 30 +++++++++++---------
3 files changed, 22 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/a6c73dcd/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksummedFile.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksummedFile.java b/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksummedFile.java
index 2cd0169..0f36ce1 100644
--- a/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksummedFile.java
+++ b/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksummedFile.java
@@ -28,6 +28,7 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
+import java.nio.file.StandardOpenOption;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
@@ -95,8 +96,10 @@ public class ChecksummedFile
throws IOException
{
File checksumFile = new File( referenceFile.getAbsolutePath() + "." + checksumAlgorithm.getExt() );
+ Files.deleteIfExists( checksumFile.toPath() );
String checksum = calculateChecksum( checksumAlgorithm );
- FileUtils.writeStringToFile( checksumFile, checksum + " " + referenceFile.getName() );
+ Files.write( checksumFile.toPath(), (checksum + " " + referenceFile.getName()).getBytes(), StandardOpenOption.CREATE_NEW );
+ //FileUtils.writeStringToFile( checksumFile, checksum + " " + referenceFile.getName() );
return checksumFile;
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/a6c73dcd/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java
index 954ac6b..9b5510c 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java
@@ -155,7 +155,7 @@ public class ArtifactMissingChecksumsConsumer
private void createFixChecksum( String path, ChecksumAlgorithm checksumAlgorithm )
{
File artifactFile = new File( this.repositoryDir, path );
- File checksumFile = new File( this.repositoryDir, path + "." + checksumAlgorithm.getExt() );
+ File checksumFile = new File( this.repositoryDir, path + checksumAlgorithm.getExt() );//+ "."
if ( checksumFile.exists() )
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/a6c73dcd/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumerTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumerTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumerTest.java
index 8645ab0..6c0d8a7 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumerTest.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumerTest.java
@@ -62,26 +62,32 @@ public class ArtifactMissingChecksumsConsumerTest
{
String path = "/no-checksums-artifact/1.0/no-checksums-artifact-1.0.jar";
- Path sha1Path = Paths.get( repoConfig.getLocation(),
- path + ".sha1" );// new File( repoConfig.getLocation(), path + ".sha1" );
- Path md5FilePath =
- Paths.get( repoConfig.getLocation(), path + ".md5" );// new File( repoConfig.getLocation(), path + ".md5" );
+ Path sha1Path = Paths.get( repoConfig.getLocation(), path + ".sha1" );
+ Path md5FilePath = Paths.get( repoConfig.getLocation(), path + ".md5" );
Files.deleteIfExists( sha1Path );
Files.deleteIfExists( md5FilePath );
- //sha1File.delete();
- //md5File.delete();
-
- Assertions.assertThat( sha1Path.toFile() ).doesNotExist();// assertFalse( sha1File.exists() );
- Assertions.assertThat( md5FilePath.toFile() ).doesNotExist();// assertFalse( md5File.exists() );
+ Assertions.assertThat( sha1Path.toFile() ).doesNotExist();
+ Assertions.assertThat( md5FilePath.toFile() ).doesNotExist();
consumer.beginScan( repoConfig, Calendar.getInstance().getTime() );
consumer.processFile( path );
- Assertions.assertThat( sha1Path.toFile() ).exists();// assertTrue( sha1File.exists() );
- Assertions.assertThat( md5FilePath.toFile() ).exists();//assertTrue( md5File.exists() );
+ Assertions.assertThat( sha1Path.toFile() ).exists();
+ long sha1LastModified = sha1Path.toFile().lastModified();
+ Assertions.assertThat( md5FilePath.toFile() ).exists();
+ long md5LastModified = md5FilePath.toFile().lastModified();
+ Thread.sleep( 1 );
+ consumer.processFile( path );
+
+ Assertions.assertThat( sha1Path.toFile() ).exists();
+ Assertions.assertThat( md5FilePath.toFile() ).exists();
+
+ Assertions.assertThat( sha1Path.toFile().lastModified() ).isEqualTo( sha1LastModified );
+
+ Assertions.assertThat( md5FilePath.toFile().lastModified() ).isEqualTo( md5LastModified );
}
@Test
@@ -95,10 +101,8 @@ public class ArtifactMissingChecksumsConsumerTest
String path = "/incorrect-checksums/1.0/incorrect-checksums-1.0.jar";
- // new File( repoConfig.getLocation(), path + ".sha1" );
Path sha1Path = Paths.get( repoConfig.getLocation(), path + ".sha1" );
- //new File( repoConfig.getLocation(), path + ".md5" );
Path md5Path = Paths.get( repoConfig.getLocation(), path + ".md5" );
ChecksummedFile checksum = new ChecksummedFile( new File( repoConfig.getLocation(), path ) );