You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2013/09/24 14:42:59 UTC

[32/51] [partial] Refactored project structure

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AnnotationAttribute.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AnnotationAttribute.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AnnotationAttribute.java
deleted file mode 100644
index e71d85f..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AnnotationAttribute.java
+++ /dev/null
@@ -1,94 +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.odata2.api.edm.provider;
-
-import org.apache.olingo.odata2.api.edm.EdmAnnotationAttribute;
-
-/**
- * Objects of this class represent an annotation attribute
- * 
- */
-public class AnnotationAttribute implements EdmAnnotationAttribute {
-
-  private String namespace;
-  private String prefix;
-  private String name;
-  private String text;
-
-  @Override
-  public String getNamespace() {
-    return namespace;
-  }
-
-  @Override
-  public String getPrefix() {
-    return prefix;
-  }
-
-  @Override
-  public String getName() {
-    return name;
-  }
-
-  @Override
-  public String getText() {
-    return text;
-  }
-
-  /**
-   * Sets the namespace for this {@link AnnotationAttribute}.
-   * @param namespace
-   * @return {@link AnnotationAttribute} for method chaining
-   */
-  public AnnotationAttribute setNamespace(final String namespace) {
-    this.namespace = namespace;
-    return this;
-  }
-
-  /**
-   * Sets the prefix for this {@link AnnotationAttribute}.
-   * @param prefix
-   * @return {@link AnnotationAttribute} for method chaining
-   */
-  public AnnotationAttribute setPrefix(final String prefix) {
-    this.prefix = prefix;
-    return this;
-  }
-
-  /**
-   * Sets the name for this {@link AnnotationAttribute}.
-   * @param name
-   * @return {@link AnnotationAttribute} for method chaining
-   */
-  public AnnotationAttribute setName(final String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Sets the text for this {@link AnnotationAttribute}.
-   * @param text
-   * @return {@link AnnotationAttribute} for method chaining
-   */
-  public AnnotationAttribute setText(final String text) {
-    this.text = text;
-    return this;
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AnnotationElement.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AnnotationElement.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AnnotationElement.java
deleted file mode 100644
index d1e0e4e..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AnnotationElement.java
+++ /dev/null
@@ -1,130 +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.odata2.api.edm.provider;
-
-import java.util.List;
-
-import org.apache.olingo.odata2.api.edm.EdmAnnotationElement;
-
-/**
- * Objects of this class represent an annotation element.
- * 
- */
-public class AnnotationElement implements EdmAnnotationElement {
-
-  private String namespace;
-  private String prefix;
-  private String name;
-  private String text;
-  private List<AnnotationElement> childElements;
-  private List<AnnotationAttribute> attributes;
-
-  @Override
-  public String getNamespace() {
-    return namespace;
-  }
-
-  @Override
-  public String getPrefix() {
-    return prefix;
-  }
-
-  @Override
-  public String getName() {
-    return name;
-  }
-
-  @Override
-  public String getText() {
-    return text;
-  }
-
-  @Override
-  public List<AnnotationElement> getChildElements() {
-    return childElements;
-  }
-
-  @Override
-  public List<AnnotationAttribute> getAttributes() {
-    return attributes;
-  }
-
-  /**
-   * Sets the attributes for this {@link AnnotationElement}.
-   * @param attributes
-   * @return {@link AnnotationElement} for method chaining
-   */
-  public AnnotationElement setAttributes(final List<AnnotationAttribute> attributes) {
-    this.attributes = attributes;
-    return this;
-  }
-
-  /**
-   * Sets the child elements for this {@link AnnotationElement}.
-   * Does not set child elements and characterData for one element.
-   * @param childElements
-   * @return {@link AnnotationElement} for method chaining
-   */
-  public AnnotationElement setChildElements(final List<AnnotationElement> childElements) {
-    this.childElements = childElements;
-    return this;
-  }
-
-  /**
-   * Sets the namespace for this {@link AnnotationElement}.
-   * @param namespace
-   * @return {@link AnnotationElement} for method chaining
-   */
-  public AnnotationElement setNamespace(final String namespace) {
-    this.namespace = namespace;
-    return this;
-  }
-
-  /**
-   * Sets the prefix for this {@link AnnotationElement}.
-   * @param prefix
-   * @return {@link AnnotationElement} for method chaining
-   */
-  public AnnotationElement setPrefix(final String prefix) {
-    this.prefix = prefix;
-    return this;
-  }
-
-  /**
-   * Sets the name for this {@link AnnotationElement}.
-   * @param name
-   * @return {@link AnnotationElement} for method chaining
-   */
-  public AnnotationElement setName(final String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Sets the text for this {@link AnnotationElement} which will be displayed inside the tags.
-   * Must NOT be set if child elements are set!
-   * @param text
-   * @return {@link AnnotationElement} for method chaining
-   */
-  public AnnotationElement setText(final String text) {
-    this.text = text;
-    return this;
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Association.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Association.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Association.java
deleted file mode 100644
index d78ef45..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Association.java
+++ /dev/null
@@ -1,155 +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.odata2.api.edm.provider;
-
-import java.util.List;
-
-/**
- * Objects of this class represent an association
- * 
- */
-public class Association {
-
-  private String name;
-  private AssociationEnd end1;
-  private AssociationEnd end2;
-  private ReferentialConstraint referentialConstraint;
-  private Documentation documentation;
-  private List<AnnotationAttribute> annotationAttributes;
-  private List<AnnotationElement> annotationElements;
-
-  /**
-   * @return <b>String</b> name
-   */
-  public String getName() {
-    return name;
-  }
-
-  /**
-   * @return {@link AssociationEnd} end2
-   */
-  public AssociationEnd getEnd1() {
-    return end1;
-  }
-
-  /**
-   * @return {@link AssociationEnd} end2
-   */
-  public AssociationEnd getEnd2() {
-    return end2;
-  }
-
-  /**
-   * @return {@link ReferentialConstraint} referentialConstraint
-   */
-  public ReferentialConstraint getReferentialConstraint() {
-    return referentialConstraint;
-  }
-
-  /**
-   * @return {@link Documentation} documentation
-   */
-  public Documentation getDocumentation() {
-    return documentation;
-  }
-
-  /**
-   * @return collection of {@link AnnotationAttribute} annotation attributes
-   */
-  public List<AnnotationAttribute> getAnnotationAttributes() {
-    return annotationAttributes;
-  }
-
-  /**
-   * @return collection of {@link AnnotationElement} annotation elements
-   */
-  public List<AnnotationElement> getAnnotationElements() {
-    return annotationElements;
-  }
-
-  /**
-   * Sets the name for this {@link Association}
-   * @param name
-   * @return {@link Association} for method chaining
-   */
-  public Association setName(final String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Sets the first {@link AssociationEnd} for this {@link Association}
-   * @param end1
-   * @return {@link Association} for method chaining
-   */
-  public Association setEnd1(final AssociationEnd end1) {
-    this.end1 = end1;
-    return this;
-  }
-
-  /**
-   * Sets the second {@link AssociationEnd} for this {@link Association}
-   * @param end2
-   * @return {@link Association} for method chaining
-   */
-  public Association setEnd2(final AssociationEnd end2) {
-    this.end2 = end2;
-    return this;
-  }
-
-  /**
-   * Sets the {@link ReferentialConstraint} for this {@link Association}
-   * @param referentialConstraint
-   * @return {@link Association} for method chaining
-   */
-  public Association setReferentialConstraint(final ReferentialConstraint referentialConstraint) {
-    this.referentialConstraint = referentialConstraint;
-    return this;
-  }
-
-  /**
-   * Sets the {@link Documentation} for this {@link Association}
-   * @param documentation
-   * @return {@link Association} for method chaining
-   */
-  public Association setDocumentation(final Documentation documentation) {
-    this.documentation = documentation;
-    return this;
-  }
-
-  /**
-   * Sets the collection of {@link AnnotationAttribute} for this {@link Association}
-   * @param annotationAttributes
-   * @return {@link Association} for method chaining
-   */
-  public Association setAnnotationAttributes(final List<AnnotationAttribute> annotationAttributes) {
-    this.annotationAttributes = annotationAttributes;
-    return this;
-  }
-
-  /**
-   * Sets the collection of {@link AnnotationElement} for this {@link Association}
-   * @param annotationElements
-   * @return {@link Association} for method chaining
-   */
-  public Association setAnnotationElements(final List<AnnotationElement> annotationElements) {
-    this.annotationElements = annotationElements;
-    return this;
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationEnd.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationEnd.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationEnd.java
deleted file mode 100644
index 11fcf2a..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationEnd.java
+++ /dev/null
@@ -1,158 +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.odata2.api.edm.provider;
-
-import java.util.List;
-
-import org.apache.olingo.odata2.api.edm.EdmMultiplicity;
-import org.apache.olingo.odata2.api.edm.FullQualifiedName;
-
-/**
- * Objects of this class represent an association end
- * 
- */
-public class AssociationEnd {
-
-  private FullQualifiedName type;
-  private String role;
-  private EdmMultiplicity multiplicity;
-  private OnDelete onDelete;
-  private Documentation documentation;
-  private List<AnnotationAttribute> annotationAttributes;
-  private List<AnnotationElement> annotationElements;
-
-  /**
-   * @return {@link FullQualifiedName} full qualified name (namespace and name)
-   */
-  public FullQualifiedName getType() {
-    return type;
-  }
-
-  /**
-   * @return <b>String</b> role
-   */
-  public String getRole() {
-    return role;
-  }
-
-  /**
-   * @return {@link EdmMultiplicity} multiplicity of this end
-   */
-  public EdmMultiplicity getMultiplicity() {
-    return multiplicity;
-  }
-
-  /**
-   * @return {@link OnDelete} on delete
-   */
-  public OnDelete getOnDelete() {
-    return onDelete;
-  }
-
-  /**
-   * @return {@link Documentation} documentation
-   */
-  public Documentation getDocumentation() {
-    return documentation;
-  }
-
-  /**
-   * @return collection of {@link AnnotationAttribute} annotation attributes
-   */
-  public List<AnnotationAttribute> getAnnotationAttributes() {
-    return annotationAttributes;
-  }
-
-  /**
-   * @return collection of {@link AnnotationElement} annotation elements
-   */
-  public List<AnnotationElement> getAnnotationElements() {
-    return annotationElements;
-  }
-
-  /**
-   * Sets the {@link FullQualifiedName} for this {@link AssociationEnd}
-   * @param type
-   * @return {@link AssociationEnd} for method chaining
-   */
-  public AssociationEnd setType(final FullQualifiedName type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * Sets the role for this {@link AssociationEnd}
-   * @param role
-   * @return {@link AssociationEnd} for method chaining
-   */
-  public AssociationEnd setRole(final String role) {
-    this.role = role;
-    return this;
-  }
-
-  /**
-   * Sets the {@link EdmMultiplicity} for this {@link AssociationEnd}
-   * @param multiplicity
-   * @return {@link AssociationEnd} for method chaining
-   */
-  public AssociationEnd setMultiplicity(final EdmMultiplicity multiplicity) {
-    this.multiplicity = multiplicity;
-    return this;
-  }
-
-  /**
-   * Sets {@link OnDelete} for this {@link AssociationEnd}
-   * @param onDelete
-   * @return {@link AssociationEnd} for method chaining
-   */
-  public AssociationEnd setOnDelete(final OnDelete onDelete) {
-    this.onDelete = onDelete;
-    return this;
-  }
-
-  /**
-   * Sets the {@link Documentation} for this {@link AssociationEnd}
-   * @param documentation
-   * @return {@link AssociationEnd} for method chaining
-   */
-  public AssociationEnd setDocumentation(final Documentation documentation) {
-    this.documentation = documentation;
-    return this;
-  }
-
-  /**
-   * Sets the collection of {@link AnnotationAttribute} for this {@link AssociationEnd}
-   * @param annotationAttributes
-   * @return {@link AssociationEnd} for method chaining
-   */
-  public AssociationEnd setAnnotationAttributes(final List<AnnotationAttribute> annotationAttributes) {
-    this.annotationAttributes = annotationAttributes;
-    return this;
-  }
-
-  /**
-   * Sets the collection of {@link AnnotationElement} for this {@link AssociationEnd}
-   * @param annotationElements
-   * @return {@link AssociationEnd} for method chaining
-   */
-  public AssociationEnd setAnnotationElements(final List<AnnotationElement> annotationElements) {
-    this.annotationElements = annotationElements;
-    return this;
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationSet.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationSet.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationSet.java
deleted file mode 100644
index a5b6207..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationSet.java
+++ /dev/null
@@ -1,157 +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.odata2.api.edm.provider;
-
-import java.util.List;
-
-import org.apache.olingo.odata2.api.edm.FullQualifiedName;
-
-/**
- * Objects of this class represent an association set
- * 
- */
-public class AssociationSet {
-
-  private String name;
-  private FullQualifiedName association;
-  private AssociationSetEnd end1;
-  private AssociationSetEnd end2;
-  private Documentation documentation;
-  private List<AnnotationAttribute> annotationAttributes;
-  private List<AnnotationElement> annotationElements;
-
-  /**
-   * @return <b>String</b> name
-   */
-  public String getName() {
-    return name;
-  }
-
-  /**
-   * @return {@link FullQualifiedName} Association of this {@link AssociationSet} (namespace and name)
-   */
-  public FullQualifiedName getAssociation() {
-    return association;
-  }
-
-  /**
-   * @return {@link AssociationEnd} end1
-   */
-  public AssociationSetEnd getEnd1() {
-    return end1;
-  }
-
-  /**
-   * @return {@link AssociationEnd} end2
-   */
-  public AssociationSetEnd getEnd2() {
-    return end2;
-  }
-
-  /**
-   * @return {@link Documentation} documentation
-   */
-  public Documentation getDocumentation() {
-    return documentation;
-  }
-
-  /**
-   * @return collection of {@link AnnotationAttribute} annotation attributes
-   */
-  public List<AnnotationAttribute> getAnnotationAttributes() {
-    return annotationAttributes;
-  }
-
-  /**
-   * @return collection of {@link AnnotationElement} annotation elements
-   */
-  public List<AnnotationElement> getAnnotationElements() {
-    return annotationElements;
-  }
-
-  /**
-   * Sets the name for this {@link AssociationSet}
-   * @param name
-   * @return {@link AssociationSet} for method chaining
-   */
-  public AssociationSet setName(final String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Sets the {@link FullQualifiedName} association for this {@link AssociationSet}
-   * @param association
-   * @return {@link AssociationSet} for method chaining
-   */
-  public AssociationSet setAssociation(final FullQualifiedName association) {
-    this.association = association;
-    return this;
-  }
-
-  /**
-   * Sets the first {@link AssociationSetEnd} for this {@link AssociationSet}
-   * @param end1
-   * @return {@link AssociationSet} for method chaining
-   */
-  public AssociationSet setEnd1(final AssociationSetEnd end1) {
-    this.end1 = end1;
-    return this;
-  }
-
-  /**
-   * Sets the second {@link AssociationSetEnd} for this {@link AssociationSet}
-   * @param end2
-   * @return {@link AssociationSet} for method chaining
-   */
-  public AssociationSet setEnd2(final AssociationSetEnd end2) {
-    this.end2 = end2;
-    return this;
-  }
-
-  /**
-   * Sets the {@link Documentation} for this {@link AssociationSet}
-   * @param documentation
-   * @return {@link AssociationSet} for method chaining
-   */
-  public AssociationSet setDocumentation(final Documentation documentation) {
-    this.documentation = documentation;
-    return this;
-  }
-
-  /**
-   * Sets the collection of {@link AnnotationAttribute} for this {@link AssociationSet}
-   * @param annotationAttributes
-   * @return {@link AssociationSet} for method chaining
-   */
-  public AssociationSet setAnnotationAttributes(final List<AnnotationAttribute> annotationAttributes) {
-    this.annotationAttributes = annotationAttributes;
-    return this;
-  }
-
-  /**
-   * Sets the collection of {@link AnnotationElement} for this {@link AssociationSet}
-   * @param annotationElements
-   * @return {@link AssociationSet} for method chaining
-   */
-  public AssociationSet setAnnotationElements(final List<AnnotationElement> annotationElements) {
-    this.annotationElements = annotationElements;
-    return this;
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationSetEnd.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationSetEnd.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationSetEnd.java
deleted file mode 100644
index c2fa5c0..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationSetEnd.java
+++ /dev/null
@@ -1,119 +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.odata2.api.edm.provider;
-
-import java.util.List;
-
-/**
- * Objects of this class represent an association set end
- * 
- */
-public class AssociationSetEnd {
-
-  private String role;
-  private String entitySet;
-  private Documentation documentation;
-  private List<AnnotationAttribute> annotationAttributes;
-  private List<AnnotationElement> annotationElements;
-
-  /**
-   * @return <b>String</b> role
-   */
-  public String getRole() {
-    return role;
-  }
-
-  /**
-   * @return <b>String</b> name of the target entity set
-   */
-  public String getEntitySet() {
-    return entitySet;
-  }
-
-  /**
-   * @return {@link Documentation} documentation
-   */
-  public Documentation getDocumentation() {
-    return documentation;
-  }
-
-  /**
-   * @return collection of {@link AnnotationAttribute} annotation attributes
-   */
-  public List<AnnotationAttribute> getAnnotationAttributes() {
-    return annotationAttributes;
-  }
-
-  /**
-   * @return collection of {@link AnnotationElement} annotation elements
-   */
-  public List<AnnotationElement> getAnnotationElements() {
-    return annotationElements;
-  }
-
-  /**
-   * Sets the role of this {@link AssociationSetEnd}
-   * @param role
-   * @return {@link AssociationSetEnd} for method chaining
-   */
-  public AssociationSetEnd setRole(final String role) {
-    this.role = role;
-    return this;
-  }
-
-  /**
-   * Sets the target entity set of this {@link AssociationSetEnd}
-   * @param entitySet
-   * @return {@link AssociationSetEnd} for method chaining
-   */
-  public AssociationSetEnd setEntitySet(final String entitySet) {
-    this.entitySet = entitySet;
-    return this;
-  }
-
-  /**
-   * Sets the {@link Documentation} of this {@link AssociationSetEnd}
-   * @param documentation
-   * @return {@link AssociationSetEnd} for method chaining
-   */
-  public AssociationSetEnd setDocumentation(final Documentation documentation) {
-    this.documentation = documentation;
-    return this;
-  }
-
-  /**
-   * Sets the collection of {@link AnnotationAttribute} for this {@link AssociationSetEnd}
-   * @param annotationAttributes
-   * @return {@link AssociationSetEnd} for method chaining
-   */
-  public AssociationSetEnd setAnnotationAttributes(final List<AnnotationAttribute> annotationAttributes) {
-    this.annotationAttributes = annotationAttributes;
-    return this;
-  }
-
-  /**
-   * Sets the collection of {@link AnnotationElement} for this {@link AssociationSetEnd}
-   * @param annotationElements
-   * @return {@link AssociationSetEnd} for method chaining
-   */
-  public AssociationSetEnd setAnnotationElements(final List<AnnotationElement> annotationElements) {
-    this.annotationElements = annotationElements;
-    return this;
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ComplexProperty.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ComplexProperty.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ComplexProperty.java
deleted file mode 100644
index 02f88f1..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ComplexProperty.java
+++ /dev/null
@@ -1,98 +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.odata2.api.edm.provider;
-
-import java.util.List;
-
-import org.apache.olingo.odata2.api.edm.EdmFacets;
-import org.apache.olingo.odata2.api.edm.FullQualifiedName;
-
-/**
- * Objects of this class represent a complex property.
- * 
- */
-public class ComplexProperty extends Property {
-
-  private FullQualifiedName type;
-
-  /**
-   * @return {@link FullQualifiedName} of this property
-   */
-  public FullQualifiedName getType() {
-    return type;
-  }
-
-  /**
-   * Sets the {@link FullQualifiedName} for this {@link Property}
-   * @param type
-   * @return {@link Property} for method chaining
-   */
-  public ComplexProperty setType(final FullQualifiedName type) {
-    this.type = type;
-    return this;
-  }
-
-  @Override
-  public ComplexProperty setName(final String name) {
-    super.setName(name);
-    return this;
-  }
-
-  @Override
-  public ComplexProperty setFacets(final EdmFacets facets) {
-    super.setFacets(facets);
-    return this;
-  }
-
-  @Override
-  public ComplexProperty setCustomizableFeedMappings(final CustomizableFeedMappings customizableFeedMappings) {
-    super.setCustomizableFeedMappings(customizableFeedMappings);
-    return this;
-  }
-
-  @Override
-  public ComplexProperty setMimeType(final String mimeType) {
-    super.setMimeType(mimeType);
-    return this;
-  }
-
-  @Override
-  public ComplexProperty setMapping(final Mapping mapping) {
-    super.setMapping(mapping);
-    return this;
-  }
-
-  @Override
-  public ComplexProperty setDocumentation(final Documentation documentation) {
-    super.setDocumentation(documentation);
-    return this;
-  }
-
-  @Override
-  public ComplexProperty setAnnotationAttributes(final List<AnnotationAttribute> annotationAttributes) {
-    super.setAnnotationAttributes(annotationAttributes);
-    return this;
-  }
-
-  @Override
-  public ComplexProperty setAnnotationElements(final List<AnnotationElement> annotationElements) {
-    super.setAnnotationElements(annotationElements);
-    return this;
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ComplexType.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ComplexType.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ComplexType.java
deleted file mode 100644
index c3f53e5..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ComplexType.java
+++ /dev/null
@@ -1,175 +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.odata2.api.edm.provider;
-
-import java.util.List;
-
-import org.apache.olingo.odata2.api.edm.FullQualifiedName;
-
-/**
- * Objects of this class represent a complex type
- * 
- */
-public class ComplexType {
-
-  private String name;
-  private FullQualifiedName baseType;
-  private boolean isAbstract;
-  private List<Property> properties;
-  private Mapping mapping;
-  private Documentation documentation;
-  private List<AnnotationAttribute> annotationAttributes;
-  private List<AnnotationElement> annotationElements;
-
-  /**
-   * @return <b>String</b> name
-   */
-  public String getName() {
-    return name;
-  }
-
-  /**
-   * @return {@link FullQualifiedName} of the base type of this type (namespace and name)
-   */
-  public FullQualifiedName getBaseType() {
-    return baseType;
-  }
-
-  /**
-   * @return <b>boolean</b> if this type is abstract
-   */
-  public boolean isAbstract() {
-    return isAbstract;
-  }
-
-  /**
-   * @return List<{@link Property}> of all properties for this type
-   */
-  public List<Property> getProperties() {
-    return properties;
-  }
-
-  /**
-   * @return {@link Mapping} for this type
-   */
-  public Mapping getMapping() {
-    return mapping;
-  }
-
-  /**
-   * @return {@link Documentation} documentation
-   */
-  public Documentation getDocumentation() {
-    return documentation;
-  }
-
-  /**
-   * @return collection of {@link AnnotationAttribute} annotation attributes
-   */
-  public List<AnnotationAttribute> getAnnotationAttributes() {
-    return annotationAttributes;
-  }
-
-  /**
-   * @return collection of {@link AnnotationElement} annotation elements
-   */
-  public List<AnnotationElement> getAnnotationElements() {
-    return annotationElements;
-  }
-
-  /**
-   * Sets the name
-   * @param name
-   * @return {@link ComplexType} for method chaining
-   */
-  public ComplexType setName(final String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Sets the {@link FullQualifiedName} of the base type
-   * @param baseType
-   * @return {@link ComplexType} for method chaining
-   */
-  public ComplexType setBaseType(final FullQualifiedName baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * Sets if it is abstract
-   * @param isAbstract
-   * @return {@link ComplexType} for method chaining
-   */
-  public ComplexType setAbstract(final boolean isAbstract) {
-    this.isAbstract = isAbstract;
-    return this;
-  }
-
-  /**
-   * Sets the {@link Property}s
-   * @param properties
-   * @return {@link ComplexType} for method chaining
-   */
-  public ComplexType setProperties(final List<Property> properties) {
-    this.properties = properties;
-    return this;
-  }
-
-  /**
-   * Sets the {@link Mapping}
-   * @param mapping
-   * @return {@link ComplexType} for method chaining
-   */
-  public ComplexType setMapping(final Mapping mapping) {
-    this.mapping = mapping;
-    return this;
-  }
-
-  /**
-   * Sets the {@link Documentation}
-   * @param documentation
-   * @return {@link ComplexType} for method chaining
-   */
-  public ComplexType setDocumentation(final Documentation documentation) {
-    this.documentation = documentation;
-    return this;
-  }
-
-  /**
-   * Sets the collection of {@link AnnotationAttribute} for this {@link ComplexType}
-   * @param annotationAttributes
-   * @return {@link ComplexType} for method chaining
-   */
-  public ComplexType setAnnotationAttributes(final List<AnnotationAttribute> annotationAttributes) {
-    this.annotationAttributes = annotationAttributes;
-    return this;
-  }
-
-  /**
-   * Sets the collection of {@link AnnotationElement} for this {@link ComplexType}
-   * @param annotationElements
-   * @return {@link ComplexType} for method chaining
-   */
-  public ComplexType setAnnotationElements(final List<AnnotationElement> annotationElements) {
-    this.annotationElements = annotationElements;
-    return this;
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/CustomizableFeedMappings.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/CustomizableFeedMappings.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/CustomizableFeedMappings.java
deleted file mode 100644
index 9bc570e..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/CustomizableFeedMappings.java
+++ /dev/null
@@ -1,135 +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.odata2.api.edm.provider;
-
-import org.apache.olingo.odata2.api.edm.EdmContentKind;
-import org.apache.olingo.odata2.api.edm.EdmCustomizableFeedMappings;
-
-/**
- * Objects of this class represent customizable feed mappings.
- * 
- */
-public class CustomizableFeedMappings implements EdmCustomizableFeedMappings {
-
-  private Boolean fcKeepInContent;
-  private EdmContentKind fcContentKind;
-  private String fcNsPrefix;
-  private String fcNsUri;
-  private String fcSourcePath;
-  private String fcTargetPath;
-
-  @Override
-  public Boolean isFcKeepInContent() {
-    return fcKeepInContent;
-  }
-
-  @Override
-  public EdmContentKind getFcContentKind() {
-    return fcContentKind;
-  }
-
-  @Override
-  public String getFcNsPrefix() {
-    return fcNsPrefix;
-  }
-
-  @Override
-  public String getFcNsUri() {
-    return fcNsUri;
-  }
-
-  @Override
-  public String getFcSourcePath() {
-    return fcSourcePath;
-  }
-
-  @Override
-  public String getFcTargetPath() {
-    return fcTargetPath;
-  }
-
-  /**
-   * @return <b>boolean</b>
-   */
-  public Boolean getFcKeepInContent() {
-    return fcKeepInContent;
-  }
-
-  /**
-   * Sets if this is kept in content.
-   * @param fcKeepInContent
-   * @return {@link CustomizableFeedMappings} for method chaining
-   */
-  public CustomizableFeedMappings setFcKeepInContent(final Boolean fcKeepInContent) {
-    this.fcKeepInContent = fcKeepInContent;
-    return this;
-  }
-
-  /**
-   * Sets the {@link EdmContentKind}.
-   * @param fcContentKind
-   * @return {@link CustomizableFeedMappings} for method chaining
-   */
-  public CustomizableFeedMappings setFcContentKind(final EdmContentKind fcContentKind) {
-    this.fcContentKind = fcContentKind;
-    return this;
-  }
-
-  /**
-   * Sets the prefix.
-   * @param fcNsPrefix
-   * @return {@link CustomizableFeedMappings} for method chaining
-   */
-  public CustomizableFeedMappings setFcNsPrefix(final String fcNsPrefix) {
-    this.fcNsPrefix = fcNsPrefix;
-    return this;
-  }
-
-  /**
-   * Sets the Uri.
-   * @param fcNsUri
-   * @return {@link CustomizableFeedMappings} for method chaining
-   */
-  public CustomizableFeedMappings setFcNsUri(final String fcNsUri) {
-    this.fcNsUri = fcNsUri;
-    return this;
-  }
-
-  /**
-   * Sets the source path.
-   * @param fcSourcePath
-   * @return {@link CustomizableFeedMappings} for method chaining
-   */
-  public CustomizableFeedMappings setFcSourcePath(final String fcSourcePath) {
-    this.fcSourcePath = fcSourcePath;
-    return this;
-  }
-
-  /**
-   * <p>Sets the target path.</p>
-   * <p>For standard Atom elements, constants are available in {@link org.apache.olingo.odata2.api.edm.EdmTargetPath
-   * EdmTargetPath}.</p>
-   * @param fcTargetPath
-   * @return {@link CustomizableFeedMappings} for method chaining
-   */
-  public CustomizableFeedMappings setFcTargetPath(final String fcTargetPath) {
-    this.fcTargetPath = fcTargetPath;
-    return this;
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/DataServices.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/DataServices.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/DataServices.java
deleted file mode 100644
index 552eb01..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/DataServices.java
+++ /dev/null
@@ -1,66 +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.odata2.api.edm.provider;
-
-import java.util.List;
-
-/**
- * Objects of this class represent the data service. They contain all schemas of the EDM as well as the
- * dataServiceVersion
- * 
- */
-public class DataServices {
-
-  private List<Schema> schemas;
-  private String dataServiceVersion;
-
-  /**
-   * Sets the schemas for this {@link DataServices}
-   * @param schemas
-   * @return {@link DataServices} for method chaining
-   */
-  public DataServices setSchemas(final List<Schema> schemas) {
-    this.schemas = schemas;
-    return this;
-  }
-
-  /**
-   * Sets the data service version for this {@link DataServices}
-   * @param dataServiceVersion
-   * @return {@link DataServices} for method chaining
-   */
-  public DataServices setDataServiceVersion(final String dataServiceVersion) {
-    this.dataServiceVersion = dataServiceVersion;
-    return this;
-  }
-
-  /**
-   * @return List<{@link Schema}>
-   */
-  public List<Schema> getSchemas() {
-    return schemas;
-  }
-
-  /**
-   * @return <b>String</b> data service version
-   */
-  public String getDataServiceVersion() {
-    return dataServiceVersion;
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Documentation.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Documentation.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Documentation.java
deleted file mode 100644
index 7fcb382..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Documentation.java
+++ /dev/null
@@ -1,101 +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.odata2.api.edm.provider;
-
-import java.util.List;
-
-/**
- * Objects of this class represent documentation
- * 
- */
-public class Documentation {
-
-  private String summary;
-  private String longDescription;
-  private List<AnnotationAttribute> annotationAttributes;
-  private List<AnnotationElement> annotationElements;
-
-  /**
-   * @return <b>String</b> summary
-   */
-  public String getSummary() {
-    return summary;
-  }
-
-  /**
-   * @return <b>String</b> the long description
-   */
-  public String getLongDescription() {
-    return longDescription;
-  }
-
-  /**
-   * @return collection of {@link AnnotationAttribute} annotation attributes
-   */
-  public List<AnnotationAttribute> getAnnotationAttributes() {
-    return annotationAttributes;
-  }
-
-  /**
-   * @return collection of {@link AnnotationElement} annotation elements
-   */
-  public List<AnnotationElement> getAnnotationElements() {
-    return annotationElements;
-  }
-
-  /**
-   * Sets the summary for this {@link Documentation}
-   * @param summary
-   * @return {@link Documentation} for method chaining
-   */
-  public Documentation setSummary(final String summary) {
-    this.summary = summary;
-    return this;
-  }
-
-  /**
-   * Sets the long description for this {@link Documentation}
-   * @param longDescription
-   * @return {@link Documentation} for method chaining
-   */
-  public Documentation setLongDescription(final String longDescription) {
-    this.longDescription = longDescription;
-    return this;
-  }
-
-  /**
-   * Sets the collection of {@link AnnotationAttribute} for this {@link Documentation}
-   * @param annotationAttributes
-   * @return {@link Documentation} for method chaining
-   */
-  public Documentation setAnnotationAttributes(final List<AnnotationAttribute> annotationAttributes) {
-    this.annotationAttributes = annotationAttributes;
-    return this;
-  }
-
-  /**
-   * Sets the collection of {@link AnnotationElement} for this {@link Documentation}
-   * @param annotationElements
-   * @return {@link Documentation} for method chaining
-   */
-  public Documentation setAnnotationElements(final List<AnnotationElement> annotationElements) {
-    this.annotationElements = annotationElements;
-    return this;
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProvider.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProvider.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProvider.java
deleted file mode 100644
index bc793eb..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProvider.java
+++ /dev/null
@@ -1,119 +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.odata2.api.edm.provider;
-
-import java.util.List;
-
-import org.apache.olingo.odata2.api.edm.FullQualifiedName;
-import org.apache.olingo.odata2.api.exception.ODataException;
-import org.apache.olingo.odata2.api.exception.ODataNotImplementedException;
-
-/**
- * Default EDM Provider which is to be extended by the application
- * 
- * 
- */
-public abstract class EdmProvider {
-
-  /**
-   * This method should return an {@link EntityContainerInfo} or <b>null</b> if nothing is found
-   * @param name (null for default container)
-   * @return {@link EntityContainerInfo} for the given name
-   * @throws ODataException
-   */
-  public EntityContainerInfo getEntityContainerInfo(final String name) throws ODataException {
-    throw new ODataNotImplementedException();
-  }
-
-  /**
-   * This method should return an {@link EntityType} or <b>null</b> if nothing is found
-   * @param edmFQName
-   * @return {@link EntityType} for the given name
-   * @throws ODataException
-   */
-  public EntityType getEntityType(final FullQualifiedName edmFQName) throws ODataException {
-    throw new ODataNotImplementedException();
-  }
-
-  /**
-   * This method should return a {@link ComplexType} or <b>null</b> if nothing is found
-   * @param edmFQName
-   * @return {@link ComplexType} for the given name
-   * @throws ODataException
-   */
-  public ComplexType getComplexType(final FullQualifiedName edmFQName) throws ODataException {
-    throw new ODataNotImplementedException();
-  }
-
-  /**
-   * This method should return an {@link Association} or <b>null</b> if nothing is found
-   * @param edmFQName
-   * @return {@link Association} for the given name
-   * @throws ODataException
-   */
-  public Association getAssociation(final FullQualifiedName edmFQName) throws ODataException {
-    throw new ODataNotImplementedException();
-  }
-
-  /**
-   * This method should return an {@link EntitySet} or <b>null</b> if nothing is found
-   * @param entityContainer
-   * @param name
-   * @return {@link EntitySet} for the given container name and entity set name
-   * @throws ODataException
-   */
-  public EntitySet getEntitySet(final String entityContainer, final String name) throws ODataException {
-    throw new ODataNotImplementedException();
-  }
-
-  /**
-   * This method should return an {@link AssociationSet} or <b>null</b> if nothing is found
-   * @param entityContainer
-   * @param association
-   * @param sourceEntitySetName
-   * @param sourceEntitySetRole
-   * @return {@link AssociationSet} for the given container name, association name, source entity set name and source
-   * entity set role
-   * @throws ODataException
-   */
-  public AssociationSet getAssociationSet(final String entityContainer, final FullQualifiedName association,
-      final String sourceEntitySetName, final String sourceEntitySetRole) throws ODataException {
-    throw new ODataNotImplementedException();
-  }
-
-  /**
-   * This method should return a {@link FunctionImport} or <b>null</b> if nothing is found
-   * @param entityContainer
-   * @param name
-   * @return {@link FunctionImport} for the given container name and function import name
-   * @throws ODataException
-   */
-  public FunctionImport getFunctionImport(final String entityContainer, final String name) throws ODataException {
-    throw new ODataNotImplementedException();
-  }
-
-  /**
-   * This method should return a collection of all {@link Schema} or <b>null</b> if nothing is found
-   * @return List<{@link Schema}>
-   * @throws ODataException
-   */
-  public List<Schema> getSchemas() throws ODataException {
-    throw new ODataNotImplementedException();
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProviderAccessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProviderAccessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProviderAccessor.java
deleted file mode 100644
index d765156..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProviderAccessor.java
+++ /dev/null
@@ -1,33 +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.odata2.api.edm.provider;
-
-/**
- * This interface can be used to access the {@link EdmProvider} within an application.
- * 
- * 
- */
-public interface EdmProviderAccessor {
-
-  /**
-   * @return {@link EdmProvider} of this service
-   */
-  public EdmProvider getEdmProvider();
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProviderFactory.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProviderFactory.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProviderFactory.java
deleted file mode 100644
index 9dbdc8a..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProviderFactory.java
+++ /dev/null
@@ -1,43 +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.odata2.api.edm.provider;
-
-import java.io.InputStream;
-
-import org.apache.olingo.odata2.api.ep.EntityProviderException;
-import org.apache.olingo.odata2.api.rt.RuntimeDelegate;
-
-/**
- * EDM Provider Factory which can be used to create an edm provider (e.g. from a metadata document)
- * 
- * 
- */
-public class EdmProviderFactory {
-
-  /**
-   * Creates and returns an edm provider.
-   * @param metadataXml a metadata xml input stream (means the metadata document)
-   * @param validate true if semantic checks for metadata document input stream shall be done
-   * @return an instance of EdmProvider
-   */
-  public static EdmProvider getEdmProvider(final InputStream metadataXml, final boolean validate)
-      throws EntityProviderException {
-    return RuntimeDelegate.createEdmProvider(metadataXml, validate);
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityContainer.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityContainer.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityContainer.java
deleted file mode 100644
index 0b375ab..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityContainer.java
+++ /dev/null
@@ -1,134 +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.odata2.api.edm.provider;
-
-import java.util.List;
-
-/**
- * Objects of this class represent an entity container including its child elements
- * 
- */
-public class EntityContainer extends EntityContainerInfo {
-
-  private List<EntitySet> entitySets;
-  private List<AssociationSet> associationSets;
-  private List<FunctionImport> functionImports;
-  private Documentation documentation;
-
-  /**
-   * @return <b>List</b> of all entity sets of the entity container
-   */
-  public List<EntitySet> getEntitySets() {
-    return entitySets;
-  }
-
-  /**
-   * Sets the entity sets of this {@link EntityContainer}
-   * @param entitySets
-   * @return {@link EntityContainerInfo} for method chaining
-   */
-  public EntityContainer setEntitySets(final List<EntitySet> entitySets) {
-    this.entitySets = entitySets;
-    return this;
-  }
-
-  /**
-   * @return <b>List</b> of all association sets of the entity container
-   */
-  public List<AssociationSet> getAssociationSets() {
-    return associationSets;
-  }
-
-  /**
-   * Sets the association sets of this {@link EntityContainer}
-   * @param associationSets
-   * @return {@link EntityContainerInfo} for method chaining
-   */
-  public EntityContainer setAssociationSets(final List<AssociationSet> associationSets) {
-    this.associationSets = associationSets;
-    return this;
-  }
-
-  /**
-   * @return <b>List</b> of all function imports of the entity container
-   */
-  public List<FunctionImport> getFunctionImports() {
-    return functionImports;
-  }
-
-  /**
-   * Sets the function imports of this {@link EntityContainer}
-   * @param functionImports
-   * @return {@link EntityContainerInfo} for method chaining
-   */
-  public EntityContainer setFunctionImports(final List<FunctionImport> functionImports) {
-    this.functionImports = functionImports;
-    return this;
-  }
-
-  /**
-   * Sets the name of this {@link EntityContainer}
-   * @param name
-   * @return {@link EntityContainer} for method chaining
-   */
-  @Override
-  public EntityContainer setName(final String name) {
-    super.setName(name);
-    return this;
-  }
-
-  /**
-   * Sets the entity container which is the parent of this {@link EntityContainer}
-   * @param extendz
-   * @return {@link EntityContainer} for method chaining
-   */
-  @Override
-  public EntityContainer setExtendz(final String extendz) {
-    super.setExtendz(extendz);
-    return this;
-  }
-
-  /**
-   * Sets if this is the default {@link EntityContainer}
-   * @param isDefaultEntityContainer
-   * @return {@link EntityContainer} for method chaining
-   */
-  @Override
-  public EntityContainer setDefaultEntityContainer(final boolean isDefaultEntityContainer) {
-    super.setDefaultEntityContainer(isDefaultEntityContainer);
-    return this;
-  }
-
-  /**
-   * @return {@link Documentation} documentation
-   */
-  public Documentation getDocumentation() {
-    return documentation;
-  }
-
-  /**
-   * Sets the {@link Documentation}
-   * @param documentation
-   * @return {@link EntityContainer} for method chaining
-   */
-  public EntityContainer setDocumentation(final Documentation documentation) {
-    this.documentation = documentation;
-    return this;
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityContainerInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityContainerInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityContainerInfo.java
deleted file mode 100644
index 440a0b9..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityContainerInfo.java
+++ /dev/null
@@ -1,120 +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.odata2.api.edm.provider;
-
-import java.util.List;
-
-/**
- * Objects of this class represent an entity container
- * 
- */
-public class EntityContainerInfo {
-
-  private String name;
-  private String extendz;
-  private boolean isDefaultEntityContainer;
-  private List<AnnotationAttribute> annotationAttributes;
-  private List<AnnotationElement> annotationElements;
-
-  /**
-   * @return <b>String</b> name
-   */
-  public String getName() {
-    return name;
-  }
-
-  /**
-   * @return <b>String</b> name of the container which is extended by this container
-   */
-  public String getExtendz() {
-    return extendz;
-  }
-
-  /**
-   * @return <b>boolean</b> if this container is the default container
-   */
-  public boolean isDefaultEntityContainer() {
-    return isDefaultEntityContainer;
-  }
-
-  /**
-   * Sets the name of this {@link EntityContainerInfo}
-   * @param name
-   * @return {@link EntityContainerInfo} for method chaining
-   */
-  public EntityContainerInfo setName(final String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Sets the entity container which is the parent of this {@link EntityContainerInfo}
-   * @param extendz
-   * @return {@link EntityContainerInfo} for method chaining
-   */
-  public EntityContainerInfo setExtendz(final String extendz) {
-    this.extendz = extendz;
-    return this;
-  }
-
-  /**
-   * Sets if this is the default {@link EntityContainerInfo}
-   * @param isDefaultEntityContainer
-   * @return {@link EntityContainerInfo} for method chaining
-   */
-  public EntityContainerInfo setDefaultEntityContainer(final boolean isDefaultEntityContainer) {
-    this.isDefaultEntityContainer = isDefaultEntityContainer;
-    return this;
-  }
-
-  /**
-   * @return collection of {@link AnnotationAttribute} annotation attributes
-   */
-  public List<AnnotationAttribute> getAnnotationAttributes() {
-    return annotationAttributes;
-  }
-
-  /**
-   * Sets the collection of {@link AnnotationAttribute} for this {@link EntityContainer}
-   * @param annotationAttributes
-   * @return {@link EntityContainer} for method chaining
-   */
-  public EntityContainerInfo setAnnotationAttributes(final List<AnnotationAttribute> annotationAttributes) {
-    this.annotationAttributes = annotationAttributes;
-    return this;
-  }
-
-  /**
-   * @return collection of {@link AnnotationElement} annotation elements
-   */
-  public List<AnnotationElement> getAnnotationElements() {
-    return annotationElements;
-  }
-
-  /**
-   * Sets the collection of {@link AnnotationElement} for this {@link EntityContainer}
-   * @param annotationElements
-   * @return {@link EntityContainer} for method chaining
-   */
-  public EntityContainerInfo setAnnotationElements(final List<AnnotationElement> annotationElements) {
-    this.annotationElements = annotationElements;
-    return this;
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntitySet.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntitySet.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntitySet.java
deleted file mode 100644
index 8208e67..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntitySet.java
+++ /dev/null
@@ -1,139 +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.odata2.api.edm.provider;
-
-import java.util.List;
-
-import org.apache.olingo.odata2.api.edm.FullQualifiedName;
-
-/**
- * Objects of this class represent an entity set
- * 
- */
-public class EntitySet {
-
-  private String name;
-  private FullQualifiedName entityType;
-  private Mapping mapping;
-  private Documentation documentation;
-  private List<AnnotationAttribute> annotationAttributes;
-  private List<AnnotationElement> annotationElements;
-
-  /**
-   * @return <b>String> name of this entity set
-   */
-  public String getName() {
-    return name;
-  }
-
-  /**
-   * @return {@link FullQualifiedName} of the entity type of this entity set
-   */
-  public FullQualifiedName getEntityType() {
-    return entityType;
-  }
-
-  /**
-   * @return {@link Mapping} for this type
-   */
-  public Mapping getMapping() {
-    return mapping;
-  }
-
-  /**
-   * @return {@link Documentation} documentation
-   */
-  public Documentation getDocumentation() {
-    return documentation;
-  }
-
-  /**
-   * @return collection of {@link AnnotationAttribute} annotation attributes
-   */
-  public List<AnnotationAttribute> getAnnotationAttributes() {
-    return annotationAttributes;
-  }
-
-  /**
-   * @return collection of {@link AnnotationElement} annotation elements
-   */
-  public List<AnnotationElement> getAnnotationElements() {
-    return annotationElements;
-  }
-
-  /**
-   * Sets the name of this {@link EntitySet}
-   * @param name
-   * @return {@link EntitySet} for method chaining
-   */
-  public EntitySet setName(final String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Sets the {@link FullQualifiedName} of the {@link EntityType} of this {@link EntitySet}
-   * @param entityType
-   * @return {@link EntitySet} for method chaining
-   */
-  public EntitySet setEntityType(final FullQualifiedName entityType) {
-    this.entityType = entityType;
-    return this;
-  }
-
-  /**
-   * Sets the {@link Mapping}
-   * @param mapping
-   * @return {@link EntitySet} for method chaining
-   */
-  public EntitySet setMapping(final Mapping mapping) {
-    this.mapping = mapping;
-    return this;
-  }
-
-  /**
-   * Sets the {@link Documentation}
-   * @param documentation
-   * @return {@link EntitySet} for method chaining
-   */
-  public EntitySet setDocumentation(final Documentation documentation) {
-    this.documentation = documentation;
-    return this;
-  }
-
-  /**
-   * Sets the collection of {@link AnnotationAttribute} for this {@link EntitySet}
-   * @param annotationAttributes
-   * @return {@link EntitySet} for method chaining
-   */
-  public EntitySet setAnnotationAttributes(final List<AnnotationAttribute> annotationAttributes) {
-    this.annotationAttributes = annotationAttributes;
-    return this;
-  }
-
-  /**
-   * Sets the collection of {@link AnnotationElement} for this {@link EntitySet}
-   * @param annotationElements
-   * @return {@link EntitySet} for method chaining
-   */
-  public EntitySet setAnnotationElements(final List<AnnotationElement> annotationElements) {
-    this.annotationElements = annotationElements;
-    return this;
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityType.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityType.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityType.java
deleted file mode 100644
index ddd12bf..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityType.java
+++ /dev/null
@@ -1,185 +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.odata2.api.edm.provider;
-
-import java.util.List;
-
-import org.apache.olingo.odata2.api.edm.FullQualifiedName;
-
-/**
- * Objects of this class represent an entity type
- * 
- */
-public class EntityType extends ComplexType {
-
-  private boolean hasStream;
-  private CustomizableFeedMappings customizableFeedMappings;
-  private Key key;
-  private List<NavigationProperty> navigationProperties;
-
-  /**
-   * @return <b>boolean</b> if this EntityType is a media resource
-   */
-  public boolean isHasStream() {
-    return hasStream;
-  }
-
-  /**
-   * @return {@link CustomizableFeedMappings} of this entity type
-   */
-  public CustomizableFeedMappings getCustomizableFeedMappings() {
-    return customizableFeedMappings;
-  }
-
-  /**
-   * @return {@link Key} of this entity type
-   */
-  public Key getKey() {
-    return key;
-  }
-
-  /**
-   * @return List<{@link NavigationProperty}> of this entity type
-   */
-  public List<NavigationProperty> getNavigationProperties() {
-    return navigationProperties;
-  }
-
-  /**
-   * Sets if this {@link EntityType} is a media resource
-   * @param hasStream
-   * @return {@link EntityType} for method chaining,
-   */
-  public EntityType setHasStream(final boolean hasStream) {
-    this.hasStream = hasStream;
-    return this;
-  }
-
-  /**
-   * Sets the {@link CustomizableFeedMappings} for this {@link EntityType}
-   * @param customizableFeedMappings
-   * @return {@link EntityType} for method chaining
-   */
-  public EntityType setCustomizableFeedMappings(final CustomizableFeedMappings customizableFeedMappings) {
-    this.customizableFeedMappings = customizableFeedMappings;
-    return this;
-  }
-
-  /**
-   * Sets the {@link Key} for this {@link EntityType}
-   * @param key
-   * @return {@link EntityType} for method chaining
-   */
-  public EntityType setKey(final Key key) {
-    this.key = key;
-    return this;
-  }
-
-  /**
-   * Sets the {@link NavigationProperty}s for this {@link EntityType}
-   * @param navigationProperties
-   * @return {@link EntityType} for method chaining
-   */
-  public EntityType setNavigationProperties(final List<NavigationProperty> navigationProperties) {
-    this.navigationProperties = navigationProperties;
-    return this;
-  }
-
-  /**
-   * @param name
-   * @return {@link EntityType} for method chaining
-   */
-  @Override
-  public EntityType setName(final String name) {
-    super.setName(name);
-    return this;
-  }
-
-  /**
-   * @param baseType
-   * @return {@link EntityType} for method chaining
-   */
-  @Override
-  public EntityType setBaseType(final FullQualifiedName baseType) {
-    super.setBaseType(baseType);
-    return this;
-  }
-
-  /**
-   * @param isAbstract
-   * @return {@link EntityType} for method chaining
-   */
-  @Override
-  public EntityType setAbstract(final boolean isAbstract) {
-    super.setAbstract(isAbstract);
-    return this;
-  }
-
-  /**
-   * @param properties
-   * @return {@link EntityType} for method chaining
-   */
-  @Override
-  public EntityType setProperties(final List<Property> properties) {
-    super.setProperties(properties);
-    return this;
-  }
-
-  /**
-   * @param mapping
-   * @return {@link EntityType} for method chaining
-   */
-  @Override
-  public EntityType setMapping(final Mapping mapping) {
-    super.setMapping(mapping);
-    return this;
-  }
-
-  /**
-   * @param documentation
-   * @return {@link EntityType} for method chaining
-   */
-  @Override
-  public EntityType setDocumentation(final Documentation documentation) {
-    super.setDocumentation(documentation);
-    return this;
-  }
-
-  /**
-   * Sets the collection of {@link AnnotationAttribute} for this {@link EntityType}
-   * @param annotationAttributes
-   * @return {@link EntityType} for method chaining
-   */
-  @Override
-  public EntityType setAnnotationAttributes(final List<AnnotationAttribute> annotationAttributes) {
-    super.setAnnotationAttributes(annotationAttributes);
-    return this;
-  }
-
-  /**
-   * Sets the collection of {@link AnnotationElement} for this {@link EntityType}
-   * @param annotationElements
-   * @return {@link EntityType} for method chaining
-   */
-  @Override
-  public EntityType setAnnotationElements(final List<AnnotationElement> annotationElements) {
-    super.setAnnotationElements(annotationElements);
-    return this;
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Facets.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Facets.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Facets.java
deleted file mode 100644
index 498b696..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Facets.java
+++ /dev/null
@@ -1,214 +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.odata2.api.edm.provider;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.olingo.odata2.api.edm.EdmConcurrencyMode;
-import org.apache.olingo.odata2.api.edm.EdmFacets;
-
-/**
- * Objects of this class represent the facets an entity type, property or function import can have
- * 
- */
-public class Facets implements EdmFacets {
-
-  /**
-   * Specification default is TRUE but we won't set it here because
-   * we want to know if it's set explicitly by an application.
-   */
-  Boolean nullable;
-  String defaultValue;
-  Integer maxLength;
-  Boolean fixedLength;
-  Integer precision;
-  Integer scale;
-  Boolean unicode;
-  String collation;
-  EdmConcurrencyMode concurrencyMode;
-
-  @Override
-  public Boolean isNullable() {
-    return nullable;
-  }
-
-  @Override
-  public String getDefaultValue() {
-    return defaultValue;
-  }
-
-  @Override
-  public Integer getMaxLength() {
-    return maxLength;
-  }
-
-  @Override
-  public Boolean isFixedLength() {
-    return fixedLength;
-  }
-
-  @Override
-  public Integer getPrecision() {
-    return precision;
-  }
-
-  @Override
-  public Integer getScale() {
-    return scale;
-  }
-
-  @Override
-  public Boolean isUnicode() {
-    return unicode;
-  }
-
-  @Override
-  public String getCollation() {
-    return collation;
-  }
-
-  @Override
-  public EdmConcurrencyMode getConcurrencyMode() {
-    return concurrencyMode;
-  }
-
-  /**
-   * Sets if this {@link Facets} is nullable
-   * @param nullable
-   * @return {@link Facets} for method chaining
-   */
-  public Facets setNullable(final Boolean nullable) {
-    this.nullable = nullable;
-    return this;
-  }
-
-  /**
-   * Sets the fixed length of this {@link Facets}
-   * @param fixedLength
-   * @return {@link Facets} for method chaining
-   */
-  public Facets setFixedLength(final Boolean fixedLength) {
-    this.fixedLength = fixedLength;
-    return this;
-  }
-
-  /**
-   * Sets if this {@link Facets} is in Unicode
-   * @param unicode
-   * @return {@link Facets} for method chaining
-   */
-  public Facets setUnicode(final Boolean unicode) {
-    this.unicode = unicode;
-    return this;
-  }
-
-  /**
-   * Sets the default value of this {@link Facets}
-   * @param defaultValue
-   * @return {@link Facets} for method chaining
-   */
-  public Facets setDefaultValue(final String defaultValue) {
-    this.defaultValue = defaultValue;
-    return this;
-  }
-
-  /**
-   * Sets the maximum length of this {@link Facets}
-   * @param maxLength
-   * @return {@link Facets} for method chaining
-   */
-  public Facets setMaxLength(final Integer maxLength) {
-    this.maxLength = maxLength;
-    return this;
-  }
-
-  /**
-   * Sets the precision of this {@link Facets}
-   * @param precision
-   * @return {@link Facets} for method chaining
-   */
-  public Facets setPrecision(final Integer precision) {
-    this.precision = precision;
-    return this;
-  }
-
-  /**
-   * Sets the scale of this {@link Facets}
-   * @param scale
-   * @return {@link Facets} for method chaining
-   */
-  public Facets setScale(final Integer scale) {
-    this.scale = scale;
-    return this;
-  }
-
-  /**
-   * Sets the collation of this {@link Facets}
-   * @param collation
-   * @return {@link Facets} for method chaining
-   */
-  public Facets setCollation(final String collation) {
-    this.collation = collation;
-    return this;
-  }
-
-  /**
-   * Sets the {@link EdmConcurrencyMode} of this {@link Facets}
-   * @param concurrencyMode
-   * @return {@link Facets} for method chaining
-   */
-  public Facets setConcurrencyMode(final EdmConcurrencyMode concurrencyMode) {
-    this.concurrencyMode = concurrencyMode;
-    return this;
-  }
-
-  @Override
-  public String toString() {
-    final List<String> values = new ArrayList<String>();
-    if (nullable != null) {
-      values.add("Nullable=" + nullable);
-    }
-    if (defaultValue != null) {
-      values.add("DefaultValue=" + defaultValue);
-    }
-    if (maxLength != null) {
-      values.add("MaxLength=" + maxLength);
-    }
-    if (fixedLength != null) {
-      values.add("FixedLength=" + fixedLength);
-    }
-    if (precision != null) {
-      values.add("Precision=" + precision);
-    }
-    if (scale != null) {
-      values.add("Scale=" + scale);
-    }
-    if (unicode != null) {
-      values.add("Unicode=" + unicode);
-    }
-    if (collation != null) {
-      values.add("Collation=" + collation);
-    }
-    if (concurrencyMode != null) {
-      values.add("ConcurrencyMode=" + concurrencyMode);
-    }
-    return values.toString();
-  }
-}