You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by il...@apache.org on 2014/07/10 17:19:36 UTC
[1/2] git commit: Fixing Android functioning
Repository: olingo-odata4
Updated Branches:
refs/heads/master d1e5d2265 -> bc033b0f3
Fixing Android functioning
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/1b9c3e1e
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/1b9c3e1e
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/1b9c3e1e
Branch: refs/heads/master
Commit: 1b9c3e1e1d458730d0d7a5abe3b655f11df5cead
Parents: a82f399
Author: Francesco Chicchiriccò <--global>
Authored: Thu Jul 10 17:18:38 2014 +0200
Committer: Francesco Chicchiriccò <--global>
Committed: Thu Jul 10 17:18:38 2014 +0200
----------------------------------------------------------------------
.../request/retrieve/v4/XMLMetadataRequestImpl.java | 12 ++++++++----
.../communication/response/AbstractODataResponse.java | 9 +++++----
2 files changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/1b9c3e1e/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v4/XMLMetadataRequestImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v4/XMLMetadataRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v4/XMLMetadataRequestImpl.java
index 4645d86..814306c 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v4/XMLMetadataRequestImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v4/XMLMetadataRequestImpl.java
@@ -24,7 +24,6 @@ import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
import org.apache.olingo.client.api.communication.request.retrieve.XMLMetadataRequest;
import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
import org.apache.olingo.client.api.edm.xml.Schema;
@@ -52,7 +51,7 @@ public class XMLMetadataRequestImpl extends AbstractMetadataRequestImpl<Map<Stri
final SingleXMLMetadatRequestImpl rootReq = new SingleXMLMetadatRequestImpl((ODataClient) odataClient, uri);
final ODataRetrieveResponse<XMLMetadata> rootRes = rootReq.execute();
- final XMLMetadataResponseImpl response = new XMLMetadataResponseImpl(httpClient, rootReq.getHttpResponse());
+ final XMLMetadataResponseImpl response = new XMLMetadataResponseImpl(rootReq.getHttpResponse());
final XMLMetadata rootMetadata = rootRes.getBody();
for (Schema schema : rootMetadata.getSchemas()) {
@@ -156,8 +155,13 @@ public class XMLMetadataRequestImpl extends AbstractMetadataRequestImpl<Map<Stri
private final Map<String, Schema> schemas = new HashMap<String, Schema>();
- private XMLMetadataResponseImpl(final HttpClient client, final HttpResponse res) {
- super(client, res);
+ private XMLMetadataResponseImpl(final HttpResponse res) {
+ super();
+
+ statusCode = res.getStatusLine().getStatusCode();
+ statusMessage = res.getStatusLine().getReasonPhrase();
+
+ hasBeenInitialized = true;
}
@Override
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/1b9c3e1e/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/AbstractODataResponse.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/AbstractODataResponse.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/AbstractODataResponse.java
index 2109d96..3bac018 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/AbstractODataResponse.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/AbstractODataResponse.java
@@ -100,8 +100,7 @@ public abstract class AbstractODataResponse implements ODataResponse {
* Constructor.
*/
public AbstractODataResponse() {
- this.client = null;
- this.res = null;
+ this(null, null);
}
/**
@@ -113,7 +112,9 @@ public abstract class AbstractODataResponse implements ODataResponse {
public AbstractODataResponse(final HttpClient client, final HttpResponse res) {
this.client = client;
this.res = res;
- initFromHttpResponse(res);
+ if (res != null) {
+ initFromHttpResponse(res);
+ }
}
/**
@@ -205,7 +206,7 @@ public abstract class AbstractODataResponse implements ODataResponse {
statusCode = res.getStatusLine().getStatusCode();
statusMessage = res.getStatusLine().getReasonPhrase();
- this.hasBeenInitialized = true;
+ hasBeenInitialized = true;
return this;
}
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/olingo-odata4
Posted by il...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/olingo-odata4
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/bc033b0f
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/bc033b0f
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/bc033b0f
Branch: refs/heads/master
Commit: bc033b0f3b9fc0d823700997e9658aee90148162
Parents: 1b9c3e1 d1e5d22
Author: Francesco Chicchiriccò <--global>
Authored: Thu Jul 10 17:18:58 2014 +0200
Committer: Francesco Chicchiriccò <--global>
Committed: Thu Jul 10 17:18:58 2014 +0200
----------------------------------------------------------------------
.../communication/request/AbstractRequest.java | 3 +-
.../olingo/commons/api/domain/ODataError.java | 101 +++++++++++---
.../commons/api/domain/ODataErrorDetail.java | 33 ++++-
.../commons/core/data/ODataErrorDetailImpl.java | 57 --------
.../commons/core/data/ODataErrorImpl.java | 89 ------------
.../core/serialization/AtomDeserializer.java | 3 +-
.../JsonODataErrorDeserializer.java | 8 +-
.../JsonODataErrorDetailDeserializer.java | 3 +-
.../server/api/serializer/ODataSerializer.java | 8 ++
lib/server-core/pom.xml | 25 +++-
.../core/serializer/ODataXmlSerializerImpl.java | 6 +
.../serializer/json/ODataErrorSerializer.java | 79 +++++++++++
.../serializer/json/ODataJsonSerializer.java | 52 +++++--
.../json/ODataErrorSerializerTest.java | 135 +++++++++++++++++++
.../tecsvc/data/JsonDataProviderTest.java | 6 +-
15 files changed, 417 insertions(+), 191 deletions(-)
----------------------------------------------------------------------