Author: brett
Date: Thu Dec 29 22:42:13 2005
New Revision: 360003
URL: http://svn.apache.org/viewcvs?rev=360003&view=rev
Log:
null pointer safety
Modified:
maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java
maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java
maven/repository-manager/trunk/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/ChecksumArtifactReporter.java
maven/repository-manager/trunk/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/InvalidPomArtifactReportProcessor.java
maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractChecksumArtifactReporterTest.java
Modified:
maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java?rev=360003&r1=360002&r2=360003&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java
(original)
+++
maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java
Thu Dec 29 22:42:13 2005
@@ -81,14 +81,14 @@
{
String path = (String) i.next();
- found = path.equals( "KEYS" );
+ found = "KEYS".equals( path );
}
assertTrue( "Check exclusion was found", found );
for ( Iterator i = artifacts.iterator(); i.hasNext(); )
{
Artifact a = (Artifact) i.next();
- assertFalse( "Check not KEYS", a.getFile().getName().equals(
"KEYS" ) );
+ assertFalse( "Check not KEYS", "KEYS".equals(
a.getFile().getName() ) );
}
}
@@ -101,7 +101,7 @@
{
String path = (String) i.next();
- found = path.replace( '\\', '/' ).equals(
"javax/sql/jdbc/2.0/jdbc-2.0.jar" );
+ found = "javax/sql/jdbc/2.0/jdbc-2.0.jar".equals( path.replace(
'\\', '/' ) );
}
assertTrue( "Check exclusion was found", found );
@@ -117,14 +117,14 @@
{
String path = (String) i.next();
- found = path.replace( '\\', '/' ).equals(
"invalid/invalid-1.0.jar" );
+ found = "invalid/invalid-1.0.jar".equals( path.replace( '\\', '/'
) );
}
assertTrue( "Check kickout was found", found );
for ( Iterator i = artifacts.iterator(); i.hasNext(); )
{
Artifact a = (Artifact) i.next();
- assertFalse( "Check not invalid-1.0.jar",
a.getFile().getName().equals( "invalid-1.0.jar" ) );
+ assertFalse( "Check not invalid-1.0.jar",
"invalid-1.0.jar".equals( a.getFile().getName() ) );
}
}
@@ -137,8 +137,8 @@
{
String path = (String) i.next();
- found = path.replace( '\\', '/' ).equals(
-
"org/apache/maven/test/1.0-SNAPSHOT/wrong-artifactId-1.0-20050611.112233-1.jar"
);
+ found =
"org/apache/maven/test/1.0-SNAPSHOT/wrong-artifactId-1.0-20050611.112233-1.jar".equals(
+ path.replace( '\\', '/' ) );
}
assertTrue( "Check kickout was found", found );
@@ -146,7 +146,7 @@
{
Artifact a = (Artifact) i.next();
assertFalse( "Check not wrong jar",
- a.getFile().getName().equals(
"wrong-artifactId-1.0-20050611.112233-1.jar" ) );
+ "wrong-artifactId-1.0-20050611.112233-1.jar".equals(
a.getFile().getName() ) );
}
}
@@ -159,14 +159,14 @@
{
String path = (String) i.next();
- found = path.replace( '\\', '/' ).equals(
"invalid/invalid/1/invalid-1" );
+ found = "invalid/invalid/1/invalid-1".equals( path.replace( '\\',
'/' ) );
}
assertTrue( "Check kickout was found", found );
for ( Iterator i = artifacts.iterator(); i.hasNext(); )
{
Artifact a = (Artifact) i.next();
- assertFalse( "Check not 'invalid-1'",
a.getFile().getName().equals( "invalid-1" ) );
+ assertFalse( "Check not 'invalid-1'", "invalid-1".equals(
a.getFile().getName() ) );
}
}
@@ -179,14 +179,14 @@
{
String path = (String) i.next();
- found = path.replace( '\\', '/' ).equals(
"invalid/invalid/1.0/invalid-2.0.jar" );
+ found = "invalid/invalid/1.0/invalid-2.0.jar".equals(
path.replace( '\\', '/' ) );
}
assertTrue( "Check kickout was found", found );
for ( Iterator i = artifacts.iterator(); i.hasNext(); )
{
Artifact a = (Artifact) i.next();
- assertFalse( "Check not 'invalid-2.0.jar'",
a.getFile().getName().equals( "invalid-2.0.jar" ) );
+ assertFalse( "Check not 'invalid-2.0.jar'",
"invalid-2.0.jar".equals( a.getFile().getName() ) );
}
}
@@ -199,14 +199,14 @@
{
String path = (String) i.next();
- found = path.replace( '\\', '/' ).equals(
"invalid/invalid/1.0/invalid-1.0b.jar" );
+ found = "invalid/invalid/1.0/invalid-1.0b.jar".equals(
path.replace( '\\', '/' ) );
}
assertTrue( "Check kickout was found", found );
for ( Iterator i = artifacts.iterator(); i.hasNext(); )
{
Artifact a = (Artifact) i.next();
- assertFalse( "Check not 'invalid-1.0b.jar'",
a.getFile().getName().equals( "invalid-1.0b.jar" ) );
+ assertFalse( "Check not 'invalid-1.0b.jar'",
"invalid-1.0b.jar".equals( a.getFile().getName() ) );
}
}
@@ -219,14 +219,14 @@
{
String path = (String) i.next();
- found = path.replace( '\\', '/' ).equals(
"invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar" );
+ found = "invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar".equals(
path.replace( '\\', '/' ) );
}
assertTrue( "Check kickout was found", found );
for ( Iterator i = artifacts.iterator(); i.hasNext(); )
{
Artifact a = (Artifact) i.next();
- assertFalse( "Check not 'invalid-1.0.jar'",
a.getFile().getName().equals( "invalid-1.0.jar" ) );
+ assertFalse( "Check not 'invalid-1.0.jar'",
"invalid-1.0.jar".equals( a.getFile().getName() ) );
}
}
@@ -239,8 +239,8 @@
{
String path = (String) i.next();
- found = path.replace( '\\', '/' ).equals(
-
"invalid/invalid/1.0-20050611.123456-1/invalid-1.0-20050611.123456-1.jar" );
+ found =
"invalid/invalid/1.0-20050611.123456-1/invalid-1.0-20050611.123456-1.jar".equals(
+ path.replace( '\\', '/' ) );
}
assertTrue( "Check kickout was found", found );
@@ -248,7 +248,7 @@
{
Artifact a = (Artifact) i.next();
assertFalse( "Check not 'invalid-1.0-20050611-123456-1.jar'",
- a.getFile().getName().equals(
"invalid-1.0-20050611.123456-1.jar" ) );
+ "invalid-1.0-20050611.123456-1.jar".equals(
a.getFile().getName() ) );
}
}
Modified:
maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java?rev=360003&r1=360002&r2=360003&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java
(original)
+++
maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java
Thu Dec 29 22:42:13 2005
@@ -81,14 +81,14 @@
{
String path = (String) i.next();
- found = path.equals( "KEYS" );
+ found = "KEYS".equals( path );
}
assertTrue( "Check exclusion was found", found );
for ( Iterator i = artifacts.iterator(); i.hasNext(); )
{
Artifact a = (Artifact) i.next();
- assertFalse( "Check not KEYS", a.getFile().getName().equals(
"KEYS" ) );
+ assertFalse( "Check not KEYS", "KEYS".equals(
a.getFile().getName() ) );
}
}
@@ -101,7 +101,7 @@
{
String path = (String) i.next();
- found = path.replace( '\\', '/' ).equals(
"javax.sql/jars/jdbc-2.0.jar" );
+ found = "javax.sql/jars/jdbc-2.0.jar".equals( path.replace( '\\',
'/' ) );
}
assertTrue( "Check exclusion was found", found );
@@ -117,14 +117,14 @@
{
String path = (String) i.next();
- found = path.replace( '\\', '/' ).equals(
"invalid/invalid-1.0.jar" );
+ found = "invalid/invalid-1.0.jar".equals( path.replace( '\\', '/'
) );
}
assertTrue( "Check kickout was found", found );
for ( Iterator i = artifacts.iterator(); i.hasNext(); )
{
Artifact a = (Artifact) i.next();
- assertFalse( "Check not invalid-1.0.jar",
a.getFile().getName().equals( "invalid-1.0.jar" ) );
+ assertFalse( "Check not invalid-1.0.jar",
"invalid-1.0.jar".equals( a.getFile().getName() ) );
}
}
@@ -137,14 +137,14 @@
{
String path = (String) i.next();
- found = path.replace( '\\', '/' ).equals(
"invalid/jars/1.0/invalid-1.0.jar" );
+ found = "invalid/jars/1.0/invalid-1.0.jar".equals( path.replace(
'\\', '/' ) );
}
assertTrue( "Check kickout was found", found );
for ( Iterator i = artifacts.iterator(); i.hasNext(); )
{
Artifact a = (Artifact) i.next();
- assertFalse( "Check not invalid-1.0.jar",
a.getFile().getName().equals( "invalid-1.0.jar" ) );
+ assertFalse( "Check not invalid-1.0.jar",
"invalid-1.0.jar".equals( a.getFile().getName() ) );
}
}
@@ -157,14 +157,14 @@
{
String path = (String) i.next();
- found = path.replace( '\\', '/' ).equals(
"invalid/foo/invalid-1.0.foo" );
+ found = "invalid/foo/invalid-1.0.foo".equals( path.replace( '\\',
'/' ) );
}
assertTrue( "Check kickout was found", found );
for ( Iterator i = artifacts.iterator(); i.hasNext(); )
{
Artifact a = (Artifact) i.next();
- assertFalse( "Check not invalid-1.0.foo",
a.getFile().getName().equals( "invalid-1.0.foo" ) );
+ assertFalse( "Check not invalid-1.0.foo",
"invalid-1.0.foo".equals( a.getFile().getName() ) );
}
}
@@ -177,14 +177,14 @@
{
String path = (String) i.next();
- found = path.replace( '\\', '/' ).equals(
"invalid/jars/no-extension" );
+ found = "invalid/jars/no-extension".equals( path.replace( '\\',
'/' ) );
}
assertTrue( "Check kickout was found", found );
for ( Iterator i = artifacts.iterator(); i.hasNext(); )
{
Artifact a = (Artifact) i.next();
- assertFalse( "Check not 'no-extension'",
a.getFile().getName().equals( "no-extension" ) );
+ assertFalse( "Check not 'no-extension'", "no-extension".equals(
a.getFile().getName() ) );
}
}
@@ -197,14 +197,14 @@
{
String path = (String) i.next();
- found = path.replace( '\\', '/' ).equals(
"invalid/jars/invalid-1.0.rar" );
+ found = "invalid/jars/invalid-1.0.rar".equals( path.replace( '\\',
'/' ) );
}
assertTrue( "Check kickout was found", found );
for ( Iterator i = artifacts.iterator(); i.hasNext(); )
{
Artifact a = (Artifact) i.next();
- assertFalse( "Check not 'invalid-1.0.rar'",
a.getFile().getName().equals( "invalid-1.0.rar" ) );
+ assertFalse( "Check not 'invalid-1.0.rar'",
"invalid-1.0.rar".equals( a.getFile().getName() ) );
}
}
@@ -217,14 +217,14 @@
{
String path = (String) i.next();
- found = path.replace( '\\', '/' ).equals(
"invalid/jars/invalid.jar" );
+ found = "invalid/jars/invalid.jar".equals( path.replace( '\\', '/'
) );
}
assertTrue( "Check kickout was found", found );
for ( Iterator i = artifacts.iterator(); i.hasNext(); )
{
Artifact a = (Artifact) i.next();
- assertFalse( "Check not 'invalid.jar'",
a.getFile().getName().equals( "invalid.jar" ) );
+ assertFalse( "Check not 'invalid.jar'", "invalid.jar".equals(
a.getFile().getName() ) );
}
}
Modified:
maven/repository-manager/trunk/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/ChecksumArtifactReporter.java
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/ChecksumArtifactReporter.java?rev=360003&r1=360002&r2=360003&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/ChecksumArtifactReporter.java
(original)
+++
maven/repository-manager/trunk/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/ChecksumArtifactReporter.java
Thu Dec 29 22:42:13 2005
@@ -64,7 +64,7 @@
String artifactUrl = "";
String repositoryUrl = "";
- if ( !repository.getProtocol().equals( "file" ) )
+ if ( !"file".equals( repository.getProtocol() ) )
{
isLocal = false;
repositoryUrl = repository.getUrl();
@@ -126,7 +126,7 @@
// .println( "====================================== +++++ PROCESS
METADATA +++++ ==============================" );
String metadataUrl = "", repositoryUrl = "", filename = "";
- if ( !repository.getProtocol().equals( "file" ) )
+ if ( !"file".equals( repository.getProtocol() ) )
{
isLocal = false;
repositoryUrl = repository.getUrl() + "/";
@@ -269,7 +269,7 @@
{
//Create checksum for jar file
String ext = ".md5";
- if ( algo.equals( "SHA-1" ) )
+ if ( "SHA-1".equals( algo ) )
{
ext = ".sha1";
}
Modified:
maven/repository-manager/trunk/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/InvalidPomArtifactReportProcessor.java
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/InvalidPomArtifactReportProcessor.java?rev=360003&r1=360002&r2=360003&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/InvalidPomArtifactReportProcessor.java
(original)
+++
maven/repository-manager/trunk/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/InvalidPomArtifactReportProcessor.java
Thu Dec 29 22:42:13 2005
@@ -49,10 +49,10 @@
{
InputStream is = null;
- if ( ( artifact.getType().toLowerCase() ).equals( "pom" ) )
+ if ( "pom".equals( artifact.getType().toLowerCase() ) )
{
- if ( repository.getProtocol().equals( "file" ) )
+ if ( "file".equals( repository.getProtocol() ) )
{
try
{
Modified:
maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractChecksumArtifactReporterTest.java
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractChecksumArtifactReporterTest.java?rev=360003&r1=360002&r2=360003&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractChecksumArtifactReporterTest.java
(original)
+++
maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractChecksumArtifactReporterTest.java
Thu Dec 29 22:42:13 2005
@@ -74,7 +74,7 @@
boolean written = true;
//loop through the valid artifact names..
- if ( type.equals( "VALID" ) )
+ if ( "VALID".equals( type ) )
{
for ( int i = 0; i < validArtifactChecksumJars.length; i++ )
{
@@ -85,7 +85,7 @@
}
}
}
- else if ( type.equals( "INVALID" ) )
+ else if ( "INVALID".equals( type ) )
{
for ( int i = 0; i < invalidArtifactChecksumJars.length; i++ )
{
@@ -111,14 +111,14 @@
boolean written = true;
//loop through the valid artifact names..
- if ( type.equals( "VALID" ) )
+ if ( "VALID".equals( type ) )
{
writeMetadataFile( "checksumTest/validArtifact/1.0/",
metadataChecksumFilename, "xml", true );
writeMetadataFile( "checksumTest/validArtifact/",
metadataChecksumFilename, "xml", true );
writeMetadataFile( "checksumTest/", metadataChecksumFilename,
"xml", true );
}
- else if ( type.equals( "INVALID" ) )
+ else if ( "INVALID".equals( type ) )
{
writeMetadataFile( "checksumTest/invalidArtifact/1.0/",
metadataChecksumFilename, "xml", false );
}
