Merge pull request #639 from martin-g/master

Do not cache the response for Wicket test application

wicket/README.md

@@ -15,7 +15,7 @@ Use [Hibernate](http://www.hibernate.org/) for interaction with MySQL database.
 ## Versions
 
 * [Java OpenJDK 1.7.0_09](http://openjdk.java.net/)
-* [Wicket 6.5.0](http://wicket.apache.org/)
+* [Wicket 6.12.0](http://wicket.apache.org/)
 * [Hibernate 4.1.1](http://www.hibernate.org/)
 * [MySQL 5.5.29](http://dev.mysql.com/)
 * [Maven 2.2.1](https://maven.apache.org/)
@@ -29,4 +29,4 @@ Use [Hibernate](http://www.hibernate.org/) for interaction with MySQL database.
 
 ### Database Mapping Test
 
-    http://localhost:8080/wicket/hello_db?queries=5
+    http://localhost:8080/wicket/hello_db?queries=5

wicket/pom.xml

@@ -20,7 +20,7 @@
 		</license>
 	</licenses>
 	<properties>
-		<wicket.version>6.5.0</wicket.version>
+		<wicket.version>6.12.0</wicket.version>
 		<jetty.version>7.5.0.v20110901</jetty.version>
 	</properties>
 	<dependencies>
@@ -145,13 +145,13 @@
 							<port>8080</port>
 							<maxIdleTime>3600000</maxIdleTime>
 						</connector>
-						<connector implementation="org.eclipse.jetty.server.ssl.SslSocketConnector">
+						<!--connector implementation="org.eclipse.jetty.server.ssl.SslSocketConnector">
 							<port>8443</port>
 							<maxIdleTime>3600000</maxIdleTime>
 							<keystore>${project.build.directory}/test-classes/keystore</keystore>
 							<password>wicket</password>
 							<keyPassword>wicket</keyPassword>
-						</connector>
+						</connector-->
 					</connectors>
 				</configuration>
 			</plugin>

wicket/src/main/java/hellowicket/HelloDbResponse.java

@@ -40,7 +40,16 @@ public class HelloDbResponse extends AbstractResource
 
         try
         {
-          attributes.getResponse().write(HelloDbResponse.mapper.writeValueAsString(worlds));
+          String data;
+          if (queries == 1)
+          {
+              data = HelloDbResponse.mapper.writeValueAsString(worlds[0]);
+          }
+          else
+          {
+              data = HelloDbResponse.mapper.writeValueAsString(worlds);
+          }
+          attributes.getResponse().write(data);
         }
         catch (IOException ex)
         {

wicket/src/main/java/hellowicket/WicketApplication.java

@@ -8,7 +8,7 @@ import org.apache.wicket.protocol.http.WebApplication;
  * @see hellowicket.Start#main(String[])
  */
 public class WicketApplication extends WebApplication
-{    	
+{
 	/**
 	 * @see org.apache.wicket.Application#getHomePage()
 	 */
@@ -27,7 +27,13 @@ public class WicketApplication extends WebApplication
 		super.init();
 
 		// add your configuration here
-    mountResource("/json", new HelloJsonReference());
-    mountResource("/db", new HelloDbReference());
+
+		// mount the resources under test
+		mountResource("/json", new HelloJsonReference());
+		mountResource("/db", new HelloDbReference());
+
+		// disable response caching to be more close to other
+		// test applications' behavior
+		getRequestCycleSettings().setBufferResponse(false);
 	}
 }