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 2019/10/19 20:01:53 UTC
[maven-shared-jar] 01/01: [MSHARED-824] Move code to Java 7 level
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MSHARED-824
in repository https://gitbox.apache.org/repos/asf/maven-shared-jar.git
commit cfd311c6330cfbde26ac54ecde35b538af0aec1b
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat Oct 19 22:00:55 2019 +0200
[MSHARED-824] Move code to Java 7 level
---
.../org/apache/maven/shared/jar/JarAnalyzer.java | 2 +-
.../maven/shared/jar/classes/ImportVisitor.java | 2 +-
.../shared/jar/classes/JarClassesAnalysis.java | 8 +++----
.../jar/identification/JarIdentification.java | 10 ++++-----
.../exposers/EmbeddedMavenModelExposer.java | 2 +-
.../exposers/RepositorySearchExposer.java | 2 +-
.../identification/exposers/TextFileExposer.java | 11 ++--------
.../hash/JarBytecodeHashAnalyzer.java | 25 +++++-----------------
.../shared/jar/AbstractJarAnalyzerTestCase.java | 15 +++++++------
.../apache/maven/shared/jar/JarAnalyzerTest.java | 1 -
10 files changed, 28 insertions(+), 50 deletions(-)
diff --git a/src/main/java/org/apache/maven/shared/jar/JarAnalyzer.java b/src/main/java/org/apache/maven/shared/jar/JarAnalyzer.java
index 01de394..077e0d9 100644
--- a/src/main/java/org/apache/maven/shared/jar/JarAnalyzer.java
+++ b/src/main/java/org/apache/maven/shared/jar/JarAnalyzer.java
@@ -173,7 +173,7 @@ public class JarAnalyzer
*/
public List<JarEntry> filterEntries( Pattern pattern )
{
- List<JarEntry> ret = new ArrayList<JarEntry>();
+ List<JarEntry> ret = new ArrayList<>();
for ( JarEntry entry : getEntries() )
{
diff --git a/src/main/java/org/apache/maven/shared/jar/classes/ImportVisitor.java b/src/main/java/org/apache/maven/shared/jar/classes/ImportVisitor.java
index 6f78bb6..94026d1 100644
--- a/src/main/java/org/apache/maven/shared/jar/classes/ImportVisitor.java
+++ b/src/main/java/org/apache/maven/shared/jar/classes/ImportVisitor.java
@@ -153,7 +153,7 @@ public class ImportVisitor
// Double ".." indicates a bad class fail-fast.
// Seen when ConstantUTF8 Pool has regex patterns.
- if ( ret.indexOf( ".." ) != -1 )
+ if ( ret.contains( ".." ) )
{
return;
}
diff --git a/src/main/java/org/apache/maven/shared/jar/classes/JarClassesAnalysis.java b/src/main/java/org/apache/maven/shared/jar/classes/JarClassesAnalysis.java
index e0a92cc..141d1d5 100644
--- a/src/main/java/org/apache/maven/shared/jar/classes/JarClassesAnalysis.java
+++ b/src/main/java/org/apache/maven/shared/jar/classes/JarClassesAnalysis.java
@@ -114,9 +114,9 @@ public class JarClassesAnalysis
}
Method[] methods = javaClass.getMethods();
- for ( int i = 0; i < methods.length; i++ )
+ for ( Method method : methods )
{
- classes.addMethod( classSignature + "." + methods[i].getName() + methods[i].getSignature() );
+ classes.addMethod( classSignature + "." + method.getName() + method.getSignature() );
}
String classPackageName = javaClass.getPackageName();
@@ -183,9 +183,9 @@ public class JarClassesAnalysis
{
boolean ret = false;
Method[] methods = javaClass.getMethods();
- for ( int i = 0; i < methods.length; i++ )
+ for ( Method method : methods )
{
- LineNumberTable linenumbers = methods[i].getLineNumberTable();
+ LineNumberTable linenumbers = method.getLineNumberTable();
if ( linenumbers != null && linenumbers.getLength() > 0 )
{
ret = true;
diff --git a/src/main/java/org/apache/maven/shared/jar/identification/JarIdentification.java b/src/main/java/org/apache/maven/shared/jar/identification/JarIdentification.java
index 7a01a51..d0d341d 100644
--- a/src/main/java/org/apache/maven/shared/jar/identification/JarIdentification.java
+++ b/src/main/java/org/apache/maven/shared/jar/identification/JarIdentification.java
@@ -57,27 +57,27 @@ public class JarIdentification
/**
* The list of possible group IDs discovered.
*/
- private List<String> potentialGroupIds = new ArrayList<String>();
+ private List<String> potentialGroupIds = new ArrayList<>();
/**
* The list of possible artifact IDs discovered.
*/
- private List<String> potentialArtifactIds = new ArrayList<String>();
+ private List<String> potentialArtifactIds = new ArrayList<>();
/**
* The list of possible versions discovered.
*/
- private List<String> potentialVersions = new ArrayList<String>();
+ private List<String> potentialVersions = new ArrayList<>();
/**
* The list of possible artifact names discovered.
*/
- private List<String> potentialNames = new ArrayList<String>();
+ private List<String> potentialNames = new ArrayList<>();
/**
* The list of possible vendors discovered.
*/
- private List<String> potentialVendors = new ArrayList<String>();
+ private List<String> potentialVendors = new ArrayList<>();
/**
* Add a validated group ID.
diff --git a/src/main/java/org/apache/maven/shared/jar/identification/exposers/EmbeddedMavenModelExposer.java b/src/main/java/org/apache/maven/shared/jar/identification/exposers/EmbeddedMavenModelExposer.java
index 380b92f..bdcd9cf 100644
--- a/src/main/java/org/apache/maven/shared/jar/identification/exposers/EmbeddedMavenModelExposer.java
+++ b/src/main/java/org/apache/maven/shared/jar/identification/exposers/EmbeddedMavenModelExposer.java
@@ -59,7 +59,7 @@ public class EmbeddedMavenModelExposer
"More than one Maven model entry was found in the JAR, using only the first of: " + entries );
}
- JarEntry pom = (JarEntry) entries.get( 0 );
+ JarEntry pom = entries.get( 0 );
MavenXpp3Reader pomreader = new MavenXpp3Reader();
InputStream is = null;
try
diff --git a/src/main/java/org/apache/maven/shared/jar/identification/exposers/RepositorySearchExposer.java b/src/main/java/org/apache/maven/shared/jar/identification/exposers/RepositorySearchExposer.java
index a40efc1..2e83512 100644
--- a/src/main/java/org/apache/maven/shared/jar/identification/exposers/RepositorySearchExposer.java
+++ b/src/main/java/org/apache/maven/shared/jar/identification/exposers/RepositorySearchExposer.java
@@ -70,7 +70,7 @@ public class RepositorySearchExposer
public void expose( JarIdentification identification, JarAnalyzer jarAnalyzer )
{
- List<Artifact> repohits = new ArrayList<Artifact>();
+ List<Artifact> repohits = new ArrayList<>();
String hash = fileHashAnalyzer.computeHash( jarAnalyzer );
if ( hash != null )
diff --git a/src/main/java/org/apache/maven/shared/jar/identification/exposers/TextFileExposer.java b/src/main/java/org/apache/maven/shared/jar/identification/exposers/TextFileExposer.java
index ade4639..06628d6 100644
--- a/src/main/java/org/apache/maven/shared/jar/identification/exposers/TextFileExposer.java
+++ b/src/main/java/org/apache/maven/shared/jar/identification/exposers/TextFileExposer.java
@@ -23,7 +23,6 @@ import org.apache.maven.shared.jar.JarAnalyzer;
import org.apache.maven.shared.jar.identification.JarIdentification;
import org.apache.maven.shared.jar.identification.JarIdentificationExposer;
import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.apache.maven.shared.utils.io.IOUtil;
import org.apache.maven.shared.utils.StringUtils;
import java.io.BufferedReader;
@@ -56,7 +55,7 @@ public class TextFileExposer
private List<String> findTextFileVersions( JarAnalyzer jarAnalyzer )
{
- List<String> textVersions = new ArrayList<String>();
+ List<String> textVersions = new ArrayList<>();
List<JarEntry> hits = jarAnalyzer.getVersionEntries();
for ( JarEntry entry : hits )
@@ -65,10 +64,8 @@ public class TextFileExposer
if ( !entry.getName().endsWith( ".class" ) ) //$NON-NLS-1$
{
getLogger().debug( "Version Hit: " + entry.getName() );
- InputStream is = null;
- try
+ try ( InputStream is = jarAnalyzer.getEntryInputStream( entry ) )
{
- is = jarAnalyzer.getEntryInputStream( entry );
BufferedReader br = new BufferedReader( new InputStreamReader( is ) );
String line = br.readLine();
@@ -85,10 +82,6 @@ public class TextFileExposer
{
getLogger().warn( "Unable to read line from " + entry.getName(), e );
}
- finally
- {
- IOUtil.close( is );
- }
}
}
return textVersions;
diff --git a/src/main/java/org/apache/maven/shared/jar/identification/hash/JarBytecodeHashAnalyzer.java b/src/main/java/org/apache/maven/shared/jar/identification/hash/JarBytecodeHashAnalyzer.java
index 8db7a6b..b45099e 100644
--- a/src/main/java/org/apache/maven/shared/jar/identification/hash/JarBytecodeHashAnalyzer.java
+++ b/src/main/java/org/apache/maven/shared/jar/identification/hash/JarBytecodeHashAnalyzer.java
@@ -24,7 +24,6 @@ import org.apache.maven.shared.jar.JarData;
import org.codehaus.plexus.digest.DigesterException;
import org.codehaus.plexus.digest.StreamingDigester;
import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.apache.maven.shared.utils.io.IOUtil;
import java.io.IOException;
import java.io.InputStream;
@@ -65,16 +64,15 @@ public class JarBytecodeHashAnalyzer
digester.reset();
for ( JarEntry entry : entries )
{
- computeEntryBytecodeHash( jarAnalyzer.getEntryInputStream( entry ) );
+ try ( InputStream is = jarAnalyzer.getEntryInputStream( entry ) )
+ {
+ digester.update( is );
+ }
}
result = digester.calc();
jarData.setBytecodeHash( result );
}
- catch ( DigesterException e )
- {
- getLogger().warn( "Unable to calculate the hashcode.", e );
- }
- catch ( IOException e )
+ catch ( DigesterException | IOException e )
{
getLogger().warn( "Unable to calculate the hashcode.", e );
}
@@ -82,19 +80,6 @@ public class JarBytecodeHashAnalyzer
return result;
}
- private void computeEntryBytecodeHash( InputStream is )
- throws IOException, DigesterException
- {
- try
- {
- digester.update( is );
- }
- finally
- {
- IOUtil.close( is );
- }
- }
-
public void setDigester( StreamingDigester digester )
{
this.digester = digester;
diff --git a/src/test/java/org/apache/maven/shared/jar/AbstractJarAnalyzerTestCase.java b/src/test/java/org/apache/maven/shared/jar/AbstractJarAnalyzerTestCase.java
index 780ecc4..f391a7a 100644
--- a/src/test/java/org/apache/maven/shared/jar/AbstractJarAnalyzerTestCase.java
+++ b/src/test/java/org/apache/maven/shared/jar/AbstractJarAnalyzerTestCase.java
@@ -24,7 +24,6 @@ import org.codehaus.plexus.PlexusTestCase;
import java.io.File;
import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.Collection;
@@ -32,23 +31,25 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
/**
* Abstract JarAnalyzer TestCase
*/
public abstract class AbstractJarAnalyzerTestCase
extends PlexusTestCase
{
- public File getSampleJar( String filename )
- throws MalformedURLException, UnsupportedEncodingException
+ protected File getSampleJar( String filename )
+ throws UnsupportedEncodingException
{
String path = getClass().getResource( "/jars/" + filename ).getPath();
// URLDecoder.decode necessary for JDK 1.5+, where spaces are escaped to %20
- return new File( URLDecoder.decode( path, "UTF-8" ) );
+ return new File( URLDecoder.decode( path, UTF_8.name() ) );
}
- public void assertNotContainsRegex( String msg, String regex, Collection<String> coll )
+ protected void assertNotContainsRegex( String msg, String regex, Collection<String> coll )
{
- List<String> failures = new ArrayList<String>();
+ List<String> failures = new ArrayList<>();
Pattern pat = Pattern.compile( regex );
for ( String value : coll )
{
@@ -61,7 +62,7 @@ public abstract class AbstractJarAnalyzerTestCase
if ( !failures.isEmpty() )
{
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append( msg ).append( " collection has illegal regex \"" ).append( regex ).append( "\"" );
for ( String failure : failures )
{
diff --git a/src/test/java/org/apache/maven/shared/jar/JarAnalyzerTest.java b/src/test/java/org/apache/maven/shared/jar/JarAnalyzerTest.java
index 74d5d63..a31322b 100644
--- a/src/test/java/org/apache/maven/shared/jar/JarAnalyzerTest.java
+++ b/src/test/java/org/apache/maven/shared/jar/JarAnalyzerTest.java
@@ -71,7 +71,6 @@ public class JarAnalyzerTest
}
public void testMissingFile()
- throws Exception
{
try
{