[google-guice] r1569 committed - ...

google-guice Wed, 29 Jun 2011 15:08:37 -0700

Revision: 1569
Author:   sberlin
Date:     Wed Jun 29 15:04:31 2011
Log:
Restore usernames


Revision created by MOE tool push_codebase.
MOE_MIGRATION=2449

http://code.google.com/p/google-guice/source/detail?r=1569

Modified:
 /trunk/core/src/com/google/inject/internal/AbstractBindingProcessor.java

/trunk/core/src/com/google/inject/internal/InternalFactoryToProviderAdapter.java/trunk/core/src/com/google/inject/internal/ProvisionListenerStackCallback.java

 /trunk/core/test/com/google/inject/TypeLiteralTypeResolutionTest.java
 /trunk/core/test/com/googlecode/guice/BytecodeGenTest.java

/trunk/extensions/grapher/src/com/google/inject/grapher/GraphingVisitor.java/trunk/extensions/grapher/src/com/google/inject/grapher/TransitiveDependencyVisitor.java/trunk/extensions/grapher/src/com/google/inject/grapher/graphviz/InterfaceNodeFactory.java/trunk/extensions/grapher/test/com/google/inject/grapher/demo/InjectorGrapherDemo.java

 /trunk/extensions/persist/src/com/google/inject/persist/PersistService.java

/trunk/extensions/persist/src/com/google/inject/persist/jpa/JpaFinderProxy.java/trunk/extensions/persist/src/com/google/inject/persist/jpa/JpaLocalTxnInterceptor.java/trunk/extensions/persist/src/com/google/inject/persist/jpa/JpaPersistModule.java/trunk/extensions/servlet/src/com/google/inject/servlet/ContinuingHttpServletRequest.java/trunk/extensions/servlet/src/com/google/inject/servlet/GuiceServletContextListener.java/trunk/extensions/servlet/src/com/google/inject/servlet/InternalServletModule.java/trunk/extensions/servlet/src/com/google/inject/servlet/ManagedServletPipeline.java/trunk/extensions/servlet/src/com/google/inject/servlet/ServletDefinition.java

 /trunk/extensions/servlet/src/com/google/inject/servlet/ServletScopes.java

/trunk/extensions/servlet/src/com/google/inject/servlet/UriPatternMatcher.java


=======================================

---/trunk/core/src/com/google/inject/internal/AbstractBindingProcessor.javaWed Jun 29 15:02:50 2011+++/trunk/core/src/com/google/inject/internal/AbstractBindingProcessor.javaWed Jun 29 15:04:31 2011

@@ -33,7 +33,7 @@

 /**
  * Guarantees that processing of Binding elements happens in a sane way.
- *
+ *
  * @author sa...@google.com (Sam Berlin)
  */
 abstract class AbstractBindingProcessor extends AbstractProcessor {
@@ -52,10 +52,10 @@
       Provider.class,
       Scope.class,
       TypeLiteral.class);
-  // TODO(user): fix BuiltInModule, then add Stage
-
+  // TODO(jessewilson): fix BuiltInModule, then add Stage
+
   protected final ProcessedBindingData bindingData;
-
+

AbstractBindingProcessor(Errors errors, ProcessedBindingDatabindingData) {

     super(errors);
     this.bindingData = bindingData;
@@ -65,7 +65,7 @@
       InjectorImpl injector, Key<T> key, Object source) {
     return new UntargettedBindingImpl<T>(injector, key, source);
   }
-
+
   protected void putBinding(BindingImpl<?> binding) {
     Key<?> key = binding.getKey();

@@ -124,13 +124,13 @@
       }
     }
   }
-
+
   private <T> void validateKey(Object source, Key<T> key) {
     Annotations.checkForMisplacedScopeAnnotations(
         key.getTypeLiteral().getRawType(), source, errors);
   }
-
-  /**
+
+  /**
    * Processor for visiting bindings.  Each overriden method that wants to
    * actually process the binding should call prepareBinding first.
    */
@@ -139,15 +139,15 @@
     final Key<T> key;
     final Class<? super T> rawType;
     Scoping scoping;
-
+
     Processor(BindingImpl<T> binding) {
       source = binding.getSource();
       key = binding.getKey();
       rawType = key.getTypeLiteral().getRawType();
       scoping = binding.getScoping();
     }
-
-    protected void prepareBinding() {
+
+    protected void prepareBinding() {
       validateKey(source, key);
       scoping = Scoping.makeInjectable(scoping, injector, errors);
     }
=======================================

---/trunk/core/src/com/google/inject/internal/InternalFactoryToProviderAdapter.javaWed Jun 29 15:02:50 2011+++/trunk/core/src/com/google/inject/internal/InternalFactoryToProviderAdapter.javaWed Jun 29 15:04:31 2011

@@ -35,7 +35,7 @@

public T get(Errors errors, InternalContext context, Dependency<?>dependency, boolean linked)

       throws ErrorsException {
-    // TODO(user): Does this need to push state into the context?
+    // TODO(sameb): Does this need to push state into the context?
     try {
       return errors.checkForNull(provider.get(), source, dependency);
     } catch (RuntimeException userException) {
=======================================

---/trunk/core/src/com/google/inject/internal/ProvisionListenerStackCallback.javaWed Jun 29 15:02:50 2011+++/trunk/core/src/com/google/inject/internal/ProvisionListenerStackCallback.javaWed Jun 29 15:04:31 2011

@@ -30,7 +30,7 @@
  */
 final class ProvisionListenerStackCallback<T> {

- private static final ProvisionListener EMPTY_LISTENER[] = newProvisionListener[0];+ private static final ProvisionListener EMPTY_LISTENER[] = newProvisionListener[0];

   private final ProvisionListener[] listeners;
   private final Key<T> key;

@@ -42,7 +42,7 @@

this.listeners = listeners.toArray(newProvisionListener[listeners.size()]);

     }
   }
-
+
   public boolean hasListeners() {
     return listeners.length > 0;
   }
@@ -56,7 +56,7 @@
     } catch(RuntimeException t) {
       caught = t;
     }
-
+
     if (provision.exceptionDuringProvision != null) {
       throw provision.exceptionDuringProvision;
     } else if (caught != null) {
@@ -71,7 +71,7 @@
     }
   }

-  // TODO(user): Can this be more InternalFactory-like?
+  // TODO(sameb): Can this be more InternalFactory-like?
   public interface ProvisionCallback<T> {
     public T call() throws ErrorsException;
   }
@@ -119,12 +119,12 @@
       }
       return result;
     }
-
+
     @Override
     public Key<T> getKey() {
       return key;
     }
-
+
     @Override
     public List<DependencyAndSource> getDependencyChain() {
       return context.getDependencyChain();
=======================================

--- /trunk/core/test/com/google/inject/TypeLiteralTypeResolutionTest.javaWed Jun 29 15:02:50 2011+++ /trunk/core/test/com/google/inject/TypeLiteralTypeResolutionTest.javaWed Jun 29 15:04:31 2011

@@ -98,7 +98,7 @@

assertEquals(ImmutableList.<TypeLiteral<?>>of(TypeLiteral.get(String.class)),resolver.getParameterTypes(Collection.class.getMethod("add",Object.class)));

   }
-
+
   public void testGenericSupertype() {
     TypeLiteral<?> resolver = TypeLiteral.get(arrayListOfString);
     assertEquals(newParameterizedType(Collection.class, String.class),
@@ -123,7 +123,7 @@
       return value - o.value;
     }
   }
-
+
   public void testFields() {
     TypeLiteral<?> resolver = TypeLiteral.get(hasGenericFieldsOfShort);

assertEquals(listOf(Short.class),resolver.getFieldType(list).getType());

@@ -315,7 +315,7 @@
     public List<? super T> superT;
   }

- // TODO(user): tests for tricky bounded types like <T extendsCollection, Serializable>+ // TODO(jessewilson): tests for tricky bounded types like <T extendsCollection, Serializable>


   public void testEqualsAndHashCode() throws IOException {
     TypeLiteral<?> a1 = TypeLiteral.get(arrayListOfString);
=======================================

--- /trunk/core/test/com/googlecode/guice/BytecodeGenTest.java Wed Jun 2915:02:50 2011+++ /trunk/core/test/com/googlecode/guice/BytecodeGenTest.java Wed Jun 2915:04:31 2011

@@ -76,15 +76,15 @@

Injector injector = Guice.createInjector(interceptorModule, newPackageVisibilityTestModule());injector.getInstance(PublicUserOfPackagePrivate.class); // This mustpass.

   }
-
+
   public void testEnhancerNaming() {

Injector injector = Guice.createInjector(interceptorModule, newPackageVisibilityTestModule());PublicUserOfPackagePrivate pupp =injector.getInstance(PublicUserOfPackagePrivate.class);

     assertTrue(pupp.getClass().getName().startsWith(

PublicUserOfPackagePrivate.class.getName()+ "$$EnhancerByGuice$$"));

   }
-
-  // TODO(user): Figure out how to test FastClass naming tests.
+
+  // TODO(sameb): Figure out how to test FastClass naming tests.

   /**
    * Custom URL classloader with basic visibility rules
@@ -188,7 +188,7 @@

* Note: this class must be marked as public or protected so that theGuice* custom classloader will intercept it. Private and implementationclasses

    * are not intercepted by the custom classloader.
-   *
+   *
    * @see com.google.inject.internal.BytecodeGen.Visibility
    */
   public static class ProxyTestImpl implements ProxyTest {
@@ -224,7 +224,7 @@

assertNotSame(testProxy.getClass().getClassLoader(),systemClassLoader);

     }
   }
-
+
   public void testProxyClassUnloading() {
     Object testObject = Guice.createInjector(interceptorModule, testModule)
         .getInstance(proxyTestClass);
=======================================

---/trunk/extensions/grapher/src/com/google/inject/grapher/GraphingVisitor.javaWed Jun 29 15:02:50 2011+++/trunk/extensions/grapher/src/com/google/inject/grapher/GraphingVisitor.javaWed Jun 29 15:04:31 2011

@@ -46,7 +46,7 @@

* ({@link InterfaceNode}, {@link ImplementationNode}, {@linkBindingEdge}, and

  * {@link DependencyEdge}) so that you can extend those interfaces and also

* extend this class, and the helper methods will all return your newtypes.

- *
+ *
  * @author phopk...@gmail.com (Pete Hopkins)
  *
  * @param <K> The type for node IDs.
@@ -60,7 +60,7 @@
 implements BindingTargetVisitor<Object, Void> {

   private final NodeIdFactory<K> idFactory;
-
+
   private final InterfaceNode.Factory<K, N> interfaceNodeFactory;
   private final ImplementationNode.Factory<K, M> implementationNodeFactory;
   private final BindingEdge.Factory<K, B> bindingEdgeFactory;
@@ -85,7 +85,7 @@
   /**
    * Helper method to return the standard node ID for the {@link Binding}'s
    * {@link Key}.
-   *
+   *
    * @see NodeIdFactory#getClassNodeId(Key)
    */
   protected final K getClassNodeId(Binding<?> binding) {
@@ -95,7 +95,7 @@
   /**
    * Helper method to return the instance node ID for the {@link Binding}'s
    * {@link Key}.
-   *
+   *
    * @see NodeIdFactory#getInstanceNodeId(Key)
    */
   protected final K getInstanceNodeId(Binding<?> binding) {
@@ -173,7 +173,7 @@
    * will start at the {@link Member}.
    *
    * @see #newDependencyEdge(Object, InjectionPoint, Dependency)
-   *
+   *
    * @param nodeId ID of the node that should be the tail of the
    *     {@link DependencyEdge}s.
    * @param node An {@link ImplementationNode} to add {@link Member}s to.
@@ -248,7 +248,7 @@

* {@link BindingEdge} to the source {@link Key}. That will then berendered

    * by {@link #visit(InstanceBinding)} as an {@link InterfaceNode}
    * with a {@link BindingEdge} to the {@link String} instance.
-   *
+   *
    * @see #newInterfaceNode(Binding)