Author: jsdelfino
Date: Mon Nov 5 20:57:32 2007
New Revision: 592275
URL: http://svn.apache.org/viewvc?rev=592275&view=rev
Log:
Minor change to the REST/Atom based interfaces. PUT does not need to return the
updated resource.
Modified:
incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/Collection.java
incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/MediaCollection.java
incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java
incubator/tuscany/java/sca/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClientImpl.java
incubator/tuscany/java/sca/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerCollectionImpl.java
incubator/tuscany/java/sca/modules/implementation-data/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java
incubator/tuscany/java/sca/modules/implementation-data/src/test/java/org/apache/tuscany/sca/implementation/data/companyFeed/CompanyFeed.java
incubator/tuscany/java/sca/modules/implementation-widget/src/test/java/store/ShoppingCartImpl.java
Modified:
incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/Collection.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/Collection.java?rev=592275&r1=592274&r2=592275&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/Collection.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/Collection.java
Mon Nov 5 20:57:32 2007
@@ -61,7 +61,7 @@
* @param entry
* @return
*/
- Entry put(String id, Entry entry) throws NotFoundException;
+ void put(String id, Entry entry) throws NotFoundException;
/**
* Delete an entry.
Modified:
incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/MediaCollection.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/MediaCollection.java?rev=592275&r1=592274&r2=592275&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/MediaCollection.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/MediaCollection.java
Mon Nov 5 20:57:32 2007
@@ -50,6 +50,6 @@
* @param media
* @return
*/
- Entry putMedia(String id, String contentType, InputStream media) throws
NotFoundException;
+ void putMedia(String id, String contentType, InputStream media) throws
NotFoundException;
}
Modified:
incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java?rev=592275&r1=592274&r2=592275&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java
Mon Nov 5 20:57:32 2007
@@ -483,7 +483,6 @@
if (path != null && path.startsWith("/")) {
String id = path.substring(1);
- Entry updatedEntry = null;
// Update an Atom entry
String contentType = request.getContentType();
@@ -513,8 +512,6 @@
} else {
throw new
ServletException((Throwable)responseMessage.getBody());
}
- } else {
- updatedEntry = responseMessage.getBody();
}
} else {
@@ -530,9 +527,6 @@
} else {
throw new
ServletException((Throwable)responseMessage.getBody());
}
- } else {
- item = responseMessage.getBody();
- updatedEntry = createEntry(id, item);
}
}
@@ -551,29 +545,10 @@
} else {
throw new
ServletException((Throwable)responseMessage.getBody());
}
- } else {
- updatedEntry = (Entry) body;
}
-
} else {
response.sendError(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE);
}
-
- // The entry was successfully updated
- if (updatedEntry != null) {
-
- // Write the updated Atom entry
- response.setContentType("application/atom+xml; charset=utf-8");
- try {
- AtomEntryUtil.writeEntry(updatedEntry, feedType,
getWriter(response));
- } catch (FeedException e) {
- throw new ServletException(e);
- }
-
- } else {
- response.sendError(HttpServletResponse.SC_NOT_FOUND);
- }
-
} else {
response.sendError(HttpServletResponse.SC_NOT_FOUND);
}
Modified:
incubator/tuscany/java/sca/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClientImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClientImpl.java?rev=592275&r1=592274&r2=592275&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClientImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClientImpl.java
Mon Nov 5 20:57:32 2007
@@ -51,7 +51,7 @@
System.out.println("<<< get id=" + entry.getId() + " entry=" +
entry.getTitle());
System.out.println(">>> put id=" + newEntry.getId() + " entry=" +
entry.getTitle());
- entry = resourceCollection.put(entry.getId(), updateEntry(entry,
"James Bond"));
+ resourceCollection.put(entry.getId(), updateEntry(entry, "James
Bond"));
System.out.println("<<< put id=" + entry.getId() + " entry=" +
entry.getTitle());
System.out.println(">>> delete id=" + entry.getId());
Modified:
incubator/tuscany/java/sca/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerCollectionImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerCollectionImpl.java?rev=592275&r1=592274&r2=592275&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerCollectionImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerCollectionImpl.java
Mon Nov 5 20:57:32 2007
@@ -108,12 +108,11 @@
return entries.get(id);
}
- public Entry put(String id, Entry entry) {
+ public void put(String id, Entry entry) {
System.out.println(">>> ResourceCollectionImpl.put id=" + id + "
entry=" + entry.getTitle());
entry.setUpdated(new Date());
entries.put(id, entry);
- return entry;
}
public void delete(String id) {
Modified:
incubator/tuscany/java/sca/modules/implementation-data/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-data/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java?rev=592275&r1=592274&r2=592275&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-data/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-data/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java
Mon Nov 5 20:57:32 2007
@@ -67,7 +67,7 @@
* @param item
* @return
*/
- D put(K key, D item) throws NotFoundException;
+ void put(K key, D item) throws NotFoundException;
/**
* Delete an item.
Modified:
incubator/tuscany/java/sca/modules/implementation-data/src/test/java/org/apache/tuscany/sca/implementation/data/companyFeed/CompanyFeed.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-data/src/test/java/org/apache/tuscany/sca/implementation/data/companyFeed/CompanyFeed.java?rev=592275&r1=592274&r2=592275&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-data/src/test/java/org/apache/tuscany/sca/implementation/data/companyFeed/CompanyFeed.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-data/src/test/java/org/apache/tuscany/sca/implementation/data/companyFeed/CompanyFeed.java
Mon Nov 5 20:57:32 2007
@@ -95,8 +95,7 @@
return null;
}
- public Entry put(String id, Entry entry) throws NotFoundException {
- return null;
+ public void put(String id, Entry entry) throws NotFoundException {
}
}
Modified:
incubator/tuscany/java/sca/modules/implementation-widget/src/test/java/store/ShoppingCartImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-widget/src/test/java/store/ShoppingCartImpl.java?rev=592275&r1=592274&r2=592275&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-widget/src/test/java/store/ShoppingCartImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-widget/src/test/java/store/ShoppingCartImpl.java
Mon Nov 5 20:57:32 2007
@@ -70,10 +70,9 @@
return entry;
}
- public Entry put(String id, Entry entry) throws NotFoundException {
+ public void put(String id, Entry entry) throws NotFoundException {
entry.setUpdated(new Date());
cart.put(id, entry);
- return entry;
}
public void delete(String id) throws NotFoundException {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
