Removed support of POST on contacts resource and fixed PUT.

Author: jmcx

modules/org.restlet.tutorial.webapi/src/main/java/org/restlet/tutorial/resource/ContactListResource.java

@@ -25,11 +25,7 @@
 package org.restlet.tutorial.resource;
 
 import org.restlet.resource.Get;
-import org.restlet.resource.Post;
-import org.restlet.tutorial.core.exception.BadEntityException;
-import org.restlet.tutorial.representation.CompanyRepresentation;
 import org.restlet.tutorial.representation.ContactListRepresentation;
-import org.restlet.tutorial.representation.ContactRepresentation;
 import org.restlet.tutorial.representation.ContactWithCompanyListRepresentation;
 
 public interface ContactListResource {
@@ -39,9 +35,5 @@ public interface ContactListResource {
 
     @Get("?strategy=load")
     public ContactWithCompanyListRepresentation getContactsLoad();
-    
-    @Post
-    public ContactRepresentation add(ContactRepresentation contactReprIn)
-            throws BadEntityException;
 
 }

modules/org.restlet.tutorial.webapi/src/main/java/org/restlet/tutorial/resource/server/ContactListServerResource.java

@@ -29,11 +29,9 @@
 import java.util.List;
 import java.util.logging.Level;
 
-import org.restlet.data.Status;
 import org.restlet.resource.ResourceException;
 import org.restlet.resource.ServerResource;
 import org.restlet.tutorial.WebApiTutorial;
-import org.restlet.tutorial.core.exception.BadEntityException;
 import org.restlet.tutorial.core.exception.NotFoundException;
 import org.restlet.tutorial.core.util.ResourceUtils;
 import org.restlet.tutorial.persistence.ContactPersistence;
@@ -209,49 +207,4 @@ public ContactWithCompanyListRepresentation getContactsLoad()
         }
 
     }
-
-	@Override
-	public ContactRepresentation add(ContactRepresentation contactReprIn)
-			throws BadEntityException {
-		
-		getLogger().finer("Add a new contact.");
-
-        // Check authorization
-        ResourceUtils.checkRole(this, WebApiTutorial.ROLE_USER);
-        getLogger().finer("User allowed to add a contact.");
-
-        // Check entity
-        ResourceUtils.notNull(contactReprIn);
-        getLogger().finer("Contact checked");
-
-        try {
-
-            // Convert ContactRepresentation to Contact
-            Contact contactIn = ContactUtils.toContact(contactReprIn);
-
-            // Add new contact in DB and retrieve created contact
-            Contact contactOut = contactPersistence.add(contactIn);
-
-            // Convert company to CompanyRepresentation
-            ContactRepresentation result = ContactUtils
-                    .toContactRepresentation(contactOut);
-
-            // Set location of created resource and status to created (201)
-            getResponse().setLocationRef(
-                    ResourceUtils.getContactUrl(contactOut.getId()));
-            getResponse().setStatus(Status.SUCCESS_CREATED);
-
-            getLogger().finer("Contact successfully added.");
-
-            return result;
-        } catch (SQLException ex) {
-            getLogger().log(Level.WARNING, "Error when adding a contact", ex);
-            if (WebApiTutorial.SQL_STATE_23000_DUPLICATE.equals(ex
-                    .getSQLState())) {
-                throw new BadEntityException(
-                        "Can't add a contact due to integrity constraint violation.");
-            }
-            throw new ResourceException(ex);
-        }
-	}
 }

modules/org.restlet.tutorial.webapi/src/main/java/org/restlet/tutorial/resource/server/ContactServerResource.java

@@ -84,7 +84,6 @@ protected void doInit() {
                 setExisting(true);
             } else {
                 setExisting(false);
-                throw new NotFoundException("No contact with email: " + email);
             }
         } catch (SQLException ex) {
             throw new ResourceException(ex);
@@ -96,7 +95,12 @@ protected void doInit() {
     }
 
     public ContactRepresentation getContact() {
-        getLogger().finer("Retrieve a contact");
+    	
+    	getLogger().finer("Retrieve a contact");	
+    	
+    	if (contact == null){
+            throw new NotFoundException("No contact with email: " + email);
+    	}
 
         // Check authorization
         ResourceUtils.checkRole(this, WebApiTutorial.ROLE_USER);
@@ -118,6 +122,10 @@ public ContactWithCompanyRepresentation getContactLoad() {
 
         getLogger().finer("Load a contact");
 
+        if (contact == null){
+            throw new NotFoundException("No contact with email: " + email);
+    	}
+        
         // Check authorization
         ResourceUtils.checkRole(this, WebApiTutorial.ROLE_USER);
         getLogger().finer("User allowed to load a contact.");
@@ -145,6 +153,10 @@ public ContactWithCompanyRepresentation getContactLoad() {
     public void remove() throws NotFoundException {
 
         getLogger().finer("Remove a contact.");
+        
+    	if (contact == null){
+            throw new NotFoundException("No contact with email: " + email);
+    	}
 
         // Check authorization
         ResourceUtils.checkRole(this, WebApiTutorial.ROLE_OWNER);