[OLINGO-852] less warnings + general clean-up Signed-off-by: Christian Amend <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/5d7c1287 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/5d7c1287 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/5d7c1287 Branch: refs/heads/OLINGO-832_StreamSerializerPoC Commit: 5d7c1287f042fbb6c50e815c2dc1af9903b74951 Parents: 110c7b0 Author: Klaus Straubinger <[email protected]> Authored: Thu Feb 4 12:28:35 2016 +0100 Committer: Christian Amend <[email protected]> Committed: Thu Feb 4 12:42:29 2016 +0100 ---------------------------------------------------------------------- .../commons/AbstractInvocationHandler.java | 17 +- .../AbstractStructuredInvocationHandler.java | 2 +- .../commons/AnnotatationsInvocationHandler.java | 2 +- .../ComplexCollectionInvocationHandler.java | 2 +- .../proxy/commons/ComplexInvocationHandler.java | 6 +- .../proxy/commons/EdmStreamValueHandler.java | 2 +- .../EntityCollectionInvocationHandler.java | 2 +- .../EntityContainerInvocationHandler.java | 4 +- .../proxy/commons/EntityInvocationHandler.java | 6 +- .../commons/EntitySetInvocationHandler.java | 2 +- .../proxy/commons/InvokerInvocationHandler.java | 2 +- .../commons/OperationInvocationHandler.java | 2 +- .../PrimitiveCollectionInvocationHandler.java | 2 +- ...turedComposableInvokerInvocationHandler.java | 2 +- .../olingo/ext/proxy/utils/CoreUtils.java | 5 +- .../org/apache/olingo/fit/AbstractServices.java | 1947 -------------- .../main/java/org/apache/olingo/fit/Demo.java | 6 +- .../java/org/apache/olingo/fit/OpenType.java | 5 +- .../java/org/apache/olingo/fit/Services.java | 2511 +++++++++++++++--- .../org/apache/olingo/fit/Vocabularies.java | 10 +- .../apache/olingo/fit/metadata/EntitySet.java | 8 - .../olingo/fit/rest/OAuth2RequestFilter.java | 3 +- .../fit/serializer/FITAtomDeserializer.java | 13 +- .../olingo/fit/utils/AbstractUtilities.java | 22 +- .../org/apache/olingo/fit/utils/Accept.java | 31 +- .../org/apache/olingo/fit/utils/Commons.java | 24 +- .../apache/olingo/fit/utils/ConstantKey.java | 10 +- .../org/apache/olingo/fit/utils/Constants.java | 7 - .../org/apache/olingo/fit/utils/FSManager.java | 25 +- .../fit/utils/InjectableSerializerProvider.java | 42 - .../apache/olingo/fit/utils/JSONUtilities.java | 14 +- .../olingo/fit/utils/MetadataLinkInfo.java | 182 -- .../apache/olingo/fit/utils/XMLUtilities.java | 3 + .../proxy/demo/odatademo/types/Customer.java | 6 +- .../proxy/demo/odatademo/types/Employee.java | 6 +- .../demo/odatademo/types/FeaturedProduct.java | 6 +- .../opentypesservice/types/IndexedRow.java | 8 +- .../odatawcfservice/types/CreditCardPI.java | 6 +- .../odatawcfservice/types/Customer.java | 6 +- .../odatawcfservice/types/Employee.java | 6 +- .../odatawcfservice/types/PublicCompany.java | 8 +- .../tecsvc/client/EntityReferencesITCase.java | 13 +- .../ExpandWithSystemQueryOptionsITCase.java | 74 +- .../core/domain/AbstractClientEntitySet.java | 114 - .../core/domain/ClientCollectionValueImpl.java | 2 +- .../client/core/domain/ClientEntitySetImpl.java | 74 +- .../core/domain/ClientPrimitiveValueImpl.java | 5 +- .../client/core/domain/ClientPropertyImpl.java | 135 +- .../client/core/domain/ClientValuableImpl.java | 22 +- .../core/serialization/ODataBinderImpl.java | 2 +- .../apache/olingo/client/core/AbstractTest.java | 9 +- .../org/apache/olingo/client/core/AtomTest.java | 6 - .../olingo/client/core/EntitySetTest.java | 22 +- .../apache/olingo/client/core/EntityTest.java | 73 +- .../apache/olingo/client/core/ErrorTest.java | 8 +- .../org/apache/olingo/client/core/JSONTest.java | 46 +- .../apache/olingo/client/core/MetadataTest.java | 33 +- .../olingo/client/core/PrimitiveValueTest.java | 22 +- .../apache/olingo/client/core/PropertyTest.java | 38 +- .../olingo/client/core/ServiceDocumentTest.java | 16 +- .../client/core/uri/FilterFactoryTest.java | 8 +- .../olingo/client/core/uri/URIBuilderTest.java | 71 +- .../olingo/commons/api/edm/geo/Geospatial.java | 7 +- .../core/edm/EdmNavigationPropertyImpl.java | 3 +- .../commons/core/edm/EdmParameterImpl.java | 3 +- .../commons/core/edm/EdmPropertyImpl.java | 5 +- .../core/batchhandler/BatchFacadeImpl.java | 18 +- .../server/core/batchhandler/BatchHandler.java | 2 +- 68 files changed, 2488 insertions(+), 3316 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5d7c1287/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractInvocationHandler.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractInvocationHandler.java index 258a496..ff4663e 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractInvocationHandler.java @@ -69,7 +69,7 @@ abstract class AbstractInvocationHandler implements InvocationHandler { return service.getContext(); } - protected boolean isSelfMethod(final Method method, final Object[] args) { + protected boolean isSelfMethod(final Method method) { final Method[] selfMethods = getClass().getMethods(); boolean result = false; @@ -161,7 +161,7 @@ abstract class AbstractInvocationHandler implements InvocationHandler { CoreUtils.addProperties(getClient(), handler.getPropertyChanges(), template); final Object key = CoreUtils.getKey(getClient(), handler, handler.getUUID().getType(), template); - entityURI = CoreUtils.buildEditLink(getClient(), baseURI.toASCIIString(), template, key).build(); + entityURI = CoreUtils.buildEditLink(getClient(), baseURI.toASCIIString(), key).build(); template.setEditLink(entityURI); } else { entityURI = handler.getEntityURI(); @@ -182,32 +182,25 @@ abstract class AbstractInvocationHandler implements InvocationHandler { } } - protected static URIBuilder buildEntitySetURI( - final Class<?> ref, - final AbstractService<?> service) { + protected static URIBuilder buildEntitySetURI(final Class<?> ref, final AbstractService<?> service) { - final String containerNS; final String entitySetName; Annotation ann = ref.getAnnotation(EntitySet.class); if (ann instanceof EntitySet) { - containerNS = EntitySet.class.cast(ann).container(); entitySetName = EntitySet.class.cast(ann).name(); } else { ann = ref.getAnnotation(Singleton.class); if (ann instanceof Singleton) { - containerNS = Singleton.class.cast(ann).container(); entitySetName = Singleton.class.cast(ann).name(); } else { - containerNS = null; entitySetName = null; } } - return buildEntitySetURI(containerNS, entitySetName, service); + return buildEntitySetURI(entitySetName, service); } - protected static URIBuilder buildEntitySetURI( - final String containerNS, final String entitySetName, final AbstractService<?> service) { + protected static URIBuilder buildEntitySetURI(final String entitySetName, final AbstractService<?> service) { final URIBuilder uriBuilder = service.getClient().newURIBuilder(); final StringBuilder entitySetSegment = new StringBuilder(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5d7c1287/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractStructuredInvocationHandler.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractStructuredInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractStructuredInvocationHandler.java index 96b3f26..a448186 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractStructuredInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractStructuredInvocationHandler.java @@ -210,7 +210,7 @@ public abstract class AbstractStructuredInvocationHandler extends AbstractInvoca || "refs".equals(method.getName())) { invokeSelfMethod(method, args); return proxy; - } else if (isSelfMethod(method, args)) { + } else if (isSelfMethod(method)) { return invokeSelfMethod(method, args); } else if ("load".equals(method.getName()) && ArrayUtils.isEmpty(args)) { load(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5d7c1287/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AnnotatationsInvocationHandler.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AnnotatationsInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AnnotatationsInvocationHandler.java index fcd5078..8f0951d 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AnnotatationsInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AnnotatationsInvocationHandler.java @@ -55,7 +55,7 @@ public class AnnotatationsInvocationHandler extends AbstractInvocationHandler { @Override public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable { - if (isSelfMethod(method, args)) { + if (isSelfMethod(method)) { return invokeSelfMethod(method, args); } else if (method.getName().startsWith("get") && method.getName().endsWith("Annotations")) { final Method getter = proxy.getClass().getInterfaces()[0].getMethod(method.getName()); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5d7c1287/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexCollectionInvocationHandler.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexCollectionInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexCollectionInvocationHandler.java index ff4fc66..8699ed4 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexCollectionInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexCollectionInvocationHandler.java @@ -80,7 +80,7 @@ public class ComplexCollectionInvocationHandler<T extends ComplexType<?>> invokeSelfMethod(method, args); return proxy; - } else if (isSelfMethod(method, args)) { + } else if (isSelfMethod(method)) { return invokeSelfMethod(method, args); } else if ("operations".equals(method.getName()) && ArrayUtils.isEmpty(args)) { final Class<?> returnType = method.getReturnType(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5d7c1287/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexInvocationHandler.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexInvocationHandler.java index 3aa3326..1e2197c 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexInvocationHandler.java @@ -63,11 +63,7 @@ public class ComplexInvocationHandler extends AbstractStructuredInvocationHandle return new ImmutablePair<ClientComplexValue, Class<?>>(complex, complexTypeRef); } - public static ComplexInvocationHandler getInstance( - final String propertyName, - final EntityInvocationHandler handler, - final Class<?> typeRef) { - + public static ComplexInvocationHandler getInstance(final EntityInvocationHandler handler, final Class<?> typeRef) { final Pair<ClientComplexValue, Class<?>> init = init(typeRef, handler.service); return new ComplexInvocationHandler(init.getLeft(), init.getRight(), handler); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5d7c1287/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EdmStreamValueHandler.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EdmStreamValueHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EdmStreamValueHandler.java index d197f58..c13a3cf 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EdmStreamValueHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EdmStreamValueHandler.java @@ -59,7 +59,7 @@ public class EdmStreamValueHandler extends AbstractInvocationHandler { load(); return proxy; } else { - if (isSelfMethod(method, args)) { + if (isSelfMethod(method)) { return invokeSelfMethod(method, args); } else { throw new NoSuchMethodException(method.getName()); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5d7c1287/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityCollectionInvocationHandler.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityCollectionInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityCollectionInvocationHandler.java index 5c8da2c..e7d819a 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityCollectionInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityCollectionInvocationHandler.java @@ -62,7 +62,7 @@ public class EntityCollectionInvocationHandler<T extends EntityType<?>> || "execute".equals(method.getName())) { invokeSelfMethod(method, args); return proxy; - } else if (isSelfMethod(method, args)) { + } else if (isSelfMethod(method)) { return invokeSelfMethod(method, args); } else if ("operations".equals(method.getName()) && ArrayUtils.isEmpty(args)) { final Class<?> returnType = method.getReturnType(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5d7c1287/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityContainerInvocationHandler.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityContainerInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityContainerInvocationHandler.java index cb72126..af8101b 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityContainerInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityContainerInvocationHandler.java @@ -80,7 +80,7 @@ public final class EntityContainerInvocationHandler extends AbstractInvocationHa @Override public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable { - if (isSelfMethod(method, args)) { + if (isSelfMethod(method)) { return invokeSelfMethod(method, args); } else if ("flush".equals(method.getName()) && ArrayUtils.isEmpty(args)) { service.getPersistenceManager().flush(); @@ -114,7 +114,7 @@ public final class EntityContainerInvocationHandler extends AbstractInvocationHa final Class<?> typeRef = method.getReturnType(); final Singleton singleton = method.getAnnotation(Singleton.class); - final URI uri = buildEntitySetURI(singleton.container(), singleton.name(), service).build(); + final URI uri = buildEntitySetURI(singleton.name(), service).build(); final EntityUUID uuid = new EntityUUID(uri, typeRef); LOG.debug("Ask for singleton '{}'", typeRef.getSimpleName()); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5d7c1287/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityInvocationHandler.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityInvocationHandler.java index c124402..e993140 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityInvocationHandler.java @@ -191,7 +191,7 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler this.uri = getClient().newURIBuilder(baseURI.toASCIIString()); } else if (key != null) { final URIBuilder uriBuilder = - CoreUtils.buildEditLink(getClient(), entitySetURI.toASCIIString(), entity, key); + CoreUtils.buildEditLink(getClient(), entitySetURI.toASCIIString(), key); this.uri = uriBuilder; this.baseURI = this.uri.build(); @@ -219,7 +219,7 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler if (this.uri == null) { final URIBuilder uriBuilder = entity.getEditLink() == null - ? CoreUtils.buildEditLink(getClient(), getUUID().getEntitySetURI().toASCIIString(), entity, key) + ? CoreUtils.buildEditLink(getClient(), getUUID().getEntitySetURI().toASCIIString(), key) : getClient().newURIBuilder(entity.getEditLink().toASCIIString()); this.uri = uriBuilder; @@ -252,7 +252,7 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler if (this.uri == null) { final URIBuilder uriBuilder = getEntity().getEditLink() == null - ? CoreUtils.buildEditLink(getClient(), entitySetURI.toASCIIString(), getEntity(), key) + ? CoreUtils.buildEditLink(getClient(), entitySetURI.toASCIIString(), key) : getClient().newURIBuilder(getEntity().getEditLink().toASCIIString()); this.uri = uriBuilder; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5d7c1287/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetInvocationHandler.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetInvocationHandler.java index 8250f72..9d1970a 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetInvocationHandler.java @@ -84,7 +84,7 @@ public class EntitySetInvocationHandler< invokeSelfMethod(method, args); return proxy; - } else if (isSelfMethod(method, args)) { + } else if (isSelfMethod(method)) { return invokeSelfMethod(method, args); } else { throw new NoSuchMethodException(method.getName()); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5d7c1287/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/InvokerInvocationHandler.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/InvokerInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/InvokerInvocationHandler.java index 53208f7..3ed6121 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/InvokerInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/InvokerInvocationHandler.java @@ -276,7 +276,7 @@ public class InvokerInvocationHandler<T, O extends Operations> extends AbstractI return Proxy.newProxyInstance( Thread.currentThread().getContextClassLoader(), new Class<?>[] {operationRef}, handler); - } else if (isSelfMethod(method, args)) { + } else if (isSelfMethod(method)) { return invokeSelfMethod(method, args); } else { throw new NoSuchMethodException(method.getName()); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5d7c1287/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/OperationInvocationHandler.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/OperationInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/OperationInvocationHandler.java index bdab06c..23cd25c 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/OperationInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/OperationInvocationHandler.java @@ -133,7 +133,7 @@ final class OperationInvocationHandler extends AbstractInvocationHandler { @Override @SuppressWarnings({"unchecked", "rawtypes"}) public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable { - if (isSelfMethod(method, args)) { + if (isSelfMethod(method)) { return invokeSelfMethod(method, args); } else { final Operation operation = method.getAnnotation(Operation.class); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5d7c1287/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/PrimitiveCollectionInvocationHandler.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/PrimitiveCollectionInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/PrimitiveCollectionInvocationHandler.java index 553af6e..67d6e86 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/PrimitiveCollectionInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/PrimitiveCollectionInvocationHandler.java @@ -75,7 +75,7 @@ public class PrimitiveCollectionInvocationHandler<T extends Serializable> invokeSelfMethod(method, args); return proxy; - } else if (isSelfMethod(method, args)) { + } else if (isSelfMethod(method)) { return invokeSelfMethod(method, args); } else if ("operations".equals(method.getName()) && ArrayUtils.isEmpty(args)) { final Class<?> returnType = method.getReturnType(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5d7c1287/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/StructuredComposableInvokerInvocationHandler.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/StructuredComposableInvokerInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/StructuredComposableInvokerInvocationHandler.java index 41ec9ce..00670b3 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/StructuredComposableInvokerInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/StructuredComposableInvokerInvocationHandler.java @@ -75,7 +75,7 @@ public class StructuredComposableInvokerInvocationHandler<T, O extends Operation return super.invoke(proxy, method, args); } else if ("operations".equals(method.getName()) && ArrayUtils.isEmpty(args)) { return super.invoke(proxy, method, args); - } else if (isSelfMethod(method, args)) { + } else if (isSelfMethod(method)) { return invokeSelfMethod(method, args); } else { throw new NoSuchMethodException(method.getName()); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5d7c1287/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/CoreUtils.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/CoreUtils.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/CoreUtils.java index 2776f3b..8f804fe 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/CoreUtils.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/CoreUtils.java @@ -378,7 +378,6 @@ public final class CoreUtils { public static URIBuilder buildEditLink( final EdmEnabledODataClient client, final String entitySetURI, - final ClientEntity entity, final Object key) { if (key == null) { @@ -506,7 +505,7 @@ public final class CoreUtils { final Object complex = Proxy.newProxyInstance( Thread.currentThread().getContextClassLoader(), new Class<?>[] { getter.getReturnType() }, - ComplexInvocationHandler.getInstance(property.getName(), typeHandler, getter.getReturnType())); + ComplexInvocationHandler.getInstance(typeHandler, getter.getReturnType())); populate(client, typeHandler, complex, Property.class, property.getValue().asComplex().iterator()); setPropertyValue(bean, getter, complex); @@ -530,7 +529,7 @@ public final class CoreUtils { final Object collItem = Proxy.newProxyInstance( Thread.currentThread().getContextClassLoader(), new Class<?>[] { collItemClass }, - ComplexInvocationHandler.getInstance(property.getName(), typeHandler, collItemClass)); + ComplexInvocationHandler.getInstance(typeHandler, collItemClass)); populate(client, typeHandler, collItem, Property.class, value.asComplex().iterator()); collection.add(collItem);
