You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by fm...@apache.org on 2014/04/19 13:01:36 UTC
git commit: [OLINGO-175, OLINGO-205, OLINGO-246] fix fo build
Repository: olingo-odata4
Updated Branches:
refs/heads/master 9fa8fbc31 -> 85a3e0e81
[OLINGO-175, OLINGO-205, OLINGO-246] fix fo build
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/85a3e0e8
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/85a3e0e8
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/85a3e0e8
Branch: refs/heads/master
Commit: 85a3e0e813143dd4730d4bd6e1d85c2846c4c6c3
Parents: 9fa8fbc
Author: fmartelli <fa...@gmail.com>
Authored: Sat Apr 19 13:01:17 2014 +0200
Committer: fmartelli <fa...@gmail.com>
Committed: Sat Apr 19 13:01:17 2014 +0200
----------------------------------------------------------------------
fit/src/main/java/org/apache/olingo/fit/AbstractServices.java | 3 +--
.../communication/request/batch/AbstractBatchStreamManager.java | 4 ++--
.../communication/request/batch/AbstractODataBatchRequest.java | 4 ++++
.../org/apache/olingo/client/core/it/v4/BatchTestITCase.java | 3 ++-
4 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/85a3e0e8/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java b/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java
index 9c158d1..2ed2053 100644
--- a/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java
+++ b/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java
@@ -212,8 +212,7 @@ public abstract class AbstractServices {
final boolean continueOnError = prefer.contains("odata.continue-on-error");
return xml.createBatchResponse(
- exploreMultipart(attachment.getAllAttachments(), BOUNDARY, continueOnError),
- BOUNDARY);
+ exploreMultipart(attachment.getAllAttachments(), BOUNDARY, continueOnError), BOUNDARY);
} catch (IOException e) {
return xml.createFaultResponse(Accept.XML.toString(version), e);
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/85a3e0e8/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractBatchStreamManager.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractBatchStreamManager.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractBatchStreamManager.java
index aa05f36..52c40e6 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractBatchStreamManager.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractBatchStreamManager.java
@@ -67,7 +67,7 @@ public abstract class AbstractBatchStreamManager extends AbstractODataStreamMana
streamDashBoundary();
final ODataChangesetResponseItem expectedResItem = new ODataChangesetResponseItem();
- ((AbstractODataBatchRequest) req).expectedResItems.add(expectedResItem);
+ ((AbstractODataBatchRequest) req).addExpectedResItem(expectedResItem);
currentItem = new ODataChangesetImpl(req, expectedResItem);
@@ -88,7 +88,7 @@ public abstract class AbstractBatchStreamManager extends AbstractODataStreamMana
final ODataRetrieveResponseItem expectedResItem = new ODataRetrieveResponseItem();
currentItem = new ODataRetrieveImpl(req, expectedResItem);
- ((AbstractODataBatchRequest) req).expectedResItems.add(expectedResItem);
+ ((AbstractODataBatchRequest) req).addExpectedResItem(expectedResItem);
return (ODataRetrieve) currentItem;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/85a3e0e8/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractODataBatchRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractODataBatchRequest.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractODataBatchRequest.java
index fd24a69..606dec9 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractODataBatchRequest.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractODataBatchRequest.java
@@ -49,6 +49,10 @@ public abstract class AbstractODataBatchRequest<V extends ODataResponse, T exten
*/
protected final List<ODataBatchResponseItem> expectedResItems = new ArrayList<ODataBatchResponseItem>();
+ protected void addExpectedResItem(ODataBatchResponseItem item) {
+ expectedResItems.add(item);
+ }
+
/**
* Constructor.
*
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/85a3e0e8/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v4/BatchTestITCase.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v4/BatchTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v4/BatchTestITCase.java
index aabcd6d..d9b7293 100644
--- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v4/BatchTestITCase.java
+++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v4/BatchTestITCase.java
@@ -80,7 +80,8 @@ public class BatchTestITCase extends AbstractTestITCase {
// ------------------------
// Uncomment to performe check externally ...
// ------------------------
- // private final static String testStaticServiceRootURL= "http://odatae2etest.azurewebsites.net/javatest/DefaultService/";
+ // private final static String testStaticServiceRootURL=
+ // "http://odatae2etest.azurewebsites.net/javatest/DefaultService/";
// private final static String ACCEPT = ContentType.MULTIPART_MIXED;
// ------------------------
private final static String ACCEPT = ContentType.APPLICATION_OCTET_STREAM;