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 2014/04/17 02:46:18 UTC
git commit: more code simplification with 1.7 features
Repository: archiva
Updated Branches:
refs/heads/master 0a21a1167 -> 213296539
more code simplification with 1.7 features
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/21329653
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/21329653
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/21329653
Branch: refs/heads/master
Commit: 2132965397ca7d93a66c2eea3dfce98ca377268d
Parents: 0a21a11
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu Apr 17 10:46:06 2014 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Apr 17 10:46:06 2014 +1000
----------------------------------------------------------------------
.../java/org/apache/archiva/cli/ArchivaCli.java | 4 +---
.../artifact/LegacyToDefaultConverter.java | 19 ++++---------------
.../consumers/core/ValidateChecksumConsumer.java | 12 ------------
.../indexing/DownloadRemoteIndexTask.java | 7 +------
.../storage/maven2/Maven2RepositoryStorage.java | 17 ++++-------------
.../repository/file/FileMetadataRepository.java | 3 ++-
.../DuplicateArtifactsConsumerTest.java | 7 +++----
7 files changed, 15 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/21329653/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java
----------------------------------------------------------------------
diff --git a/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java b/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java
index 25e9947..ae43387 100644
--- a/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java
+++ b/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java
@@ -38,8 +38,6 @@ import org.apache.maven.artifact.manager.WagonManager;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
@@ -255,7 +253,7 @@ public class ArchivaCli
}
private void doConversion( String properties )
- throws FileNotFoundException, IOException, RepositoryConversionException, PlexusSisuBridgeException
+ throws IOException, RepositoryConversionException, PlexusSisuBridgeException
{
LegacyRepositoryConverter legacyRepositoryConverter = lookup( LegacyRepositoryConverter.class );
http://git-wip-us.apache.org/repos/asf/archiva/blob/21329653/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java b/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java
index 3635408..ba8bf27 100644
--- a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java
+++ b/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java
@@ -51,12 +51,12 @@ import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
import java.io.IOException;
+import java.io.Reader;
import java.io.StringReader;
import java.io.StringWriter;
import java.nio.charset.Charset;
+import java.nio.file.Files;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -393,24 +393,13 @@ public class LegacyToDefaultConverter
private Metadata readMetadata( File file )
throws ArtifactConversionException
{
- Metadata metadata;
MetadataXpp3Reader reader = new MetadataXpp3Reader();
- try (FileReader fileReader = new FileReader( file ))
+ try (Reader fileReader = Files.newBufferedReader( file.toPath(), Charset.defaultCharset() ))
{
return reader.read( fileReader );
}
- catch ( FileNotFoundException e )
- {
- throw new ArtifactConversionException( Messages.getString( "error.reading.target.metadata" ),
- e ); //$NON-NLS-1$
- }
- catch ( IOException e )
- {
- throw new ArtifactConversionException( Messages.getString( "error.reading.target.metadata" ),
- e ); //$NON-NLS-1$
- }
- catch ( XmlPullParserException e )
+ catch ( IOException | XmlPullParserException e )
{
throw new ArtifactConversionException( Messages.getString( "error.reading.target.metadata" ),
e ); //$NON-NLS-1$
http://git-wip-us.apache.org/repos/asf/archiva/blob/21329653/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ValidateChecksumConsumer.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ValidateChecksumConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ValidateChecksumConsumer.java
index 0a8f22f..07f108c 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ValidateChecksumConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ValidateChecksumConsumer.java
@@ -60,24 +60,12 @@ public class ValidateChecksumConsumer
private static final String CHECKSUM_IO_ERROR = "checksum-io-error";
- /**
- * default-value="validate-checksums"
- */
private String id = "validate-checksums";
- /**
- * default-value="Validate checksums against file."
- */
private String description = "Validate checksums against file.";
- /**
- *
- */
private ChecksumFile checksum;
- /**
- *
- */
private List<Digester> allDigesters;
@Inject
http://git-wip-us.apache.org/repos/asf/archiva/blob/21329653/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java
index 4ae8d22..6a9a396 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java
@@ -50,7 +50,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
@@ -352,11 +351,7 @@ public class DownloadRemoteIndexTask
wagon.get( addParameters( name, this.remoteRepository ), file );
return Files.newInputStream( file.toPath() );
}
- catch ( AuthorizationException e )
- {
- throw new IOException( e.getMessage(), e );
- }
- catch ( TransferFailedException e )
+ catch ( AuthorizationException | TransferFailedException e )
{
throw new IOException( e.getMessage(), e );
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/21329653/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
index c7303ce..0543c33 100644
--- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
+++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
@@ -87,6 +87,8 @@ import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.FilenameFilter;
import java.io.IOException;
+import java.io.Reader;
+import java.nio.charset.Charset;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Arrays;
@@ -688,19 +690,12 @@ public class Maven2RepositoryStorage
try
{
// MavenXpp3Reader leaves the file open, so we need to close it ourselves.
- FileReader reader = new FileReader( pom );
+
Model model = null;
- try
+ try (Reader reader = Files.newBufferedReader( pom.toPath(), Charset.defaultCharset() ))
{
model = MAVEN_XPP_3_READER.read( reader );
}
- finally
- {
- if ( reader != null )
- {
- reader.close();
- }
- }
DistributionManagement dist = model.getDistributionManagement();
if ( dist != null )
@@ -724,10 +719,6 @@ public class Maven2RepositoryStorage
}
}
}
- catch ( FileNotFoundException e )
- {
- // Artifact has no POM in repo : ignore
- }
catch ( IOException e )
{
// Unable to read POM : ignore.
http://git-wip-us.apache.org/repos/asf/archiva/blob/21329653/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java b/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
index 15129c9..e04c7d3 100644
--- a/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
+++ b/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
@@ -46,6 +46,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.file.Files;
+import java.nio.file.NoSuchFileException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -857,7 +858,7 @@ public class FileMetadataRepository
{
return readProperties( directory, propertiesKey );
}
- catch ( FileNotFoundException e )
+ catch ( FileNotFoundException | NoSuchFileException e )
{
// ignore and return new properties
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/21329653/archiva-modules/plugins/problem-reports/src/test/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumerTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/problem-reports/src/test/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumerTest.java b/archiva-modules/plugins/problem-reports/src/test/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumerTest.java
index 750b112..b86bee0 100644
--- a/archiva-modules/plugins/problem-reports/src/test/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumerTest.java
+++ b/archiva-modules/plugins/problem-reports/src/test/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumerTest.java
@@ -21,6 +21,7 @@ package org.apache.archiva.reports.consumers;
import junit.framework.TestCase;
import org.apache.archiva.admin.model.beans.ManagedRepository;
+import org.apache.archiva.consumers.ConsumerException;
import org.apache.archiva.metadata.model.ArtifactMetadata;
import org.apache.archiva.metadata.model.MetadataFacet;
import org.apache.archiva.metadata.repository.MetadataRepository;
@@ -28,26 +29,24 @@ import org.apache.archiva.metadata.repository.RepositorySession;
import org.apache.archiva.metadata.repository.RepositorySessionFactory;
import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator;
import org.apache.archiva.reports.RepositoryProblemFacet;
-import org.apache.archiva.consumers.ConsumerException;
+import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Matchers;
import org.springframework.context.ApplicationContext;
+import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import javax.inject.Inject;
import javax.inject.Named;
import java.io.File;
-import java.io.FileNotFoundException;
import java.nio.file.NoSuchFileException;
import java.util.Arrays;
import java.util.Date;
-import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
import static org.mockito.Mockito.*;
-import org.springframework.test.annotation.DirtiesContext;
@SuppressWarnings( { "ThrowableInstanceNeverThrown" } )
@RunWith( ArchivaSpringJUnit4ClassRunner.class )