You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2016/03/13 08:58:42 UTC
[2/2] olingo-odata4 git commit: [OLINGO-856] Merge branch 'master'
into OLINGO-856_ODataHandlerInAPI
[OLINGO-856] Merge branch 'master' into OLINGO-856_ODataHandlerInAPI
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/64617c81
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/64617c81
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/64617c81
Branch: refs/heads/OLINGO-856_ODataHandlerInAPI
Commit: 64617c814025c44c0ac28a546bfdb03e60800aa0
Parents: 8c143c9 6278306
Author: mibo <mi...@apache.org>
Authored: Sun Mar 13 08:45:32 2016 +0100
Committer: mibo <mi...@apache.org>
Committed: Sun Mar 13 08:49:24 2016 +0100
----------------------------------------------------------------------
.../fit/tecsvc/client/FilterSystemQueryITCase.java | 4 ++--
.../main/java/org/apache/olingo/server/api/OData.java | 2 +-
.../apache/olingo/server/api/debug/DebugSupport.java | 5 ++---
.../java/org/apache/olingo/server/core/ODataImpl.java | 2 +-
.../server/core/uri/parser/ExpressionParser.java | 4 +---
.../expression/operation/BinaryOperator.java | 13 +++++++++----
6 files changed, 16 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/64617c81/lib/server-api/src/main/java/org/apache/olingo/server/api/OData.java
----------------------------------------------------------------------
diff --cc lib/server-api/src/main/java/org/apache/olingo/server/api/OData.java
index 4921ac4,26f5f61..118f07a
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/OData.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/OData.java
@@@ -98,13 -98,6 +98,13 @@@ public abstract class OData
public abstract ODataHttpHandler createHandler(ServiceMetadata serviceMetadata);
/**
+ * Creates a new ODataHandler for handling OData requests.
+ *
+ * @param serviceMetadata - metadata object required to handle an OData request
+ */
- public abstract ODataHandler createBasicHandler(ServiceMetadata serviceMetadata);
++ public abstract ODataHandler createRawHandler(ServiceMetadata serviceMetadata);
+
+ /**
* Creates a metadata object for this service.
*
* @param edmProvider a custom or default implementation for creating metadata
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/64617c81/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/DebugSupport.java
----------------------------------------------------------------------
diff --cc lib/server-api/src/main/java/org/apache/olingo/server/api/debug/DebugSupport.java
index 7fa7cd6,8a62427..054c23a
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/DebugSupport.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/DebugSupport.java
@@@ -25,17 -24,17 +25,17 @@@ import org.apache.olingo.server.api.Oli
/**
* Register this interface to add debug support to your service.
*/
- public interface DebugSupport extends OlingoExtension {
+ public interface DebugSupport {
- public static final String ODATA_DEBUG_QUERY_PARAMETER = "odata-debug";
- public static final String ODATA_DEBUG_JSON = "json";
- public static final String ODATA_DEBUG_HTML = "html";
- public static final String ODATA_DEBUG_DOWNLOAD = "download";
+ String ODATA_DEBUG_QUERY_PARAMETER = "odata-debug";
+ String ODATA_DEBUG_JSON = "json";
+ String ODATA_DEBUG_HTML = "html";
+ String ODATA_DEBUG_DOWNLOAD = "download";
/**
* Initializes the debug support implementation.
* Is called before {@link #isUserAuthorized()} and {@link #createDebugResponse(String, DebugInformation)}.
-- * @param odata
++ * @param odata related OData/Olingo service factory
*/
void init(OData odata);
@@@ -53,5 -52,5 +53,4 @@@
* @return a new debug response which will be sent to the client
*/
ODataResponse createDebugResponse(String debugFormat, DebugInformation debugInfo);
--
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/64617c81/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataImpl.java
----------------------------------------------------------------------
diff --cc lib/server-core/src/main/java/org/apache/olingo/server/core/ODataImpl.java
index e1e5553,e5c5437..65037f6
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataImpl.java
@@@ -86,13 -84,8 +86,13 @@@ public class ODataImpl extends OData
}
@Override
- public ODataHttpHandler createHandler(final ServiceMetadata edm) {
- return new ODataHttpHandlerImpl(this, edm);
+ public ODataHttpHandler createHandler(final ServiceMetadata serviceMetadata) {
+ return new ODataHttpHandlerImpl(this, serviceMetadata);
+ }
+
+ @Override
- public ODataHandler createBasicHandler(ServiceMetadata serviceMetadata) {
++ public ODataHandler createRawHandler(ServiceMetadata serviceMetadata) {
+ return new ODataHandlerImpl(this, serviceMetadata, new ServerCoreDebugger(this));
}
@Override