Remove complex import order Google's style guide changed its complex rules to be much simpler: all static imports, then all non-static imports: https://google.github.io/styleguide/javaguide.html#s3.3.3-import-ordering-and-spacing google-java-format will also understand this order. Change the Eclipse project settings and .importorder file, and reorder everything. Change-Id: I0bd3a085ef00ceee88d06e2c4b4711f1f696e4ae
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/AbstractHttpFilter.java b/gitiles-servlet/src/main/java/com/google/gitiles/AbstractHttpFilter.java index 275a427..f1a7657 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/AbstractHttpFilter.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/AbstractHttpFilter.java
@@ -15,7 +15,6 @@ package com.google.gitiles; import java.io.IOException; - import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig;
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/ArchiveFormat.java b/gitiles-servlet/src/main/java/com/google/gitiles/ArchiveFormat.java index a44aa96..f29db45 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/ArchiveFormat.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/ArchiveFormat.java
@@ -18,7 +18,6 @@ import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; - import org.eclipse.jgit.api.ArchiveCommand; import org.eclipse.jgit.archive.TarFormat; import org.eclipse.jgit.archive.Tbz2Format;
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/ArchiveServlet.java b/gitiles-servlet/src/main/java/com/google/gitiles/ArchiveServlet.java index 8a3b1e2..f004c9f 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/ArchiveServlet.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/ArchiveServlet.java
@@ -19,7 +19,10 @@ import com.google.common.base.Optional; import com.google.common.base.Strings; - +import java.io.IOException; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jgit.api.ArchiveCommand; import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.errors.IncorrectObjectTypeException; @@ -31,12 +34,6 @@ import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.treewalk.TreeWalk; -import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - public class ArchiveServlet extends BaseServlet { private static final long serialVersionUID = 1L;
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/BaseServlet.java b/gitiles-servlet/src/main/java/com/google/gitiles/BaseServlet.java index e839a9f..6e27cc9 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/BaseServlet.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/BaseServlet.java
@@ -32,9 +32,6 @@ import com.google.common.net.HttpHeaders; import com.google.gson.FieldNamingPolicy; import com.google.gson.GsonBuilder; - -import org.joda.time.Instant; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; @@ -43,11 +40,11 @@ import java.lang.reflect.Type; import java.util.Map; import java.util.zip.GZIPOutputStream; - import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.joda.time.Instant; /** Base servlet class for Gitiles servlets that serve Soy templates. */ public abstract class BaseServlet extends HttpServlet {
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/BlobSoyData.java b/gitiles-servlet/src/main/java/com/google/gitiles/BlobSoyData.java index 41e0701..c505ed4 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/BlobSoyData.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/BlobSoyData.java
@@ -22,7 +22,9 @@ import com.google.common.collect.Maps; import com.google.template.soy.data.SoyListData; import com.google.template.soy.data.SoyMapData; - +import java.io.IOException; +import java.util.List; +import java.util.Map; import org.eclipse.jgit.diff.RawText; import org.eclipse.jgit.errors.LargeObjectException; import org.eclipse.jgit.errors.MissingObjectException; @@ -33,11 +35,6 @@ import org.eclipse.jgit.util.RawParseUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import java.io.IOException; -import java.util.List; -import java.util.Map; - import prettify.parser.Prettify; import syntaxhighlight.ParseResult;
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/CommentLinkInfo.java b/gitiles-servlet/src/main/java/com/google/gitiles/CommentLinkInfo.java index cf10241..7be81ea 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/CommentLinkInfo.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/CommentLinkInfo.java
@@ -19,7 +19,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; - import java.util.List; import java.util.Map; import java.util.regex.Matcher;
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/CommitData.java b/gitiles-servlet/src/main/java/com/google/gitiles/CommitData.java index 429acae..4e917c4 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/CommitData.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/CommitData.java
@@ -25,7 +25,13 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Ordering; import com.google.common.collect.Sets; - +import java.io.IOException; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Set; +import javax.annotation.Nullable; +import javax.servlet.http.HttpServletRequest; import org.eclipse.jgit.diff.DiffEntry; import org.eclipse.jgit.diff.DiffFormatter; import org.eclipse.jgit.http.server.ServletUtils; @@ -44,15 +50,6 @@ import org.eclipse.jgit.treewalk.EmptyTreeIterator; import org.eclipse.jgit.util.io.NullOutputStream; -import java.io.IOException; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.annotation.Nullable; -import javax.servlet.http.HttpServletRequest; - /** Format-independent data about a single commit. */ class CommitData { enum Field {
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/CommitJsonData.java b/gitiles-servlet/src/main/java/com/google/gitiles/CommitJsonData.java index 4b75ffd..96f7f2f 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/CommitJsonData.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/CommitJsonData.java
@@ -20,19 +20,16 @@ import com.google.common.collect.Sets; import com.google.gitiles.CommitData.DiffList; import com.google.gitiles.CommitData.Field; - +import java.io.IOException; +import java.util.List; +import java.util.Set; +import javax.annotation.Nullable; +import javax.servlet.http.HttpServletRequest; import org.eclipse.jgit.diff.DiffEntry; import org.eclipse.jgit.lib.PersonIdent; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevWalk; -import java.io.IOException; -import java.util.List; -import java.util.Set; - -import javax.annotation.Nullable; -import javax.servlet.http.HttpServletRequest; - public class CommitJsonData { static final ImmutableSet<Field> DEFAULT_FIELDS = Sets.immutableEnumSet(
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/CommitSoyData.java b/gitiles-servlet/src/main/java/com/google/gitiles/CommitSoyData.java index d5bd8fd..40c5f74 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/CommitSoyData.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/CommitSoyData.java
@@ -27,7 +27,12 @@ import com.google.gitiles.CommitData.DiffList; import com.google.gitiles.CommitData.Field; import com.google.template.soy.data.restricted.NullData; - +import java.io.IOException; +import java.util.List; +import java.util.Map; +import java.util.Set; +import javax.annotation.Nullable; +import javax.servlet.http.HttpServletRequest; import org.eclipse.jgit.diff.DiffEntry; import org.eclipse.jgit.diff.DiffEntry.ChangeType; import org.eclipse.jgit.lib.Constants; @@ -37,14 +42,6 @@ import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.util.RelativeDateFormatter; -import java.io.IOException; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.annotation.Nullable; -import javax.servlet.http.HttpServletRequest; - /** Soy data converter for git commits. */ public class CommitSoyData { static final ImmutableSet<Field> DEFAULT_FIELDS =
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/ConfigUtil.java b/gitiles-servlet/src/main/java/com/google/gitiles/ConfigUtil.java index 1915d73..b9700b8 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/ConfigUtil.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/ConfigUtil.java
@@ -21,16 +21,13 @@ import com.google.common.cache.CacheBuilder; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; - -import org.eclipse.jgit.lib.Config; -import org.joda.time.Duration; - import java.util.TimeZone; import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; - import javax.annotation.Nullable; +import org.eclipse.jgit.lib.Config; +import org.joda.time.Duration; /** Utilities for working with {@link Config} objects. */ public class ConfigUtil {
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/DateFormatter.java b/gitiles-servlet/src/main/java/com/google/gitiles/DateFormatter.java index affe508..1f847a8 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/DateFormatter.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/DateFormatter.java
@@ -15,14 +15,12 @@ package com.google.gitiles; import com.google.common.base.Optional; - -import org.eclipse.jgit.lib.PersonIdent; -import org.eclipse.jgit.util.SystemReader; - import java.io.IOException; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.TimeZone; +import org.eclipse.jgit.lib.PersonIdent; +import org.eclipse.jgit.util.SystemReader; /** Date formatter similar in spirit to JGit's {@code GitDateFormatter}. */ public class DateFormatter {
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/DebugRenderer.java b/gitiles-servlet/src/main/java/com/google/gitiles/DebugRenderer.java index dd6830d..5a54cea 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/DebugRenderer.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/DebugRenderer.java
@@ -21,7 +21,6 @@ import com.google.common.hash.HashCode; import com.google.template.soy.SoyFileSet; import com.google.template.soy.tofu.SoyTofu; - import java.io.File; import java.net.URISyntaxException; import java.net.URL;
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/DefaultAccess.java b/gitiles-servlet/src/main/java/com/google/gitiles/DefaultAccess.java index f912c3e..745eef7 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/DefaultAccess.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/DefaultAccess.java
@@ -21,18 +21,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Queues; - -import org.eclipse.jgit.errors.ConfigInvalidException; -import org.eclipse.jgit.errors.RepositoryNotFoundException; -import org.eclipse.jgit.http.server.ServletUtils; -import org.eclipse.jgit.lib.Config; -import org.eclipse.jgit.lib.Ref; -import org.eclipse.jgit.lib.Repository; -import org.eclipse.jgit.lib.StoredConfig; -import org.eclipse.jgit.transport.resolver.FileResolver; -import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException; -import org.eclipse.jgit.util.IO; - import java.io.File; import java.io.IOException; import java.text.Collator; @@ -43,8 +31,17 @@ import java.util.Map; import java.util.Queue; import java.util.Set; - import javax.servlet.http.HttpServletRequest; +import org.eclipse.jgit.errors.ConfigInvalidException; +import org.eclipse.jgit.errors.RepositoryNotFoundException; +import org.eclipse.jgit.http.server.ServletUtils; +import org.eclipse.jgit.lib.Config; +import org.eclipse.jgit.lib.Ref; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.lib.StoredConfig; +import org.eclipse.jgit.transport.resolver.FileResolver; +import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException; +import org.eclipse.jgit.util.IO; /** * Default implementation of {@link GitilesAccess} with local repositories.
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/DefaultRenderer.java b/gitiles-servlet/src/main/java/com/google/gitiles/DefaultRenderer.java index 238aa74..0d78e24 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/DefaultRenderer.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/DefaultRenderer.java
@@ -20,7 +20,6 @@ import com.google.common.io.Resources; import com.google.template.soy.SoyFileSet; import com.google.template.soy.tofu.SoyTofu; - import java.net.URL; import java.util.Map;
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/DefaultUrls.java b/gitiles-servlet/src/main/java/com/google/gitiles/DefaultUrls.java index 7218a4b..d6e9bf7 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/DefaultUrls.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/DefaultUrls.java
@@ -18,7 +18,6 @@ import java.net.InetAddress; import java.net.UnknownHostException; - import javax.servlet.http.HttpServletRequest; /**
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/DescribeServlet.java b/gitiles-servlet/src/main/java/com/google/gitiles/DescribeServlet.java index fb4aa0f..88535d2 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/DescribeServlet.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/DescribeServlet.java
@@ -20,7 +20,12 @@ import com.google.common.base.Joiner; import com.google.common.collect.ImmutableMap; import com.google.gson.reflect.TypeToken; - +import java.io.IOException; +import java.io.Writer; +import java.util.List; +import java.util.Map; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.NameRevCommand; import org.eclipse.jgit.api.errors.GitAPIException; @@ -31,14 +36,6 @@ import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.Repository; -import java.io.IOException; -import java.io.Writer; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** Serves an API result describing an object. */ public class DescribeServlet extends BaseServlet { private static final long serialVersionUID = 1L;
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/DiffServlet.java b/gitiles-servlet/src/main/java/com/google/gitiles/DiffServlet.java index 27b9852..273b0be 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/DiffServlet.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/DiffServlet.java
@@ -20,7 +20,14 @@ import com.google.common.io.BaseEncoding; import com.google.gitiles.CommitData.Field; import com.google.gitiles.DateFormatter.Format; - +import java.io.IOException; +import java.io.OutputStream; +import java.io.Writer; +import java.util.Arrays; +import java.util.Map; +import java.util.Set; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jgit.diff.DiffFormatter; import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.errors.MissingObjectException; @@ -36,16 +43,6 @@ import org.eclipse.jgit.treewalk.TreeWalk; import org.eclipse.jgit.treewalk.filter.PathFilter; -import java.io.IOException; -import java.io.OutputStream; -import java.io.Writer; -import java.util.Arrays; -import java.util.Map; -import java.util.Set; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** Serves an HTML page with all the diffs for a commit. */ public class DiffServlet extends BaseServlet { private static final long serialVersionUID = 1L;
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/FormatType.java b/gitiles-servlet/src/main/java/com/google/gitiles/FormatType.java index 4eca18d..7f8d62a 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/FormatType.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/FormatType.java
@@ -18,7 +18,6 @@ import com.google.common.base.Optional; import com.google.common.base.Strings; import com.google.common.net.HttpHeaders; - import javax.servlet.http.HttpServletRequest; /** Type of formatting to use in the response to the client. */
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/GitilesAccess.java b/gitiles-servlet/src/main/java/com/google/gitiles/GitilesAccess.java index 3b5427d..32002ec 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/GitilesAccess.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/GitilesAccess.java
@@ -14,16 +14,14 @@ package com.google.gitiles; -import org.eclipse.jgit.lib.Config; -import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException; -import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException; - import java.io.IOException; import java.util.Map; import java.util.Set; - import javax.annotation.Nullable; import javax.servlet.http.HttpServletRequest; +import org.eclipse.jgit.lib.Config; +import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException; +import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException; /** * Git storage interface for Gitiles.
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/GitilesConfig.java b/gitiles-servlet/src/main/java/com/google/gitiles/GitilesConfig.java index 9793163..40fd6d0 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/GitilesConfig.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/GitilesConfig.java
@@ -16,17 +16,15 @@ import static com.google.common.base.Preconditions.checkNotNull; +import java.io.File; +import java.io.IOException; +import java.util.Map; +import javax.servlet.FilterConfig; import org.eclipse.jgit.errors.ConfigInvalidException; import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.storage.file.FileBasedConfig; import org.eclipse.jgit.util.FS; -import java.io.File; -import java.io.IOException; -import java.util.Map; - -import javax.servlet.FilterConfig; - public class GitilesConfig { private static final String FILTER_CONFIG_PARAM = "configPath"; private static final String PROPERTY_NAME = "com.google.gitiles.configPath";
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/GitilesFilter.java b/gitiles-servlet/src/main/java/com/google/gitiles/GitilesFilter.java index 4e5da10..4e362a5 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/GitilesFilter.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/GitilesFilter.java
@@ -30,14 +30,6 @@ import com.google.gitiles.blame.BlameCacheImpl; import com.google.gitiles.blame.BlameServlet; import com.google.gitiles.doc.DocServlet; - -import org.eclipse.jgit.errors.ConfigInvalidException; -import org.eclipse.jgit.http.server.glue.MetaFilter; -import org.eclipse.jgit.http.server.glue.ServletBinder; -import org.eclipse.jgit.lib.Config; -import org.eclipse.jgit.transport.resolver.FileResolver; -import org.eclipse.jgit.transport.resolver.RepositoryResolver; - import java.io.File; import java.io.IOException; import java.net.UnknownHostException; @@ -45,7 +37,6 @@ import java.util.Iterator; import java.util.Map; import java.util.regex.Pattern; - import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -55,6 +46,12 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.eclipse.jgit.errors.ConfigInvalidException; +import org.eclipse.jgit.http.server.glue.MetaFilter; +import org.eclipse.jgit.http.server.glue.ServletBinder; +import org.eclipse.jgit.lib.Config; +import org.eclipse.jgit.transport.resolver.FileResolver; +import org.eclipse.jgit.transport.resolver.RepositoryResolver; /** * MetaFilter to serve Gitiles.
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/GitilesServlet.java b/gitiles-servlet/src/main/java/com/google/gitiles/GitilesServlet.java index 7a14ba2..05a2669 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/GitilesServlet.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/GitilesServlet.java
@@ -15,13 +15,7 @@ package com.google.gitiles; import com.google.gitiles.blame.BlameCache; - -import org.eclipse.jgit.http.server.glue.MetaServlet; -import org.eclipse.jgit.lib.Config; -import org.eclipse.jgit.transport.resolver.RepositoryResolver; - import java.util.Enumeration; - import javax.annotation.Nullable; import javax.servlet.Filter; import javax.servlet.FilterConfig; @@ -30,6 +24,9 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; +import org.eclipse.jgit.http.server.glue.MetaServlet; +import org.eclipse.jgit.lib.Config; +import org.eclipse.jgit.transport.resolver.RepositoryResolver; /** * Servlet to serve Gitiles.
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/GitilesUrls.java b/gitiles-servlet/src/main/java/com/google/gitiles/GitilesUrls.java index 53dddc9..50171c3 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/GitilesUrls.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/GitilesUrls.java
@@ -17,10 +17,8 @@ import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.base.Function; - import java.io.UnsupportedEncodingException; import java.net.URLEncoder; - import javax.servlet.http.HttpServletRequest; /** Interface for URLs displayed on source browsing pages. */
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/GitilesView.java b/gitiles-servlet/src/main/java/com/google/gitiles/GitilesView.java index 057ebf4..889c603 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/GitilesView.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/GitilesView.java
@@ -32,10 +32,6 @@ import com.google.common.collect.LinkedListMultimap; import com.google.common.collect.ListMultimap; import com.google.common.collect.Multimaps; - -import org.eclipse.jgit.lib.Constants; -import org.eclipse.jgit.revwalk.RevObject; - import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.util.ArrayList; @@ -43,8 +39,9 @@ import java.util.EnumSet; import java.util.List; import java.util.Map; - import javax.servlet.http.HttpServletRequest; +import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.revwalk.RevObject; /** * Information about a view in Gitiles.
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/GitwebRedirectFilter.java b/gitiles-servlet/src/main/java/com/google/gitiles/GitwebRedirectFilter.java index 6578891..f1e01bc 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/GitwebRedirectFilter.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/GitwebRedirectFilter.java
@@ -27,19 +27,16 @@ import com.google.common.collect.LinkedListMultimap; import com.google.common.collect.ListMultimap; import com.google.gitiles.GitilesView.InvalidViewException; - -import org.eclipse.jgit.lib.ObjectId; - import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.util.List; import java.util.regex.Pattern; - import javax.servlet.FilterChain; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.eclipse.jgit.lib.ObjectId; /** Filter to redirect Gitweb-style URLs to Gitiles-style URLs. */ public class GitwebRedirectFilter extends AbstractHttpFilter {
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/HostIndexServlet.java b/gitiles-servlet/src/main/java/com/google/gitiles/HostIndexServlet.java index ca35727..4a448e3 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/HostIndexServlet.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/HostIndexServlet.java
@@ -29,14 +29,6 @@ import com.google.template.soy.data.SoyData; import com.google.template.soy.data.SoyListData; import com.google.template.soy.data.SoyMapData; - -import org.eclipse.jgit.errors.RepositoryNotFoundException; -import org.eclipse.jgit.transport.ServiceMayNotContinueException; -import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException; -import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.IOException; import java.io.Writer; import java.util.Collections; @@ -44,10 +36,15 @@ import java.util.List; import java.util.Map; import java.util.Set; - import javax.annotation.Nullable; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.eclipse.jgit.errors.RepositoryNotFoundException; +import org.eclipse.jgit.transport.ServiceMayNotContinueException; +import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException; +import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** Serves the top level index page for a Gitiles host. */ public class HostIndexServlet extends BaseServlet {
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/HtmlDiffFormatter.java b/gitiles-servlet/src/main/java/com/google/gitiles/HtmlDiffFormatter.java index 4998f94..a290642 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/HtmlDiffFormatter.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/HtmlDiffFormatter.java
@@ -20,7 +20,10 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; - +import java.io.IOException; +import java.io.OutputStream; +import java.util.List; +import java.util.Map; import org.apache.commons.lang3.StringEscapeUtils; import org.eclipse.jgit.diff.DiffEntry; import org.eclipse.jgit.diff.DiffEntry.ChangeType; @@ -30,11 +33,6 @@ import org.eclipse.jgit.patch.FileHeader.PatchType; import org.eclipse.jgit.util.RawParseUtils; -import java.io.IOException; -import java.io.OutputStream; -import java.util.List; -import java.util.Map; - /** Formats a unified format patch as UTF-8 encoded HTML. */ final class HtmlDiffFormatter extends DiffFormatter { private static final byte[] DIFF_BEGIN = "<pre class=\"u-pre Diff-unified\">".getBytes(UTF_8);
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/IdentRevFilter.java b/gitiles-servlet/src/main/java/com/google/gitiles/IdentRevFilter.java index 5493452..745debd 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/IdentRevFilter.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/IdentRevFilter.java
@@ -15,7 +15,7 @@ package com.google.gitiles; import com.google.common.annotations.VisibleForTesting; - +import java.io.IOException; import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.errors.StopWalkException; @@ -24,8 +24,6 @@ import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.revwalk.filter.RevFilter; -import java.io.IOException; - /** Filter which only includes commits matching a person identity. */ public abstract class IdentRevFilter extends RevFilter { public static IdentRevFilter author(String author) {
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/Linkifier.java b/gitiles-servlet/src/main/java/com/google/gitiles/Linkifier.java index e513ec4..e3110dd 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/Linkifier.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/Linkifier.java
@@ -20,11 +20,6 @@ import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; - -import org.eclipse.jgit.lib.Config; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -32,8 +27,10 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; - import javax.servlet.http.HttpServletRequest; +import org.eclipse.jgit.lib.Config; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** Linkifier for blocks of text such as commit message descriptions. */ public class Linkifier {
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/LogServlet.java b/gitiles-servlet/src/main/java/com/google/gitiles/LogServlet.java index 30d37f5..5f17081 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/LogServlet.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/LogServlet.java
@@ -29,7 +29,16 @@ import com.google.gitiles.CommitData.Field; import com.google.gitiles.DateFormatter.Format; import com.google.gson.reflect.TypeToken; - +import java.io.IOException; +import java.io.OutputStream; +import java.io.Writer; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jgit.diff.DiffConfig; import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.errors.MissingObjectException; @@ -56,18 +65,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.io.OutputStream; -import java.io.Writer; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** Serves an HTML page with a shortlog for commits and paths. */ public class LogServlet extends BaseServlet { private static final long serialVersionUID = 1L;
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/LogSoyData.java b/gitiles-servlet/src/main/java/com/google/gitiles/LogSoyData.java index 6d1a1c8..56ddb8f 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/LogSoyData.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/LogSoyData.java
@@ -23,21 +23,18 @@ import com.google.common.collect.Sets; import com.google.gitiles.CommitData.Field; import com.google.template.soy.tofu.SoyTofu; - +import java.io.IOException; +import java.io.Writer; +import java.util.Map; +import java.util.Set; +import javax.annotation.Nullable; +import javax.servlet.http.HttpServletRequest; import org.eclipse.jgit.diff.DiffEntry; import org.eclipse.jgit.diff.DiffEntry.ChangeType; import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.revwalk.RevCommit; -import java.io.IOException; -import java.io.Writer; -import java.util.Map; -import java.util.Set; - -import javax.annotation.Nullable; -import javax.servlet.http.HttpServletRequest; - public class LogSoyData { private static final ImmutableSet<Field> FIELDS = Sets.immutableEnumSet(
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/MimeTypes.java b/gitiles-servlet/src/main/java/com/google/gitiles/MimeTypes.java index ed219ce..440503c 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/MimeTypes.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/MimeTypes.java
@@ -16,7 +16,6 @@ import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableMap; - import java.io.IOException; import java.io.InputStream; import java.util.Map;
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/Paginator.java b/gitiles-servlet/src/main/java/com/google/gitiles/Paginator.java index 019d33c..ba85828 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/Paginator.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/Paginator.java
@@ -18,6 +18,13 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; +import java.io.IOException; +import java.util.ArrayDeque; +import java.util.Deque; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import javax.annotation.Nullable; import org.eclipse.jgit.diff.DiffEntry; import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.errors.MissingObjectException; @@ -29,15 +36,6 @@ import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.treewalk.filter.TreeFilter; -import java.io.IOException; -import java.util.ArrayDeque; -import java.util.Deque; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - -import javax.annotation.Nullable; - /** * Wrapper around {@link RevWalk} that paginates for Gitiles. *
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/PathServlet.java b/gitiles-servlet/src/main/java/com/google/gitiles/PathServlet.java index 91e7060..1870258 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/PathServlet.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/PathServlet.java
@@ -29,7 +29,14 @@ import com.google.common.collect.Maps; import com.google.common.io.BaseEncoding; import com.google.common.primitives.Bytes; - +import java.io.IOException; +import java.io.OutputStream; +import java.io.Writer; +import java.util.List; +import java.util.Map; +import java.util.regex.Pattern; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jgit.errors.ConfigInvalidException; import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.errors.LargeObjectException; @@ -57,16 +64,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.io.OutputStream; -import java.io.Writer; -import java.util.List; -import java.util.Map; -import java.util.regex.Pattern; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** Serves an HTML page with detailed information about a path within a tree. */ // TODO(dborowitz): Handle non-UTF-8 names. public class PathServlet extends BaseServlet {
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/PathUtil.java b/gitiles-servlet/src/main/java/com/google/gitiles/PathUtil.java index e67223f..2df8cdc 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/PathUtil.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/PathUtil.java
@@ -18,7 +18,6 @@ import com.google.common.base.Splitter; import com.google.common.base.Strings; import com.google.common.io.Files; - import java.util.StringTokenizer; /** Static utilities for dealing with pathnames. */
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/ReadmeHelper.java b/gitiles-servlet/src/main/java/com/google/gitiles/ReadmeHelper.java index 3dcf1ea..0d625a9 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/ReadmeHelper.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/ReadmeHelper.java
@@ -17,7 +17,7 @@ import com.google.gitiles.doc.MarkdownConfig; import com.google.gitiles.doc.MarkdownToHtml; import com.google.template.soy.data.SanitizedContent; - +import java.io.IOException; import org.eclipse.jgit.errors.CorruptObjectException; import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.errors.MissingObjectException; @@ -30,8 +30,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; - class ReadmeHelper { private static final Logger log = LoggerFactory.getLogger(ReadmeHelper.class);
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/RefServlet.java b/gitiles-servlet/src/main/java/com/google/gitiles/RefServlet.java index f434586..5aa4119 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/RefServlet.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/RefServlet.java
@@ -25,7 +25,15 @@ import com.google.common.primitives.Ints; import com.google.common.util.concurrent.UncheckedExecutionException; import com.google.gson.reflect.TypeToken; - +import java.io.IOException; +import java.io.Writer; +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Nullable; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jgit.http.server.ServletUtils; import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.Constants; @@ -35,17 +43,6 @@ import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.transport.RefAdvertiser; -import java.io.IOException; -import java.io.Writer; -import java.util.Collection; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Nullable; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** Serves an HTML page with all the refs in a repository. */ public class RefServlet extends BaseServlet { private static final long serialVersionUID = 1L;
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/Renderer.java b/gitiles-servlet/src/main/java/com/google/gitiles/Renderer.java index 694a3c3..f5d6e36 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/Renderer.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/Renderer.java
@@ -31,7 +31,6 @@ import com.google.common.io.ByteStreams; import com.google.common.net.HttpHeaders; import com.google.template.soy.tofu.SoyTofu; - import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -41,7 +40,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentMap; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse;
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/RepositoryFilter.java b/gitiles-servlet/src/main/java/com/google/gitiles/RepositoryFilter.java index bbaabc5..ffb4a55 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/RepositoryFilter.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/RepositoryFilter.java
@@ -21,6 +21,11 @@ import static org.eclipse.jgit.http.server.GitSmartHttpTools.sendError; import static org.eclipse.jgit.http.server.ServletUtils.ATTRIBUTE_REPOSITORY; +import java.io.IOException; +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jgit.errors.RepositoryNotFoundException; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.transport.ServiceMayNotContinueException; @@ -28,13 +33,6 @@ import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException; import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException; -import java.io.IOException; - -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - class RepositoryFilter extends AbstractHttpFilter { private final RepositoryResolver<HttpServletRequest> resolver;
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/RepositoryIndexServlet.java b/gitiles-servlet/src/main/java/com/google/gitiles/RepositoryIndexServlet.java index 3b754df..7ce3720 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/RepositoryIndexServlet.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/RepositoryIndexServlet.java
@@ -26,7 +26,13 @@ import com.google.gitiles.doc.MarkdownConfig; import com.google.gson.reflect.TypeToken; import com.google.template.soy.data.SanitizedContent; - +import java.io.IOException; +import java.io.OutputStream; +import java.io.Writer; +import java.util.List; +import java.util.Map; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.http.server.ServletUtils; import org.eclipse.jgit.lib.Config; @@ -38,15 +44,6 @@ import org.eclipse.jgit.revwalk.RevTree; import org.eclipse.jgit.revwalk.RevWalk; -import java.io.IOException; -import java.io.OutputStream; -import java.io.Writer; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** Serves the index page for a repository, if accessed directly by a browser. */ public class RepositoryIndexServlet extends BaseServlet { private static final long serialVersionUID = 1L;
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/Revision.java b/gitiles-servlet/src/main/java/com/google/gitiles/Revision.java index 356fbc7..c494af9 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/Revision.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/Revision.java
@@ -21,7 +21,8 @@ import static org.eclipse.jgit.lib.Constants.OBJ_TAG; import com.google.common.annotations.VisibleForTesting; - +import java.io.IOException; +import java.util.Objects; import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.lib.AbbreviatedObjectId; import org.eclipse.jgit.lib.Constants; @@ -29,9 +30,6 @@ import org.eclipse.jgit.revwalk.RevObject; import org.eclipse.jgit.revwalk.RevWalk; -import java.io.IOException; -import java.util.Objects; - /** * Object encapsulating a single revision as seen by Gitiles. * <p>
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/RevisionParser.java b/gitiles-servlet/src/main/java/com/google/gitiles/RevisionParser.java index f837bca..9b2d044 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/RevisionParser.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/RevisionParser.java
@@ -21,7 +21,8 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.CharMatcher; import com.google.common.base.Splitter; - +import java.io.IOException; +import java.util.Objects; import org.eclipse.jgit.errors.AmbiguousObjectException; import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.errors.RevisionSyntaxException; @@ -32,9 +33,6 @@ import org.eclipse.jgit.revwalk.RevTag; import org.eclipse.jgit.revwalk.RevWalk; -import java.io.IOException; -import java.util.Objects; - /** Object to parse revisions out of Gitiles paths. */ class RevisionParser { private static final Splitter OPERATOR_SPLITTER = Splitter.on(CharMatcher.anyOf("^~"));
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/RevisionServlet.java b/gitiles-servlet/src/main/java/com/google/gitiles/RevisionServlet.java index cc80490..a126c7e 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/RevisionServlet.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/RevisionServlet.java
@@ -28,7 +28,13 @@ import com.google.gitiles.CommitData.Field; import com.google.gitiles.CommitJsonData.Commit; import com.google.gitiles.DateFormatter.Format; - +import java.io.IOException; +import java.io.OutputStream; +import java.io.Writer; +import java.util.List; +import java.util.Map; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.http.server.ServletUtils; @@ -46,15 +52,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.io.OutputStream; -import java.io.Writer; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** Serves an HTML page with detailed information about a ref. */ public class RevisionServlet extends BaseServlet { private static final ImmutableSet<Field> COMMIT_SOY_FIELDS =
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/RootedDocServlet.java b/gitiles-servlet/src/main/java/com/google/gitiles/RootedDocServlet.java index 057aba8..90c6e07 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/RootedDocServlet.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/RootedDocServlet.java
@@ -17,7 +17,12 @@ import static org.eclipse.jgit.http.server.ServletUtils.ATTRIBUTE_REPOSITORY; import com.google.gitiles.doc.DocServlet; - +import java.io.IOException; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jgit.errors.RepositoryNotFoundException; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.Repository; @@ -30,14 +35,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; - -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** Serves Markdown at the root of a host. */ public class RootedDocServlet extends HttpServlet { private static final Logger log = LoggerFactory.getLogger(ViewFilter.class);
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/TagSoyData.java b/gitiles-servlet/src/main/java/com/google/gitiles/TagSoyData.java index 8401551..831cb8e 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/TagSoyData.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/TagSoyData.java
@@ -15,14 +15,11 @@ package com.google.gitiles; import com.google.common.collect.Maps; - +import java.util.Map; +import javax.servlet.http.HttpServletRequest; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.revwalk.RevTag; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - /** Soy data converter for git tags. */ public class TagSoyData { private final Linkifier linkifier;
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/ThreadSafePrettifyParser.java b/gitiles-servlet/src/main/java/com/google/gitiles/ThreadSafePrettifyParser.java index 36646aa..b529ea8 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/ThreadSafePrettifyParser.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/ThreadSafePrettifyParser.java
@@ -15,7 +15,6 @@ package com.google.gitiles; import java.util.Collections; - import prettify.PrettifyParser; import prettify.parser.Prettify;
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/TimeCache.java b/gitiles-servlet/src/main/java/com/google/gitiles/TimeCache.java index 7021733..dee10d1 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/TimeCache.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/TimeCache.java
@@ -17,7 +17,9 @@ import com.google.common.base.Throwables; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; - +import java.io.IOException; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutionException; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.PersonIdent; @@ -26,10 +28,6 @@ import org.eclipse.jgit.revwalk.RevTag; import org.eclipse.jgit.revwalk.RevWalk; -import java.io.IOException; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutionException; - /** * Cache of the time associated with Git objects. * <p>
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/TreeJsonData.java b/gitiles-servlet/src/main/java/com/google/gitiles/TreeJsonData.java index 998d546..212099c 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/TreeJsonData.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/TreeJsonData.java
@@ -17,16 +17,14 @@ import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.collect.Lists; - +import java.io.IOException; +import java.util.List; import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.FileMode; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.treewalk.TreeWalk; -import java.io.IOException; -import java.util.List; - class TreeJsonData { static class Tree { String id;
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/TreeSoyData.java b/gitiles-servlet/src/main/java/com/google/gitiles/TreeSoyData.java index f32e2cf..936094c 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/TreeSoyData.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/TreeSoyData.java
@@ -23,7 +23,9 @@ import com.google.common.collect.Maps; import com.google.gitiles.PathServlet.FileType; import com.google.gitiles.doc.MarkdownConfig; - +import java.io.IOException; +import java.util.List; +import java.util.Map; import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.ObjectId; @@ -31,10 +33,6 @@ import org.eclipse.jgit.revwalk.RevTree; import org.eclipse.jgit.treewalk.TreeWalk; -import java.io.IOException; -import java.util.List; -import java.util.Map; - /** Soy data converter for git trees. */ public class TreeSoyData { /**
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/ViewFilter.java b/gitiles-servlet/src/main/java/com/google/gitiles/ViewFilter.java index dbc9436..51e248e 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/ViewFilter.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/ViewFilter.java
@@ -21,19 +21,16 @@ import static org.eclipse.jgit.http.server.ServletUtils.ATTRIBUTE_REPOSITORY; import com.google.common.base.Strings; - -import org.eclipse.jgit.http.server.ServletUtils; -import org.eclipse.jgit.http.server.glue.WrappedRequest; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.IOException; import java.util.Map; - import javax.servlet.FilterChain; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.eclipse.jgit.http.server.ServletUtils; +import org.eclipse.jgit.http.server.glue.WrappedRequest; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** Filter to parse URLs and convert them to {@link GitilesView}s. */ public class ViewFilter extends AbstractHttpFilter {
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/VisibilityCache.java b/gitiles-servlet/src/main/java/com/google/gitiles/VisibilityCache.java index 6c1a7a2..657bba8 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/VisibilityCache.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/VisibilityCache.java
@@ -30,7 +30,13 @@ import com.google.common.cache.CacheBuilder; import com.google.common.collect.Collections2; import com.google.common.util.concurrent.ExecutionError; - +import java.io.IOException; +import java.util.Arrays; +import java.util.Collection; +import java.util.Objects; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.lib.ObjectId; @@ -41,14 +47,6 @@ import org.eclipse.jgit.revwalk.RevSort; import org.eclipse.jgit.revwalk.RevWalk; -import java.io.IOException; -import java.util.Arrays; -import java.util.Collection; -import java.util.Objects; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeUnit; - /** Cache of per-user object visibility. */ public class VisibilityCache { private static class Key {
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/blame/BlameServlet.java b/gitiles-servlet/src/main/java/com/google/gitiles/blame/BlameServlet.java index 2bb9dd3..bff70c2 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/blame/BlameServlet.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/blame/BlameServlet.java
@@ -34,7 +34,12 @@ import com.google.gson.reflect.TypeToken; import com.google.template.soy.data.SoyListData; import com.google.template.soy.data.SoyMapData; - +import java.io.IOException; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.http.server.ServletUtils; import org.eclipse.jgit.lib.FileMode; @@ -48,14 +53,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.util.List; -import java.util.Map; -import java.util.Objects; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** Serves an HTML page with blame data for a commit. */ public class BlameServlet extends BaseServlet { private static final long serialVersionUID = 1L;
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/blame/RegionAdapter.java b/gitiles-servlet/src/main/java/com/google/gitiles/blame/RegionAdapter.java index eed270f..f2f1855 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/blame/RegionAdapter.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/blame/RegionAdapter.java
@@ -20,10 +20,8 @@ import com.google.gson.TypeAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; - -import org.eclipse.jgit.lib.ObjectId; - import java.io.IOException; +import org.eclipse.jgit.lib.ObjectId; class RegionAdapter extends TypeAdapter<Region> { private final DateFormatter df;
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/doc/BlockNoteExtension.java b/gitiles-servlet/src/main/java/com/google/gitiles/doc/BlockNoteExtension.java index 3ae747d..8a7e250 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/doc/BlockNoteExtension.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/doc/BlockNoteExtension.java
@@ -15,7 +15,6 @@ package com.google.gitiles.doc; import com.google.common.collect.ImmutableSet; - import org.commonmark.Extension; import org.commonmark.node.Block; import org.commonmark.parser.Parser;
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/doc/DocServlet.java b/gitiles-servlet/src/main/java/com/google/gitiles/doc/DocServlet.java index 9007928..37a1ec6 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/doc/DocServlet.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/doc/DocServlet.java
@@ -34,7 +34,12 @@ import com.google.gitiles.GitilesView; import com.google.gitiles.Renderer; import com.google.gitiles.ViewFilter; - +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; +import javax.annotation.Nullable; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.commonmark.node.Node; import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.errors.LargeObjectException; @@ -49,14 +54,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - -import javax.annotation.Nullable; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - public class DocServlet extends BaseServlet { private static final Logger log = LoggerFactory.getLogger(DocServlet.class); private static final long serialVersionUID = 1L;
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/doc/GitilesHtmlExtension.java b/gitiles-servlet/src/main/java/com/google/gitiles/doc/GitilesHtmlExtension.java index 2127400..a049fa8 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/doc/GitilesHtmlExtension.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/doc/GitilesHtmlExtension.java
@@ -15,7 +15,8 @@ package com.google.gitiles.doc; import com.google.gitiles.doc.html.HtmlBuilder; - +import java.util.regex.Matcher; +import java.util.regex.Pattern; import org.commonmark.Extension; import org.commonmark.node.AbstractVisitor; import org.commonmark.node.HardLineBreak; @@ -27,9 +28,6 @@ import org.commonmark.parser.Parser.ParserExtension; import org.commonmark.parser.PostProcessor; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - /** * Convert some {@link HtmlInline} and {@link HtmlBlock} to safe types. * <p>
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/doc/GitilesMarkdown.java b/gitiles-servlet/src/main/java/com/google/gitiles/doc/GitilesMarkdown.java index fcd00dc..cc50048 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/doc/GitilesMarkdown.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/doc/GitilesMarkdown.java
@@ -15,7 +15,6 @@ package com.google.gitiles.doc; import com.google.common.collect.ImmutableList; - import org.commonmark.ext.autolink.AutolinkExtension; import org.commonmark.ext.gfm.strikethrough.StrikethroughExtension; import org.commonmark.ext.gfm.tables.TablesExtension;
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/doc/ImageLoader.java b/gitiles-servlet/src/main/java/com/google/gitiles/doc/ImageLoader.java index 4fca76a..b7b2531 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/doc/ImageLoader.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/doc/ImageLoader.java
@@ -19,7 +19,8 @@ import com.google.gitiles.GitilesView; import com.google.gitiles.MimeTypes; import com.google.template.soy.shared.restricted.EscapingConventions.FilterImageDataUri; - +import java.io.IOException; +import javax.annotation.Nullable; import org.eclipse.jgit.errors.LargeObjectException; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.FileMode; @@ -30,10 +31,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; - -import javax.annotation.Nullable; - /** Reads an image from Git and converts to {@code data:image/*;base64,...} */ class ImageLoader { private static final Logger log = LoggerFactory.getLogger(ImageLoader.class);
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/doc/MarkdownConfig.java b/gitiles-servlet/src/main/java/com/google/gitiles/doc/MarkdownConfig.java index f229f8e..5737d85 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/doc/MarkdownConfig.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/doc/MarkdownConfig.java
@@ -16,7 +16,6 @@ import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; - import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.Config.SectionParser; import org.eclipse.jgit.util.StringUtils;
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/doc/MarkdownToHtml.java b/gitiles-servlet/src/main/java/com/google/gitiles/doc/MarkdownToHtml.java index d5218e7..5a86d4c 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/doc/MarkdownToHtml.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/doc/MarkdownToHtml.java
@@ -24,7 +24,8 @@ import com.google.template.soy.data.SanitizedContent; import com.google.template.soy.shared.restricted.EscapingConventions.FilterImageDataUri; import com.google.template.soy.shared.restricted.EscapingConventions.FilterNormalizeUri; - +import java.util.List; +import javax.annotation.Nullable; import org.commonmark.ext.gfm.strikethrough.Strikethrough; import org.commonmark.ext.gfm.tables.TableBlock; import org.commonmark.ext.gfm.tables.TableBody; @@ -59,11 +60,6 @@ import org.commonmark.node.Visitor; import org.eclipse.jgit.lib.ObjectReader; import org.eclipse.jgit.revwalk.RevTree; - -import java.util.List; - -import javax.annotation.Nullable; - import prettify.parser.Prettify; import syntaxhighlight.ParseResult;
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/doc/MarkdownUtil.java b/gitiles-servlet/src/main/java/com/google/gitiles/doc/MarkdownUtil.java index 6392cd0..9a6bb82 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/doc/MarkdownUtil.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/doc/MarkdownUtil.java
@@ -16,7 +16,6 @@ import com.google.common.base.CharMatcher; import com.google.common.base.Strings; - import org.commonmark.node.Heading; import org.commonmark.node.Node; import org.commonmark.node.Text;
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/doc/MultiColumnExtension.java b/gitiles-servlet/src/main/java/com/google/gitiles/doc/MultiColumnExtension.java index aeb3d89..4f1ca53 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/doc/MultiColumnExtension.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/doc/MultiColumnExtension.java
@@ -17,7 +17,8 @@ import com.google.common.base.Splitter; import com.google.common.primitives.Ints; import com.google.gitiles.doc.MultiColumnBlock.Column; - +import java.util.ArrayList; +import java.util.List; import org.commonmark.Extension; import org.commonmark.node.Block; import org.commonmark.node.Heading; @@ -31,9 +32,6 @@ import org.commonmark.parser.block.MatchedBlockParser; import org.commonmark.parser.block.ParserState; -import java.util.ArrayList; -import java.util.List; - /** CommonMark extension for multicolumn layouts. */ public class MultiColumnExtension implements ParserExtension { private static final String MARKER = "|||---|||";
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/doc/NamedAnchorExtension.java b/gitiles-servlet/src/main/java/com/google/gitiles/doc/NamedAnchorExtension.java index fd3f8f7..e6a3071 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/doc/NamedAnchorExtension.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/doc/NamedAnchorExtension.java
@@ -14,6 +14,8 @@ package com.google.gitiles.doc; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import org.commonmark.Extension; import org.commonmark.node.Node; import org.commonmark.node.Text; @@ -22,9 +24,6 @@ import org.commonmark.parser.delimiter.DelimiterProcessor; import org.commonmark.parser.delimiter.DelimiterRun; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - /** Parses <code>{#foo}</code> into {@link NamedAnchor}. */ public class NamedAnchorExtension implements ParserExtension { public static Extension create() {
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/doc/Navbar.java b/gitiles-servlet/src/main/java/com/google/gitiles/doc/Navbar.java index 5affd6c..50e0b61 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/doc/Navbar.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/doc/Navbar.java
@@ -15,17 +15,15 @@ package com.google.gitiles.doc; import com.google.gitiles.doc.html.HtmlBuilder; -import com.google.template.soy.shared.restricted.Sanitizers; import com.google.template.soy.shared.restricted.EscapingConventions.FilterImageDataUri; - -import org.commonmark.node.Heading; -import org.commonmark.node.Node; -import org.eclipse.jgit.util.RawParseUtils; - +import com.google.template.soy.shared.restricted.Sanitizers; import java.util.HashMap; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.commonmark.node.Heading; +import org.commonmark.node.Node; +import org.eclipse.jgit.util.RawParseUtils; class Navbar { private static final Pattern REF_LINK =
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/doc/PathResolver.java b/gitiles-servlet/src/main/java/com/google/gitiles/doc/PathResolver.java index 1cc8095..33feff7 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/doc/PathResolver.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/doc/PathResolver.java
@@ -15,7 +15,6 @@ package com.google.gitiles.doc; import com.google.common.base.CharMatcher; - import javax.annotation.Nullable; class PathResolver {
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/doc/SmartQuotedExtension.java b/gitiles-servlet/src/main/java/com/google/gitiles/doc/SmartQuotedExtension.java index 4f06f3d..7df0c13 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/doc/SmartQuotedExtension.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/doc/SmartQuotedExtension.java
@@ -18,7 +18,6 @@ import static com.google.gitiles.doc.SmartQuoted.Type.SINGLE; import com.google.gitiles.doc.SmartQuoted.Type; - import org.commonmark.Extension; import org.commonmark.node.Node; import org.commonmark.node.Text;
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/doc/TocFormatter.java b/gitiles-servlet/src/main/java/com/google/gitiles/doc/TocFormatter.java index 9c415a8..1cbc374 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/doc/TocFormatter.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/doc/TocFormatter.java
@@ -19,17 +19,15 @@ import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import com.google.gitiles.doc.html.HtmlBuilder; - -import org.apache.commons.lang3.StringUtils; -import org.commonmark.node.Heading; -import org.commonmark.node.Node; - import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Collection; import java.util.Deque; import java.util.List; import java.util.Map; +import org.apache.commons.lang3.StringUtils; +import org.commonmark.node.Heading; +import org.commonmark.node.Node; /** Outputs outline from HeaderNodes in the AST. */ class TocFormatter {
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/doc/html/HtmlBuilder.java b/gitiles-servlet/src/main/java/com/google/gitiles/doc/html/HtmlBuilder.java index 3239fe1..26c48e2 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/doc/html/HtmlBuilder.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/doc/html/HtmlBuilder.java
@@ -25,7 +25,6 @@ import com.google.template.soy.shared.restricted.EscapingConventions.EscapeHtml; import com.google.template.soy.shared.restricted.EscapingConventions.FilterImageDataUri; import com.google.template.soy.shared.restricted.EscapingConventions.FilterNormalizeUri; - import java.io.IOException; import java.util.regex.Pattern;
diff --git a/gitiles-servlet/src/test/java/com/google/gitiles/ConfigUtilTest.java b/gitiles-servlet/src/test/java/com/google/gitiles/ConfigUtilTest.java index 255d7b8..0002ed1 100644 --- a/gitiles-servlet/src/test/java/com/google/gitiles/ConfigUtilTest.java +++ b/gitiles-servlet/src/test/java/com/google/gitiles/ConfigUtilTest.java
@@ -14,7 +14,6 @@ package com.google.gitiles; -import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.truth.Truth.assertThat; import static com.google.gitiles.ConfigUtil.getDuration; import static org.junit.Assert.fail;
diff --git a/gitiles-servlet/src/test/java/com/google/gitiles/DateFormatterTest.java b/gitiles-servlet/src/test/java/com/google/gitiles/DateFormatterTest.java index f2adff3..760ccb9 100644 --- a/gitiles-servlet/src/test/java/com/google/gitiles/DateFormatterTest.java +++ b/gitiles-servlet/src/test/java/com/google/gitiles/DateFormatterTest.java
@@ -20,17 +20,15 @@ import static java.util.TimeZone.getTimeZone; import com.google.common.base.Optional; - +import java.text.ParseException; +import java.util.Date; +import java.util.TimeZone; import org.eclipse.jgit.lib.PersonIdent; import org.eclipse.jgit.util.GitDateParser; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.text.ParseException; -import java.util.Date; -import java.util.TimeZone; - @RunWith(JUnit4.class) public class DateFormatterTest { @Test
diff --git a/gitiles-servlet/src/test/java/com/google/gitiles/DiffServletTest.java b/gitiles-servlet/src/test/java/com/google/gitiles/DiffServletTest.java index 620d80a..b89e446 100644 --- a/gitiles-servlet/src/test/java/com/google/gitiles/DiffServletTest.java +++ b/gitiles-servlet/src/test/java/com/google/gitiles/DiffServletTest.java
@@ -20,7 +20,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.io.BaseEncoding; - import org.eclipse.jgit.diff.DiffEntry; import org.eclipse.jgit.diff.DiffEntry.ChangeType; import org.eclipse.jgit.diff.DiffEntry.Side;
diff --git a/gitiles-servlet/src/test/java/com/google/gitiles/FakeHttpServletRequest.java b/gitiles-servlet/src/test/java/com/google/gitiles/FakeHttpServletRequest.java index b158432..f113d94 100644 --- a/gitiles-servlet/src/test/java/com/google/gitiles/FakeHttpServletRequest.java +++ b/gitiles-servlet/src/test/java/com/google/gitiles/FakeHttpServletRequest.java
@@ -25,10 +25,6 @@ import com.google.common.collect.LinkedListMultimap; import com.google.common.collect.ListMultimap; import com.google.common.collect.Maps; - -import org.eclipse.jgit.http.server.ServletUtils; -import org.eclipse.jgit.internal.storage.dfs.DfsRepository; - import java.io.BufferedReader; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; @@ -39,12 +35,13 @@ import java.util.List; import java.util.Locale; import java.util.Map; - import javax.servlet.RequestDispatcher; import javax.servlet.ServletInputStream; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; +import org.eclipse.jgit.http.server.ServletUtils; +import org.eclipse.jgit.internal.storage.dfs.DfsRepository; /** Simple fake implementation of {@link HttpServletRequest}. */ public class FakeHttpServletRequest implements HttpServletRequest {
diff --git a/gitiles-servlet/src/test/java/com/google/gitiles/FakeHttpServletResponse.java b/gitiles-servlet/src/test/java/com/google/gitiles/FakeHttpServletResponse.java index 4f50568..544c075 100644 --- a/gitiles-servlet/src/test/java/com/google/gitiles/FakeHttpServletResponse.java +++ b/gitiles-servlet/src/test/java/com/google/gitiles/FakeHttpServletResponse.java
@@ -23,18 +23,15 @@ import com.google.common.collect.LinkedListMultimap; import com.google.common.collect.ListMultimap; import com.google.common.net.HttpHeaders; - -import org.eclipse.jgit.util.RawParseUtils; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.PrintWriter; import java.nio.charset.Charset; import java.util.Locale; - import javax.servlet.ServletOutputStream; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletResponse; +import org.eclipse.jgit.util.RawParseUtils; /** Simple fake implementation of {@link HttpServletResponse}. */ public class FakeHttpServletResponse implements HttpServletResponse {
diff --git a/gitiles-servlet/src/test/java/com/google/gitiles/GitilesFilterTest.java b/gitiles-servlet/src/test/java/com/google/gitiles/GitilesFilterTest.java index 4b10ca7..f8d8640 100644 --- a/gitiles-servlet/src/test/java/com/google/gitiles/GitilesFilterTest.java +++ b/gitiles-servlet/src/test/java/com/google/gitiles/GitilesFilterTest.java
@@ -19,12 +19,11 @@ import static com.google.gitiles.GitilesFilter.REPO_REGEX; import static com.google.gitiles.GitilesFilter.ROOT_REGEX; +import java.util.regex.Matcher; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.util.regex.Matcher; - /** Tests for the Gitiles filter. */ @RunWith(JUnit4.class) public class GitilesFilterTest {
diff --git a/gitiles-servlet/src/test/java/com/google/gitiles/GitilesViewTest.java b/gitiles-servlet/src/test/java/com/google/gitiles/GitilesViewTest.java index 59659a2..7cce3ef 100644 --- a/gitiles-servlet/src/test/java/com/google/gitiles/GitilesViewTest.java +++ b/gitiles-servlet/src/test/java/com/google/gitiles/GitilesViewTest.java
@@ -20,7 +20,6 @@ import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ImmutableMap; import com.google.gitiles.GitilesView.Type; - import org.eclipse.jgit.lib.ObjectId; import org.junit.Test; import org.junit.runner.RunWith;
diff --git a/gitiles-servlet/src/test/java/com/google/gitiles/GitwebRedirectFilterTest.java b/gitiles-servlet/src/test/java/com/google/gitiles/GitwebRedirectFilterTest.java index 0a502b0..779e816 100644 --- a/gitiles-servlet/src/test/java/com/google/gitiles/GitwebRedirectFilterTest.java +++ b/gitiles-servlet/src/test/java/com/google/gitiles/GitwebRedirectFilterTest.java
@@ -21,7 +21,7 @@ import static javax.servlet.http.HttpServletResponse.SC_MOVED_PERMANENTLY; import com.google.common.net.HttpHeaders; - +import javax.servlet.http.HttpServletRequest; import org.eclipse.jgit.internal.storage.dfs.DfsRepository; import org.eclipse.jgit.internal.storage.dfs.DfsRepositoryDescription; import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository; @@ -33,8 +33,6 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import javax.servlet.http.HttpServletRequest; - /** Tests for gitweb redirector. */ @RunWith(JUnit4.class) public class GitwebRedirectFilterTest {
diff --git a/gitiles-servlet/src/test/java/com/google/gitiles/HostIndexServletTest.java b/gitiles-servlet/src/test/java/com/google/gitiles/HostIndexServletTest.java index 07b8585..1e1e01f 100644 --- a/gitiles-servlet/src/test/java/com/google/gitiles/HostIndexServletTest.java +++ b/gitiles-servlet/src/test/java/com/google/gitiles/HostIndexServletTest.java
@@ -22,7 +22,8 @@ import com.google.template.soy.data.SoyListData; import com.google.template.soy.data.SoyMapData; import com.google.template.soy.data.restricted.NullData; - +import java.util.Map; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jgit.internal.storage.dfs.DfsRepository; import org.eclipse.jgit.internal.storage.dfs.DfsRepositoryDescription; import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository; @@ -32,10 +33,6 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.util.Map; - -import javax.servlet.http.HttpServletResponse; - /** Tests for {@link HostIndexServlet}. */ @RunWith(JUnit4.class) public class HostIndexServletTest extends ServletTest {
diff --git a/gitiles-servlet/src/test/java/com/google/gitiles/LinkifierTest.java b/gitiles-servlet/src/test/java/com/google/gitiles/LinkifierTest.java index f6b16d9..37ff436 100644 --- a/gitiles-servlet/src/test/java/com/google/gitiles/LinkifierTest.java +++ b/gitiles-servlet/src/test/java/com/google/gitiles/LinkifierTest.java
@@ -17,14 +17,12 @@ import static com.google.common.truth.Truth.assertThat; import com.google.common.collect.ImmutableMap; - +import javax.servlet.http.HttpServletRequest; import org.eclipse.jgit.lib.Config; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import javax.servlet.http.HttpServletRequest; - /** Tests for {@link Linkifier}. */ @RunWith(JUnit4.class) public class LinkifierTest {
diff --git a/gitiles-servlet/src/test/java/com/google/gitiles/LogServletTest.java b/gitiles-servlet/src/test/java/com/google/gitiles/LogServletTest.java index 5d1d1f6..06ddaf4 100644 --- a/gitiles-servlet/src/test/java/com/google/gitiles/LogServletTest.java +++ b/gitiles-servlet/src/test/java/com/google/gitiles/LogServletTest.java
@@ -20,14 +20,12 @@ import com.google.gitiles.CommitJsonData.Log; import com.google.gitiles.DateFormatter.Format; import com.google.gson.reflect.TypeToken; - +import java.util.ArrayList; import org.eclipse.jgit.revwalk.RevCommit; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.util.ArrayList; - /** Tests for {@link LogServlet}. */ @RunWith(JUnit4.class) public class LogServletTest extends ServletTest {
diff --git a/gitiles-servlet/src/test/java/com/google/gitiles/PaginatorTest.java b/gitiles-servlet/src/test/java/com/google/gitiles/PaginatorTest.java index 3328b4c..a174625 100644 --- a/gitiles-servlet/src/test/java/com/google/gitiles/PaginatorTest.java +++ b/gitiles-servlet/src/test/java/com/google/gitiles/PaginatorTest.java
@@ -18,7 +18,7 @@ import static com.google.common.truth.Truth.assertThat; import com.google.common.collect.Lists; - +import java.util.List; import org.eclipse.jgit.internal.storage.dfs.DfsRepository; import org.eclipse.jgit.internal.storage.dfs.DfsRepositoryDescription; import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository; @@ -31,8 +31,6 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.util.List; - /** Unit tests for {@link LogServlet}. */ @RunWith(JUnit4.class) public class PaginatorTest {
diff --git a/gitiles-servlet/src/test/java/com/google/gitiles/PathServletTest.java b/gitiles-servlet/src/test/java/com/google/gitiles/PathServletTest.java index 696b446..b492ed3 100644 --- a/gitiles-servlet/src/test/java/com/google/gitiles/PathServletTest.java +++ b/gitiles-servlet/src/test/java/com/google/gitiles/PathServletTest.java
@@ -21,7 +21,8 @@ import com.google.gitiles.TreeJsonData.Tree; import com.google.template.soy.data.SoyListData; import com.google.template.soy.data.restricted.StringData; - +import java.util.List; +import java.util.Map; import org.eclipse.jgit.dircache.DirCacheEditor.PathEdit; import org.eclipse.jgit.dircache.DirCacheEntry; import org.eclipse.jgit.lib.FileMode; @@ -33,9 +34,6 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.util.List; -import java.util.Map; - /** Tests for {@PathServlet}. */ @SuppressWarnings("unchecked") @RunWith(JUnit4.class)
diff --git a/gitiles-servlet/src/test/java/com/google/gitiles/RefServletTest.java b/gitiles-servlet/src/test/java/com/google/gitiles/RefServletTest.java index 962b037..8dff6b3 100644 --- a/gitiles-servlet/src/test/java/com/google/gitiles/RefServletTest.java +++ b/gitiles-servlet/src/test/java/com/google/gitiles/RefServletTest.java
@@ -21,7 +21,10 @@ import com.google.common.collect.ImmutableMap; import com.google.gitiles.RefServlet.RefJsonData; import com.google.gson.reflect.TypeToken; - +import java.io.IOException; +import java.util.List; +import java.util.Map; +import javax.servlet.http.HttpServletRequest; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; @@ -31,12 +34,6 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.io.IOException; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - /** Tests for {@link RefServlet}. */ @RunWith(JUnit4.class) public class RefServletTest extends ServletTest {
diff --git a/gitiles-servlet/src/test/java/com/google/gitiles/RevisionParserTest.java b/gitiles-servlet/src/test/java/com/google/gitiles/RevisionParserTest.java index 85311a8..43047ed 100644 --- a/gitiles-servlet/src/test/java/com/google/gitiles/RevisionParserTest.java +++ b/gitiles-servlet/src/test/java/com/google/gitiles/RevisionParserTest.java
@@ -21,7 +21,6 @@ import com.google.common.cache.CacheBuilder; import com.google.gitiles.RevisionParser.Result; - import org.eclipse.jgit.internal.storage.dfs.DfsRepository; import org.eclipse.jgit.internal.storage.dfs.DfsRepositoryDescription; import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository;
diff --git a/gitiles-servlet/src/test/java/com/google/gitiles/ServletTest.java b/gitiles-servlet/src/test/java/com/google/gitiles/ServletTest.java index fdf2eec..24c551c 100644 --- a/gitiles-servlet/src/test/java/com/google/gitiles/ServletTest.java +++ b/gitiles-servlet/src/test/java/com/google/gitiles/ServletTest.java
@@ -26,7 +26,8 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; - +import java.util.Map; +import java.util.TimeZone; import org.eclipse.jgit.internal.storage.dfs.DfsRepository; import org.eclipse.jgit.internal.storage.dfs.DfsRepositoryDescription; import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository; @@ -38,9 +39,6 @@ import org.junit.After; import org.junit.Before; -import java.util.Map; -import java.util.TimeZone; - /** Base class for servlet tests. */ public class ServletTest { protected TestRepository<DfsRepository> repo;
diff --git a/gitiles-servlet/src/test/java/com/google/gitiles/TestGitilesAccess.java b/gitiles-servlet/src/test/java/com/google/gitiles/TestGitilesAccess.java index 50c91a5..3571270 100644 --- a/gitiles-servlet/src/test/java/com/google/gitiles/TestGitilesAccess.java +++ b/gitiles-servlet/src/test/java/com/google/gitiles/TestGitilesAccess.java
@@ -18,15 +18,12 @@ import com.google.common.base.CharMatcher; import com.google.common.collect.ImmutableMap; - -import org.eclipse.jgit.internal.storage.dfs.DfsRepository; -import org.eclipse.jgit.lib.Config; - import java.util.Collections; import java.util.Map; import java.util.Set; - import javax.servlet.http.HttpServletRequest; +import org.eclipse.jgit.internal.storage.dfs.DfsRepository; +import org.eclipse.jgit.lib.Config; /** Gitiles access for testing. */ public class TestGitilesAccess implements GitilesAccess.Factory {
diff --git a/gitiles-servlet/src/test/java/com/google/gitiles/TestGitilesServlet.java b/gitiles-servlet/src/test/java/com/google/gitiles/TestGitilesServlet.java index 9b80a56..836116c 100644 --- a/gitiles-servlet/src/test/java/com/google/gitiles/TestGitilesServlet.java +++ b/gitiles-servlet/src/test/java/com/google/gitiles/TestGitilesServlet.java
@@ -15,7 +15,13 @@ package com.google.gitiles; import com.google.common.collect.ImmutableList; - +import java.net.URL; +import java.util.Collections; +import java.util.Enumeration; +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; import org.eclipse.jgit.errors.RepositoryNotFoundException; import org.eclipse.jgit.internal.storage.dfs.DfsRepository; import org.eclipse.jgit.junit.TestRepository; @@ -23,15 +29,6 @@ import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.transport.resolver.RepositoryResolver; -import java.net.URL; -import java.util.Collections; -import java.util.Enumeration; - -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; - /** Static utility methods for creating {@link GitilesServlet}s for testing. */ public class TestGitilesServlet { /** @see #create(TestRepository) */
diff --git a/gitiles-servlet/src/test/java/com/google/gitiles/TestViewFilter.java b/gitiles-servlet/src/test/java/com/google/gitiles/TestViewFilter.java index 9a7f4cb..68acffb 100644 --- a/gitiles-servlet/src/test/java/com/google/gitiles/TestViewFilter.java +++ b/gitiles-servlet/src/test/java/com/google/gitiles/TestViewFilter.java
@@ -21,19 +21,16 @@ import static com.google.gitiles.GitilesFilter.ROOT_REGEX; import com.google.common.collect.ImmutableList; - -import org.eclipse.jgit.http.server.glue.MetaFilter; -import org.eclipse.jgit.http.server.glue.MetaServlet; -import org.eclipse.jgit.internal.storage.dfs.DfsRepository; -import org.eclipse.jgit.junit.TestRepository; - import java.io.IOException; import java.util.regex.Pattern; - import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.eclipse.jgit.http.server.glue.MetaFilter; +import org.eclipse.jgit.http.server.glue.MetaServlet; +import org.eclipse.jgit.internal.storage.dfs.DfsRepository; +import org.eclipse.jgit.junit.TestRepository; /** Run {@link ViewFilter} in a test environment. */ public class TestViewFilter {
diff --git a/gitiles-servlet/src/test/java/com/google/gitiles/TimeCacheTest.java b/gitiles-servlet/src/test/java/com/google/gitiles/TimeCacheTest.java index e34bc88..b5a6561 100644 --- a/gitiles-servlet/src/test/java/com/google/gitiles/TimeCacheTest.java +++ b/gitiles-servlet/src/test/java/com/google/gitiles/TimeCacheTest.java
@@ -16,6 +16,7 @@ import static com.google.common.truth.Truth.assertThat; +import java.io.IOException; import org.eclipse.jgit.internal.storage.dfs.DfsRepository; import org.eclipse.jgit.internal.storage.dfs.DfsRepositoryDescription; import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository; @@ -33,8 +34,6 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.io.IOException; - /** Unit tests for {@link TimeCache}. */ @RunWith(JUnit4.class) public class TimeCacheTest {
diff --git a/gitiles-servlet/src/test/java/com/google/gitiles/TreeSoyDataTest.java b/gitiles-servlet/src/test/java/com/google/gitiles/TreeSoyDataTest.java index 001ef02..98d416a 100644 --- a/gitiles-servlet/src/test/java/com/google/gitiles/TreeSoyDataTest.java +++ b/gitiles-servlet/src/test/java/com/google/gitiles/TreeSoyDataTest.java
@@ -19,7 +19,6 @@ import static com.google.gitiles.TreeSoyData.resolveTargetUrl; import com.google.common.base.Strings; - import org.eclipse.jgit.lib.ObjectId; import org.junit.Test; import org.junit.runner.RunWith;
diff --git a/gitiles-servlet/src/test/java/com/google/gitiles/ViewFilterTest.java b/gitiles-servlet/src/test/java/com/google/gitiles/ViewFilterTest.java index 32cb7ca..9981a2d 100644 --- a/gitiles-servlet/src/test/java/com/google/gitiles/ViewFilterTest.java +++ b/gitiles-servlet/src/test/java/com/google/gitiles/ViewFilterTest.java
@@ -19,7 +19,8 @@ import com.google.common.net.HttpHeaders; import com.google.gitiles.GitilesView.Type; - +import java.io.IOException; +import javax.servlet.ServletException; import org.eclipse.jgit.internal.storage.dfs.DfsRepository; import org.eclipse.jgit.internal.storage.dfs.DfsRepositoryDescription; import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository; @@ -30,10 +31,6 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.io.IOException; - -import javax.servlet.ServletException; - /** Tests for the view filter. */ @RunWith(JUnit4.class) public class ViewFilterTest {
diff --git a/gitiles-servlet/src/test/java/com/google/gitiles/blame/BlameServletTest.java b/gitiles-servlet/src/test/java/com/google/gitiles/blame/BlameServletTest.java index 265866b..d05b082 100644 --- a/gitiles-servlet/src/test/java/com/google/gitiles/blame/BlameServletTest.java +++ b/gitiles-servlet/src/test/java/com/google/gitiles/blame/BlameServletTest.java
@@ -20,15 +20,13 @@ import com.google.gitiles.CommitJsonData.Ident; import com.google.gitiles.ServletTest; import com.google.gson.reflect.TypeToken; - +import java.util.List; +import java.util.Map; import org.eclipse.jgit.revwalk.RevCommit; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.util.List; -import java.util.Map; - @RunWith(JUnit4.class) public class BlameServletTest extends ServletTest { private static final String NAME = "J. Author";
diff --git a/gitiles-servlet/src/test/java/com/google/gitiles/doc/DocServletTest.java b/gitiles-servlet/src/test/java/com/google/gitiles/doc/DocServletTest.java index f9aaf75..2404090 100644 --- a/gitiles-servlet/src/test/java/com/google/gitiles/doc/DocServletTest.java +++ b/gitiles-servlet/src/test/java/com/google/gitiles/doc/DocServletTest.java
@@ -17,7 +17,6 @@ import static com.google.common.truth.Truth.assertThat; import com.google.gitiles.ServletTest; - import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4;
diff --git a/gitiles-servlet/src/test/java/com/google/gitiles/doc/LinkTest.java b/gitiles-servlet/src/test/java/com/google/gitiles/doc/LinkTest.java index 30dd897..782a603 100644 --- a/gitiles-servlet/src/test/java/com/google/gitiles/doc/LinkTest.java +++ b/gitiles-servlet/src/test/java/com/google/gitiles/doc/LinkTest.java
@@ -19,7 +19,6 @@ import com.google.common.base.CharMatcher; import com.google.gitiles.GitilesView; import com.google.gitiles.RootedDocServlet; - import org.eclipse.jgit.lib.Config; import org.junit.Before; import org.junit.Test;