Apache
/
olingo-odata4
mirror of https://github.com/apache/olingo-odata4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[OLINGO-175, OLINGO-205, OLINGO-246] fix fo build

This commit is contained in:
fmartelli 2014-04-19 13:01:17 +02:00
parent 9fa8fbc31f
commit 85a3e0e813
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fit/src/main/java/org/apache/olingo/fit/AbstractServices.java
View File

@ -212,8 +212,7 @@ public abstract class AbstractServices {
final boolean continueOnError = prefer.contains("odata.continue-on-error"); final boolean continueOnError = prefer.contains("odata.continue-on-error");
return xml.createBatchResponse( return xml.createBatchResponse(
exploreMultipart(attachment.getAllAttachments(), BOUNDARY, continueOnError), exploreMultipart(attachment.getAllAttachments(), BOUNDARY, continueOnError), BOUNDARY);
BOUNDARY);
} catch (IOException e) { } catch (IOException e) {
return xml.createFaultResponse(Accept.XML.toString(version), e); return xml.createFaultResponse(Accept.XML.toString(version), e);
} }

4
lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractBatchStreamManager.java
View File

@ -67,7 +67,7 @@ public abstract class AbstractBatchStreamManager extends AbstractODataStreamMana
streamDashBoundary(); streamDashBoundary();
final ODataChangesetResponseItem expectedResItem = new ODataChangesetResponseItem(); final ODataChangesetResponseItem expectedResItem = new ODataChangesetResponseItem();
((AbstractODataBatchRequest) req).expectedResItems.add(expectedResItem); ((AbstractODataBatchRequest) req).addExpectedResItem(expectedResItem);
currentItem = new ODataChangesetImpl(req, expectedResItem); currentItem = new ODataChangesetImpl(req, expectedResItem);
@ -88,7 +88,7 @@ public abstract class AbstractBatchStreamManager extends AbstractODataStreamMana
final ODataRetrieveResponseItem expectedResItem = new ODataRetrieveResponseItem(); final ODataRetrieveResponseItem expectedResItem = new ODataRetrieveResponseItem();
currentItem = new ODataRetrieveImpl(req, expectedResItem); currentItem = new ODataRetrieveImpl(req, expectedResItem);
((AbstractODataBatchRequest) req).expectedResItems.add(expectedResItem); ((AbstractODataBatchRequest) req).addExpectedResItem(expectedResItem);
return (ODataRetrieve) currentItem; return (ODataRetrieve) currentItem;
} }

4
lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractODataBatchRequest.java
View File

@ -49,6 +49,10 @@ public abstract class AbstractODataBatchRequest<V extends ODataResponse, T exten
*/ */
protected final List<ODataBatchResponseItem> expectedResItems = new ArrayList<ODataBatchResponseItem>(); protected final List<ODataBatchResponseItem> expectedResItems = new ArrayList<ODataBatchResponseItem>();
protected void addExpectedResItem(ODataBatchResponseItem item) {
expectedResItems.add(item);
}
/** /**
* Constructor. * Constructor.
* *

3
lib/client-core/src/test/java/org/apache/olingo/client/core/it/v4/BatchTestITCase.java
View File

@ -80,7 +80,8 @@ public class BatchTestITCase extends AbstractTestITCase {
// ------------------------ // ------------------------
// Uncomment to performe check externally ... // 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.MULTIPART_MIXED;
// ------------------------ // ------------------------
private final static String ACCEPT = ContentType.APPLICATION_OCTET_STREAM; private final static String ACCEPT = ContentType.APPLICATION_OCTET_STREAM;