Repository: camel Updated Branches: refs/heads/master 390b4d78f -> 0816a6fe1
CAMEL-11860: camel-olingo4- Upgrade to olingo 4.4 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0816a6fe Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0816a6fe Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0816a6fe Branch: refs/heads/master Commit: 0816a6fe1f247d29e1a72db3d8d20a926fcf8d1e Parents: 390b4d7 Author: Viral Gohel <vrlgohe...@gmail.com> Authored: Fri Sep 29 15:52:47 2017 +0530 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Thu Oct 12 10:37:03 2017 +0200 ---------------------------------------------------------------------- .../olingo4/api/impl/Olingo4AppImpl.java | 27 ++++++++++---------- parent/pom.xml | 2 +- 2 files changed, 15 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/0816a6fe/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/impl/Olingo4AppImpl.java ---------------------------------------------------------------------- diff --git a/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/impl/Olingo4AppImpl.java b/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/impl/Olingo4AppImpl.java index 2c21336..c8c685d 100644 --- a/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/impl/Olingo4AppImpl.java +++ b/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/impl/Olingo4AppImpl.java @@ -141,6 +141,7 @@ public final class Olingo4AppImpl implements Olingo4App { private final ODataWriter odataWriter = odataClient.getWriter(); private String serviceUri; + private ContentType contentType; private Map<String, String> httpHeaders; @@ -231,7 +232,7 @@ public final class Olingo4AppImpl implements Olingo4App { public <T> void read(final Edm edm, final String resourcePath, final Map<String, String> queryParams, final Map<String, String> endpointHttpHeaders, final Olingo4ResponseHandler<T> responseHandler) { final String queryOptions = concatQueryParams(queryParams); - final UriInfo uriInfo = parseUri(edm, resourcePath, queryOptions); + final UriInfo uriInfo = parseUri(edm, resourcePath, queryOptions, serviceUri); execute(new HttpGet(createUri(resourcePath, queryOptions)), getResourceContentType(uriInfo), endpointHttpHeaders, new AbstractFutureCallback<T>(responseHandler) { @@ -247,7 +248,7 @@ public final class Olingo4AppImpl implements Olingo4App { public void uread(final Edm edm, final String resourcePath, final Map<String, String> queryParams, final Map<String, String> endpointHttpHeaders, final Olingo4ResponseHandler<InputStream> responseHandler) { final String queryOptions = concatQueryParams(queryParams); - final UriInfo uriInfo = parseUri(edm, resourcePath, queryOptions); + final UriInfo uriInfo = parseUri(edm, resourcePath, queryOptions, serviceUri); execute(new HttpGet(createUri(resourcePath, queryOptions)), getResourceContentType(uriInfo), endpointHttpHeaders, new AbstractFutureCallback<InputStream>(responseHandler) { @@ -267,14 +268,14 @@ public final class Olingo4AppImpl implements Olingo4App { @Override public <T> void create(final Edm edm, final String resourcePath, final Map<String, String> endpointHttpHeaders, final Object data, final Olingo4ResponseHandler<T> responseHandler) { - final UriInfo uriInfo = parseUri(edm, resourcePath, null); + final UriInfo uriInfo = parseUri(edm, resourcePath, null, serviceUri); writeContent(edm, new HttpPost(createUri(resourcePath, null)), uriInfo, data, endpointHttpHeaders, responseHandler); } @Override public <T> void update(final Edm edm, final String resourcePath, final Map<String, String> endpointHttpHeaders, final Object data, final Olingo4ResponseHandler<T> responseHandler) { - final UriInfo uriInfo = parseUri(edm, resourcePath, null); + final UriInfo uriInfo = parseUri(edm, resourcePath, null, serviceUri); writeContent(edm, new HttpPut(createUri(resourcePath, null)), uriInfo, data, endpointHttpHeaders, responseHandler); } @@ -292,21 +293,21 @@ public final class Olingo4AppImpl implements Olingo4App { @Override public <T> void patch(final Edm edm, final String resourcePath, final Map<String, String> endpointHttpHeaders, final Object data, final Olingo4ResponseHandler<T> responseHandler) { - final UriInfo uriInfo = parseUri(edm, resourcePath, null); + final UriInfo uriInfo = parseUri(edm, resourcePath, null, serviceUri); writeContent(edm, new HttpPatch(createUri(resourcePath, null)), uriInfo, data, endpointHttpHeaders, responseHandler); } @Override public <T> void merge(final Edm edm, final String resourcePath, final Map<String, String> endpointHttpHeaders, final Object data, final Olingo4ResponseHandler<T> responseHandler) { - final UriInfo uriInfo = parseUri(edm, resourcePath, null); + final UriInfo uriInfo = parseUri(edm, resourcePath, null, serviceUri); writeContent(edm, new HttpMerge(createUri(resourcePath, null)), uriInfo, data, endpointHttpHeaders, responseHandler); } @Override public void batch(final Edm edm, final Map<String, String> endpointHttpHeaders, final Object data, final Olingo4ResponseHandler<List<Olingo4BatchResponse>> responseHandler) { - final UriInfo uriInfo = parseUri(edm, SegmentType.BATCH.getValue(), null); + final UriInfo uriInfo = parseUri(edm, SegmentType.BATCH.getValue(), null, serviceUri); writeContent(edm, new HttpPost(createUri(SegmentType.BATCH.getValue(), null)), uriInfo, data, endpointHttpHeaders, responseHandler); } @@ -563,7 +564,7 @@ public final class Olingo4AppImpl implements Olingo4App { final Olingo4BatchQueryRequest batchQueryPart = (Olingo4BatchQueryRequest)batchPart; final String batchQueryUri = createUri(StringUtils.isBlank(batchQueryPart.getResourceUri()) ? serviceUri : batchQueryPart.getResourceUri(), batchQueryPart.getResourcePath(), concatQueryParams(batchQueryPart.getQueryParams())); - final UriInfo uriInfo = parseUri(edm, batchQueryPart.getResourcePath(), concatQueryParams(batchQueryPart.getQueryParams())); + final UriInfo uriInfo = parseUri(edm, batchQueryPart.getResourcePath(), concatQueryParams(batchQueryPart.getQueryParams()), serviceUri); batchRequestHeaderOutputStream.write(ODataStreamer.CRLF); batchRequestHeaderOutputStream.write((HttpGet.METHOD_NAME + " " + batchQueryUri + " " + HttpVersion.HTTP_1_1).getBytes(Constants.UTF8)); @@ -583,7 +584,7 @@ public final class Olingo4AppImpl implements Olingo4App { final Olingo4BatchChangeRequest batchChangePart = (Olingo4BatchChangeRequest)batchPart; final String batchChangeUri = createUri(StringUtils.isBlank(batchChangePart.getResourceUri()) ? serviceUri : batchChangePart.getResourceUri(), batchChangePart.getResourcePath(), null); - final UriInfo uriInfo = parseUri(edm, batchChangePart.getResourcePath(), null); + final UriInfo uriInfo = parseUri(edm, batchChangePart.getResourcePath(), null, serviceUri); if (batchChangePart.getOperation() != Operation.DELETE) { writeHttpHeader(batchRequestHeaderOutputStream, CONTENT_ID_HEADER, batchChangePart.getContentId()); @@ -656,7 +657,7 @@ public final class Olingo4AppImpl implements Olingo4App { Map<String, String> batchPartHeaders = getHeadersValueMap(batchPartHttpResponse.getAllHeaders()); if (batchPartRequest instanceof Olingo4BatchQueryRequest) { Olingo4BatchQueryRequest batchPartQueryRequest = (Olingo4BatchQueryRequest)batchPartRequest; - final UriInfo uriInfo = parseUri(edm, batchPartQueryRequest.getResourcePath(), null); + final UriInfo uriInfo = parseUri(edm, batchPartQueryRequest.getResourcePath(), null, serviceUri); if (HttpStatusCode.BAD_REQUEST.getStatusCode() <= batchPartLineStatusCode && batchPartLineStatusCode <= AbstractFutureCallback.NETWORK_CONNECT_TIMEOUT_ERROR) { final ContentType responseContentType = getContentTypeHeader(batchPartHttpResponse); @@ -681,7 +682,7 @@ public final class Olingo4AppImpl implements Olingo4App { } else { final UriInfo uriInfo = parseUri(edm, batchPartChangeRequest.getResourcePath() + (batchPartChangeRequest.getOperation() == Operation.CREATE ? CLIENT_ENTITY_FAKE_MARKER : ""), - null); + null, serviceUri); content = readContent(uriInfo, batchPartHttpResponse.getEntity().getContent()); } } @@ -797,12 +798,12 @@ public final class Olingo4AppImpl implements Olingo4App { return concatQuery.toString().replaceAll(" *", "%20"); } - private static UriInfo parseUri(Edm edm, String resourcePath, String queryOptions) { + private static UriInfo parseUri(Edm edm, String resourcePath, String queryOptions, String serviceUri) { Parser parser = new Parser(edm, OData.newInstance()); UriInfo result; try { - result = parser.parseUri(resourcePath, queryOptions, null); + result = parser.parseUri(resourcePath, queryOptions, null, serviceUri); } catch (Exception e) { throw new IllegalArgumentException("parseUri (" + resourcePath + "," + queryOptions + "): " + e.getMessage(), e); } http://git-wip-us.apache.org/repos/asf/camel/blob/0816a6fe/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 6b0bf41..a935632 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -528,7 +528,7 @@ <olingo2-version>2.0.9</olingo2-version> <olingo-odata2-core-bundle-version>2.0.9_1</olingo-odata2-core-bundle-version> <olingo2-gson-version>2.4</olingo2-gson-version> - <olingo4-version>4.3.0</olingo4-version> + <olingo4-version>4.4.0</olingo4-version> <ognl-version>3.1.12</ognl-version> <ognl-bundle-version>3.1.12_1</ognl-bundle-version> <oncrpc-version>1.1.3</oncrpc-version>
