You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2022/04/22 20:38:17 UTC
[maven-archiver] 02/04: [MSHARED-991] small code cleanup
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MSHARED-1003a
in repository https://gitbox.apache.org/repos/asf/maven-archiver.git
commit ceb5e2433b6416e21923befd1462775dea7ae83e
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Fri Apr 22 00:54:32 2022 +0200
[MSHARED-991] small code cleanup
---
src/main/java/org/apache/maven/archiver/MavenArchiver.java | 11 +++++------
.../java/org/apache/maven/archiver/PomPropertiesUtil.java | 4 ++--
.../java/org/apache/maven/archiver/MavenArchiverTest.java | 13 +++++--------
3 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/src/main/java/org/apache/maven/archiver/MavenArchiver.java b/src/main/java/org/apache/maven/archiver/MavenArchiver.java
index 5ece688..0e66008 100644
--- a/src/main/java/org/apache/maven/archiver/MavenArchiver.java
+++ b/src/main/java/org/apache/maven/archiver/MavenArchiver.java
@@ -129,7 +129,7 @@ public class MavenArchiver
{
boolean hasManifestEntries = !config.isManifestEntriesEmpty();
Map<String, String> entries =
- hasManifestEntries ? config.getManifestEntries() : Collections.<String, String>emptyMap();
+ hasManifestEntries ? config.getManifestEntries() : Collections.emptyMap();
Manifest manifest = getManifest( session, project, config.getManifest(), entries );
@@ -197,7 +197,7 @@ public class MavenArchiver
public Manifest getManifest( MavenProject project, ManifestConfiguration config )
throws ManifestException, DependencyResolutionRequiredException
{
- return getManifest( null, project, config, Collections.<String, String>emptyMap() );
+ return getManifest( null, project, config, Collections.emptyMap() );
}
/**
@@ -211,7 +211,7 @@ public class MavenArchiver
public Manifest getManifest( MavenSession mavenSession, MavenProject project, ManifestConfiguration config )
throws ManifestException, DependencyResolutionRequiredException
{
- return getManifest( mavenSession, project, config, Collections.<String, String>emptyMap() );
+ return getManifest( mavenSession, project, config, Collections.emptyMap() );
}
private void addManifestAttribute( Manifest manifest, Map<String, String> map, String key, String value )
@@ -471,11 +471,10 @@ public class MavenArchiver
addManifestAttribute( m, entries, "Extension-List", extensionsList.toString() );
}
- for ( Object artifact1 : artifacts )
+ for ( Artifact artifact : artifacts )
{
// TODO: the correct solution here would be to have an extension type, and to read
// the real extension values either from the artifact's manifest or some part of the POM
- Artifact artifact = (Artifact) artifact1;
if ( "jar".equals( artifact.getType() ) )
{
String artifactId = artifact.getArtifactId().replace( '.', '_' );
@@ -487,7 +486,7 @@ public class MavenArchiver
if ( artifact.getRepository() != null )
{
iname = artifactId + "-Implementation-URL";
- String url = artifact.getRepository().getUrl() + "/" + artifact.toString();
+ String url = artifact.getRepository().getUrl() + "/" + artifact;
addManifestAttribute( m, entries, iname, url );
}
}
diff --git a/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java b/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java
index 7da8883..1ee6066 100644
--- a/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java
+++ b/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java
@@ -21,12 +21,12 @@ package org.apache.maven.archiver;
import java.io.BufferedReader;
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintWriter;
import java.io.StringReader;
import java.io.StringWriter;
+import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -46,7 +46,7 @@ public class PomPropertiesUtil
throws IOException
{
Properties fileProps = new Properties();
- try ( InputStream istream = new FileInputStream( file ) )
+ try ( InputStream istream = Files.newInputStream( file.toPath() ) )
{
fileProps.load( istream );
return fileProps;
diff --git a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
index 029d3fb..b82f455 100644
--- a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
+++ b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
@@ -23,7 +23,6 @@ import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DependencyResolutionRequiredException;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.DefaultArtifactHandler;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.execution.DefaultMavenExecutionRequest;
import org.apache.maven.execution.DefaultMavenExecutionResult;
import org.apache.maven.execution.MavenExecutionRequest;
@@ -1221,9 +1220,9 @@ public class MavenArchiverTest
model.setVersion( "0.1.1" );
final MavenProject project = new MavenProject( model );
- project.setExtensionArtifacts( Collections.<Artifact>emptySet() );
- project.setRemoteArtifactRepositories( Collections.<ArtifactRepository>emptyList() );
- project.setPluginArtifactRepositories( Collections.<ArtifactRepository>emptyList() );
+ project.setExtensionArtifacts( Collections.emptySet() );
+ project.setRemoteArtifactRepositories( Collections.emptyList() );
+ project.setPluginArtifactRepositories( Collections.emptyList() );
return project;
}
@@ -1392,15 +1391,13 @@ public class MavenArchiverTest
private MavenSession getDummySession( Properties systemProperties )
{
- File settings = null;
- List<String> goals = null;
Date startTime = new Date();
MavenExecutionRequest request = new DefaultMavenExecutionRequest();
request.setSystemProperties( systemProperties );
- request.setGoals( goals );
+ request.setGoals( null );
request.setStartTime( startTime );
- request.setUserSettingsFile( settings );
+ request.setUserSettingsFile( null );
MavenExecutionResult result = new DefaultMavenExecutionResult();