Merge branch 'stable-2.15' into stable-2.16
* stable-2.15: Consistently define default serialVersionUID Change-Id: I11473939eb38a8f206117694e372773011cf2c09
This commit is contained in:
commit
c34d55b868
@ -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;
|
||||
|
@ -35,10 +35,11 @@ public class RevisionInfoCache {
|
||||
|
||||
private final LinkedHashMap<PatchSet.Id, String> psToCommit;
|
||||
|
||||
@SuppressWarnings("serial")
|
||||
private RevisionInfoCache() {
|
||||
psToCommit =
|
||||
new LinkedHashMap<PatchSet.Id, String>(LIMIT) {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@Override
|
||||
protected boolean removeEldestEntry(Map.Entry<PatchSet.Id, String> e) {
|
||||
return size() > LIMIT;
|
||||
|
@ -73,9 +73,10 @@ public abstract class NavigationTable<RowItem> extends FancyFlexTable<RowItem> {
|
||||
}
|
||||
}
|
||||
|
||||
@SuppressWarnings("serial")
|
||||
private static final LinkedHashMap<String, Object> savedPositions =
|
||||
new LinkedHashMap<String, Object>(10, 0.75f, true) {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@Override
|
||||
protected boolean removeEldestEntry(Entry<String, Object> eldest) {
|
||||
return size() >= 20;
|
||||
|
@ -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> webSession;
|
||||
private final SchemaFactory<ReviewDb> schema;
|
||||
private final Accounts accounts;
|
||||
|
@ -46,9 +46,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 FluentLogger logger = FluentLogger.forEnclosingClass();
|
||||
|
||||
private final AccountManager accountManager;
|
||||
|
@ -52,9 +52,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 FluentLogger logger = FluentLogger.forEnclosingClass();
|
||||
|
||||
private static final ImmutableMap<String, String> ALL_PROVIDERS =
|
||||
|
@ -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
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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());
|
||||
|
@ -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;
|
||||
|
||||
|
@ -89,9 +89,10 @@ import org.eclipse.jgit.lib.Config;
|
||||
import org.eclipse.jgit.lib.Repository;
|
||||
|
||||
/** 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 FluentLogger logger = FluentLogger.forEnclosingClass();
|
||||
|
||||
private static final String PROJECT_LIST_ACTION = "project_list";
|
||||
|
@ -49,9 +49,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<ReviewDb> requestDb;
|
||||
private final ChangeEditUtil changeEditUtil;
|
||||
private final PatchSetUtil psUtil;
|
||||
|
@ -66,9 +66,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 FluentLogger logger = FluentLogger.forEnclosingClass();
|
||||
|
||||
private static final String HPD_ID = "gerrit_hostpagedata";
|
||||
|
@ -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;
|
||||
|
||||
|
@ -46,9 +46,10 @@ import javax.servlet.http.HttpServletResponse;
|
||||
* Port 8010
|
||||
* }</pre>
|
||||
*/
|
||||
@SuppressWarnings("serial")
|
||||
@Singleton
|
||||
public class SshInfoServlet extends HttpServlet {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
private final SshInfo sshd;
|
||||
|
||||
@Inject
|
||||
|
@ -1544,8 +1544,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);
|
||||
}
|
||||
|
@ -41,8 +41,9 @@ import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
/** Base JSON servlet to ensure the current user is not forged. */
|
||||
@SuppressWarnings("serial")
|
||||
final class GerritJsonServlet extends JsonServlet<GerritJsonServlet.GerritCall> {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
|
||||
|
||||
private static final ThreadLocal<GerritCall> currentCall = new ThreadLocal<>();
|
||||
|
@ -50,4 +50,6 @@ public abstract class AccountDirectory {
|
||||
|
||||
public abstract void fillAccountInfo(Iterable<? extends AccountInfo> in, Set<FillOptions> options)
|
||||
throws PermissionBackendException;
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -129,8 +129,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) {
|
||||
|
@ -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 {
|
||||
|
@ -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 {
|
||||
|
@ -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) {
|
||||
|
Loading…
Reference in New Issue
Block a user