[maven-archiver] branch master updated: Sonar: fix reported issues
Locked
[maven-archiver] branch master updated: Sonar: fix reported issues
 
|
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-archiver.git The following commit(s) were added to refs/heads/master by this push: new df1a252 Sonar: fix reported issues df1a252 is described below commit df1a2527b31a66329f64197ffae0de62a01f5df7 Author: Sylwester Lachiewicz <[hidden email]> AuthorDate: Tue Jan 12 01:27:09 2021 +0100 Sonar: fix reported issues --- .../maven/archiver/ManifestConfiguration.java | 1 - .../org/apache/maven/archiver/ManifestSection.java | 3 +- .../maven/archiver/MavenArchiveConfiguration.java | 5 +- .../org/apache/maven/archiver/MavenArchiver.java | 97 +++++++++++----------- .../apache/maven/archiver/PomPropertiesUtil.java | 9 +- .../org/apache/maven/archiver/MockArtifact.java | 3 +- 6 files changed, 59 insertions(+), 59 deletions(-) diff --git a/src/main/java/org/apache/maven/archiver/ManifestConfiguration.java b/src/main/java/org/apache/maven/archiver/ManifestConfiguration.java index ccfc621..02e0f6b 100644 --- a/src/main/java/org/apache/maven/archiver/ManifestConfiguration.java +++ b/src/main/java/org/apache/maven/archiver/ManifestConfiguration.java @@ -23,7 +23,6 @@ package org.apache.maven.archiver; * Capture common manifest configuration. * * @author <a href="mailto:[hidden email]">Brett Porter</a> - * @version $Id$ */ // TODO Is this general enough to be in Plexus Archiver? public class ManifestConfiguration diff --git a/src/main/java/org/apache/maven/archiver/ManifestSection.java b/src/main/java/org/apache/maven/archiver/ManifestSection.java index e48fced..833ce68 100644 --- a/src/main/java/org/apache/maven/archiver/ManifestSection.java +++ b/src/main/java/org/apache/maven/archiver/ManifestSection.java @@ -23,14 +23,13 @@ import java.util.LinkedHashMap; import java.util.Map; /** - * @version $Id$ */ public class ManifestSection { private String name = null; - private Map<String, String> manifestEntries = new LinkedHashMap<String, String>(); + private final Map<String, String> manifestEntries = new LinkedHashMap<>(); /** * @param key The key of the manifest entry. diff --git a/src/main/java/org/apache/maven/archiver/MavenArchiveConfiguration.java b/src/main/java/org/apache/maven/archiver/MavenArchiveConfiguration.java index 01d772f..4fb179d 100644 --- a/src/main/java/org/apache/maven/archiver/MavenArchiveConfiguration.java +++ b/src/main/java/org/apache/maven/archiver/MavenArchiveConfiguration.java @@ -29,7 +29,6 @@ import java.util.Map; * Capture common archive configuration. * * @author <a href="mailto:[hidden email]">Brett Porter</a> - * @version $Id$ */ // TODO Is this general enough to be in Plexus Archiver? public class MavenArchiveConfiguration @@ -47,9 +46,9 @@ public class MavenArchiveConfiguration //TODO: Rename this attribute to manifestConfiguration; private ManifestConfiguration manifest; - private Map<String, String> manifestEntries = new LinkedHashMap<String, String>(); + private Map<String, String> manifestEntries = new LinkedHashMap<>(); - private List<ManifestSection> manifestSections = new LinkedList<ManifestSection>(); + private List<ManifestSection> manifestSections = new LinkedList<>(); /** * @since 2.2 diff --git a/src/main/java/org/apache/maven/archiver/MavenArchiver.java b/src/main/java/org/apache/maven/archiver/MavenArchiver.java index b8edf41..b6e91d2 100644 --- a/src/main/java/org/apache/maven/archiver/MavenArchiver.java +++ b/src/main/java/org/apache/maven/archiver/MavenArchiver.java @@ -54,10 +54,13 @@ import java.util.Properties; import java.util.Set; import java.util.jar.Attributes; +import static org.apache.maven.archiver.ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_CUSTOM; +import static org.apache.maven.archiver.ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_REPOSITORY; +import static org.apache.maven.archiver.ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_SIMPLE; + /** * @author <a href="[hidden email]">Emmanuel Venisse</a> * @author kama - * @version $Revision$ $Date$ */ public class MavenArchiver { @@ -94,7 +97,7 @@ public class MavenArchiver static { - List<String> artifactExpressionPrefixes = new ArrayList<String>(); + List<String> artifactExpressionPrefixes = new ArrayList<>(); artifactExpressionPrefixes.add( "artifact." ); ARTIFACT_EXPRESSION_PREFIXES = artifactExpressionPrefixes; @@ -298,7 +301,7 @@ public class MavenArchiver } else { - List<ValueSource> valueSources = new ArrayList<ValueSource>(); + List<ValueSource> valueSources = new ArrayList<>(); handleExtraExpression( artifact, valueSources ); @@ -312,48 +315,49 @@ public class MavenArchiver try { - if ( ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_SIMPLE.equals( layoutType ) ) - { - if ( config.isUseUniqueVersions() ) - { - classpath.append( interpolator.interpolate( SIMPLE_LAYOUT, recursionInterceptor ) ); - } - else - { - classpath.append( interpolator.interpolate( SIMPLE_LAYOUT_NONUNIQUE, - recursionInterceptor ) ); - } - } - else if ( ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_REPOSITORY.equals( layoutType ) ) - { - // we use layout /$groupId[0]/../${groupId[n]/$artifactId/$version/{fileName} - // here we must find the Artifact in the project Artifacts to create the maven layout - if ( config.isUseUniqueVersions() ) - { - classpath.append( interpolator.interpolate( REPOSITORY_LAYOUT, - recursionInterceptor ) ); - } - else - { - classpath.append( interpolator.interpolate( REPOSITORY_LAYOUT_NONUNIQUE, - recursionInterceptor ) ); - } - } - else if ( ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_CUSTOM.equals( layoutType ) ) - { - if ( layout == null ) - { - throw new ManifestException( ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_CUSTOM - + " layout type was declared, but custom layout expression was not" - + " specified. Check your <archive><manifest><customLayout/> element." ); - } - - classpath.append( interpolator.interpolate( layout, recursionInterceptor ) ); - } - else + switch ( layoutType ) { - throw new ManifestException( "Unknown classpath layout type: '" + layoutType - + "'. Check your <archive><manifest><layoutType/> element." ); + case CLASSPATH_LAYOUT_TYPE_SIMPLE: + if ( config.isUseUniqueVersions() ) + { + classpath.append( interpolator.interpolate( SIMPLE_LAYOUT, + recursionInterceptor ) ); + } + else + { + classpath.append( interpolator.interpolate( SIMPLE_LAYOUT_NONUNIQUE, + recursionInterceptor ) ); + } + break; + case CLASSPATH_LAYOUT_TYPE_REPOSITORY: + // we use layout /$groupId[0]/../${groupId[n]/$artifactId/$version/{fileName} + // here we must find the Artifact in the project Artifacts + // to create the maven layout + if ( config.isUseUniqueVersions() ) + { + classpath.append( interpolator.interpolate( REPOSITORY_LAYOUT, + recursionInterceptor ) ); + } + else + { + classpath.append( interpolator.interpolate( REPOSITORY_LAYOUT_NONUNIQUE, + recursionInterceptor ) ); + } + break; + case CLASSPATH_LAYOUT_TYPE_CUSTOM: + if ( layout == null ) + { + throw new ManifestException( CLASSPATH_LAYOUT_TYPE_CUSTOM + + " layout type was declared, but custom layout expression was not" + + " specified. Check your <archive><manifest><customLayout/>" + + " element." ); + } + + classpath.append( interpolator.interpolate( layout, recursionInterceptor ) ); + break; + default: + throw new ManifestException( "Unknown classpath layout type: '" + layoutType + + "'. Check your <archive><manifest><layoutType/> element." ); } } catch ( InterpolationException e ) @@ -445,7 +449,7 @@ public class MavenArchiver { // TODO: this is only for applets - should we distinguish them as a packaging? StringBuilder extensionsList = new StringBuilder(); - Set<Artifact> artifacts = (Set<Artifact>) project.getArtifacts(); + Set<Artifact> artifacts = project.getArtifacts(); for ( Artifact artifact : artifacts ) { @@ -579,8 +583,7 @@ public class MavenArchiver { // we have to clone the project instance so we can write out the pom with the deployment version, // without impacting the main project instance... - MavenProject workingProject = null; - workingProject = (MavenProject) project.clone(); + MavenProject workingProject = project.clone(); boolean forced = archiveConfiguration.isForced(); if ( archiveConfiguration.isAddMavenDescriptor() ) diff --git a/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java b/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java index e05b7f3..7da8883 100644 --- a/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java +++ b/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java @@ -65,8 +65,7 @@ public class PomPropertiesUtil return fileProps.equals( props ); } - private void createPropertiesFile( MavenSession session, Properties properties, File outputFile, - boolean forceCreation ) + private void createPropertiesFile( Properties properties, File outputFile, boolean forceCreation ) throws IOException { File outputDir = outputFile.getParentFile(); @@ -80,12 +79,12 @@ public class PomPropertiesUtil } try ( PrintWriter pw = new PrintWriter( outputFile, "ISO-8859-1" ); - StringWriter sw = new StringWriter(); ) + StringWriter sw = new StringWriter() ) { properties.store( sw, null ); - List<String> lines = new ArrayList<String>(); + List<String> lines = new ArrayList<>(); try ( BufferedReader r = new BufferedReader( new StringReader( sw.toString() ) ) ) { String line; @@ -142,7 +141,7 @@ public class PomPropertiesUtil p.setProperty( "version", version ); - createPropertiesFile( session, p, pomPropertiesFile, forceCreation ); + createPropertiesFile( p, pomPropertiesFile, forceCreation ); archiver.addFile( pomPropertiesFile, "META-INF/maven/" + groupId + "/" + artifactId + "/pom.properties" ); } diff --git a/src/test/java/org/apache/maven/archiver/MockArtifact.java b/src/test/java/org/apache/maven/archiver/MockArtifact.java index 0ae4972..3bd51f9 100644 --- a/src/test/java/org/apache/maven/archiver/MockArtifact.java +++ b/src/test/java/org/apache/maven/archiver/MockArtifact.java @@ -33,8 +33,9 @@ import java.util.Collection; import java.util.List; /** - * @todo move to maven-artifact-test + * TODO move to maven-artifact-test */ +@SuppressWarnings( "deprecation" ) class MockArtifact implements Artifact { |
«
Return to Maven - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |