You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2013/08/25 21:12:49 UTC
svn commit: r1517368 - in /maven/plugins/trunk:
maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/
maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/
maven-war-plugin/src/main/java/org/apache/maven/plugin/war/
maven-war-plugin/src/mai...
Author: krosenvold
Date: Sun Aug 25 19:12:48 2013
New Revision: 1517368
URL: http://svn.apache.org/r1517368
Log:
pmd/war java5 stuff
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ClassesPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WarUtils.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/AbstractWarExplodedMojoTest.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/AbstractWarMojoTest.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectArtifactsStub.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/PathSetTest.java
Modified: maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java?rev=1517368&r1=1517367&r2=1517368&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java Sun Aug 25 19:12:48 2013
@@ -287,12 +287,9 @@ public abstract class AbstractPmdReport
Collection<File> excludeRootFiles = new HashSet<File>( excludeRoots.length );
- for ( int i = 0; i < excludeRoots.length; i++ )
- {
- File file = excludeRoots[i];
- if ( file.isDirectory() )
- {
- excludeRootFiles.add( file );
+ for (File file : excludeRoots) {
+ if (file.isDirectory()) {
+ excludeRootFiles.add(file);
}
}
@@ -359,9 +356,8 @@ public abstract class AbstractPmdReport
{
@SuppressWarnings( "unchecked" ) List<File> newfiles =
FileUtils.getFiles( sourceDirectory, including, excluding );
- for ( Iterator<File> it2 = newfiles.iterator(); it2.hasNext(); )
- {
- files.put( it2.next().getCanonicalFile(), finfo );
+ for (File newfile : newfiles) {
+ files.put(newfile.getCanonicalFile(), finfo);
}
}
}
Modified: maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java?rev=1517368&r1=1517367&r2=1517368&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java Sun Aug 25 19:12:48 2013
@@ -78,16 +78,16 @@ public class CpdReportTest
// check the contents of cpd.html
String str =
readFile( new File( getBasedir(), "target/test/unit/default-configuration/target/site/cpd.html" ) );
- assertTrue( str.toLowerCase().indexOf( "AppSample.java".toLowerCase() ) != -1 );
+ assertTrue(str.toLowerCase().contains("AppSample.java".toLowerCase()));
str = readFile( new File( getBasedir(), "target/test/unit/default-configuration/target/site/cpd.html" ) );
- assertTrue( str.toLowerCase().indexOf( "App.java".toLowerCase() ) != -1 );
+ assertTrue(str.toLowerCase().contains("App.java".toLowerCase()));
str = readFile( new File( getBasedir(), "target/test/unit/default-configuration/target/site/cpd.html" ) );
- assertTrue( str.toLowerCase().indexOf( "public String dup( String str )".toLowerCase() ) != -1 );
+ assertTrue(str.toLowerCase().contains("public String dup( String str )".toLowerCase()));
str = readFile( new File( getBasedir(), "target/test/unit/default-configuration/target/site/cpd.html" ) );
- assertTrue( str.toLowerCase().indexOf( "tmp = tmp + str.substring( i, i + 1);".toLowerCase() ) != -1 );
+ assertTrue(str.toLowerCase().contains("tmp = tmp + str.substring( i, i + 1);".toLowerCase()));
}
@@ -114,20 +114,20 @@ public class CpdReportTest
// Contents that should NOT be in the report
String str = readFile( new File( getBasedir(), "target/test/unit/custom-configuration/target/site/cpd.html" ) );
- assertTrue( str.toLowerCase().indexOf( "/Sample.java".toLowerCase() ) == -1 );
+ assertTrue(!str.toLowerCase().contains("/Sample.java".toLowerCase()));
str = readFile( new File( getBasedir(), "target/test/unit/custom-configuration/target/site/cpd.html" ) );
- assertTrue( str.toLowerCase().indexOf( "public void duplicateMethod( int i )".toLowerCase() ) == -1 );
+ assertTrue(!str.toLowerCase().contains("public void duplicateMethod( int i )".toLowerCase()));
// Contents that should be in the report
str = readFile( new File( getBasedir(), "target/test/unit/custom-configuration/target/site/cpd.html" ) );
- assertTrue( str.toLowerCase().indexOf( "AnotherSample.java".toLowerCase() ) != -1 );
+ assertTrue(str.toLowerCase().contains("AnotherSample.java".toLowerCase()));
str = readFile( new File( getBasedir(), "target/test/unit/custom-configuration/target/site/cpd.html" ) );
- assertTrue( str.toLowerCase().indexOf( "public static void main( String[] args )".toLowerCase() ) != -1 );
+ assertTrue(str.toLowerCase().contains("public static void main( String[] args )".toLowerCase()));
str = readFile( new File( getBasedir(), "target/test/unit/custom-configuration/target/site/cpd.html" ) );
- assertTrue( str.toLowerCase().indexOf( "private String unusedMethod(".toLowerCase() ) != -1 );
+ assertTrue(str.toLowerCase().contains("private String unusedMethod(".toLowerCase()));
}
@@ -232,7 +232,7 @@ public class CpdReportTest
File generatedFile = new File( getBasedir(), "target/test/unit/empty-report/target/site/cpd.html" );
assertTrue( FileUtils.fileExists( generatedFile.getAbsolutePath() ) );
String str = readFile( new File( getBasedir(), "target/test/unit/empty-report/target/site/cpd.html" ) );
- assertTrue( str.toLowerCase().indexOf( "Hello.java".toLowerCase() ) == -1 );
+ assertTrue(!str.toLowerCase().contains("Hello.java".toLowerCase()));
}
Modified: maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java?rev=1517368&r1=1517367&r2=1517368&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java Sun Aug 25 19:12:48 2013
@@ -80,9 +80,9 @@ public class PmdReportTest
String str =
readFile( new File( getBasedir(), "target/test/unit/default-configuration/target/site/pmd.html" ) );
- assertTrue( str.indexOf( "/xref/def/configuration/App.html#31" ) != -1 );
+ assertTrue(str.contains("/xref/def/configuration/App.html#31"));
- assertTrue( str.indexOf( "/xref/def/configuration/AppSample.html#45" ) != -1 );
+ assertTrue(str.contains("/xref/def/configuration/AppSample.html#45"));
}
@@ -114,7 +114,7 @@ public class PmdReportTest
assertTrue( FileUtils.fileExists( generatedFile.getAbsolutePath() ) );
String str = readFile( generatedFile );
- assertTrue( str.indexOf( "Avoid using global variables" ) != -1 );
+ assertTrue(str.contains("Avoid using global variables"));
}
public void testFileURL()
@@ -156,9 +156,9 @@ public class PmdReportTest
String str =
readFile( new File( getBasedir(), "target/test/unit/default-configuration/target/site/pmd.html" ) );
- assertTrue( str.indexOf( "/xref/def/configuration/App.html#31" ) != -1 );
+ assertTrue(str.contains("/xref/def/configuration/App.html#31"));
- assertTrue( str.indexOf( "/xref/def/configuration/AppSample.html#45" ) != -1 );
+ assertTrue(str.contains("/xref/def/configuration/AppSample.html#45"));
}
/**
@@ -189,15 +189,13 @@ public class PmdReportTest
//check if custom ruleset was applied
String str = readFile( new File( getBasedir(), "target/test/unit/custom-configuration/target/site/pmd.html" ) );
- assertTrue( str.toLowerCase().indexOf( "Avoid using if statements without curly braces".toLowerCase() ) != -1 );
+ assertTrue(str.toLowerCase().contains("Avoid using if statements without curly braces".toLowerCase()));
assertTrue(
- str.toLowerCase().indexOf( "Avoid using if...else statements without curly braces".toLowerCase() ) != -1 );
+ str.toLowerCase().contains("Avoid using if...else statements without curly braces".toLowerCase()));
assertTrue( "unnecessary constructor should not be triggered because of low priority",
- str.toLowerCase().indexOf(
- "Avoid unnecessary constructors - the compiler will generate these for you".toLowerCase() )
- == -1 );
+ !str.toLowerCase().contains("Avoid unnecessary constructors - the compiler will generate these for you".toLowerCase()));
}
@@ -247,7 +245,7 @@ public class PmdReportTest
File generatedFile = new File( getBasedir(), "target/test/unit/empty-report/target/site/pmd.html" );
assertTrue( FileUtils.fileExists( generatedFile.getAbsolutePath() ) );
String str = readFile( new File( getBasedir(), "target/test/unit/empty-report/target/site/pmd.html" ) );
- assertTrue( str.toLowerCase().indexOf( "Hello.java".toLowerCase() ) == -1 );
+ assertTrue(!str.toLowerCase().contains("Hello.java".toLowerCase()));
}
public void testInvalidFormat()
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java?rev=1517368&r1=1517367&r2=1517368&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java Sun Aug 25 19:12:48 2013
@@ -373,7 +373,7 @@ public abstract class AbstractWarMojo
excludeList.add( "**/" + META_INF + "/" + containerConfigXML.getName() );
}
- return (String[]) excludeList.toArray( EMPTY_STRING_ARRAY );
+ return (String[]) excludeList.toArray(new String[excludeList.size()]);
}
/**
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ClassesPackagingTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ClassesPackagingTask.java?rev=1517368&r1=1517367&r2=1517368&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ClassesPackagingTask.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ClassesPackagingTask.java Sun Aug 25 19:12:48 2013
@@ -91,7 +91,7 @@ public class ClassesPackagingTask
ArtifactFactory factory = context.getArtifactFactory();
Artifact artifact = factory.createBuildArtifact( project.getGroupId(), project.getArtifactId(),
project.getVersion(), "jar" );
- String archiveName = null;
+ String archiveName;
try
{
archiveName = getArtifactFinalName( context, artifact );
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java?rev=1517368&r1=1517367&r2=1517368&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java Sun Aug 25 19:12:48 2013
@@ -306,28 +306,22 @@ public class WarProjectPackagingTask
context.getLog().info( "Copying webapp webResources [" + resource.getDirectory() + "] to ["
+ context.getWebappDirectory().getAbsolutePath() + "]" );
String[] fileNames = getFilesToCopy( resource );
- for ( int i = 0; i < fileNames.length; i++ )
- {
- String targetFileName = fileNames[i];
- if ( resource.getTargetPath() != null )
- {
+ for (String fileName : fileNames) {
+ String targetFileName = fileName;
+ if (resource.getTargetPath() != null) {
//TODO make sure this thing is 100% safe
// MWAR-129 if targetPath is only a dot <targetPath>.</targetPath> or ./
// and the Resource is in a part of the warSourceDirectory the file from sources will override this
// that's we don't have to add the targetPath yep not nice but works
- if ( !StringUtils.equals( ".", resource.getTargetPath() )
- && !StringUtils.equals( "./", resource.getTargetPath() ) )
- {
+ if (!StringUtils.equals(".", resource.getTargetPath())
+ && !StringUtils.equals("./", resource.getTargetPath())) {
targetFileName = resource.getTargetPath() + File.separator + targetFileName;
}
}
- if ( resource.isFiltering() && !context.isNonFilteredExtension( fileNames[i] ) )
- {
- copyFilteredFile( id, context, new File( resource.getDirectory(), fileNames[i] ), targetFileName );
- }
- else
- {
- copyFile( id, context, new File( resource.getDirectory(), fileNames[i] ), targetFileName );
+ if (resource.isFiltering() && !context.isNonFilteredExtension(fileName)) {
+ copyFilteredFile(id, context, new File(resource.getDirectory(), fileName), targetFileName);
+ } else {
+ copyFile(id, context, new File(resource.getDirectory(), fileName), targetFileName);
}
}
}
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WarUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WarUtils.java?rev=1517368&r1=1517367&r2=1517368&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WarUtils.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WarUtils.java Sun Aug 25 19:12:48 2013
@@ -37,21 +37,15 @@ public class WarUtils
public static Artifact getArtifact( MavenProject project, Dependency dependency )
{
- final Iterator it = project.getArtifacts().iterator();
- while ( it.hasNext() )
- {
- Artifact artifact = (Artifact) it.next();
- if ( artifact.getGroupId().equals( dependency.getGroupId() )
- && artifact.getArtifactId().equals( dependency.getArtifactId() )
- && artifact.getType().equals( dependency.getType() ) )
- {
- if ( artifact.getClassifier() == null && dependency.getClassifier() == null )
- {
+ for (Object o : project.getArtifacts()) {
+ Artifact artifact = (Artifact) o;
+ if (artifact.getGroupId().equals(dependency.getGroupId())
+ && artifact.getArtifactId().equals(dependency.getArtifactId())
+ && artifact.getType().equals(dependency.getType())) {
+ if (artifact.getClassifier() == null && dependency.getClassifier() == null) {
return artifact;
- }
- else if ( dependency.getClassifier() != null
- && dependency.getClassifier().equals( artifact.getClassifier() ) )
- {
+ } else if (dependency.getClassifier() != null
+ && dependency.getClassifier().equals(artifact.getClassifier())) {
return artifact;
}
}
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/AbstractWarExplodedMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/AbstractWarExplodedMojoTest.java?rev=1517368&r1=1517367&r2=1517368&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/AbstractWarExplodedMojoTest.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/AbstractWarExplodedMojoTest.java Sun Aug 25 19:12:48 2013
@@ -90,11 +90,9 @@ public abstract class AbstractWarExplode
else
{
webAppSource = createWebAppSource( testId, false );
- for ( int i = 0; i < sourceFiles.length; i++ )
- {
- String sourceFile = sourceFiles[i];
- File sample = new File( webAppSource, sourceFile );
- createFile( sample );
+ for (String sourceFile : sourceFiles) {
+ File sample = new File(webAppSource, sourceFile);
+ createFile(sample);
}
@@ -106,10 +104,8 @@ public abstract class AbstractWarExplode
if ( artifactStubs != null )
{
- for ( int i = 0; i < artifactStubs.length; i++ )
- {
- ArtifactStub artifactStub = artifactStubs[i];
- project.addArtifact( artifactStub );
+ for (ArtifactStub artifactStub : artifactStubs) {
+ project.addArtifact(artifactStub);
}
}
@@ -203,19 +199,14 @@ public abstract class AbstractWarExplode
protected List assertCustomContent( File webAppDirectory, String[] filePaths, String customMessage )
{
final List content = new ArrayList();
- for ( int i = 0; i < filePaths.length; i++ )
- {
- String filePath = filePaths[i];
- final File expectedFile = new File( webAppDirectory, filePath );
- if ( customMessage != null )
- {
- assertTrue( customMessage + " - " + expectedFile.toString(), expectedFile.exists() );
+ for (String filePath : filePaths) {
+ final File expectedFile = new File(webAppDirectory, filePath);
+ if (customMessage != null) {
+ assertTrue(customMessage + " - " + expectedFile.toString(), expectedFile.exists());
+ } else {
+ assertTrue("source file not found: " + expectedFile.toString(), expectedFile.exists());
}
- else
- {
- assertTrue( "source file not found: " + expectedFile.toString(), expectedFile.exists() );
- }
- content.add( expectedFile );
+ content.add(expectedFile);
}
return content;
}
@@ -261,20 +252,15 @@ public abstract class AbstractWarExplode
{
final File[] files = dir.listFiles();
- for ( int i = 0; i < files.length; i++ )
- {
- File file = files[i];
-
+ for (File file : files) {
// Add the file if the filter is ok with it
- if ( filter.accept( file ) )
- {
- content.add( file );
+ if (filter.accept(file)) {
+ content.add(file);
}
// Even if the file is not accepted and is a directory, add it
- if ( file.isDirectory() )
- {
- buildFilesList( file, filter, content );
+ if (file.isDirectory()) {
+ buildFilesList(file, filter, content);
}
}
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/AbstractWarMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/AbstractWarMojoTest.java?rev=1517368&r1=1517367&r2=1517368&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/AbstractWarMojoTest.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/AbstractWarMojoTest.java Sun Aug 25 19:12:48 2013
@@ -94,11 +94,9 @@ public abstract class AbstractWarMojoTes
if ( xmlFiles != null )
{
- Iterator iterator = Arrays.asList( xmlFiles ).iterator();
- while ( iterator.hasNext() )
- {
- XMLFile = new File( xmlConfigDir, (String) iterator.next() );
- createFile( XMLFile );
+ for (String o : xmlFiles) {
+ XMLFile = new File(xmlConfigDir, o);
+ createFile(XMLFile);
}
}
@@ -255,9 +253,8 @@ public abstract class AbstractWarMojoTes
"jsp/c.jsp", "WEB-INF/classes/a.class", "WEB-INF/classes/b.class", "WEB-INF/classes/c.class",
"WEB-INF/lib/a.jar", "WEB-INF/lib/b.jar", "WEB-INF/lib/c.jar", "WEB-INF/web.xml"};
- for ( int i = 0; i < filePaths.length; i++ )
- {
- createFile( new File( rootDir, filePaths[i] ), id + "-" + filePaths[i] );
+ for (String filePath : filePaths) {
+ createFile(new File(rootDir, filePath), id + "-" + filePath);
}
createArchive( rootDir, destFile );
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java?rev=1517368&r1=1517367&r2=1517368&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java Sun Aug 25 19:12:48 2013
@@ -451,12 +451,9 @@ public class WarMojoTest
}
}
if( mustNotBeInJar!=null )
- {
- for ( int i = 0; i < mustNotBeInJar.length; i++ )
- {
- String file = mustNotBeInJar[i];
-
- assertFalse( "File[" + file + "] found in archive", jarContent.containsKey( file ) );
+ {
+ for (String file : mustNotBeInJar) {
+ assertFalse("File[" + file + "] found in archive", jarContent.containsKey(file));
}
}
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectArtifactsStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectArtifactsStub.java?rev=1517368&r1=1517367&r2=1517368&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectArtifactsStub.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectArtifactsStub.java Sun Aug 25 19:12:48 2013
@@ -57,18 +57,16 @@ public class MavenProjectArtifactsStub
return new ArrayList();
}
final List dependencies = new ArrayList();
- final Iterator it = getArtifacts().iterator();
- while ( it.hasNext() )
- {
- Artifact a = (Artifact) it.next();
+ for (Object o : getArtifacts()) {
+ Artifact a = (Artifact) o;
Dependency dependency = new Dependency();
- dependency.setArtifactId( a.getArtifactId() );
- dependency.setGroupId( a.getGroupId() );
- dependency.setVersion( a.getVersion() );
- dependency.setScope( a.getScope() );
- dependency.setType( a.getType() );
- dependency.setClassifier( a.getClassifier() );
- dependencies.add( dependency );
+ dependency.setArtifactId(a.getArtifactId());
+ dependency.setGroupId(a.getGroupId());
+ dependency.setVersion(a.getVersion());
+ dependency.setScope(a.getScope());
+ dependency.setType(a.getType());
+ dependency.setClassifier(a.getClassifier());
+ dependencies.add(dependency);
}
return dependencies;
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/PathSetTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/PathSetTest.java?rev=1517368&r1=1517367&r2=1517368&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/PathSetTest.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/PathSetTest.java Sun Aug 25 19:12:48 2013
@@ -113,31 +113,29 @@ public class PathSetTest
assertEquals( "Unexpected PathSet size", ps.size(), 2 );
int i = 0;
- for ( Iterator iter2 = ps.iterator(); iter2.hasNext(); )
- {
+ for (String p1 : ps) {
i++;
- String pathstr = (String) iter2.next();
- assertTrue( ps.contains( pathstr ) );
- assertTrue( ps.contains( "/" + pathstr ) );
- assertTrue( ps.contains( "/" + StringUtils.replace( pathstr, '/', '\\' ) ) );
- assertFalse( ps.contains( "/" + StringUtils.replace( pathstr, '/', '\\' ) + "/a" ) );
- assertFalse( ps.contains( "/a/" + StringUtils.replace( pathstr, '/', '\\' ) ) );
+ String pathstr = p1;
+ assertTrue(ps.contains(pathstr));
+ assertTrue(ps.contains("/" + pathstr));
+ assertTrue(ps.contains("/" + StringUtils.replace(pathstr, '/', '\\')));
+ assertFalse(ps.contains("/" + StringUtils.replace(pathstr, '/', '\\') + "/a"));
+ assertFalse(ps.contains("/a/" + StringUtils.replace(pathstr, '/', '\\')));
}
assertEquals( "Wrong count of iterations", 2, i );
ps.addPrefix( "/ab/c/" );
i = 0;
- for ( Iterator iter2 = ps.iterator(); iter2.hasNext(); )
- {
+ for (String p : ps) {
i++;
- String pathstr = (String) iter2.next();
- assertTrue( pathstr.startsWith( "ab/c/" ) );
- assertFalse( pathstr.startsWith( "ab/c//" ) );
- assertTrue( ps.contains( pathstr ) );
- assertTrue( ps.contains( "/" + pathstr ) );
- assertTrue( ps.contains( "/" + StringUtils.replace( pathstr, '/', '\\' ) ) );
- assertFalse( ps.contains( "/" + StringUtils.replace( pathstr, '/', '\\' ) + "/a" ) );
- assertFalse( ps.contains( "/ab/" + StringUtils.replace( pathstr, '/', '\\' ) ) );
+ String pathstr = p;
+ assertTrue(pathstr.startsWith("ab/c/"));
+ assertFalse(pathstr.startsWith("ab/c//"));
+ assertTrue(ps.contains(pathstr));
+ assertTrue(ps.contains("/" + pathstr));
+ assertTrue(ps.contains("/" + StringUtils.replace(pathstr, '/', '\\')));
+ assertFalse(ps.contains("/" + StringUtils.replace(pathstr, '/', '\\') + "/a"));
+ assertFalse(ps.contains("/ab/" + StringUtils.replace(pathstr, '/', '\\')));
}
assertEquals( "Wrong count of iterations", 2, i );
}
@@ -174,22 +172,18 @@ public class PathSetTest
ps2.addAll( s1set );
assertEquals( "Unexpected PathSet size", 5, ps2.size() );
- for ( Iterator iter = ps1.iterator(); iter.hasNext(); )
- {
- String str = (String) iter.next();
- assertTrue( str, ps2.contains( str ) );
- assertTrue( ps2.contains( "/" + str ) );
- assertTrue( ps1.contains( str ) );
- assertTrue( ps1.contains( "/" + str ) );
- }
-
- for ( Iterator iter = ps2.iterator(); iter.hasNext(); )
- {
- String str = (String) iter.next();
- assertTrue( ps1.contains( str ) );
- assertTrue( ps1.contains( "/" + str ) );
- assertTrue( ps2.contains( str ) );
- assertTrue( ps2.contains( "/" + str ) );
+ for (String str : ps1) {
+ assertTrue(str, ps2.contains(str));
+ assertTrue(ps2.contains("/" + str));
+ assertTrue(ps1.contains(str));
+ assertTrue(ps1.contains("/" + str));
+ }
+
+ for (String str : ps2) {
+ assertTrue(ps1.contains(str));
+ assertTrue(ps1.contains("/" + str));
+ assertTrue(ps2.contains(str));
+ assertTrue(ps2.contains("/" + str));
}
ps1.addAll( s2ar, "/pref/" );
@@ -198,22 +192,18 @@ public class PathSetTest
ps2.addAll( s2ar, "/pref/" );
assertEquals( "Unexpected PathSet size", 8, ps2.size() );
- for ( Iterator iter = ps1.iterator(); iter.hasNext(); )
- {
- String str = (String) iter.next();
- assertTrue( str, ps2.contains( str ) );
- assertTrue( ps2.contains( "/" + str ) );
- assertTrue( ps1.contains( str ) );
- assertTrue( ps1.contains( "/" + str ) );
- }
-
- for ( Iterator iter = ps2.iterator(); iter.hasNext(); )
- {
- String str = (String) iter.next();
- assertTrue( ps1.contains( str ) );
- assertTrue( ps1.contains( "/" + str ) );
- assertTrue( ps2.contains( str ) );
- assertTrue( ps2.contains( "/" + str ) );
+ for (String str : ps1) {
+ assertTrue(str, ps2.contains(str));
+ assertTrue(ps2.contains("/" + str));
+ assertTrue(ps1.contains(str));
+ assertTrue(ps1.contains("/" + str));
+ }
+
+ for (String str : ps2) {
+ assertTrue(ps1.contains(str));
+ assertTrue(ps1.contains("/" + str));
+ assertTrue(ps2.contains(str));
+ assertTrue(ps2.contains("/" + str));
}
}