[google-guice] r1371 committed - simplify servlet SPI test.

[google-guice]

Revision: 1371
Author: sberlin
Date: Sat Nov 13 06:28:44 2010
Log: simplify servlet SPI test.
http://code.google.com/p/google-guice/source/detail?r=1371
Modified:
  
/trunk/extensions/servlet/test/com/google/inject/servlet/ServletSpiVisitor.java

=======================================
---  
/trunk/extensions/servlet/test/com/google/inject/servlet/ServletSpiVisitor.java	 
Sun Aug 22 11:48:23 2010
+++  
/trunk/extensions/servlet/test/com/google/inject/servlet/ServletSpiVisitor.java	 
Sat Nov 13 06:28:44 2010
@@ -72,22 +72,22 @@
   }

   public Integer visit(InstanceFilterBinding binding) {
-    actual.add(new Params(binding.getPattern(),  
binding.getFilterInstance(), binding.getInitParams(),  
binding.getUriPatternType()));
+    actual.add(new Params(binding, binding.getFilterInstance()));
     return currentCount++;
   }

   public Integer visit(InstanceServletBinding binding) {
-    actual.add(new Params(binding.getPattern(),  
binding.getServletInstance(), binding.getInitParams(),  
binding.getUriPatternType()));
+    actual.add(new Params(binding, binding.getServletInstance()));
     return currentCount++;
   }

   public Integer visit(LinkedFilterBinding binding) {
-    actual.add(new Params(binding.getPattern(), binding.getLinkedKey(),  
binding.getInitParams(), binding.getUriPatternType()));
+    actual.add(new Params(binding, binding.getLinkedKey()));
     return currentCount++;
   }

   public Integer visit(LinkedServletBinding binding) {
-    actual.add(new Params(binding.getPattern(), binding.getLinkedKey(),  
binding.getInitParams(), binding.getUriPatternType()));
+    actual.add(new Params(binding, binding.getLinkedKey()));
     return currentCount++;
   }

@@ -104,7 +104,14 @@
     private final String pattern;
     private final Object keyOrInstance;
     private final Map<String, String> params;
-    private UriPatternType patternType;
+    private final UriPatternType patternType;
+
+    Params(ServletModuleBinding binding, Object keyOrInstance) {
+      this.pattern = binding.getPattern();
+      this.keyOrInstance = keyOrInstance;
+      this.params = binding.getInitParams();
+      this.patternType = binding.getUriPatternType();
+    }

     Params(String pattern, Object keyOrInstance, Map params,  
UriPatternType patternType) {
       this.pattern = pattern;
@@ -125,7 +132,7 @@
         return false;
       }
     }
-
+
     @Override
     public int hashCode() {
       return Objects.hashCode(pattern, keyOrInstance, params, patternType);

--
You received this message because you are subscribed to the Google Groups 
"google-guice-dev" group.
To post to this group, send email to google-guice-...@googlegroups.com.
To unsubscribe from this group, send email to 
google-guice-dev+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/google-guice-dev?hl=en.