[Engine-patches] Change in ovirt-engine[master]: restapi: Add the "Expect" header to update actions

[juan . hernandez]

Juan Hernandez has uploaded a new change for review.

Change subject: restapi: Add the "Expect" header to update actions
......................................................................

restapi: Add the "Expect" header to update actions

The actions used to update entities support the "Expect" header with the
"202-accepted" value, so it should be explicitly added to the generated
RSDL document.

Change-Id: I07ff97f1bbf895043ba82c5ef1dce49e9a9f8197
Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com>
---
M 
backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/RsdlBuilder.java
1 file changed, 11 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/40/39940/1

diff --git 
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/RsdlBuilder.java
 
b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/RsdlBuilder.java
index eaa95ab..1deff88 100644
--- 
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/RsdlBuilder.java
+++ 
b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/RsdlBuilder.java
@@ -485,7 +485,14 @@
         // "201-created" value, so instead of explicitly adding it in the 
metadata file it is better to add it
         // implicitly:
         if (ADD.equals(link.getRel())) {
-            addExpectHeader(link);
+            addExpectHeader(link, "201-created");
+        }
+
+        // All the operations that update entities (those whose rel is 
"update") support the "Expect" header with the
+        // "202-accepted" value, so instead of explicitly adding it in the 
metadata file it is better to add it
+        // implicitly:
+        if (UPDATE.equals(link.getRel())) {
+            addExpectHeader(link, "202-accepted");
         }
     }
 
@@ -529,8 +536,9 @@
      * Adds the description of the {@code Expect} header to a link.
      *
      * @param link the link where the description of the header will be added
+     * @param value the value of the header
      */
-    private void addExpectHeader(DetailedLink link) {
+    private void addExpectHeader(DetailedLink link, String value) {
         Headers headers = link.getRequest().getHeaders();
         if (headers == null) {
             headers = new Headers();
@@ -538,7 +546,7 @@
         }
         Header header = new Header();
         header.setName("Expect");
-        header.setValue("201-created");
+        header.setValue(value);
         header.setRequired(false);
         headers.getHeaders().add(header);
     }


-- 
To view, visit https://gerrit.ovirt.org/39940
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I07ff97f1bbf895043ba82c5ef1dce49e9a9f8197
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Juan Hernandez <juan.hernan...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches