A {@code ClientHttpRequest} can be {@linkplain #execute() executed}, getting a - * {@link ClientHttpResponse} which can be read from. + *
A {@code ClientHttpRequest} can be {@linkplain #execute() executed}, + * receiving a {@link ClientHttpResponse} which can be read from. * * @author Arjen Poutsma * @since 3.0 diff --git a/spring-web/src/main/java/org/springframework/http/client/ClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/ClientHttpResponse.java index 26fa24a44cb..05fa7ddd58f 100644 --- a/spring-web/src/main/java/org/springframework/http/client/ClientHttpResponse.java +++ b/spring-web/src/main/java/org/springframework/http/client/ClientHttpResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,10 +23,11 @@ import org.springframework.http.HttpInputMessage; import org.springframework.http.HttpStatus; /** - * Represents a client-side HTTP response. Obtained via an calling of the {@link ClientHttpRequest#execute()}. + * Represents a client-side HTTP response. + * Obtained via an calling of the {@link ClientHttpRequest#execute()}. * - *
A {@code ClientHttpResponse} must be {@linkplain #close() closed}, typically in a - * {@code finally} block. + *
A {@code ClientHttpResponse} must be {@linkplain #close() closed},
+ * typically in a {@code finally} block.
*
* @author Arjen Poutsma
* @since 3.0
@@ -55,7 +56,7 @@ public interface ClientHttpResponse extends HttpInputMessage, Closeable {
String getStatusText() throws IOException;
/**
- * Closes this response, freeing any resources created.
+ * Close this response, freeing any resources created.
*/
@Override
void close();
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java
index afb6cfc87ae..7c4b635afe0 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java
@@ -73,7 +73,7 @@ public class FreeMarkerMacroTests {
// final Template expectedTemplate = new Template();
fc = new FreeMarkerConfigurer();
- fc.setTemplateLoaderPaths(new String[] { "classpath:/", "file://" + System.getProperty("java.io.tmpdir") });
+ fc.setTemplateLoaderPaths("classpath:/", "file://" + System.getProperty("java.io.tmpdir"));
fc.afterPropertiesSet();
wac.getDefaultListableBeanFactory().registerSingleton("freeMarkerConfigurer", fc);
@@ -86,6 +86,7 @@ public class FreeMarkerMacroTests {
response = new MockHttpServletResponse();
}
+
@Test
public void testExposeSpringMacroHelpers() throws Exception {
FreeMarkerView fv = new FreeMarkerView() {
@@ -128,7 +129,8 @@ public class FreeMarkerMacroTests {
try {
fv.render(model, request, response);
- } catch (Exception ex) {
+ }
+ catch (Exception ex) {
assertTrue(ex instanceof ServletException);
assertTrue(ex.getMessage().contains(FreeMarkerView.SPRING_MACRO_REQUEST_CONTEXT_ATTRIBUTE));
}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewTests.java
index 0131151f0e9..330399afcb9 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -23,10 +23,14 @@ import java.io.Writer;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
-
import javax.servlet.http.HttpServletResponse;
+import freemarker.ext.servlet.AllHttpScopesHashModel;
+import freemarker.template.Configuration;
+import freemarker.template.Template;
+import freemarker.template.TemplateException;
import org.junit.Test;
+
import org.springframework.context.ApplicationContextException;
import org.springframework.mock.web.test.MockHttpServletRequest;
import org.springframework.mock.web.test.MockHttpServletResponse;
@@ -40,11 +44,6 @@ import org.springframework.web.servlet.view.AbstractView;
import org.springframework.web.servlet.view.InternalResourceView;
import org.springframework.web.servlet.view.RedirectView;
-import freemarker.ext.servlet.AllHttpScopesHashModel;
-import freemarker.template.Configuration;
-import freemarker.template.Template;
-import freemarker.template.TemplateException;
-
import static org.junit.Assert.*;
import static org.mockito.BDDMockito.*;
@@ -70,7 +69,7 @@ public class FreeMarkerViewTests {
}
catch (ApplicationContextException ex) {
// Check there's a helpful error message
- assertTrue(ex.getMessage().indexOf("FreeMarkerConfig") != -1);
+ assertTrue(ex.getMessage().contains("FreeMarkerConfig"));
}
}
@@ -83,7 +82,7 @@ public class FreeMarkerViewTests {
}
catch (IllegalArgumentException ex) {
// Check there's a helpful error message
- assertTrue(ex.getMessage().indexOf("url") != -1);
+ assertTrue(ex.getMessage().contains("url"));
}
}
@@ -94,7 +93,7 @@ public class FreeMarkerViewTests {
WebApplicationContext wac = mock(WebApplicationContext.class);
MockServletContext sc = new MockServletContext();
- Map configs = new HashMap();
+ Map