You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mr...@apache.org on 2007/10/28 02:19:17 UTC
svn commit: r589250 - in /struts/sandbox/trunk/struts2-rest-plugin:
showcase/src/main/java/org/apache/struts2/rest/example/
src/main/java/org/apache/struts2/rest/
Author: mrdon
Date: Sat Oct 27 17:19:11 2007
New Revision: 589250
URL: http://svn.apache.org/viewvc?rev=589250&view=rev
Log:
Changing example to return better headers, new constructors for DefaultHttpHeader
Modified:
struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/java/org/apache/struts2/rest/example/Order.java
struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/java/org/apache/struts2/rest/example/OrdersController.java
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/DefaultHttpHeaders.java
Modified: struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/java/org/apache/struts2/rest/example/Order.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/java/org/apache/struts2/rest/example/Order.java?rev=589250&r1=589249&r2=589250&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/java/org/apache/struts2/rest/example/Order.java (original)
+++ struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/java/org/apache/struts2/rest/example/Order.java Sat Oct 27 17:19:11 2007
@@ -39,6 +39,43 @@
order.setAmount(getAmount());
order.setClientName(getClientName());
}
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + amount;
+ result = prime * result
+ + ((clientName == null) ? 0 : clientName.hashCode());
+ result = prime * result + ((id == null) ? 0 : id.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ final Order other = (Order) obj;
+ if (amount != other.amount)
+ return false;
+ if (clientName == null) {
+ if (other.clientName != null)
+ return false;
+ } else if (!clientName.equals(other.clientName))
+ return false;
+ if (id == null) {
+ if (other.id != null)
+ return false;
+ } else if (!id.equals(other.id))
+ return false;
+ return true;
+ }
+
+
}
Modified: struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/java/org/apache/struts2/rest/example/OrdersController.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/java/org/apache/struts2/rest/example/OrdersController.java?rev=589250&r1=589249&r2=589250&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/java/org/apache/struts2/rest/example/OrdersController.java (original)
+++ struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/java/org/apache/struts2/rest/example/OrdersController.java Sat Oct 27 17:19:11 2007
@@ -38,8 +38,8 @@
}
}
- public String show() {
- return "show";
+ public HttpHeaders show() {
+ return new DefaultHttpHeaders("show");
}
public String edit() {
@@ -73,8 +73,7 @@
public HttpHeaders index() {
list = new ArrayList(orders.values());
- return new DefaultHttpHeaders()
- .renderResult("index")
+ return new DefaultHttpHeaders("index")
.disableCaching();
}
Modified: struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/DefaultHttpHeaders.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/DefaultHttpHeaders.java?rev=589250&r1=589249&r2=589250&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/DefaultHttpHeaders.java (original)
+++ struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/DefaultHttpHeaders.java Sat Oct 27 17:19:11 2007
@@ -39,6 +39,12 @@
boolean noETag = false;
Date lastModified;
+ public DefaultHttpHeaders() {}
+
+ public DefaultHttpHeaders(String result) {
+ resultCode = result;
+ }
+
public DefaultHttpHeaders renderResult(String code) {
this.resultCode = code;
return this;