GitilesFilter: allow injecting custom BlameCache Change-Id: I3e12e624120de452bbc1ff7598836a5ddf1cd949
diff --git a/gitiles-dev/src/main/java/com/google/gitiles/dev/DevServer.java b/gitiles-dev/src/main/java/com/google/gitiles/dev/DevServer.java index 4f23595..273873d 100644 --- a/gitiles-dev/src/main/java/com/google/gitiles/dev/DevServer.java +++ b/gitiles-dev/src/main/java/com/google/gitiles/dev/DevServer.java
@@ -191,7 +191,7 @@ new File(sourceRoot, "gitiles-servlet/src/main/resources/com/google/gitiles/templates") .getPath(), Objects.firstNonNull(cfg.getString("gitiles", null, "siteTitle"), "Gitiles")), - null, null, null, null, null, null); + null, null, null, null, null, null, null); ServletContextHandler handler = new ServletContextHandler(); handler.setContextPath("");
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 ca17e33..1bdcc0b 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/GitilesFilter.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/GitilesFilter.java
@@ -177,6 +177,7 @@ final RepositoryResolver<HttpServletRequest> resolver, VisibilityCache visibilityCache, TimeCache timeCache, + BlameCache blameCache, GitwebRedirectFilter gitwebRedirect) { this.config = checkNotNull(config, "config"); this.renderer = renderer; @@ -184,6 +185,7 @@ this.accessFactory = accessFactory; this.visibilityCache = visibilityCache; this.timeCache = timeCache; + this.blameCache = blameCache; this.gitwebRedirect = gitwebRedirect; if (resolver != null) { this.resolver = wrapResolver(resolver);
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 d015f7a..cc49466 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/GitilesServlet.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/GitilesServlet.java
@@ -52,9 +52,10 @@ @Nullable RepositoryResolver<HttpServletRequest> resolver, @Nullable VisibilityCache visibilityCache, @Nullable TimeCache timeCache, + @Nullable BlameCache blameCache, @Nullable GitwebRedirectFilter gitwebRedirect) { super(new GitilesFilter( - config, renderer, urls, accessFactory, resolver, visibilityCache, timeCache, + config, renderer, urls, accessFactory, resolver, visibilityCache, timeCache, blameCache, gitwebRedirect)); }
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 e7079d3..84ddd64 100644 --- a/gitiles-servlet/src/test/java/com/google/gitiles/TestGitilesServlet.java +++ b/gitiles-servlet/src/test/java/com/google/gitiles/TestGitilesServlet.java
@@ -69,7 +69,7 @@ } return repo.getRepository(); } - }, null, null, gitwebRedirect); + }, null, null, null, gitwebRedirect); servlet.init(new ServletConfig() { @Override