Repository: olingo-odata4 Updated Branches: refs/heads/OLINGO-564 cbbe3da69 -> 2318953c2
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/PropertyProvider.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/PropertyProvider.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/PropertyProvider.java index db19766..c18ed9d 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/PropertyProvider.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/PropertyProvider.java @@ -20,8 +20,8 @@ package org.apache.olingo.server.tecsvc.provider; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.FullQualifiedName; -import org.apache.olingo.commons.api.edm.provider.NavigationProperty; -import org.apache.olingo.commons.api.edm.provider.Property; +import org.apache.olingo.commons.api.edm.provider.CsdlNavigationProperty; +import org.apache.olingo.commons.api.edm.provider.CsdlProperty; public class PropertyProvider { @@ -50,731 +50,737 @@ public class PropertyProvider { public static final FullQualifiedName nameTimeOfDay = EdmPrimitiveTypeKind.TimeOfDay.getFullQualifiedName(); // Primitive Properties -------------------------------------------------------------------------------------------- - public static final Property collPropertyBinary = new Property() + public static final CsdlProperty collPropertyBinary = new CsdlProperty() .setName("CollPropertyBinary") .setType(nameBinary) .setCollection(true); - public static final Property collPropertyBinary_ExplicitNullable = new Property() + public static final CsdlProperty collPropertyBinary_ExplicitNullable = new CsdlProperty() .setName("CollPropertyBinary") .setType(nameBinary) .setNullable(true) .setCollection(true); - public static final Property collPropertyBinary_NotNullable = new Property() + public static final CsdlProperty collPropertyBinary_NotNullable = new CsdlProperty() .setName("CollPropertyBinary") .setType(nameBinary) .setNullable(false) .setCollection(true); - public static final Property collPropertyBoolean = new Property() + public static final CsdlProperty collPropertyBoolean = new CsdlProperty() .setName("CollPropertyBoolean") .setType(nameBoolean) .setCollection(true); - public static final Property collPropertyBoolean_ExplicitNullable = new Property() + public static final CsdlProperty collPropertyBoolean_ExplicitNullable = new CsdlProperty() .setName("CollPropertyBoolean") .setType(nameBoolean) .setNullable(true) .setCollection(true); - public static final Property collPropertyBoolean_NotNullable = new Property() + public static final CsdlProperty collPropertyBoolean_NotNullable = new CsdlProperty() .setName("CollPropertyBoolean") .setType(nameBoolean) .setNullable(true) .setCollection(true); - public static final Property collPropertyByte = new Property() + public static final CsdlProperty collPropertyByte = new CsdlProperty() .setName("CollPropertyByte") .setType(nameByte) .setCollection(true); - public static final Property collPropertyByte_ExplicitNullable = new Property() + public static final CsdlProperty collPropertyByte_ExplicitNullable = new CsdlProperty() .setName("CollPropertyByte") .setType(nameByte) .setNullable(true) .setCollection(true); - public static final Property collPropertyByte_NotNullable = new Property() + public static final CsdlProperty collPropertyByte_NotNullable = new CsdlProperty() .setName("CollPropertyByte") .setType(nameByte) .setNullable(false) .setCollection(true); - public static final Property collPropertyDate = new Property() + public static final CsdlProperty collPropertyDate = new CsdlProperty() .setName("CollPropertyDate") .setType(nameDate) .setCollection(true); - public static final Property collPropertyDate_ExplicitNullable = new Property() + public static final CsdlProperty collPropertyDate_ExplicitNullable = new CsdlProperty() .setName("CollPropertyDate") .setType(nameDate) .setNullable(true) .setCollection(true); - public static final Property collPropertyDate_NotNullable = new Property() + public static final CsdlProperty collPropertyDate_NotNullable = new CsdlProperty() .setName("CollPropertyDate") .setType(nameDate) .setNullable(false) .setCollection(true); - public static final Property collPropertyDateTimeOffset = new Property() + public static final CsdlProperty collPropertyDateTimeOffset = new CsdlProperty() .setName("CollPropertyDateTimeOffset") .setType(nameDateTimeOffset) .setCollection(true); - public static final Property collPropertyDateTimeOffset_ExplicitNullable = new Property() + public static final CsdlProperty collPropertyDateTimeOffset_ExplicitNullable = new CsdlProperty() .setName("CollPropertyDateTimeOffset") .setType(nameDateTimeOffset) .setNullable(true) .setCollection(true); - public static final Property collPropertyDateTimeOffset_NotNullable = new Property() + public static final CsdlProperty collPropertyDateTimeOffset_NotNullable = new CsdlProperty() .setName("CollPropertyDateTimeOffset") .setType(nameDateTimeOffset) .setNullable(false) .setCollection(true); - public static final Property collPropertyDecimal = new Property() + public static final CsdlProperty collPropertyDecimal = new CsdlProperty() .setName("CollPropertyDecimal") .setType(nameDecimal) .setCollection(true); - public static final Property collPropertyDecimal_ExplicitNullable = new Property() + public static final CsdlProperty collPropertyDecimal_ExplicitNullable = new CsdlProperty() .setName("CollPropertyDecimal") .setType(nameDecimal) .setNullable(true) .setCollection(true); - public static final Property collPropertyDecimal_NotNullable = new Property() + public static final CsdlProperty collPropertyDecimal_NotNullable = new CsdlProperty() .setName("CollPropertyDecimal") .setType(nameDecimal) .setNullable(false) .setCollection(true); - public static final Property collPropertyDouble = new Property() + public static final CsdlProperty collPropertyDouble = new CsdlProperty() .setName("CollPropertyDouble") .setType(nameDouble) .setCollection(true); - public static final Property collPropertyDouble_ExplicitNullable = new Property() + public static final CsdlProperty collPropertyDouble_ExplicitNullable = new CsdlProperty() .setName("CollPropertyDouble") .setType(nameDouble) .setNullable(true) .setCollection(true); - public static final Property collPropertyDouble_NotNullable = new Property() + public static final CsdlProperty collPropertyDouble_NotNullable = new CsdlProperty() .setName("CollPropertyDouble") .setType(nameDouble) .setNullable(false) .setCollection(true); - public static final Property collPropertyDuration = new Property() + public static final CsdlProperty collPropertyDuration = new CsdlProperty() .setName("CollPropertyDuration") .setType(nameDuration) .setCollection(true); - public static final Property collPropertyDuration_ExplicitNullable = new Property() + public static final CsdlProperty collPropertyDuration_ExplicitNullable = new CsdlProperty() .setName("CollPropertyDuration") .setType(nameDuration) .setNullable(true) .setCollection(true); - public static final Property collPropertyDuration_NotNullable = new Property() + public static final CsdlProperty collPropertyDuration_NotNullable = new CsdlProperty() .setName("CollPropertyDuration") .setType(nameDuration) .setNullable(false) .setCollection(true); - public static final Property collPropertyGuid = new Property() + public static final CsdlProperty collPropertyGuid = new CsdlProperty() .setName("CollPropertyGuid") .setType(nameGuid) .setCollection(true); - public static final Property collPropertyGuid_ExplicitNullable = new Property() + public static final CsdlProperty collPropertyGuid_ExplicitNullable = new CsdlProperty() .setName("CollPropertyGuid") .setType(nameGuid) .setNullable(true) .setCollection(true); - public static final Property collPropertyGuid_NotNullable = new Property() + public static final CsdlProperty collPropertyGuid_NotNullable = new CsdlProperty() .setName("CollPropertyGuid") .setType(nameGuid) .setNullable(false) .setCollection(true); - public static final Property collPropertyInt16 = new Property() + public static final CsdlProperty collPropertyInt16 = new CsdlProperty() .setName("CollPropertyInt16") .setType(nameInt16) .setCollection(true); - public static final Property collPropertyInt16_ExplicitNullable = new Property() + public static final CsdlProperty collPropertyInt16_ExplicitNullable = new CsdlProperty() .setName("CollPropertyInt16") .setType(nameInt16) .setNullable(true) .setCollection(true); - public static final Property collPropertyInt16_NotNullable = new Property() + public static final CsdlProperty collPropertyInt16_NotNullable = new CsdlProperty() .setName("CollPropertyInt16") .setType(nameInt16) .setNullable(false) .setCollection(true); - public static final Property collPropertyInt32 = new Property() + public static final CsdlProperty collPropertyInt32 = new CsdlProperty() .setName("CollPropertyInt32") .setType(nameInt32) .setCollection(true); - public static final Property collPropertyInt32_ExplicitNullable = new Property() + public static final CsdlProperty collPropertyInt32_ExplicitNullable = new CsdlProperty() .setName("CollPropertyInt32") .setType(nameInt32) .setNullable(true) .setCollection(true); - public static final Property collPropertyInt32_NotNullable = new Property() + public static final CsdlProperty collPropertyInt32_NotNullable = new CsdlProperty() .setName("CollPropertyInt32") .setType(nameInt32) .setNullable(false) .setCollection(true); - public static final Property collPropertyInt64 = new Property() + public static final CsdlProperty collPropertyInt64 = new CsdlProperty() .setName("CollPropertyInt64") .setType(nameInt64) .setCollection(true); - public static final Property collPropertyInt64_ExplicitNullable = new Property() + public static final CsdlProperty collPropertyInt64_ExplicitNullable = new CsdlProperty() .setName("CollPropertyInt64") .setType(nameInt64) .setNullable(true) .setCollection(true); - public static final Property collPropertyInt64_NotNullable = new Property() + public static final CsdlProperty collPropertyInt64_NotNullable = new CsdlProperty() .setName("CollPropertyInt64") .setType(nameInt64) .setNullable(false) .setCollection(true); - public static final Property collPropertySByte = new Property() + public static final CsdlProperty collPropertySByte = new CsdlProperty() .setName("CollPropertySByte") .setType(nameSByte) .setCollection(true); - public static final Property collPropertySByte_ExplicitNullable = new Property() + public static final CsdlProperty collPropertySByte_ExplicitNullable = new CsdlProperty() .setName("CollPropertySByte") .setType(nameSByte) .setNullable(true) .setCollection(true); - public static final Property collPropertySByte_NotNullable = new Property() + public static final CsdlProperty collPropertySByte_NotNullable = new CsdlProperty() .setName("CollPropertySByte") .setType(nameSByte) .setNullable(false) .setCollection(true); - public static final Property collPropertySingle = new Property() + public static final CsdlProperty collPropertySingle = new CsdlProperty() .setName("CollPropertySingle") .setType(nameSingle) .setCollection(true); - public static final Property collPropertySingle_ExplicitNullable = new Property() + public static final CsdlProperty collPropertySingle_ExplicitNullable = new CsdlProperty() .setName("CollPropertySingle") .setType(nameSingle) .setNullable(true) .setCollection(true); - public static final Property collPropertySingle_NotNullable = new Property() + public static final CsdlProperty collPropertySingle_NotNullable = new CsdlProperty() .setName("CollPropertySingle") .setType(nameSingle) .setNullable(false) .setCollection(true); - public static final Property collPropertyString = new Property() + public static final CsdlProperty collPropertyString = new CsdlProperty() .setName("CollPropertyString") .setType(nameString) .setCollection(true); - public static final Property collPropertyString_ExplicitNullable = new Property() + public static final CsdlProperty collPropertyString_ExplicitNullable = new CsdlProperty() .setName("CollPropertyString") .setType(nameString) .setNullable(true) .setCollection(true); - public static final Property collPropertyString_NotNullable = new Property() + public static final CsdlProperty collPropertyString_NotNullable = new CsdlProperty() .setName("CollPropertyString") .setType(nameString) .setNullable(false) .setCollection(true); - public static final Property collPropertyTimeOfDay = new Property() + public static final CsdlProperty collPropertyTimeOfDay = new CsdlProperty() .setName("CollPropertyTimeOfDay") .setType(nameTimeOfDay) .setCollection(true); - public static final Property collPropertyTimeOfDay_ExplicitNullable = new Property() + public static final CsdlProperty collPropertyTimeOfDay_ExplicitNullable = new CsdlProperty() .setName("CollPropertyTimeOfDay") .setType(nameTimeOfDay) .setNullable(true) .setCollection(true); - public static final Property collPropertyTimeOfDay_NotNullable = new Property() + public static final CsdlProperty collPropertyTimeOfDay_NotNullable = new CsdlProperty() .setName("CollPropertyTimeOfDay") .setType(nameTimeOfDay) .setNullable(false) .setCollection(true); - public static final Property propertyBinary = new Property() + public static final CsdlProperty propertyBinary = new CsdlProperty() .setName("PropertyBinary") .setType(nameBinary); - public static final Property propertyBinary_NotNullable = new Property() + public static final CsdlProperty propertyBinary_NotNullable = new CsdlProperty() .setName("PropertyBinary") .setType(nameBinary) .setNullable(false); - public static final Property propertyBinary_ExplicitNullable = new Property() + public static final CsdlProperty propertyBinary_ExplicitNullable = new CsdlProperty() .setName("PropertyBinary") .setType(nameBinary) .setNullable(true); - public static final Property propertyBoolean = new Property() + public static final CsdlProperty propertyBoolean = new CsdlProperty() .setName("PropertyBoolean") .setType(nameBoolean); - public static final Property propertyBoolean_NotNullable = new Property() + public static final CsdlProperty propertyBoolean_NotNullable = new CsdlProperty() .setName("PropertyBoolean") .setType(nameBoolean) .setNullable(false); - public static final Property propertyBoolean_ExplicitNullable = new Property() + public static final CsdlProperty propertyBoolean_ExplicitNullable = new CsdlProperty() .setName("PropertyBoolean") .setType(nameBoolean) .setNullable(true); - public static final Property propertyByte = new Property() + public static final CsdlProperty propertyByte = new CsdlProperty() .setName("PropertyByte") .setType(nameByte); - public static final Property propertyByte_NotNullable = new Property() + public static final CsdlProperty propertyByte_NotNullable = new CsdlProperty() .setName("PropertyByte") .setType(nameByte) .setNullable(false); - public static final Property propertyByte_ExplicitNullable = new Property() + public static final CsdlProperty propertyByte_ExplicitNullable = new CsdlProperty() .setName("PropertyByte") .setType(nameByte) .setNullable(true); - public static final Property propertyDate = new Property() + public static final CsdlProperty propertyDate = new CsdlProperty() .setName("PropertyDate") .setType(nameDate); - public static final Property propertyDate_NotNullable = new Property() + public static final CsdlProperty propertyDate_NotNullable = new CsdlProperty() .setName("PropertyDate") .setType(nameDate) .setNullable(false); - public static final Property propertyDate_ExplicitNullable = new Property() + public static final CsdlProperty propertyDate_ExplicitNullable = new CsdlProperty() .setName("PropertyDate") .setType(nameDate) .setNullable(true); - public static final Property propertyDateTimeOffset = new Property() + public static final CsdlProperty propertyDateTimeOffset = new CsdlProperty() .setName("PropertyDateTimeOffset") .setType(nameDateTimeOffset); - public static final Property propertyDateTimeOffset_Precision = new Property() + public static final CsdlProperty propertyDateTimeOffset_Precision = new CsdlProperty() .setName("PropertyDateTimeOffset") .setPrecision(12) .setType(nameDateTimeOffset); - public static final Property propertyDateTimeOffset_NotNullable = new Property() + public static final CsdlProperty propertyDateTimeOffset_NotNullable = new CsdlProperty() .setName("PropertyDateTimeOffset") .setType(nameDateTimeOffset) .setNullable(false); - public static final Property propertyDateTimeOffset_ExplicitNullable = new Property() + public static final CsdlProperty propertyDateTimeOffset_ExplicitNullable = new CsdlProperty() .setName("PropertyDateTimeOffset") .setType(nameDateTimeOffset) .setNullable(true); - public static final Property propertyDecimal_Scale_Precision = new Property() + public static final CsdlProperty propertyDecimal_Scale_Precision = new CsdlProperty() .setName("PropertyDecimal") .setScale(5) .setPrecision(11) .setType(nameDecimal); - public static final Property propertyDecimal_Scale = new Property() + public static final CsdlProperty propertyDecimal_Scale = new CsdlProperty() .setName("PropertyDecimal") .setScale(10) .setType(nameDecimal); - public static final Property propertyDecimal_NotNullable = new Property() + public static final CsdlProperty propertyDecimal_NotNullable = new CsdlProperty() .setName("PropertyDecimal") .setType(nameDecimal) .setNullable(false); - public static final Property propertyDecimal_ExplicitNullable = new Property() + public static final CsdlProperty propertyDecimal_ExplicitNullable = new CsdlProperty() .setName("PropertyDecimal") .setType(nameDecimal) .setNullable(true); - public static final Property propertyDouble = new Property() + public static final CsdlProperty propertyDouble = new CsdlProperty() .setName("PropertyDouble") .setType(nameDouble); - public static final Property propertyDouble_NotNullable = new Property() + public static final CsdlProperty propertyDouble_NotNullable = new CsdlProperty() .setName("PropertyDouble") .setType(nameDouble) .setNullable(false); - public static final Property propertyDouble_ExplicitNullable = new Property() + public static final CsdlProperty propertyDouble_ExplicitNullable = new CsdlProperty() .setName("PropertyDouble") .setType(nameDouble) .setNullable(true); - public static final Property propertyDuration = new Property() + public static final CsdlProperty propertyDuration = new CsdlProperty() .setName("PropertyDuration") .setType(nameDuration); - public static final Property propertyDuration_NotNullable = new Property() + public static final CsdlProperty propertyDuration_NotNullable = new CsdlProperty() .setName("PropertyDuration") .setType(nameDuration) .setNullable(false); - public static final Property propertyDuration_ExplicitNullable = new Property() + public static final CsdlProperty propertyDuration_ExplicitNullable = new CsdlProperty() .setName("PropertyDuration") .setType(nameDuration) .setNullable(true); - public static final Property propertyGuid = new Property() + public static final CsdlProperty propertyGuid = new CsdlProperty() .setName("PropertyGuid") .setType(nameGuid); - public static final Property propertyGuid_NotNullable = new Property() + public static final CsdlProperty propertyGuid_NotNullable = new CsdlProperty() .setName("PropertyGuid") .setType(nameGuid) .setNullable(false); - public static final Property propertyGuid_ExplicitNullable = new Property() + public static final CsdlProperty propertyGuid_ExplicitNullable = new CsdlProperty() .setName("PropertyGuid") .setType(nameGuid) .setNullable(true); - public static final Property propertyInt16 = new Property() + public static final CsdlProperty propertyInt16 = new CsdlProperty() .setName("PropertyInt16") .setType(nameInt16); - public static final Property propertyInt16_NotNullable = new Property() + public static final CsdlProperty propertyInt16_NotNullable = new CsdlProperty() .setName("PropertyInt16") .setType(nameInt16) .setNullable(false); - public static final Property propertyInt16_ExplicitNullable = new Property() + public static final CsdlProperty propertyInt16_ExplicitNullable = new CsdlProperty() .setName("PropertyInt16") .setType(nameInt16) .setNullable(true); - public static final Property propertyInt32 = new Property() + public static final CsdlProperty propertyInt32 = new CsdlProperty() .setName("PropertyInt32") .setType(nameInt32); - public static final Property propertyInt32_NotNullable = new Property() + public static final CsdlProperty propertyInt32_NotNullable = new CsdlProperty() .setName("PropertyInt32") .setType(nameInt32) .setNullable(false); - public static final Property propertyInt32_ExplicitNullable = new Property() + public static final CsdlProperty propertyInt32_ExplicitNullable = new CsdlProperty() .setName("PropertyInt32") .setType(nameInt32) .setNullable(true); - public static final Property propertyInt64 = new Property() + public static final CsdlProperty propertyInt64 = new CsdlProperty() .setName("PropertyInt64") .setType(nameInt64); - public static final Property propertyInt64_NotNullable = new Property() + public static final CsdlProperty propertyInt64_NotNullable = new CsdlProperty() .setName("PropertyInt64") .setType(nameInt64) .setNullable(false); - public static final Property propertyInt64_ExplicitNullable = new Property() + public static final CsdlProperty propertyInt64_ExplicitNullable = new CsdlProperty() .setName("PropertyInt64") .setType(nameInt64) .setNullable(true); - public static final Property propertySByte = new Property() + public static final CsdlProperty propertySByte = new CsdlProperty() .setName("PropertySByte") .setType(nameSByte); - public static final Property propertySByte_NotNullable = new Property() + public static final CsdlProperty propertySByte_NotNullable = new CsdlProperty() .setName("PropertySByte") .setType(nameSByte) .setNullable(false); - public static final Property propertySByte_ExplicitNullable = new Property() + public static final CsdlProperty propertySByte_ExplicitNullable = new CsdlProperty() .setName("PropertySByte") .setType(nameSByte) .setNullable(true); - public static final Property propertySingle = new Property() + public static final CsdlProperty propertySingle = new CsdlProperty() .setName("PropertySingle") .setType(nameSingle); - public static final Property propertySingle_NotNullable = new Property() + public static final CsdlProperty propertySingle_NotNullable = new CsdlProperty() .setName("PropertySingle") .setType(nameSingle) .setNullable(false); - public static final Property propertySingle_ExplicitNullable = new Property() + public static final CsdlProperty propertySingle_ExplicitNullable = new CsdlProperty() .setName("PropertySingle") .setType(nameSingle) .setNullable(true); - public static final Property propertyString = new Property() + public static final CsdlProperty propertyString = new CsdlProperty() .setName("PropertyString") .setType(nameString); - public static final Property propertyString_NotNullable = new Property() + public static final CsdlProperty propertyString_NotNullable = new CsdlProperty() .setName("PropertyString") .setType(nameString) .setNullable(false); - public static final Property propertyString_ExplicitNullable = new Property() + public static final CsdlProperty propertyString_ExplicitNullable = new CsdlProperty() .setName("PropertyString") .setType(nameString) .setNullable(true); - public static final Property propertyTimeOfDay = new Property() + public static final CsdlProperty propertyTimeOfDay = new CsdlProperty() .setName("PropertyTimeOfDay") .setType(nameTimeOfDay); - public static final Property propertyTimeOfDay_Precision = new Property() + public static final CsdlProperty propertyTimeOfDay_Precision = new CsdlProperty() .setName("PropertyTimeOfDay") .setPrecision(12) .setType(nameTimeOfDay); - public static final Property propertyTimeOfDay_NotNullable = new Property() + public static final CsdlProperty propertyTimeOfDay_NotNullable = new CsdlProperty() .setName("PropertyTimeOfDay") .setType(nameTimeOfDay) .setNullable(false); - public static final Property propertyTimeOfDay_ExplicitNullable = new Property() + public static final CsdlProperty propertyTimeOfDay_ExplicitNullable = new CsdlProperty() .setName("PropertyTimeOfDay") .setType(nameTimeOfDay) .setNullable(true); // Complex Properties ---------------------------------------------------------------------------------------------- - public static final Property collPropertyComp_CTPrimComp = new Property() + public static final CsdlProperty collPropertyComp_CTPrimComp = new CsdlProperty() .setName("CollPropertyComp") .setType(ComplexTypeProvider.nameCTPrimComp) .setCollection(true); - public static final Property collPropertyComp_CTTwoPrim = new Property() + public static final CsdlProperty collPropertyComp_CTTwoPrim = new CsdlProperty() .setName("CollPropertyComp") .setType(ComplexTypeProvider.nameCTTwoPrim) .setCollection(true); - public static final Property propertyComp_CTAllPrim = new Property() + public static final CsdlProperty propertyComp_CTAllPrim = new CsdlProperty() .setName("PropertyComp") .setType(ComplexTypeProvider.nameCTAllPrim); - public static final Property propertyComp_CTCollAllPrim = new Property() + public static final CsdlProperty propertyComp_CTCollAllPrim = new CsdlProperty() .setName("PropertyComp") .setType(ComplexTypeProvider.nameCTCollAllPrim); - public static final Property propertyComp_CTCompCollComp = new Property() + public static final CsdlProperty propertyComp_CTCompCollComp = new CsdlProperty() .setName("PropertyComp") .setType(ComplexTypeProvider.nameCTCompCollComp); - public static final Property propertyComp_CTCompComp = new Property() + public static final CsdlProperty propertyComp_CTCompComp = new CsdlProperty() .setName("PropertyComp") .setType(ComplexTypeProvider.nameCTCompComp); - public static final Property propertyComp_CTNavFiveProp = new Property() + public static final CsdlProperty propertyComp_CTNavFiveProp = new CsdlProperty() .setName("PropertyComp") .setType(ComplexTypeProvider.nameCTNavFiveProp); - public static final Property propertyCompNav_CTNavFiveProp = new Property() + public static final CsdlProperty propertyCompNav_CTNavFiveProp = new CsdlProperty() .setName("PropertyCompNav") .setType(ComplexTypeProvider.nameCTNavFiveProp); - public static final Property propertyComp_CTPrimComp_NotNullable = new Property() + public static final CsdlProperty propertyComp_CTPrimComp_NotNullable = new CsdlProperty() .setName("PropertyComp") .setType(ComplexTypeProvider.nameCTPrimComp) .setNullable(false); - public static final Property propertyComp_CTTwoPrim = new Property() + public static final CsdlProperty propertyComp_CTTwoPrim = new CsdlProperty() .setName("PropertyComp") .setType(ComplexTypeProvider.nameCTTwoPrim); - public static final Property propertyComp_CTTwoPrim_NotNullable = new Property() + public static final CsdlProperty propertyComp_CTTwoPrim_NotNullable = new CsdlProperty() .setName("PropertyComp") .setType(ComplexTypeProvider.nameCTTwoPrim) .setNullable(false); - public static final Property propertyCompNavCont = new Property() + public static final CsdlProperty propertyCompNavCont = new CsdlProperty() .setName("PropertyCompNavCont") .setType(ComplexTypeProvider.nameCTNavCont); - public static final Property propertyCompAllPrim_CTAllPrim = new Property() + public static final CsdlProperty propertyCompAllPrim_CTAllPrim = new CsdlProperty() .setName("PropertyCompAllPrim") .setType(ComplexTypeProvider.nameCTAllPrim); - public static final Property propertyCompComp_CTCompComp = new Property() + public static final CsdlProperty propertyCompComp_CTCompComp = new CsdlProperty() .setName("PropertyCompComp") .setType(ComplexTypeProvider.nameCTCompComp); - public static final Property propertyCompComp_CTCompComp_NotNullable = new Property() + public static final CsdlProperty propertyCompComp_CTCompComp_NotNullable = new CsdlProperty() .setName("PropertyCompComp") .setType(ComplexTypeProvider.nameCTCompComp) .setNullable(false); - public static final Property propertyCompTwoPrim_CTTwoPrim = new Property() + public static final CsdlProperty propertyCompTwoPrim_CTTwoPrim = new CsdlProperty() .setName("PropertyCompTwoPrim") .setType(ComplexTypeProvider.nameCTTwoPrim); - public static final Property propertyMixedPrimCollComp_CTMixPrimCollComp = new Property() + public static final CsdlProperty propertyMixedPrimCollComp_CTMixPrimCollComp = new CsdlProperty() .setName("PropertyMixedPrimCollComp") .setType(ComplexTypeProvider.nameCTMixPrimCollComp); - public static final Property propertyComp_CTMixEnumTypeDefColl = new Property() + public static final CsdlProperty propertyComp_CTMixEnumTypeDefColl = new CsdlProperty() .setName("PropertyCompMixedEnumDef") .setType(ComplexTypeProvider.nameCTMixEnumDef); - public static final Property propertyCompColl_CTMixEnumTypeDefColl = new Property() + public static final CsdlProperty propertyCompColl_CTMixEnumTypeDefColl = new CsdlProperty() .setName("CollPropertyCompMixedEnumDef") .setType(ComplexTypeProvider.nameCTMixEnumDef) .setCollection(true); // Navigation Properties ------------------------------------------------------------------------------------------- - public static final NavigationProperty collectionNavPropertyETKeyNavMany_ETKeyNav = new NavigationProperty() + public static final CsdlNavigationProperty collectionNavPropertyETKeyNavMany_ETKeyNav = new CsdlNavigationProperty() .setName("NavPropertyETKeyNavMany") .setType(EntityTypeProvider.nameETKeyNav) .setCollection(true); - public static final NavigationProperty collectionNavPropertyETMediaMany_ETMedia = new NavigationProperty() + public static final CsdlNavigationProperty collectionNavPropertyETMediaMany_ETMedia = new CsdlNavigationProperty() .setName("NavPropertyETMediaMany") .setType(EntityTypeProvider.nameETMedia) .setCollection(true); - public static final NavigationProperty collectionNavPropertyETTwoKeyNavMany_ETTwoKeyNav_WithPartnerERKeyNavOne = - new NavigationProperty() + public static final CsdlNavigationProperty collectionNavPropertyETTwoKeyNavMany_ETTwoKeyNav_WithPartnerERKeyNavOne = + new CsdlNavigationProperty() .setName("NavPropertyETTwoKeyNavMany") .setType(EntityTypeProvider.nameETTwoKeyNav) .setCollection(true) .setPartner("NavPropertyETKeyNavOne"); - public static final NavigationProperty collectionNavPropertyETTwoKeyNavMany_ETTwoKeyNav = new NavigationProperty() + public static final CsdlNavigationProperty collectionNavPropertyETTwoKeyNavMany_ETTwoKeyNav = + new CsdlNavigationProperty() .setName("NavPropertyETTwoKeyNavMany") .setType(EntityTypeProvider.nameETTwoKeyNav) .setCollection(true); - public static final NavigationProperty collectionNavPropertyETTwoKeyNavOne_ETTwoKeyNav = new NavigationProperty() + public static final CsdlNavigationProperty collectionNavPropertyETTwoKeyNavOne_ETTwoKeyNav = + new CsdlNavigationProperty() .setName("NavPropertyETTwoKeyNavOne") .setType(EntityTypeProvider.nameETTwoKeyNav); - public static final NavigationProperty collectionNavPropertyETTwoPrimMany_ETTwoPrim = new NavigationProperty() + public static final CsdlNavigationProperty collectionNavPropertyETTwoPrimMany_ETTwoPrim = + new CsdlNavigationProperty() .setName("NavPropertyETTwoPrimMany") .setType(EntityTypeProvider.nameETTwoPrim) .setCollection(true); - public static final NavigationProperty collectionNavPropertyETAllPrimMany_ETAllPrim = new NavigationProperty() + public static final CsdlNavigationProperty collectionNavPropertyETAllPrimMany_ETAllPrim = + new CsdlNavigationProperty() .setName("NavPropertyETAllPrimMany") .setType(EntityTypeProvider.nameETAllPrim) .setCollection(true); - public static final NavigationProperty collectionNavPropertySINav = new NavigationProperty() + public static final CsdlNavigationProperty collectionNavPropertySINav = new CsdlNavigationProperty() .setName("NavPropertySINav") .setCollection(true) .setType(EntityTypeProvider.nameETTwoKeyNav); - public static final NavigationProperty collectionNavPropertyETKeyNavContMany_CT_ETKeyNav = new NavigationProperty() + public static final CsdlNavigationProperty collectionNavPropertyETKeyNavContMany_CT_ETKeyNav = + new CsdlNavigationProperty() .setName("NavPropertyETKeyNavContMany") .setCollection(true) .setContainsTarget(true) .setType(EntityTypeProvider.nameETKeyNav); - public static final NavigationProperty collectionNavPropertyETTwoKeyNavContMany_CT_ETKeyNav = - new NavigationProperty() + public static final CsdlNavigationProperty collectionNavPropertyETTwoKeyNavContMany_CT_ETKeyNav = + new CsdlNavigationProperty() .setName("NavPropertyETTwoKeyNavContMany") .setCollection(true) .setContainsTarget(true) .setType(EntityTypeProvider.nameETKeyNav); - public static final NavigationProperty navPropertyETKeyNavOne_ETKeyNav = new NavigationProperty() + public static final CsdlNavigationProperty navPropertyETKeyNavOne_ETKeyNav = new CsdlNavigationProperty() .setName("NavPropertyETKeyNavOne") .setType(EntityTypeProvider.nameETKeyNav); - public static final NavigationProperty navPropertyETMediaOne_ETMedia = new NavigationProperty() + public static final CsdlNavigationProperty navPropertyETMediaOne_ETMedia = new CsdlNavigationProperty() .setName("NavPropertyETMediaOne") .setType(EntityTypeProvider.nameETMedia); - public static final NavigationProperty navPropertyETKeyPrimNavOne_ETKeyPrimNav = new NavigationProperty() + public static final CsdlNavigationProperty navPropertyETKeyPrimNavOne_ETKeyPrimNav = new CsdlNavigationProperty() .setName("NavPropertyETKeyPrimNavOne") .setType(EntityTypeProvider.nameETKeyPrimNav); - public static final NavigationProperty navPropertyETTwoKeyNavOne_ETTwoKeyNav_NotNullable = new NavigationProperty() + public static final CsdlNavigationProperty navPropertyETTwoKeyNavOne_ETTwoKeyNav_NotNullable = + new CsdlNavigationProperty() .setName("NavPropertyETTwoKeyNavOne") .setType(EntityTypeProvider.nameETTwoKeyNav) .setNullable(false); - public static final NavigationProperty navPropertyETTwoKeyNavOne_ETTwoKeyNav = new NavigationProperty() + public static final CsdlNavigationProperty navPropertyETTwoKeyNavOne_ETTwoKeyNav = new CsdlNavigationProperty() .setName("NavPropertyETTwoKeyNavOne") .setType(EntityTypeProvider.nameETTwoKeyNav); - public static final NavigationProperty navPropertyETTwoPrimOne_ETTwoPrim = new NavigationProperty() + public static final CsdlNavigationProperty navPropertyETTwoPrimOne_ETTwoPrim = new CsdlNavigationProperty() .setName("NavPropertyETTwoPrimOne") .setType(EntityTypeProvider.nameETTwoPrim) .setNullable(false); - public static final NavigationProperty navPropertyETAllPrimOne_ETAllPrim = new NavigationProperty() + public static final CsdlNavigationProperty navPropertyETAllPrimOne_ETAllPrim = new CsdlNavigationProperty() .setName("NavPropertyETAllPrimOne") .setType(EntityTypeProvider.nameETAllPrim); - public static final NavigationProperty navPropertyETKeyNavContOne_CT_ETeyNav = new NavigationProperty() + public static final CsdlNavigationProperty navPropertyETKeyNavContOne_CT_ETeyNav = new CsdlNavigationProperty() .setName("NavPropertyETKeyNavContOne") .setContainsTarget(true) .setType(EntityTypeProvider.nameETKeyNav); - public static final NavigationProperty navPropertyETTwoKeyNavContOne_CT_ETKeyNav = new NavigationProperty() + public static final CsdlNavigationProperty navPropertyETTwoKeyNavContOne_CT_ETKeyNav = new CsdlNavigationProperty() .setName("NavPropertyETTwoKeyNavContOne") .setContainsTarget(true) .setType(EntityTypeProvider.nameETKeyNav); - public static final NavigationProperty navPropertyETTwoKeyNavContOneCT_ETTwoKeyNav = new NavigationProperty() + public static final CsdlNavigationProperty navPropertyETTwoKeyNavContOneCT_ETTwoKeyNav = new CsdlNavigationProperty() .setName("NavPropertyETTwoKeyNavContOne") .setContainsTarget(true) .setType(EntityTypeProvider.nameETTwoKeyNav); - public static final NavigationProperty collectionNavPropertyETTwoKeyNavContMany_CT_ETTwoKeyNav = - new NavigationProperty() + public static final CsdlNavigationProperty collectionNavPropertyETTwoKeyNavContMany_CT_ETTwoKeyNav = + new CsdlNavigationProperty() .setName("NavPropertyETTwoKeyNavContMany") .setContainsTarget(true) .setCollection(true) .setType(EntityTypeProvider.nameETTwoKeyNav); // EnumProperties -------------------------------------------------------------------------------------------------- - public static final Property propertyEnumString_ENString = new Property() + public static final CsdlProperty propertyEnumString_ENString = new CsdlProperty() .setName("PropertyEnumString") .setType(EnumTypeProvider.nameENString) .setNullable(false); - public static final Property propertyEnumString_ENString_Nullable = new Property() + public static final CsdlProperty propertyEnumString_ENString_Nullable = new CsdlProperty() .setName("PropertyEnumString") .setType(EnumTypeProvider.nameENString); - public static final Property collPropertyEnumString_ENString = new Property() + public static final CsdlProperty collPropertyEnumString_ENString = new CsdlProperty() .setName("CollPropertyEnumString") .setType(EnumTypeProvider.nameENString) .setCollection(true); // TypeDefinition Properties --------------------------------------------------------------------------------------- - public static final Property propertyTypeDefinition_TDString = new Property() + public static final CsdlProperty propertyTypeDefinition_TDString = new CsdlProperty() .setName("PropertyDefString") .setType(TypeDefinitionProvider.nameTDString) .setMaxLength(15); - public static final Property collPropertyTypeDefinition_TDString = new Property() + public static final CsdlProperty collPropertyTypeDefinition_TDString = new CsdlProperty() .setName("CollPropertyDefString") .setType(TypeDefinitionProvider.nameTDString) .setMaxLength(15) http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/SchemaProvider.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/SchemaProvider.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/SchemaProvider.java index 33f98a6..7500a5a 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/SchemaProvider.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/SchemaProvider.java @@ -19,13 +19,13 @@ package org.apache.olingo.server.tecsvc.provider; import org.apache.olingo.commons.api.ODataException; -import org.apache.olingo.commons.api.edm.provider.Action; -import org.apache.olingo.commons.api.edm.provider.ComplexType; -import org.apache.olingo.commons.api.edm.provider.EntityType; -import org.apache.olingo.commons.api.edm.provider.EnumType; -import org.apache.olingo.commons.api.edm.provider.Function; -import org.apache.olingo.commons.api.edm.provider.Schema; -import org.apache.olingo.commons.api.edm.provider.TypeDefinition; +import org.apache.olingo.commons.api.edm.provider.CsdlAction; +import org.apache.olingo.commons.api.edm.provider.CsdlComplexType; +import org.apache.olingo.commons.api.edm.provider.CsdlEntityType; +import org.apache.olingo.commons.api.edm.provider.CsdlEnumType; +import org.apache.olingo.commons.api.edm.provider.CsdlFunction; +import org.apache.olingo.commons.api.edm.provider.CsdlSchema; +import org.apache.olingo.commons.api.edm.provider.CsdlTypeDefinition; import java.util.ArrayList; import java.util.List; @@ -40,25 +40,25 @@ public class SchemaProvider { this.prov = prov; } - public List<Schema> getSchemas() throws ODataException { - List<Schema> schemas = new ArrayList<Schema>(); - Schema schema = new Schema(); + public List<CsdlSchema> getSchemas() throws ODataException { + List<CsdlSchema> schemas = new ArrayList<CsdlSchema>(); + CsdlSchema schema = new CsdlSchema(); schema.setNamespace(NAMESPACE); schema.setAlias("Namespace1_Alias"); schemas.add(schema); // EnumTypes - List<EnumType> enumTypes = new ArrayList<EnumType>(); + List<CsdlEnumType> enumTypes = new ArrayList<CsdlEnumType>(); schema.setEnumTypes(enumTypes); // TypeDefinitions - List<TypeDefinition> typeDefinitions = new ArrayList<TypeDefinition>(); + List<CsdlTypeDefinition> typeDefinitions = new ArrayList<CsdlTypeDefinition>(); schema.setTypeDefinitions(typeDefinitions); typeDefinitions.add(prov.getTypeDefinition(TypeDefinitionProvider.nameTDString)); enumTypes.add(prov.getEnumType(EnumTypeProvider.nameENString)); // EntityTypes - List<EntityType> entityTypes = new ArrayList<EntityType>(); + List<CsdlEntityType> entityTypes = new ArrayList<CsdlEntityType>(); schema.setEntityTypes(entityTypes); entityTypes.add(prov.getEntityType(EntityTypeProvider.nameETAllPrim)); @@ -90,7 +90,7 @@ public class SchemaProvider { // ComplexTypes - List<ComplexType> complexType = new ArrayList<ComplexType>(); + List<CsdlComplexType> complexType = new ArrayList<CsdlComplexType>(); schema.setComplexTypes(complexType); complexType.add(prov.getComplexType(ComplexTypeProvider.nameCTPrim)); complexType.add(prov.getComplexType(ComplexTypeProvider.nameCTAllPrim)); @@ -111,7 +111,7 @@ public class SchemaProvider { // Actions - List<Action> actions = new ArrayList<Action>(); + List<CsdlAction> actions = new ArrayList<CsdlAction>(); schema.setActions(actions); actions.addAll(prov.getActions(ActionProvider.nameBAETTwoKeyNavRTETTwoKeyNav)); actions.addAll(prov.getActions(ActionProvider.nameBAESAllPrimRTETAllPrim)); @@ -134,7 +134,7 @@ public class SchemaProvider { actions.addAll(prov.getActions(ActionProvider.nameUARTTwoParam)); // Functions - List<Function> functions = new ArrayList<Function>(); + List<CsdlFunction> functions = new ArrayList<CsdlFunction>(); schema.setFunctions(functions); functions.addAll(prov.getFunctions(FunctionProvider.nameUFNRTInt16)); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/TypeDefinitionProvider.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/TypeDefinitionProvider.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/TypeDefinitionProvider.java index 74cdbb1..3a357a2 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/TypeDefinitionProvider.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/TypeDefinitionProvider.java @@ -20,15 +20,15 @@ package org.apache.olingo.server.tecsvc.provider; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.FullQualifiedName; -import org.apache.olingo.commons.api.edm.provider.TypeDefinition; +import org.apache.olingo.commons.api.edm.provider.CsdlTypeDefinition; public class TypeDefinitionProvider { public static final FullQualifiedName nameTDString = new FullQualifiedName(SchemaProvider.NAMESPACE, "TDString"); - public TypeDefinition getTypeDefinition(final FullQualifiedName typeDefinitionName) { + public CsdlTypeDefinition getTypeDefinition(final FullQualifiedName typeDefinitionName) { if (nameTDString.equals(typeDefinitionName)) { - return new TypeDefinition().setName(nameTDString.getName()).setUnderlyingType( + return new CsdlTypeDefinition().setName(nameTDString.getName()).setUnderlyingType( EdmPrimitiveTypeKind.String.getFullQualifiedName()).setMaxLength(15); } return null; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerTest.java index 0ed13fe..20eb233 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerTest.java @@ -39,8 +39,8 @@ import org.apache.commons.io.IOUtils; import org.apache.olingo.commons.api.ODataException; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; -import org.apache.olingo.commons.api.edm.provider.AbstractEdmProvider; -import org.apache.olingo.commons.api.edm.provider.EntitySet; +import org.apache.olingo.commons.api.edm.provider.CsdlAbstractEdmProvider; +import org.apache.olingo.commons.api.edm.provider.CsdlEntitySet; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.http.HttpContentType; @@ -223,8 +223,8 @@ public class ODataHandlerTest { public void uriParserExceptionResultsInRightResponseEdmCause() throws Exception { final OData odata = OData.newInstance(); final ServiceMetadata serviceMetadata = odata.createServiceMetadata( - new AbstractEdmProvider() { - public EntitySet getEntitySet(final FullQualifiedName entityContainer, final String entitySetName) + new CsdlAbstractEdmProvider() { + public CsdlEntitySet getEntitySet(final FullQualifiedName entityContainer, final String entitySetName) throws ODataException { throw new ODataException("msg"); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializerEntityTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializerEntityTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializerEntityTest.java index 4a433c3..8c01c21 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializerEntityTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializerEntityTest.java @@ -45,7 +45,7 @@ import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmEntityType; import org.apache.olingo.commons.api.edm.EdmProperty; import org.apache.olingo.commons.api.edm.FullQualifiedName; -import org.apache.olingo.commons.api.edm.provider.Mapping; +import org.apache.olingo.commons.api.edm.provider.CsdlMapping; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.core.edm.primitivetype.EdmDate; import org.apache.olingo.commons.core.edm.primitivetype.EdmDateTimeOffset; @@ -656,7 +656,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe propertyNames.add("PropertyDate"); propertyNames.add("PropertyDateTimeOffset"); when(entityType.getPropertyNames()).thenReturn(propertyNames); - Mapping mapping = new Mapping().setMappedJavaClass(Date.class); + CsdlMapping mapping = new CsdlMapping().setMappedJavaClass(Date.class); EdmProperty propertyDate = mock(EdmProperty.class); when(propertyDate.getName()).thenReturn("PropertyDate"); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/EdmTechTestProvider.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/EdmTechTestProvider.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/EdmTechTestProvider.java index a48627d..d1b739b 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/EdmTechTestProvider.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/EdmTechTestProvider.java @@ -21,11 +21,11 @@ package org.apache.olingo.server.core.uri.testutil; import org.apache.olingo.commons.api.ODataException; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.FullQualifiedName; -import org.apache.olingo.commons.api.edm.provider.ComplexType; -import org.apache.olingo.commons.api.edm.provider.EntitySet; -import org.apache.olingo.commons.api.edm.provider.EntityType; -import org.apache.olingo.commons.api.edm.provider.Property; -import org.apache.olingo.commons.api.edm.provider.PropertyRef; +import org.apache.olingo.commons.api.edm.provider.CsdlComplexType; +import org.apache.olingo.commons.api.edm.provider.CsdlEntitySet; +import org.apache.olingo.commons.api.edm.provider.CsdlEntityType; +import org.apache.olingo.commons.api.edm.provider.CsdlProperty; +import org.apache.olingo.commons.api.edm.provider.CsdlPropertyRef; import org.apache.olingo.server.tecsvc.provider.EdmTechProvider; import java.util.Arrays; @@ -43,20 +43,20 @@ public class EdmTechTestProvider extends EdmTechProvider { public static final String NAMESPACE = "olingo.odata.test1"; public static final FullQualifiedName nameContainer = new FullQualifiedName(NAMESPACE, "Container"); - Property propertyAInt16 = new Property().setName("a").setType(nameInt16); - Property propertyBInt16 = new Property().setName("b").setType(nameInt16); - Property propertyCInt16 = new Property().setName("c").setType(nameInt16); - Property propertyDInt16 = new Property().setName("d").setType(nameInt16); - Property propertyEInt16 = new Property().setName("e").setType(nameInt16); - Property propertyFInt16 = new Property().setName("f").setType(nameInt16); + CsdlProperty propertyAInt16 = new CsdlProperty().setName("a").setType(nameInt16); + CsdlProperty propertyBInt16 = new CsdlProperty().setName("b").setType(nameInt16); + CsdlProperty propertyCInt16 = new CsdlProperty().setName("c").setType(nameInt16); + CsdlProperty propertyDInt16 = new CsdlProperty().setName("d").setType(nameInt16); + CsdlProperty propertyEInt16 = new CsdlProperty().setName("e").setType(nameInt16); + CsdlProperty propertyFInt16 = new CsdlProperty().setName("f").setType(nameInt16); public static final FullQualifiedName nameCTabc = new FullQualifiedName(NAMESPACE, "CTabc"); public static final FullQualifiedName nameETabc = new FullQualifiedName(NAMESPACE, "ETabc"); @Override - public ComplexType getComplexType(final FullQualifiedName complexTypeName) throws ODataException { + public CsdlComplexType getComplexType(final FullQualifiedName complexTypeName) throws ODataException { if (complexTypeName.equals(nameCTabc)) { - return new ComplexType() + return new CsdlComplexType() .setName("CTabc") .setProperties(Arrays.asList( propertyAInt16, propertyBInt16, propertyCInt16, @@ -69,10 +69,10 @@ public class EdmTechTestProvider extends EdmTechProvider { } @Override - public EntitySet getEntitySet(final FullQualifiedName entityContainer, final String name) throws ODataException { + public CsdlEntitySet getEntitySet(final FullQualifiedName entityContainer, final String name) throws ODataException { if (nameContainer.equals(entityContainer)) { if (name.equals("ESabc")) { - return new EntitySet() + return new CsdlEntitySet() .setName("ESabc") .setType(nameETabc); } @@ -82,11 +82,11 @@ public class EdmTechTestProvider extends EdmTechProvider { } @Override - public EntityType getEntityType(final FullQualifiedName entityTypeName) throws ODataException { - List<PropertyRef> oneKeyPropertyInt16 = Arrays.asList(new PropertyRef().setName("a")); + public CsdlEntityType getEntityType(final FullQualifiedName entityTypeName) throws ODataException { + List<CsdlPropertyRef> oneKeyPropertyInt16 = Arrays.asList(new CsdlPropertyRef().setName("a")); if (entityTypeName.equals(nameETabc)) { - return new EntityType() + return new CsdlEntityType() .setName("ETabc") .setProperties(Arrays.asList( propertyAInt16, propertyBInt16, propertyCInt16, http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/samples/server/src/main/java/org/apache/olingo/server/sample/edmprovider/CarsEdmProvider.java ---------------------------------------------------------------------- diff --git a/samples/server/src/main/java/org/apache/olingo/server/sample/edmprovider/CarsEdmProvider.java b/samples/server/src/main/java/org/apache/olingo/server/sample/edmprovider/CarsEdmProvider.java index 8036c8f..4d3ba9d 100644 --- a/samples/server/src/main/java/org/apache/olingo/server/sample/edmprovider/CarsEdmProvider.java +++ b/samples/server/src/main/java/org/apache/olingo/server/sample/edmprovider/CarsEdmProvider.java @@ -25,19 +25,19 @@ import java.util.List; import org.apache.olingo.commons.api.ODataException; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.FullQualifiedName; -import org.apache.olingo.commons.api.edm.provider.AbstractEdmProvider; -import org.apache.olingo.commons.api.edm.provider.ComplexType; -import org.apache.olingo.commons.api.edm.provider.EntityContainer; -import org.apache.olingo.commons.api.edm.provider.EntityContainerInfo; -import org.apache.olingo.commons.api.edm.provider.EntitySet; -import org.apache.olingo.commons.api.edm.provider.EntityType; -import org.apache.olingo.commons.api.edm.provider.NavigationProperty; -import org.apache.olingo.commons.api.edm.provider.NavigationPropertyBinding; -import org.apache.olingo.commons.api.edm.provider.Property; -import org.apache.olingo.commons.api.edm.provider.PropertyRef; -import org.apache.olingo.commons.api.edm.provider.Schema; - -public class CarsEdmProvider extends AbstractEdmProvider { +import org.apache.olingo.commons.api.edm.provider.CsdlAbstractEdmProvider; +import org.apache.olingo.commons.api.edm.provider.CsdlComplexType; +import org.apache.olingo.commons.api.edm.provider.CsdlEntityContainer; +import org.apache.olingo.commons.api.edm.provider.CsdlEntityContainerInfo; +import org.apache.olingo.commons.api.edm.provider.CsdlEntitySet; +import org.apache.olingo.commons.api.edm.provider.CsdlEntityType; +import org.apache.olingo.commons.api.edm.provider.CsdlNavigationProperty; +import org.apache.olingo.commons.api.edm.provider.CsdlNavigationPropertyBinding; +import org.apache.olingo.commons.api.edm.provider.CsdlProperty; +import org.apache.olingo.commons.api.edm.provider.CsdlPropertyRef; +import org.apache.olingo.commons.api.edm.provider.CsdlSchema; + +public class CarsEdmProvider extends CsdlAbstractEdmProvider { // Service Namespace public static final String NAMESPACE = "olingo.odata.sample"; @@ -58,39 +58,39 @@ public class CarsEdmProvider extends AbstractEdmProvider { public static final String ES_MANUFACTURER_NAME = "Manufacturers"; @Override - public EntityType getEntityType(final FullQualifiedName entityTypeName) throws ODataException { + public CsdlEntityType getEntityType(final FullQualifiedName entityTypeName) throws ODataException { if (ET_CAR.equals(entityTypeName)) { - return new EntityType() + return new CsdlEntityType() .setName(ET_CAR.getName()) .setKey(Arrays.asList( - new PropertyRef().setName("Id"))) + new CsdlPropertyRef().setName("Id"))) .setProperties( Arrays.asList( - new Property().setName("Id").setType(EdmPrimitiveTypeKind.Int16.getFullQualifiedName()), - new Property().setName("Model").setType(EdmPrimitiveTypeKind.String.getFullQualifiedName()), - new Property().setName("ModelYear").setType(EdmPrimitiveTypeKind.String.getFullQualifiedName()) + new CsdlProperty().setName("Id").setType(EdmPrimitiveTypeKind.Int16.getFullQualifiedName()), + new CsdlProperty().setName("Model").setType(EdmPrimitiveTypeKind.String.getFullQualifiedName()), + new CsdlProperty().setName("ModelYear").setType(EdmPrimitiveTypeKind.String.getFullQualifiedName()) .setMaxLength(4), - new Property().setName("Price").setType(EdmPrimitiveTypeKind.Decimal.getFullQualifiedName()) + new CsdlProperty().setName("Price").setType(EdmPrimitiveTypeKind.Decimal.getFullQualifiedName()) .setScale(2), - new Property().setName("Currency").setType(EdmPrimitiveTypeKind.String.getFullQualifiedName()) + new CsdlProperty().setName("Currency").setType(EdmPrimitiveTypeKind.String.getFullQualifiedName()) .setMaxLength(3) ) ).setNavigationProperties(Arrays.asList( - new NavigationProperty().setName("Manufacturer").setType(ET_MANUFACTURER) + new CsdlNavigationProperty().setName("Manufacturer").setType(ET_MANUFACTURER) ) ); } else if (ET_MANUFACTURER.equals(entityTypeName)) { - return new EntityType() + return new CsdlEntityType() .setName(ET_MANUFACTURER.getName()) .setKey(Arrays.asList( - new PropertyRef().setName("Id"))) + new CsdlPropertyRef().setName("Id"))) .setProperties(Arrays.asList( - new Property().setName("Id").setType(EdmPrimitiveTypeKind.Int16.getFullQualifiedName()), - new Property().setName("Name").setType(EdmPrimitiveTypeKind.String.getFullQualifiedName()), - new Property().setName("Address").setType(CT_ADDRESS)) + new CsdlProperty().setName("Id").setType(EdmPrimitiveTypeKind.Int16.getFullQualifiedName()), + new CsdlProperty().setName("Name").setType(EdmPrimitiveTypeKind.String.getFullQualifiedName()), + new CsdlProperty().setName("Address").setType(CT_ADDRESS)) ).setNavigationProperties(Arrays.asList( - new NavigationProperty().setName("Cars").setType(ET_CAR).setCollection(true) + new CsdlNavigationProperty().setName("Cars").setType(ET_CAR).setCollection(true) ) ); } @@ -98,36 +98,36 @@ public class CarsEdmProvider extends AbstractEdmProvider { return null; } - public ComplexType getComplexType(final FullQualifiedName complexTypeName) throws ODataException { + public CsdlComplexType getComplexType(final FullQualifiedName complexTypeName) throws ODataException { if (CT_ADDRESS.equals(complexTypeName)) { - return new ComplexType().setName(CT_ADDRESS.getName()).setProperties(Arrays.asList( - new Property().setName("Street").setType(EdmPrimitiveTypeKind.String.getFullQualifiedName()), - new Property().setName("City").setType(EdmPrimitiveTypeKind.String.getFullQualifiedName()), - new Property().setName("ZipCode").setType(EdmPrimitiveTypeKind.String.getFullQualifiedName()), - new Property().setName("Country").setType(EdmPrimitiveTypeKind.String.getFullQualifiedName()) + return new CsdlComplexType().setName(CT_ADDRESS.getName()).setProperties(Arrays.asList( + new CsdlProperty().setName("Street").setType(EdmPrimitiveTypeKind.String.getFullQualifiedName()), + new CsdlProperty().setName("City").setType(EdmPrimitiveTypeKind.String.getFullQualifiedName()), + new CsdlProperty().setName("ZipCode").setType(EdmPrimitiveTypeKind.String.getFullQualifiedName()), + new CsdlProperty().setName("Country").setType(EdmPrimitiveTypeKind.String.getFullQualifiedName()) )); } return null; } @Override - public EntitySet getEntitySet(final FullQualifiedName entityContainer, final String entitySetName) + public CsdlEntitySet getEntitySet(final FullQualifiedName entityContainer, final String entitySetName) throws ODataException { if (CONTAINER_FQN.equals(entityContainer)) { if (ES_CARS_NAME.equals(entitySetName)) { - return new EntitySet() + return new CsdlEntitySet() .setName(ES_CARS_NAME) .setType(ET_CAR) .setNavigationPropertyBindings( Arrays.asList( - new NavigationPropertyBinding().setPath("Manufacturer").setTarget( + new CsdlNavigationPropertyBinding().setPath("Manufacturer").setTarget( CONTAINER_FQN.getFullQualifiedNameAsString() + "/" + ES_MANUFACTURER_NAME))); } else if (ES_MANUFACTURER_NAME.equals(entitySetName)) { - return new EntitySet() + return new CsdlEntitySet() .setName(ES_MANUFACTURER_NAME) .setType(ET_MANUFACTURER).setNavigationPropertyBindings( Arrays.asList( - new NavigationPropertyBinding().setPath("Cars") + new CsdlNavigationPropertyBinding().setPath("Cars") .setTarget(CONTAINER_FQN.getFullQualifiedNameAsString() + "/" + ES_CARS_NAME))); } } @@ -136,18 +136,18 @@ public class CarsEdmProvider extends AbstractEdmProvider { } @Override - public List<Schema> getSchemas() throws ODataException { - List<Schema> schemas = new ArrayList<Schema>(); - Schema schema = new Schema(); + public List<CsdlSchema> getSchemas() throws ODataException { + List<CsdlSchema> schemas = new ArrayList<CsdlSchema>(); + CsdlSchema schema = new CsdlSchema(); schema.setNamespace(NAMESPACE); // EntityTypes - List<EntityType> entityTypes = new ArrayList<EntityType>(); + List<CsdlEntityType> entityTypes = new ArrayList<CsdlEntityType>(); entityTypes.add(getEntityType(ET_CAR)); entityTypes.add(getEntityType(ET_MANUFACTURER)); schema.setEntityTypes(entityTypes); // ComplexTypes - List<ComplexType> complexTypes = new ArrayList<ComplexType>(); + List<CsdlComplexType> complexTypes = new ArrayList<CsdlComplexType>(); complexTypes.add(getComplexType(CT_ADDRESS)); schema.setComplexTypes(complexTypes); @@ -159,12 +159,12 @@ public class CarsEdmProvider extends AbstractEdmProvider { } @Override - public EntityContainer getEntityContainer() throws ODataException { - EntityContainer container = new EntityContainer(); + public CsdlEntityContainer getEntityContainer() throws ODataException { + CsdlEntityContainer container = new CsdlEntityContainer(); container.setName(CONTAINER_FQN.getName()); // EntitySets - List<EntitySet> entitySets = new ArrayList<EntitySet>(); + List<CsdlEntitySet> entitySets = new ArrayList<CsdlEntitySet>(); container.setEntitySets(entitySets); entitySets.add(getEntitySet(CONTAINER_FQN, ES_CARS_NAME)); entitySets.add(getEntitySet(CONTAINER_FQN, ES_MANUFACTURER_NAME)); @@ -173,9 +173,10 @@ public class CarsEdmProvider extends AbstractEdmProvider { } @Override - public EntityContainerInfo getEntityContainerInfo(final FullQualifiedName entityContainerName) throws ODataException { + public CsdlEntityContainerInfo getEntityContainerInfo(final FullQualifiedName entityContainerName) + throws ODataException { if (entityContainerName == null || CONTAINER_FQN.equals(entityContainerName)) { - return new EntityContainerInfo().setContainerName(CONTAINER_FQN); + return new CsdlEntityContainerInfo().setContainerName(CONTAINER_FQN); } return null; }
