Repository: olingo-odata4 Updated Branches: refs/heads/master 53de4ab24 -> 1fb616fff
Adding missing method to Edm interfaces to check whether an entity or a complex type is abstract Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/10f03a2c Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/10f03a2c Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/10f03a2c Branch: refs/heads/master Commit: 10f03a2c0a81e3b88ce895563fc37651f5f52278 Parents: 8a6bcb3 Author: Francesco Chicchiriccò <[email protected]> Authored: Wed Apr 30 09:13:08 2014 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Wed Apr 30 09:13:08 2014 +0200 ---------------------------------------------------------------------- .../olingo/client/core/edm/EdmComplexTypeImpl.java | 4 ++++ .../apache/olingo/client/core/edm/EdmEntityTypeImpl.java | 4 ++++ .../client/core/edm/EdmStructuredTypeHelperImpl.java | 8 ++++++++ .../apache/olingo/commons/api/edm/EdmStructuredType.java | 11 +++++++++-- .../olingo/commons/core/edm/EdmStructuredTypeHelper.java | 1 + .../server/core/edm/provider/EdmComplexTypeImpl.java | 4 ++++ .../server/core/edm/provider/EdmEntityTypeImpl.java | 4 ++++ .../core/edm/provider/EdmStructuredTypeHelperImpl.java | 4 ++++ 8 files changed, 38 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/10f03a2c/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmComplexTypeImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmComplexTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmComplexTypeImpl.java index caaf7c0..325473b 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmComplexTypeImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmComplexTypeImpl.java @@ -69,4 +69,8 @@ public class EdmComplexTypeImpl extends AbstractEdmComplexType { return helper.isOpenType(); } + @Override + public boolean isAbstract() { + return helper.isAbstract(); + } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/10f03a2c/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEntityTypeImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEntityTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEntityTypeImpl.java index 994e42c..02814a3 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEntityTypeImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEntityTypeImpl.java @@ -83,4 +83,8 @@ public class EdmEntityTypeImpl extends AbstractEdmEntityType { return helper.isOpenType(); } + @Override + public boolean isAbstract() { + return helper.isAbstract(); + } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/10f03a2c/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmStructuredTypeHelperImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmStructuredTypeHelperImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmStructuredTypeHelperImpl.java index f3b8946..45bd2c1 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmStructuredTypeHelperImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmStructuredTypeHelperImpl.java @@ -80,4 +80,12 @@ public class EdmStructuredTypeHelperImpl implements EdmStructuredTypeHelper { : false; } + @Override + public boolean isAbstract() { + return complexType instanceof org.apache.olingo.client.api.edm.xml.v4.ComplexType + ? ((org.apache.olingo.client.api.edm.xml.v4.ComplexType) complexType).isAbstractEntityType() + : complexType instanceof EntityType + ? ((EntityType) complexType).isAbstractEntityType() + : false; + } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/10f03a2c/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmStructuredType.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmStructuredType.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmStructuredType.java index 6990091..a0b5f1e 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmStructuredType.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmStructuredType.java @@ -81,9 +81,16 @@ public interface EdmStructuredType extends EdmType { boolean compatibleTo(EdmType targetType); /** - * Indicates if the entity type is an open type. + * Indicates if the structured type is an open type. * - * @return <code>true</code> if the entity type is open + * @return <code>true</code> if the structured type is open */ boolean isOpenType(); + + /** + * Indicates if the structured type is abstract. + * + * @return <code>true</code> if the structured type is abstract + */ + boolean isAbstract(); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/10f03a2c/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmStructuredTypeHelper.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmStructuredTypeHelper.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmStructuredTypeHelper.java index a14700b..a2aef25 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmStructuredTypeHelper.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmStructuredTypeHelper.java @@ -31,4 +31,5 @@ public interface EdmStructuredTypeHelper { boolean isOpenType(); + boolean isAbstract(); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/10f03a2c/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmComplexTypeImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmComplexTypeImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmComplexTypeImpl.java index 91bec42..fc67611 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmComplexTypeImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmComplexTypeImpl.java @@ -59,4 +59,8 @@ public class EdmComplexTypeImpl extends AbstractEdmComplexType { return helper.isOpenType(); } + @Override + public boolean isAbstract() { + return helper.isAbstract(); + } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/10f03a2c/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImpl.java index b6c7828..35942d2 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImpl.java @@ -93,4 +93,8 @@ public class EdmEntityTypeImpl extends AbstractEdmEntityType { return helper.isOpenType(); } + @Override + public boolean isAbstract() { + return helper.isAbstract(); + } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/10f03a2c/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmStructuredTypeHelperImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmStructuredTypeHelperImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmStructuredTypeHelperImpl.java index 4fdda9c..d5773f0 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmStructuredTypeHelperImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmStructuredTypeHelperImpl.java @@ -76,4 +76,8 @@ public class EdmStructuredTypeHelperImpl implements EdmStructuredTypeHelper { return structuredType.isOpenType(); } + @Override + public boolean isAbstract() { + return structuredType.isAbstract(); + } }
