From b5c589f9b9c9a7540c2815b11eb1350ddd3532ae Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Mon, 17 Dec 2018 15:47:44 +0900 Subject: [PATCH 1/6] GroupsUpdate: Evict group caches on group creation If a group is created after a previous cache miss for its name, Id, or UUID, the cache also does not return the group if it is called immediately after the group is created. Evict the group out of the caches after creation. Change-Id: I066df3b1814b2a7a6cc83b0f64c18ae550c23ef9 --- .../google/gerrit/server/group/db/GroupsUpdate.java | 3 +++ .../google/gerrit/acceptance/api/group/GroupsIT.java | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/java/com/google/gerrit/server/group/db/GroupsUpdate.java b/java/com/google/gerrit/server/group/db/GroupsUpdate.java index 5e1e2b561c..828c6bb518 100644 --- a/java/com/google/gerrit/server/group/db/GroupsUpdate.java +++ b/java/com/google/gerrit/server/group/db/GroupsUpdate.java @@ -345,6 +345,9 @@ public class GroupsUpdate { } private void updateCachesOnGroupCreation(InternalGroup createdGroup) throws IOException { + groupCache.evict(createdGroup.getGroupUUID()); + groupCache.evict(createdGroup.getId()); + groupCache.evict(createdGroup.getNameKey()); indexer.get().index(createdGroup.getGroupUUID()); createdGroup.getMembers().forEach(groupIncludeCache::evictGroupsWithMember); createdGroup.getSubgroups().forEach(groupIncludeCache::evictParentGroupsOf); diff --git a/javatests/com/google/gerrit/acceptance/api/group/GroupsIT.java b/javatests/com/google/gerrit/acceptance/api/group/GroupsIT.java index ade0f3c144..e2d390e6fd 100644 --- a/javatests/com/google/gerrit/acceptance/api/group/GroupsIT.java +++ b/javatests/com/google/gerrit/acceptance/api/group/GroupsIT.java @@ -16,6 +16,7 @@ package com.google.gerrit.acceptance.api.group; import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.truth.Truth.assertThat; +import static com.google.common.truth.Truth8.assertThat; import static com.google.gerrit.acceptance.GitUtil.deleteRef; import static com.google.gerrit.acceptance.GitUtil.fetch; import static com.google.gerrit.acceptance.api.group.GroupAssert.assertGroupInfo; @@ -203,6 +204,15 @@ public class GroupsIT extends AbstractDaemonTest { assertThat(groupsWithMemberAfterRemoval).doesNotContain(groupUuid); } + @Test + public void cachedGroupByNameIsUpdatedOnCreation() throws Exception { + String newGroupName = name("newGroup"); + AccountGroup.NameKey nameKey = new AccountGroup.NameKey(newGroupName); + assertThat(groupCache.get(nameKey)).isEmpty(); + gApi.groups().create(newGroupName); + assertThat(groupCache.get(nameKey)).isPresent(); + } + @Test public void addExistingMember_OK() throws Exception { String g = "Administrators"; From 3d2fdd0d98dd8b44842c994537c946ebdea5a74b Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Wed, 19 Dec 2018 11:23:55 +0200 Subject: [PATCH 2/6] Scripts: Use bash in shebang These scripts use [[, which is not POSIX compliant. Change-Id: I9dbb3334e44fba0c88c54c1ef0f2f4d1b3932088 --- polygerrit-ui/app/polylint_test.sh | 2 +- polygerrit-ui/app/template_test.sh | 2 +- tools/coverage.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/polygerrit-ui/app/polylint_test.sh b/polygerrit-ui/app/polylint_test.sh index ca9f9a92c8..ee69ce2aa8 100755 --- a/polygerrit-ui/app/polylint_test.sh +++ b/polygerrit-ui/app/polylint_test.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -ex diff --git a/polygerrit-ui/app/template_test.sh b/polygerrit-ui/app/template_test.sh index fcadc1bdaf..7177e8afbb 100755 --- a/polygerrit-ui/app/template_test.sh +++ b/polygerrit-ui/app/template_test.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -ex diff --git a/tools/coverage.sh b/tools/coverage.sh index 22b40d8f6d..72e1d5bbdb 100755 --- a/tools/coverage.sh +++ b/tools/coverage.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # Usage # From d7b29fffc683b48c7ce857ed54c722e9b7d75701 Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Tue, 18 Dec 2018 19:47:51 -0800 Subject: [PATCH 3/6] Consistently define default serialVersionUID A handful of classes suppressed the warning instead of adding a default serialVersionUID. I only weakly believe that using a default serialVersionUID is better than suppressing the warning in these cases, but I do value consistency. Change-Id: Ic56ecb2d541c5276a9d32ab822b510598be86600 --- .../java/com/google/gwtexpui/safehtml/client/SafeHtml.java | 3 ++- .../google/gwtexpui/safehtml/client/SafeHtmlBuilder.java | 3 ++- .../google/gwtexpui/safehtml/client/SafeHtmlString.java | 3 ++- .../com/google/gerrit/client/change/RelatedChangesTab.java | 3 ++- .../google/gerrit/client/changes/RevisionInfoCache.java | 3 ++- .../java/com/google/gerrit/client/ui/NavigationTable.java | 3 ++- .../httpd/auth/become/BecomeAnyAccountLoginServlet.java | 3 ++- .../google/gerrit/httpd/auth/ldap/LdapLoginServlet.java | 3 ++- .../com/google/gerrit/httpd/gitweb/GitLogoServlet.java | 3 ++- .../com/google/gerrit/httpd/gitweb/GitwebCssServlet.java | 7 ++++++- .../gerrit/httpd/gitweb/GitwebJavaScriptServlet.java | 3 ++- .../java/com/google/gerrit/httpd/gitweb/GitwebServlet.java | 3 ++- .../main/java/com/google/gerrit/httpd/raw/CatServlet.java | 3 ++- .../java/com/google/gerrit/httpd/raw/HostPageServlet.java | 3 ++- .../com/google/gerrit/httpd/raw/LegacyGerritServlet.java | 3 ++- .../java/com/google/gerrit/httpd/raw/SshInfoServlet.java | 3 ++- .../com/google/gerrit/httpd/restapi/RestApiServlet.java | 3 ++- .../com/google/gerrit/httpd/rpc/GerritJsonServlet.java | 3 ++- .../com/google/gerrit/httpd/auth/openid/LoginForm.java | 3 ++- .../gerrit/httpd/auth/openid/OpenIdLoginServlet.java | 3 ++- .../com/google/gerrit/server/account/AccountDirectory.java | 3 ++- .../com/google/gerrit/server/config/AllProjectsName.java | 3 ++- .../java/com/google/gerrit/server/config/AllUsersName.java | 3 ++- .../server/documentation/QueryDocumentationExecutor.java | 3 ++- .../google/gerrit/server/project/RuleEvalException.java | 3 ++- 25 files changed, 54 insertions(+), 25 deletions(-) diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtml.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtml.java index 2a1ddc0ce1..5b3b9b607a 100644 --- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtml.java +++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtml.java @@ -28,8 +28,9 @@ import java.util.Iterator; import java.util.List; /** Immutable string safely placed as HTML without further escaping. */ -@SuppressWarnings("serial") public abstract class SafeHtml implements com.google.gwt.safehtml.shared.SafeHtml { + private static final long serialVersionUID = 1L; + public static final SafeHtmlResources RESOURCES; static { diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtmlBuilder.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtmlBuilder.java index a9269063ae..cde0f2af75 100644 --- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtmlBuilder.java +++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtmlBuilder.java @@ -17,8 +17,9 @@ package com.google.gwtexpui.safehtml.client; import com.google.gwt.core.client.GWT; /** Safely constructs a {@link SafeHtml}, escaping user provided content. */ -@SuppressWarnings("serial") public class SafeHtmlBuilder extends SafeHtml { + private static final long serialVersionUID = 1L; + private static final Impl impl; static { diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtmlString.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtmlString.java index 889509abb6..5335170499 100644 --- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtmlString.java +++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtmlString.java @@ -14,8 +14,9 @@ package com.google.gwtexpui.safehtml.client; -@SuppressWarnings("serial") class SafeHtmlString extends SafeHtml { + private static final long serialVersionUID = 1L; + private final String html; SafeHtmlString(String h) { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChangesTab.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChangesTab.java index aa049cab51..c53427bee3 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChangesTab.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChangesTab.java @@ -248,8 +248,9 @@ class RelatedChangesTab implements IsWidget { } } - @SuppressWarnings("serial") private class RowSafeHtml implements SafeHtml { + private static final long serialVersionUID = 1L; + private String html; private ChangeAndCommit info; private final boolean notConnected; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/RevisionInfoCache.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/RevisionInfoCache.java index 0b83119ae1..fde2b055c9 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/RevisionInfoCache.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/RevisionInfoCache.java @@ -35,10 +35,11 @@ public class RevisionInfoCache { private final LinkedHashMap psToCommit; - @SuppressWarnings("serial") private RevisionInfoCache() { psToCommit = new LinkedHashMap(LIMIT) { + private static final long serialVersionUID = 1L; + @Override protected boolean removeEldestEntry(Map.Entry e) { return size() > LIMIT; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/NavigationTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/NavigationTable.java index 7e34730f6a..b2306a6b96 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/NavigationTable.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/NavigationTable.java @@ -73,9 +73,10 @@ public abstract class NavigationTable extends FancyFlexTable { } } - @SuppressWarnings("serial") private static final LinkedHashMap savedPositions = new LinkedHashMap(10, 0.75f, true) { + private static final long serialVersionUID = 1L; + @Override protected boolean removeEldestEntry(Entry eldest) { return size() >= 20; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become/BecomeAnyAccountLoginServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become/BecomeAnyAccountLoginServlet.java index 1f095e0540..de549a0efe 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become/BecomeAnyAccountLoginServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become/BecomeAnyAccountLoginServlet.java @@ -55,9 +55,10 @@ import org.eclipse.jgit.errors.ConfigInvalidException; import org.w3c.dom.Document; import org.w3c.dom.Element; -@SuppressWarnings("serial") @Singleton class BecomeAnyAccountLoginServlet extends HttpServlet { + private static final long serialVersionUID = 1L; + private final DynamicItem webSession; private final SchemaFactory schema; private final Accounts accounts; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/LdapLoginServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/LdapLoginServlet.java index 46714756fb..316bf5dfa9 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/LdapLoginServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/LdapLoginServlet.java @@ -47,9 +47,10 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; /** Handles username/password based authentication against the directory. */ -@SuppressWarnings("serial") @Singleton class LdapLoginServlet extends HttpServlet { + private static final long serialVersionUID = 1L; + private static final Logger log = LoggerFactory.getLogger(LdapLoginServlet.class); private final AccountManager accountManager; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitLogoServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitLogoServlet.java index af853cc333..2019dec073 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitLogoServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitLogoServlet.java @@ -32,9 +32,10 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -@SuppressWarnings("serial") @Singleton class GitLogoServlet extends HttpServlet { + private static final long serialVersionUID = 1L; + private final long modified; private final byte[] raw; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebCssServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebCssServlet.java index 5e22081f72..83aed9c31e 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebCssServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebCssServlet.java @@ -32,10 +32,13 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -@SuppressWarnings("serial") abstract class GitwebCssServlet extends HttpServlet { + private static final long serialVersionUID = 1L; + @Singleton static class Site extends GitwebCssServlet { + private static final long serialVersionUID = 1L; + @Inject Site(SitePaths paths) throws IOException { super(paths.site_css); @@ -44,6 +47,8 @@ abstract class GitwebCssServlet extends HttpServlet { @Singleton static class Default extends GitwebCssServlet { + private static final long serialVersionUID = 1L; + @Inject Default(GitwebCgiConfig gwcc) throws IOException { super(gwcc.getGitwebCss()); diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebJavaScriptServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebJavaScriptServlet.java index 651b582fca..1b26f6d5ba 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebJavaScriptServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebJavaScriptServlet.java @@ -32,9 +32,10 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -@SuppressWarnings("serial") @Singleton class GitwebJavaScriptServlet extends HttpServlet { + private static final long serialVersionUID = 1L; + private final long modified; private final byte[] raw; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebServlet.java index 6a30000ee1..ec7c4778aa 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebServlet.java @@ -84,9 +84,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** Invokes {@code gitweb.cgi} for the project given in {@code p}. */ -@SuppressWarnings("serial") @Singleton class GitwebServlet extends HttpServlet { + private static final long serialVersionUID = 1L; + private static final Logger log = LoggerFactory.getLogger(GitwebServlet.class); private static final String PROJECT_LIST_ACTION = "project_list"; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/CatServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/CatServlet.java index 08b42e5c7c..d28e582696 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/CatServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/CatServlet.java @@ -48,9 +48,10 @@ import org.eclipse.jgit.lib.ObjectId; * this site, and will execute it with the site's own protection domain. This opens a massive * security hole so we package the content into a zip file. */ -@SuppressWarnings("serial") @Singleton public class CatServlet extends HttpServlet { + private static final long serialVersionUID = 1L; + private final Provider requestDb; private final Provider userProvider; private final ChangeEditUtil changeEditUtil; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/HostPageServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/HostPageServlet.java index 51340ae578..9818a34bb9 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/HostPageServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/HostPageServlet.java @@ -67,9 +67,10 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; /** Sends the Gerrit host page to clients. */ -@SuppressWarnings("serial") @Singleton public class HostPageServlet extends HttpServlet { + private static final long serialVersionUID = 1L; + private static final Logger log = LoggerFactory.getLogger(HostPageServlet.class); private static final String HPD_ID = "gerrit_hostpagedata"; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/LegacyGerritServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/LegacyGerritServlet.java index 10735a5154..c34b3cb936 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/LegacyGerritServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/LegacyGerritServlet.java @@ -34,9 +34,10 @@ import javax.servlet.http.HttpServletResponse; * as it would lose any history token that appears in the URL. Instead we send an HTML page which * instructs the browser to replace the URL, but preserve the history token. */ -@SuppressWarnings("serial") @Singleton public class LegacyGerritServlet extends HttpServlet { + private static final long serialVersionUID = 1L; + private final byte[] raw; private final byte[] compressed; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/SshInfoServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/SshInfoServlet.java index 55bc2a6c1b..d68b0093c8 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/SshInfoServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/SshInfoServlet.java @@ -46,9 +46,10 @@ import javax.servlet.http.HttpServletResponse; * Port 8010 * } */ -@SuppressWarnings("serial") @Singleton public class SshInfoServlet extends HttpServlet { + private static final long serialVersionUID = 1L; + private final SshInfo sshd; @Inject diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/RestApiServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/RestApiServlet.java index 7684bec7bd..f73e27d0ba 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/RestApiServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/RestApiServlet.java @@ -1295,8 +1295,9 @@ public class RestApiServlet extends HttpServlet { return new TemporaryBuffer.Heap(est, max); } - @SuppressWarnings("serial") private static class AmbiguousViewException extends Exception { + private static final long serialVersionUID = 1L; + AmbiguousViewException(String message) { super(message); } diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/GerritJsonServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/GerritJsonServlet.java index 178cda9358..d3d49cbca3 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/GerritJsonServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/GerritJsonServlet.java @@ -42,8 +42,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** Base JSON servlet to ensure the current user is not forged. */ -@SuppressWarnings("serial") final class GerritJsonServlet extends JsonServlet { + private static final long serialVersionUID = 1L; + private static final Logger log = LoggerFactory.getLogger(GerritJsonServlet.class); private static final ThreadLocal currentCall = new ThreadLocal<>(); private static final ThreadLocal currentMethod = new ThreadLocal<>(); diff --git a/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/LoginForm.java b/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/LoginForm.java index 6202cfc65d..b083d0158d 100644 --- a/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/LoginForm.java +++ b/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/LoginForm.java @@ -53,9 +53,10 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; /** Handles OpenID based login flow. */ -@SuppressWarnings("serial") @Singleton class LoginForm extends HttpServlet { + private static final long serialVersionUID = 1L; + private static final Logger log = LoggerFactory.getLogger(LoginForm.class); private static final ImmutableMap ALL_PROVIDERS = ImmutableMap.of( diff --git a/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdLoginServlet.java b/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdLoginServlet.java index a97e8aeb08..1b0fe9efe2 100644 --- a/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdLoginServlet.java +++ b/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdLoginServlet.java @@ -23,9 +23,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; /** Handles the {@code /OpenID} URL for web based single-sign-on. */ -@SuppressWarnings("serial") @Singleton class OpenIdLoginServlet extends HttpServlet { + private static final long serialVersionUID = 1L; + private final OpenIdServiceImpl impl; @Inject diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountDirectory.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountDirectory.java index 5c14c9450c..6e5b42ee05 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountDirectory.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountDirectory.java @@ -50,8 +50,9 @@ public abstract class AccountDirectory { public abstract void fillAccountInfo(Iterable in, Set options) throws DirectoryException; - @SuppressWarnings("serial") public static class DirectoryException extends Exception { + private static final long serialVersionUID = 1L; + public DirectoryException(String message, Throwable why) { super(message, why); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/AllProjectsName.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/AllProjectsName.java index 198d5c5e8e..7719e38dbb 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/AllProjectsName.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/AllProjectsName.java @@ -17,8 +17,9 @@ package com.google.gerrit.server.config; import com.google.gerrit.reviewdb.client.Project; /** Special name of the project that all projects derive from. */ -@SuppressWarnings("serial") public class AllProjectsName extends Project.NameKey { + private static final long serialVersionUID = 1L; + public AllProjectsName(String name) { super(name); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/AllUsersName.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/AllUsersName.java index ff28be4660..22d29a4fef 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/AllUsersName.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/AllUsersName.java @@ -17,8 +17,9 @@ package com.google.gerrit.server.config; import com.google.gerrit.reviewdb.client.Project; /** Special name of the project in which meta data for all users is stored. */ -@SuppressWarnings("serial") public class AllUsersName extends Project.NameKey { + private static final long serialVersionUID = 1L; + public AllUsersName(String name) { super(name); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/documentation/QueryDocumentationExecutor.java b/gerrit-server/src/main/java/com/google/gerrit/server/documentation/QueryDocumentationExecutor.java index eef6d3509c..73c2b5ead8 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/documentation/QueryDocumentationExecutor.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/documentation/QueryDocumentationExecutor.java @@ -130,8 +130,9 @@ public class QueryDocumentationExecutor { return parser != null && searcher != null; } - @SuppressWarnings("serial") public static class DocQueryException extends Exception { + private static final long serialVersionUID = 1L; + DocQueryException() {} DocQueryException(String msg) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/RuleEvalException.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/RuleEvalException.java index 9dae11c4d6..d2af2a3c7d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/RuleEvalException.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/RuleEvalException.java @@ -14,8 +14,9 @@ package com.google.gerrit.server.project; -@SuppressWarnings("serial") public class RuleEvalException extends Exception { + private static final long serialVersionUID = 1L; + public RuleEvalException(String message) { super(message); } From 64a76378e3280bd2d37bd5f1290b32ca0124ef65 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 20 Dec 2018 16:43:01 +0900 Subject: [PATCH 4/6] ListBranchesIT: Also assert on the expected ref of refs/meta/config Change-Id: I5b601954ec1dfbbd47c93db5a7107972c85f9a36 --- .../gerrit/acceptance/rest/project/ListBranchesIT.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/javatests/com/google/gerrit/acceptance/rest/project/ListBranchesIT.java b/javatests/com/google/gerrit/acceptance/rest/project/ListBranchesIT.java index 65276b5093..b46b087506 100644 --- a/javatests/com/google/gerrit/acceptance/rest/project/ListBranchesIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/project/ListBranchesIT.java @@ -55,10 +55,11 @@ public class ListBranchesIT extends AbstractDaemonTest { public void listBranches() throws Exception { String master = pushTo("refs/heads/master").getCommit().name(); String dev = pushTo("refs/heads/dev").getCommit().name(); + String refsConfig = getRemoteHead(project, RefNames.REFS_CONFIG).name(); assertRefs( ImmutableList.of( branch("HEAD", "master", false), - branch(RefNames.REFS_CONFIG, null, false), + branch(RefNames.REFS_CONFIG, refsConfig, false), branch("refs/heads/dev", dev, true), branch("refs/heads/master", master, false)), list().get()); @@ -90,7 +91,8 @@ public class ListBranchesIT extends AbstractDaemonTest { @Test public void listBranchesUsingPagination() throws Exception { BranchInfo head = branch("HEAD", "master", false); - BranchInfo refsConfig = branch(RefNames.REFS_CONFIG, null, false); + BranchInfo refsConfig = + branch(RefNames.REFS_CONFIG, getRemoteHead(project, RefNames.REFS_CONFIG).name(), false); BranchInfo master = branch("refs/heads/master", pushTo("refs/heads/master").getCommit().getName(), false); BranchInfo branch1 = From f86cc5eb4fcbcb02912168245202783d64285a8e Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 20 Dec 2018 16:50:14 +0900 Subject: [PATCH 5/6] Bazel: Fix testonly values in BUILD and .bzl files According to the documentation [1], the expected values for testonly are True and False. Replace all the current usages of "1" with "True". [1] https://docs.bazel.build/versions/master/be/common-definitions.html Change-Id: I89417f6f9d56e126a6b05edeaaa946934799ab23 --- BUILD | 2 +- java/com/google/gerrit/acceptance/BUILD | 8 ++++---- java/com/google/gerrit/common/data/testing/BUILD | 2 +- java/com/google/gerrit/extensions/common/testing/BUILD | 2 +- java/com/google/gerrit/extensions/restapi/testing/BUILD | 2 +- java/com/google/gerrit/git/testing/BUILD | 2 +- java/com/google/gerrit/gpg/testing/BUILD | 2 +- java/com/google/gerrit/server/cache/testing/BUILD | 2 +- java/com/google/gerrit/server/group/db/testing/BUILD | 2 +- java/com/google/gerrit/server/group/testing/BUILD | 2 +- java/com/google/gerrit/server/project/testing/BUILD | 2 +- java/com/google/gerrit/testing/BUILD | 2 +- java/com/google/gerrit/truth/BUILD | 2 +- javatests/com/google/gerrit/acceptance/git/BUILD | 4 ++-- javatests/com/google/gerrit/acceptance/pgm/BUILD | 2 +- javatests/com/google/gerrit/acceptance/rest/BUILD | 2 +- javatests/com/google/gerrit/acceptance/rest/account/BUILD | 2 +- javatests/com/google/gerrit/acceptance/rest/change/BUILD | 2 +- javatests/com/google/gerrit/acceptance/rest/project/BUILD | 2 +- javatests/com/google/gerrit/acceptance/server/mail/BUILD | 2 +- javatests/com/google/gerrit/acceptance/ssh/BUILD | 2 +- javatests/com/google/gerrit/elasticsearch/BUILD | 2 +- javatests/com/google/gerrit/server/BUILD | 2 +- javatests/com/google/gerrit/server/query/account/BUILD | 2 +- javatests/com/google/gerrit/server/query/change/BUILD | 2 +- javatests/com/google/gerrit/server/query/group/BUILD | 2 +- javatests/com/google/gerrit/server/query/project/BUILD | 2 +- javatests/com/google/gerrit/util/http/testutil/BUILD | 2 +- lib/jgit/org.eclipse.jgit.junit/BUILD | 2 +- lib/testcontainers/BUILD | 2 +- polygerrit-ui/app/BUILD | 2 +- tools/eclipse/BUILD | 4 ++-- tools/maven/package.bzl | 4 ++-- 33 files changed, 39 insertions(+), 39 deletions(-) diff --git a/BUILD b/BUILD index 318968d23e..0b528d8bf8 100644 --- a/BUILD +++ b/BUILD @@ -110,7 +110,7 @@ API_DEPS = [ genrule2( name = "api", - testonly = 1, + testonly = True, srcs = API_DEPS, outs = ["api.zip"], cmd = " && ".join([ diff --git a/java/com/google/gerrit/acceptance/BUILD b/java/com/google/gerrit/acceptance/BUILD index 861372dd9a..a9a077f0c0 100644 --- a/java/com/google/gerrit/acceptance/BUILD +++ b/java/com/google/gerrit/acceptance/BUILD @@ -2,7 +2,7 @@ load("//tools/bzl:java.bzl", "java_library2") java_library( name = "lib", - testonly = 1, + testonly = True, resource_strip_prefix = "resources", resources = ["//resources/com/google/gerrit/acceptance"], visibility = ["//visibility:public"], @@ -55,7 +55,7 @@ java_library( java_binary( name = "framework", - testonly = 1, + testonly = True, main_class = "Dummy", visibility = ["//visibility:public"], runtime_deps = [":framework-lib"], @@ -63,7 +63,7 @@ java_binary( java_library2( name = "framework-lib", - testonly = 1, + testonly = True, srcs = glob(["**/*.java"]), exported_deps = [ "//java/com/google/gerrit/gpg", @@ -129,7 +129,7 @@ load("//tools/bzl:javadoc.bzl", "java_doc") java_doc( name = "framework-javadoc", - testonly = 1, + testonly = True, libs = [":framework-lib"], pkgs = ["com.google.gerrit.acceptance"], title = "Gerrit Acceptance Test Framework Documentation", diff --git a/java/com/google/gerrit/common/data/testing/BUILD b/java/com/google/gerrit/common/data/testing/BUILD index 3899e39280..32815d588e 100644 --- a/java/com/google/gerrit/common/data/testing/BUILD +++ b/java/com/google/gerrit/common/data/testing/BUILD @@ -1,6 +1,6 @@ java_library( name = "common-data-test-util", - testonly = 1, + testonly = True, srcs = glob(["**/*.java"]), visibility = ["//visibility:public"], deps = [ diff --git a/java/com/google/gerrit/extensions/common/testing/BUILD b/java/com/google/gerrit/extensions/common/testing/BUILD index 94fecbf670..6679104c9a 100644 --- a/java/com/google/gerrit/extensions/common/testing/BUILD +++ b/java/com/google/gerrit/extensions/common/testing/BUILD @@ -1,6 +1,6 @@ java_library( name = "common-test-util", - testonly = 1, + testonly = True, srcs = glob(["**/*.java"]), visibility = ["//visibility:public"], deps = [ diff --git a/java/com/google/gerrit/extensions/restapi/testing/BUILD b/java/com/google/gerrit/extensions/restapi/testing/BUILD index 434591ef88..3417cae2a9 100644 --- a/java/com/google/gerrit/extensions/restapi/testing/BUILD +++ b/java/com/google/gerrit/extensions/restapi/testing/BUILD @@ -1,6 +1,6 @@ java_library( name = "restapi-test-util", - testonly = 1, + testonly = True, srcs = glob(["**/*.java"]), visibility = ["//visibility:public"], deps = [ diff --git a/java/com/google/gerrit/git/testing/BUILD b/java/com/google/gerrit/git/testing/BUILD index 49003398d1..497510d2a5 100644 --- a/java/com/google/gerrit/git/testing/BUILD +++ b/java/com/google/gerrit/git/testing/BUILD @@ -1,4 +1,4 @@ -package(default_testonly = 1) +package(default_testonly = True) java_library( name = "testing", diff --git a/java/com/google/gerrit/gpg/testing/BUILD b/java/com/google/gerrit/gpg/testing/BUILD index ff8fecfa94..0282d3ad4e 100644 --- a/java/com/google/gerrit/gpg/testing/BUILD +++ b/java/com/google/gerrit/gpg/testing/BUILD @@ -1,6 +1,6 @@ java_library( name = "gpg-test-util", - testonly = 1, + testonly = True, srcs = glob(["**/*.java"]), visibility = ["//visibility:public"], deps = [ diff --git a/java/com/google/gerrit/server/cache/testing/BUILD b/java/com/google/gerrit/server/cache/testing/BUILD index 9a9f1efed5..f87c006254 100644 --- a/java/com/google/gerrit/server/cache/testing/BUILD +++ b/java/com/google/gerrit/server/cache/testing/BUILD @@ -1,4 +1,4 @@ -package(default_testonly = 1) +package(default_testonly = True) java_library( name = "testing", diff --git a/java/com/google/gerrit/server/group/db/testing/BUILD b/java/com/google/gerrit/server/group/db/testing/BUILD index 6961b6518b..c13abbaf66 100644 --- a/java/com/google/gerrit/server/group/db/testing/BUILD +++ b/java/com/google/gerrit/server/group/db/testing/BUILD @@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"]) java_library( name = "testing", - testonly = 1, + testonly = True, srcs = glob(["*.java"]), deps = [ "//java/com/google/gerrit/common:server", diff --git a/java/com/google/gerrit/server/group/testing/BUILD b/java/com/google/gerrit/server/group/testing/BUILD index 8b8cd00804..3ef712c87e 100644 --- a/java/com/google/gerrit/server/group/testing/BUILD +++ b/java/com/google/gerrit/server/group/testing/BUILD @@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"]) java_library( name = "testing", - testonly = 1, + testonly = True, srcs = glob(["*.java"]), deps = [ "//java/com/google/gerrit/common:server", diff --git a/java/com/google/gerrit/server/project/testing/BUILD b/java/com/google/gerrit/server/project/testing/BUILD index ca1ffae262..f221e00dc9 100644 --- a/java/com/google/gerrit/server/project/testing/BUILD +++ b/java/com/google/gerrit/server/project/testing/BUILD @@ -1,6 +1,6 @@ java_library( name = "project-test-util", - testonly = 1, + testonly = True, srcs = glob(["*.java"]), visibility = ["//visibility:public"], deps = [ diff --git a/java/com/google/gerrit/testing/BUILD b/java/com/google/gerrit/testing/BUILD index 412a071520..71efda6276 100644 --- a/java/com/google/gerrit/testing/BUILD +++ b/java/com/google/gerrit/testing/BUILD @@ -1,6 +1,6 @@ java_library( name = "gerrit-test-util", - testonly = 1, + testonly = True, srcs = glob(["**/*.java"]), visibility = ["//visibility:public"], exports = [ diff --git a/java/com/google/gerrit/truth/BUILD b/java/com/google/gerrit/truth/BUILD index 719ddce440..786ae0d86a 100644 --- a/java/com/google/gerrit/truth/BUILD +++ b/java/com/google/gerrit/truth/BUILD @@ -1,6 +1,6 @@ java_library( name = "truth", - testonly = 1, + testonly = True, srcs = glob(["**/*.java"]), visibility = ["//visibility:public"], deps = [ diff --git a/javatests/com/google/gerrit/acceptance/git/BUILD b/javatests/com/google/gerrit/acceptance/git/BUILD index 3541fec640..e222a4fc58 100644 --- a/javatests/com/google/gerrit/acceptance/git/BUILD +++ b/javatests/com/google/gerrit/acceptance/git/BUILD @@ -12,7 +12,7 @@ acceptance_tests( java_library( name = "push_for_review", - testonly = 1, + testonly = True, srcs = ["AbstractPushForReview.java"], deps = [ "//java/com/google/gerrit/acceptance:lib", @@ -22,7 +22,7 @@ java_library( java_library( name = "submodule_util", - testonly = 1, + testonly = True, srcs = ["AbstractSubmoduleSubscription.java"], deps = ["//java/com/google/gerrit/acceptance:lib"], ) diff --git a/javatests/com/google/gerrit/acceptance/pgm/BUILD b/javatests/com/google/gerrit/acceptance/pgm/BUILD index e0d2f86da5..e8cf516907 100644 --- a/javatests/com/google/gerrit/acceptance/pgm/BUILD +++ b/javatests/com/google/gerrit/acceptance/pgm/BUILD @@ -41,7 +41,7 @@ acceptance_tests( java_library( name = "util", - testonly = 1, + testonly = True, srcs = [ "AbstractReindexTests.java", "IndexUpgradeController.java", diff --git a/javatests/com/google/gerrit/acceptance/rest/BUILD b/javatests/com/google/gerrit/acceptance/rest/BUILD index b94a98da7e..40abd6bb10 100644 --- a/javatests/com/google/gerrit/acceptance/rest/BUILD +++ b/javatests/com/google/gerrit/acceptance/rest/BUILD @@ -12,7 +12,7 @@ acceptance_tests( java_library( name = "util", - testonly = 1, + testonly = True, srcs = [ "AbstractRestApiBindingsTest.java", ], diff --git a/javatests/com/google/gerrit/acceptance/rest/account/BUILD b/javatests/com/google/gerrit/acceptance/rest/account/BUILD index 217d716d91..433b854a28 100644 --- a/javatests/com/google/gerrit/acceptance/rest/account/BUILD +++ b/javatests/com/google/gerrit/acceptance/rest/account/BUILD @@ -9,7 +9,7 @@ acceptance_tests( java_library( name = "util", - testonly = 1, + testonly = True, srcs = [ "AccountAssert.java", "CapabilityInfo.java", diff --git a/javatests/com/google/gerrit/acceptance/rest/change/BUILD b/javatests/com/google/gerrit/acceptance/rest/change/BUILD index d955f1b84a..9a6537895c 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/BUILD +++ b/javatests/com/google/gerrit/acceptance/rest/change/BUILD @@ -30,7 +30,7 @@ acceptance_tests( java_library( name = "submit_util", - testonly = 1, + testonly = True, srcs = SUBMIT_UTIL_SRCS, deps = [ "//java/com/google/gerrit/acceptance:lib", diff --git a/javatests/com/google/gerrit/acceptance/rest/project/BUILD b/javatests/com/google/gerrit/acceptance/rest/project/BUILD index dad3ca944e..64bd5c327e 100644 --- a/javatests/com/google/gerrit/acceptance/rest/project/BUILD +++ b/javatests/com/google/gerrit/acceptance/rest/project/BUILD @@ -40,7 +40,7 @@ java_library( java_library( name = "push_tag_util", - testonly = 1, + testonly = True, srcs = [ "AbstractPushTag.java", ], diff --git a/javatests/com/google/gerrit/acceptance/server/mail/BUILD b/javatests/com/google/gerrit/acceptance/server/mail/BUILD index b5ad42514e..e21789b966 100644 --- a/javatests/com/google/gerrit/acceptance/server/mail/BUILD +++ b/javatests/com/google/gerrit/acceptance/server/mail/BUILD @@ -21,7 +21,7 @@ acceptance_tests( java_library( name = "util", - testonly = 1, + testonly = True, srcs = ["AbstractMailIT.java"], deps = DEPS + ["//java/com/google/gerrit/acceptance:lib"], ) diff --git a/javatests/com/google/gerrit/acceptance/ssh/BUILD b/javatests/com/google/gerrit/acceptance/ssh/BUILD index a01cd3e3b3..00a0914af6 100644 --- a/javatests/com/google/gerrit/acceptance/ssh/BUILD +++ b/javatests/com/google/gerrit/acceptance/ssh/BUILD @@ -2,7 +2,7 @@ load("//javatests/com/google/gerrit/acceptance:tests.bzl", "acceptance_tests") java_library( name = "util", - testonly = 1, + testonly = True, srcs = ["AbstractIndexTests.java"], deps = ["//java/com/google/gerrit/acceptance:lib"], ) diff --git a/javatests/com/google/gerrit/elasticsearch/BUILD b/javatests/com/google/gerrit/elasticsearch/BUILD index 446953e652..4806accd6e 100644 --- a/javatests/com/google/gerrit/elasticsearch/BUILD +++ b/javatests/com/google/gerrit/elasticsearch/BUILD @@ -2,7 +2,7 @@ load("//tools/bzl:junit.bzl", "junit_tests") java_library( name = "elasticsearch_test_utils", - testonly = 1, + testonly = True, srcs = [ "ElasticContainer.java", "ElasticTestUtils.java", diff --git a/javatests/com/google/gerrit/server/BUILD b/javatests/com/google/gerrit/server/BUILD index 8749b7a056..8b35b6a3b8 100644 --- a/javatests/com/google/gerrit/server/BUILD +++ b/javatests/com/google/gerrit/server/BUILD @@ -6,7 +6,7 @@ CUSTOM_TRUTH_SUBJECTS = glob([ java_library( name = "custom-truth-subjects", - testonly = 1, + testonly = True, srcs = CUSTOM_TRUTH_SUBJECTS, deps = [ "//java/com/google/gerrit/extensions:api", diff --git a/javatests/com/google/gerrit/server/query/account/BUILD b/javatests/com/google/gerrit/server/query/account/BUILD index e6c631b044..e41d390315 100644 --- a/javatests/com/google/gerrit/server/query/account/BUILD +++ b/javatests/com/google/gerrit/server/query/account/BUILD @@ -4,7 +4,7 @@ ABSTRACT_QUERY_TEST = ["AbstractQueryAccountsTest.java"] java_library( name = "abstract_query_tests", - testonly = 1, + testonly = True, srcs = ABSTRACT_QUERY_TEST, visibility = ["//visibility:public"], deps = [ diff --git a/javatests/com/google/gerrit/server/query/change/BUILD b/javatests/com/google/gerrit/server/query/change/BUILD index c27be68548..fc1483c123 100644 --- a/javatests/com/google/gerrit/server/query/change/BUILD +++ b/javatests/com/google/gerrit/server/query/change/BUILD @@ -4,7 +4,7 @@ ABSTRACT_QUERY_TEST = ["AbstractQueryChangesTest.java"] java_library( name = "abstract_query_tests", - testonly = 1, + testonly = True, srcs = ABSTRACT_QUERY_TEST, visibility = ["//visibility:public"], runtime_deps = ["//prolog:gerrit-prolog-common"], diff --git a/javatests/com/google/gerrit/server/query/group/BUILD b/javatests/com/google/gerrit/server/query/group/BUILD index 0dd16cdac2..3f147c929b 100644 --- a/javatests/com/google/gerrit/server/query/group/BUILD +++ b/javatests/com/google/gerrit/server/query/group/BUILD @@ -4,7 +4,7 @@ ABSTRACT_QUERY_TEST = ["AbstractQueryGroupsTest.java"] java_library( name = "abstract_query_tests", - testonly = 1, + testonly = True, srcs = ABSTRACT_QUERY_TEST, visibility = ["//visibility:public"], deps = [ diff --git a/javatests/com/google/gerrit/server/query/project/BUILD b/javatests/com/google/gerrit/server/query/project/BUILD index f0c455e76d..4ce1c00b4b 100644 --- a/javatests/com/google/gerrit/server/query/project/BUILD +++ b/javatests/com/google/gerrit/server/query/project/BUILD @@ -4,7 +4,7 @@ ABSTRACT_QUERY_TEST = ["AbstractQueryProjectsTest.java"] java_library( name = "abstract_query_tests", - testonly = 1, + testonly = True, srcs = ABSTRACT_QUERY_TEST, visibility = ["//visibility:public"], deps = [ diff --git a/javatests/com/google/gerrit/util/http/testutil/BUILD b/javatests/com/google/gerrit/util/http/testutil/BUILD index b92518894d..adae68e375 100644 --- a/javatests/com/google/gerrit/util/http/testutil/BUILD +++ b/javatests/com/google/gerrit/util/http/testutil/BUILD @@ -1,6 +1,6 @@ java_library( name = "testutil", - testonly = 1, + testonly = True, srcs = glob(["**/*.java"]), visibility = ["//visibility:public"], deps = [ diff --git a/lib/jgit/org.eclipse.jgit.junit/BUILD b/lib/jgit/org.eclipse.jgit.junit/BUILD index 85e9167722..29d80d35c3 100644 --- a/lib/jgit/org.eclipse.jgit.junit/BUILD +++ b/lib/jgit/org.eclipse.jgit.junit/BUILD @@ -2,7 +2,7 @@ load("//lib/jgit:jgit.bzl", "jgit_dep") java_library( name = "junit", - testonly = 1, + testonly = True, data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"], visibility = ["//visibility:public"], exports = [jgit_dep("@jgit-junit//jar")], diff --git a/lib/testcontainers/BUILD b/lib/testcontainers/BUILD index 5e2d039bce..25ca327565 100644 --- a/lib/testcontainers/BUILD +++ b/lib/testcontainers/BUILD @@ -38,7 +38,7 @@ java_library( java_library( name = "testcontainers-elasticsearch", - testonly = 1, + testonly = True, data = ["//lib:LICENSE-testcontainers"], visibility = ["//visibility:public"], exports = ["@testcontainers-elasticsearch//jar"], diff --git a/polygerrit-ui/app/BUILD b/polygerrit-ui/app/BUILD index 0aa70b87b3..d48641b7b4 100644 --- a/polygerrit-ui/app/BUILD +++ b/polygerrit-ui/app/BUILD @@ -23,7 +23,7 @@ polygerrit_bundle( bower_component_bundle( name = "test_components", - testonly = 1, + testonly = True, deps = [ "//lib/js:iron-test-helpers", "//lib/js:test-fixture", diff --git a/tools/eclipse/BUILD b/tools/eclipse/BUILD index 0c9d023477..5ac3a362b0 100644 --- a/tools/eclipse/BUILD +++ b/tools/eclipse/BUILD @@ -37,13 +37,13 @@ DEPS = [ java_library( name = "classpath", - testonly = 1, + testonly = True, runtime_deps = LIBS + PGMLIBS + DEPS, ) classpath_collector( name = "main_classpath_collect", - testonly = 1, + testonly = True, deps = LIBS + PGMLIBS + DEPS + TEST_DEPS + ["//plugins/%s:%s__plugin" % (n, n) for n in CORE_PLUGINS + CUSTOM_PLUGINS] + ["//plugins/%s:%s__plugin_test_deps" % (n, n) for n in CUSTOM_PLUGINS_TEST_DEPS], diff --git a/tools/maven/package.bzl b/tools/maven/package.bzl index 5b497f83b6..11e569dc42 100644 --- a/tools/maven/package.bzl +++ b/tools/maven/package.bzl @@ -50,7 +50,7 @@ def maven_package( srcs = api_targets, outs = ["api_install.sh"], executable = True, - testonly = 1, + testonly = True, ) if repository and url: @@ -70,7 +70,7 @@ def maven_package( srcs = api_targets, outs = ["api_deploy.sh"], executable = True, - testonly = 1, + testonly = True, ) war_cmd = mvn_cmd[:] From dff4c394321ca06ef8b5809bb9f725c71b0f95b9 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 20 Dec 2018 16:50:49 +0900 Subject: [PATCH 6/6] Mark greenmail as testonly The greenmail library is only used in integration tests and in the acceptance framework. Change-Id: Iec369bd57a146c0d23d7514fd3cdfe477fe9d6e3 --- lib/greenmail/BUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/greenmail/BUILD b/lib/greenmail/BUILD index 41fbdab1e5..062f866303 100644 --- a/lib/greenmail/BUILD +++ b/lib/greenmail/BUILD @@ -2,6 +2,7 @@ package(default_visibility = ["//visibility:public"]) java_library( name = "greenmail", + testonly = True, data = ["//lib:LICENSE-Apache2.0"], exports = ["@greenmail//jar"], )