- Revision
- 803
- Author
- mauro
- Date
- 2008-09-03 06:28:45 -0500 (Wed, 03 Sep 2008)
Log Message
Cleanup of variable names in waffle servlet following refactor of binders.
Modified Paths
Diff
Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/servlet/WaffleServlet.java (802 => 803)
--- trunk/waffle-core/src/main/java/org/codehaus/waffle/servlet/WaffleServlet.java 2008-09-02 14:36:00 UTC (rev 802) +++ trunk/waffle-core/src/main/java/org/codehaus/waffle/servlet/WaffleServlet.java 2008-09-03 11:28:45 UTC (rev 803) @@ -59,8 +59,8 @@ private ActionMethodExecutor actionMethodExecutor; private ActionMethodResponseHandler actionMethodResponseHandler; private ControllerDefinitionFactory controllerDefinitionFactory; - private ControllerDataBinder dataBinder; - private ViewDataBinder requestAttributeBinder; + private ControllerDataBinder controllerDataBinder; + private ViewDataBinder viewDataBinder; private Validator validator; private ServletMonitor servletMonitor; private boolean componentsRetrieved = false; @@ -78,23 +78,23 @@ * @param actionMethodExecutor * @param actionMethodResponseHandler * @param servletMonitor - * @param dataBinder - * @param requestAttributeBinder + * @param controllerDataBinder + * @param viewDataBinder * @param controllerDefinitionFactory * @param validator */ public WaffleServlet(ActionMethodExecutor actionMethodExecutor, ActionMethodResponseHandler actionMethodResponseHandler, ServletMonitor servletMonitor, - ControllerDataBinder dataBinder, - ViewDataBinder requestAttributeBinder, + ControllerDataBinder controllerDataBinder, + ViewDataBinder viewDataBinder, ControllerDefinitionFactory controllerDefinitionFactory, Validator validator) { this.actionMethodExecutor = actionMethodExecutor; this.actionMethodResponseHandler = actionMethodResponseHandler; this.servletMonitor = servletMonitor; - this.dataBinder = dataBinder; - this.requestAttributeBinder = requestAttributeBinder; + this.controllerDataBinder = controllerDataBinder; + this.viewDataBinder = viewDataBinder; this.controllerDefinitionFactory = controllerDefinitionFactory; this.validator = validator; componentsRetrieved = true; @@ -111,8 +111,8 @@ actionMethodExecutor = registry.getActionMethodExecutor(); actionMethodResponseHandler = registry.getActionMethodResponseHandler(); controllerDefinitionFactory = registry.getControllerDefinitionFactory(); - dataBinder = registry.getControllerDataBinder(); - requestAttributeBinder = registry.getViewDataBinder(); + controllerDataBinder = registry.getControllerDataBinder(); + viewDataBinder = registry.getViewDataBinder(); validator = registry.getValidator(); servletMonitor = registry.getServletMonitor(); } @@ -150,7 +150,7 @@ try { ControllerDefinition controllerDefinition = controllerDefinitionFactory.getControllerDefinition(request, response); - dataBinder.bind(request, response, errorsContext, controllerDefinition.getController()); + controllerDataBinder.bind(request, response, errorsContext, controllerDefinition.getController()); validator.validate(controllerDefinition, errorsContext); try { @@ -184,7 +184,7 @@ + controllerDefinition, e)); view = buildActionMethodFailureView(controllerDefinition); } - requestAttributeBinder.bind(request, controllerDefinition.getController()); + viewDataBinder.bind(request, controllerDefinition.getController()); } catch (WaffleException e) { servletMonitor.servletServiceFailed(e); errorsContext.addErrorMessage(new GlobalErrorMessage(e.getMessage(), e)); @@ -290,10 +290,10 @@ sb.append(actionMethodResponseHandler); sb.append(", controllerDefinitionFactory="); sb.append(controllerDefinitionFactory); - sb.append(", dataBinder="); - sb.append(dataBinder); - sb.append(", requestAttributeBinder="); - sb.append(requestAttributeBinder); + sb.append(", controllerDataBinder="); + sb.append(controllerDataBinder); + sb.append(", viewDataBinder="); + sb.append(viewDataBinder); sb.append(", validator="); sb.append(validator); sb.append("]");
Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/servlet/WaffleServletTest.java (802 => 803)
--- trunk/waffle-core/src/test/java/org/codehaus/waffle/servlet/WaffleServletTest.java 2008-09-02 14:36:00 UTC (rev 802) +++ trunk/waffle-core/src/test/java/org/codehaus/waffle/servlet/WaffleServletTest.java 2008-09-03 11:28:45 UTC (rev 803) @@ -164,10 +164,10 @@ one(validator).validate(with(any(ControllerDefinition.class)), with(any(ErrorsContext.class))); }}); - // Mock RequestAttributeBinder - final ViewDataBinder requestAttributeBinder = mockery.mock(ViewDataBinder.class); + // Mock ViewDataBinder + final ViewDataBinder viewDataBinder = mockery.mock(ViewDataBinder.class); mockery.checking(new Expectations() {{ - one(requestAttributeBinder).bind(with(same(request)), with(any(NonDispatchingController.class))); + one(viewDataBinder).bind(with(same(request)), with(any(NonDispatchingController.class))); }}); // Mock ControllerDefinitionFactory @@ -183,7 +183,7 @@ actionMethodResponseHandler, monitor, new OgnlControllerDataBinder(new OgnlValueConverterFinder(), null, monitor), - requestAttributeBinder, + viewDataBinder, controllerDefinitionFactory, validator) { @Override public ServletConfig getServletConfig() { @@ -250,10 +250,10 @@ one(validator).validate(with(any(ControllerDefinition.class)), with(any(ErrorsContext.class))); }}); - // Mock RequestAttributeBinder - final ViewDataBinder requestAttributeBinder = mockery.mock(ViewDataBinder.class); + // Mock ViewDataBinder + final ViewDataBinder viewDataBinder = mockery.mock(ViewDataBinder.class); mockery.checking(new Expectations() {{ - one(requestAttributeBinder).bind(with(same(request)), with(any(NonDispatchingController.class))); + one(viewDataBinder).bind(with(same(request)), with(any(NonDispatchingController.class))); }}); // Mock ControllerDefinitionFactory @@ -269,7 +269,7 @@ actionMethodResponseHandler, monitor, new OgnlControllerDataBinder(new OgnlValueConverterFinder(), null, monitor), - requestAttributeBinder, + viewDataBinder, controllerDefinitionFactory, validator) { @Override public ServletConfig getServletConfig() { @@ -408,10 +408,10 @@ one(validator).validate(with(any(ControllerDefinition.class)), with(any(ErrorsContext.class))); }}); - // Mock RequestAttributeBinder - final ViewDataBinder requestAttributeBinder = mockery.mock(ViewDataBinder.class); + // Mock ViewDataBinder + final ViewDataBinder viewDataBinder = mockery.mock(ViewDataBinder.class); mockery.checking(new Expectations() {{ - one(requestAttributeBinder).bind(with(same(request)), with(any(NonDispatchingController.class))); + one(viewDataBinder).bind(with(same(request)), with(any(NonDispatchingController.class))); }}); // Mock ControllerDefinitionFactory @@ -426,7 +426,7 @@ actionMethodResponseHandler, new SilentMonitor(), new OgnlControllerDataBinder(new OgnlValueConverterFinder(), null, new SilentMonitor()), - requestAttributeBinder, + viewDataBinder, controllerDefinitionFactory, validator) { @Override public ServletConfig getServletConfig() { @@ -493,9 +493,9 @@ }}); // Mock RequestAttributeBinder - final ViewDataBinder requestAttributeBinder = mockery.mock(ViewDataBinder.class); + final ViewDataBinder viewDataBinder = mockery.mock(ViewDataBinder.class); mockery.checking(new Expectations() {{ - one(requestAttributeBinder).bind(with(same(request)), with(any(NonDispatchingController.class))); + one(viewDataBinder).bind(with(same(request)), with(any(NonDispatchingController.class))); }}); // Mock ControllerDefinitionFactory @@ -510,7 +510,7 @@ actionMethodResponseHandler, new SilentMonitor(), new OgnlControllerDataBinder(new OgnlValueConverterFinder(), null, new SilentMonitor()), - requestAttributeBinder, + viewDataBinder, controllerDefinitionFactory, validator) { @Override public ServletConfig getServletConfig() { @@ -538,9 +538,9 @@ }}); // Set up what normally would happen via "init()" - Field dataBinderField = WaffleServlet.class.getDeclaredField("dataBinder"); - dataBinderField.setAccessible(true); - dataBinderField.set(servlet, new OgnlControllerDataBinder(new OgnlValueConverterFinder(), null, new SilentMonitor())); + Field controllerDataBinderField = WaffleServlet.class.getDeclaredField("controllerDataBinder"); + controllerDataBinderField.setAccessible(true); + controllerDataBinderField.set(servlet, new OgnlControllerDataBinder(new OgnlValueConverterFinder(), null, new SilentMonitor())); Field actionMethodExecutorField = WaffleServlet.class.getDeclaredField("actionMethodExecutor"); actionMethodExecutorField.setAccessible(true);
To unsubscribe from this list please visit:
