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/07 14:50:19 UTC
[3/3] olingo-odata4 git commit: [OLINGO-482] non-standard HTTP MERGE
not to be used in server part
[OLINGO-482] non-standard HTTP MERGE not to be used in server part
Change-Id: I425dd5b79617ca7f1a56818d0bb106611792ebd5
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/300250af
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/300250af
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/300250af
Branch: refs/heads/master
Commit: 300250af3c2aa326dc7aea4418f3175f1fa4420f
Parents: a405e5b
Author: Klaus Straubinger <kl...@sap.com>
Authored: Fri Nov 7 08:53:00 2014 +0100
Committer: Christian Amend <ch...@apache.org>
Committed: Fri Nov 7 14:49:31 2014 +0100
----------------------------------------------------------------------
.../apache/olingo/server/core/uri/validator/UriValidator.java | 7 +------
.../apache/olingo/server/core/ODataHttpHandlerImplTest.java | 5 ++---
.../java/org/apache/olingo/server/core/ODataHandlerTest.java | 2 --
.../olingo/server/core/uri/validator/UriValidatorTest.java | 1 -
4 files changed, 3 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/300250af/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/UriValidator.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/UriValidator.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/UriValidator.java
index 32fc690..b66856d 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/UriValidator.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/UriValidator.java
@@ -84,7 +84,6 @@ public class UriValidator {
/* PUT 0 */ { false , false , false , false, false , false , false , false , false , false , false , false },
/* DELETE 0 */ { false , false , false , false, false , false, false , false, false , false , false, false },
/* PATCH 0 */ { false , false , false , false, false , false , false , false , false , false , false , false },
- /* MERGE 0 */ { false , false , false , false, false , false , false , false , false , false , false , false },
};
//CHECKSTYLE:ON
@@ -154,8 +153,7 @@ public class UriValidator {
POST(1),
PUT(2),
DELETE(3),
- MERGE(4),
- PATCH(5);
+ PATCH(4);
private int idx;
@@ -602,9 +600,6 @@ public class UriValidator {
case PATCH:
idx = RowIndexForHttpMethod.PATCH;
break;
- case MERGE:
- idx = RowIndexForHttpMethod.MERGE;
- break;
default:
throw new UriValidationException("HTTP method not supported: " + httpMethod,
UriValidationException.MessageKeys.UNSUPPORTED_HTTP_METHOD, httpMethod.toString());
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/300250af/lib/server-core/src/test/java/org/apache/olingo/server/core/ODataHttpHandlerImplTest.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/ODataHttpHandlerImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/ODataHttpHandlerImplTest.java
index a81af68..8200c32 100644
--- a/lib/server-core/src/test/java/org/apache/olingo/server/core/ODataHttpHandlerImplTest.java
+++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/ODataHttpHandlerImplTest.java
@@ -38,7 +38,6 @@ public class ODataHttpHandlerImplTest {
{ "GET", null, null, "GET" },
{ "GET", "xxx", "yyy", "GET" },
{ "PUT", "xxx", "yyy", "PUT" },
- { "MERGE", "xxx", "yyy", "MERGE" },
{ "DELETE", "xxx", "yyy", "DELETE" },
{ "PATCH", "xxx", "yyy", "PATCH" },
@@ -47,7 +46,7 @@ public class ODataHttpHandlerImplTest {
{ "POST", null, "PATCH", "PATCH" },
{ "POST", "GET", null, "GET" },
- { "POST", "MERGE", null, "MERGE" },
+ { "POST", "PATCH", null, "PATCH" },
{ "POST", "GET", "GET", "GET" },
};
@@ -71,7 +70,7 @@ public class ODataHttpHandlerImplTest {
public void extractMethodFail() throws Exception {
String[][] mm = {
{ "POST", "bla", null },
- { "POST", "MERGE", "PATCH" },
+ { "POST", "PUT", "PATCH" },
{ "OPTIONS", null, null },
{ "HEAD", null, null },
};
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/300250af/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerTest.java
----------------------------------------------------------------------
diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerTest.java
index f49b4d4..8785845 100644
--- a/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerTest.java
+++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerTest.java
@@ -77,7 +77,6 @@ public class ODataHandlerTest {
dispatchMethodNotAllowed(HttpMethod.POST, "/", processor);
dispatchMethodNotAllowed(HttpMethod.PUT, "/", processor);
dispatchMethodNotAllowed(HttpMethod.PATCH, "/", processor);
- dispatchMethodNotAllowed(HttpMethod.MERGE, "/", processor);
dispatchMethodNotAllowed(HttpMethod.DELETE, "/", processor);
}
@@ -116,7 +115,6 @@ public class ODataHandlerTest {
dispatchMethodNotAllowed(HttpMethod.POST, "$metadata", processor);
dispatchMethodNotAllowed(HttpMethod.PUT, "$metadata", processor);
dispatchMethodNotAllowed(HttpMethod.PATCH, "$metadata", processor);
- dispatchMethodNotAllowed(HttpMethod.MERGE, "$metadata", processor);
dispatchMethodNotAllowed(HttpMethod.DELETE, "$metadata", processor);
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/300250af/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/validator/UriValidatorTest.java
----------------------------------------------------------------------
diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/validator/UriValidatorTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/validator/UriValidatorTest.java
index 02b51b1..7a5c692 100644
--- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/validator/UriValidatorTest.java
+++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/validator/UriValidatorTest.java
@@ -266,7 +266,6 @@ public class UriValidatorTest {
validator.validate(uri, HttpMethod.PUT);
validator.validate(uri, HttpMethod.DELETE);
validator.validate(uri, HttpMethod.PATCH);
- validator.validate(uri, HttpMethod.MERGE);
}
@Test