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 2014/03/16 07:18:14 UTC
[2/2] git commit: [OLINGO-191] change package name: part 1 of
1.client.api.edm.xml->client.api.edm.xml.shared, 2,
client.api.edm.xml.v4->client.api.edm.xml.
[OLINGO-191] change package name: part 1 of 1.client.api.edm.xml->client.api.edm.xml.shared, 2, client.api.edm.xml.v4->client.api.edm.xml.
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/2870fdc9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/tree/2870fdc9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/diff/2870fdc9
Branch: refs/heads/olingo191
Commit: 2870fdc9e299bf08d5e249f808900ab083baaf19
Parents: 781cd72
Author: challenh <ch...@apache.org>
Authored: Sun Mar 16 14:14:22 2014 +0800
Committer: challenh <ch...@apache.org>
Committed: Sun Mar 16 14:14:22 2014 +0800
----------------------------------------------------------------------
.../client/api/edm/xml/CommonAnnotations.java | 26 -------
.../api/edm/xml/CommonFunctionImport.java | 22 ------
.../api/edm/xml/CommonNavigationProperty.java | 22 ------
.../client/api/edm/xml/CommonParameter.java | 33 ---------
.../client/api/edm/xml/CommonProperty.java | 39 -----------
.../olingo/client/api/edm/xml/ComplexType.java | 32 ---------
.../olingo/client/api/edm/xml/DataServices.java | 30 --------
.../apache/olingo/client/api/edm/xml/Edmx.java | 26 -------
.../client/api/edm/xml/EntityContainer.java | 40 -----------
.../olingo/client/api/edm/xml/EntityKey.java | 26 -------
.../olingo/client/api/edm/xml/EntitySet.java | 25 -------
.../olingo/client/api/edm/xml/EntityType.java | 32 ---------
.../olingo/client/api/edm/xml/EnumType.java | 34 ---------
.../olingo/client/api/edm/xml/Member.java | 26 -------
.../apache/olingo/client/api/edm/xml/Named.java | 24 -------
.../olingo/client/api/edm/xml/OnDelete.java | 24 -------
.../client/api/edm/xml/OnDeleteAction.java | 28 --------
.../olingo/client/api/edm/xml/PropertyRef.java | 25 -------
.../olingo/client/api/edm/xml/Schema.java | 74 --------------------
.../olingo/client/api/edm/xml/XMLMetadata.java | 59 ----------------
.../api/edm/xml/shared/CommonAnnotations.java | 26 +++++++
.../edm/xml/shared/CommonFunctionImport.java | 22 ++++++
.../xml/shared/CommonNavigationProperty.java | 22 ++++++
.../api/edm/xml/shared/CommonParameter.java | 33 +++++++++
.../api/edm/xml/shared/CommonProperty.java | 39 +++++++++++
.../client/api/edm/xml/shared/ComplexType.java | 32 +++++++++
.../client/api/edm/xml/shared/DataServices.java | 30 ++++++++
.../olingo/client/api/edm/xml/shared/Edmx.java | 26 +++++++
.../api/edm/xml/shared/EntityContainer.java | 40 +++++++++++
.../client/api/edm/xml/shared/EntityKey.java | 26 +++++++
.../client/api/edm/xml/shared/EntitySet.java | 25 +++++++
.../client/api/edm/xml/shared/EntityType.java | 32 +++++++++
.../client/api/edm/xml/shared/EnumType.java | 34 +++++++++
.../client/api/edm/xml/shared/Member.java | 26 +++++++
.../olingo/client/api/edm/xml/shared/Named.java | 24 +++++++
.../client/api/edm/xml/shared/OnDelete.java | 24 +++++++
.../api/edm/xml/shared/OnDeleteAction.java | 28 ++++++++
.../client/api/edm/xml/shared/PropertyRef.java | 25 +++++++
.../client/api/edm/xml/shared/Schema.java | 74 ++++++++++++++++++++
.../client/api/edm/xml/shared/XMLMetadata.java | 59 ++++++++++++++++
.../client/api/edm/xml/v3/Annotations.java | 2 +-
.../client/api/edm/xml/v3/Association.java | 2 +-
.../client/api/edm/xml/v3/AssociationEnd.java | 2 +-
.../client/api/edm/xml/v3/AssociationSet.java | 2 +-
.../client/api/edm/xml/v3/FunctionImport.java | 2 +-
.../api/edm/xml/v3/NavigationProperty.java | 2 +-
.../olingo/client/api/edm/xml/v3/Parameter.java | 2 +-
.../olingo/client/api/edm/xml/v3/Property.java | 2 +-
.../edm/xml/v3/ReferentialConstraintRole.java | 2 +-
.../olingo/client/api/edm/xml/v3/ValueTerm.java | 2 +-
.../olingo/client/api/edm/xml/v4/Action.java | 2 +-
.../client/api/edm/xml/v4/Annotations.java | 2 +-
.../client/api/edm/xml/v4/BindingTarget.java | 2 +-
.../client/api/edm/xml/v4/ComplexType.java | 2 +-
.../olingo/client/api/edm/xml/v4/Edmx.java | 2 +-
.../client/api/edm/xml/v4/EntityContainer.java | 2 +-
.../olingo/client/api/edm/xml/v4/EntitySet.java | 2 +-
.../client/api/edm/xml/v4/EntityType.java | 2 +-
.../client/api/edm/xml/v4/FunctionImport.java | 2 +-
.../api/edm/xml/v4/NavigationProperty.java | 4 +-
.../client/api/edm/xml/v4/OperationImport.java | 2 +-
.../olingo/client/api/edm/xml/v4/Parameter.java | 2 +-
.../olingo/client/api/edm/xml/v4/Property.java | 2 +-
.../olingo/client/api/edm/xml/v4/Schema.java | 2 +-
.../olingo/client/api/edm/xml/v4/Singleton.java | 2 +-
.../olingo/client/api/edm/xml/v4/Term.java | 2 +-
.../client/api/edm/xml/v4/TypeDefinition.java | 2 +-
.../client/api/edm/xml/v4/XMLMetadata.java | 2 +-
.../olingo/client/api/op/ODataDeserializer.java | 2 +-
.../client/core/edm/EdmServiceMetadataImpl.java | 2 +-
.../shared/AbstractEdmServiceMetadataImpl.java | 8 +--
.../client/core/edm/shared/EdmClientImpl.java | 14 ++--
.../core/edm/shared/EdmComplexTypeImpl.java | 2 +-
.../core/edm/shared/EdmEntityContainerImpl.java | 8 +--
.../core/edm/shared/EdmEntityTypeImpl.java | 4 +-
.../client/core/edm/shared/EdmEnumTypeImpl.java | 5 +-
.../core/edm/shared/EdmKeyPropertyRefImpl.java | 2 +-
.../core/edm/shared/EdmOperationImpl.java | 2 +-
.../core/edm/shared/EdmParameterImpl.java | 2 +-
.../client/core/edm/shared/EdmPropertyImpl.java | 2 +-
.../client/core/edm/shared/EdmSchemaImpl.java | 12 ++--
.../edm/shared/EdmStructuredTypeHelperImpl.java | 6 +-
.../client/core/edm/v3/EdmEntitySetProxy.java | 6 +-
.../client/core/edm/v3/EdmOperationProxy.java | 2 +-
.../core/edm/v3/EdmServiceMetadataImpl.java | 6 +-
.../core/edm/xml/NavigationPropertyImpl.java | 2 +-
.../olingo/client/core/edm/xml/SchemaImpl.java | 2 +-
.../edm/xml/shared/AbstractAnnotations.java | 2 +-
.../edm/xml/shared/AbstractComplexType.java | 6 +-
.../edm/xml/shared/AbstractDataServices.java | 2 +-
.../core/edm/xml/shared/AbstractEdmItem.java | 2 +-
.../core/edm/xml/shared/AbstractEdmx.java | 4 +-
.../edm/xml/shared/AbstractEntityContainer.java | 6 +-
.../core/edm/xml/shared/AbstractEntitySet.java | 2 +-
.../core/edm/xml/shared/AbstractEntityType.java | 4 +-
.../core/edm/xml/shared/AbstractEnumType.java | 4 +-
.../core/edm/xml/shared/AbstractMember.java | 2 +-
.../xml/shared/AbstractNavigationProperty.java | 2 +-
.../core/edm/xml/shared/AbstractParameter.java | 2 +-
.../core/edm/xml/shared/AbstractProperty.java | 2 +-
.../core/edm/xml/shared/AbstractSchema.java | 8 +--
.../edm/xml/shared/AbstractXMLMetadata.java | 6 +-
.../core/edm/xml/shared/EntityKeyImpl.java | 4 +-
.../core/edm/xml/shared/OnDeleteImpl.java | 4 +-
.../core/edm/xml/shared/PropertyRefImpl.java | 2 +-
.../core/edm/xml/v3/AssociationEndImpl.java | 2 +-
.../client/core/edm/xml/v3/ComplexTypeImpl.java | 2 +-
.../core/edm/xml/v3/DataServicesImpl.java | 2 +-
.../core/edm/xml/v3/EntityContainerImpl.java | 2 +-
.../client/core/edm/xml/v3/EnumTypeImpl.java | 2 +-
.../xml/v3/ReferentialConstraintRoleImpl.java | 2 +-
.../client/core/edm/xml/v3/SchemaImpl.java | 10 +--
.../apache/olingo/client/core/uri/URIUtils.java | 4 +-
.../olingo/client/core/v3/MetadataTest.java | 8 +--
114 files changed, 770 insertions(+), 769 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/CommonAnnotations.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/CommonAnnotations.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/CommonAnnotations.java
deleted file mode 100644
index b79328f..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/CommonAnnotations.java
+++ /dev/null
@@ -1,26 +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.client.api.edm.xml;
-
-public abstract interface CommonAnnotations {
-
- String getTarget();
-
- String getQualifier();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/CommonFunctionImport.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/CommonFunctionImport.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/CommonFunctionImport.java
deleted file mode 100644
index c590387..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/CommonFunctionImport.java
+++ /dev/null
@@ -1,22 +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.client.api.edm.xml;
-
-public interface CommonFunctionImport extends Named {
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/CommonNavigationProperty.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/CommonNavigationProperty.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/CommonNavigationProperty.java
deleted file mode 100644
index 20eb9de..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/CommonNavigationProperty.java
+++ /dev/null
@@ -1,22 +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.client.api.edm.xml;
-
-public interface CommonNavigationProperty extends Named {
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/CommonParameter.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/CommonParameter.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/CommonParameter.java
deleted file mode 100644
index ec96dc0..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/CommonParameter.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.client.api.edm.xml;
-
-public interface CommonParameter extends Named {
-
- String getType();
-
- boolean isNullable();
-
- Integer getMaxLength();
-
- Integer getPrecision();
-
- Integer getScale();
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/CommonProperty.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/CommonProperty.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/CommonProperty.java
deleted file mode 100644
index b11de10..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/CommonProperty.java
+++ /dev/null
@@ -1,39 +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.client.api.edm.xml;
-
-public interface CommonProperty extends Named {
-
- String getType();
-
- boolean isNullable();
-
- String getDefaultValue();
-
- Integer getMaxLength();
-
- Integer getPrecision();
-
- Integer getScale();
-
- boolean isUnicode();
-
- String getSrid();
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ComplexType.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ComplexType.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ComplexType.java
deleted file mode 100644
index 9e85e22..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ComplexType.java
+++ /dev/null
@@ -1,32 +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.client.api.edm.xml;
-
-import java.util.List;
-
-public interface ComplexType extends Named {
-
- CommonProperty getProperty(String name);
-
- List<? extends CommonProperty> getProperties();
-
- CommonNavigationProperty getNavigationProperty(String name);
-
- List<? extends CommonNavigationProperty> getNavigationProperties();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/DataServices.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/DataServices.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/DataServices.java
deleted file mode 100644
index 961f69c..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/DataServices.java
+++ /dev/null
@@ -1,30 +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.client.api.edm.xml;
-
-import java.util.List;
-
-public interface DataServices {
-
- String getDataServiceVersion();
-
- String getMaxDataServiceVersion();
-
- List<? extends Schema> getSchemas();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Edmx.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Edmx.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Edmx.java
deleted file mode 100644
index ee495c2..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Edmx.java
+++ /dev/null
@@ -1,26 +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.client.api.edm.xml;
-
-public interface Edmx {
-
- String getVersion();
-
- DataServices getDataServices();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntityContainer.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntityContainer.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntityContainer.java
deleted file mode 100644
index b748c5f..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntityContainer.java
+++ /dev/null
@@ -1,40 +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.client.api.edm.xml;
-
-import java.util.List;
-
-public interface EntityContainer extends Named {
-
- String getExtends();
-
- boolean isLazyLoadingEnabled();
-
- boolean isDefaultEntityContainer();
-
- EntitySet getEntitySet(String name);
-
- List<? extends EntitySet> getEntitySets();
-
- CommonFunctionImport getFunctionImport(String name);
-
- List<? extends CommonFunctionImport> getFunctionImports(String name);
-
- List<? extends CommonFunctionImport> getFunctionImports();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntityKey.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntityKey.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntityKey.java
deleted file mode 100644
index c1c43ec..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntityKey.java
+++ /dev/null
@@ -1,26 +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.client.api.edm.xml;
-
-import java.util.List;
-
-public interface EntityKey {
-
- List<PropertyRef> getPropertyRefs();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntitySet.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntitySet.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntitySet.java
deleted file mode 100644
index 3dea8b4..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntitySet.java
+++ /dev/null
@@ -1,25 +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.client.api.edm.xml;
-
-public interface EntitySet extends Named {
-
- String getEntityType();
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntityType.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntityType.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntityType.java
deleted file mode 100644
index a413edf..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntityType.java
+++ /dev/null
@@ -1,32 +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.client.api.edm.xml;
-
-public interface EntityType extends ComplexType {
-
- boolean isAbstractEntityType();
-
- String getBaseType();
-
- boolean isOpenType();
-
- EntityKey getKey();
-
- boolean isHasStream();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EnumType.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EnumType.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EnumType.java
deleted file mode 100644
index 318dc17..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EnumType.java
+++ /dev/null
@@ -1,34 +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.client.api.edm.xml;
-
-import java.util.List;
-
-public interface EnumType extends Named {
-
- String getUnderlyingType();
-
- boolean isFlags();
-
- List<Member> getMembers();
-
- Member getMember(String name);
-
- Member getMember(Integer value);
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Member.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Member.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Member.java
deleted file mode 100644
index 0cb9b74..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Member.java
+++ /dev/null
@@ -1,26 +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.client.api.edm.xml;
-
-public interface Member {
-
- String getName();
-
- String getValue();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Named.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Named.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Named.java
deleted file mode 100644
index bf7d602..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Named.java
+++ /dev/null
@@ -1,24 +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.client.api.edm.xml;
-
-public interface Named {
-
- String getName();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/OnDelete.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/OnDelete.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/OnDelete.java
deleted file mode 100644
index 7ebbfb3..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/OnDelete.java
+++ /dev/null
@@ -1,24 +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.client.api.edm.xml;
-
-public interface OnDelete {
-
- OnDeleteAction getAction();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/OnDeleteAction.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/OnDeleteAction.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/OnDeleteAction.java
deleted file mode 100644
index b8daec0..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/OnDeleteAction.java
+++ /dev/null
@@ -1,28 +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.client.api.edm.xml;
-
-public enum OnDeleteAction {
-
- Cascade,
- None,
- SetNull,
- SetDefault;
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/PropertyRef.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/PropertyRef.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/PropertyRef.java
deleted file mode 100644
index 8de4a22..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/PropertyRef.java
+++ /dev/null
@@ -1,25 +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.client.api.edm.xml;
-
-public interface PropertyRef extends Named {
-
- String getAlias();
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Schema.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Schema.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Schema.java
deleted file mode 100644
index cee0c9a..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Schema.java
+++ /dev/null
@@ -1,74 +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.client.api.edm.xml;
-
-import java.util.List;
-
-public interface Schema {
-
- String getNamespace();
-
- String getAlias();
-
- List<? extends EntityType> getEntityTypes();
-
- List<EnumType> getEnumTypes();
-
- EnumType getEnumType(String name);
-
- List<? extends CommonAnnotations> getAnnotationsList();
-
- CommonAnnotations getAnnotationsList(String target);
-
- List<? extends ComplexType> getComplexTypes();
-
- List<? extends EntityContainer> getEntityContainers();
-
- /**
- * Gets default entity container.
- *
- * @return default entity container.
- */
- EntityContainer getDefaultEntityContainer();
-
- /**
- * Gets entity container with the given name.
- *
- * @param name name.
- * @return entity container.
- */
- EntityContainer getEntityContainer(String name);
-
- /**
- * Gets entity type with the given name.
- *
- * @param name name.
- * @return entity type.
- */
- EntityType getEntityType(String name);
-
- /**
- * Gets complex type with the given name.
- *
- * @param name name.
- * @return complex type.
- */
- ComplexType getComplexType(String name);
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/XMLMetadata.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/XMLMetadata.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/XMLMetadata.java
deleted file mode 100644
index bcb5973..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/XMLMetadata.java
+++ /dev/null
@@ -1,59 +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.client.api.edm.xml;
-
-import java.util.List;
-
-/**
- * Entry point for access information about EDM metadata.
- */
-public interface XMLMetadata {
-
- /**
- * Checks whether the given key is a valid namespace or alias in the EdM metadata document.
- *
- * @param key namespace or alias
- * @return true if key is valid namespace or alias
- */
- boolean isNsOrAlias(String key);
-
- /**
- * Returns the Schema at the specified position in the EdM metadata document.
- *
- * @param index index of the Schema to return
- * @return the Schema at the specified position in the EdM metadata document
- */
- Schema getSchema(final int index);
-
- /**
- * Returns the Schema with the specified key (namespace or alias) in the EdM metadata document.
- *
- * @param key namespace or alias
- * @return the Schema with the specified key in the EdM metadata document
- */
- Schema getSchema(final String key);
-
- /**
- * Returns all Schema objects defined in the EdM metadata document.
- *
- * @return all Schema objects defined in the EdM metadata document
- */
- List<? extends Schema> getSchemas();
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/CommonAnnotations.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/CommonAnnotations.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/CommonAnnotations.java
new file mode 100644
index 0000000..879f6b1
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/CommonAnnotations.java
@@ -0,0 +1,26 @@
+/*
+ * 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.client.api.edm.xml.shared;
+
+public abstract interface CommonAnnotations {
+
+ String getTarget();
+
+ String getQualifier();
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/CommonFunctionImport.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/CommonFunctionImport.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/CommonFunctionImport.java
new file mode 100644
index 0000000..881383b
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/CommonFunctionImport.java
@@ -0,0 +1,22 @@
+/*
+ * 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.client.api.edm.xml.shared;
+
+public interface CommonFunctionImport extends Named {
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/CommonNavigationProperty.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/CommonNavigationProperty.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/CommonNavigationProperty.java
new file mode 100644
index 0000000..f8f476c
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/CommonNavigationProperty.java
@@ -0,0 +1,22 @@
+/*
+ * 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.client.api.edm.xml.shared;
+
+public interface CommonNavigationProperty extends Named {
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/CommonParameter.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/CommonParameter.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/CommonParameter.java
new file mode 100644
index 0000000..e3983c8
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/CommonParameter.java
@@ -0,0 +1,33 @@
+/*
+ * 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.client.api.edm.xml.shared;
+
+public interface CommonParameter extends Named {
+
+ String getType();
+
+ boolean isNullable();
+
+ Integer getMaxLength();
+
+ Integer getPrecision();
+
+ Integer getScale();
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/CommonProperty.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/CommonProperty.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/CommonProperty.java
new file mode 100644
index 0000000..21db814
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/CommonProperty.java
@@ -0,0 +1,39 @@
+/*
+ * 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.client.api.edm.xml.shared;
+
+public interface CommonProperty extends Named {
+
+ String getType();
+
+ boolean isNullable();
+
+ String getDefaultValue();
+
+ Integer getMaxLength();
+
+ Integer getPrecision();
+
+ Integer getScale();
+
+ boolean isUnicode();
+
+ String getSrid();
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/ComplexType.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/ComplexType.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/ComplexType.java
new file mode 100644
index 0000000..1d95611
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/ComplexType.java
@@ -0,0 +1,32 @@
+/*
+ * 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.client.api.edm.xml.shared;
+
+import java.util.List;
+
+public interface ComplexType extends Named {
+
+ CommonProperty getProperty(String name);
+
+ List<? extends CommonProperty> getProperties();
+
+ CommonNavigationProperty getNavigationProperty(String name);
+
+ List<? extends CommonNavigationProperty> getNavigationProperties();
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/DataServices.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/DataServices.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/DataServices.java
new file mode 100644
index 0000000..2797f36
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/DataServices.java
@@ -0,0 +1,30 @@
+/*
+ * 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.client.api.edm.xml.shared;
+
+import java.util.List;
+
+public interface DataServices {
+
+ String getDataServiceVersion();
+
+ String getMaxDataServiceVersion();
+
+ List<? extends Schema> getSchemas();
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/Edmx.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/Edmx.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/Edmx.java
new file mode 100644
index 0000000..3193cad
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/Edmx.java
@@ -0,0 +1,26 @@
+/*
+ * 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.client.api.edm.xml.shared;
+
+public interface Edmx {
+
+ String getVersion();
+
+ DataServices getDataServices();
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/EntityContainer.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/EntityContainer.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/EntityContainer.java
new file mode 100644
index 0000000..3c76202
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/EntityContainer.java
@@ -0,0 +1,40 @@
+/*
+ * 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.client.api.edm.xml.shared;
+
+import java.util.List;
+
+public interface EntityContainer extends Named {
+
+ String getExtends();
+
+ boolean isLazyLoadingEnabled();
+
+ boolean isDefaultEntityContainer();
+
+ EntitySet getEntitySet(String name);
+
+ List<? extends EntitySet> getEntitySets();
+
+ CommonFunctionImport getFunctionImport(String name);
+
+ List<? extends CommonFunctionImport> getFunctionImports(String name);
+
+ List<? extends CommonFunctionImport> getFunctionImports();
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/EntityKey.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/EntityKey.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/EntityKey.java
new file mode 100644
index 0000000..9be330e
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/EntityKey.java
@@ -0,0 +1,26 @@
+/*
+ * 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.client.api.edm.xml.shared;
+
+import java.util.List;
+
+public interface EntityKey {
+
+ List<PropertyRef> getPropertyRefs();
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/EntitySet.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/EntitySet.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/EntitySet.java
new file mode 100644
index 0000000..d69ba01
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/EntitySet.java
@@ -0,0 +1,25 @@
+/*
+ * 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.client.api.edm.xml.shared;
+
+public interface EntitySet extends Named {
+
+ String getEntityType();
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/EntityType.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/EntityType.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/EntityType.java
new file mode 100644
index 0000000..cab8393
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/EntityType.java
@@ -0,0 +1,32 @@
+/*
+ * 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.client.api.edm.xml.shared;
+
+public interface EntityType extends ComplexType {
+
+ boolean isAbstractEntityType();
+
+ String getBaseType();
+
+ boolean isOpenType();
+
+ EntityKey getKey();
+
+ boolean isHasStream();
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/EnumType.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/EnumType.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/EnumType.java
new file mode 100644
index 0000000..5dc0b8b
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/EnumType.java
@@ -0,0 +1,34 @@
+/*
+ * 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.client.api.edm.xml.shared;
+
+import java.util.List;
+
+public interface EnumType extends Named {
+
+ String getUnderlyingType();
+
+ boolean isFlags();
+
+ List<Member> getMembers();
+
+ Member getMember(String name);
+
+ Member getMember(Integer value);
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/Member.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/Member.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/Member.java
new file mode 100644
index 0000000..42418b2
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/Member.java
@@ -0,0 +1,26 @@
+/*
+ * 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.client.api.edm.xml.shared;
+
+public interface Member {
+
+ String getName();
+
+ String getValue();
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/Named.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/Named.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/Named.java
new file mode 100644
index 0000000..9d5ebe0
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/Named.java
@@ -0,0 +1,24 @@
+/*
+ * 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.client.api.edm.xml.shared;
+
+public interface Named {
+
+ String getName();
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/OnDelete.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/OnDelete.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/OnDelete.java
new file mode 100644
index 0000000..12f493a
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/OnDelete.java
@@ -0,0 +1,24 @@
+/*
+ * 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.client.api.edm.xml.shared;
+
+public interface OnDelete {
+
+ OnDeleteAction getAction();
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/OnDeleteAction.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/OnDeleteAction.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/OnDeleteAction.java
new file mode 100644
index 0000000..ab52ef1
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/OnDeleteAction.java
@@ -0,0 +1,28 @@
+/*
+ * 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.client.api.edm.xml.shared;
+
+public enum OnDeleteAction {
+
+ Cascade,
+ None,
+ SetNull,
+ SetDefault;
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/PropertyRef.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/PropertyRef.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/PropertyRef.java
new file mode 100644
index 0000000..38eb1b1
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/PropertyRef.java
@@ -0,0 +1,25 @@
+/*
+ * 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.client.api.edm.xml.shared;
+
+public interface PropertyRef extends Named {
+
+ String getAlias();
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/Schema.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/Schema.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/Schema.java
new file mode 100644
index 0000000..6dc057c
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/Schema.java
@@ -0,0 +1,74 @@
+/*
+ * 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.client.api.edm.xml.shared;
+
+import java.util.List;
+
+public interface Schema {
+
+ String getNamespace();
+
+ String getAlias();
+
+ List<? extends EntityType> getEntityTypes();
+
+ List<EnumType> getEnumTypes();
+
+ EnumType getEnumType(String name);
+
+ List<? extends CommonAnnotations> getAnnotationsList();
+
+ CommonAnnotations getAnnotationsList(String target);
+
+ List<? extends ComplexType> getComplexTypes();
+
+ List<? extends EntityContainer> getEntityContainers();
+
+ /**
+ * Gets default entity container.
+ *
+ * @return default entity container.
+ */
+ EntityContainer getDefaultEntityContainer();
+
+ /**
+ * Gets entity container with the given name.
+ *
+ * @param name name.
+ * @return entity container.
+ */
+ EntityContainer getEntityContainer(String name);
+
+ /**
+ * Gets entity type with the given name.
+ *
+ * @param name name.
+ * @return entity type.
+ */
+ EntityType getEntityType(String name);
+
+ /**
+ * Gets complex type with the given name.
+ *
+ * @param name name.
+ * @return complex type.
+ */
+ ComplexType getComplexType(String name);
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/XMLMetadata.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/XMLMetadata.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/XMLMetadata.java
new file mode 100644
index 0000000..85f8220
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/shared/XMLMetadata.java
@@ -0,0 +1,59 @@
+/*
+ * 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.client.api.edm.xml.shared;
+
+import java.util.List;
+
+/**
+ * Entry point for access information about EDM metadata.
+ */
+public interface XMLMetadata {
+
+ /**
+ * Checks whether the given key is a valid namespace or alias in the EdM metadata document.
+ *
+ * @param key namespace or alias
+ * @return true if key is valid namespace or alias
+ */
+ boolean isNsOrAlias(String key);
+
+ /**
+ * Returns the Schema at the specified position in the EdM metadata document.
+ *
+ * @param index index of the Schema to return
+ * @return the Schema at the specified position in the EdM metadata document
+ */
+ Schema getSchema(final int index);
+
+ /**
+ * Returns the Schema with the specified key (namespace or alias) in the EdM metadata document.
+ *
+ * @param key namespace or alias
+ * @return the Schema with the specified key in the EdM metadata document
+ */
+ Schema getSchema(final String key);
+
+ /**
+ * Returns all Schema objects defined in the EdM metadata document.
+ *
+ * @return all Schema objects defined in the EdM metadata document
+ */
+ List<? extends Schema> getSchemas();
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/Annotations.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/Annotations.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/Annotations.java
index 55ee38e..c4ed27a 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/Annotations.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/Annotations.java
@@ -20,7 +20,7 @@ package org.apache.olingo.client.api.edm.xml.v3;
import java.util.List;
-import org.apache.olingo.client.api.edm.xml.CommonAnnotations;
+import org.apache.olingo.client.api.edm.xml.shared.CommonAnnotations;
public interface Annotations extends CommonAnnotations {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/Association.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/Association.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/Association.java
index 5c53201..c91299e 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/Association.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/Association.java
@@ -20,7 +20,7 @@ package org.apache.olingo.client.api.edm.xml.v3;
import java.util.List;
-import org.apache.olingo.client.api.edm.xml.Named;
+import org.apache.olingo.client.api.edm.xml.shared.Named;
public interface Association extends Named {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/AssociationEnd.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/AssociationEnd.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/AssociationEnd.java
index 88cd78e..14e4f84 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/AssociationEnd.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/AssociationEnd.java
@@ -18,7 +18,7 @@
*/
package org.apache.olingo.client.api.edm.xml.v3;
-import org.apache.olingo.client.api.edm.xml.OnDelete;
+import org.apache.olingo.client.api.edm.xml.shared.OnDelete;
public interface AssociationEnd {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/AssociationSet.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/AssociationSet.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/AssociationSet.java
index a6b4b44..573c8da 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/AssociationSet.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/AssociationSet.java
@@ -20,7 +20,7 @@ package org.apache.olingo.client.api.edm.xml.v3;
import java.util.List;
-import org.apache.olingo.client.api.edm.xml.Named;
+import org.apache.olingo.client.api.edm.xml.shared.Named;
public interface AssociationSet extends Named {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/FunctionImport.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/FunctionImport.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/FunctionImport.java
index 212507b..7956b43 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/FunctionImport.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/FunctionImport.java
@@ -20,7 +20,7 @@ package org.apache.olingo.client.api.edm.xml.v3;
import java.util.List;
-public interface FunctionImport extends org.apache.olingo.client.api.edm.xml.CommonFunctionImport {
+public interface FunctionImport extends org.apache.olingo.client.api.edm.xml.shared.CommonFunctionImport {
String getReturnType();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/NavigationProperty.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/NavigationProperty.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/NavigationProperty.java
index d7ef556..e2b3429 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/NavigationProperty.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/NavigationProperty.java
@@ -18,7 +18,7 @@
*/
package org.apache.olingo.client.api.edm.xml.v3;
-public interface NavigationProperty extends org.apache.olingo.client.api.edm.xml.CommonNavigationProperty {
+public interface NavigationProperty extends org.apache.olingo.client.api.edm.xml.shared.CommonNavigationProperty {
String getRelationship();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/Parameter.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/Parameter.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/Parameter.java
index a5f5c88..2e2e2d8 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/Parameter.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/Parameter.java
@@ -18,7 +18,7 @@
*/
package org.apache.olingo.client.api.edm.xml.v3;
-public interface Parameter extends org.apache.olingo.client.api.edm.xml.CommonParameter {
+public interface Parameter extends org.apache.olingo.client.api.edm.xml.shared.CommonParameter {
ParameterMode getMode();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/Property.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/Property.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/Property.java
index 1d77f8e..43aa109 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/Property.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/Property.java
@@ -20,7 +20,7 @@ package org.apache.olingo.client.api.edm.xml.v3;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
import org.apache.olingo.client.api.edm.StoreGeneratedPattern;
-import org.apache.olingo.client.api.edm.xml.CommonProperty;
+import org.apache.olingo.client.api.edm.xml.shared.CommonProperty;
import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
public interface Property extends CommonProperty {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/ReferentialConstraintRole.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/ReferentialConstraintRole.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/ReferentialConstraintRole.java
index f5a76dc..552d922 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/ReferentialConstraintRole.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/ReferentialConstraintRole.java
@@ -20,7 +20,7 @@ package org.apache.olingo.client.api.edm.xml.v3;
import java.util.List;
-import org.apache.olingo.client.api.edm.xml.PropertyRef;
+import org.apache.olingo.client.api.edm.xml.shared.PropertyRef;
public interface ReferentialConstraintRole {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/ValueTerm.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/ValueTerm.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/ValueTerm.java
index 09b9a81..debf6a5 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/ValueTerm.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/ValueTerm.java
@@ -18,7 +18,7 @@
*/
package org.apache.olingo.client.api.edm.xml.v3;
-import org.apache.olingo.client.api.edm.xml.Named;
+import org.apache.olingo.client.api.edm.xml.shared.Named;
public interface ValueTerm extends Named {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Action.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Action.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Action.java
index 1591c5f..0f43790 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Action.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Action.java
@@ -20,7 +20,7 @@ package org.apache.olingo.client.api.edm.xml.v4;
import java.util.List;
-import org.apache.olingo.client.api.edm.xml.Named;
+import org.apache.olingo.client.api.edm.xml.shared.Named;
public interface Action extends Named {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Annotations.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Annotations.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Annotations.java
index fc481a2..d93ec6d 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Annotations.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Annotations.java
@@ -20,7 +20,7 @@ package org.apache.olingo.client.api.edm.xml.v4;
import java.util.List;
-import org.apache.olingo.client.api.edm.xml.CommonAnnotations;
+import org.apache.olingo.client.api.edm.xml.shared.CommonAnnotations;
public interface Annotations extends CommonAnnotations {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/BindingTarget.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/BindingTarget.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/BindingTarget.java
index f4d8491..a53c9b6 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/BindingTarget.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/BindingTarget.java
@@ -20,7 +20,7 @@ package org.apache.olingo.client.api.edm.xml.v4;
import java.util.List;
-import org.apache.olingo.client.api.edm.xml.Named;
+import org.apache.olingo.client.api.edm.xml.shared.Named;
public interface BindingTarget extends Named, AnnotatedEdmItem {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/2870fdc9/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/ComplexType.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/ComplexType.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/ComplexType.java
index bc93911..8004211 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/ComplexType.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/ComplexType.java
@@ -20,7 +20,7 @@ package org.apache.olingo.client.api.edm.xml.v4;
import java.util.List;
-public interface ComplexType extends org.apache.olingo.client.api.edm.xml.ComplexType, AnnotatedEdmItem {
+public interface ComplexType extends org.apache.olingo.client.api.edm.xml.shared.ComplexType, AnnotatedEdmItem {
boolean isAbstractEntityType();