Repository: camel Updated Branches: refs/heads/master 608236dd6 -> 3ea909391
CAMEL-11856: Reduce import of olingo4-core packages Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3ea90939 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3ea90939 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3ea90939 Branch: refs/heads/master Commit: 3ea909391e12e0e1511f0ff0dd4f1a47cd6acad0 Parents: 608236d Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Sep 28 11:11:28 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Sep 28 11:14:56 2017 +0200 ---------------------------------------------------------------------- .../camel/component/olingo4/api/impl/Olingo4AppImpl.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/3ea90939/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 2b90be7..2c21336 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 @@ -103,11 +103,9 @@ import org.apache.olingo.server.api.uri.UriInfoKind; import org.apache.olingo.server.api.uri.UriParameter; import org.apache.olingo.server.api.uri.UriResource; import org.apache.olingo.server.api.uri.UriResourceEntitySet; +import org.apache.olingo.server.api.uri.UriResourceFunction; import org.apache.olingo.server.api.uri.UriResourceKind; -import org.apache.olingo.server.core.uri.UriResourceFunctionImpl; import org.apache.olingo.server.core.uri.parser.Parser; -import org.apache.olingo.server.core.uri.parser.UriParserException; -import org.apache.olingo.server.core.uri.validator.UriValidationException; import static org.apache.camel.component.olingo4.api.impl.Olingo4Helper.getContentTypeHeader; @@ -411,7 +409,7 @@ public final class Olingo4AppImpl implements Olingo4App { } break; case function: - UriResourceFunctionImpl uriResourceFunction = (UriResourceFunctionImpl)listResource.get(listResource.size() - 1); + UriResourceFunction uriResourceFunction = (UriResourceFunction)listResource.get(listResource.size() - 1); EdmReturnType functionReturnType = uriResourceFunction.getFunction().getReturnType(); switch (functionReturnType.getType().getKind()) { @@ -805,7 +803,7 @@ public final class Olingo4AppImpl implements Olingo4App { try { result = parser.parseUri(resourcePath, queryOptions, null); - } catch (UriParserException | UriValidationException e) { + } catch (Exception e) { throw new IllegalArgumentException("parseUri (" + resourcePath + "," + queryOptions + "): " + e.getMessage(), e); } return result;
