Support PATCH method in HTTP controllers #9131

enonic · Jan 3, 2025 · 34eeac1 · 34eeac1
1 parent 227175a
commit 34eeac1
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 7 deletions.
diff --git a/...les/admin/admin-impl/src/test/java/com/enonic/xp/admin/impl/portal/WidgetHandlerTest.java b/...les/admin/admin-impl/src/test/java/com/enonic/xp/admin/impl/portal/WidgetHandlerTest.java
@@ -120,7 +120,7 @@ public void testOptions()
         final WebResponse response = this.handler.handle( this.request, WebResponse.create().build(), null );
         assertNotNull( response );
         assertEquals( HttpStatus.OK, response.getStatus() );
-        assertEquals( "GET,POST,HEAD,OPTIONS,PUT,DELETE,TRACE", response.getHeaders().get( "Allow" ) );
+        assertEquals( "GET,POST,HEAD,OPTIONS,PUT,DELETE,TRACE,PATCH", response.getHeaders().get( "Allow" ) );
     }
 
     @Test

diff --git a/...l/portal-impl/src/test/java/com/enonic/xp/portal/impl/handler/error/ErrorHandlerTest.java b/...l/portal-impl/src/test/java/com/enonic/xp/portal/impl/handler/error/ErrorHandlerTest.java
@@ -65,7 +65,7 @@ public void testOptions()
         final WebResponse res = this.handler.handle( this.request, PortalResponse.create().build(), null );
         assertNotNull( res );
         assertEquals( HttpStatus.OK, res.getStatus() );
-        assertEquals( "GET,POST,HEAD,OPTIONS,PUT,DELETE,TRACE", res.getHeaders().get( "Allow" ) );
+        assertEquals( "GET,POST,HEAD,OPTIONS,PUT,DELETE,TRACE,PATCH", res.getHeaders().get( "Allow" ) );
     }
 
     @Test

diff --git a/...al-impl/src/test/java/com/enonic/xp/portal/impl/handler/identity/IdentityHandlerTest.java b/...al-impl/src/test/java/com/enonic/xp/portal/impl/handler/identity/IdentityHandlerTest.java
@@ -111,7 +111,7 @@ public void testOptions()
         final WebResponse res = this.handler.handle( this.request, PortalResponse.create().build(), null );
         assertNotNull( res );
         assertEquals( HttpStatus.OK, res.getStatus() );
-        assertEquals( "GET,POST,HEAD,OPTIONS,PUT,DELETE,TRACE", res.getHeaders().get( "Allow" ) );
+        assertEquals( "GET,POST,HEAD,OPTIONS,PUT,DELETE,TRACE,PATCH", res.getHeaders().get( "Allow" ) );
     }
 
     @Test

diff --git a/...tal-impl/src/test/java/com/enonic/xp/portal/impl/handler/render/ComponentHandlerTest.java b/...tal-impl/src/test/java/com/enonic/xp/portal/impl/handler/render/ComponentHandlerTest.java
@@ -97,7 +97,7 @@ public void testOptions()
         final WebResponse res = this.handler.handle( this.request, PortalResponse.create().build(), null );
         assertNotNull( res );
         assertEquals( HttpStatus.OK, res.getStatus() );
-        assertEquals( "GET,POST,HEAD,OPTIONS,PUT,DELETE,TRACE", res.getHeaders().get( "Allow" ) );
+        assertEquals( "GET,POST,HEAD,OPTIONS,PUT,DELETE,TRACE,PATCH", res.getHeaders().get( "Allow" ) );
     }
 
     @Test

diff --git a/...l/portal-impl/src/test/java/com/enonic/xp/portal/impl/handler/render/PageHandlerTest.java b/...l/portal-impl/src/test/java/com/enonic/xp/portal/impl/handler/render/PageHandlerTest.java
@@ -92,7 +92,7 @@ public void testOptions()
         final WebResponse res = this.handler.handle( this.request, PortalResponse.create().build(), null );
         assertNotNull( res );
         assertEquals( HttpStatus.OK, res.getStatus() );
-        assertEquals( "GET,POST,HEAD,OPTIONS,PUT,DELETE,TRACE", res.getHeaders().get( "Allow" ) );
+        assertEquals( "GET,POST,HEAD,OPTIONS,PUT,DELETE,TRACE,PATCH", res.getHeaders().get( "Allow" ) );
     }
 
 

diff --git a/...rtal-impl/src/test/java/com/enonic/xp/portal/impl/handler/service/ServiceHandlerTest.java b/...rtal-impl/src/test/java/com/enonic/xp/portal/impl/handler/service/ServiceHandlerTest.java
@@ -137,7 +137,7 @@ public void testOptions()
         final WebResponse res = this.handler.handle( this.request, PortalResponse.create().build(), null );
         assertNotNull( res );
         assertEquals( HttpStatus.OK, res.getStatus() );
-        assertEquals( "GET,POST,HEAD,OPTIONS,PUT,DELETE,TRACE", res.getHeaders().get( "Allow" ) );
+        assertEquals( "GET,POST,HEAD,OPTIONS,PUT,DELETE,TRACE,PATCH", res.getHeaders().get( "Allow" ) );
     }
 
     @Test

diff --git a/modules/web/web-api/src/main/java/com/enonic/xp/web/HttpMethod.java b/modules/web/web-api/src/main/java/com/enonic/xp/web/HttpMethod.java
@@ -6,13 +6,15 @@ public enum HttpMethod
 {
     GET, POST, HEAD, OPTIONS, PUT, DELETE, TRACE, CONNECT, PATCH, PROPFIND, PROPPATCH, MKCOL, COPY, MOVE, LOCK, UNLOCK;
 
+    private static final EnumSet<HttpMethod> STANDARD_METHODS = EnumSet.of( GET, POST, HEAD, OPTIONS, PUT, DELETE, TRACE, PATCH );
+
     public static EnumSet<HttpMethod> all()
     {
         return EnumSet.allOf( HttpMethod.class );
     }
 
     public static EnumSet<HttpMethod> standard()
     {
-        return EnumSet.of( GET, POST, HEAD, OPTIONS, PUT, DELETE, TRACE );
+        return STANDARD_METHODS.clone();
     }
 }