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/365ea6f8 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/365ea6f8 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/365ea6f8 Branch: refs/heads/master Commit: 365ea6f8b79b9d10d0f0df4ea65606a066df497c Parents: a96cc23 ce8d993 Author: Francesco Chicchiriccò <--global> Authored: Fri May 9 15:05:34 2014 +0200 Committer: Francesco Chicchiriccò <--global> Committed: Fri May 9 15:05:34 2014 +0200 ---------------------------------------------------------------------- .../ext/proxy/EntityContainerFactory.java | 5 + .../commons/AbstractTypeInvocationHandler.java | 178 +++++++------------ .../commons/ComplexTypeInvocationHandler.java | 73 +++++--- .../commons/EntityTypeInvocationHandler.java | 107 +++++++++-- .../olingo/ext/proxy/utils/EngineUtils.java | 6 +- .../proxy/v3/AuthEntityRetrieveTestITCase.java | 50 ++++++ .../proxy/v4/AuthEntityRetrieveTestITCase.java | 49 +++++ .../olingo/fit/v4/DerivedTypeTestITCase.java | 3 +- .../olingo/client/api/op/CommonODataBinder.java | 9 + .../client/core/op/impl/v3/ODataBinderImpl.java | 9 +- .../client/core/op/impl/v4/ODataBinderImpl.java | 9 +- .../core/v3/EdmEnabledODataClientImpl.java | 3 + .../core/v4/EdmEnabledODataClientImpl.java | 3 + 13 files changed, 344 insertions(+), 160 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/365ea6f8/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/EntityContainerFactory.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/365ea6f8/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/EngineUtils.java ---------------------------------------------------------------------- diff --cc ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/EngineUtils.java index 0e4ee28,b66461f..35dc7f8 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/EngineUtils.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/EngineUtils.java @@@ -153,10 -151,9 +153,10 @@@ public final class EngineUtils return getODataProperty(client, property, type, obj); } - private static CommonODataProperty getODataProperty( + public static CommonODataProperty getODataProperty( final CommonEdmEnabledODataClient<?> client, final String name, final EdmTypeInfo type, final Object obj) { - final CommonODataProperty oprop; + + CommonODataProperty oprop; try { if (type == null || obj == null) {
