You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pe...@apache.org on 2011/04/17 06:47:26 UTC
svn commit: r1094099 - in /wicket/trunk/wicket-core/src:
main/java/org/apache/wicket/protocol/http/
test/java/org/apache/wicket/markup/transformer/
test/java/org/apache/wicket/protocol/http/
Author: pedro
Date: Sun Apr 17 04:47:25 2011
New Revision: 1094099
URL: http://svn.apache.org/viewvc?rev=1094099&view=rev
Log:
improving BufferedWebResponse to invoke set header actions before write in response.
Issue: WICKET-3618
Added:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/transformer/
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/transformer/AbstractTransformerBehaviorTest.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/protocol/http/BufferedWebResponseTest.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/BufferedWebResponse.java
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/BufferedWebResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/BufferedWebResponse.java?rev=1094099&r1=1094098&r2=1094099&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/BufferedWebResponse.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/BufferedWebResponse.java Sun Apr 17 04:47:25 2011
@@ -20,6 +20,7 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import javax.servlet.http.Cookie;
@@ -88,9 +89,14 @@ public class BufferedWebResponse extends
}
}
- private static abstract class Action
+ private static abstract class Action implements Comparable<Action>
{
protected abstract void invoke(WebResponse response);
+
+ public int compareTo(Action o)
+ {
+ return 0;
+ }
}
/**
@@ -100,6 +106,12 @@ public class BufferedWebResponse extends
*/
private static abstract class MetaDataAction extends Action
{
+ @Override
+ public int compareTo(Action o)
+ {
+ // write first in response
+ return Integer.MIN_VALUE;
+ }
}
private static class WriteCharSequenceAction extends Action
@@ -135,6 +147,13 @@ public class BufferedWebResponse extends
}
response.write(builder);
}
+
+ @Override
+ public int compareTo(Action o)
+ {
+ // needs to be invoked after set header actions
+ return Integer.MAX_VALUE;
+ }
}
private static class WriteDataAction extends Action
@@ -163,6 +182,13 @@ public class BufferedWebResponse extends
{
writeStream(response, stream);
}
+
+ @Override
+ public int compareTo(Action o)
+ {
+ // needs to be invoked after set header actions
+ return Integer.MAX_VALUE;
+ }
}
private static class CloseAction extends Action
@@ -242,7 +268,7 @@ public class BufferedWebResponse extends
}
}
- private static class SetContentLengthAction extends Action
+ private static class SetContentLengthAction extends MetaDataAction
{
private final long contentLength;
@@ -258,7 +284,7 @@ public class BufferedWebResponse extends
}
}
- private static class SetContentTypeAction extends Action
+ private static class SetContentTypeAction extends MetaDataAction
{
private final String contentType;
@@ -482,6 +508,8 @@ public class BufferedWebResponse extends
{
Args.notNull(response, "response");
+ Collections.sort(actions);
+
for (Action action : actions)
{
action.invoke(response);
Added: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/transformer/AbstractTransformerBehaviorTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/transformer/AbstractTransformerBehaviorTest.java?rev=1094099&view=auto
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/transformer/AbstractTransformerBehaviorTest.java (added)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/transformer/AbstractTransformerBehaviorTest.java Sun Apr 17 04:47:25 2011
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.markup.transformer;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.markup.IMarkupResourceStreamProvider;
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.util.resource.IResourceStream;
+import org.apache.wicket.util.resource.StringResourceStream;
+
+/**
+ * @author Pedro Santos
+ */
+public class AbstractTransformerBehaviorTest extends WicketTestCase
+{
+ /** */
+ public void testResponseTransformation()
+ {
+ TestPage testPage = new TestPage();
+ testPage.add(new AbstractTransformerBehavior()
+ {
+ /** */
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public CharSequence transform(Component component, CharSequence output)
+ throws Exception
+ {
+ return output.toString().replace("to be replaced", "replacement");
+ }
+ });
+ tester.startPage(testPage);
+ assertTrue(tester.getLastResponseAsString().contains("replacement"));
+ }
+
+ /** */
+ public static class TestPage extends WebPage implements IMarkupResourceStreamProvider
+ {
+ private static final long serialVersionUID = 1L;
+
+ public IResourceStream getMarkupResourceStream(MarkupContainer container,
+ Class<?> containerClass)
+ {
+ return new StringResourceStream("<html><body>{to be replaced}</body></html>");
+ }
+
+ }
+}
Added: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/protocol/http/BufferedWebResponseTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/protocol/http/BufferedWebResponseTest.java?rev=1094099&view=auto
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/protocol/http/BufferedWebResponseTest.java (added)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/protocol/http/BufferedWebResponseTest.java Sun Apr 17 04:47:25 2011
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.protocol.http;
+
+import java.util.ArrayList;
+
+import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.mock.MockWebResponse;
+import org.apache.wicket.request.http.WebResponse;
+
+
+/**
+ * @author Pedro Santos
+ */
+public class BufferedWebResponseTest extends WicketTestCase
+{
+ enum TestAction {
+ SET_HEADER, WRITE_RESPONSE
+ }
+
+ /**
+ * Asserting that set header actions are invoked before write in response actions.
+ *
+ * WICKET-3618
+ */
+ public void testBufferedResponsePostponeWriteResponseAction()
+ {
+ final ArrayList<TestAction> actionsSequence = new ArrayList<TestAction>();
+ WebResponse originalResponse = new MockWebResponse()
+ {
+ @Override
+ public void setContentLength(long length)
+ {
+ actionsSequence.add(TestAction.SET_HEADER);
+ }
+
+ @Override
+ public void write(CharSequence sequence)
+ {
+ actionsSequence.add(TestAction.WRITE_RESPONSE);
+ }
+ };
+ BufferedWebResponse response = new BufferedWebResponse(originalResponse);
+ response.setText("some text");
+ response.setContentLength(9);
+ response.writeTo(originalResponse);
+ assertEquals(0, actionsSequence.indexOf(TestAction.SET_HEADER));
+ assertEquals(1, actionsSequence.indexOf(TestAction.WRITE_RESPONSE));
+ }
+}
\ No newline at end of file