This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-dist-tool.git
commit 652f7bb71e13205209e75d4f19eaabb0a7ce98a5 Author: Hervé Boutemy <[email protected]> AuthorDate: Sun Jan 2 19:51:29 2022 +0100 rename methods --- .../java/org/apache/maven/dist/tools/site/CheckSiteResult.java | 10 +++++----- .../org/apache/maven/dist/tools/site/DistCheckSiteReport.java | 7 ++++--- .../java/org/apache/maven/dist/tools/site/HTMLChecker.java | 6 +++--- .../maven/dist/tools/site/checkers/FluidoHTMLChecker.java | 2 +- .../maven/dist/tools/site/checkers/StylusLeftHTMLChecker.java | 2 +- .../maven/dist/tools/site/checkers/StylusRightHTMLChecker.java | 2 +- 6 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/apache/maven/dist/tools/site/CheckSiteResult.java b/src/main/java/org/apache/maven/dist/tools/site/CheckSiteResult.java index 8282216..48f57d7 100644 --- a/src/main/java/org/apache/maven/dist/tools/site/CheckSiteResult.java +++ b/src/main/java/org/apache/maven/dist/tools/site/CheckSiteResult.java @@ -85,7 +85,7 @@ class CheckSiteResult return statusCode; } - void getSkins( Sink sink ) + void renderDetectedSkin( Sink sink ) { if ( statusCode != DistCheckSiteReport.HTTP_OK ) { @@ -94,10 +94,10 @@ class CheckSiteResult else { String text = ""; - Elements htmlTag = document.select( "html " ); - for ( Element htmlTa : htmlTag ) + Elements htmlTags = document.select( "html " ); + for ( Element htmlTag : htmlTags ) { - Node n = htmlTa.previousSibling(); + Node n = htmlTag.previousSibling(); if ( n instanceof Comment ) { text += ( ( Comment ) n ).getData(); @@ -127,7 +127,7 @@ class CheckSiteResult } } - void getOverall( Sink sink ) + void renderDisplayedArtifactVersion( Sink sink ) { if ( statusCode != DistCheckSiteReport.HTTP_OK ) { diff --git a/src/main/java/org/apache/maven/dist/tools/site/DistCheckSiteReport.java b/src/main/java/org/apache/maven/dist/tools/site/DistCheckSiteReport.java index 24f46ce..ed878b8 100644 --- a/src/main/java/org/apache/maven/dist/tools/site/DistCheckSiteReport.java +++ b/src/main/java/org/apache/maven/dist/tools/site/DistCheckSiteReport.java @@ -39,6 +39,7 @@ import org.apache.maven.project.MavenProjectBuilder; import org.apache.maven.reporting.MavenReportException; import org.jsoup.HttpStatusException; import org.jsoup.nodes.Document; + /** * * @author skygo @@ -204,11 +205,11 @@ public class DistCheckSiteReport sink.rawText( getSimplifiedUrl( csr.getUrl() ) ); sink.link_(); sink.lineBreak(); - csr.getSkins( sink ); + csr.renderDetectedSkin( sink ); sink.tableCell_(); sink.tableCell(); - csr.getOverall( sink ); + csr.renderDisplayedArtifactVersion( sink ); sink.tableCell_(); sink.tableRow_(); @@ -249,7 +250,7 @@ public class DistCheckSiteReport Document doc = JsoupRetry.get( siteUrl ); for ( HTMLChecker c : checker ) { - result.getCheckMap().put( c, c.isOk( doc, version ) ); + result.getCheckMap().put( c, c.isDisplayedArtifactVersionOk( doc, version ) ); } result.setDocument( doc ); diff --git a/src/main/java/org/apache/maven/dist/tools/site/HTMLChecker.java b/src/main/java/org/apache/maven/dist/tools/site/HTMLChecker.java index 90a5bae..fc66a63 100644 --- a/src/main/java/org/apache/maven/dist/tools/site/HTMLChecker.java +++ b/src/main/java/org/apache/maven/dist/tools/site/HTMLChecker.java @@ -36,19 +36,19 @@ public interface HTMLChecker String getName(); /** - * Get an id representing sink. + * Get an id representing skin. * * @return string for skin */ String getSkin(); /** - * true if checker find pattern in document + * Checks if the documents represents the provided artifact version. * * @param doc html document * @param version version to check against * @return true if version is found */ - boolean isOk( Document doc, String version ); + boolean isDisplayedArtifactVersionOk( Document doc, String version ); } diff --git a/src/main/java/org/apache/maven/dist/tools/site/checkers/FluidoHTMLChecker.java b/src/main/java/org/apache/maven/dist/tools/site/checkers/FluidoHTMLChecker.java index e47cedf..2ae7d5c 100644 --- a/src/main/java/org/apache/maven/dist/tools/site/checkers/FluidoHTMLChecker.java +++ b/src/main/java/org/apache/maven/dist/tools/site/checkers/FluidoHTMLChecker.java @@ -44,7 +44,7 @@ public class FluidoHTMLChecker implements HTMLChecker } @Override - public boolean isOk( Document doc, String version ) + public boolean isDisplayedArtifactVersionOk( Document doc, String version ) { Element links = doc.select( "li#projectVersion" ).first(); return ( links != null ) && links.text().contains( version ); diff --git a/src/main/java/org/apache/maven/dist/tools/site/checkers/StylusLeftHTMLChecker.java b/src/main/java/org/apache/maven/dist/tools/site/checkers/StylusLeftHTMLChecker.java index 22e66ec..4d2cc50 100644 --- a/src/main/java/org/apache/maven/dist/tools/site/checkers/StylusLeftHTMLChecker.java +++ b/src/main/java/org/apache/maven/dist/tools/site/checkers/StylusLeftHTMLChecker.java @@ -44,7 +44,7 @@ public class StylusLeftHTMLChecker implements HTMLChecker } @Override - public boolean isOk( Document doc, String version ) + public boolean isDisplayedArtifactVersionOk( Document doc, String version ) { Element links = doc.select( "div.xleft" ).first(); diff --git a/src/main/java/org/apache/maven/dist/tools/site/checkers/StylusRightHTMLChecker.java b/src/main/java/org/apache/maven/dist/tools/site/checkers/StylusRightHTMLChecker.java index 16d0f56..b3a790e 100644 --- a/src/main/java/org/apache/maven/dist/tools/site/checkers/StylusRightHTMLChecker.java +++ b/src/main/java/org/apache/maven/dist/tools/site/checkers/StylusRightHTMLChecker.java @@ -44,7 +44,7 @@ public class StylusRightHTMLChecker implements HTMLChecker } @Override - public boolean isOk( Document doc, String version ) + public boolean isDisplayedArtifactVersionOk( Document doc, String version ) { Element links = doc.select( "div.xright" ).first();
