diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/GitwebLink.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/GitwebLink.java index 3f5e207beb..1cf9592474 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/data/GitwebLink.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/GitwebLink.java @@ -18,6 +18,7 @@ import com.google.gerrit.reviewdb.Branch; import com.google.gerrit.reviewdb.PatchSet; import com.google.gerrit.reviewdb.Project; import com.google.gwt.http.client.URL; + import java.util.HashMap; import java.util.Map; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/SearchPanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/SearchPanel.java index 44ccb05d22..db9ff59b3f 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/SearchPanel.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/SearchPanel.java @@ -14,7 +14,6 @@ package com.google.gerrit.client; -import com.google.gerrit.client.changes.ChangeScreen; import com.google.gerrit.common.PageLinks; import com.google.gerrit.reviewdb.Change; import com.google.gwt.event.dom.client.BlurEvent; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AgreementPanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AgreementPanel.java index 1fc5b3407d..326a1dfc80 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AgreementPanel.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AgreementPanel.java @@ -18,6 +18,7 @@ import com.google.gerrit.client.FormatUtil; import com.google.gerrit.client.Gerrit; import com.google.gerrit.client.rpc.GerritCallback; import com.google.gerrit.client.ui.FancyFlexTable; +import com.google.gerrit.client.ui.Hyperlink; import com.google.gerrit.common.PageLinks; import com.google.gerrit.common.data.AgreementInfo; import com.google.gerrit.reviewdb.AbstractAgreement; @@ -27,7 +28,6 @@ import com.google.gerrit.reviewdb.ContributorAgreement; import com.google.gwt.user.client.ui.Anchor; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.FlowPanel; -import com.google.gerrit.client.ui.Hyperlink; import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter; import com.google.gwtexpui.safehtml.client.SafeHtml; import com.google.gwtexpui.safehtml.client.SafeHtmlBuilder; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/RegisterScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/RegisterScreen.java index 32416ac7d9..f43d1ac2a2 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/RegisterScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/RegisterScreen.java @@ -16,13 +16,13 @@ package com.google.gerrit.client.account; import com.google.gerrit.client.Gerrit; import com.google.gerrit.client.ui.AccountScreen; +import com.google.gerrit.client.ui.InlineHyperlink; import com.google.gerrit.client.ui.SmallHeading; import com.google.gerrit.common.PageLinks; import com.google.gerrit.reviewdb.Account; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.FormPanel; import com.google.gwt.user.client.ui.HTML; -import com.google.gerrit.client.ui.InlineHyperlink; public class RegisterScreen extends AccountScreen { private final String nextToken; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/GroupListScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/GroupListScreen.java index 18aad37a6b..e29530ca27 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/GroupListScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/GroupListScreen.java @@ -14,8 +14,8 @@ package com.google.gerrit.client.admin; -import com.google.gerrit.client.Gerrit; import com.google.gerrit.client.Dispatcher; +import com.google.gerrit.client.Gerrit; import com.google.gerrit.client.rpc.GerritCallback; import com.google.gerrit.client.rpc.ScreenLoadCallback; import com.google.gerrit.client.ui.AccountScreen; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/GroupTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/GroupTable.java index 078d3cb832..18a3761f4f 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/GroupTable.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/GroupTable.java @@ -14,15 +14,15 @@ package com.google.gerrit.client.admin; -import com.google.gerrit.client.Gerrit; import com.google.gerrit.client.Dispatcher; +import com.google.gerrit.client.Gerrit; +import com.google.gerrit.client.ui.Hyperlink; import com.google.gerrit.client.ui.NavigationTable; import com.google.gerrit.reviewdb.AccountGroup; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.dom.client.KeyCodes; import com.google.gwt.user.client.History; -import com.google.gerrit.client.ui.Hyperlink; import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter; import com.google.gwt.user.client.ui.HTMLTable.Cell; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AllSingleListScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AllSingleListScreen.java index bf07a3c36a..e28c7f4a91 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AllSingleListScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AllSingleListScreen.java @@ -16,6 +16,7 @@ package com.google.gerrit.client.changes; import com.google.gerrit.client.Gerrit; import com.google.gerrit.client.rpc.ScreenLoadCallback; +import com.google.gerrit.client.ui.Hyperlink; import com.google.gerrit.client.ui.Screen; import com.google.gerrit.common.data.ChangeInfo; import com.google.gerrit.common.data.SingleListChangeInfo; @@ -24,7 +25,6 @@ import com.google.gwt.event.dom.client.KeyPressEvent; import com.google.gwt.user.client.History; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.HorizontalPanel; -import com.google.gerrit.client.ui.Hyperlink; import com.google.gwtexpui.globalkey.client.KeyCommand; import java.util.List; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/PatchLink.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/PatchLink.java index ae44313fae..6a34826235 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/PatchLink.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/PatchLink.java @@ -17,7 +17,6 @@ package com.google.gerrit.client.ui; import com.google.gerrit.client.Dispatcher; import com.google.gerrit.client.changes.PatchTable; import com.google.gerrit.reviewdb.Patch; -import com.google.gwt.user.client.History; public abstract class PatchLink extends InlineHyperlink { protected Patch.Key patchKey; diff --git a/gerrit-httpd/pom.xml b/gerrit-httpd/pom.xml index d35859799f..40198b585a 100644 --- a/gerrit-httpd/pom.xml +++ b/gerrit-httpd/pom.xml @@ -38,7 +38,12 @@ limitations under the License. servlet-api provided - + + + com.google.code.findbugs + jsr305 + + org.eclipse.jgit org.eclipse.jgit.http.server diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpLogoutServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpLogoutServlet.java index b00ee065b9..7b2c3f04f9 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpLogoutServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpLogoutServlet.java @@ -17,13 +17,13 @@ package com.google.gerrit.httpd; import com.google.gerrit.server.account.AccountManager; import com.google.gerrit.server.config.AuthConfig; import com.google.gerrit.server.config.CanonicalWebUrl; -import com.google.gerrit.server.config.Nullable; import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.io.IOException; +import javax.annotation.Nullable; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectDigestFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectDigestFilter.java index 4a07fa4b51..9d9daec2f2 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectDigestFilter.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectDigestFilter.java @@ -23,7 +23,6 @@ import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; import com.google.gerrit.server.account.AccountCache; import com.google.gerrit.server.account.AccountState; import com.google.gerrit.server.config.CanonicalWebUrl; -import com.google.gerrit.server.config.Nullable; import com.google.gwtjsonrpc.server.SignedToken; import com.google.gwtjsonrpc.server.XsrfException; import com.google.inject.Inject; @@ -38,6 +37,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; +import javax.annotation.Nullable; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectServlet.java index 95969f593c..8379835b21 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectServlet.java @@ -20,7 +20,6 @@ import com.google.gerrit.reviewdb.Project; import com.google.gerrit.server.AnonymousUser; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.config.CanonicalWebUrl; -import com.google.gerrit.server.config.Nullable; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.git.ReceiveCommits; import com.google.gerrit.server.project.NoSuchProjectException; @@ -46,6 +45,7 @@ import org.slf4j.LoggerFactory; import java.io.IOException; +import javax.annotation.Nullable; import javax.servlet.ServletConfig; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequireSslFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequireSslFilter.java index db88eeb623..6b7839c971 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequireSslFilter.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequireSslFilter.java @@ -15,7 +15,6 @@ package com.google.gerrit.httpd; import com.google.gerrit.server.config.CanonicalWebUrl; -import com.google.gerrit.server.config.Nullable; import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -23,6 +22,7 @@ import com.google.inject.servlet.ServletModule; import java.io.IOException; +import javax.annotation.Nullable; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/WebModule.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/WebModule.java index 5554b3b36d..cec4be3029 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/WebModule.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/WebModule.java @@ -34,7 +34,6 @@ import com.google.gerrit.server.config.AuthConfig; import com.google.gerrit.server.config.CanonicalWebUrl; import com.google.gerrit.server.config.FactoryModule; import com.google.gerrit.server.config.GerritRequestModule; -import com.google.gerrit.server.config.Nullable; import com.google.gerrit.server.contact.ContactStore; import com.google.gerrit.server.contact.ContactStoreProvider; import com.google.gerrit.server.ssh.SshInfo; @@ -49,6 +48,8 @@ import com.google.inject.servlet.ServletModule; import java.net.SocketAddress; +import javax.annotation.Nullable; + public class WebModule extends FactoryModule { private final Provider sshInfoProvider; private final Provider sshKeyCacheProvider; 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 1f879ddb2b..6154815cad 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 @@ -27,7 +27,6 @@ import com.google.gerrit.server.account.AccountManager; import com.google.gerrit.server.account.AuthRequest; import com.google.gerrit.server.account.AuthResult; import com.google.gerrit.server.config.CanonicalWebUrl; -import com.google.gerrit.server.config.Nullable; import com.google.gwtorm.client.OrmException; import com.google.gwtorm.client.SchemaFactory; import com.google.inject.Inject; @@ -44,6 +43,7 @@ import java.io.Writer; import java.util.List; import java.util.UUID; +import javax.annotation.Nullable; import javax.servlet.ServletContext; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpLoginServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpLoginServlet.java index c3aa491ecc..88a05a92aa 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpLoginServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpLoginServlet.java @@ -22,7 +22,6 @@ import com.google.gerrit.server.account.AuthRequest; import com.google.gerrit.server.account.AuthResult; import com.google.gerrit.server.config.AuthConfig; import com.google.gerrit.server.config.CanonicalWebUrl; -import com.google.gerrit.server.config.Nullable; import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -33,6 +32,7 @@ import org.slf4j.LoggerFactory; import java.io.IOException; +import javax.annotation.Nullable; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/LoginRedirectServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/LoginRedirectServlet.java index db9eef700e..7e043584aa 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/LoginRedirectServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/LoginRedirectServlet.java @@ -18,13 +18,13 @@ import com.google.gerrit.common.PageLinks; import com.google.gerrit.common.auth.SignInMode; import com.google.gerrit.httpd.WebSession; import com.google.gerrit.server.config.CanonicalWebUrl; -import com.google.gerrit.server.config.Nullable; import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.io.IOException; +import javax.annotation.Nullable; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdServiceImpl.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdServiceImpl.java index 41135ae4bf..bdab696ec3 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdServiceImpl.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdServiceImpl.java @@ -29,7 +29,6 @@ import com.google.gerrit.server.cache.Cache; import com.google.gerrit.server.cache.SelfPopulatingCache; import com.google.gerrit.server.config.CanonicalWebUrl; import com.google.gerrit.server.config.GerritServerConfig; -import com.google.gerrit.server.config.Nullable; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwtorm.client.KeyUtil; import com.google.inject.Inject; @@ -64,6 +63,7 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.List; +import javax.annotation.Nullable; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/AbandonChange.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/AbandonChange.java index 4c3bd49283..5f0851eadc 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/AbandonChange.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/AbandonChange.java @@ -25,7 +25,6 @@ import com.google.gerrit.reviewdb.PatchSetApproval; import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.ChangeUtil; import com.google.gerrit.server.IdentifiedUser; -import com.google.gerrit.server.config.Nullable; import com.google.gerrit.server.mail.AbandonedSender; import com.google.gerrit.server.mail.EmailException; import com.google.gerrit.server.patch.PatchSetInfoNotAvailableException; @@ -33,14 +32,14 @@ import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.project.NoSuchChangeException; import com.google.gwtorm.client.AtomicUpdate; import com.google.gwtorm.client.OrmException; -import com.google.gwtorm.client.OrmRunnable; -import com.google.gwtorm.client.Transaction; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import java.util.Collections; import java.util.List; +import javax.annotation.Nullable; + class AbandonChange extends Handler { interface Factory { AbandonChange create(PatchSet.Id patchSetId, String message); diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/CommentDetailFactory.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/CommentDetailFactory.java index ae529aa77b..6079bfa1be 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/CommentDetailFactory.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/CommentDetailFactory.java @@ -25,7 +25,6 @@ import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.account.AccountInfoCacheFactory; -import com.google.gerrit.server.config.Nullable; import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.project.NoSuchChangeException; import com.google.gwtorm.client.OrmException; @@ -37,6 +36,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.annotation.Nullable; + class CommentDetailFactory extends Handler { interface Factory { diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchScriptFactory.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchScriptFactory.java index 24b17cac11..6f856e955b 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchScriptFactory.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchScriptFactory.java @@ -28,7 +28,6 @@ import com.google.gerrit.reviewdb.Project; import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.FileTypeRegistry; import com.google.gerrit.server.IdentifiedUser; -import com.google.gerrit.server.config.Nullable; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.patch.PatchList; import com.google.gerrit.server.patch.PatchListCache; @@ -40,14 +39,16 @@ import com.google.gwtorm.client.OrmException; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.eclipse.jgit.errors.RepositoryNotFoundException; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.Repository; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.IOException; +import javax.annotation.Nullable; + class PatchScriptFactory extends Handler { interface Factory { diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/AddRefRight.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/AddRefRight.java index 3d3ba3b2c4..963650ee69 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/AddRefRight.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/AddRefRight.java @@ -26,7 +26,6 @@ import com.google.gerrit.reviewdb.RefRight; import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.account.GroupCache; import com.google.gerrit.server.account.NoSuchGroupException; -import com.google.gerrit.server.config.Nullable; import com.google.gerrit.server.project.NoSuchProjectException; import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectControl; @@ -39,6 +38,8 @@ import org.eclipse.jgit.lib.Repository; import java.util.Collections; +import javax.annotation.Nullable; + class AddRefRight extends Handler { interface Factory { AddRefRight create(@Assisted Project.NameKey projectName, diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/RefRight.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/RefRight.java index 6667f540ee..e47cfc3ce1 100644 --- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/RefRight.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/RefRight.java @@ -14,7 +14,6 @@ package com.google.gerrit.reviewdb; -import com.google.gerrit.reviewdb.Project.NameKey; import com.google.gwtorm.client.Column; import com.google.gwtorm.client.CompoundKey; import com.google.gwtorm.client.StringKey; diff --git a/gerrit-server/pom.xml b/gerrit-server/pom.xml index 9cc94f8f76..b99c982cd7 100644 --- a/gerrit-server/pom.xml +++ b/gerrit-server/pom.xml @@ -123,6 +123,11 @@ limitations under the License. h2 test + + + com.google.code.findbugs + jsr305 + diff --git a/gerrit-server/src/main/java/com/google/gerrit/common/ChangeHookRunner.java b/gerrit-server/src/main/java/com/google/gerrit/common/ChangeHookRunner.java index 3e17006973..2c9cc7ad63 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/common/ChangeHookRunner.java +++ b/gerrit-server/src/main/java/com/google/gerrit/common/ChangeHookRunner.java @@ -25,19 +25,19 @@ import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.git.WorkQueue; import com.google.inject.Inject; import com.google.inject.Singleton; -import java.io.BufferedReader; +import org.eclipse.jgit.lib.Config; +import org.eclipse.jgit.lib.Repository; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.BufferedReader; import java.io.File; import java.io.IOException; import java.io.InputStreamReader; import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.eclipse.jgit.lib.Config; -import org.eclipse.jgit.lib.Repository; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * This class implements hooks for certain gerrit events. diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/IdentifiedUser.java b/gerrit-server/src/main/java/com/google/gerrit/server/IdentifiedUser.java index dcc055ee44..6900538f38 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/IdentifiedUser.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/IdentifiedUser.java @@ -24,7 +24,6 @@ import com.google.gerrit.server.account.AccountState; import com.google.gerrit.server.account.Realm; import com.google.gerrit.server.config.AuthConfig; import com.google.gerrit.server.config.CanonicalWebUrl; -import com.google.gerrit.server.config.Nullable; import com.google.gwtorm.client.OrmException; import com.google.inject.Inject; import com.google.inject.OutOfScopeException; @@ -48,6 +47,8 @@ import java.util.HashSet; import java.util.Set; import java.util.TimeZone; +import javax.annotation.Nullable; + /** An authenticated user. */ public class IdentifiedUser extends CurrentUser { /** Create an IdentifiedUser, ignoring any per-request state. */ diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapRealm.java b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapRealm.java index 8b2444a858..7286084764 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapRealm.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapRealm.java @@ -14,14 +14,14 @@ package com.google.gerrit.server.auth.ldap; -import static com.google.gerrit.reviewdb.AccountExternalId.*; +import static com.google.gerrit.reviewdb.AccountExternalId.SCHEME_GERRIT; +import com.google.gerrit.common.data.ParamertizedString; import com.google.gerrit.reviewdb.Account; import com.google.gerrit.reviewdb.AccountExternalId; import com.google.gerrit.reviewdb.AccountGroup; import com.google.gerrit.reviewdb.AuthType; import com.google.gerrit.reviewdb.ReviewDb; -import com.google.gerrit.common.data.ParamertizedString; import com.google.gerrit.server.account.AccountException; import com.google.gerrit.server.account.AccountState; import com.google.gerrit.server.account.AuthRequest; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/Nullable.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/Nullable.java deleted file mode 100644 index eb7ae0bb81..0000000000 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/Nullable.java +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright (C) 2009 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package com.google.gerrit.server.config; - -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; - -/** Indicates an injected dependency can be null. */ -@Retention(RUNTIME) -public @interface Nullable { -} diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java index adf2f65ccd..25c93d7e84 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java @@ -14,11 +14,10 @@ package com.google.gerrit.server.git; -import com.google.gerrit.common.ChangeHookRunner; -import com.google.gerrit.common.data.AccountInfoCache; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.MINUTES; +import com.google.gerrit.common.ChangeHookRunner; import com.google.gerrit.common.data.ApprovalType; import com.google.gerrit.common.data.ApprovalTypes; import com.google.gerrit.reviewdb.Account; @@ -36,7 +35,6 @@ import com.google.gerrit.server.GerritPersonIdent; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.account.AccountCache; import com.google.gerrit.server.config.CanonicalWebUrl; -import com.google.gerrit.server.config.Nullable; import com.google.gerrit.server.mail.EmailException; import com.google.gerrit.server.mail.MergeFailSender; import com.google.gerrit.server.mail.MergedSender; @@ -49,9 +47,7 @@ import com.google.gerrit.server.workflow.FunctionState; import com.google.gwtorm.client.AtomicUpdate; import com.google.gwtorm.client.OrmConcurrencyException; import com.google.gwtorm.client.OrmException; -import com.google.gwtorm.client.OrmRunnable; import com.google.gwtorm.client.SchemaFactory; -import com.google.gwtorm.client.Transaction; import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.assistedinject.Assisted; @@ -91,6 +87,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import javax.annotation.Nullable; + /** * Merges changes in submission order into a single branch. *

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/PushAllProjectsOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/PushAllProjectsOp.java index 4dbc9e8632..8985f2919e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/PushAllProjectsOp.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/PushAllProjectsOp.java @@ -16,7 +16,6 @@ package com.google.gerrit.server.git; import com.google.gerrit.reviewdb.Project; import com.google.gerrit.reviewdb.ReviewDb; -import com.google.gerrit.server.config.Nullable; import com.google.gerrit.server.config.WildProjectName; import com.google.gwtorm.client.OrmException; import com.google.gwtorm.client.SchemaFactory; @@ -28,6 +27,8 @@ import org.slf4j.LoggerFactory; import java.util.concurrent.TimeUnit; +import javax.annotation.Nullable; + public class PushAllProjectsOp extends DefaultQueueOp { public interface Factory { PushAllProjectsOp create(String urlMatch); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/PushOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/PushOp.java index cdc05cd5fd..ddc4bea8ee 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/PushOp.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/PushOp.java @@ -19,7 +19,6 @@ import com.google.inject.assistedinject.Assisted; import com.jcraft.jsch.JSchException; -import org.slf4j.Logger; import org.eclipse.jgit.errors.NoRemoteRepositoryException; import org.eclipse.jgit.errors.NotSupportedException; import org.eclipse.jgit.errors.RepositoryNotFoundException; @@ -35,6 +34,7 @@ import org.eclipse.jgit.transport.RemoteConfig; import org.eclipse.jgit.transport.RemoteRefUpdate; import org.eclipse.jgit.transport.Transport; import org.eclipse.jgit.transport.URIish; +import org.slf4j.Logger; import java.io.IOException; import java.util.ArrayList; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java index 5f5c74ab5c..5992e84b49 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java @@ -41,7 +41,6 @@ import com.google.gerrit.server.GerritPersonIdent; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.account.AccountResolver; import com.google.gerrit.server.config.CanonicalWebUrl; -import com.google.gerrit.server.config.Nullable; import com.google.gerrit.server.mail.CreateChangeSender; import com.google.gerrit.server.mail.EmailException; import com.google.gerrit.server.mail.MergedSender; @@ -90,6 +89,8 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; +import javax.annotation.Nullable; + /** Receives change upload using the Git receive-pack protocol. */ public class ReceiveCommits implements PreReceiveHook, PostReceiveHook { private static final Logger log = diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java index 146d1b3d6a..164602333e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java @@ -14,9 +14,9 @@ package com.google.gerrit.server.mail; +import com.google.gerrit.common.data.ParamertizedString; import com.google.gerrit.reviewdb.Account; import com.google.gerrit.server.GerritPersonIdent; -import com.google.gerrit.common.data.ParamertizedString; import com.google.gerrit.server.account.AccountCache; import com.google.gerrit.server.config.GerritServerConfig; import com.google.inject.Inject; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmail.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmail.java index c49c556edb..956529a276 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmail.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmail.java @@ -28,7 +28,6 @@ import com.google.gerrit.reviewdb.UserIdentity; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.account.AccountCache; import com.google.gerrit.server.config.CanonicalWebUrl; -import com.google.gerrit.server.config.Nullable; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.patch.PatchList; import com.google.gerrit.server.patch.PatchListCache; @@ -56,6 +55,8 @@ import java.util.Map; import java.util.Random; import java.util.Set; +import javax.annotation.Nullable; + /** Sends an email to one or more interested parties. */ public abstract class OutgoingEmail { private static final String HDR_TO = "To"; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchList.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchList.java index b45fb83a5e..dc600b7b4d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchList.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchList.java @@ -26,7 +26,6 @@ import static org.eclipse.jgit.lib.ObjectIdSerialization.writeNotNull; import com.google.gerrit.reviewdb.Patch; import com.google.gerrit.reviewdb.PatchSet; -import com.google.gerrit.server.config.Nullable; import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.ObjectId; @@ -45,6 +44,8 @@ import java.util.List; import java.util.zip.DeflaterOutputStream; import java.util.zip.InflaterInputStream; +import javax.annotation.Nullable; + public class PatchList implements Serializable { private static final long serialVersionUID = PatchListKey.serialVersionUID; private static final Comparator PATCH_CMP = diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListKey.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListKey.java index a6c0a72ffb..b05006b459 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListKey.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListKey.java @@ -23,7 +23,6 @@ import static org.eclipse.jgit.lib.ObjectIdSerialization.writeNotNull; import com.google.gerrit.common.data.PatchScriptSettings.Whitespace; import com.google.gerrit.reviewdb.Project; -import com.google.gerrit.server.config.Nullable; import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.ObjectId; @@ -33,6 +32,8 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; +import javax.annotation.Nullable; + public class PatchListKey implements Serializable { static final long serialVersionUID = 9L; diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/ioutil/BasicSerializationTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/ioutil/BasicSerializationTest.java index 38e6a0ff3f..9b6b0df48d 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/ioutil/BasicSerializationTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/ioutil/BasicSerializationTest.java @@ -15,11 +15,11 @@ package com.google.gerrit.server.ioutil; import static com.google.gerrit.server.ioutil.BasicSerialization.readFixInt64; +import static com.google.gerrit.server.ioutil.BasicSerialization.readString; import static com.google.gerrit.server.ioutil.BasicSerialization.readVarInt32; import static com.google.gerrit.server.ioutil.BasicSerialization.writeFixInt64; -import static com.google.gerrit.server.ioutil.BasicSerialization.writeVarInt32; -import static com.google.gerrit.server.ioutil.BasicSerialization.readString; import static com.google.gerrit.server.ioutil.BasicSerialization.writeString; +import static com.google.gerrit.server.ioutil.BasicSerialization.writeVarInt32; import junit.framework.TestCase; diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Receive.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Receive.java index 8639bcd276..0f538af975 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Receive.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Receive.java @@ -18,7 +18,6 @@ import com.google.gerrit.reviewdb.Account; import com.google.gerrit.reviewdb.Change; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.config.CanonicalWebUrl; -import com.google.gerrit.server.config.Nullable; import com.google.gerrit.server.git.ReceiveCommits; import com.google.gerrit.server.git.ReceiveCommits.MessageListener; import com.google.inject.Inject; @@ -31,6 +30,8 @@ import java.io.PrintWriter; import java.util.HashSet; import java.util.Set; +import javax.annotation.Nullable; + /** Receives change upload over SSH using the Git receive-pack protocol. */ final class Receive extends AbstractGitCommand { @Inject diff --git a/pom.xml b/pom.xml index 13e4b9c589..d64a7e8dc8 100644 --- a/pom.xml +++ b/pom.xml @@ -697,6 +697,12 @@ limitations under the License. gwt-dev ${gwtVersion} + + + com.google.code.findbugs + jsr305 + 1.3.9 +