You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2013/11/28 14:57:07 UTC

git commit: [OLINGO-62] Operation overloading and edm interface implementation

Updated Branches:
  refs/heads/master 5c8d53b26 -> 243ca4093


[OLINGO-62] Operation overloading and edm interface implementation


Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/commit/243ca409
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/tree/243ca409
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/diff/243ca409

Branch: refs/heads/master
Commit: 243ca40936c285521710fc0249b89b61bf3b574d
Parents: 5c8d53b
Author: Christian Amend <ch...@apache.org>
Authored: Thu Nov 28 14:56:08 2013 +0100
Committer: Christian Amend <ch...@apache.org>
Committed: Thu Nov 28 14:56:08 2013 +0100

----------------------------------------------------------------------
 .../olingo/commons/api/edm/EdmActionImport.java |   3 +-
 .../commons/api/edm/EdmEntityContainer.java     |   1 -
 .../commons/api/edm/EdmFunctionImport.java      |   5 +-
 .../commons/api/edm/EdmKeyPropertyRef.java      |   2 +-
 .../commons/api/edm/EdmOperationImport.java     |   6 --
 .../api/edm/helper/EdmEntitySetInfo.java        |   1 +
 .../api/edm/helper/EntityContainerInfo.java     |   2 -
 .../olingo/commons/api/edm/package-info.java    |   3 +-
 .../commons/api/edm/provider/ActionImport.java  |  12 +++
 .../commons/api/edm/provider/BindingTarget.java |   4 +-
 .../commons/api/edm/provider/ComplexType.java   |   3 +-
 .../commons/api/edm/provider/EdmProvider.java   |  26 ++---
 .../api/edm/provider/EdmProviderAdapter.java    |  36 +++----
 .../commons/api/edm/provider/EntitySet.java     |  17 +--
 .../api/edm/provider/FunctionImport.java        |  17 +++
 .../commons/api/edm/provider/Mapping.java       |   8 +-
 .../edm/provider/NavigationPropertyBinding.java |   7 +-
 .../api/edm/provider/OperationImport.java       |  11 +-
 .../commons/api/edm/provider/Parameter.java     |   2 +-
 .../commons/api/edm/provider/Property.java      |  14 +--
 .../commons/api/edm/provider/PropertyRef.java   |   4 +-
 .../commons/api/edm/provider/Singleton.java     |  17 +--
 .../olingo/commons/api/edm/provider/Target.java |  47 +++++++++
 .../commons/api/edm/provider/TargetPath.java    |  47 ---------
 .../commons/api/exception/ODataException.java   |   2 +-
 .../exception/ODataNotImplementedException.java |   8 +-
 .../apache/olingo/commons/core/edm/EdmImpl.java |   4 +-
 .../olingo/commons/core/edm/FunctionMapKey.java |  10 +-
 .../core/edm/provider/EdmActionImportImpl.java  |  29 ++----
 .../core/edm/provider/EdmBindingTargetImpl.java |  48 ++++++++-
 .../edm/provider/EdmEntityContainerImpl.java    |   8 +-
 .../core/edm/provider/EdmEntitySetImpl.java     |   5 +-
 .../edm/provider/EdmFunctionImportImpl.java     |  31 ++----
 .../edm/provider/EdmKeyPropertyRefImpl.java     |   5 +-
 .../edm/provider/EdmOperationImportImpl.java    |  62 +++++++++++
 .../core/edm/provider/EdmProviderImpl.java      | 103 +++++++++++++++++--
 .../edm/provider/EdmServiceMetadataImpl.java    |   6 +-
 .../core/edm/provider/EdmSingletonImpl.java     |   5 +-
 .../primitivetype/PrimitiveTypeBaseTest.java    |  10 --
 .../core/edm/provider/EdmProviderImplTest.java  |  16 ++-
 .../olingo/producer/core/testutil/EdmMock.java  |  18 ++--
 41 files changed, 408 insertions(+), 257 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmActionImport.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmActionImport.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmActionImport.java
index 047b710..4a20341 100644
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmActionImport.java
+++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmActionImport.java
@@ -23,6 +23,5 @@ package org.apache.olingo.commons.api.edm;
  */
 public interface EdmActionImport extends EdmOperationImport {
 
-  @Override
-  public EdmAction getOperation();
+  public EdmAction getAction();
 }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmEntityContainer.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmEntityContainer.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmEntityContainer.java
index 5c7f388..5bd1bb2 100644
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmEntityContainer.java
+++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmEntityContainer.java
@@ -58,6 +58,5 @@ public interface EdmEntityContainer extends EdmNamed {
    */
   EdmFunctionImport getFunctionImport(String name);
 
-  //TODO:evaluate
   EdmNamed getElement(String odataIdentifier);
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmFunctionImport.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmFunctionImport.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmFunctionImport.java
index 63f39f0..2b236ff 100644
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmFunctionImport.java
+++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmFunctionImport.java
@@ -18,12 +18,13 @@
  ******************************************************************************/
 package org.apache.olingo.commons.api.edm;
 
+import java.util.List;
+
 /**
  * A CSDL FunctionImport element
  */
 public interface EdmFunctionImport extends EdmOperationImport {
 
-  @Override
-  public EdmFunction getOperation();
+  public EdmFunction getFunction(List<String> parameterNames);
 
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmKeyPropertyRef.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmKeyPropertyRef.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmKeyPropertyRef.java
index 7d45a36..3ce5e63 100644
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmKeyPropertyRef.java
+++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmKeyPropertyRef.java
@@ -24,7 +24,7 @@ public interface EdmKeyPropertyRef {
    * @return name of the key predicate
    */
   String getKeyPropertyName();
-  
+
   /**
    * @return alias of this reference or null if not set
    */

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmOperationImport.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmOperationImport.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmOperationImport.java
index 4673833..c2beb8b 100644
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmOperationImport.java
+++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmOperationImport.java
@@ -24,12 +24,6 @@ package org.apache.olingo.commons.api.edm;
 public interface EdmOperationImport extends EdmNamed {
 
   /**
-   * @see EdmOperation
-   * @return the {@link EdmOperation} associated with this EdmOperationImport
-   */
-  EdmOperation getOperation();
-
-  /**
    * @return {@link EdmEntitySet} of this OperationImport
    */
   EdmEntitySet getReturnedEntitySet();

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/helper/EdmEntitySetInfo.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/helper/EdmEntitySetInfo.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/helper/EdmEntitySetInfo.java
index 8754bfd..8af3d70 100644
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/helper/EdmEntitySetInfo.java
+++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/helper/EdmEntitySetInfo.java
@@ -25,6 +25,7 @@ import java.net.URI;
  */
 public interface EdmEntitySetInfo {
 
+  // TODO: Either make this a class or alias info an interface!
   /**
    * @return the entity container name which contains this entity set.
    */

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/helper/EntityContainerInfo.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/helper/EntityContainerInfo.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/helper/EntityContainerInfo.java
index 5536f7a..8d534ba 100644
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/helper/EntityContainerInfo.java
+++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/helper/EntityContainerInfo.java
@@ -18,9 +18,7 @@
  ******************************************************************************/
 package org.apache.olingo.commons.api.edm.helper;
 
-//TODO:Where to put this class?
 public class EntityContainerInfo {
-  // Why full qualified name?
   private FullQualifiedName containerName;
   private FullQualifiedName extendsContainer;
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/package-info.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/package-info.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/package-info.java
index 73822db..f9fb51a 100644
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/package-info.java
+++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/package-info.java
@@ -15,7 +15,8 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
- ******************************************************************************//**
+ ******************************************************************************/
+/**
  * <h1>Entity Data Model API</h1>
  * <p>The Entity Data Model is described in the OData protocol specification
  * as well as in the Conceptual Schema Definition for the OData Protocol.

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/ActionImport.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/ActionImport.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/ActionImport.java
index 0227047..bbcc480 100644
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/ActionImport.java
+++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/ActionImport.java
@@ -24,6 +24,18 @@ import org.apache.olingo.commons.api.edm.helper.FullQualifiedName;
 public class ActionImport extends OperationImport {
   private FullQualifiedName action;
 
+  @Override
+  public ActionImport setName(final String name) {
+    this.name = name;
+    return this;
+  }
+
+  @Override
+  public ActionImport setEntitySet(final Target entitySet) {
+    this.entitySet = entitySet;
+    return this;
+  }
+
   public FullQualifiedName getAction() {
     return action;
   }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/BindingTarget.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/BindingTarget.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/BindingTarget.java
index 1fd4515..b79e5be 100644
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/BindingTarget.java
+++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/BindingTarget.java
@@ -27,7 +27,7 @@ public abstract class BindingTarget {
   protected String name;
   protected FullQualifiedName type;
   protected List<NavigationPropertyBinding> navigationPropertyBindings;
-  
+
   public String getName() {
     return name;
   }
@@ -54,5 +54,5 @@ public abstract class BindingTarget {
     this.navigationPropertyBindings = navigationPropertyBindings;
     return this;
   }
-  
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/ComplexType.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/ComplexType.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/ComplexType.java
index fdf9497..b96254a 100644
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/ComplexType.java
+++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/ComplexType.java
@@ -22,9 +22,8 @@ import java.util.List;
 
 import org.apache.olingo.commons.api.edm.helper.FullQualifiedName;
 
-//TODO:finish
 public class ComplexType extends StructuralType {
-//Anything needed here?
+
   @Override
   public ComplexType setName(final String name) {
     this.name = name;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EdmProvider.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EdmProvider.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EdmProvider.java
index a6ae59d..79d7f1e 100644
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EdmProvider.java
+++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EdmProvider.java
@@ -20,9 +20,9 @@ package org.apache.olingo.commons.api.edm.provider;
 
 import java.util.List;
 
+import org.apache.olingo.commons.api.edm.helper.AliasInfo;
 import org.apache.olingo.commons.api.edm.helper.EntityContainerInfo;
 import org.apache.olingo.commons.api.edm.helper.FullQualifiedName;
-import org.apache.olingo.commons.api.edm.helper.AliasInfo;
 import org.apache.olingo.commons.api.exception.ODataException;
 
 public interface EdmProvider {
@@ -59,32 +59,24 @@ public interface EdmProvider {
    */
   public ComplexType getComplexType(final FullQualifiedName complexTypeName) throws ODataException;
 
-  // Revisit signature
   /**
-   * This method should return a {@link Action} or <b>null</b> if nothing is found
+   * This method should return a list of all {@link Action} for the FullQualifiedname or <b>null</b> if nothing is found
    * @param actionName
-   * @param bindingPatameterTypeName may be null if unbound
-   * @param isBindingParameterCollection may be null if unbound
-   * @return {@link Action} for the given name
+   * @return List of {@link Action} or null
    * @throws ODataException
    */
-  public Action getAction(final FullQualifiedName actionName, final FullQualifiedName bindingPatameterTypeName,
-      final Boolean isBindingParameterCollection) throws ODataException;
+  public List<Action> getActions(final FullQualifiedName actionName) throws ODataException;
 
-  // Revisit Signature
   /**
-   * This method should return a {@link Function} or <b>null</b> if nothing is found
+   * This method should return a list of all {@link Function} for the FullQualifiedname or <b>null</b> if nothing is
+   * found
    * @param functionName
-   * @param bindingPatameterTypeName may be null if unbound
-   * @param isBindingParameterCollection may be null if unbound
-   * @param parameterNames may be null if unbound
-   * @return {@link Function} for given name
+   * @return List of {@link Function} or null
    * @throws ODataException
    */
-  public Function getFunction(final FullQualifiedName functionName, final FullQualifiedName bindingPatameterTypeName,
-      final Boolean isBindingParameterCollection, final List<String> parameterNames) throws ODataException;
+  public List<Function> getFunctions(final FullQualifiedName functionName) throws ODataException;
 
-  //TODO: document
+  // TODO: document
   public Term getTerm(final FullQualifiedName termName) throws ODataException;
 
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EdmProviderAdapter.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EdmProviderAdapter.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EdmProviderAdapter.java
index f911adc..b3eeb81 100644
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EdmProviderAdapter.java
+++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EdmProviderAdapter.java
@@ -20,9 +20,9 @@ package org.apache.olingo.commons.api.edm.provider;
 
 import java.util.List;
 
+import org.apache.olingo.commons.api.edm.helper.AliasInfo;
 import org.apache.olingo.commons.api.edm.helper.EntityContainerInfo;
 import org.apache.olingo.commons.api.edm.helper.FullQualifiedName;
-import org.apache.olingo.commons.api.edm.helper.AliasInfo;
 import org.apache.olingo.commons.api.exception.ODataException;
 
 //TODO: Finish
@@ -38,73 +38,69 @@ public abstract class EdmProviderAdapter implements EdmProvider {
 
   @Override
   public TypeDefinition getTypeDefinition(final FullQualifiedName typeDefinitionName) throws ODataException {
-     return null;
+    return null;
   }
 
   @Override
   public EntityType getEntityType(final FullQualifiedName entityTypeName) throws ODataException {
-     return null;
+    return null;
   }
 
   @Override
   public ComplexType getComplexType(final FullQualifiedName complexTypeName) throws ODataException {
-     return null;
+    return null;
   }
 
-  // Revisit signature
   @Override
-  public Action getAction(final FullQualifiedName actionName, final FullQualifiedName bindingPatameterTypeName,
-      final Boolean isBindingParameterCollection) throws ODataException {
-     return null;
+  public List<Action> getActions(final FullQualifiedName actionName) throws ODataException {
+    return null;
   }
 
-  // Revisit Signature
   @Override
-  public Function getFunction(final FullQualifiedName functionName, final FullQualifiedName bindingPatameterTypeName,
-      final Boolean isBindingParameterCollection, final List<String> parameterNames) throws ODataException {
-     return null;
+  public List<Function> getFunctions(final FullQualifiedName functionName) throws ODataException {
+    return null;
   }
 
   @Override
   public Term getTerm(final FullQualifiedName termName) throws ODataException {
-     return null;
+    return null;
   }
 
   @Override
   public EntitySet getEntitySet(final FullQualifiedName entityContainer, final String name) throws ODataException {
-     return null;
+    return null;
   }
 
   @Override
   public Singleton getSingleton(final FullQualifiedName entityContainer, final String name) throws ODataException {
-     return null;
+    return null;
   }
 
   @Override
   public ActionImport getActionImport(final FullQualifiedName entityContainer, final String name) throws ODataException
   {
-     return null;
+    return null;
   }
 
   @Override
   public FunctionImport getFunctionImport(final FullQualifiedName entityContainer, final String name)
       throws ODataException {
-     return null;
+    return null;
   }
 
   // There are no other containers
   @Override
   public EntityContainerInfo getEntityContainerInfo(final FullQualifiedName entityContainerName) throws ODataException {
-     return null;
+    return null;
   }
 
   @Override
   public List<AliasInfo> getAliasInfos() throws ODataException {
-     return null;
+    return null;
   }
 
   @Override
   public List<Schema> getSchemas() throws ODataException {
-     return null;
+    return null;
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EntitySet.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EntitySet.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EntitySet.java
index c83120a..0e2e0c3 100644
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EntitySet.java
+++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EntitySet.java
@@ -27,30 +27,21 @@ public class EntitySet extends BindingTarget {
 
   private boolean includeInServiceDocument;
 
-  public String getName() {
-    return name;
-  }
-
+  @Override
   public EntitySet setName(final String name) {
     this.name = name;
     return this;
   }
 
-  public List<NavigationPropertyBinding> getNavigationPropertyBindings() {
-    return navigationPropertyBindings;
-  }
-
+  @Override
   public EntitySet setNavigationPropertyBindings(final List<NavigationPropertyBinding> navigationPropertyBindings) {
     this.navigationPropertyBindings = navigationPropertyBindings;
     return this;
   }
 
-  public FullQualifiedName getType() {
-    return type;
-  }
-
+  @Override
   public EntitySet setType(final FullQualifiedName entityType) {
-    this.type = entityType;
+    type = entityType;
     return this;
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/FunctionImport.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/FunctionImport.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/FunctionImport.java
index ef46ace..7071171 100644
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/FunctionImport.java
+++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/FunctionImport.java
@@ -26,6 +26,23 @@ public class FunctionImport extends OperationImport {
   private FullQualifiedName function;
   private boolean includeInServiceDocument;
 
+  @Override
+  public String getName() {
+    return name;
+  }
+
+  @Override
+  public FunctionImport setName(final String name) {
+    this.name = name;
+    return this;
+  }
+
+  @Override
+  public FunctionImport setEntitySet(final Target entitySet) {
+    this.entitySet = entitySet;
+    return this;
+  }
+
   public FullQualifiedName getFunction() {
     return function;
   }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Mapping.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Mapping.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Mapping.java
index b757496..defd1d2 100644
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Mapping.java
+++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Mapping.java
@@ -36,7 +36,7 @@ public class Mapping implements EdmMapping {
   public Object getObject() {
     return object;
   }
-  
+
   @Override
   public String getMediaResourceSourceKey() {
     return mediaResourceSourceKey;
@@ -66,13 +66,13 @@ public class Mapping implements EdmMapping {
     this.object = object;
     return this;
   }
-  
+
   /**
    * Sets the key for the resource source key which is used for the lookup in the data map
    * @param mediaResourceSourceKey under which the source can be found in the data map
    * @return {@link Mapping} for method chaining
    */
-  public Mapping setMediaResourceSourceKey(String mediaResourceSourceKey) {
+  public Mapping setMediaResourceSourceKey(final String mediaResourceSourceKey) {
     this.mediaResourceSourceKey = mediaResourceSourceKey;
     return this;
   }
@@ -82,7 +82,7 @@ public class Mapping implements EdmMapping {
    * @param mediaResourceMimeTypeKey under which the mime type can be found in the data map
    * @return {@link Mapping} for method chaining
    */
-  public Mapping setMediaResourceMimeTypeKey(String mediaResourceMimeTypeKey) {
+  public Mapping setMediaResourceMimeTypeKey(final String mediaResourceMimeTypeKey) {
     this.mediaResourceMimeTypeKey = mediaResourceMimeTypeKey;
     return this;
   }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/NavigationPropertyBinding.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/NavigationPropertyBinding.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/NavigationPropertyBinding.java
index aefa5e6..fbeb613 100644
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/NavigationPropertyBinding.java
+++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/NavigationPropertyBinding.java
@@ -22,8 +22,7 @@ package org.apache.olingo.commons.api.edm.provider;
 public class NavigationPropertyBinding {
 
   private String path;
-  // Should this really be an own class?
-  private TargetPath target;
+  private Target target;
 
   public String getPath() {
     return path;
@@ -34,11 +33,11 @@ public class NavigationPropertyBinding {
     return this;
   }
 
-  public TargetPath getTarget() {
+  public Target getTarget() {
     return target;
   }
 
-  public NavigationPropertyBinding setTarget(final TargetPath target) {
+  public NavigationPropertyBinding setTarget(final Target target) {
     this.target = target;
     return this;
   }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/OperationImport.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/OperationImport.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/OperationImport.java
index be4ea20..7e1df45 100644
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/OperationImport.java
+++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/OperationImport.java
@@ -19,12 +19,11 @@
 package org.apache.olingo.commons.api.edm.provider;
 
 //TODO: finish
-public class OperationImport {
+public abstract class OperationImport {
 
-  private String name;
-  private TargetPath entitySet;
+  protected String name;
+  protected Target entitySet;
 
-  // What about the operation which is behind the operation import?
   // Annotations?
 
   public String getName() {
@@ -36,11 +35,11 @@ public class OperationImport {
     return this;
   }
 
-  public TargetPath getEntitySet() {
+  public Target getEntitySet() {
     return entitySet;
   }
 
-  public OperationImport setEntitySet(final TargetPath entitySet) {
+  public OperationImport setEntitySet(final Target entitySet) {
     this.entitySet = entitySet;
     return this;
   }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Parameter.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Parameter.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Parameter.java
index 4b78d72..23a1fd0 100644
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Parameter.java
+++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Parameter.java
@@ -101,7 +101,7 @@ public class Parameter {
     return mapping;
   }
 
-  public Parameter setMapping(Mapping mapping) {
+  public Parameter setMapping(final Mapping mapping) {
     this.mapping = mapping;
     return this;
   }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Property.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Property.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Property.java
index 7c1f5d7..1a7ffaa 100644
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Property.java
+++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Property.java
@@ -27,11 +27,11 @@ public class Property {
   // Can be simple or complex
   private FullQualifiedName type;
   private boolean collection;
-  
-  //Mimetype and mapping what here
+
+  // Mimetype and mapping what here
   private String mimeType;
   private Mapping mapping;
-  
+
   // Facets
   private String defaultValue;
   private Boolean nullable;
@@ -63,7 +63,7 @@ public class Property {
   }
 
   public Property setCollection(final boolean isCollection) {
-    this.collection = isCollection;
+    collection = isCollection;
     return this;
   }
 
@@ -117,7 +117,7 @@ public class Property {
   }
 
   public Property setUnicode(final Boolean isUnicode) {
-    this.unicode = isUnicode;
+    unicode = isUnicode;
     return this;
   }
 
@@ -125,7 +125,7 @@ public class Property {
     return mimeType;
   }
 
-  public Property setMimeType(String mimeType) {
+  public Property setMimeType(final String mimeType) {
     this.mimeType = mimeType;
     return this;
   }
@@ -134,7 +134,7 @@ public class Property {
     return mapping;
   }
 
-  public Property setMapping(Mapping mapping) {
+  public Property setMapping(final Mapping mapping) {
     this.mapping = mapping;
     return this;
   }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/PropertyRef.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/PropertyRef.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/PropertyRef.java
index 5891483..44b9baf 100644
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/PropertyRef.java
+++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/PropertyRef.java
@@ -28,7 +28,7 @@ public class PropertyRef {
     return path;
   }
 
-  public PropertyRef setPath(String path) {
+  public PropertyRef setPath(final String path) {
     this.path = path;
     return this;
   }
@@ -38,7 +38,7 @@ public class PropertyRef {
   }
 
   public PropertyRef setPropertyName(final String name) {
-    this.propertyName = name;
+    propertyName = name;
     return this;
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Singleton.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Singleton.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Singleton.java
index c543f52..1d6e170 100644
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Singleton.java
+++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Singleton.java
@@ -23,30 +23,21 @@ import java.util.List;
 import org.apache.olingo.commons.api.edm.helper.FullQualifiedName;
 
 //TODO: Finish
-public class Singleton extends BindingTarget{
-
-  public String getName() {
-    return name;
-  }
+public class Singleton extends BindingTarget {
 
+  @Override
   public Singleton setName(final String name) {
     this.name = name;
     return this;
   }
 
-  public FullQualifiedName getType() {
-    return type;
-  }
-
+  @Override
   public Singleton setType(final FullQualifiedName type) {
     this.type = type;
     return this;
   }
 
-  public List<NavigationPropertyBinding> getNavigationPropertyBindings() {
-    return navigationPropertyBindings;
-  }
-
+  @Override
   public Singleton setNavigationPropertyBindings(final List<NavigationPropertyBinding> navigationPropertyBindings) {
     this.navigationPropertyBindings = navigationPropertyBindings;
     return this;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Target.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Target.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Target.java
new file mode 100644
index 0000000..1278150
--- /dev/null
+++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Target.java
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * 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.commons.api.edm.provider;
+
+import org.apache.olingo.commons.api.edm.helper.FullQualifiedName;
+
+public class Target {
+
+  // What is the name here?
+  private String targetName;
+  private FullQualifiedName entityContainer;
+
+  public String getTargetName() {
+    return targetName;
+  }
+
+  public Target setTargetName(final String targetPathName) {
+    targetName = targetPathName;
+    return this;
+  }
+
+  public FullQualifiedName getEntityContainer() {
+    return entityContainer;
+  }
+
+  public Target setEntityContainer(final FullQualifiedName entityContainer) {
+    this.entityContainer = entityContainer;
+    return this;
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/TargetPath.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/TargetPath.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/TargetPath.java
deleted file mode 100644
index e674b93..0000000
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/TargetPath.java
+++ /dev/null
@@ -1,47 +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.commons.api.edm.provider;
-
-import org.apache.olingo.commons.api.edm.helper.FullQualifiedName;
-
-public class TargetPath {
-
-  // What is the name here?
-  private String targetPathName;
-  private FullQualifiedName entityContainer;
-
-  public String getTargetPathName() {
-    return targetPathName;
-  }
-
-  public TargetPath setTargetPathName(final String targetPathName) {
-    this.targetPathName = targetPathName;
-    return this;
-  }
-
-  public FullQualifiedName getEntityContainer() {
-    return entityContainer;
-  }
-
-  public TargetPath setEntityContainer(final FullQualifiedName entityContainer) {
-    this.entityContainer = entityContainer;
-    return this;
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/exception/ODataException.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/exception/ODataException.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/exception/ODataException.java
index fd01a8b..27576de 100644
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/exception/ODataException.java
+++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/exception/ODataException.java
@@ -32,5 +32,5 @@ public class ODataException extends Exception {
   public ODataException(final Throwable e) {
     super(e);
   }
-  
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/exception/ODataNotImplementedException.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/exception/ODataNotImplementedException.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/exception/ODataNotImplementedException.java
index baa7b28..132a989 100644
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/exception/ODataNotImplementedException.java
+++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/exception/ODataNotImplementedException.java
@@ -21,12 +21,12 @@ package org.apache.olingo.commons.api.exception;
 public class ODataNotImplementedException extends ODataException {
 
   private static final long serialVersionUID = 1L;
-  
-  public ODataNotImplementedException(String msg){
+
+  public ODataNotImplementedException(final String msg) {
     super(msg);
   }
-  
-  public ODataNotImplementedException(){
+
+  public ODataNotImplementedException() {
     super("Not implemented");
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmImpl.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmImpl.java
index 6d6bff6..2eb4ccb 100644
--- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmImpl.java
+++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmImpl.java
@@ -187,11 +187,11 @@ public abstract class EdmImpl implements Edm {
 
   protected abstract EdmComplexType createComplexType(FullQualifiedName complexTypeName);
 
-  protected abstract EdmAction createAction(FullQualifiedName actionName, FullQualifiedName bindingPatameterTypeName,
+  protected abstract EdmAction createAction(FullQualifiedName actionName, FullQualifiedName bindingParameterTypeName,
       Boolean isBindingParameterCollection);
 
   protected abstract EdmFunction createFunction(FullQualifiedName functionName,
-      FullQualifiedName bindingPatameterTypeName, Boolean isBindingParameterCollection,
+      FullQualifiedName bindingParameterTypeName, Boolean isBindingParameterCollection,
       List<String> parameterNames);
 
   protected abstract EdmServiceMetadata createServiceMetadata();

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/FunctionMapKey.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/FunctionMapKey.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/FunctionMapKey.java
index 75f7739..ea4c9f9 100644
--- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/FunctionMapKey.java
+++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/FunctionMapKey.java
@@ -18,6 +18,7 @@
  ******************************************************************************/
 package org.apache.olingo.commons.core.edm;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -31,13 +32,16 @@ public class FunctionMapKey {
   private final List<String> parameterNames;
 
   public FunctionMapKey(final FullQualifiedName functionName, final FullQualifiedName bindingParameterTypeName,
-      final Boolean isBindingParameterCollection, final List<String> bindingParameterNames) {
+      final Boolean isBindingParameterCollection, final List<String> parameterNames) {
     this.functionName = functionName;
     this.bindingParameterTypeName = bindingParameterTypeName;
     this.isBindingParameterCollection = isBindingParameterCollection;
-    parameterNames = bindingParameterNames;
     if (parameterNames != null) {
-      Collections.sort(parameterNames);
+      this.parameterNames = new ArrayList<String>();
+      this.parameterNames.addAll(parameterNames);
+      Collections.sort(this.parameterNames);
+    } else {
+      this.parameterNames = null;
     }
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmActionImportImpl.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmActionImportImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmActionImportImpl.java
index 3ef0000..19d299a 100644
--- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmActionImportImpl.java
+++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmActionImportImpl.java
@@ -21,32 +21,21 @@ package org.apache.olingo.commons.core.edm.provider;
 import org.apache.olingo.commons.api.edm.EdmAction;
 import org.apache.olingo.commons.api.edm.EdmActionImport;
 import org.apache.olingo.commons.api.edm.EdmEntityContainer;
-import org.apache.olingo.commons.api.edm.EdmEntitySet;
+import org.apache.olingo.commons.api.edm.provider.ActionImport;
 
-public class EdmActionImportImpl implements EdmActionImport {
+public class EdmActionImportImpl extends EdmOperationImportImpl implements EdmActionImport {
 
-  @Override
-  public EdmEntitySet getReturnedEntitySet() {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  @Override
-  public EdmEntityContainer getEntityContainer() {
-    // TODO Auto-generated method stub
-    return null;
-  }
+  private final ActionImport actionImport;
 
-  @Override
-  public String getName() {
-    // TODO Auto-generated method stub
-    return null;
+  public EdmActionImportImpl(final EdmProviderImpl edm, final String name, final EdmEntityContainer container,
+      final ActionImport actionImport) {
+    super(edm, name, container, actionImport);
+    this.actionImport = actionImport;
   }
 
   @Override
-  public EdmAction getOperation() {
-    // TODO Auto-generated method stub
-    return null;
+  public EdmAction getAction() {
+    return edm.getAction(actionImport.getAction(), null, null);
   }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmBindingTargetImpl.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmBindingTargetImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmBindingTargetImpl.java
index 4555b2d..0bef855 100644
--- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmBindingTargetImpl.java
+++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmBindingTargetImpl.java
@@ -18,30 +18,68 @@
  ******************************************************************************/
 package org.apache.olingo.commons.core.edm.provider;
 
+import java.util.List;
+
 import org.apache.olingo.commons.api.edm.EdmBindingTarget;
 import org.apache.olingo.commons.api.edm.EdmEntityContainer;
 import org.apache.olingo.commons.api.edm.EdmEntityType;
+import org.apache.olingo.commons.api.edm.EdmException;
 import org.apache.olingo.commons.api.edm.provider.BindingTarget;
+import org.apache.olingo.commons.api.edm.provider.NavigationPropertyBinding;
+import org.apache.olingo.commons.api.edm.provider.Target;
 
 public abstract class EdmBindingTargetImpl extends EdmNamedImpl implements EdmBindingTarget {
 
-  public EdmBindingTargetImpl(final EdmProviderImpl edm, final String name, final BindingTarget target) {
-    super(edm, name);
+  private BindingTarget target;
+  private EdmEntityContainer container;
+
+  public EdmBindingTargetImpl(final EdmProviderImpl edm, final EdmEntityContainer container,
+      final BindingTarget target) {
+    super(edm, target.getName());
+    this.container = container;
+    this.target = target;
   }
 
   @Override
   public EdmBindingTarget getRelatedBindingTarget(final String path) {
-    return null;
+    EdmBindingTarget bindingTarget = null;
+    List<NavigationPropertyBinding> navigationPropertyBindings = target.getNavigationPropertyBindings();
+    if (navigationPropertyBindings != null) {
+      for (NavigationPropertyBinding binding : navigationPropertyBindings) {
+        if (binding.getPath().equals(path)) {
+          Target providerTarget = binding.getTarget();
+          EdmEntityContainer entityContainer = edm.getEntityContainer(providerTarget.getEntityContainer());
+          if (entityContainer == null) {
+            throw new EdmException("Can´t find entity container with name: " + providerTarget.getEntityContainer());
+          }
+          bindingTarget = entityContainer.getEntitySet(providerTarget.getTargetName());
+          if (bindingTarget == null) {
+            bindingTarget = entityContainer.getSingleton(providerTarget.getTargetName());
+            if (bindingTarget != null) {
+              break;
+            }
+          } else {
+            break;
+          }
+        }
+      }
+    }
+
+    return bindingTarget;
   }
 
   @Override
   public EdmEntityContainer getEntityContainer() {
-    return null;
+    return container;
   }
 
   @Override
   public EdmEntityType getEntityType() {
-    return null;
+    EdmEntityType type = edm.getEntityType(target.getType());
+    if (type == null) {
+      throw new EdmException("Can´t find entity type : " + target.getType() + "for entity set: " + target.getName());
+    }
+    return type;
   }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmEntityContainerImpl.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmEntityContainerImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmEntityContainerImpl.java
index 41114c8..24a3d46 100644
--- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmEntityContainerImpl.java
+++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmEntityContainerImpl.java
@@ -65,7 +65,7 @@ public class EdmEntityContainerImpl extends EdmNamedImpl implements EdmEntityCon
       try {
         Singleton providerSingleton = provider.getSingleton(entityContainerName, singletonName);
         if (providerSingleton != null) {
-          singleton = new EdmSingletonImpl(edm, singletonName, providerSingleton);
+          singleton = new EdmSingletonImpl(edm, this, providerSingleton);
           singletons.put(singletonName, singleton);
         }
       } catch (ODataException e) {
@@ -82,7 +82,7 @@ public class EdmEntityContainerImpl extends EdmNamedImpl implements EdmEntityCon
       try {
         EntitySet providerEntitySet = provider.getEntitySet(entityContainerName, entitySetName);
         if (providerEntitySet != null) {
-          entitySet = new EdmEntitySetImpl(edm, entitySetName, providerEntitySet);
+          entitySet = new EdmEntitySetImpl(edm, this, providerEntitySet);
           entitySets.put(entitySetName, entitySet);
         }
       } catch (ODataException e) {
@@ -99,7 +99,7 @@ public class EdmEntityContainerImpl extends EdmNamedImpl implements EdmEntityCon
       try {
         ActionImport providerImport = provider.getActionImport(entityContainerName, actionImportName);
         if (providerImport != null) {
-          actionImport = new EdmActionImportImpl();
+          actionImport = new EdmActionImportImpl(edm, actionImportName, this, providerImport);
           actionImports.put(actionImportName, actionImport);
         }
       } catch (ODataException e) {
@@ -116,7 +116,7 @@ public class EdmEntityContainerImpl extends EdmNamedImpl implements EdmEntityCon
       try {
         FunctionImport providerImport = provider.getFunctionImport(entityContainerName, functionImportName);
         if (providerImport != null) {
-          functionImport = new EdmFunctionImportImpl();
+          functionImport = new EdmFunctionImportImpl(edm, functionImportName, this, providerImport);
           functionImports.put(functionImportName, functionImport);
         }
       } catch (ODataException e) {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmEntitySetImpl.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmEntitySetImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmEntitySetImpl.java
index 629da77..86fc331 100644
--- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmEntitySetImpl.java
+++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmEntitySetImpl.java
@@ -18,13 +18,14 @@
  ******************************************************************************/
 package org.apache.olingo.commons.core.edm.provider;
 
+import org.apache.olingo.commons.api.edm.EdmEntityContainer;
 import org.apache.olingo.commons.api.edm.EdmEntitySet;
 import org.apache.olingo.commons.api.edm.provider.EntitySet;
 
 public class EdmEntitySetImpl extends EdmBindingTargetImpl implements EdmEntitySet {
 
-  public EdmEntitySetImpl(final EdmProviderImpl edm, final String name, final EntitySet entitySet) {
-    super(edm, name, entitySet);
+  public EdmEntitySetImpl(final EdmProviderImpl edm, final EdmEntityContainer container, final EntitySet entitySet) {
+    super(edm, container, entitySet);
   }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmFunctionImportImpl.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmFunctionImportImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmFunctionImportImpl.java
index 1a02740..ec5f8e8 100644
--- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmFunctionImportImpl.java
+++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmFunctionImportImpl.java
@@ -18,35 +18,26 @@
  ******************************************************************************/
 package org.apache.olingo.commons.core.edm.provider;
 
+import java.util.List;
+
 import org.apache.olingo.commons.api.edm.EdmEntityContainer;
-import org.apache.olingo.commons.api.edm.EdmEntitySet;
 import org.apache.olingo.commons.api.edm.EdmFunction;
 import org.apache.olingo.commons.api.edm.EdmFunctionImport;
+import org.apache.olingo.commons.api.edm.provider.FunctionImport;
 
-public class EdmFunctionImportImpl implements EdmFunctionImport {
+public class EdmFunctionImportImpl extends EdmOperationImportImpl implements EdmFunctionImport {
 
-  @Override
-  public EdmEntitySet getReturnedEntitySet() {
-    // TODO Auto-generated method stub
-    return null;
-  }
+  private final FunctionImport functionImport;
 
-  @Override
-  public EdmEntityContainer getEntityContainer() {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  @Override
-  public String getName() {
-    // TODO Auto-generated method stub
-    return null;
+  public EdmFunctionImportImpl(final EdmProviderImpl edm, final String name, final EdmEntityContainer container,
+      final FunctionImport functionImport) {
+    super(edm, name, container, functionImport);
+    this.functionImport = functionImport;
   }
 
   @Override
-  public EdmFunction getOperation() {
-    // TODO Auto-generated method stub
-    return null;
+  public EdmFunction getFunction(final List<String> parameterNames) {
+    return edm.getFunction(functionImport.getFunction(), null, null, parameterNames);
   }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmKeyPropertyRefImpl.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmKeyPropertyRefImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmKeyPropertyRefImpl.java
index eb5e391..c60ebe9 100644
--- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmKeyPropertyRefImpl.java
+++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmKeyPropertyRefImpl.java
@@ -59,7 +59,7 @@ public class EdmKeyPropertyRefImpl implements EdmKeyPropertyRef {
       if (ref.getAlias() == null) {
         property = (EdmProperty) edmEntityType.getProperty(ref.getPropertyName());
         if (property == null) {
-          throw new EdmException("Invalid key property ref specified. Can�t find property with name: "
+          throw new EdmException("Invalid key property ref specified. Can´t find property with name: "
               + ref.getPropertyName());
         }
       } else {
@@ -68,14 +68,13 @@ public class EdmKeyPropertyRefImpl implements EdmKeyPropertyRef {
         for (int i = 0; i < splitPath.length; i++) {
           property = (EdmProperty) structType.getProperty(splitPath[i]);
           if (property == null) {
-            throw new EdmException("Invalid key property ref specified. Can�t find property with name: "
+            throw new EdmException("Invalid key property ref specified. Can´t find property with name: "
                 + splitPath[i]);
           }
           EdmType childType = property.getType();
           if (childType.getKind() == EdmTypeKind.COMPLEX) {
             structType = (EdmStructuralType) childType;
           } else {
-            // TODO: Should we check for typekind primitve?
             if (i + 1 != splitPath.length) {
               throw new EdmException("Invalid path: " + ref.getPath() + " Must end after: " + splitPath[i]);
             }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmOperationImportImpl.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmOperationImportImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmOperationImportImpl.java
new file mode 100644
index 0000000..d509080
--- /dev/null
+++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmOperationImportImpl.java
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * 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.commons.core.edm.provider;
+
+import org.apache.olingo.commons.api.edm.EdmEntityContainer;
+import org.apache.olingo.commons.api.edm.EdmEntitySet;
+import org.apache.olingo.commons.api.edm.EdmException;
+import org.apache.olingo.commons.api.edm.EdmOperationImport;
+import org.apache.olingo.commons.api.edm.provider.OperationImport;
+import org.apache.olingo.commons.api.edm.provider.Target;
+
+public abstract class EdmOperationImportImpl extends EdmNamedImpl implements EdmOperationImport {
+
+  private final OperationImport operationImport;
+  private final EdmEntityContainer container;
+  private EdmEntitySet returnedEntitySet;
+
+  public EdmOperationImportImpl(final EdmProviderImpl edm, final String name, final EdmEntityContainer container,
+      final OperationImport operationImport) {
+    super(edm, name);
+    this.container = container;
+    this.operationImport = operationImport;
+  }
+
+  @Override
+  public EdmEntitySet getReturnedEntitySet() {
+    Target target = operationImport.getEntitySet();
+    if (target != null && returnedEntitySet == null) {
+      EdmEntityContainer entityContainer = edm.getEntityContainer(target.getEntityContainer());
+      if (entityContainer == null) {
+        throw new EdmException("Can´t find entity container with name: " + target.getEntityContainer());
+      }
+      returnedEntitySet = entityContainer.getEntitySet(target.getTargetName());
+      if (returnedEntitySet == null) {
+        throw new EdmException("Can´t find entity set with name: " + target.getTargetName());
+      }
+    }
+    return returnedEntitySet;
+  }
+
+  @Override
+  public EdmEntityContainer getEntityContainer() {
+    return container;
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmProviderImpl.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmProviderImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmProviderImpl.java
index d0c7bdb..d885bab 100644
--- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmProviderImpl.java
+++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmProviderImpl.java
@@ -18,6 +18,7 @@
  ******************************************************************************/
 package org.apache.olingo.commons.core.edm.provider;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -40,6 +41,7 @@ import org.apache.olingo.commons.api.edm.provider.EdmProvider;
 import org.apache.olingo.commons.api.edm.provider.EntityType;
 import org.apache.olingo.commons.api.edm.provider.EnumType;
 import org.apache.olingo.commons.api.edm.provider.Function;
+import org.apache.olingo.commons.api.edm.provider.Parameter;
 import org.apache.olingo.commons.api.edm.provider.TypeDefinition;
 import org.apache.olingo.commons.api.exception.ODataException;
 import org.apache.olingo.commons.core.edm.EdmImpl;
@@ -119,12 +121,43 @@ public class EdmProviderImpl extends EdmImpl {
   }
 
   @Override
-  public EdmAction createAction(final FullQualifiedName actionName, final FullQualifiedName bindingPatameterTypeName,
+  public EdmAction createAction(final FullQualifiedName actionName, final FullQualifiedName bindingParameterTypeName,
       final Boolean isBindingParameterCollection) {
+
     try {
-      Action action = provider.getAction(actionName, bindingPatameterTypeName, isBindingParameterCollection);
-      if (action != null) {
-        return new EdmActionImpl(this, actionName, action);
+      List<Action> actions = provider.getActions(actionName);
+      if (actions != null) {
+        EdmActionImpl actionImpl = null;
+        if (bindingParameterTypeName == null) {
+          // Search for first unbound action
+          for (Action action : actions) {
+            if (action.isBound() == false) {
+              actionImpl = new EdmActionImpl(this, actionName, action);
+              break;
+            }
+          }
+        } else {
+          // Search for bound action where binding parameter matches
+          boolean isCollection = false;
+          if (isBindingParameterCollection == null) {
+            isCollection = false;
+          } else {
+            isCollection = isBindingParameterCollection;
+          }
+          for (Action action : actions) {
+            if (action.isBound() == true) {
+              List<Parameter> parameters = action.getParameters();
+              Parameter parameter = parameters.get(0);
+              if (bindingParameterTypeName.equals(parameter.getType()) && isCollection == parameter.isCollection()) {
+                actionImpl = new EdmActionImpl(this, actionName, action);
+                break;
+              }
+
+            }
+          }
+        }
+
+        return actionImpl;
       }
       return null;
     } catch (ODataException e) {
@@ -134,13 +167,61 @@ public class EdmProviderImpl extends EdmImpl {
 
   @Override
   public EdmFunction createFunction(final FullQualifiedName functionName,
-      final FullQualifiedName bindingPatameterTypeName,
-      final Boolean isBindingParameterCollection, final List<String> parameterNames) {
+      final FullQualifiedName bindingParameterTypeName, final Boolean isBindingParameterCollection,
+      final List<String> parameterNames) {
     try {
-      Function function = provider.getFunction(functionName, bindingPatameterTypeName, isBindingParameterCollection,
-          parameterNames);
-      if (function != null) {
-        return new EdmFunctionImpl(this, functionName, function);
+      List<Function> functions = provider.getFunctions(functionName);
+      if (functions != null) {
+        EdmFunctionImpl functionImpl = null;
+        // TODO: Should we throw an edmexception when parameternames is null?
+        if (bindingParameterTypeName == null) {
+          // Search for matching unbound function
+          for (Function function : functions) {
+            if (function.isBound() == false) {
+              List<Parameter> parameters = function.getParameters();
+              if (parameterNames.size() == parameters.size()) {
+                List<String> functionParameterNames = new ArrayList<String>();
+                for (Parameter parameter : parameters) {
+                  functionParameterNames.add(parameter.getName());
+                }
+
+                if (parameterNames.containsAll(functionParameterNames)) {
+                  functionImpl = new EdmFunctionImpl(this, functionName, function);
+                  break;
+                }
+              }
+            }
+          }
+        } else {
+          // Search for matching bound function
+          boolean isCollection = false;
+          if (isBindingParameterCollection == null) {
+            isCollection = false;
+          } else {
+            isCollection = isBindingParameterCollection;
+          }
+          for (Function function : functions) {
+            if (function.isBound() == true) {
+              List<Parameter> parameters = function.getParameters();
+              Parameter bindingParameter = parameters.get(0);
+              if (bindingParameterTypeName.equals(bindingParameter.getType())
+                  && isCollection == bindingParameter.isCollection()) {
+                // bindingparameter type matches now only parameter names have to match
+                List<String> functionParameterNames = new ArrayList<String>();
+                for (int i = 1; i < parameters.size(); i++) {
+                  functionParameterNames.add(parameters.get(i).getName());
+                }
+
+                if (parameterNames.containsAll(functionParameterNames)) {
+                  functionImpl = new EdmFunctionImpl(this, functionName, function);
+                  break;
+                }
+              }
+            }
+          }
+        }
+
+        return functionImpl;
       }
       return null;
     } catch (ODataException e) {
@@ -150,7 +231,7 @@ public class EdmProviderImpl extends EdmImpl {
 
   @Override
   public EdmServiceMetadata createServiceMetadata() {
-    return new EdmServiceMetadataImpl();
+    return new EdmServiceMetadataImpl(provider);
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmServiceMetadataImpl.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmServiceMetadataImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmServiceMetadataImpl.java
index bae0bae..5feb519 100644
--- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmServiceMetadataImpl.java
+++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmServiceMetadataImpl.java
@@ -25,9 +25,12 @@ import org.apache.olingo.commons.api.edm.EdmServiceMetadata;
 import org.apache.olingo.commons.api.edm.helper.EdmEntitySetInfo;
 import org.apache.olingo.commons.api.edm.helper.EdmFunctionImportInfo;
 import org.apache.olingo.commons.api.edm.helper.EdmSingletonInfo;
+import org.apache.olingo.commons.api.edm.provider.EdmProvider;
 
 public class EdmServiceMetadataImpl implements EdmServiceMetadata {
 
+  public EdmServiceMetadataImpl(final EdmProvider provider) {}
+
   @Override
   public InputStream getMetadata() {
     return null;
@@ -35,7 +38,8 @@ public class EdmServiceMetadataImpl implements EdmServiceMetadata {
 
   @Override
   public String getDataServiceVersion() {
-    return null;
+    // TODO: make constant
+    return "4.0";
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmSingletonImpl.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmSingletonImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmSingletonImpl.java
index 2bfc52f..7dcab20 100644
--- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmSingletonImpl.java
+++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmSingletonImpl.java
@@ -18,12 +18,13 @@
  ******************************************************************************/
 package org.apache.olingo.commons.core.edm.provider;
 
+import org.apache.olingo.commons.api.edm.EdmEntityContainer;
 import org.apache.olingo.commons.api.edm.EdmSingleton;
 import org.apache.olingo.commons.api.edm.provider.Singleton;
 
 public class EdmSingletonImpl extends EdmBindingTargetImpl implements EdmSingleton {
 
-  public EdmSingletonImpl(final EdmProviderImpl edm, final String name, final Singleton singleton) {
-    super(edm, name, singleton);
+  public EdmSingletonImpl(final EdmProviderImpl edm, final EdmEntityContainer container, final Singleton singleton) {
+    super(edm, container, singleton);
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/PrimitiveTypeBaseTest.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/PrimitiveTypeBaseTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/PrimitiveTypeBaseTest.java
index 564a8eb..bef72bb 100644
--- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/PrimitiveTypeBaseTest.java
+++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/PrimitiveTypeBaseTest.java
@@ -35,9 +35,6 @@ public abstract class PrimitiveTypeBaseTest {
       instance.valueToString(value, isNullable, maxLength, precision, scale, isUnicode);
       fail("Expected exception not thrown");
     } catch (final EdmPrimitiveTypeException e) {
-      // TODO: How to test without message reference
-      // assertNotNull(e.getMessageReference());
-      // assertEquals(messageReference.getKey(), e.getMessageReference().getKey());
       assertNotNull(e.getLocalizedMessage());
       assertTrue(e.getLocalizedMessage().startsWith(messageReferenceString));
     }
@@ -75,9 +72,6 @@ public abstract class PrimitiveTypeBaseTest {
       instance.valueOfString(value, isNullable, maxLength, precision, scale, isUnicode, returnType);
       fail("Expected exception not thrown");
     } catch (final EdmPrimitiveTypeException e) {
-      // TODO: How to test without message reference
-      // assertNotNull(e.getMessageReference());
-      // assertEquals(messageReference.getKey(), e.getMessageReference().getKey());
       assertNotNull(e.getLocalizedMessage());
       assertTrue(e.getLocalizedMessage().startsWith(messageReferenceString));
     }
@@ -116,10 +110,6 @@ public abstract class PrimitiveTypeBaseTest {
       instance.fromUriLiteral(value);
       fail("Expected exception not thrown");
     } catch (final EdmPrimitiveTypeException e) {
-      // TODO: How to test without message reference
-      // assertNotNull(e.getMessageReference());
-      // assertEquals(EdmPrimitiveTypeException.LITERAL_ILLEGAL_CONTENT.getKey(),
-      // e.getMessageReference().getKey());
       assertNotNull(e.getLocalizedMessage());
       assertTrue(e.getLocalizedMessage().startsWith("EdmPrimitiveTypeException.LITERAL_ILLEGAL_CONTENT"));
     }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/provider/EdmProviderImplTest.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/provider/EdmProviderImplTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/provider/EdmProviderImplTest.java
index a4e7b20..d1a1c8a 100644
--- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/provider/EdmProviderImplTest.java
+++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/provider/EdmProviderImplTest.java
@@ -25,6 +25,7 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import org.apache.olingo.commons.api.edm.Edm;
 import org.apache.olingo.commons.api.edm.EdmAction;
@@ -42,6 +43,7 @@ import org.apache.olingo.commons.api.edm.provider.EdmProvider;
 import org.apache.olingo.commons.api.edm.provider.EntityType;
 import org.apache.olingo.commons.api.edm.provider.EnumType;
 import org.apache.olingo.commons.api.edm.provider.Function;
+import org.apache.olingo.commons.api.edm.provider.Parameter;
 import org.apache.olingo.commons.api.edm.provider.PropertyRef;
 import org.apache.olingo.commons.api.edm.provider.TypeDefinition;
 import org.junit.Before;
@@ -73,10 +75,14 @@ public class EdmProviderImplTest {
     when(provider.getComplexType(FQN)).thenReturn(complexType);
 
     Action action = new Action().setName(FQN.getName());
-    when(provider.getAction(FQN, null, null)).thenReturn(action);
+    List<Action> actions = new ArrayList<Action>();
+    actions.add(action);
+    when(provider.getActions(FQN)).thenReturn(actions);
 
-    Function function = new Function().setName(FQN.getName());
-    when(provider.getFunction(FQN, null, null, null)).thenReturn(function);
+    Function function = new Function().setName(FQN.getName()).setParameters(new ArrayList<Parameter>());
+    List<Function> functions = new ArrayList<Function>();
+    functions.add(function);
+    when(provider.getFunctions(FQN)).thenReturn(functions);
 
     edm = new EdmProviderImpl(provider);
   }
@@ -148,12 +154,12 @@ public class EdmProviderImplTest {
 
   @Test
   public void getFunction() {
-    EdmFunction function = edm.getFunction(FQN, null, null, null);
+    EdmFunction function = edm.getFunction(FQN, null, null, new ArrayList<String>());
     assertNotNull(function);
     assertEquals(FQN.getNamespace(), function.getNamespace());
     assertEquals(FQN.getName(), function.getName());
 
-    assertNull(edm.getFunction(WRONG_FQN, null, null, null));
+    assertNull(edm.getFunction(WRONG_FQN, null, null, new ArrayList<String>()));
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/243ca409/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/testutil/EdmMock.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/testutil/EdmMock.java b/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/testutil/EdmMock.java
index 232d65f..d4d4b22 100644
--- a/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/testutil/EdmMock.java
+++ b/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/testutil/EdmMock.java
@@ -358,21 +358,21 @@ public class EdmMock implements Edm {
     when(actionImport1.getName()).thenReturn(ACTION_IMPORT1_NAME.getName());
     when(actionImport1.getEntityContainer()).thenReturn(container1);
     when(actionImport1.getReturnedEntitySet()).thenReturn(employeesSet);
-    when(actionImport1.getOperation()).thenReturn(action1);
+    when(actionImport1.getAction()).thenReturn(action1);
   }
 
   private void enhanceFunctionImport1() {
     when(functionImport1.getName()).thenReturn(FUNCTION_IMPORT1_NAME.getName());
     when(functionImport1.getEntityContainer()).thenReturn(container1);
     when(functionImport1.getReturnedEntitySet()).thenReturn(teamsSet);
-    when(functionImport1.getOperation()).thenReturn(function1);
+    when(functionImport1.getFunction(null)).thenReturn(function1);
   }
 
   private void enhanceFunctionImportEmployeeSearch() {
     when(employeeSearchFunctionImport.getName()).thenReturn(FUNCTION_IMPORT_EMPLOYEE_SEARCH_NAME.getName());
     when(employeeSearchFunctionImport.getEntityContainer()).thenReturn(container1);
     when(employeeSearchFunctionImport.getReturnedEntitySet()).thenReturn(teamsSet);
-    when(employeeSearchFunctionImport.getOperation()).thenReturn(employeeSearchFunction);
+    when(employeeSearchFunctionImport.getFunction(null)).thenReturn(employeeSearchFunction);
   }
 
   private void enhanceFunctionEmployeeSearch() {
@@ -385,8 +385,7 @@ public class EdmMock implements Edm {
   private void enhanceMaximalAgeFunctionImport() {
     when(maximalAgeFunctionImport.getName()).thenReturn(FUNCTION_IMPORT_MAXIMAL_AGE_NAME.getName());
     when(maximalAgeFunctionImport.getEntityContainer()).thenReturn(container1);
-    // TODO: getReturnedEntitySet()
-    when(maximalAgeFunctionImport.getOperation()).thenReturn(maximalAgeFunction);
+    when(maximalAgeFunctionImport.getFunction(null)).thenReturn(maximalAgeFunction);
   }
 
   private void enhanceMaximalAgeFunction() {
@@ -400,8 +399,7 @@ public class EdmMock implements Edm {
   private void enhanceAllUsedRoomIdsFunctionImport() {
     when(allUsedRoomIdsFunctionImport.getName()).thenReturn(FUNCTION_IMPORT_ALL_USED_ROOMS_NAME.getName());
     when(allUsedRoomIdsFunctionImport.getEntityContainer()).thenReturn(container1);
-    // TODO: getReturnedEntitySet()
-    when(allUsedRoomIdsFunctionImport.getOperation()).thenReturn(allUsedRoomIdsFunction);
+    when(allUsedRoomIdsFunctionImport.getFunction(null)).thenReturn(allUsedRoomIdsFunction);
   }
 
   private void enhanceAllUsedRoomIdsFunction() {
@@ -415,8 +413,7 @@ public class EdmMock implements Edm {
   private void enhanceMostCommonLocationFunctionImport() {
     when(mostCommonLocationFunctionImport.getName()).thenReturn(FUNCTION_IMPORT_MOST_COMMON_LOCATION_NAME.getName());
     when(mostCommonLocationFunctionImport.getEntityContainer()).thenReturn(container1);
-    // TODO: getReturnedEntitySet()
-    when(mostCommonLocationFunctionImport.getOperation()).thenReturn(mostCommonLocationFunction);
+    when(mostCommonLocationFunctionImport.getFunction(null)).thenReturn(mostCommonLocationFunction);
   }
 
   private void enhanceMostCommonLocationFunction() {
@@ -430,8 +427,7 @@ public class EdmMock implements Edm {
   private void enhanceAllLocationsFunctionImport() {
     when(allLocationsFunctionImport.getName()).thenReturn(FUNCTION_IMPORT_ALL_LOCATIONS_NAME.getName());
     when(allLocationsFunctionImport.getEntityContainer()).thenReturn(container1);
-    // TODO: getReturnedEntitySet()
-    when(allLocationsFunctionImport.getOperation()).thenReturn(allLocationsFunction);
+    when(allLocationsFunctionImport.getFunction(null)).thenReturn(allLocationsFunction);
   }
 
   private void enhanceAllLocationsFunction() {