Run google-java-format on all Guice code.

configure a presubmit to ensure that it stays formatted.

Highlights include:
* simplified import order
* method annotations are now consistently defined on the preceding line
* javadoc reformatted to 100 chars column width

One test that contained line numbers in error messages had to be modified and
the formatter didn't like some of the more complicated preprocessor directives
(MOE and AOP).

To avoid formatting the copyright notices as javadoc i did a preprocessing step to rewrite the initial '/**' to '/*' using perl

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=132688230

Author: lukesandberg

extensions/servlet/test/com/google/inject/servlet/AllTests.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (C) 2008 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,9 +19,7 @@
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-/**
- * @author [email protected] (Dhanji R. Prasanna)
- */
+/** @author [email protected] (Dhanji R. Prasanna) */
 public class AllTests {
 
   public static Test suite() {

extensions/servlet/test/com/google/inject/servlet/ContextPathTest.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (C) 2011 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,13 +26,7 @@
 import com.google.inject.Scopes;
 import com.google.inject.name.Named;
 import com.google.inject.name.Names;
-
-import junit.framework.TestCase;
-
-import org.easymock.IMocksControl;
-
 import java.io.IOException;
-
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletContext;
@@ -42,14 +36,18 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import junit.framework.TestCase;
+import org.easymock.IMocksControl;
 
 /** Tests to make sure that servlets with a context path are handled right. */
 public class ContextPathTest extends TestCase {
 
-  @Inject @Named("foo")
+  @Inject
+  @Named("foo")
   private TestServlet fooServlet;
 
-  @Inject @Named("bar") 
+  @Inject
+  @Named("bar")
   private TestServlet barServlet;
 
   private IMocksControl globalControl;
@@ -60,18 +58,24 @@ public class ContextPathTest extends TestCase {
 
   @Override
   public final void setUp() throws Exception {
-    injector = Guice.createInjector(new ServletModule() {
-      @Override
-      protected void configureServlets() {
-        bind(TestServlet.class).annotatedWith(Names.named("foo"))
-            .to(TestServlet.class).in(Scopes.SINGLETON);
-        bind(TestServlet.class).annotatedWith(Names.named("bar"))
-            .to(TestServlet.class).in(Scopes.SINGLETON);
-        serve("/foo/*").with(Key.get(TestServlet.class, Names.named("foo")));
-        serve("/bar/*").with(Key.get(TestServlet.class, Names.named("bar")));
-        // TODO: add a filter(..) call and validate it is correct
-      }
-    });
+    injector =
+        Guice.createInjector(
+            new ServletModule() {
+              @Override
+              protected void configureServlets() {
+                bind(TestServlet.class)
+                    .annotatedWith(Names.named("foo"))
+                    .to(TestServlet.class)
+                    .in(Scopes.SINGLETON);
+                bind(TestServlet.class)
+                    .annotatedWith(Names.named("bar"))
+                    .to(TestServlet.class)
+                    .in(Scopes.SINGLETON);
+                serve("/foo/*").with(Key.get(TestServlet.class, Names.named("foo")));
+                serve("/bar/*").with(Key.get(TestServlet.class, Names.named("bar")));
+                // TODO: add a filter(..) call and validate it is correct
+              }
+            });
     injector.injectMembers(this);
 
     assertNotNull(fooServlet);
@@ -83,7 +87,8 @@ protected void configureServlets() {
     filterConfig = globalControl.createMock(FilterConfig.class);
 
     expect(servletContext.getAttribute(GuiceServletContextListener.INJECTOR_NAME))
-        .andReturn(injector).anyTimes();
+        .andReturn(injector)
+        .anyTimes();
     expect(filterConfig.getServletContext()).andReturn(servletContext).anyTimes();
 
     globalControl.replay();
@@ -229,8 +234,13 @@ public void testWebtestSpecific() throws Exception {
     runTest("/webtest/xxx", "/xxx", "/webtest", true, false, false);
   }
 
-  private void runTest(final String requestURI, final String servletPath, final String contextPath,
-      final boolean filterResult, final boolean fooResult, final boolean barResult)
+  private void runTest(
+      final String requestURI,
+      final String servletPath,
+      final String contextPath,
+      final boolean filterResult,
+      final boolean fooResult,
+      final boolean barResult)
       throws Exception {
     IMocksControl testControl = createControl();
 

extensions/servlet/test/com/google/inject/servlet/ContinuingHttpServletRequestTest.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (C) 2013 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,16 +15,15 @@
  */
 package com.google.inject.servlet;
 
-import junit.framework.AssertionFailedError;
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 
-import junit.framework.TestCase;
-
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
+import junit.framework.AssertionFailedError;
+import junit.framework.TestCase;
 
 public class ContinuingHttpServletRequestTest extends TestCase {
 
@@ -42,19 +41,16 @@ public void testReturnNullCookiesIfDelegateHasNoNull() {
 
     verify(delegate);
   }
-  
+
   public void testReturnDelegateCookies() {
-    Cookie[] cookies = new Cookie[]{
-        new Cookie("testName1", TEST_VALUE_1),
-        new Cookie("testName2", "testValue2")
-    };
+    Cookie[] cookies =
+        new Cookie[] {new Cookie("testName1", TEST_VALUE_1), new Cookie("testName2", "testValue2")};
     HttpServletRequest delegate = createMock(HttpServletRequest.class);
     expect(delegate.getCookies()).andStubReturn(cookies);
 
     replay(delegate);
 
-    ContinuingHttpServletRequest continuingRequest = new ContinuingHttpServletRequest(
-        delegate);
+    ContinuingHttpServletRequest continuingRequest = new ContinuingHttpServletRequest(delegate);
 
     assertCookieArraysEqual(cookies, continuingRequest.getCookies());
 
@@ -76,8 +72,8 @@ public void testReturnDelegateCookies() {
     assertEquals(DEFAULT_MAX_AGE, continuingRequest.getCookies()[1].getMaxAge());
 
     // Perform a snapshot of the snapshot.
-    ContinuingHttpServletRequest furtherContinuingRequest = new ContinuingHttpServletRequest(
-        continuingRequest);
+    ContinuingHttpServletRequest furtherContinuingRequest =
+        new ContinuingHttpServletRequest(continuingRequest);
 
     // The cookies should be fixed.
     assertCookieArraysEqual(continuingRequest.getCookies(), furtherContinuingRequest.getCookies());

extensions/servlet/test/com/google/inject/servlet/ContinuingRequestIntegrationTest.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (C) 2010 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,6 @@
 
 package com.google.inject.servlet;
 
-import javax.servlet.http.Cookie;
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.replay;
@@ -30,9 +29,6 @@
 import com.google.inject.Key;
 import com.google.inject.Provider;
 import com.google.inject.Singleton;
-
-import junit.framework.TestCase;
-
 import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.AbstractExecutorService;
@@ -42,18 +38,17 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
-
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
+import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import junit.framework.TestCase;
 
-/**
- * Tests continuation of requests
- */
+/** Tests continuation of requests */
 
 public class ContinuingRequestIntegrationTest extends TestCase {
   private static final String PARAM_VALUE = "there";
@@ -108,21 +103,25 @@ public <T> Future<T> submit(Callable<T> task) {
   private ExecutorService executor;
   private Injector injector;
 
-  @Override protected void tearDown() throws Exception {
+  @Override
+  protected void tearDown() throws Exception {
     injector.getInstance(GuiceFilter.class).destroy();
   }
 
   public final void testRequestContinuesInOtherThread()
       throws ServletException, IOException, InterruptedException {
     executor = Executors.newSingleThreadExecutor();
 
-    injector = Guice.createInjector(new ServletModule() {
-      @Override protected void configureServlets() {
-        serve("/*").with(ContinuingServlet.class);
+    injector =
+        Guice.createInjector(
+            new ServletModule() {
+              @Override
+              protected void configureServlets() {
+                serve("/*").with(ContinuingServlet.class);
 
-        bind(ExecutorService.class).toInstance(executor);
-      }
-    });
+                bind(ExecutorService.class).toInstance(executor);
+              }
+            });
 
     FilterConfig filterConfig = createMock(FilterConfig.class);
     expect(filterConfig.getServletContext()).andReturn(createMock(ServletContext.class));
@@ -132,9 +131,7 @@ public final void testRequestContinuesInOtherThread()
     HttpServletRequest request = createMock(HttpServletRequest.class);
 
     expect(request.getRequestURI()).andReturn("/");
-    expect(request.getContextPath())
-        .andReturn("")
-        .anyTimes();
+    expect(request.getContextPath()).andReturn("").anyTimes();
     expect(request.getMethod()).andReturn("GET");
     expect(request.getCookies()).andReturn(new Cookie[0]);
 
@@ -157,15 +154,18 @@ public final void testRequestContinuesInOtherThread()
   public final void testRequestContinuationDiesInHttpRequestThread()
       throws ServletException, IOException, InterruptedException {
     executor = sameThreadExecutor;
-    injector = Guice.createInjector(new ServletModule() {
-      @Override protected void configureServlets() {
-        serve("/*").with(ContinuingServlet.class);
+    injector =
+        Guice.createInjector(
+            new ServletModule() {
+              @Override
+              protected void configureServlets() {
+                serve("/*").with(ContinuingServlet.class);
 
-        bind(ExecutorService.class).toInstance(executor);
+                bind(ExecutorService.class).toInstance(executor);
 
-        bind(SomeObject.class);
-      }
-    });
+                bind(SomeObject.class);
+              }
+            });
 
     FilterConfig filterConfig = createMock(FilterConfig.class);
     expect(filterConfig.getServletContext()).andReturn(createMock(ServletContext.class));
@@ -175,9 +175,7 @@ public final void testRequestContinuationDiesInHttpRequestThread()
     HttpServletRequest request = createMock(HttpServletRequest.class);
 
     expect(request.getRequestURI()).andReturn("/");
-    expect(request.getContextPath())
-        .andReturn("")
-        .anyTimes();
+    expect(request.getContextPath()).andReturn("").anyTimes();
 
     expect(request.getMethod()).andReturn("GET");
     expect(request.getCookies()).andReturn(new Cookie[0]);
@@ -199,8 +197,7 @@ public final void testRequestContinuationDiesInHttpRequestThread()
   }
 
   @RequestScoped
-  public static class SomeObject {
-  }
+  public static class SomeObject {}
 
   @Singleton
   public static class ContinuingServlet extends HttpServlet {
@@ -209,14 +206,16 @@ public static class ContinuingServlet extends HttpServlet {
 
     private SomeObject someObject;
 
-    @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp)
         throws ServletException, IOException {
       assertNull(someObject);
 
       // Seed with someobject.
       someObject = new SomeObject();
-      Callable<String> task = ServletScopes.continueRequest(callable,
-          ImmutableMap.<Key<?>, Object>of(Key.get(SomeObject.class), someObject));
+      Callable<String> task =
+          ServletScopes.continueRequest(
+              callable, ImmutableMap.<Key<?>, Object>of(Key.get(SomeObject.class), someObject));
 
       executorService.submit(task);
     }

extensions/servlet/test/com/google/inject/servlet/DummyFilterImpl.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (C) 2008 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,7 +17,6 @@
 package com.google.inject.servlet;
 
 import java.io.IOException;
-
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
@@ -33,8 +32,7 @@
 public class DummyFilterImpl implements Filter {
   int num;
 
-  public DummyFilterImpl() {
-  }
+  public DummyFilterImpl() {}
 
   public DummyFilterImpl(int num) {
     this.num = num;

extensions/servlet/test/com/google/inject/servlet/DummyServlet.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (C) 2008 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,6 @@
 package com.google.inject.servlet;
 
 import com.google.inject.Singleton;
-
 import javax.servlet.http.HttpServlet;
 
 /**
@@ -25,6 +24,4 @@
  * @author Dhanji R. Prasanna (dhanji@gmail com)
  */
 @Singleton
-public class DummyServlet extends HttpServlet {
-
-}
+public class DummyServlet extends HttpServlet {}