Author: nlebas
Date: Fri Dec 16 00:32:31 2011
New Revision: 1215009
URL: http://svn.apache.org/viewvc?rev=1215009&view=rev
Log:
changing the type of responseHeaders from Map to the more natural Addable
Modified:
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/Request.java
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/DefaultRequestWrapper.java
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/DispatchRequestWrapper.java
tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/scope/ReflectionContextResolverTest.java
tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/util/DefaultRequestWrapperTest.java
tiles/framework/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletRequest.java
tiles/framework/trunk/tiles-request/tiles-request-portlet/src/test/java/org/apache/tiles/request/portlet/PortletRequestTest.java
tiles/framework/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java
tiles/framework/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletRequestTest.java
Modified:
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/Request.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/Request.java?rev=1215009&r1=1215008&r2=1215009&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/Request.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/Request.java
Fri Dec 16 00:32:31 2011
@@ -27,6 +27,8 @@ import java.io.Writer;
import java.util.Locale;
import java.util.Map;
+import org.apache.tiles.request.attribute.Addable;
+
/**
* Encapsulation of request information.
@@ -54,11 +56,11 @@ public interface Request {
Map<String, String[]> getHeaderValues();
/**
- * Return an unreadable Map that writes headers to the response.
+ * Return an Addable object that can be used to write headers to the
response.
*
- * @return The header map.
+ * @return An Addable object.
*/
- Map<String, String> getResponseHeaders();
+ Addable<String> getResponseHeaders();
/**
* Returns a context map, given the scope name.
Modified:
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/DefaultRequestWrapper.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/DefaultRequestWrapper.java?rev=1215009&r1=1215008&r2=1215009&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/DefaultRequestWrapper.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/DefaultRequestWrapper.java
Fri Dec 16 00:32:31 2011
@@ -30,6 +30,7 @@ import java.util.Map;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.attribute.Addable;
import org.apache.tiles.request.scope.ContextResolver;
/**
@@ -71,7 +72,7 @@ public class DefaultRequestWrapper imple
}
/** {@inheritDoc} */
- public Map<String, String> getResponseHeaders() {
+ public Addable<String> getResponseHeaders() {
return context.getResponseHeaders();
}
Modified:
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/DispatchRequestWrapper.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/DispatchRequestWrapper.java?rev=1215009&r1=1215008&r2=1215009&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/DispatchRequestWrapper.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/DispatchRequestWrapper.java
Fri Dec 16 00:32:31 2011
@@ -30,6 +30,7 @@ import java.util.Map;
import org.apache.tiles.request.AbstractRequest;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.DispatchRequest;
+import org.apache.tiles.request.attribute.Addable;
import org.apache.tiles.request.scope.ContextResolver;
/**
@@ -71,7 +72,7 @@ public class DispatchRequestWrapper exte
}
/** {@inheritDoc} */
- public Map<String, String> getResponseHeaders() {
+ public Addable<String> getResponseHeaders() {
return context.getResponseHeaders();
}
Modified:
tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/scope/ReflectionContextResolverTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/scope/ReflectionContextResolverTest.java?rev=1215009&r1=1215008&r2=1215009&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/scope/ReflectionContextResolverTest.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/scope/ReflectionContextResolverTest.java
Fri Dec 16 00:32:31 2011
@@ -31,6 +31,7 @@ import java.util.Map;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.attribute.Addable;
import org.apache.tiles.request.util.DefaultRequestWrapper;
import org.apache.tiles.request.util.RequestWrapper;
import org.junit.Before;
@@ -260,7 +261,7 @@ public class ReflectionContextResolverTe
}
@Override
- public Map<String, String> getResponseHeaders() {
+ public Addable<String> getResponseHeaders() {
return null;
}
Modified:
tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/util/DefaultRequestWrapperTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/util/DefaultRequestWrapperTest.java?rev=1215009&r1=1215008&r2=1215009&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/util/DefaultRequestWrapperTest.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/util/DefaultRequestWrapperTest.java
Fri Dec 16 00:32:31 2011
@@ -38,6 +38,7 @@ import java.util.Map;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.attribute.Addable;
import org.apache.tiles.request.scope.ContextResolver;
import org.junit.Test;
@@ -106,7 +107,7 @@ public class DefaultRequestWrapperTest {
@Test
public void testGetResponseHeaders() {
Request wrappedRequest = createMockRequest();
- Map<String, String> header = createMock(Map.class);
+ Addable<String> header = createMock(Addable.class);
expect(wrappedRequest.getResponseHeaders()).andReturn(header);
Modified:
tiles/framework/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletRequest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletRequest.java?rev=1215009&r1=1215008&r2=1215009&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletRequest.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletRequest.java
Fri Dec 16 00:32:31 2011
@@ -35,7 +35,7 @@ import javax.portlet.PortletSession;
import org.apache.tiles.request.AbstractClientRequest;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.collection.AddOnlyMap;
+import org.apache.tiles.request.attribute.Addable;
import org.apache.tiles.request.collection.HeaderValuesMap;
import org.apache.tiles.request.collection.ReadOnlyEnumerationMap;
import org.apache.tiles.request.collection.ScopeMap;
@@ -68,7 +68,7 @@ public class PortletRequest extends Abst
* <p>The lazily instantiated <code>Map</code> of header name-value
* combinations (write-only).</p>
*/
- private Map<String, String> responseHeaders = null;
+ private Addable<String> responseHeaders = null;
/**
@@ -184,9 +184,9 @@ public class PortletRequest extends Abst
}
/** {@inheritDoc} */
- public Map<String, String> getResponseHeaders() {
+ public Addable<String> getResponseHeaders() {
if ((responseHeaders == null) && (request != null)) {
- responseHeaders = new AddOnlyMap<String>(new HeaderExtractor(null,
response));
+ responseHeaders = new HeaderExtractor(null, response);
}
return (responseHeaders);
}
Modified:
tiles/framework/trunk/tiles-request/tiles-request-portlet/src/test/java/org/apache/tiles/request/portlet/PortletRequestTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-portlet/src/test/java/org/apache/tiles/request/portlet/PortletRequestTest.java?rev=1215009&r1=1215008&r2=1215009&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-portlet/src/test/java/org/apache/tiles/request/portlet/PortletRequestTest.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-portlet/src/test/java/org/apache/tiles/request/portlet/PortletRequestTest.java
Fri Dec 16 00:32:31 2011
@@ -36,12 +36,12 @@ import javax.portlet.PortletResponse;
import javax.servlet.ServletOutputStream;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.collection.AddOnlyMap;
import org.apache.tiles.request.collection.HeaderValuesMap;
import org.apache.tiles.request.collection.ReadOnlyEnumerationMap;
import org.apache.tiles.request.collection.ScopeMap;
import org.apache.tiles.request.portlet.delegate.RequestDelegate;
import org.apache.tiles.request.portlet.delegate.ResponseDelegate;
+import org.apache.tiles.request.portlet.extractor.HeaderExtractor;
import org.junit.Before;
import org.junit.Test;
@@ -244,7 +244,7 @@ public class PortletRequestTest {
*/
@Test
public void testGetResponseHeaders() {
- assertTrue(req.getResponseHeaders() instanceof AddOnlyMap);
+ assertTrue(req.getResponseHeaders() instanceof HeaderExtractor);
}
/**
Modified:
tiles/framework/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java?rev=1215009&r1=1215008&r2=1215009&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java
Fri Dec 16 00:32:31 2011
@@ -34,7 +34,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.tiles.request.AbstractClientRequest;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.collection.AddOnlyMap;
+import org.apache.tiles.request.attribute.Addable;
import org.apache.tiles.request.collection.HeaderValuesMap;
import org.apache.tiles.request.collection.ReadOnlyEnumerationMap;
import org.apache.tiles.request.collection.ScopeMap;
@@ -85,7 +85,7 @@ public class ServletRequest extends Abst
* <p>The lazily instantiated <code>Map</code> of header name-value
* combinations (write-only).</p>
*/
- private Map<String, String> responseHeaders = null;
+ private Addable<String> responseHeaders = null;
/**
@@ -142,10 +142,10 @@ public class ServletRequest extends Abst
}
/** {@inheritDoc} */
- public Map<String, String> getResponseHeaders() {
+ public Addable<String> getResponseHeaders() {
if ((responseHeaders == null) && (response != null)) {
- responseHeaders = new AddOnlyMap<String>(new HeaderExtractor(null,
response));
+ responseHeaders = new HeaderExtractor(null, response);
}
return (responseHeaders);
Modified:
tiles/framework/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletRequestTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletRequestTest.java?rev=1215009&r1=1215008&r2=1215009&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletRequestTest.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletRequestTest.java
Fri Dec 16 00:32:31 2011
@@ -36,10 +36,10 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.collection.AddOnlyMap;
import org.apache.tiles.request.collection.HeaderValuesMap;
import org.apache.tiles.request.collection.ReadOnlyEnumerationMap;
import org.apache.tiles.request.collection.ScopeMap;
+import org.apache.tiles.request.servlet.extractor.HeaderExtractor;
import org.junit.Before;
import org.junit.Test;
@@ -223,7 +223,7 @@ public class ServletRequestTest {
*/
@Test
public void testGetResponseHeaders() {
- assertTrue(req.getResponseHeaders() instanceof AddOnlyMap);
+ assertTrue(req.getResponseHeaders() instanceof HeaderExtractor);
}
/**
