You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2014/11/18 16:12:12 UTC
[11/22] olingo-odata4 git commit: Merge method removed
Merge method removed
Signed-off-by: Christian Amend <ch...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/5f4eb03d
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/5f4eb03d
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/5f4eb03d
Branch: refs/heads/master
Commit: 5f4eb03df3e980dd2c4593ddb900e15290ac057d
Parents: bb4b554
Author: Christian Holzer <c....@sap.com>
Authored: Thu Nov 6 17:48:33 2014 +0100
Committer: Christian Amend <ch...@apache.org>
Committed: Thu Nov 13 17:10:59 2014 +0100
----------------------------------------------------------------------
.../server/core/batch/transformator/HttpRequestStatusLine.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5f4eb03d/lib/server-core/src/main/java/org/apache/olingo/server/core/batch/transformator/HttpRequestStatusLine.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/batch/transformator/HttpRequestStatusLine.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/batch/transformator/HttpRequestStatusLine.java
index 416d593..c08bb2e 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/batch/transformator/HttpRequestStatusLine.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/batch/transformator/HttpRequestStatusLine.java
@@ -40,10 +40,7 @@ public class HttpRequestStatusLine {
private static final Set<String> HTTP_BATCH_METHODS = new HashSet<String>(Arrays.asList(new String[] { "GET" }));
private static final Set<String> HTTP_CHANGE_SET_METHODS = new HashSet<String>(Arrays.asList(new String[] { "POST",
- "PUT", "DELETE", "MERGE", "PATCH" }));
- // TODO Is Merge still supported?
- // What`s New in OData 4: 2.7.2 Pruned: MERGE
- // MERGE was used to do PATCH before PATCH existed. Now that we have PATCH, we no longer need MERGE. => No
+ "PUT", "DELETE", "PATCH" }));
private static final String HTTP_VERSION = "HTTP/1.1";
final private Line statusLine;