Repository: olingo-odata4 Updated Branches: refs/heads/master e41b81ea0 -> 00a5b1d2e
[OLINGO-1083] Change EntityType attribute to Type in Singletons accroding to spec Signed-off-by: Christian Amend <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/00a5b1d2 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/00a5b1d2 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/00a5b1d2 Branch: refs/heads/master Commit: 00a5b1d2e15519d148ab6f1946b0bc8457dd0e65 Parents: e41b81e Author: i036162 <[email protected]> Authored: Fri Feb 24 16:45:49 2017 +0100 Committer: Christian Amend <[email protected]> Committed: Wed Mar 1 16:00:09 2017 +0100 ---------------------------------------------------------------------- .../server/core/serializer/xml/MetadataDocumentXmlSerializer.java | 3 ++- .../core/serializer/xml/MetadataDocumentXmlSerializerTest.java | 2 +- .../olingo/server/core/serializer/xml/MetadataDocumentTest.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/00a5b1d2/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java index ff4b009..fe0fb54 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java @@ -113,6 +113,7 @@ public class MetadataDocumentXmlSerializer { private static final String XML_IS_COMPOSABLE = "IsComposable"; private static final String XML_IS_BOUND = "IsBound"; private static final String XML_ENTITY_TYPE = "EntityType"; + private static final String XML_SINGLETON_TYPE = XML_TYPE; private static final String XML_SINGLETON = "Singleton"; private static final String XML_ACTION = "Action"; private static final String XML_ACTION_IMPORT = "ActionImport"; @@ -607,7 +608,7 @@ public class MetadataDocumentXmlSerializer { for (EdmSingleton singleton : singletons) { writer.writeStartElement(XML_SINGLETON); writer.writeAttribute(XML_NAME, singleton.getName()); - writer.writeAttribute(XML_ENTITY_TYPE, getAliasedFullQualifiedName(singleton.getEntityType(), false)); + writer.writeAttribute(XML_SINGLETON_TYPE, getAliasedFullQualifiedName(singleton.getEntityType(), false)); appendNavigationPropertyBindings(writer, singleton); appendAnnotations(writer, singleton); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/00a5b1d2/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializerTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializerTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializerTest.java index 27e3e90..d92d6ac 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializerTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializerTest.java @@ -247,7 +247,7 @@ public class MetadataDocumentXmlSerializerTest { assertTrue(metadata.contains("<ComplexType Name=\"CTTwoPrimBase\" BaseType=\"Alias.CTTwoPrim\"/>")); assertTrue(metadata.contains("<Property Name=\"PropertyInt16\" Type=\"Edm.Int16\" Nullable=\"false\"/>")); assertTrue(metadata.contains("<EntitySet Name=\"ESAllPrim\" EntityType=\"Alias.ETAbstractBase\"/>")); - assertTrue(metadata.contains("<Singleton Name=\"SI\" EntityType=\"Alias.ETAbstractBase\"/>")); + assertTrue(metadata.contains("<Singleton Name=\"SI\" Type=\"Alias.ETAbstractBase\"/>")); assertTrue(metadata.contains("<ActionImport Name=\"AIRTPrimParam\" Action=\"Alias.UARTPrimParam\"/>")); assertTrue(metadata.contains("<FunctionImport Name=\"FINRTInt16\" " + "Function=\"Alias.UFNRTInt16\" IncludeInServiceDocument=\"true\"/>")); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/00a5b1d2/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentTest.java index a8ea4b5..3e9188e 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentTest.java @@ -116,7 +116,7 @@ public class MetadataDocumentTest { containsString("<EntitySet Name=\"ESTwoPrim\" EntityType=\"Namespace1_Alias.ETTwoPrim\">")); assertThat(metadata, - containsString("<Singleton Name=\"SINav\" EntityType=\"Namespace1_Alias.ETTwoKeyNav\">" + containsString("<Singleton Name=\"SINav\" Type=\"Namespace1_Alias.ETTwoKeyNav\">" + "<NavigationPropertyBinding Path=\"NavPropertyETTwoKeyNavMany\" Target=\"ESTwoKeyNav\"/>" + "<NavigationPropertyBinding Path=\"NavPropertyETTwoKeyNavOne\" Target=\"ESTwoKeyNav\"/>" + "<NavigationPropertyBinding Path=\"NavPropertyETKeyNavOne\" Target=\"ESKeyNav\"/>"
