Merge pull request spring-projects#99 from trepel/removalofputmethod

Removed HTTP PUT method - it is not supported in JSP 2.3
Jakarta-EE-Petclinic · Oct 14, 2015 · 566fdac · 566fdac
2 parents 8b5d980 + f7498c7
commit 566fdac
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 29 deletions.
diff --git a/src/main/java/org/springframework/samples/petclinic/web/OwnerController.java b/src/main/java/org/springframework/samples/petclinic/web/OwnerController.java
@@ -116,7 +116,7 @@ public String initUpdateOwnerForm(@PathVariable("ownerId") int ownerId, Model mo
         return "owners/createOrUpdateOwnerForm";
     }
 
-    @RequestMapping(value = "/owners/{ownerId}/edit", method = RequestMethod.PUT)
+    @RequestMapping(value = "/owners/{ownerId}/edit", method = RequestMethod.POST)
     public String processUpdateOwnerForm(@Valid Owner owner, BindingResult result, SessionStatus status) {
         if (result.hasErrors()) {
             return "owners/createOrUpdateOwnerForm";

diff --git a/src/main/java/org/springframework/samples/petclinic/web/PetController.java b/src/main/java/org/springframework/samples/petclinic/web/PetController.java
@@ -91,7 +91,7 @@ public String initUpdateForm(@PathVariable("petId") int petId, Map<String, Objec
         return "pets/createOrUpdatePetForm";
     }
 
-    @RequestMapping(value = "/owners/{ownerId}/pets/{petId}/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    @RequestMapping(value = "/owners/{ownerId}/pets/{petId}/edit", method = RequestMethod.POST)
     public String processUpdateForm(@Valid Pet pet, BindingResult result, SessionStatus status) {
         if (result.hasErrors()) {
             return "pets/createOrUpdatePetForm";

diff --git a/src/main/webapp/WEB-INF/jsp/owners/createOrUpdateOwnerForm.jsp b/src/main/webapp/WEB-INF/jsp/owners/createOrUpdateOwnerForm.jsp
@@ -15,15 +15,11 @@
 <body>
 <div class="container">
     <jsp:include page="../fragments/bodyHeader.jsp"/>
-    <c:choose>
-        <c:when test="${owner['new']}"><c:set var="method" value="post"/></c:when>
-        <c:otherwise><c:set var="method" value="put"/></c:otherwise>
-    </c:choose>
 
     <h2>
         <c:if test="${owner['new']}">New </c:if> Owner
     </h2>
-    <form:form modelAttribute="owner" method="${method}" class="form-horizontal" id="add-owner-form">
+    <form:form modelAttribute="owner" class="form-horizontal" id="add-owner-form">
         <petclinic:inputField label="First Name" name="firstName"/>
         <petclinic:inputField label="Last Name" name="lastName"/>
         <petclinic:inputField label="Address" name="address"/>

diff --git a/src/main/webapp/WEB-INF/jsp/pets/createOrUpdatePetForm.jsp b/src/main/webapp/WEB-INF/jsp/pets/createOrUpdatePetForm.jsp
@@ -18,21 +18,13 @@
 </script>
 <div class="container">
     <jsp:include page="../fragments/bodyHeader.jsp"/>
-    <c:choose>
-        <c:when test="${pet['new']}">
-            <c:set var="method" value="post"/>
-        </c:when>
-        <c:otherwise>
-            <c:set var="method" value="put"/>
-        </c:otherwise>
-    </c:choose>
 
     <h2>
         <c:if test="${pet['new']}">New </c:if>
         Pet
     </h2>
 
-    <form:form modelAttribute="pet" method="${method}"
+    <form:form modelAttribute="pet"
                class="form-horizontal">
         <div class="control-group" id="owner">
             <label class="control-label">Owner </label>

diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
@@ -100,19 +100,6 @@
         <url-pattern>/*</url-pattern>
     </filter-mapping>
 
-    <!-- used so we can use forms of method type 'PUT' and 'DELETE' (such as in the Pet form)
-see here: http://static.springsource.org/spring/docs/current/spring-framework-reference/html/view.html#rest-method-conversion
--->
-    <filter>
-        <filter-name>httpMethodFilter</filter-name>
-        <filter-class>org.springframework.web.filter.HiddenHttpMethodFilter</filter-class>
-    </filter>
-
-    <filter-mapping>
-        <filter-name>httpMethodFilter</filter-name>
-        <servlet-name>petclinic</servlet-name>
-    </filter-mapping>
-
      <!-- Dandelion-Datatables filter, used for basic export -->
      <filter>
         <filter-name>datatables</filter-name>