Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Whitespace polishing: leading spaces->tabs; updated eclipse configuration to default to leading tabs for all bundles

Browse Source
This commit is contained in:
Chris Beams
2008-12-18 14:50:25 +00:00
parent 0f521c3bfb
commit 579280d7bf
87 changed files with 4294 additions and 654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
org.springframework.web.servlet/src/main/java/org/springframework/web/multipart/support/AbstractMultipartHttpServletRequest.java
View File

@@ -34,7 +34,7 @@ import org.springframework.web.multipart.MultipartHttpServletRequest;
* @since 06.10.2003
*/
public abstract class AbstractMultipartHttpServletRequest extends HttpServletRequestWrapper
implements MultipartHttpServletRequest {
implements MultipartHttpServletRequest {
private Map<String, MultipartFile> multipartFiles;

2
org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java
View File

@@ -46,7 +46,7 @@ import org.springframework.web.servlet.HandlerMapping;
* @see org.springframework.web.servlet.HandlerInterceptor
*/
public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
implements HandlerMapping, Ordered {
implements HandlerMapping, Ordered {
private int order = Integer.MAX_VALUE; // default: same as non-Ordered

6
org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java
View File

@@ -85,7 +85,7 @@ import org.springframework.web.servlet.ModelAndView;
* @see org.springframework.orm.jdo.support.OpenPersistenceManagerInViewFilter
*/
public class ServletWrappingController extends AbstractController
implements BeanNameAware, InitializingBean, DisposableBean {
implements BeanNameAware, InitializingBean, DisposableBean {
private Class servletClass;
@@ -138,7 +138,7 @@ public class ServletWrappingController extends AbstractController
}
if (!Servlet.class.isAssignableFrom(this.servletClass)) {
throw new IllegalArgumentException("servletClass [" + this.servletClass.getName() +
"] needs to implement interface [javax.servlet.Servlet]");
"] needs to implement interface [javax.servlet.Servlet]");
}
if (this.servletName == null) {
this.servletName = this.beanName;
@@ -154,7 +154,7 @@ public class ServletWrappingController extends AbstractController
*/
@Override
protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response)
throws Exception {
throws Exception {
this.servletInstance.service(request, response);
return null;

8
org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/CancellableFormControllerTests.java
View File

@@ -137,7 +137,7 @@ public class CancellableFormControllerTests extends TestCase {
public void testCancelSubmission() throws Exception {
String cancelView = "cancelView";
String cancelParameterKey = "cancelRequest";
String cancelParameterKey = "cancelRequest";
TestController ctl = new TestController();
ctl.setCancelParamKey(cancelParameterKey);
@@ -155,7 +155,7 @@ public class CancellableFormControllerTests extends TestCase {
public void testCancelSubmissionWithValidationError() throws Exception {
String cancelView = "cancelView";
String cancelParameterKey = "cancelRequest";
String cancelParameterKey = "cancelRequest";
TestController ctl = new TestController();
ctl.setCancelParamKey(cancelParameterKey);
@@ -179,8 +179,8 @@ public class CancellableFormControllerTests extends TestCase {
public void testCancelSubmissionWithCustomModelParams() throws Exception {
String cancelView = "cancelView";
String cancelParameterKey = "cancelRequest";
final String reason = "Because I wanted to";
String cancelParameterKey = "cancelRequest";
final String reason = "Because I wanted to";
TestController ctl = new TestController() {
protected ModelAndView onCancel(HttpServletRequest request, HttpServletResponse response, Object command) {

68
org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/FormControllerTests.java
View File

@@ -47,24 +47,24 @@ import org.springframework.web.servlet.ModelAndView;
* @author Juergen Hoeller
*/
public class FormControllerTests extends TestCase {
public void testReferenceDataOnForm() throws Exception {
String formView = "f";
String successView = "s";
RefController mc = new RefController();
mc.setFormView(formView);
mc.setCommandName("tb");
mc.setSuccessView(successView);
mc.refDataCount = 0;
HttpServletRequest request = new MockHttpServletRequest("GET", "/welcome.html");
HttpServletResponse response = new MockHttpServletResponse();
ModelAndView mv = mc.handleRequest(request, response);
assertTrue("returned correct view name", mv.getViewName().equals(formView));
assertTrue("refDataCount == 1", mc.refDataCount == 1);
TestBean person = (TestBean) mv.getModel().get(mc.getCommandName());
int[] numbers = (int[]) mv.getModel().get(mc.NUMBERS_ATT);
assertTrue("model is non null", person != null);
@@ -74,22 +74,22 @@ public class FormControllerTests extends TestCase {
public void testReferenceDataOnResubmit() throws Exception {
String formView = "f";
String successView = "s";
RefController mc = new RefController();
mc.setFormView(formView);
mc.setCommandName("tb");
mc.setSuccessView(successView);
mc.refDataCount = 0;
MockHttpServletRequest request = new MockHttpServletRequest("POST", "/welcome.html");
request.addParameter("age", "23x");
HttpServletResponse response = new MockHttpServletResponse();
ModelAndView mv = mc.handleRequest(request, response);
assertTrue("returned correct view name", mv.getViewName().equals(formView));
assertTrue("has errors", mv.getModel().get(BindException.MODEL_KEY_PREFIX + mc.getCommandName()) != null);
assertTrue("refDataCount == 1", mc.refDataCount == 1);
TestBean person = (TestBean) mv.getModel().get(mc.getCommandName());
int[] numbers = (int[]) mv.getModel().get(mc.NUMBERS_ATT);
assertTrue("model is non null", person != null);
@@ -99,17 +99,17 @@ public class FormControllerTests extends TestCase {
public void testForm() throws Exception {
String formView = "f";
String successView = "s";
TestController mc = new TestController();
mc.setFormView(formView);
mc.setSuccessView(successView);
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/welcome.html");
request.addParameter("name", "rod");
HttpServletResponse response = new MockHttpServletResponse();
ModelAndView mv = mc.handleRequest(request, response);
assertTrue("returned correct view name", mv.getViewName().equals(formView));
TestBean person = (TestBean) mv.getModel().get(TestController.BEAN_NAME);
assertTrue("model is non null", person != null);
assertTrue("bean age default ok", person.getAge() == TestController.DEFAULT_AGE);
@@ -147,11 +147,11 @@ public class FormControllerTests extends TestCase {
public void testSubmitWithoutErrors() throws Exception {
String formView = "f";
String successView = "s";
TestController mc = new TestController();
mc.setFormView(formView);
mc.setSuccessView(successView);
String name = "Rod";
int age = 32;
@@ -169,7 +169,7 @@ public class FormControllerTests extends TestCase {
assertTrue("bean name bound ok", person.getName().equals(name));
assertTrue("bean age bound ok", person.getAge() == age);
}
public void testSubmitWithoutValidation() throws Exception {
String formView = "f";
String successView = "s";
@@ -218,12 +218,12 @@ public class FormControllerTests extends TestCase {
public void testSubmitPassedByValidator() throws Exception {
String formView = "f";
String successView = "s";
TestController mc = new TestController();
mc.setFormView(formView);
mc.setSuccessView(successView);
mc.setValidator(new TestValidator());
String name = "Roderick Johnson";
int age = 32;
@@ -234,21 +234,21 @@ public class FormControllerTests extends TestCase {
ModelAndView mv = mc.handleRequest(request, response);
assertTrue("returned correct view name: expected '" + successView + "', not '" + mv.getViewName() + "'",
mv.getViewName().equals(successView));
TestBean person = (TestBean) mv.getModel().get(TestController.BEAN_NAME);
assertTrue("model is non null", person != null);
assertTrue("bean name bound ok", person.getName().equals(name));
assertTrue("bean age bound ok", person.getAge() == age);
}
public void testSubmit1Mismatch() throws Exception {
String formView = "fred";
String successView = "tony";
TestController mc = new TestController();
mc.setFormView(formView);
mc.setSuccessView(successView);
String name = "Rod";
String age = "xxx";
@@ -259,7 +259,7 @@ public class FormControllerTests extends TestCase {
ModelAndView mv = mc.handleRequest(request, response);
assertTrue("returned correct view name: expected '" + formView + "', not '" + mv.getViewName() + "'",
mv.getViewName().equals(formView));
TestBean person = (TestBean) mv.getModel().get(mc.getCommandName());
assertTrue("model is non null", person != null);
assertTrue("bean name bound ok", person.getName().equals(name));
@@ -271,11 +271,11 @@ public class FormControllerTests extends TestCase {
assertTrue("Saved invalid value", fe.getRejectedValue().equals(age));
assertTrue("Correct field", fe.getField().equals("age"));
}
public void testSubmit1Mismatch1Invalidated() throws Exception {
String formView = "fred";
String successView = "tony";
TestController mc = new TestController();
mc.setFormView(formView);
mc.setSuccessView(successView);
@@ -284,7 +284,7 @@ public class FormControllerTests extends TestCase {
String name = "Rod";
// will be rejected
String age = "xxx";
MockHttpServletRequest request = new MockHttpServletRequest("POST", "/foo.html");
request.addParameter("name", name);
request.addParameter("age", "" + age);
@@ -292,10 +292,10 @@ public class FormControllerTests extends TestCase {
ModelAndView mv = mc.handleRequest(request, response);
assertTrue("returned correct view name: expected '" + formView + "', not '" + mv.getViewName() + "'",
mv.getViewName().equals(formView));
TestBean person = (TestBean) mv.getModel().get(TestController.BEAN_NAME);
assertTrue("model is non null", person != null);
// yes, but it was rejected after binding by the validator
assertTrue("bean name bound ok", person.getName().equals(name));
assertTrue("bean age is default", person.getAge() == TestController.DEFAULT_AGE);
@@ -305,7 +305,7 @@ public class FormControllerTests extends TestCase {
FieldError fe = errors.getFieldError("age");
assertTrue("Saved invalid value", fe.getRejectedValue().equals(age));
assertTrue("Correct field", fe.getField().equals("age"));
// raised by first validator
fe = errors.getFieldError("name");
assertTrue("Saved invalid value", fe.getRejectedValue().equals(name));
@@ -371,7 +371,7 @@ public class FormControllerTests extends TestCase {
TestController mc = new TestController() {
protected ModelAndView handleInvalidSubmit(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
throws ServletException, IOException {
throw new ServletException("invalid submit");
}
};
@@ -435,7 +435,7 @@ public class FormControllerTests extends TestCase {
public void testFormChangeRequest() throws Exception {
String formView = "fred";
String successView = "tony";
final Float myFloat = new Float("123.45");
final Float myFloat = new Float("123.45");
TestController mc = new TestController() {
protected boolean isFormChangeRequest(HttpServletRequest request) {
@@ -569,17 +569,17 @@ public class FormControllerTests extends TestCase {
private static class RefController extends SimpleFormController {
final String NUMBERS_ATT = "NUMBERS";
static final int[] NUMBERS = { 1, 2, 3, 4 };
int refDataCount;
public RefController() {
setCommandClass(TestBean.class);
}
protected Map referenceData(HttpServletRequest request) {
++refDataCount;
Map m = new HashMap();

80
org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/feed/AtomFeedViewTest.java
View File

@@ -38,52 +38,52 @@ import org.springframework.mock.web.MockHttpServletResponse;
public class AtomFeedViewTest {
private AbstractAtomFeedView view;
private AbstractAtomFeedView view;
@Before
public void createView() throws Exception {
view = new MyAtomFeedView();
setIgnoreWhitespace(true);
}
@Before
public void createView() throws Exception {
view = new MyAtomFeedView();
setIgnoreWhitespace(true);
}
@Test
public void render() throws Exception {
MockHttpServletRequest request = new MockHttpServletRequest();
MockHttpServletResponse response = new MockHttpServletResponse();
@Test
public void render() throws Exception {
MockHttpServletRequest request = new MockHttpServletRequest();
MockHttpServletResponse response = new MockHttpServletResponse();
Map<String, String> model = new HashMap<String, String>();
model.put("1", "This is entry 1");
model.put("2", "This is entry 2");
Map<String, String> model = new HashMap<String, String>();
model.put("1", "This is entry 1");
model.put("2", "This is entry 2");
view.render(model, request, response);
assertEquals("Invalid content-type", "application/atom+xml", response.getContentType());
String expected = "<feed xmlns=\"http://www.w3.org/2005/Atom\">" + "<title>Test Feed</title>" +
"<entry><title>2</title><summary>This is entry 2</summary></entry>" +
"<entry><title>1</title><summary>This is entry 1</summary></entry>" + "</feed>";
assertXMLEqual(expected, response.getContentAsString());
}
view.render(model, request, response);
assertEquals("Invalid content-type", "application/atom+xml", response.getContentType());
String expected = "<feed xmlns=\"http://www.w3.org/2005/Atom\">" + "<title>Test Feed</title>" +
"<entry><title>2</title><summary>This is entry 2</summary></entry>" +
"<entry><title>1</title><summary>This is entry 1</summary></entry>" + "</feed>";
assertXMLEqual(expected, response.getContentAsString());
}
private static class MyAtomFeedView extends AbstractAtomFeedView {
private static class MyAtomFeedView extends AbstractAtomFeedView {
@Override
@Override
protected void buildFeedMetadata(Map model, Feed feed, HttpServletRequest request) {
feed.setTitle("Test Feed");
}
feed.setTitle("Test Feed");
}
@Override
@Override
protected List<Entry> buildFeedEntries(Map model, HttpServletRequest request, HttpServletResponse response)
throws Exception {
List<Entry> entries = new ArrayList<Entry>();
for (Iterator iterator = model.keySet().iterator(); iterator.hasNext();) {
String name = (String) iterator.next();
Entry entry = new Entry();
entry.setTitle(name);
Content content = new Content();
content.setValue((String) model.get(name));
entry.setSummary(content);
entries.add(entry);
}
return entries;
}
}
}
throws Exception {
List<Entry> entries = new ArrayList<Entry>();
for (Iterator iterator = model.keySet().iterator(); iterator.hasNext();) {
String name = (String) iterator.next();
Entry entry = new Entry();
entry.setTitle(name);
Content content = new Content();
content.setValue((String) model.get(name));
entry.setSummary(content);
entries.add(entry);
}
return entries;
}
}
}

86
org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/feed/RssFeedViewTest.java
View File

@@ -38,56 +38,56 @@ import org.springframework.mock.web.MockHttpServletResponse;
public class RssFeedViewTest {
private AbstractRssFeedView view;
private AbstractRssFeedView view;
@Before
public void createView() throws Exception {
view = new MyRssFeedView();
setIgnoreWhitespace(true);
@Before
public void createView() throws Exception {
view = new MyRssFeedView();
setIgnoreWhitespace(true);
}
}
@Test
public void render() throws Exception {
MockHttpServletRequest request = new MockHttpServletRequest();
MockHttpServletResponse response = new MockHttpServletResponse();
@Test
public void render() throws Exception {
MockHttpServletRequest request = new MockHttpServletRequest();
MockHttpServletResponse response = new MockHttpServletResponse();
Map<String, String> model = new HashMap<String, String>();
model.put("1", "This is entry 1");
model.put("2", "This is entry 2");
Map<String, String> model = new HashMap<String, String>();
model.put("1", "This is entry 1");
model.put("2", "This is entry 2");
view.render(model, request, response);
assertEquals("Invalid content-type", "application/rss+xml", response.getContentType());
String expected = "<rss version=\"2.0\">" +
"<channel><title>Test Feed</title><link>http://example.com</link><description>Test feed description</description>" +
"<item><title>2</title><description>This is entry 2</description></item>" +
"<item><title>1</title><description>This is entry 1</description></item>" + "</channel></rss>";
assertXMLEqual(expected, response.getContentAsString());
}
view.render(model, request, response);
assertEquals("Invalid content-type", "application/rss+xml", response.getContentType());
String expected = "<rss version=\"2.0\">" +
"<channel><title>Test Feed</title><link>http://example.com</link><description>Test feed description</description>" +
"<item><title>2</title><description>This is entry 2</description></item>" +
"<item><title>1</title><description>This is entry 1</description></item>" + "</channel></rss>";
assertXMLEqual(expected, response.getContentAsString());
}
private static class MyRssFeedView extends AbstractRssFeedView {
private static class MyRssFeedView extends AbstractRssFeedView {
@Override
@Override
protected void buildFeedMetadata(Map model, Channel channel, HttpServletRequest request) {
channel.setTitle("Test Feed");
channel.setDescription("Test feed description");
channel.setLink("http://example.com");
}
channel.setTitle("Test Feed");
channel.setDescription("Test feed description");
channel.setLink("http://example.com");
}
@Override
@Override
protected List<Item> buildFeedItems(Map model, HttpServletRequest request, HttpServletResponse response)
throws Exception {
List<Item> items = new ArrayList<Item>();
for (Iterator iterator = model.keySet().iterator(); iterator.hasNext();) {
String name = (String) iterator.next();
Item item = new Item();
item.setTitle(name);
Description description = new Description();
description.setValue((String) model.get(name));
item.setDescription(description);
items.add(item);
}
return items;
}
}
}
throws Exception {
List<Item> items = new ArrayList<Item>();
for (Iterator iterator = model.keySet().iterator(); iterator.hasNext();) {
String name = (String) iterator.next();
Item item = new Item();
item.setTitle(name);
Description description = new Description();
description.setValue((String) model.get(name));
item.setDescription(description);
items.add(item);
}
return items;
}
}
}