Return null as web link if no web link should be displayed So far a web link without URL was returned to indicate that no link should be displayed, but with I28b98c25a this now results in a warning in the log that we don't want to see. Also the web links targets are now exposed as an inner class of the WebLink interface. Adapt the plugin code to this change. Change-Id: Ifd10df61ad80bf792348b5bd99aa2e5cf5288635 Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
diff --git a/src/main/java/com/googlesource/gerrit/plugins/xdocs/XDocWebLink.java b/src/main/java/com/googlesource/gerrit/plugins/xdocs/XDocWebLink.java index 8ee9d61..1454776 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/xdocs/XDocWebLink.java +++ b/src/main/java/com/googlesource/gerrit/plugins/xdocs/XDocWebLink.java
@@ -20,7 +20,6 @@ import com.google.gerrit.extensions.webui.BranchWebLink; import com.google.gerrit.extensions.webui.FileWebLink; import com.google.gerrit.extensions.webui.ProjectWebLink; -import com.google.gerrit.extensions.webui.WebLinkTarget; import com.google.gerrit.httpd.resources.Resource; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.git.GitRepositoryManager; @@ -73,22 +72,27 @@ @Override public WebLinkInfo getBranchWebLink(String projectName, String branchName) { - return new WebLinkInfo(README, getImageUrl(), - getBranchUrl(projectName, branchName), WebLinkTarget.SELF); + String url = getBranchUrl(projectName, branchName); + return url == null + ? null + : new WebLinkInfo(README, getImageUrl(), url, Target.SELF); } @Override public WebLinkInfo getProjectWeblink(String projectName) { - return new WebLinkInfo(README, getImageUrl(), - getBranchUrl(projectName, Constants.HEAD), WebLinkTarget.SELF); + String url = getBranchUrl(projectName, Constants.HEAD); + return url == null + ? null + : new WebLinkInfo(README, getImageUrl(), url, Target.SELF); } @Override public WebLinkInfo getFileWebLink(String projectName, String revision, String fileName) { - return new WebLinkInfo(PREVIEW, getImageUrl(), - getFileUrl(projectName, revision, fileName, false), - WebLinkTarget.BLANK); + String url = getFileUrl(projectName, revision, fileName, false); + return url == null + ? null + : new WebLinkInfo(PREVIEW, getImageUrl(), url, Target.BLANK); } private String getBranchUrl(String projectName, String branchName) {