opendev/gerrit
Code Issues Proposed changes

WebLinks: Convert Functions/Predicates to lambdas

Browse Source 
Change-Id: I96e7c03839fb86c775d63e6dd6adf10a233865a1
This commit is contained in:
Dave Borowitz
2016-09-20 11:26:35 -04:00
parent d39fb04d3f
commit 8c6540e84b
1 changed files with 62 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

159
gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java
View File

@@ -39,37 +39,31 @@ import org.slf4j.LoggerFactory;
@Singleton @Singleton
public class WebLinks { public class WebLinks {
private static final Logger log = LoggerFactory.getLogger(WebLinks.class); private static final Logger log = LoggerFactory.getLogger(WebLinks.class);
private static final Predicate<WebLinkInfo> INVALID_WEBLINK = private static final Predicate<WebLinkInfo> INVALID_WEBLINK =
new Predicate<WebLinkInfo>() { link -> {
if (link == null) {
@Override return false;
public boolean apply(WebLinkInfo link) { } else if (Strings.isNullOrEmpty(link.name)
if (link == null) { || Strings.isNullOrEmpty(link.url)) {
return false; log.warn(String.format("%s is missing name and/or url",
} else if (Strings.isNullOrEmpty(link.name) link.getClass().getName()));
|| Strings.isNullOrEmpty(link.url)) { return false;
log.warn(String.format("%s is missing name and/or url",
link.getClass().getName()));
return false;
}
return true;
} }
return true;
}; };
private static final Predicate<WebLinkInfoCommon> INVALID_WEBLINK_COMMON =
new Predicate<WebLinkInfoCommon>() {
@Override private static final Predicate<WebLinkInfoCommon> INVALID_WEBLINK_COMMON =
public boolean apply(WebLinkInfoCommon link) { link -> {
if (link == null) { if (link == null) {
return false; return false;
} else if (Strings.isNullOrEmpty(link.name) } else if (Strings.isNullOrEmpty(link.name)
|| Strings.isNullOrEmpty(link.url)) { || Strings.isNullOrEmpty(link.url)) {
log.warn(String.format("%s is missing name and/or url", link log.warn(String.format("%s is missing name and/or url", link
.getClass().getName())); .getClass().getName()));
return false; return false;
}
return true;
} }
return true;
}; };
private final DynamicSet<PatchSetWebLink> patchSetLinks; private final DynamicSet<PatchSetWebLink> patchSetLinks;
@@ -85,8 +79,7 @@ public class WebLinks {
DynamicSet<FileHistoryWebLink> fileLogLinks, DynamicSet<FileHistoryWebLink> fileLogLinks,
DynamicSet<DiffWebLink> diffLinks, DynamicSet<DiffWebLink> diffLinks,
DynamicSet<ProjectWebLink> projectLinks, DynamicSet<ProjectWebLink> projectLinks,
DynamicSet<BranchWebLink> branchLinks DynamicSet<BranchWebLink> branchLinks) {
) {
this.patchSetLinks = patchSetLinks; this.patchSetLinks = patchSetLinks;
this.fileLinks = fileLinks; this.fileLinks = fileLinks;
this.fileHistoryLinks = fileLogLinks; this.fileHistoryLinks = fileLogLinks;
@@ -101,15 +94,11 @@ public class WebLinks {
* @param commit SHA1 of commit. * @param commit SHA1 of commit.
* @return Links for patch sets. * @return Links for patch sets.
*/ */
public FluentIterable<WebLinkInfo> getPatchSetLinks(final Project.NameKey project, public FluentIterable<WebLinkInfo> getPatchSetLinks(Project.NameKey project,
final String commit) { String commit) {
return filterLinks(patchSetLinks, new Function<WebLink, WebLinkInfo>() { return filterLinks(
patchSetLinks,
@Override webLink -> webLink.getPatchSetWebLink(project.get(), commit));
public WebLinkInfo apply(WebLink webLink) {
return ((PatchSetWebLink)webLink).getPatchSetWebLink(project.get(), commit);
}
});
} }
/** /**
@@ -119,15 +108,11 @@ public class WebLinks {
* @param file File name. * @param file File name.
* @return Links for files. * @return Links for files.
*/ */
public FluentIterable<WebLinkInfo> getFileLinks(final String project, final String revision, public FluentIterable<WebLinkInfo> getFileLinks(String project,
final String file) { String revision, String file) {
return filterLinks(fileLinks, new Function<WebLink, WebLinkInfo>() { return filterLinks(
fileLinks,
@Override webLink -> webLink.getFileWebLink(project, revision, file));
public WebLinkInfo apply(WebLink webLink) {
return ((FileWebLink)webLink).getFileWebLink(project, revision, file);
}
});
} }
/** /**
@@ -137,39 +122,31 @@ public class WebLinks {
* @param file File name. * @param file File name.
* @return Links for file history * @return Links for file history
*/ */
public FluentIterable<WebLinkInfo> getFileHistoryLinks(final String project, public FluentIterable<WebLinkInfo> getFileHistoryLinks(String project,
final String revision, final String file) { String revision, String file) {
return filterLinks(fileHistoryLinks, new Function<WebLink, WebLinkInfo>() { return filterLinks(
fileHistoryLinks,
@Override webLink -> webLink.getFileHistoryWebLink(project, revision, file));
public WebLinkInfo apply(WebLink webLink) {
return ((FileHistoryWebLink) webLink).getFileHistoryWebLink(project,
revision, file);
}
});
} }
public FluentIterable<WebLinkInfoCommon> getFileHistoryLinksCommon( public FluentIterable<WebLinkInfoCommon> getFileHistoryLinksCommon(
final String project, final String revision, final String file) { String project, String revision, String file) {
return FluentIterable return FluentIterable
.from(fileHistoryLinks) .from(fileHistoryLinks)
.transform(new Function<WebLink, WebLinkInfoCommon>() { .transform(
@Override webLink -> {
public WebLinkInfoCommon apply(WebLink webLink) { WebLinkInfo info =
WebLinkInfo info = webLink.getFileHistoryWebLink(project, revision, file);
((FileHistoryWebLink) webLink).getFileHistoryWebLink(project, if (info == null) {
revision, file); return null;
if (info == null) { }
return null; WebLinkInfoCommon commonInfo = new WebLinkInfoCommon();
} commonInfo.name = info.name;
WebLinkInfoCommon commonInfo = new WebLinkInfoCommon(); commonInfo.imageUrl = info.imageUrl;
commonInfo.name = info.name; commonInfo.url = info.url;
commonInfo.imageUrl = info.imageUrl; commonInfo.target = info.target;
commonInfo.url = info.url; return commonInfo;
commonInfo.target = info.target; })
return commonInfo;
}
})
.filter(INVALID_WEBLINK_COMMON); .filter(INVALID_WEBLINK_COMMON);
} }
@@ -190,14 +167,10 @@ public class WebLinks {
final int patchSetIdB, final String revisionB, final String fileB) { final int patchSetIdB, final String revisionB, final String fileB) {
return FluentIterable return FluentIterable
.from(diffLinks) .from(diffLinks)
.transform(new Function<WebLink, DiffWebLinkInfo>() { .transform(webLink ->
@Override webLink.getDiffLink(project, changeId,
public DiffWebLinkInfo apply(WebLink webLink) {
return ((DiffWebLink) webLink).getDiffLink(project, changeId,
patchSetIdA, revisionA, fileA, patchSetIdA, revisionA, fileA,
patchSetIdB, revisionB, fileB); patchSetIdB, revisionB, fileB))
}
})
.filter(INVALID_WEBLINK); .filter(INVALID_WEBLINK);
} }
@@ -207,13 +180,9 @@ public class WebLinks {
* @return Links for projects. * @return Links for projects.
*/ */
public FluentIterable<WebLinkInfo> getProjectLinks(final String project) { public FluentIterable<WebLinkInfo> getProjectLinks(final String project) {
return filterLinks(projectLinks, new Function<WebLink, WebLinkInfo>() { return filterLinks(
projectLinks,
@Override webLink -> webLink.getProjectWeblink(project));
public WebLinkInfo apply(WebLink webLink) {
return ((ProjectWebLink)webLink).getProjectWeblink(project);
}
});
} }
/** /**
@@ -223,17 +192,13 @@ public class WebLinks {
* @return Links for branches. * @return Links for branches.
*/ */
public FluentIterable<WebLinkInfo> getBranchLinks(final String project, final String branch) { public FluentIterable<WebLinkInfo> getBranchLinks(final String project, final String branch) {
return filterLinks(branchLinks, new Function<WebLink, WebLinkInfo>() { return filterLinks(
branchLinks,
@Override webLink -> webLink.getBranchWebLink(project, branch));
public WebLinkInfo apply(WebLink webLink) {
return ((BranchWebLink)webLink).getBranchWebLink(project, branch);
}
});
} }
private FluentIterable<WebLinkInfo> filterLinks(DynamicSet<? extends WebLink> links, private <T extends WebLink> FluentIterable<WebLinkInfo> filterLinks(DynamicSet<T> links,
Function<WebLink, WebLinkInfo> transformer) { Function<T, WebLinkInfo> transformer) {
return FluentIterable return FluentIterable
.from(links) .from(links)
.transform(transformer) .transform(transformer)