You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2013/11/04 22:00:14 UTC
svn commit: r1538762 - in
/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools:
DistCheckIndexPageMojo.java DistCheckSiteMojo.java
Author: hboutemy
Date: Mon Nov 4 21:00:14 2013
New Revision: 1538762
URL: http://svn.apache.org/r1538762
Log:
replaced ifs with Map
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckIndexPageMojo.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java
Modified: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckIndexPageMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckIndexPageMojo.java?rev=1538762&r1=1538761&r2=1538762&view=diff
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckIndexPageMojo.java (original)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckIndexPageMojo.java Mon Nov 4 21:00:14 2013
@@ -58,6 +58,9 @@ public class DistCheckIndexPageMojo
private static final Map<String, IndexPage> INDEX_PAGES_REF;
+ // artifact-id -> path when path is not the classical /artifact-id/
+ private static final Map<String, String> ARTIFACT_PATHS;
+
private static class IndexPage
{
final String url;
@@ -74,6 +77,7 @@ public class DistCheckIndexPageMojo
this.containsDate = containsDate;
}
}
+
static
{
Map<String, IndexPage> aMap = new HashMap<>();
@@ -82,7 +86,14 @@ public class DistCheckIndexPageMojo
aMap.put( ip.url, ip );
}
INDEX_PAGES_REF = Collections.unmodifiableMap( aMap );
+
+ Map<String, String> path = new HashMap<>();
+ path.put( "apache", "/asf/" );
+ path.put( "maven-parent", "/maven/" );
+ path.put( "maven-skins", "/skins/" );
+ ARTIFACT_PATHS = Collections.unmodifiableMap( path );
}
+
/**
* Ignore dist failure for <code>artifactId</code> or <code>artifactId:version</code>
*/
@@ -286,19 +297,10 @@ public class DistCheckIndexPageMojo
Elements a = doc.select( "tr > td > a[href]:not(.externalLink)" );
- String path = '/' + cli.getArtifactId() + '/';
- // poms index page hack: neither link text nor url are equal to artifactId
- if ( cli.getArtifactId().equals( "maven-parent" ) )
- {
- path = "/maven/";
- }
- else if ( cli.getArtifactId().equals( "maven-skins" ) )
- {
- path = "/skins/";
- }
- else if ( cli.getArtifactId().equals( "apache" ) )
+ String path = ARTIFACT_PATHS.get( cli.getArtifactId() );
+ if ( path == null )
{
- path = "/asf/";
+ path = '/' + cli.getArtifactId() + '/';
}
for ( Element e : a )
Modified: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java?rev=1538762&r1=1538761&r2=1538762&view=diff
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java (original)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java Mon Nov 4 21:00:14 2013
@@ -20,6 +20,7 @@ package org.apache.maven.dist.tools;
*/
import java.io.File;
+import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
@@ -100,6 +101,17 @@ public class DistCheckSiteMojo
*/
protected static final int HTTP_OK = 200;
+ // artifact-id -> url when site url read in pom doesn't get the expected value
+ private static final Map<String, String> ARTIFACT_SITE_URLS;
+
+ static
+ {
+ Map<String, String> urls = new HashMap<>();
+ urls.put( "apache", "http://maven.apache.org/pom/asf/" );
+ urls.put( "maven-parent", "http://maven.apache.org/pom/maven/" );
+ ARTIFACT_SITE_URLS = Collections.unmodifiableMap( urls );
+ }
+
@Override
boolean isIndexPageCheck()
{
@@ -420,15 +432,11 @@ public class DistCheckSiteMojo
artifactFactory.createProjectArtifact( cli.getGroupId(), cli.getArtifactId(), version );
MavenProject artifactProject =
mavenProjectBuilder.buildFromRepository( artifact, artifactRepositories, localRepository, false );
- String siteUrl = artifactProject.getUrl();
- if ( "apache".equals( cli.getArtifactId() ) )
- {
- siteUrl = "http://maven.apache.org/pom/asf/";
- }
- else if ( "maven-parent".equals( cli.getArtifactId() ) )
+ String siteUrl = ARTIFACT_SITE_URLS.get( cli.getArtifactId() );
+ if ( siteUrl == null )
{
- siteUrl = "http://maven.apache.org/pom/maven/";
+ siteUrl = artifactProject.getUrl();
}
result.setUrl( siteUrl );