[waffle-scm] [428] trunk/waffle-core/src/main/java/org/codehaus/waffle/monitor: Improved monitoring of missing controller validator.

Sun, 25 Nov 2007 08:38:38 -0800

Title: [waffle-scm] [428] trunk/waffle-core/src/main/java/org/codehaus/waffle/monitor: Improved monitoring of missing controller validator.

Diff

Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/monitor/AbstractWritingMonitor.java (427 => 428)

--- trunk/waffle-core/src/main/java/org/codehaus/waffle/monitor/AbstractWritingMonitor.java	2007-11-25 11:47:55 UTC (rev 427)
+++ trunk/waffle-core/src/main/java/org/codehaus/waffle/monitor/AbstractWritingMonitor.java	2007-11-25 16:38:35 UTC (rev 428)
@@ -85,7 +85,7 @@
         levels.put("sessionContextContainerCreated", DEBUG);
         levels.put("requestContextContainerCreated", DEBUG);
         levels.put("controllerNameResolved", DEBUG);
-        levels.put("controllerNotFound", WARN);
+        levels.put("controllerNotFound", DEBUG);
         levels.put("methodDefinitionNotFound", WARN);
         levels.put("requestContextContainerNotFound", WARN);
         levels.put("componentRegistered", DEBUG);
@@ -142,7 +142,7 @@
         messages.put("instanceRegistered", "Registered instance {1} with key {0}");
         messages.put("nonCachingComponentRegistered", "Registered non-caching component of type {1} with key {0} and parameters {2}");
         messages.put("servletServiceFailed", "Servlet service failed: {0}");
-        messages.put("controllerValidatorNotFound", "Controller validator not found for name {0}");
+        messages.put("controllerValidatorNotFound", "Controller validator {0} not found: defaulting to controller {1}");
         messages.put("methodDefinitionNotFound", "Method definition not found in controller definition {0}");        
         messages.put("validationFailed", "Validation failed: {0}");  
         messages.put("viewForwarded", "View forwarded to path {0}");        
@@ -315,8 +315,8 @@
         write("servletServiceFailed", cause);        
     }
     
-    public void controllerValidatorNotFound(String controllerValidatorName) {
-        write("controllerValidatorNotFound", controllerValidatorName);
+    public void controllerValidatorNotFound(String controllerValidatorName, String controllerName) {
+        write("controllerValidatorNotFound", controllerValidatorName, controllerName);
     }
 
     public void methodDefinitionNotFound(ControllerDefinition controllerDefinition) {

Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/monitor/ValidationMonitor.java (427 => 428)

--- trunk/waffle-core/src/main/java/org/codehaus/waffle/monitor/ValidationMonitor.java	2007-11-25 11:47:55 UTC (rev 427)
+++ trunk/waffle-core/src/main/java/org/codehaus/waffle/monitor/ValidationMonitor.java	2007-11-25 16:38:35 UTC (rev 428)
@@ -19,7 +19,7 @@
  */
 public interface ValidationMonitor extends Monitor {
 
-    void controllerValidatorNotFound(String controllerValidatorName);
+    void controllerValidatorNotFound(String controllerValidatorName, String controllerName);
 
     void methodDefinitionNotFound(ControllerDefinition controllerDefinition);

Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/validation/DefaultValidator.java (427 => 428)

--- trunk/waffle-core/src/main/java/org/codehaus/waffle/validation/DefaultValidator.java	2007-11-25 11:47:55 UTC (rev 427)
+++ trunk/waffle-core/src/main/java/org/codehaus/waffle/validation/DefaultValidator.java	2007-11-25 16:38:35 UTC (rev 428)
@@ -43,13 +43,14 @@
 
     public void validate(ControllerDefinition controllerDefinition, ErrorsContext errorsContext) {
         ContextContainer container = RequestLevelContainer.get();
-        String controllerValidatorName = controllerDefinition.getName() + validatorConfiguration.getSuffix();
+        String controllerName = controllerDefinition.getName();
+        String controllerValidatorName = controllerName + validatorConfiguration.getSuffix();
         Object controllerValidator = container.getComponentInstance(controllerValidatorName);
 
         if (controllerValidator == null) {
-            // default to use validation in controller
-            controllerValidator = container.getComponentInstance(controllerDefinition.getName());
-            validationMonitor.controllerValidatorNotFound(controllerValidatorName);
+            // default to use controller as validator
+            controllerValidator = container.getComponentInstance(controllerName);
+            validationMonitor.controllerValidatorNotFound(controllerValidatorName, controllerName);
         }
 
         MethodDefinition methodDefinition = controllerDefinition.getMethodDefinition();

Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/testmodel/StubMonitor.java (427 => 428)

--- trunk/waffle-core/src/test/java/org/codehaus/waffle/testmodel/StubMonitor.java	2007-11-25 11:47:55 UTC (rev 427)
+++ trunk/waffle-core/src/test/java/org/codehaus/waffle/testmodel/StubMonitor.java	2007-11-25 16:38:35 UTC (rev 428)
@@ -114,7 +114,7 @@
     public void servletServiceFailed(Exception cause) {
     }
 
-    public void controllerValidatorNotFound(String controllerValidatorName) {
+    public void controllerValidatorNotFound(String controllerValidatorName, String controllerName) {
     }
 
     public void methodDefinitionNotFound(ControllerDefinition controllerDefinition) {

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to