Repository: olingo-odata4 Updated Branches: refs/heads/olingo365 [created] c0b92cf09
[OLINGO-365] Small cleanup Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/312aff1c Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/312aff1c Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/312aff1c Branch: refs/heads/olingo365 Commit: 312aff1cb0b0a01ea5bb51b93e27158e278446bc Parents: 9b28f8d Author: Francesco Chicchiriccò <[email protected]> Authored: Sat Aug 2 15:29:55 2014 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Sat Aug 2 15:29:55 2014 +0200 ---------------------------------------------------------------------- .../olingo/ext/proxy/api/OperationExecutor.java | 27 -------------------- .../StructuredCollectionComposableInvoker.java | 3 +-- .../proxy/api/StructuredComposableInvoker.java | 2 +- .../commons/OperationInvocationHandler.java | 16 +++++------- 4 files changed, 9 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/312aff1c/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/OperationExecutor.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/OperationExecutor.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/OperationExecutor.java deleted file mode 100644 index 6010d11..0000000 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/OperationExecutor.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.ext.proxy.api; - -import java.io.Serializable; - -/** - * Interface for operation executions. - */ -public interface OperationExecutor extends Serializable { -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/312aff1c/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/StructuredCollectionComposableInvoker.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/StructuredCollectionComposableInvoker.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/StructuredCollectionComposableInvoker.java index 61cf87a..990b6ef 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/StructuredCollectionComposableInvoker.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/StructuredCollectionComposableInvoker.java @@ -19,6 +19,5 @@ package org.apache.olingo.ext.proxy.api; public interface StructuredCollectionComposableInvoker<CT extends StructuredCollection<?, ?, ?>, O extends Operations> - extends StructuredCollectionQuery<StructuredCollectionInvoker<CT>>, StructuredCollectionInvoker<CT>, - ComposableInvoker<CT, O> { + extends StructuredCollectionInvoker<CT>, ComposableInvoker<CT, O> { } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/312aff1c/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/StructuredComposableInvoker.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/StructuredComposableInvoker.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/StructuredComposableInvoker.java index a5a3be9..414ef95 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/StructuredComposableInvoker.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/StructuredComposableInvoker.java @@ -19,5 +19,5 @@ package org.apache.olingo.ext.proxy.api; public interface StructuredComposableInvoker<T extends StructuredType<?>, O extends Operations> - extends StructuredQuery<StructuredInvoker<T>>, StructuredInvoker<T>, ComposableInvoker<T, O> { + extends StructuredInvoker<T>, ComposableInvoker<T, O> { } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/312aff1c/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 1e94cc7..880f464 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 @@ -24,12 +24,16 @@ import org.apache.olingo.commons.api.edm.EdmEntityType; import org.apache.olingo.commons.api.edm.EdmFunction; import org.apache.olingo.commons.api.edm.EdmOperation; import org.apache.olingo.commons.api.edm.FullQualifiedName; -import org.apache.olingo.ext.proxy.api.OperationExecutor; import org.apache.olingo.ext.proxy.api.OperationType; import org.apache.olingo.ext.proxy.api.annotations.Operation; import org.apache.olingo.ext.proxy.api.annotations.Parameter; import org.apache.olingo.ext.proxy.utils.ClassUtils; - +import org.apache.olingo.client.api.uri.CommonURIBuilder; +import org.apache.olingo.commons.api.domain.CommonODataEntity; +import org.apache.olingo.commons.api.domain.ODataValue; +import org.apache.olingo.commons.api.edm.EdmEntityContainer; +import org.apache.olingo.commons.core.edm.EdmTypeInfo; +import org.apache.olingo.ext.proxy.utils.CoreUtils; import java.lang.annotation.Annotation; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; @@ -40,14 +44,8 @@ import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.apache.olingo.client.api.uri.CommonURIBuilder; -import org.apache.olingo.commons.api.domain.CommonODataEntity; -import org.apache.olingo.commons.api.domain.ODataValue; -import org.apache.olingo.commons.api.edm.EdmEntityContainer; -import org.apache.olingo.commons.core.edm.EdmTypeInfo; -import org.apache.olingo.ext.proxy.utils.CoreUtils; -final class OperationInvocationHandler extends AbstractInvocationHandler implements OperationExecutor { +final class OperationInvocationHandler extends AbstractInvocationHandler { private static final long serialVersionUID = 2629912294765040027L;
