WICKET-7041 Make `StringResponse` initialize the internal buffer lazily (#574)
diff --git a/wicket-core/src/main/java/org/apache/wicket/Component.java b/wicket-core/src/main/java/org/apache/wicket/Component.java
index 62710df..c288e79 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Component.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Component.java
@@ -77,7 +77,7 @@
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.ResourceReference;
-import org.apache.wicket.response.LazyStringResponse;
+import org.apache.wicket.response.StringResponse;
import org.apache.wicket.settings.DebugSettings;
import org.apache.wicket.settings.ExceptionSettings;
import org.apache.wicket.util.IHierarchical;
@@ -2639,7 +2639,7 @@
boolean wasRendered = response.wasRendered(this);
if (wasRendered == false)
{
- LazyStringResponse markupHeaderResponse = new LazyStringResponse();
+ StringResponse markupHeaderResponse = new StringResponse();
Response oldResponse = getResponse();
RequestCycle.get().setResponse(markupHeaderResponse);
try
diff --git a/wicket-core/src/main/java/org/apache/wicket/response/LazyStringResponse.java b/wicket-core/src/main/java/org/apache/wicket/response/LazyStringResponse.java
deleted file mode 100644
index 322e428..0000000
--- a/wicket-core/src/main/java/org/apache/wicket/response/LazyStringResponse.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * 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.response;
-
-import org.apache.wicket.request.Response;
-import org.apache.wicket.util.string.AppendingStringBuffer;
-
-
-/**
- * Response object that writes to an AppendingStringBuffer. This class is functionally equivalent to
- * {@link StringResponse}, but defers creating the buffer until it is needed.
- *
- * @author Thomas Heigl
- */
-public class LazyStringResponse extends Response
-{
-
- private static final int DEFAULT_INITIAL_CAPACITY = 128;
-
- /** Initial capacity of the buffer */
- private final int initialCapacity;
-
- /** Buffer to write to */
- private AppendingStringBuffer out;
-
- public LazyStringResponse()
- {
- this(DEFAULT_INITIAL_CAPACITY);
- }
-
- public LazyStringResponse(int initialCapacity)
- {
- this.initialCapacity = initialCapacity;
- }
-
- /**
- * @see Response#write(CharSequence)
- */
- @Override
- public void write(final CharSequence string)
- {
- if (out == null)
- {
- out = new AppendingStringBuffer(initialCapacity);
- }
- out.append(string);
- }
-
- /**
- * @see Response#reset()
- */
- @Override
- public void reset()
- {
- if (out != null)
- {
- out.clear();
- }
- }
-
- /**
- * @see Object#toString()
- */
- @Override
- public String toString()
- {
- return getBuffer().toString();
- }
-
- /**
- * @return The internal buffer as a {@link CharSequence} or an empty string if no content has
- * been written to the response
- */
- public CharSequence getBuffer()
- {
- return out != null ? out : "";
- }
-
- @Override
- public void write(byte[] array)
- {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void write(byte[] array, int offset, int length)
- {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public String encodeURL(CharSequence url)
- {
- return url != null ? url.toString() : null;
- }
-
- @Override
- public Object getContainerResponse()
- {
- return null;
- }
-}
diff --git a/wicket-core/src/main/java/org/apache/wicket/response/StringResponse.java b/wicket-core/src/main/java/org/apache/wicket/response/StringResponse.java
index dd1cf2b..79b8d0b 100644
--- a/wicket-core/src/main/java/org/apache/wicket/response/StringResponse.java
+++ b/wicket-core/src/main/java/org/apache/wicket/response/StringResponse.java
@@ -21,7 +21,7 @@
/**
- * Response object that writes to a StringWriter. If the StringResponse is later converted to a
+ * Response object that writes to an AppendingStringBuffer. If the StringResponse is later converted to a
* String via toString(), the output which was written to the StringResponse will be returned as a
* String.
*
@@ -32,61 +32,63 @@
private static final int DEFAULT_INITIAL_CAPACITY = 128;
- /** StringWriter to write to */
- protected final AppendingStringBuffer out;
+ /** Initial capacity of the buffer */
+ private final int initialCapacity;
- /**
- * Constructor
- */
+ /** Buffer to write to */
+ private AppendingStringBuffer out;
+
public StringResponse()
{
this(DEFAULT_INITIAL_CAPACITY);
}
- /**
- * Constructor
- *
- * @param initialCapacity
- * the initial capacity of the internal buffer
- */
public StringResponse(int initialCapacity)
{
- out = new AppendingStringBuffer(initialCapacity);
+ this.initialCapacity = initialCapacity;
}
/**
- * @see org.apache.wicket.request.Response#write(CharSequence)
+ * @see Response#write(CharSequence)
*/
@Override
public void write(final CharSequence string)
{
+ if (out == null)
+ {
+ out = new AppendingStringBuffer(initialCapacity);
+ }
out.append(string);
}
/**
- * @see org.apache.wicket.request.Response#reset()
+ * @see Response#reset()
*/
@Override
public void reset()
{
- out.clear();
+ if (out != null)
+ {
+ out.clear();
+ }
}
/**
- * @see java.lang.Object#toString()
+ * @see Object#toString()
*/
@Override
public String toString()
{
- return out.toString();
+ return getBuffer().toString();
}
/**
- * @return The internal buffer directly as a {@link CharSequence}
+ * @return The internal buffer as a {@link CharSequence} or an empty string if no content has
+ * been written to the response
*/
public CharSequence getBuffer()
{
- return out;
+ return out != null ? out : "";
}
@Override
