Author: limpbizkit
Date: Fri Apr 24 11:19:41 2009
New Revision: 934
Modified:
trunk/servlet/src/com/google/inject/servlet/FiltersModuleBuilder.java
trunk/servlet/src/com/google/inject/servlet/ServletsModuleBuilder.java
Log:
Greg Kick's fix to use UniqueAnnotations in the servlets module
Modified:
trunk/servlet/src/com/google/inject/servlet/FiltersModuleBuilder.java
==============================================================================
--- trunk/servlet/src/com/google/inject/servlet/FiltersModuleBuilder.java
(original)
+++ trunk/servlet/src/com/google/inject/servlet/FiltersModuleBuilder.java
Fri Apr 24 11:19:41 2009
@@ -19,11 +19,10 @@
import com.google.inject.Key;
import com.google.inject.TypeLiteral;
import com.google.inject.internal.Lists;
-import static com.google.inject.name.Names.named;
+import com.google.inject.internal.UniqueAnnotations;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.UUID;
import javax.servlet.Filter;
/**
@@ -41,7 +40,7 @@
protected void configure() {
// Bind these filter definitions to a unique random key. Doesn't
matter what it is,
// coz it's never used.
- bind(Key.get(new TypeLiteral<List<FilterDefinition>>() {},
named(UUID.randomUUID().toString())))
+ bind(Key.get(new TypeLiteral<List<FilterDefinition>>() {},
UniqueAnnotations.create()))
.toInstance(filterDefinitions);
}
Modified:
trunk/servlet/src/com/google/inject/servlet/ServletsModuleBuilder.java
==============================================================================
--- trunk/servlet/src/com/google/inject/servlet/ServletsModuleBuilder.java
(original)
+++ trunk/servlet/src/com/google/inject/servlet/ServletsModuleBuilder.java
Fri Apr 24 11:19:41 2009
@@ -20,12 +20,11 @@
import com.google.inject.TypeLiteral;
import com.google.inject.internal.Lists;
import com.google.inject.internal.Sets;
-import static com.google.inject.name.Names.named;
+import com.google.inject.internal.UniqueAnnotations;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.UUID;
import javax.servlet.http.HttpServlet;
/**
@@ -56,8 +55,8 @@
// Bind these servlet definitions to a unique random key. Doesn't
matter what it is,
// coz it's never used.
- bind(Key.get(new TypeLiteral<List<ServletDefinition>>() {},
-
named(UUID.randomUUID().toString()))).toInstance(servletDefinitions);
+ bind(Key.get(new TypeLiteral<List<ServletDefinition>>() {},
UniqueAnnotations.create()))
+ .toInstance(servletDefinitions);
}
//the first level of the EDSL--
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"google-guice-dev" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/google-guice-dev?hl=en
-~----------~----~----~----~------~----~------~--~---
