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 20:16:59 UTC
svn commit: r1517357 - in /maven/plugins/trunk:
maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/
maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/
maven-site-plugin/src/test/java/org/apache/maven/plugins/...
Author: krosenvold
Date: Sun Aug 25 18:16:58 2013
New Revision: 1517357
URL: http://svn.apache.org/r1517357
Log:
More java5
Modified:
maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundleUtils.java
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/PropertyUtils.java
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/AuthAsyncProxyServlet.java
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteMojoTest.java
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/stubs/SiteMavenProjectStub.java
maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/DefaultRepositoryCopier.java
maven/plugins/trunk/maven-stage-plugin/src/test/java/org/apache/maven/plugins/stage/RepositoryCopierTest.java
maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainConverter.java
maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainMojo.java
maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/ConsoleVerificationResultPrinter.java
maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/VerifierMojo.java
Modified: maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundleUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundleUtils.java?rev=1517357&r1=1517356&r2=1517357&view=diff
==============================================================================
--- maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundleUtils.java (original)
+++ maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundleUtils.java Sun Aug 25 18:16:58 2013
@@ -57,24 +57,17 @@ final class BundleUtils
{
return result;
}
-
- for ( int i = 0; i < projectFiles.length; i++ )
- {
- if ( projectFiles[i].getName().endsWith( ".pom" ) )
- {
- if ( !projectFiles[i].equals( pom ) )
- {
- log.info( "Detected POM file will be excluded:\n" + projectFiles[i]
- + "\n\nInstead, the bundle will include the POM from:\n" + pom );
+
+ for (File projectFile : projectFiles) {
+ if (projectFile.getName().endsWith(".pom")) {
+ if (!projectFile.equals(pom)) {
+ log.info("Detected POM file will be excluded:\n" + projectFile
+ + "\n\nInstead, the bundle will include the POM from:\n" + pom);
}
- }
- else if ( projectFiles[i].getName().endsWith( "-bundle.jar" ) )
- {
- log.warn( "Skipping project file which collides with repository bundle filename:\n" + projectFiles[i] );
- }
- else
- {
- result.add( projectFiles[i] );
+ } else if (projectFile.getName().endsWith("-bundle.jar")) {
+ log.warn("Skipping project file which collides with repository bundle filename:\n" + projectFile);
+ } else {
+ result.add(projectFile);
}
}
@@ -131,7 +124,7 @@ final class BundleUtils
"comma (',').\n\nSelection: " );
log.info( message );
- String response = null;
+ String response;
try
{
response = inputHandler.readLine();
Modified: maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/PropertyUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/PropertyUtils.java?rev=1517357&r1=1517356&r2=1517357&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/PropertyUtils.java (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/PropertyUtils.java Sun Aug 25 18:16:58 2013
@@ -86,11 +86,10 @@ public final class PropertyUtils
// as can be verified by replacing the implementation of #loadPropertyFile(File, boolean, boolean)
// with the commented variant I have provided that reuses this method.
- for ( Iterator<?> iter = fileProps.keySet().iterator(); iter.hasNext(); )
- {
- final String k = (String) iter.next();
- final String propValue = getPropertyValue( k, combinedProps );
- fileProps.setProperty( k, propValue );
+ for (Object o : fileProps.keySet()) {
+ final String k = (String) o;
+ final String propValue = getPropertyValue(k, combinedProps);
+ fileProps.setProperty(k, propValue);
}
return fileProps;
Modified: maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/AuthAsyncProxyServlet.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/AuthAsyncProxyServlet.java?rev=1517357&r1=1517356&r2=1517357&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/AuthAsyncProxyServlet.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/AuthAsyncProxyServlet.java Sun Aug 25 18:16:58 2013
@@ -129,7 +129,7 @@ public class AuthAsyncProxyServlet
// nop
}
}
- String authPass = this.authentications.get( user ).toString();
+ String authPass = this.authentications.get(user);
if ( password.equals( authPass ) )
{
String targetPath = request.getServletPath();
Modified: maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteMojoTest.java?rev=1517357&r1=1517356&r2=1517357&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteMojoTest.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteMojoTest.java Sun Aug 25 18:16:58 2013
@@ -69,13 +69,13 @@ public class SiteMojoTest
String siteDescriptorContent = FileUtils.fileRead( descriptorFile );
assertNotNull( siteDescriptorContent );
- assertTrue( siteDescriptorContent.indexOf( "${project.name}" ) != -1 );
+ assertTrue(siteDescriptorContent.contains("${project.name}"));
SiteTool siteTool = (SiteTool) lookup( SiteTool.ROLE );
siteDescriptorContent =
siteTool.getInterpolatedSiteDescriptorContent( new HashMap<String, String>(), siteMojo.project,
siteDescriptorContent, "UTF-8", "UTF-8" );
assertNotNull( siteDescriptorContent );
- assertTrue( siteDescriptorContent.indexOf( "${project.name}" ) == -1 );
+ assertTrue(!siteDescriptorContent.contains("${project.name}"));
}
}
Modified: maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/stubs/SiteMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/stubs/SiteMavenProjectStub.java?rev=1517357&r1=1517356&r2=1517357&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/stubs/SiteMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/stubs/SiteMavenProjectStub.java Sun Aug 25 18:16:58 2013
@@ -46,7 +46,7 @@ public class SiteMavenProjectStub
public SiteMavenProjectStub(String pomFilePath)
{
MavenXpp3Reader pomReader = new MavenXpp3Reader();
- Model model = null;
+ Model model;
try
{
Modified: maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/DefaultRepositoryCopier.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/DefaultRepositoryCopier.java?rev=1517357&r1=1517356&r2=1517357&view=diff
==============================================================================
--- maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/DefaultRepositoryCopier.java (original)
+++ maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/DefaultRepositoryCopier.java Sun Aug 25 18:16:58 2013
@@ -123,7 +123,7 @@ public class DefaultRepositoryCopier
for ( String s : files )
{
- if ( s.indexOf( ".svn" ) >= 0 )
+ if (s.contains(".svn"))
{
continue;
}
@@ -216,13 +216,12 @@ public class DefaultRepositoryCopier
logger.info( "Creating rename script." );
- for ( Iterator i = moveCommands.iterator(); i.hasNext(); )
- {
- String s = (String) i.next();
+ for (Object moveCommand : moveCommands) {
+ String s = (String) moveCommand;
// We use an explicit unix '\n' line-ending here instead of using the println() method.
// Using println() will cause files and folders to have a '\r' at the end if the plugin is run on Windows.
- rw.print( s + "\n" );
+ rw.print(s + "\n");
}
IOUtil.close( rw );
@@ -288,33 +287,25 @@ public class DefaultRepositoryCopier
File[] files = dir.listFiles();
- for ( int i = 0; i < files.length; i++ )
- {
- File f = files[i];
-
- if ( f.isDirectory() )
- {
- if ( f.getName().equals( ".svn" ) )
- {
+ for (File f : files) {
+ if (f.isDirectory()) {
+ if (f.getName().equals(".svn")) {
continue;
}
- if ( f.getName().endsWith( version ) )
- {
- String s = f.getAbsolutePath().substring( basedir.getAbsolutePath().length() + 1 );
- s = StringUtils.replace( s, "\\", "/" );
+ if (f.getName().endsWith(version)) {
+ String s = f.getAbsolutePath().substring(basedir.getAbsolutePath().length() + 1);
+ s = StringUtils.replace(s, "\\", "/");
- moveCommands.add( "mv " + s + IN_PROCESS_MARKER + " " + s );
+ moveCommands.add("mv " + s + IN_PROCESS_MARKER + " " + s);
}
- scanDirectory( basedir, f, zos, version, moveCommands );
- }
- else
- {
- InputStream is = new FileInputStream( f );
+ scanDirectory(basedir, f, zos, version, moveCommands);
+ } else {
+ InputStream is = new FileInputStream(f);
- String s = f.getAbsolutePath().substring( basedir.getAbsolutePath().length() + 1 );
- s = StringUtils.replace( s, "\\", "/" );
+ String s = f.getAbsolutePath().substring(basedir.getAbsolutePath().length() + 1);
+ s = StringUtils.replace(s, "\\", "/");
// We are marking any version directories with the in-process flag so that
// anything being unpacked on the target side will not be recogized by Maven
@@ -322,23 +313,22 @@ public class DefaultRepositoryCopier
String vtag = "/" + version;
- s = StringUtils.replace( s, vtag + "/", vtag + IN_PROCESS_MARKER + "/" );
+ s = StringUtils.replace(s, vtag + "/", vtag + IN_PROCESS_MARKER + "/");
- ZipEntry e = new ZipEntry( s );
+ ZipEntry e = new ZipEntry(s);
- zos.putNextEntry( e );
+ zos.putNextEntry(e);
- IOUtil.copy( is, zos );
+ IOUtil.copy(is, zos);
- IOUtil.close( is );
+ IOUtil.close(is);
- int idx = s.indexOf( IN_PROCESS_MARKER );
+ int idx = s.indexOf(IN_PROCESS_MARKER);
- if ( idx > 0 )
- {
- String d = s.substring( 0, idx );
+ if (idx > 0) {
+ String d = s.substring(0, idx);
- moveCommands.add( "mv " + d + IN_PROCESS_MARKER + " " + d );
+ moveCommands.add("mv " + d + IN_PROCESS_MARKER + " " + d);
}
}
}
@@ -438,16 +428,12 @@ public class DefaultRepositoryCopier
String retValue = "";
- for ( int i = 0; i < binaryData.length; i++ )
- {
- String t = Integer.toHexString( binaryData[i] & 0xff );
+ for (byte aBinaryData : binaryData) {
+ String t = Integer.toHexString(aBinaryData & 0xff);
- if ( t.length() == 1 )
- {
- retValue += ( "0" + t );
- }
- else
- {
+ if (t.length() == 1) {
+ retValue += ("0" + t);
+ } else {
retValue += t;
}
}
Modified: maven/plugins/trunk/maven-stage-plugin/src/test/java/org/apache/maven/plugins/stage/RepositoryCopierTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-stage-plugin/src/test/java/org/apache/maven/plugins/stage/RepositoryCopierTest.java?rev=1517357&r1=1517356&r2=1517357&view=diff
==============================================================================
--- maven/plugins/trunk/maven-stage-plugin/src/test/java/org/apache/maven/plugins/stage/RepositoryCopierTest.java (original)
+++ maven/plugins/trunk/maven-stage-plugin/src/test/java/org/apache/maven/plugins/stage/RepositoryCopierTest.java Sun Aug 25 18:16:58 2013
@@ -61,9 +61,8 @@ public class RepositoryCopierTest
"maven-script-beanshell",
"maven-settings" };
- for ( int i = 0; i < s.length; i++ )
- {
- testMavenArtifact( targetRepo, s[i] );
+ for (String value : s) {
+ testMavenArtifact(targetRepo, value);
}
// leave something behind to clean it up.
Modified: maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainConverter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainConverter.java?rev=1517357&r1=1517356&r2=1517357&view=diff
==============================================================================
--- maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainConverter.java (original)
+++ maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainConverter.java Sun Aug 25 18:16:58 2013
@@ -74,25 +74,20 @@ public class ToolchainConverter
{
Map map = new HashMap();
PlexusConfiguration[] tools = configuration.getChildren();
- for ( int i = 0; i < tools.length; i++ )
- {
- String type = tools[i].getName();
- PlexusConfiguration[] params = tools[i].getChildren();
+ for (PlexusConfiguration tool : tools) {
+ String type = tool.getName();
+ PlexusConfiguration[] params = tool.getChildren();
Map parameters = new HashMap();
- for ( int j = 0; j < params.length; j++ )
- {
- try
- {
- String name = params[j].getName();
- String val = params[j].getValue();
- parameters.put( name, val );
- }
- catch ( PlexusConfigurationException ex )
- {
- throw new ComponentConfigurationException( ex );
+ for (PlexusConfiguration param : params) {
+ try {
+ String name = param.getName();
+ String val = param.getValue();
+ parameters.put(name, val);
+ } catch (PlexusConfigurationException ex) {
+ throw new ComponentConfigurationException(ex);
}
}
- map.put( type, parameters );
+ map.put(type, parameters);
}
chain.toolchains = map;
}
Modified: maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainMojo.java?rev=1517357&r1=1517356&r2=1517357&view=diff
==============================================================================
--- maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainMojo.java (original)
+++ maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainMojo.java Sun Aug 25 18:16:58 2013
@@ -83,12 +83,10 @@ public class ToolchainMojo
Map params = toolchains.getParams( type );
ToolchainPrivate[] tcs = getToolchains( type );
boolean matched = false;
- for ( int i = 0; i < tcs.length; i++ )
- {
- if ( tcs[i].matchesRequirements( params ) )
- {
- getLog().info( "Toolchain (" + type + ") matched:" + tcs[i] );
- toolchainManager.storeToolchainToBuildContext( tcs[i], session );
+ for (ToolchainPrivate tc : tcs) {
+ if (tc.matchesRequirements(params)) {
+ getLog().info("Toolchain (" + type + ") matched:" + tc);
+ toolchainManager.storeToolchainToBuildContext(tc, session);
matched = true;
break;
}
@@ -108,23 +106,19 @@ public class ToolchainMojo
//TODO add the default toolchain instance if defined??
StringBuilder buff = new StringBuilder();
buff.append( "Cannot find matching toolchain definitions for the following toolchain types:" );
- Iterator it = nonMatchedTypes.iterator();
- while ( it.hasNext() )
- {
- String type = (String) it.next();
- buff.append( '\n' );
- buff.append( type );
- Map params = toolchains.getParams( type );
- if ( params.size() > 0 )
- {
+ for (Object nonMatchedType : nonMatchedTypes) {
+ String type = (String) nonMatchedType;
+ buff.append('\n');
+ buff.append(type);
+ Map params = toolchains.getParams(type);
+ if (params.size() > 0) {
Iterator it2 = params.keySet().iterator();
- buff.append( " [" );
- while ( it2.hasNext() )
- {
+ buff.append(" [");
+ while (it2.hasNext()) {
String string = (String) it2.next();
- buff.append( " " + string + "='" + params.get( string ) + "' " );
+ buff.append(" " + string + "='" + params.get(string) + "' ");
}
- buff.append( ']' );
+ buff.append(']');
}
}
getLog().error( buff.toString() );
Modified: maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/ConsoleVerificationResultPrinter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/ConsoleVerificationResultPrinter.java?rev=1517357&r1=1517356&r2=1517357&view=diff
==============================================================================
--- maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/ConsoleVerificationResultPrinter.java (original)
+++ maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/ConsoleVerificationResultPrinter.java Sun Aug 25 18:16:58 2013
@@ -42,31 +42,28 @@ public class ConsoleVerificationResultPr
private void printExistenceFailures( VerificationResult results )
{
- for ( Iterator i = results.getExistenceFailures().iterator(); i.hasNext(); )
- {
- org.apache.maven.plugin.verifier.model.File file = (org.apache.maven.plugin.verifier.model.File) i.next();
+ for (Object o : results.getExistenceFailures()) {
+ org.apache.maven.plugin.verifier.model.File file = (org.apache.maven.plugin.verifier.model.File) o;
- printMessage( "File not found [" + file.getLocation() + "]" );
+ printMessage("File not found [" + file.getLocation() + "]");
}
}
private void printNonExistenceFailures( VerificationResult results )
{
- for ( Iterator i = results.getNonExistenceFailures().iterator(); i.hasNext(); )
- {
- org.apache.maven.plugin.verifier.model.File file = (org.apache.maven.plugin.verifier.model.File) i.next();
+ for (Object o : results.getNonExistenceFailures()) {
+ org.apache.maven.plugin.verifier.model.File file = (org.apache.maven.plugin.verifier.model.File) o;
- printMessage( "File should not exist [" + file.getLocation() + "]" );
+ printMessage("File should not exist [" + file.getLocation() + "]");
}
}
private void printContentFailures( VerificationResult results )
{
- for ( Iterator i = results.getContentFailures().iterator(); i.hasNext(); )
- {
- org.apache.maven.plugin.verifier.model.File file = (org.apache.maven.plugin.verifier.model.File) i.next();
+ for (Object o : results.getContentFailures()) {
+ org.apache.maven.plugin.verifier.model.File file = (org.apache.maven.plugin.verifier.model.File) o;
- printMessage( "File [" + file.getLocation() + "] does not match regexp [" + file.getContains() + "]" );
+ printMessage("File [" + file.getLocation() + "] does not match regexp [" + file.getContains() + "]");
}
}
Modified: maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/VerifierMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/VerifierMojo.java?rev=1517357&r1=1517356&r2=1517357&view=diff
==============================================================================
--- maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/VerifierMojo.java (original)
+++ maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/VerifierMojo.java Sun Aug 25 18:16:58 2013
@@ -186,7 +186,7 @@ public class VerifierMojo
private boolean verifyFileExistence( org.apache.maven.plugin.verifier.model.File fileCheck,
VerificationResult results )
{
- boolean result = false;
+ boolean result;
File physicalFile = new File( fileCheck.getLocation() );
if ( fileCheck.isExists() )