From b812db2a8d3715507ebea30419d972361b1aaa7e Mon Sep 17 00:00:00 2001
From: Yvo Niedrich <yvo.niedrich@ecoonline.com>
Date: Thu, 19 Sep 2024 12:22:58 +0200
Subject: [PATCH] Update behaviour for `immutable` and `computed` properties
 (#837)

* Strip computed properties from payload and update OpenAPI documentation for `computed` and `immutable` properties

* code style: make boolean condition easier to read and understand

* OpenAPI: Display `Computed` properties with the entity schema and `ComputedDefault` properties with the create schema

* update phpunit snapshots

* Bugfix: Initialise `$cookies` when creating a Request object from `Illuminate\Request`

* Improvement: Utilizing the method-chaining nature of `Model.setAttribute` adds support for external model mutations and polymorphism.

* PHPUnit: Update snapshots for `mongo` test suite (computed properties are defined for the entity in OpenAPI documentation)

* Bugfix: Add `description` to Enum type to address invalid order of arguments

* EloquentEntitySet::create - use the property source name for the attribute

* `Property.IsComputed` no longer matches on ComputedDefault annotations.

* CR Feedback: Update entity auto-detected key property annotation from `ComputedDefault` to `Computed`

* Update tests

* EPC-11157: validate guids property values

* Remove "modern" PHP syntax

* Prevent `Str::startsWith` being called with `null` on `Transaction:getAcceptedContentTypes`

---------

Co-authored-by: sean.james <sean.james@ecoonline.com>
---
 src/Attributes/LodataEnum.php                 | 21 +++++++++++-----
 src/ComplexType.php                           | 23 +++++++++++------
 src/Controller/Request.php                    |  1 +
 src/Controller/Transaction.php                |  2 +-
 src/Drivers/CSVEntityType.php                 |  6 ++---
 src/Drivers/EloquentEntitySet.php             | 18 ++++++-------
 src/EntityType.php                            |  4 ++-
 src/GeneratedProperty.php                     |  5 ++++
 src/Helper/ObjectArray.php                    | 13 ++++++++++
 src/Primitive.php                             |  5 ++++
 src/PrimitiveType.php                         |  7 +++++-
 src/Property.php                              | 25 ++++++++++++++++---
 src/Type.php                                  |  5 ++++
 src/Type/Guid.php                             |  5 ++++
 tests/Drivers/WithNumericCollectionDriver.php |  6 ++---
 .../CSVTest__test_generated_property__1.xml   |  2 +-
 .../CSVTest__test_generated_property__3.json  |  2 +-
 .../CSVTest__test_generated_property__4.json  |  7 ++++++
 ...quentTest__test_generated_property__4.json |  7 ++++++
 ...ystemTest__test_generated_property__4.json | 13 ++++++++++
 ...ctionTest__test_generated_property__4.json |  7 ++++++
 ...MongoTest__test_generated_property__4.json |  7 ++++++
 ...ectionTest__test_generated_property__1.xml |  2 +-
 ...ctionTest__test_generated_property__3.json |  2 +-
 ...ctionTest__test_generated_property__4.json |  7 ++++++
 ...RedisTest__test_generated_property__4.json |  7 ++++++
 .../SQLTest__test_generated_property__4.json  |  7 ++++++
 .../EntitySet/CSVTest__test_metadata__1.xml   |  2 +-
 .../EntitySet/CSVTest__test_metadata__3.json  |  2 +-
 .../FilesystemTest__test_metadata__4.json     |  6 +++++
 ...umericCollectionTest__test_metadata__1.xml |  2 +-
 ...mericCollectionTest__test_metadata__3.json |  2 +-
 .../ActionTest__test_array_argument__1.xml    |  2 +-
 .../ActionTest__test_array_argument__3.json   |  2 +-
 .../ActionTest__test_date_argument__1.xml     |  2 +-
 .../ActionTest__test_date_argument__3.json    |  2 +-
 ...ctionTest__test_null_typed_callback__1.xml |  2 +-
 ...tionTest__test_null_typed_callback__3.json |  2 +-
 ...ionTest__test_odata_binary_argument__1.xml |  2 +-
 ...onTest__test_odata_binary_argument__3.json |  2 +-
 ...onTest__test_odata_boolean_argument__1.xml |  2 +-
 ...nTest__test_odata_boolean_argument__3.json |  2 +-
 ...ctionTest__test_odata_byte_argument__1.xml |  2 +-
 ...tionTest__test_odata_byte_argument__3.json |  2 +-
 ...est__test_odata_collection_argument__1.xml |  2 +-
 ...st__test_odata_collection_argument__3.json |  2 +-
 ...ctionTest__test_odata_date_argument__1.xml |  2 +-
 ...tionTest__test_odata_date_argument__3.json |  2 +-
 ..._test_odata_datetimeoffset_argument__1.xml |  2 +-
 ...test_odata_datetimeoffset_argument__3.json |  2 +-
 ...onTest__test_odata_decimal_argument__1.xml |  2 +-
 ...nTest__test_odata_decimal_argument__3.json |  2 +-
 ...ionTest__test_odata_double_argument__1.xml |  2 +-
 ...onTest__test_odata_double_argument__3.json |  2 +-
 ...nTest__test_odata_duration_argument__1.xml |  2 +-
 ...Test__test_odata_duration_argument__3.json |  2 +-
 ...ctionTest__test_odata_guid_argument__1.xml |  2 +-
 ...tionTest__test_odata_guid_argument__3.json |  2 +-
 ...tionTest__test_odata_int16_argument__1.xml |  2 +-
 ...ionTest__test_odata_int16_argument__3.json |  2 +-
 ...tionTest__test_odata_int32_argument__1.xml |  2 +-
 ...ionTest__test_odata_int32_argument__3.json |  2 +-
 ...tionTest__test_odata_int64_argument__1.xml |  2 +-
 ...ionTest__test_odata_int64_argument__3.json |  2 +-
 ...tionTest__test_odata_sbyte_argument__1.xml |  2 +-
 ...ionTest__test_odata_sbyte_argument__3.json |  2 +-
 ...ionTest__test_odata_single_argument__1.xml |  2 +-
 ...onTest__test_odata_single_argument__3.json |  2 +-
 ...ionTest__test_odata_string_argument__1.xml |  2 +-
 ...onTest__test_odata_string_argument__3.json |  2 +-
 ...Test__test_odata_timeofday_argument__1.xml |  2 +-
 ...est__test_odata_timeofday_argument__3.json |  2 +-
 ...ionTest__test_odata_uint16_argument__1.xml |  2 +-
 ...onTest__test_odata_uint16_argument__3.json |  2 +-
 ...ionTest__test_odata_uint32_argument__1.xml |  2 +-
 ...onTest__test_odata_uint32_argument__3.json |  2 +-
 ...ionTest__test_odata_uint64_argument__1.xml |  2 +-
 ...onTest__test_odata_uint64_argument__3.json |  2 +-
 .../FunctionTest__test_array_argument__1.xml  |  2 +-
 .../FunctionTest__test_array_argument__3.json |  2 +-
 ...FunctionTest__test_boolean_argument__1.xml |  2 +-
 ...unctionTest__test_boolean_argument__3.json |  2 +-
 ...FunctionTest__test_boolean_callback__1.xml |  2 +-
 ...unctionTest__test_boolean_callback__3.json |  2 +-
 .../FunctionTest__test_float_argument__1.xml  |  2 +-
 .../FunctionTest__test_float_argument__3.json |  2 +-
 .../FunctionTest__test_float_callback__1.xml  |  2 +-
 .../FunctionTest__test_float_callback__3.json |  2 +-
 .../FunctionTest__test_int_argument__1.xml    |  2 +-
 .../FunctionTest__test_int_argument__3.json   |  2 +-
 .../FunctionTest__test_int_callback__1.xml    |  2 +-
 .../FunctionTest__test_int_callback__3.json   |  2 +-
 .../FunctionTest__test_null_argument__1.xml   |  2 +-
 .../FunctionTest__test_null_argument__3.json  |  2 +-
 ...ionTest__test_odata_binary_argument__1.xml |  2 +-
 ...onTest__test_odata_binary_argument__3.json |  2 +-
 ...onTest__test_odata_boolean_argument__1.xml |  2 +-
 ...nTest__test_odata_boolean_argument__3.json |  2 +-
 ...ctionTest__test_odata_byte_argument__1.xml |  2 +-
 ...tionTest__test_odata_byte_argument__3.json |  2 +-
 ...est__test_odata_collection_argument__1.xml |  2 +-
 ...st__test_odata_collection_argument__3.json |  2 +-
 ...odata_collection_argument_with_type__1.xml |  2 +-
 ...data_collection_argument_with_type__3.json |  2 +-
 ...ctionTest__test_odata_date_argument__1.xml |  2 +-
 ...tionTest__test_odata_date_argument__3.json |  2 +-
 ..._test_odata_datetimeoffset_argument__1.xml |  2 +-
 ...test_odata_datetimeoffset_argument__3.json |  2 +-
 ...onTest__test_odata_decimal_argument__1.xml |  2 +-
 ...nTest__test_odata_decimal_argument__3.json |  2 +-
 ...ionTest__test_odata_double_argument__1.xml |  2 +-
 ...onTest__test_odata_double_argument__3.json |  2 +-
 ...nTest__test_odata_duration_argument__1.xml |  2 +-
 ...Test__test_odata_duration_argument__3.json |  2 +-
 ...ctionTest__test_odata_guid_argument__1.xml |  2 +-
 ...tionTest__test_odata_guid_argument__3.json |  2 +-
 ...tionTest__test_odata_int16_argument__1.xml |  2 +-
 ...ionTest__test_odata_int16_argument__3.json |  2 +-
 ...tionTest__test_odata_int32_argument__1.xml |  2 +-
 ...ionTest__test_odata_int32_argument__3.json |  2 +-
 ...tionTest__test_odata_int64_argument__1.xml |  2 +-
 ...ionTest__test_odata_int64_argument__3.json |  2 +-
 ...tionTest__test_odata_sbyte_argument__1.xml |  2 +-
 ...ionTest__test_odata_sbyte_argument__3.json |  2 +-
 ...ionTest__test_odata_single_argument__1.xml |  2 +-
 ...onTest__test_odata_single_argument__3.json |  2 +-
 ...ionTest__test_odata_string_argument__1.xml |  2 +-
 ...onTest__test_odata_string_argument__3.json |  2 +-
 ...Test__test_odata_timeofday_argument__1.xml |  2 +-
 ...est__test_odata_timeofday_argument__3.json |  2 +-
 ...ionTest__test_odata_uint16_argument__1.xml |  2 +-
 ...onTest__test_odata_uint16_argument__3.json |  2 +-
 ...ionTest__test_odata_uint32_argument__1.xml |  2 +-
 ...onTest__test_odata_uint32_argument__3.json |  2 +-
 ...ionTest__test_odata_uint64_argument__1.xml |  2 +-
 ...onTest__test_odata_uint64_argument__3.json |  2 +-
 .../FunctionTest__test_string_argument__1.xml |  2 +-
 ...FunctionTest__test_string_argument__3.json |  2 +-
 .../FunctionTest__test_string_callback__1.xml |  2 +-
 ...FunctionTest__test_string_callback__3.json |  2 +-
 ...onTest__test_parameter_bound_modify__1.xml |  2 +-
 ...nTest__test_parameter_bound_modify__3.json |  2 +-
 ...Test__test_parameter_bound_passthru__1.xml |  2 +-
 ...est__test_parameter_bound_passthru__3.json |  2 +-
 ...ionTest__test_parameter_order_bound__1.xml |  2 +-
 ...onTest__test_parameter_order_bound__3.json |  2 +-
 ...nTest__test_parameter_order_unbound__1.xml |  2 +-
 ...Test__test_parameter_order_unbound__3.json |  2 +-
 ...perationTest__test_void_uses_string__1.xml |  2 +-
 ...erationTest__test_void_uses_string__3.json |  2 +-
 ...__test_async_batch_service_metadata__5.txt |  2 +-
 ...__test_async_batch_service_metadata__6.txt |  2 +-
 .../AsyncTest__test_async_metadata__5.txt     |  2 +-
 .../AsyncTest__test_async_metadata__6.txt     |  2 +-
 ..._metadata_document_at_document_root__1.xml |  2 +-
 ...metadata_document_at_document_root__3.json |  2 +-
 ...faultExpressionTest__test_metadata__4.json |  9 ++++++-
 .../DefaultValueTest__test_default__4.json    |  5 ++++
 158 files changed, 323 insertions(+), 169 deletions(-)

diff --git a/src/Attributes/LodataEnum.php b/src/Attributes/LodataEnum.php
index 1ff831906..fd958b2cc 100644
--- a/src/Attributes/LodataEnum.php
+++ b/src/Attributes/LodataEnum.php
@@ -12,11 +12,20 @@
 #[Attribute(Attribute::TARGET_CLASS | Attribute::IS_REPEATABLE)]
 class LodataEnum extends LodataProperty
 {
-    protected string $enum;
-
-    public function __construct(string $name, string $enum, ?string $source = null)
-    {
-        parent::__construct($name, $source);
+    /** @var string */
+    protected $enum;
+
+    public function __construct(
+        string $name,
+        string $enum,
+        ?string $description = null,
+        ?string $source = null,
+        ?bool $nullable = true,
+        ?bool $immutable = false
+    ) {
+        parent::__construct($name, $description, $source);
+        $this->nullable = $nullable;
+        $this->immutable = $immutable;
         $this->enum = $enum;
     }
 
@@ -33,4 +42,4 @@ public function getType(): Type
 
         return Lodata::getEnumerationType($this->enum);
     }
-}
\ No newline at end of file
+}
diff --git a/src/ComplexType.php b/src/ComplexType.php
index ad3043cad..37d791747 100644
--- a/src/ComplexType.php
+++ b/src/ComplexType.php
@@ -6,6 +6,8 @@
 
 use ArrayAccess;
 use Flat3\Lodata\Annotation\Core\V1\Computed;
+use Flat3\Lodata\Annotation\Core\V1\ComputedDefaultValue;
+use Flat3\Lodata\Annotation\Core\V1\Immutable;
 use Flat3\Lodata\Controller\Transaction;
 use Flat3\Lodata\Exception\Protocol\NotAcceptableException;
 use Flat3\Lodata\Helper\Constants;
@@ -243,9 +245,11 @@ public function getOpenAPISchema(): array
         return [
             'type' => Constants::oapiObject,
             'title' => $this->getName(),
-            'properties' => (object) $this->getDeclaredProperties()->map(function (DeclaredProperty $property) {
-                return $property->getOpenAPISchema();
-            })
+            'properties' => (object) $this->getProperties()
+                ->sliceByClass([DeclaredProperty::class, GeneratedProperty::class])
+                ->map(function (Property $property) {
+                    return $property->getOpenAPISchema();
+                })
         ];
     }
 
@@ -259,7 +263,8 @@ public function getOpenAPICreateSchema(): array
             'type' => Constants::oapiObject,
             'title' => __('lodata:::name (Create schema)', ['name' => $this->getName()]),
             'properties' => (object) $this->getDeclaredProperties()->filter(function (DeclaredProperty $property) {
-                return $property->getAnnotations()->sliceByClass([Computed::class])->isEmpty();
+                return $property->getAnnotations()->sliceByClass([Computed::class])->isEmpty()
+                    || $property->getAnnotations()->sliceByClass([ComputedDefaultValue::class])->hasEntries();
             })->map(function (DeclaredProperty $property) {
                 return $property->getOpenAPISchema();
             })
@@ -276,7 +281,7 @@ public function getOpenAPIUpdateSchema(): array
             'type' => Constants::oapiObject,
             'title' => __('lodata:::name (Update schema)', ['name' => $this->getName()]),
             'properties' => (object) $this->getDeclaredProperties()->filter(function (DeclaredProperty $property) {
-                return $property->getAnnotations()->sliceByClass([Computed::class])->isEmpty();
+                return $property->getAnnotations()->sliceByClass([Computed::class, Immutable::class])->isEmpty();
             })->map(function (DeclaredProperty $property) {
                 return $property->getOpenAPISchema();
             })
@@ -322,7 +327,7 @@ public function assertPropertyValues(PropertyValues $propertyValues): PropertyVa
     public function assertUpdateProperties(PropertyValues $propertyValues): PropertyValues
     {
         return $this->assertPropertyValues($propertyValues)->filter(function (PropertyValue $propertyValue) {
-            return !$propertyValue->getProperty()->isImmutable();
+            return !($propertyValue->getProperty()->isImmutable() || $propertyValue->getProperty()->isComputed());
         });
     }
 
@@ -353,7 +358,7 @@ public function assertCreateProperties(
                 continue;
             }
 
-            if ($declaredProperty->isNullable() || $declaredProperty->isComputed()) {
+            if ($declaredProperty->isNullable() || $declaredProperty->isComputed() || $declaredProperty->isComputedDefault()) {
                 continue;
             }
 
@@ -371,6 +376,8 @@ public function assertCreateProperties(
             $declaredProperty->assertAllowsValue(null);
         }
 
-        return $propertyValues;
+        return $propertyValues->filter(function (PropertyValue $propertyValue) {
+            return !$propertyValue->getProperty()->isComputed();
+        });
     }
 }
diff --git a/src/Controller/Request.php b/src/Controller/Request.php
index 3d84cb263..01b0dedcf 100644
--- a/src/Controller/Request.php
+++ b/src/Controller/Request.php
@@ -63,6 +63,7 @@ public function __construct(IlluminateRequest $request)
     {
         $this->method = $request->getRealMethod();
         $this->headers = $request->headers;
+        $this->cookies = $request->cookies;
         $this->query = $request->query;
         $this->content = $request->content;
         $this->server = $request->server;
diff --git a/src/Controller/Transaction.php b/src/Controller/Transaction.php
index a61c88080..2a46b093c 100644
--- a/src/Controller/Transaction.php
+++ b/src/Controller/Transaction.php
@@ -642,7 +642,7 @@ public function getAcceptedContentTypes(): MediaTypes
     {
         $formatQueryOption = $this->getFormat()->getValue();
 
-        if (Str::startsWith($formatQueryOption, ['json', 'xml'])) {
+        if ($formatQueryOption && Str::startsWith($formatQueryOption, ['json', 'xml'])) {
             if (!in_array($formatQueryOption, ['json', 'xml'])) {
                 throw new BadRequestException(
                     'invalid_short_format',
diff --git a/src/Drivers/CSVEntityType.php b/src/Drivers/CSVEntityType.php
index 15861326d..5c5510d10 100644
--- a/src/Drivers/CSVEntityType.php
+++ b/src/Drivers/CSVEntityType.php
@@ -4,7 +4,7 @@
 
 namespace Flat3\Lodata\Drivers;
 
-use Flat3\Lodata\Annotation\Core\V1\ComputedDefaultValue;
+use Flat3\Lodata\Annotation\Core\V1\Computed;
 use Flat3\Lodata\DeclaredProperty;
 use Flat3\Lodata\EntityType;
 use Flat3\Lodata\Type;
@@ -18,6 +18,6 @@ class CSVEntityType extends EntityType
     public function __construct($identifier)
     {
         parent::__construct($identifier);
-        $this->setKey((new DeclaredProperty('offset', Type::int64()))->addAnnotation(new ComputedDefaultValue));
+        $this->setKey((new DeclaredProperty('offset', Type::int64()))->addAnnotation(new Computed));
     }
-}
\ No newline at end of file
+}
diff --git a/src/Drivers/EloquentEntitySet.php b/src/Drivers/EloquentEntitySet.php
index 122adfb58..4f4dd73b6 100644
--- a/src/Drivers/EloquentEntitySet.php
+++ b/src/Drivers/EloquentEntitySet.php
@@ -7,7 +7,7 @@
 use Doctrine\DBAL\Schema\Column;
 use Exception;
 use Flat3\Lodata\Annotation\Capabilities\V1\DeepInsertSupport;
-use Flat3\Lodata\Annotation\Core\V1\ComputedDefaultValue;
+use Flat3\Lodata\Annotation\Core\V1\Computed;
 use Flat3\Lodata\Annotation\Core\V1\Description;
 use Flat3\Lodata\Attributes\LodataIdentifier;
 use Flat3\Lodata\Attributes\LodataProperty;
@@ -187,14 +187,12 @@ public function read(PropertyValue $key): Entity
      */
     protected function setModelAttributes(Model $model, PropertyValues $propertyValues): Model
     {
-        foreach ($propertyValues->getDeclaredPropertyValues() as $propertyValue) {
-            $model->setAttribute(
-                $this->getPropertySourceName($propertyValue->getProperty()),
-                $propertyValue->getPrimitive()->toMixed()
+        return $propertyValues->getDeclaredPropertyValues()->reduce(function(Model $model, PropertyValue $value) {
+            return $model->setAttribute(
+                $this->getPropertySourceName($value->getProperty()),
+                $value->getPrimitive()->toMixed(),
             );
-        }
-
-        return $model;
+        }, $model);
     }
 
     /**
@@ -229,7 +227,7 @@ public function create(PropertyValues $propertyValues): Entity
             foreach ($navigationProperty->getConstraints() as $constraint) {
                 $referencedProperty = $constraint->getReferencedProperty();
                 $model->setAttribute(
-                    $referencedProperty->getName(),
+                    $this->getPropertySourceName($referencedProperty),
                     $this->navigationSource->getParent()->getEntityId()->getPrimitive()->toMixed()
                 );
             }
@@ -677,7 +675,7 @@ public function columnToDeclaredProperty(Column $column): ?DeclaredProperty
 
         $defaultValue = $model->getAttributeValue($column->getName());
         if ($defaultValue) {
-            $property->addAnnotation(new ComputedDefaultValue);
+            $property->addAnnotation(new Computed);
             $property->setDefaultValue($defaultValue);
         }
 
diff --git a/src/EntityType.php b/src/EntityType.php
index c7abc14b3..565a82657 100644
--- a/src/EntityType.php
+++ b/src/EntityType.php
@@ -5,6 +5,7 @@
 namespace Flat3\Lodata;
 
 use Flat3\Lodata\Annotation\Core\V1\Computed;
+use Flat3\Lodata\Annotation\Core\V1\Immutable;
 use Flat3\Lodata\Controller\Transaction;
 use Flat3\Lodata\Exception\Internal\PathNotHandledException;
 use Flat3\Lodata\Facades\Lodata;
@@ -98,7 +99,8 @@ public function getOpenAPIUpdateSchema(): array
             'type' => Constants::oapiObject,
             'title' => __('lodata:::name (Update schema)', ['name' => $this->getName()]),
             'properties' => (object) $this->getDeclaredProperties()->filter(function (DeclaredProperty $property) {
-                return $property->getAnnotations()->sliceByClass([Computed::class])->isEmpty() && $property !== $this->getKey();
+                return $property->getAnnotations()->sliceByClass([Computed::class, Immutable::class])->isEmpty()
+                    && $property !== $this->getKey();
             })->map(function (DeclaredProperty $property) {
                 return $property->getOpenAPISchema();
             })
diff --git a/src/GeneratedProperty.php b/src/GeneratedProperty.php
index e078d18bf..78cd3c399 100644
--- a/src/GeneratedProperty.php
+++ b/src/GeneratedProperty.php
@@ -13,6 +13,11 @@
  */
 abstract class GeneratedProperty extends Property
 {
+    public function __construct($name, ?Type $type = null)
+    {
+        parent::__construct($name, $type !== null ? $type : Type::untyped());
+    }
+
     /**
      * Generate the property value for this property on the provided entity
      * @param  ComplexValue  $value  Entity this property is generated on
diff --git a/src/Helper/ObjectArray.php b/src/Helper/ObjectArray.php
index 0719d9a57..ac36ded28 100644
--- a/src/Helper/ObjectArray.php
+++ b/src/Helper/ObjectArray.php
@@ -302,6 +302,19 @@ public function map(callable $callback)
         return array_map($callback, $this->array);
     }
 
+    /**
+     * @param  callable(mixed $initial, mixed $value, mixed $key): mixed  $callback
+     * @param $initial
+     * @return mixed|null
+     */
+    public function reduce(callable $callback, $initial = null)
+    {
+        foreach ($this->array as $key => $value) {
+            $initial = $callback($initial, $value, $key);
+        }
+        return $initial;
+    }
+
     /**
      * Sort the objects in the array
      * @param  callable  $callback
diff --git a/src/Primitive.php b/src/Primitive.php
index 51cab017a..fa03e9c84 100644
--- a/src/Primitive.php
+++ b/src/Primitive.php
@@ -57,6 +57,11 @@ public function __construct($value = null)
      * @return Primitive
      */
     abstract public function set($value);
+    
+    public function allows($value): bool
+    {
+        return true;
+    }
 
     /**
      * Get the internal representation of the value
diff --git a/src/PrimitiveType.php b/src/PrimitiveType.php
index 1726df817..ad026ee8c 100644
--- a/src/PrimitiveType.php
+++ b/src/PrimitiveType.php
@@ -99,4 +99,9 @@ public function getOpenAPISchema(): array
     {
         return $this->instance()->getOpenAPISchema();
     }
-}
\ No newline at end of file
+
+    public function allowsValue($value): bool
+    {
+        return $this->instance()->allows($value);
+    }
+}
diff --git a/src/Property.php b/src/Property.php
index c99d506b1..46ebe3a04 100644
--- a/src/Property.php
+++ b/src/Property.php
@@ -370,7 +370,11 @@ public function isSearchable(): bool
      */
     public function assertAllowsValue($value)
     {
-        if (!$this->isNullable() && $value === null) {
+        if ($value === null) {
+            if ($this->isNullable()) {
+                return;
+            }
+
             throw new BadRequestException(
                 'property_not_nullable',
                 sprintf("The property '%s' cannot be set to null", $this->getName())
@@ -383,6 +387,13 @@ public function assertAllowsValue($value)
                 sprintf("The value property '%s' exceeds the maximum length", $this->getName())
             );
         }
+
+        if (!$this->type->allowsValue($value)) {
+            throw new BadRequestException(
+                'property_value_invalid',
+                sprintf("The value property '%s' is not valid", $this->getName()),
+            );
+        }
     }
 
     /**
@@ -409,8 +420,16 @@ public function getOpenAPISchema(): array
     public function isComputed(): bool
     {
         return $this instanceof ComputedProperty ||
-            $this->hasAnnotation(new Computed, Boolean::true()) ||
-            $this->hasAnnotation(new ComputedDefaultValue, Boolean::true());
+            $this->hasAnnotation(new Computed, Boolean::true());
+    }
+
+    /**
+     * Determine whether this property is computed on create operations
+     * @return bool
+     */
+    public function isComputedDefault(): bool
+    {
+        return $this->hasAnnotation(new ComputedDefaultValue, Boolean::true());
     }
 
     /**
diff --git a/src/Type.php b/src/Type.php
index 3f57a4f26..9bfb1c88e 100644
--- a/src/Type.php
+++ b/src/Type.php
@@ -229,4 +229,9 @@ public function is(string $class): bool
     {
         return is_a($this->factory, $class, true);
     }
+
+    public function allowsValue($value): bool
+    {
+        return true;
+    }
 }
diff --git a/src/Type/Guid.php b/src/Type/Guid.php
index 1590e55c6..e4677254c 100644
--- a/src/Type/Guid.php
+++ b/src/Type/Guid.php
@@ -81,4 +81,9 @@ public function getOpenAPISchema(?Property $property = null): array
             'pattern' => '^'.Lexer::guid.'$',
         ]);
     }
+
+    public function allows($value): bool
+    {
+        return Lexer::patternCheck(Lexer::guid, (string) $value);
+    }
 }
diff --git a/tests/Drivers/WithNumericCollectionDriver.php b/tests/Drivers/WithNumericCollectionDriver.php
index 92635fbc3..490c1bb0c 100644
--- a/tests/Drivers/WithNumericCollectionDriver.php
+++ b/tests/Drivers/WithNumericCollectionDriver.php
@@ -4,7 +4,7 @@
 
 namespace Flat3\Lodata\Tests\Drivers;
 
-use Flat3\Lodata\Annotation\Core\V1\ComputedDefaultValue;
+use Flat3\Lodata\Annotation\Core\V1\Computed;
 use Flat3\Lodata\DeclaredProperty;
 use Flat3\Lodata\Drivers\CollectionEntitySet;
 use Flat3\Lodata\EntityType;
@@ -22,7 +22,7 @@ protected function setUpDriver(): void
 
         $entityType = new EntityType('passenger');
         $entityType->setOpen();
-        $entityType->setKey((new DeclaredProperty('id', Type::int64()))->addAnnotation(new ComputedDefaultValue));
+        $entityType->setKey((new DeclaredProperty('id', Type::int64()))->addAnnotation(new Computed));
         $this->addPassengerProperties($entityType);
         $entityType->getDeclaredProperty('name')->setSearchable();
         $entitySet = new CollectionEntitySet($this->entitySet, $entityType);
@@ -42,4 +42,4 @@ protected function captureDriverState(): array
     {
         return array_values(Lodata::getEntitySet($this->entitySet)->getCollection()->toArray());
     }
-}
\ No newline at end of file
+}
diff --git a/tests/__snapshots__/Entity/CSVTest__test_generated_property__1.xml b/tests/__snapshots__/Entity/CSVTest__test_generated_property__1.xml
index 222ca9c63..0f4f9b8b8 100644
--- a/tests/__snapshots__/Entity/CSVTest__test_generated_property__1.xml
+++ b/tests/__snapshots__/Entity/CSVTest__test_generated_property__1.xml
@@ -83,7 +83,7 @@
           <PropertyRef Name="offset"/>
         </Key>
         <Property Name="offset" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Entity/CSVTest__test_generated_property__3.json b/tests/__snapshots__/Entity/CSVTest__test_generated_property__3.json
index 048ed1c2d..cf7c45cd2 100644
--- a/tests/__snapshots__/Entity/CSVTest__test_generated_property__3.json
+++ b/tests/__snapshots__/Entity/CSVTest__test_generated_property__3.json
@@ -120,7 +120,7 @@
         "offset": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Entity/CSVTest__test_generated_property__4.json b/tests/__snapshots__/Entity/CSVTest__test_generated_property__4.json
index d004ad951..e29f24f08 100644
--- a/tests/__snapshots__/Entity/CSVTest__test_generated_property__4.json
+++ b/tests/__snapshots__/Entity/CSVTest__test_generated_property__4.json
@@ -425,6 +425,13 @@
                             "type": "string",
                             "nullable": true
                         }
+                    },
+                    "cp": {
+                        "type": "integer",
+                        "format": "int32",
+                        "minimum": -2147483648,
+                        "maximum": 2147483647,
+                        "nullable": true
                     }
                 }
             },
diff --git a/tests/__snapshots__/Entity/EloquentTest__test_generated_property__4.json b/tests/__snapshots__/Entity/EloquentTest__test_generated_property__4.json
index 0ad165567..5ce69a246 100644
--- a/tests/__snapshots__/Entity/EloquentTest__test_generated_property__4.json
+++ b/tests/__snapshots__/Entity/EloquentTest__test_generated_property__4.json
@@ -3972,6 +3972,13 @@
                             "type": "string",
                             "nullable": true
                         }
+                    },
+                    "cp": {
+                        "type": "integer",
+                        "format": "int32",
+                        "minimum": -2147483648,
+                        "maximum": 2147483647,
+                        "nullable": true
                     }
                 }
             },
diff --git a/tests/__snapshots__/Entity/FilesystemTest__test_generated_property__4.json b/tests/__snapshots__/Entity/FilesystemTest__test_generated_property__4.json
index 807975b91..c30dbe442 100644
--- a/tests/__snapshots__/Entity/FilesystemTest__test_generated_property__4.json
+++ b/tests/__snapshots__/Entity/FilesystemTest__test_generated_property__4.json
@@ -383,6 +383,13 @@
                         "type": "string",
                         "format": "base64url",
                         "nullable": true
+                    },
+                    "cp": {
+                        "type": "integer",
+                        "format": "int32",
+                        "minimum": -2147483648,
+                        "maximum": 2147483647,
+                        "nullable": true
                     }
                 }
             },
@@ -394,6 +401,12 @@
                         "type": "string",
                         "nullable": false
                     },
+                    "timestamp": {
+                        "type": "string",
+                        "format": "date-time",
+                        "pattern": "^[0-9]{4,}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]([.][0-9]{1,12})?(Z|[+-][0-9][0-9]:[0-9][0-9])$",
+                        "nullable": false
+                    },
                     "content": {
                         "type": "string",
                         "format": "base64url",
diff --git a/tests/__snapshots__/Entity/KeyedCollectionTest__test_generated_property__4.json b/tests/__snapshots__/Entity/KeyedCollectionTest__test_generated_property__4.json
index 41ce53ea7..2e96cb387 100644
--- a/tests/__snapshots__/Entity/KeyedCollectionTest__test_generated_property__4.json
+++ b/tests/__snapshots__/Entity/KeyedCollectionTest__test_generated_property__4.json
@@ -509,6 +509,13 @@
                             "type": "string",
                             "nullable": true
                         }
+                    },
+                    "cp": {
+                        "type": "integer",
+                        "format": "int32",
+                        "minimum": -2147483648,
+                        "maximum": 2147483647,
+                        "nullable": true
                     }
                 }
             },
diff --git a/tests/__snapshots__/Entity/MongoTest__test_generated_property__4.json b/tests/__snapshots__/Entity/MongoTest__test_generated_property__4.json
index 141ec99de..d1f3890b7 100644
--- a/tests/__snapshots__/Entity/MongoTest__test_generated_property__4.json
+++ b/tests/__snapshots__/Entity/MongoTest__test_generated_property__4.json
@@ -506,6 +506,13 @@
                             "type": "string",
                             "nullable": true
                         }
+                    },
+                    "cp": {
+                        "type": "integer",
+                        "format": "int32",
+                        "minimum": -2147483648,
+                        "maximum": 2147483647,
+                        "nullable": true
                     }
                 }
             },
diff --git a/tests/__snapshots__/Entity/NumericCollectionTest__test_generated_property__1.xml b/tests/__snapshots__/Entity/NumericCollectionTest__test_generated_property__1.xml
index 35f7c0590..7f018c83a 100644
--- a/tests/__snapshots__/Entity/NumericCollectionTest__test_generated_property__1.xml
+++ b/tests/__snapshots__/Entity/NumericCollectionTest__test_generated_property__1.xml
@@ -84,7 +84,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Entity/NumericCollectionTest__test_generated_property__3.json b/tests/__snapshots__/Entity/NumericCollectionTest__test_generated_property__3.json
index 4f62d8b2d..8f06f56d0 100644
--- a/tests/__snapshots__/Entity/NumericCollectionTest__test_generated_property__3.json
+++ b/tests/__snapshots__/Entity/NumericCollectionTest__test_generated_property__3.json
@@ -122,7 +122,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Entity/NumericCollectionTest__test_generated_property__4.json b/tests/__snapshots__/Entity/NumericCollectionTest__test_generated_property__4.json
index 671759d54..e399ad04e 100644
--- a/tests/__snapshots__/Entity/NumericCollectionTest__test_generated_property__4.json
+++ b/tests/__snapshots__/Entity/NumericCollectionTest__test_generated_property__4.json
@@ -515,6 +515,13 @@
                             "type": "string",
                             "nullable": true
                         }
+                    },
+                    "cp": {
+                        "type": "integer",
+                        "format": "int32",
+                        "minimum": -2147483648,
+                        "maximum": 2147483647,
+                        "nullable": true
                     }
                 }
             },
diff --git a/tests/__snapshots__/Entity/RedisTest__test_generated_property__4.json b/tests/__snapshots__/Entity/RedisTest__test_generated_property__4.json
index 9c4d7d3e9..ee1ae33f1 100644
--- a/tests/__snapshots__/Entity/RedisTest__test_generated_property__4.json
+++ b/tests/__snapshots__/Entity/RedisTest__test_generated_property__4.json
@@ -466,6 +466,13 @@
                             "type": "string",
                             "nullable": true
                         }
+                    },
+                    "cp": {
+                        "type": "integer",
+                        "format": "int32",
+                        "minimum": -2147483648,
+                        "maximum": 2147483647,
+                        "nullable": true
                     }
                 }
             },
diff --git a/tests/__snapshots__/Entity/SQLTest__test_generated_property__4.json b/tests/__snapshots__/Entity/SQLTest__test_generated_property__4.json
index e5a12451e..5776b089b 100644
--- a/tests/__snapshots__/Entity/SQLTest__test_generated_property__4.json
+++ b/tests/__snapshots__/Entity/SQLTest__test_generated_property__4.json
@@ -2948,6 +2948,13 @@
                             "type": "string",
                             "nullable": true
                         }
+                    },
+                    "cp": {
+                        "type": "integer",
+                        "format": "int32",
+                        "minimum": -2147483648,
+                        "maximum": 2147483647,
+                        "nullable": true
                     }
                 }
             },
diff --git a/tests/__snapshots__/EntitySet/CSVTest__test_metadata__1.xml b/tests/__snapshots__/EntitySet/CSVTest__test_metadata__1.xml
index 22e15fd7f..8dc39591c 100644
--- a/tests/__snapshots__/EntitySet/CSVTest__test_metadata__1.xml
+++ b/tests/__snapshots__/EntitySet/CSVTest__test_metadata__1.xml
@@ -83,7 +83,7 @@
           <PropertyRef Name="offset"/>
         </Key>
         <Property Name="offset" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/EntitySet/CSVTest__test_metadata__3.json b/tests/__snapshots__/EntitySet/CSVTest__test_metadata__3.json
index adf09a208..5c775b137 100644
--- a/tests/__snapshots__/EntitySet/CSVTest__test_metadata__3.json
+++ b/tests/__snapshots__/EntitySet/CSVTest__test_metadata__3.json
@@ -120,7 +120,7 @@
         "offset": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/EntitySet/FilesystemTest__test_metadata__4.json b/tests/__snapshots__/EntitySet/FilesystemTest__test_metadata__4.json
index 721283aaf..67ac6fc46 100644
--- a/tests/__snapshots__/EntitySet/FilesystemTest__test_metadata__4.json
+++ b/tests/__snapshots__/EntitySet/FilesystemTest__test_metadata__4.json
@@ -392,6 +392,12 @@
                         "type": "string",
                         "nullable": false
                     },
+                    "timestamp": {
+                        "type": "string",
+                        "format": "date-time",
+                        "pattern": "^[0-9]{4,}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]([.][0-9]{1,12})?(Z|[+-][0-9][0-9]:[0-9][0-9])$",
+                        "nullable": false
+                    },
                     "content": {
                         "type": "string",
                         "format": "base64url",
diff --git a/tests/__snapshots__/EntitySet/NumericCollectionTest__test_metadata__1.xml b/tests/__snapshots__/EntitySet/NumericCollectionTest__test_metadata__1.xml
index 689ef0bf3..d641aff74 100644
--- a/tests/__snapshots__/EntitySet/NumericCollectionTest__test_metadata__1.xml
+++ b/tests/__snapshots__/EntitySet/NumericCollectionTest__test_metadata__1.xml
@@ -84,7 +84,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/EntitySet/NumericCollectionTest__test_metadata__3.json b/tests/__snapshots__/EntitySet/NumericCollectionTest__test_metadata__3.json
index 040ca53b3..cf3a7f2a1 100644
--- a/tests/__snapshots__/EntitySet/NumericCollectionTest__test_metadata__3.json
+++ b/tests/__snapshots__/EntitySet/NumericCollectionTest__test_metadata__3.json
@@ -122,7 +122,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/ActionTest__test_array_argument__1.xml b/tests/__snapshots__/Operation/ActionTest__test_array_argument__1.xml
index 89d35c70e..a2429d12e 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_array_argument__1.xml
+++ b/tests/__snapshots__/Operation/ActionTest__test_array_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/ActionTest__test_array_argument__3.json b/tests/__snapshots__/Operation/ActionTest__test_array_argument__3.json
index addc9b610..33a0a8736 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_array_argument__3.json
+++ b/tests/__snapshots__/Operation/ActionTest__test_array_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/ActionTest__test_date_argument__1.xml b/tests/__snapshots__/Operation/ActionTest__test_date_argument__1.xml
index 0b87f6884..b722e7ae8 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_date_argument__1.xml
+++ b/tests/__snapshots__/Operation/ActionTest__test_date_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/ActionTest__test_date_argument__3.json b/tests/__snapshots__/Operation/ActionTest__test_date_argument__3.json
index 6a658c830..4d63aaaeb 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_date_argument__3.json
+++ b/tests/__snapshots__/Operation/ActionTest__test_date_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/ActionTest__test_null_typed_callback__1.xml b/tests/__snapshots__/Operation/ActionTest__test_null_typed_callback__1.xml
index a64990eff..d06a1d873 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_null_typed_callback__1.xml
+++ b/tests/__snapshots__/Operation/ActionTest__test_null_typed_callback__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/ActionTest__test_null_typed_callback__3.json b/tests/__snapshots__/Operation/ActionTest__test_null_typed_callback__3.json
index a03d4b8fb..b18816074 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_null_typed_callback__3.json
+++ b/tests/__snapshots__/Operation/ActionTest__test_null_typed_callback__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_binary_argument__1.xml b/tests/__snapshots__/Operation/ActionTest__test_odata_binary_argument__1.xml
index cd72dc555..d205ebfaa 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_binary_argument__1.xml
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_binary_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_binary_argument__3.json b/tests/__snapshots__/Operation/ActionTest__test_odata_binary_argument__3.json
index 8a0fd935a..bcf0bd4a3 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_binary_argument__3.json
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_binary_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_boolean_argument__1.xml b/tests/__snapshots__/Operation/ActionTest__test_odata_boolean_argument__1.xml
index ae41f86c0..d2b8feab2 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_boolean_argument__1.xml
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_boolean_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_boolean_argument__3.json b/tests/__snapshots__/Operation/ActionTest__test_odata_boolean_argument__3.json
index f5a1f1d7a..9d0c0b090 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_boolean_argument__3.json
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_boolean_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_byte_argument__1.xml b/tests/__snapshots__/Operation/ActionTest__test_odata_byte_argument__1.xml
index b77922f0b..d732d520f 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_byte_argument__1.xml
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_byte_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_byte_argument__3.json b/tests/__snapshots__/Operation/ActionTest__test_odata_byte_argument__3.json
index 61ee16c9a..9c50b09b9 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_byte_argument__3.json
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_byte_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_collection_argument__1.xml b/tests/__snapshots__/Operation/ActionTest__test_odata_collection_argument__1.xml
index de531dc77..388a882de 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_collection_argument__1.xml
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_collection_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_collection_argument__3.json b/tests/__snapshots__/Operation/ActionTest__test_odata_collection_argument__3.json
index 2a4531aab..5eb8bcf1f 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_collection_argument__3.json
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_collection_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_date_argument__1.xml b/tests/__snapshots__/Operation/ActionTest__test_odata_date_argument__1.xml
index 1adf16775..92c749e44 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_date_argument__1.xml
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_date_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_date_argument__3.json b/tests/__snapshots__/Operation/ActionTest__test_odata_date_argument__3.json
index 382668db7..88c8af9fb 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_date_argument__3.json
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_date_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_datetimeoffset_argument__1.xml b/tests/__snapshots__/Operation/ActionTest__test_odata_datetimeoffset_argument__1.xml
index d7ddc2ee5..0dd49ebd4 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_datetimeoffset_argument__1.xml
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_datetimeoffset_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_datetimeoffset_argument__3.json b/tests/__snapshots__/Operation/ActionTest__test_odata_datetimeoffset_argument__3.json
index bffe40653..52a2bf403 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_datetimeoffset_argument__3.json
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_datetimeoffset_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_decimal_argument__1.xml b/tests/__snapshots__/Operation/ActionTest__test_odata_decimal_argument__1.xml
index fe88e9351..d08759230 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_decimal_argument__1.xml
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_decimal_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_decimal_argument__3.json b/tests/__snapshots__/Operation/ActionTest__test_odata_decimal_argument__3.json
index 97700d1e9..262924714 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_decimal_argument__3.json
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_decimal_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_double_argument__1.xml b/tests/__snapshots__/Operation/ActionTest__test_odata_double_argument__1.xml
index 570bb6062..a225ef673 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_double_argument__1.xml
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_double_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_double_argument__3.json b/tests/__snapshots__/Operation/ActionTest__test_odata_double_argument__3.json
index dce3de894..f84ff78fe 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_double_argument__3.json
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_double_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_duration_argument__1.xml b/tests/__snapshots__/Operation/ActionTest__test_odata_duration_argument__1.xml
index e8dfd8e6d..6899e0267 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_duration_argument__1.xml
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_duration_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_duration_argument__3.json b/tests/__snapshots__/Operation/ActionTest__test_odata_duration_argument__3.json
index aa50cbabb..bd3e370bb 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_duration_argument__3.json
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_duration_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_guid_argument__1.xml b/tests/__snapshots__/Operation/ActionTest__test_odata_guid_argument__1.xml
index d0f9a2aee..1f791b27d 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_guid_argument__1.xml
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_guid_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_guid_argument__3.json b/tests/__snapshots__/Operation/ActionTest__test_odata_guid_argument__3.json
index 2ee7fa350..5df8c6105 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_guid_argument__3.json
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_guid_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_int16_argument__1.xml b/tests/__snapshots__/Operation/ActionTest__test_odata_int16_argument__1.xml
index da77e6760..49c4e913d 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_int16_argument__1.xml
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_int16_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_int16_argument__3.json b/tests/__snapshots__/Operation/ActionTest__test_odata_int16_argument__3.json
index 6c73abb1f..4cb3067d4 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_int16_argument__3.json
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_int16_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_int32_argument__1.xml b/tests/__snapshots__/Operation/ActionTest__test_odata_int32_argument__1.xml
index a36896b72..24ea334b3 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_int32_argument__1.xml
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_int32_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_int32_argument__3.json b/tests/__snapshots__/Operation/ActionTest__test_odata_int32_argument__3.json
index 52f0926af..9086b436a 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_int32_argument__3.json
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_int32_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_int64_argument__1.xml b/tests/__snapshots__/Operation/ActionTest__test_odata_int64_argument__1.xml
index 678ddbf1a..27355ee58 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_int64_argument__1.xml
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_int64_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_int64_argument__3.json b/tests/__snapshots__/Operation/ActionTest__test_odata_int64_argument__3.json
index 503efaab1..7aab185fe 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_int64_argument__3.json
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_int64_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_sbyte_argument__1.xml b/tests/__snapshots__/Operation/ActionTest__test_odata_sbyte_argument__1.xml
index 462319f0c..f32bdeb6c 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_sbyte_argument__1.xml
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_sbyte_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_sbyte_argument__3.json b/tests/__snapshots__/Operation/ActionTest__test_odata_sbyte_argument__3.json
index edb93a55a..e267f9cbb 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_sbyte_argument__3.json
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_sbyte_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_single_argument__1.xml b/tests/__snapshots__/Operation/ActionTest__test_odata_single_argument__1.xml
index 5fc4cc59e..da72f0711 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_single_argument__1.xml
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_single_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_single_argument__3.json b/tests/__snapshots__/Operation/ActionTest__test_odata_single_argument__3.json
index e3c8cf197..3e039bb5b 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_single_argument__3.json
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_single_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_string_argument__1.xml b/tests/__snapshots__/Operation/ActionTest__test_odata_string_argument__1.xml
index ff775585a..1f3621934 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_string_argument__1.xml
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_string_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_string_argument__3.json b/tests/__snapshots__/Operation/ActionTest__test_odata_string_argument__3.json
index 4942b7959..a8370d1b4 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_string_argument__3.json
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_string_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_timeofday_argument__1.xml b/tests/__snapshots__/Operation/ActionTest__test_odata_timeofday_argument__1.xml
index 286c1d4b3..7b2a70d5a 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_timeofday_argument__1.xml
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_timeofday_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_timeofday_argument__3.json b/tests/__snapshots__/Operation/ActionTest__test_odata_timeofday_argument__3.json
index 1eb770049..359e94b7a 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_timeofday_argument__3.json
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_timeofday_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_uint16_argument__1.xml b/tests/__snapshots__/Operation/ActionTest__test_odata_uint16_argument__1.xml
index 082d81325..f71b69345 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_uint16_argument__1.xml
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_uint16_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_uint16_argument__3.json b/tests/__snapshots__/Operation/ActionTest__test_odata_uint16_argument__3.json
index 7d7020781..bb4b4237d 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_uint16_argument__3.json
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_uint16_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_uint32_argument__1.xml b/tests/__snapshots__/Operation/ActionTest__test_odata_uint32_argument__1.xml
index d77352b24..aed770600 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_uint32_argument__1.xml
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_uint32_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_uint32_argument__3.json b/tests/__snapshots__/Operation/ActionTest__test_odata_uint32_argument__3.json
index a3b398298..7facabc30 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_uint32_argument__3.json
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_uint32_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_uint64_argument__1.xml b/tests/__snapshots__/Operation/ActionTest__test_odata_uint64_argument__1.xml
index 0ed19c6b6..1f38b7484 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_uint64_argument__1.xml
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_uint64_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/ActionTest__test_odata_uint64_argument__3.json b/tests/__snapshots__/Operation/ActionTest__test_odata_uint64_argument__3.json
index a6058f1c9..0e3340b16 100644
--- a/tests/__snapshots__/Operation/ActionTest__test_odata_uint64_argument__3.json
+++ b/tests/__snapshots__/Operation/ActionTest__test_odata_uint64_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_array_argument__1.xml b/tests/__snapshots__/Operation/FunctionTest__test_array_argument__1.xml
index afa3185e6..c1e6cd198 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_array_argument__1.xml
+++ b/tests/__snapshots__/Operation/FunctionTest__test_array_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_array_argument__3.json b/tests/__snapshots__/Operation/FunctionTest__test_array_argument__3.json
index 4bb9a55a3..7abd36f13 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_array_argument__3.json
+++ b/tests/__snapshots__/Operation/FunctionTest__test_array_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_boolean_argument__1.xml b/tests/__snapshots__/Operation/FunctionTest__test_boolean_argument__1.xml
index 803492fa2..de0a4f414 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_boolean_argument__1.xml
+++ b/tests/__snapshots__/Operation/FunctionTest__test_boolean_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_boolean_argument__3.json b/tests/__snapshots__/Operation/FunctionTest__test_boolean_argument__3.json
index 97b543e8c..5d5311ab1 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_boolean_argument__3.json
+++ b/tests/__snapshots__/Operation/FunctionTest__test_boolean_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_boolean_callback__1.xml b/tests/__snapshots__/Operation/FunctionTest__test_boolean_callback__1.xml
index 180399d4e..d58b0b5fb 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_boolean_callback__1.xml
+++ b/tests/__snapshots__/Operation/FunctionTest__test_boolean_callback__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_boolean_callback__3.json b/tests/__snapshots__/Operation/FunctionTest__test_boolean_callback__3.json
index fe9779168..ba52c6623 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_boolean_callback__3.json
+++ b/tests/__snapshots__/Operation/FunctionTest__test_boolean_callback__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_float_argument__1.xml b/tests/__snapshots__/Operation/FunctionTest__test_float_argument__1.xml
index 21d92d345..db1954d1b 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_float_argument__1.xml
+++ b/tests/__snapshots__/Operation/FunctionTest__test_float_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_float_argument__3.json b/tests/__snapshots__/Operation/FunctionTest__test_float_argument__3.json
index 29740483d..ddd6a834a 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_float_argument__3.json
+++ b/tests/__snapshots__/Operation/FunctionTest__test_float_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_float_callback__1.xml b/tests/__snapshots__/Operation/FunctionTest__test_float_callback__1.xml
index b85fb568c..cc3b8a42d 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_float_callback__1.xml
+++ b/tests/__snapshots__/Operation/FunctionTest__test_float_callback__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_float_callback__3.json b/tests/__snapshots__/Operation/FunctionTest__test_float_callback__3.json
index 2d25af8f5..e4c4a5733 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_float_callback__3.json
+++ b/tests/__snapshots__/Operation/FunctionTest__test_float_callback__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_int_argument__1.xml b/tests/__snapshots__/Operation/FunctionTest__test_int_argument__1.xml
index e907a16eb..920ce6544 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_int_argument__1.xml
+++ b/tests/__snapshots__/Operation/FunctionTest__test_int_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_int_argument__3.json b/tests/__snapshots__/Operation/FunctionTest__test_int_argument__3.json
index f2bf524ab..8079d5ba1 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_int_argument__3.json
+++ b/tests/__snapshots__/Operation/FunctionTest__test_int_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_int_callback__1.xml b/tests/__snapshots__/Operation/FunctionTest__test_int_callback__1.xml
index 956545d79..0bf90955f 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_int_callback__1.xml
+++ b/tests/__snapshots__/Operation/FunctionTest__test_int_callback__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_int_callback__3.json b/tests/__snapshots__/Operation/FunctionTest__test_int_callback__3.json
index bdd718061..5cae7c54a 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_int_callback__3.json
+++ b/tests/__snapshots__/Operation/FunctionTest__test_int_callback__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_null_argument__1.xml b/tests/__snapshots__/Operation/FunctionTest__test_null_argument__1.xml
index f11f2cefa..5272b5bea 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_null_argument__1.xml
+++ b/tests/__snapshots__/Operation/FunctionTest__test_null_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_null_argument__3.json b/tests/__snapshots__/Operation/FunctionTest__test_null_argument__3.json
index 7d3457b8f..90c230923 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_null_argument__3.json
+++ b/tests/__snapshots__/Operation/FunctionTest__test_null_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_binary_argument__1.xml b/tests/__snapshots__/Operation/FunctionTest__test_odata_binary_argument__1.xml
index b168b7a37..7960daa4a 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_binary_argument__1.xml
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_binary_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_binary_argument__3.json b/tests/__snapshots__/Operation/FunctionTest__test_odata_binary_argument__3.json
index 935089762..1271dd089 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_binary_argument__3.json
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_binary_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_boolean_argument__1.xml b/tests/__snapshots__/Operation/FunctionTest__test_odata_boolean_argument__1.xml
index afcd24fdb..9ac808a91 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_boolean_argument__1.xml
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_boolean_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_boolean_argument__3.json b/tests/__snapshots__/Operation/FunctionTest__test_odata_boolean_argument__3.json
index 3dfeafdd7..db84c16e8 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_boolean_argument__3.json
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_boolean_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_byte_argument__1.xml b/tests/__snapshots__/Operation/FunctionTest__test_odata_byte_argument__1.xml
index bf313bb30..d02da8cea 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_byte_argument__1.xml
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_byte_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_byte_argument__3.json b/tests/__snapshots__/Operation/FunctionTest__test_odata_byte_argument__3.json
index cff30b8cd..4c233d001 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_byte_argument__3.json
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_byte_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_collection_argument__1.xml b/tests/__snapshots__/Operation/FunctionTest__test_odata_collection_argument__1.xml
index 0b6e4dcbc..5f1b926f0 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_collection_argument__1.xml
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_collection_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_collection_argument__3.json b/tests/__snapshots__/Operation/FunctionTest__test_odata_collection_argument__3.json
index 53320e894..25e2b98b2 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_collection_argument__3.json
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_collection_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_collection_argument_with_type__1.xml b/tests/__snapshots__/Operation/FunctionTest__test_odata_collection_argument_with_type__1.xml
index 4c82ede17..b2dc55ac1 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_collection_argument_with_type__1.xml
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_collection_argument_with_type__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_collection_argument_with_type__3.json b/tests/__snapshots__/Operation/FunctionTest__test_odata_collection_argument_with_type__3.json
index bccf084c2..1893f5471 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_collection_argument_with_type__3.json
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_collection_argument_with_type__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_date_argument__1.xml b/tests/__snapshots__/Operation/FunctionTest__test_odata_date_argument__1.xml
index b81ae2b0e..8ff444cfe 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_date_argument__1.xml
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_date_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_date_argument__3.json b/tests/__snapshots__/Operation/FunctionTest__test_odata_date_argument__3.json
index 598b2ab08..5b48298bb 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_date_argument__3.json
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_date_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_datetimeoffset_argument__1.xml b/tests/__snapshots__/Operation/FunctionTest__test_odata_datetimeoffset_argument__1.xml
index bf3573d0b..78bfa0198 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_datetimeoffset_argument__1.xml
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_datetimeoffset_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_datetimeoffset_argument__3.json b/tests/__snapshots__/Operation/FunctionTest__test_odata_datetimeoffset_argument__3.json
index 475079ee6..bf39a717b 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_datetimeoffset_argument__3.json
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_datetimeoffset_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_decimal_argument__1.xml b/tests/__snapshots__/Operation/FunctionTest__test_odata_decimal_argument__1.xml
index 4c6eb2ebe..250c08e60 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_decimal_argument__1.xml
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_decimal_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_decimal_argument__3.json b/tests/__snapshots__/Operation/FunctionTest__test_odata_decimal_argument__3.json
index 8a9902824..ae98c4db9 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_decimal_argument__3.json
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_decimal_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_double_argument__1.xml b/tests/__snapshots__/Operation/FunctionTest__test_odata_double_argument__1.xml
index e759623f6..850112aad 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_double_argument__1.xml
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_double_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_double_argument__3.json b/tests/__snapshots__/Operation/FunctionTest__test_odata_double_argument__3.json
index 4a6504bc1..36a79d358 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_double_argument__3.json
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_double_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_duration_argument__1.xml b/tests/__snapshots__/Operation/FunctionTest__test_odata_duration_argument__1.xml
index 580906086..d60207bb3 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_duration_argument__1.xml
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_duration_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_duration_argument__3.json b/tests/__snapshots__/Operation/FunctionTest__test_odata_duration_argument__3.json
index b962a542d..e6a7ca9be 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_duration_argument__3.json
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_duration_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_guid_argument__1.xml b/tests/__snapshots__/Operation/FunctionTest__test_odata_guid_argument__1.xml
index f17530049..81fb97fb9 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_guid_argument__1.xml
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_guid_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_guid_argument__3.json b/tests/__snapshots__/Operation/FunctionTest__test_odata_guid_argument__3.json
index fbc1484bd..143fe7446 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_guid_argument__3.json
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_guid_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_int16_argument__1.xml b/tests/__snapshots__/Operation/FunctionTest__test_odata_int16_argument__1.xml
index b609e2f76..b9649588e 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_int16_argument__1.xml
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_int16_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_int16_argument__3.json b/tests/__snapshots__/Operation/FunctionTest__test_odata_int16_argument__3.json
index 214fe2d5b..22e282e52 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_int16_argument__3.json
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_int16_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_int32_argument__1.xml b/tests/__snapshots__/Operation/FunctionTest__test_odata_int32_argument__1.xml
index 43117489a..ea7fd4f9f 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_int32_argument__1.xml
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_int32_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_int32_argument__3.json b/tests/__snapshots__/Operation/FunctionTest__test_odata_int32_argument__3.json
index a2c1202f4..5ea5429ad 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_int32_argument__3.json
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_int32_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_int64_argument__1.xml b/tests/__snapshots__/Operation/FunctionTest__test_odata_int64_argument__1.xml
index cc90890e3..f71de80a9 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_int64_argument__1.xml
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_int64_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_int64_argument__3.json b/tests/__snapshots__/Operation/FunctionTest__test_odata_int64_argument__3.json
index a49b34b96..9c38fe07a 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_int64_argument__3.json
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_int64_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_sbyte_argument__1.xml b/tests/__snapshots__/Operation/FunctionTest__test_odata_sbyte_argument__1.xml
index fe2c70a68..a0e989645 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_sbyte_argument__1.xml
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_sbyte_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_sbyte_argument__3.json b/tests/__snapshots__/Operation/FunctionTest__test_odata_sbyte_argument__3.json
index 3ce59644c..c699eae34 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_sbyte_argument__3.json
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_sbyte_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_single_argument__1.xml b/tests/__snapshots__/Operation/FunctionTest__test_odata_single_argument__1.xml
index 43cd3be26..3feab4ec8 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_single_argument__1.xml
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_single_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_single_argument__3.json b/tests/__snapshots__/Operation/FunctionTest__test_odata_single_argument__3.json
index c4ff34d5f..b262cdf7a 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_single_argument__3.json
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_single_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_string_argument__1.xml b/tests/__snapshots__/Operation/FunctionTest__test_odata_string_argument__1.xml
index 1eb6c0c8f..94bd5dfba 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_string_argument__1.xml
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_string_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_string_argument__3.json b/tests/__snapshots__/Operation/FunctionTest__test_odata_string_argument__3.json
index dfb6b9a08..586dac24b 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_string_argument__3.json
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_string_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_timeofday_argument__1.xml b/tests/__snapshots__/Operation/FunctionTest__test_odata_timeofday_argument__1.xml
index cf9e6cf41..c3eac2fc1 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_timeofday_argument__1.xml
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_timeofday_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_timeofday_argument__3.json b/tests/__snapshots__/Operation/FunctionTest__test_odata_timeofday_argument__3.json
index 06b690f16..6a308a76a 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_timeofday_argument__3.json
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_timeofday_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_uint16_argument__1.xml b/tests/__snapshots__/Operation/FunctionTest__test_odata_uint16_argument__1.xml
index 2f6c24993..0867a6b90 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_uint16_argument__1.xml
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_uint16_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_uint16_argument__3.json b/tests/__snapshots__/Operation/FunctionTest__test_odata_uint16_argument__3.json
index d67c0d8b0..ebed7a20e 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_uint16_argument__3.json
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_uint16_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_uint32_argument__1.xml b/tests/__snapshots__/Operation/FunctionTest__test_odata_uint32_argument__1.xml
index 2cc980d14..792e355ce 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_uint32_argument__1.xml
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_uint32_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_uint32_argument__3.json b/tests/__snapshots__/Operation/FunctionTest__test_odata_uint32_argument__3.json
index d6372ed30..3dd55b460 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_uint32_argument__3.json
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_uint32_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_uint64_argument__1.xml b/tests/__snapshots__/Operation/FunctionTest__test_odata_uint64_argument__1.xml
index 881fa9bd5..9ad386912 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_uint64_argument__1.xml
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_uint64_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_odata_uint64_argument__3.json b/tests/__snapshots__/Operation/FunctionTest__test_odata_uint64_argument__3.json
index 2b9a0c52f..ae8f2fefd 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_odata_uint64_argument__3.json
+++ b/tests/__snapshots__/Operation/FunctionTest__test_odata_uint64_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_string_argument__1.xml b/tests/__snapshots__/Operation/FunctionTest__test_string_argument__1.xml
index cb136eba6..d21b10d0a 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_string_argument__1.xml
+++ b/tests/__snapshots__/Operation/FunctionTest__test_string_argument__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_string_argument__3.json b/tests/__snapshots__/Operation/FunctionTest__test_string_argument__3.json
index 12fd93cc9..7f5e8cfdf 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_string_argument__3.json
+++ b/tests/__snapshots__/Operation/FunctionTest__test_string_argument__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_string_callback__1.xml b/tests/__snapshots__/Operation/FunctionTest__test_string_callback__1.xml
index 48adbb571..a4e4dbdda 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_string_callback__1.xml
+++ b/tests/__snapshots__/Operation/FunctionTest__test_string_callback__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/FunctionTest__test_string_callback__3.json b/tests/__snapshots__/Operation/FunctionTest__test_string_callback__3.json
index 211dfbdfb..6ce8c4039 100644
--- a/tests/__snapshots__/Operation/FunctionTest__test_string_callback__3.json
+++ b/tests/__snapshots__/Operation/FunctionTest__test_string_callback__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/OperationTest__test_parameter_bound_modify__1.xml b/tests/__snapshots__/Operation/OperationTest__test_parameter_bound_modify__1.xml
index 6b83fea4b..09bf2e8f7 100644
--- a/tests/__snapshots__/Operation/OperationTest__test_parameter_bound_modify__1.xml
+++ b/tests/__snapshots__/Operation/OperationTest__test_parameter_bound_modify__1.xml
@@ -84,7 +84,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/OperationTest__test_parameter_bound_modify__3.json b/tests/__snapshots__/Operation/OperationTest__test_parameter_bound_modify__3.json
index c685cb9d1..75ac22f15 100644
--- a/tests/__snapshots__/Operation/OperationTest__test_parameter_bound_modify__3.json
+++ b/tests/__snapshots__/Operation/OperationTest__test_parameter_bound_modify__3.json
@@ -122,7 +122,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/OperationTest__test_parameter_bound_passthru__1.xml b/tests/__snapshots__/Operation/OperationTest__test_parameter_bound_passthru__1.xml
index 76540a61d..d9f6cda1b 100644
--- a/tests/__snapshots__/Operation/OperationTest__test_parameter_bound_passthru__1.xml
+++ b/tests/__snapshots__/Operation/OperationTest__test_parameter_bound_passthru__1.xml
@@ -84,7 +84,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/OperationTest__test_parameter_bound_passthru__3.json b/tests/__snapshots__/Operation/OperationTest__test_parameter_bound_passthru__3.json
index 8e197de48..df1d9d570 100644
--- a/tests/__snapshots__/Operation/OperationTest__test_parameter_bound_passthru__3.json
+++ b/tests/__snapshots__/Operation/OperationTest__test_parameter_bound_passthru__3.json
@@ -122,7 +122,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/OperationTest__test_parameter_order_bound__1.xml b/tests/__snapshots__/Operation/OperationTest__test_parameter_order_bound__1.xml
index 35b1c6f09..d75d38718 100644
--- a/tests/__snapshots__/Operation/OperationTest__test_parameter_order_bound__1.xml
+++ b/tests/__snapshots__/Operation/OperationTest__test_parameter_order_bound__1.xml
@@ -84,7 +84,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/OperationTest__test_parameter_order_bound__3.json b/tests/__snapshots__/Operation/OperationTest__test_parameter_order_bound__3.json
index ffe5ef4c3..d3bc63e50 100644
--- a/tests/__snapshots__/Operation/OperationTest__test_parameter_order_bound__3.json
+++ b/tests/__snapshots__/Operation/OperationTest__test_parameter_order_bound__3.json
@@ -122,7 +122,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/OperationTest__test_parameter_order_unbound__1.xml b/tests/__snapshots__/Operation/OperationTest__test_parameter_order_unbound__1.xml
index e1aa22f75..9f1a22f00 100644
--- a/tests/__snapshots__/Operation/OperationTest__test_parameter_order_unbound__1.xml
+++ b/tests/__snapshots__/Operation/OperationTest__test_parameter_order_unbound__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/OperationTest__test_parameter_order_unbound__3.json b/tests/__snapshots__/Operation/OperationTest__test_parameter_order_unbound__3.json
index 1bb7867f9..fcb4d8f12 100644
--- a/tests/__snapshots__/Operation/OperationTest__test_parameter_order_unbound__3.json
+++ b/tests/__snapshots__/Operation/OperationTest__test_parameter_order_unbound__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Operation/OperationTest__test_void_uses_string__1.xml b/tests/__snapshots__/Operation/OperationTest__test_void_uses_string__1.xml
index a3a439935..569c9cdc3 100644
--- a/tests/__snapshots__/Operation/OperationTest__test_void_uses_string__1.xml
+++ b/tests/__snapshots__/Operation/OperationTest__test_void_uses_string__1.xml
@@ -85,7 +85,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Operation/OperationTest__test_void_uses_string__3.json b/tests/__snapshots__/Operation/OperationTest__test_void_uses_string__3.json
index 3a6aea56e..0e9a52174 100644
--- a/tests/__snapshots__/Operation/OperationTest__test_void_uses_string__3.json
+++ b/tests/__snapshots__/Operation/OperationTest__test_void_uses_string__3.json
@@ -125,7 +125,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Protocol/AsyncTest__test_async_batch_service_metadata__5.txt b/tests/__snapshots__/Protocol/AsyncTest__test_async_batch_service_metadata__5.txt
index f14d39c03..b9aeb1cdb 100644
--- a/tests/__snapshots__/Protocol/AsyncTest__test_async_batch_service_metadata__5.txt
+++ b/tests/__snapshots__/Protocol/AsyncTest__test_async_batch_service_metadata__5.txt
@@ -6,7 +6,7 @@ HTTP/1.0 200 OK
 content-type: application/xml
 
 <?xml version="1.0" encoding="utf-8"?>
-<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.01"><edmx:Reference Uri="https://oasis-tcs.github.io/odata-vocabularies/vocabularies/Org.OData.Core.V1.xml"><edmx:Include Namespace="Org.OData.Core.V1"/></edmx:Reference><edmx:Reference Uri="https://oasis-tcs.github.io/odata-vocabularies/vocabularies/Org.OData.Capabilities.V1.xml"><edmx:Include Namespace="Org.OData.Capabilities.V1"/></edmx:Reference><edmx:DataServices><Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="com.example.odata"><EntityContainer Name="DefaultContainer"><EntitySet Name="passengers" EntityType="com.example.odata.passenger"><Annotation Term="Org.OData.Capabilities.V1.CountRestrictions"><Record><PropertyValue Property="Countable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.TopSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.SkipSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.FilterRestrictions"><Record><PropertyValue Property="Filterable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.SortRestrictions"><Record><PropertyValue Property="Sortable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.ExpandRestrictions"><Record><PropertyValue Property="Expandable" Bool="false"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.SearchRestrictions"><Record><PropertyValue Property="Searchable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.InsertRestrictions"><Record><PropertyValue Property="Insertable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.UpdateRestrictions"><Record><PropertyValue Property="Updatable" Bool="true"/><PropertyValue Property="DeltaUpdateSupported" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.DeleteRestrictions"><Record><PropertyValue Property="Deletable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.ReadRestrictions"><Record><PropertyValue Property="Readable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.IndexableByKey" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.SelectSupport"><Record><PropertyValue Property="Supported" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Core.V1.PositionalInsert" Bool="true"/></EntitySet></EntityContainer><EnumType Name="Colours" UnderlyingType="Edm.Int64" IsFlags="false"><Member Name="Red" Value="1"/><Member Name="Green" Value="2"/><Member Name="Blue" Value="4"/><Member Name="Brown" Value="8"/></EnumType><EnumType Name="MultiColours" UnderlyingType="Edm.Int64" IsFlags="true"><Member Name="Red" Value="1"/><Member Name="Green" Value="2"/><Member Name="Blue" Value="4"/><Member Name="Brown" Value="8"/></EnumType><EntityType Name="passenger" OpenType="true"><Key><PropertyRef Name="id"/></Key><Property Name="id" Type="Edm.Int64" Nullable="false"><Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/></Property><Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/><Property Name="age" Type="Edm.Double" Nullable="true"/><Property Name="dob" Type="Edm.DateTimeOffset" Nullable="true"/><Property Name="chips" Type="Edm.Boolean" Nullable="true"/><Property Name="dq" Type="Edm.Date" Nullable="true"/><Property Name="in_role" Type="Edm.Duration" Nullable="true"/><Property Name="open_time" Type="Edm.TimeOfDay" Nullable="true"/><Property Name="flight_id" Type="Edm.Int64" Nullable="true"/><Property Name="colour" Type="com.example.odata.Colours" Nullable="true"/><Property Name="sock_colours" Type="com.example.odata.MultiColours" Nullable="true"/><Property Name="emails" Type="Collection(Edm.String)" Nullable="false"/></EntityType><Annotations Target="com.example.odata.DefaultContainer"><Annotation Term="Org.OData.Core.V1.ConventionalIDs" Bool="true"/><Annotation Term="Org.OData.Core.V1.DefaultNamespace" Bool="true"/><Annotation Term="Org.OData.Core.V1.DereferencableIDs" Bool="true"/><Annotation Term="Org.OData.Core.V1.ODataVersions" String="4.01"/><Annotation Term="Org.OData.Capabilities.V1.AsynchronousRequestsSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.BatchSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.BatchSupport"><Record><PropertyValue Property="Supported" Bool="true"/><PropertyValue Property="EtagReferencesSupported" Bool="true"/><PropertyValue Property="SupportedFormats"><Collection><String>application/json</String><String>multipart/mixed</String></Collection></PropertyValue></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.CallbackSupported"><Record><PropertyValue Property="CallbackProtocols"><Collection><Record><PropertyValue Property="Id" String="http"/></Record></Collection></PropertyValue></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.ConformanceLevel" EnumMember="Org.OData.Capabilities.V1.ConformanceLevelType/Advanced"/><Annotation Term="Org.OData.Capabilities.V1.KeyAsSegmentSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.QuerySegmentSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.SupportedFormats"><Collection><String>application/json;metadata=full;IEEE754Compatible=true;streaming=true</String><String>application/json;metadata=minimal;IEEE754Compatible=true;streaming=true</String><String>application/json;metadata=none;IEEE754Compatible=true;streaming=true</String></Collection></Annotation><Annotation Term="Org.OData.Capabilities.V1.SupportedMetadataFormats"><Collection><String>application/json</String><String>application/xml</String></Collection></Annotation></Annotations></Schema></edmx:DataServices></edmx:Edmx>
+<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.01"><edmx:Reference Uri="https://oasis-tcs.github.io/odata-vocabularies/vocabularies/Org.OData.Core.V1.xml"><edmx:Include Namespace="Org.OData.Core.V1"/></edmx:Reference><edmx:Reference Uri="https://oasis-tcs.github.io/odata-vocabularies/vocabularies/Org.OData.Capabilities.V1.xml"><edmx:Include Namespace="Org.OData.Capabilities.V1"/></edmx:Reference><edmx:DataServices><Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="com.example.odata"><EntityContainer Name="DefaultContainer"><EntitySet Name="passengers" EntityType="com.example.odata.passenger"><Annotation Term="Org.OData.Capabilities.V1.CountRestrictions"><Record><PropertyValue Property="Countable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.TopSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.SkipSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.FilterRestrictions"><Record><PropertyValue Property="Filterable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.SortRestrictions"><Record><PropertyValue Property="Sortable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.ExpandRestrictions"><Record><PropertyValue Property="Expandable" Bool="false"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.SearchRestrictions"><Record><PropertyValue Property="Searchable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.InsertRestrictions"><Record><PropertyValue Property="Insertable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.UpdateRestrictions"><Record><PropertyValue Property="Updatable" Bool="true"/><PropertyValue Property="DeltaUpdateSupported" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.DeleteRestrictions"><Record><PropertyValue Property="Deletable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.ReadRestrictions"><Record><PropertyValue Property="Readable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.IndexableByKey" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.SelectSupport"><Record><PropertyValue Property="Supported" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Core.V1.PositionalInsert" Bool="true"/></EntitySet></EntityContainer><EnumType Name="Colours" UnderlyingType="Edm.Int64" IsFlags="false"><Member Name="Red" Value="1"/><Member Name="Green" Value="2"/><Member Name="Blue" Value="4"/><Member Name="Brown" Value="8"/></EnumType><EnumType Name="MultiColours" UnderlyingType="Edm.Int64" IsFlags="true"><Member Name="Red" Value="1"/><Member Name="Green" Value="2"/><Member Name="Blue" Value="4"/><Member Name="Brown" Value="8"/></EnumType><EntityType Name="passenger" OpenType="true"><Key><PropertyRef Name="id"/></Key><Property Name="id" Type="Edm.Int64" Nullable="false"><Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/></Property><Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/><Property Name="age" Type="Edm.Double" Nullable="true"/><Property Name="dob" Type="Edm.DateTimeOffset" Nullable="true"/><Property Name="chips" Type="Edm.Boolean" Nullable="true"/><Property Name="dq" Type="Edm.Date" Nullable="true"/><Property Name="in_role" Type="Edm.Duration" Nullable="true"/><Property Name="open_time" Type="Edm.TimeOfDay" Nullable="true"/><Property Name="flight_id" Type="Edm.Int64" Nullable="true"/><Property Name="colour" Type="com.example.odata.Colours" Nullable="true"/><Property Name="sock_colours" Type="com.example.odata.MultiColours" Nullable="true"/><Property Name="emails" Type="Collection(Edm.String)" Nullable="false"/></EntityType><Annotations Target="com.example.odata.DefaultContainer"><Annotation Term="Org.OData.Core.V1.ConventionalIDs" Bool="true"/><Annotation Term="Org.OData.Core.V1.DefaultNamespace" Bool="true"/><Annotation Term="Org.OData.Core.V1.DereferencableIDs" Bool="true"/><Annotation Term="Org.OData.Core.V1.ODataVersions" String="4.01"/><Annotation Term="Org.OData.Capabilities.V1.AsynchronousRequestsSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.BatchSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.BatchSupport"><Record><PropertyValue Property="Supported" Bool="true"/><PropertyValue Property="EtagReferencesSupported" Bool="true"/><PropertyValue Property="SupportedFormats"><Collection><String>application/json</String><String>multipart/mixed</String></Collection></PropertyValue></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.CallbackSupported"><Record><PropertyValue Property="CallbackProtocols"><Collection><Record><PropertyValue Property="Id" String="http"/></Record></Collection></PropertyValue></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.ConformanceLevel" EnumMember="Org.OData.Capabilities.V1.ConformanceLevelType/Advanced"/><Annotation Term="Org.OData.Capabilities.V1.KeyAsSegmentSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.QuerySegmentSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.SupportedFormats"><Collection><String>application/json;metadata=full;IEEE754Compatible=true;streaming=true</String><String>application/json;metadata=minimal;IEEE754Compatible=true;streaming=true</String><String>application/json;metadata=none;IEEE754Compatible=true;streaming=true</String></Collection></Annotation><Annotation Term="Org.OData.Capabilities.V1.SupportedMetadataFormats"><Collection><String>application/json</String><String>application/xml</String></Collection></Annotation></Annotations></Schema></edmx:DataServices></edmx:Edmx>
 
 --00000000-0000-0000-0000-000000000002
 content-type: application/http
diff --git a/tests/__snapshots__/Protocol/AsyncTest__test_async_batch_service_metadata__6.txt b/tests/__snapshots__/Protocol/AsyncTest__test_async_batch_service_metadata__6.txt
index f14d39c03..b9aeb1cdb 100644
--- a/tests/__snapshots__/Protocol/AsyncTest__test_async_batch_service_metadata__6.txt
+++ b/tests/__snapshots__/Protocol/AsyncTest__test_async_batch_service_metadata__6.txt
@@ -6,7 +6,7 @@ HTTP/1.0 200 OK
 content-type: application/xml
 
 <?xml version="1.0" encoding="utf-8"?>
-<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.01"><edmx:Reference Uri="https://oasis-tcs.github.io/odata-vocabularies/vocabularies/Org.OData.Core.V1.xml"><edmx:Include Namespace="Org.OData.Core.V1"/></edmx:Reference><edmx:Reference Uri="https://oasis-tcs.github.io/odata-vocabularies/vocabularies/Org.OData.Capabilities.V1.xml"><edmx:Include Namespace="Org.OData.Capabilities.V1"/></edmx:Reference><edmx:DataServices><Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="com.example.odata"><EntityContainer Name="DefaultContainer"><EntitySet Name="passengers" EntityType="com.example.odata.passenger"><Annotation Term="Org.OData.Capabilities.V1.CountRestrictions"><Record><PropertyValue Property="Countable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.TopSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.SkipSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.FilterRestrictions"><Record><PropertyValue Property="Filterable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.SortRestrictions"><Record><PropertyValue Property="Sortable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.ExpandRestrictions"><Record><PropertyValue Property="Expandable" Bool="false"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.SearchRestrictions"><Record><PropertyValue Property="Searchable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.InsertRestrictions"><Record><PropertyValue Property="Insertable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.UpdateRestrictions"><Record><PropertyValue Property="Updatable" Bool="true"/><PropertyValue Property="DeltaUpdateSupported" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.DeleteRestrictions"><Record><PropertyValue Property="Deletable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.ReadRestrictions"><Record><PropertyValue Property="Readable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.IndexableByKey" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.SelectSupport"><Record><PropertyValue Property="Supported" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Core.V1.PositionalInsert" Bool="true"/></EntitySet></EntityContainer><EnumType Name="Colours" UnderlyingType="Edm.Int64" IsFlags="false"><Member Name="Red" Value="1"/><Member Name="Green" Value="2"/><Member Name="Blue" Value="4"/><Member Name="Brown" Value="8"/></EnumType><EnumType Name="MultiColours" UnderlyingType="Edm.Int64" IsFlags="true"><Member Name="Red" Value="1"/><Member Name="Green" Value="2"/><Member Name="Blue" Value="4"/><Member Name="Brown" Value="8"/></EnumType><EntityType Name="passenger" OpenType="true"><Key><PropertyRef Name="id"/></Key><Property Name="id" Type="Edm.Int64" Nullable="false"><Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/></Property><Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/><Property Name="age" Type="Edm.Double" Nullable="true"/><Property Name="dob" Type="Edm.DateTimeOffset" Nullable="true"/><Property Name="chips" Type="Edm.Boolean" Nullable="true"/><Property Name="dq" Type="Edm.Date" Nullable="true"/><Property Name="in_role" Type="Edm.Duration" Nullable="true"/><Property Name="open_time" Type="Edm.TimeOfDay" Nullable="true"/><Property Name="flight_id" Type="Edm.Int64" Nullable="true"/><Property Name="colour" Type="com.example.odata.Colours" Nullable="true"/><Property Name="sock_colours" Type="com.example.odata.MultiColours" Nullable="true"/><Property Name="emails" Type="Collection(Edm.String)" Nullable="false"/></EntityType><Annotations Target="com.example.odata.DefaultContainer"><Annotation Term="Org.OData.Core.V1.ConventionalIDs" Bool="true"/><Annotation Term="Org.OData.Core.V1.DefaultNamespace" Bool="true"/><Annotation Term="Org.OData.Core.V1.DereferencableIDs" Bool="true"/><Annotation Term="Org.OData.Core.V1.ODataVersions" String="4.01"/><Annotation Term="Org.OData.Capabilities.V1.AsynchronousRequestsSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.BatchSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.BatchSupport"><Record><PropertyValue Property="Supported" Bool="true"/><PropertyValue Property="EtagReferencesSupported" Bool="true"/><PropertyValue Property="SupportedFormats"><Collection><String>application/json</String><String>multipart/mixed</String></Collection></PropertyValue></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.CallbackSupported"><Record><PropertyValue Property="CallbackProtocols"><Collection><Record><PropertyValue Property="Id" String="http"/></Record></Collection></PropertyValue></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.ConformanceLevel" EnumMember="Org.OData.Capabilities.V1.ConformanceLevelType/Advanced"/><Annotation Term="Org.OData.Capabilities.V1.KeyAsSegmentSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.QuerySegmentSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.SupportedFormats"><Collection><String>application/json;metadata=full;IEEE754Compatible=true;streaming=true</String><String>application/json;metadata=minimal;IEEE754Compatible=true;streaming=true</String><String>application/json;metadata=none;IEEE754Compatible=true;streaming=true</String></Collection></Annotation><Annotation Term="Org.OData.Capabilities.V1.SupportedMetadataFormats"><Collection><String>application/json</String><String>application/xml</String></Collection></Annotation></Annotations></Schema></edmx:DataServices></edmx:Edmx>
+<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.01"><edmx:Reference Uri="https://oasis-tcs.github.io/odata-vocabularies/vocabularies/Org.OData.Core.V1.xml"><edmx:Include Namespace="Org.OData.Core.V1"/></edmx:Reference><edmx:Reference Uri="https://oasis-tcs.github.io/odata-vocabularies/vocabularies/Org.OData.Capabilities.V1.xml"><edmx:Include Namespace="Org.OData.Capabilities.V1"/></edmx:Reference><edmx:DataServices><Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="com.example.odata"><EntityContainer Name="DefaultContainer"><EntitySet Name="passengers" EntityType="com.example.odata.passenger"><Annotation Term="Org.OData.Capabilities.V1.CountRestrictions"><Record><PropertyValue Property="Countable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.TopSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.SkipSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.FilterRestrictions"><Record><PropertyValue Property="Filterable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.SortRestrictions"><Record><PropertyValue Property="Sortable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.ExpandRestrictions"><Record><PropertyValue Property="Expandable" Bool="false"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.SearchRestrictions"><Record><PropertyValue Property="Searchable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.InsertRestrictions"><Record><PropertyValue Property="Insertable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.UpdateRestrictions"><Record><PropertyValue Property="Updatable" Bool="true"/><PropertyValue Property="DeltaUpdateSupported" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.DeleteRestrictions"><Record><PropertyValue Property="Deletable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.ReadRestrictions"><Record><PropertyValue Property="Readable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.IndexableByKey" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.SelectSupport"><Record><PropertyValue Property="Supported" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Core.V1.PositionalInsert" Bool="true"/></EntitySet></EntityContainer><EnumType Name="Colours" UnderlyingType="Edm.Int64" IsFlags="false"><Member Name="Red" Value="1"/><Member Name="Green" Value="2"/><Member Name="Blue" Value="4"/><Member Name="Brown" Value="8"/></EnumType><EnumType Name="MultiColours" UnderlyingType="Edm.Int64" IsFlags="true"><Member Name="Red" Value="1"/><Member Name="Green" Value="2"/><Member Name="Blue" Value="4"/><Member Name="Brown" Value="8"/></EnumType><EntityType Name="passenger" OpenType="true"><Key><PropertyRef Name="id"/></Key><Property Name="id" Type="Edm.Int64" Nullable="false"><Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/></Property><Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/><Property Name="age" Type="Edm.Double" Nullable="true"/><Property Name="dob" Type="Edm.DateTimeOffset" Nullable="true"/><Property Name="chips" Type="Edm.Boolean" Nullable="true"/><Property Name="dq" Type="Edm.Date" Nullable="true"/><Property Name="in_role" Type="Edm.Duration" Nullable="true"/><Property Name="open_time" Type="Edm.TimeOfDay" Nullable="true"/><Property Name="flight_id" Type="Edm.Int64" Nullable="true"/><Property Name="colour" Type="com.example.odata.Colours" Nullable="true"/><Property Name="sock_colours" Type="com.example.odata.MultiColours" Nullable="true"/><Property Name="emails" Type="Collection(Edm.String)" Nullable="false"/></EntityType><Annotations Target="com.example.odata.DefaultContainer"><Annotation Term="Org.OData.Core.V1.ConventionalIDs" Bool="true"/><Annotation Term="Org.OData.Core.V1.DefaultNamespace" Bool="true"/><Annotation Term="Org.OData.Core.V1.DereferencableIDs" Bool="true"/><Annotation Term="Org.OData.Core.V1.ODataVersions" String="4.01"/><Annotation Term="Org.OData.Capabilities.V1.AsynchronousRequestsSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.BatchSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.BatchSupport"><Record><PropertyValue Property="Supported" Bool="true"/><PropertyValue Property="EtagReferencesSupported" Bool="true"/><PropertyValue Property="SupportedFormats"><Collection><String>application/json</String><String>multipart/mixed</String></Collection></PropertyValue></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.CallbackSupported"><Record><PropertyValue Property="CallbackProtocols"><Collection><Record><PropertyValue Property="Id" String="http"/></Record></Collection></PropertyValue></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.ConformanceLevel" EnumMember="Org.OData.Capabilities.V1.ConformanceLevelType/Advanced"/><Annotation Term="Org.OData.Capabilities.V1.KeyAsSegmentSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.QuerySegmentSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.SupportedFormats"><Collection><String>application/json;metadata=full;IEEE754Compatible=true;streaming=true</String><String>application/json;metadata=minimal;IEEE754Compatible=true;streaming=true</String><String>application/json;metadata=none;IEEE754Compatible=true;streaming=true</String></Collection></Annotation><Annotation Term="Org.OData.Capabilities.V1.SupportedMetadataFormats"><Collection><String>application/json</String><String>application/xml</String></Collection></Annotation></Annotations></Schema></edmx:DataServices></edmx:Edmx>
 
 --00000000-0000-0000-0000-000000000002
 content-type: application/http
diff --git a/tests/__snapshots__/Protocol/AsyncTest__test_async_metadata__5.txt b/tests/__snapshots__/Protocol/AsyncTest__test_async_metadata__5.txt
index 33aaeda04..e934c052a 100644
--- a/tests/__snapshots__/Protocol/AsyncTest__test_async_metadata__5.txt
+++ b/tests/__snapshots__/Protocol/AsyncTest__test_async_metadata__5.txt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.01"><edmx:Reference Uri="https://oasis-tcs.github.io/odata-vocabularies/vocabularies/Org.OData.Core.V1.xml"><edmx:Include Namespace="Org.OData.Core.V1"/></edmx:Reference><edmx:Reference Uri="https://oasis-tcs.github.io/odata-vocabularies/vocabularies/Org.OData.Capabilities.V1.xml"><edmx:Include Namespace="Org.OData.Capabilities.V1"/></edmx:Reference><edmx:DataServices><Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="com.example.odata"><EntityContainer Name="DefaultContainer"><EntitySet Name="passengers" EntityType="com.example.odata.passenger"><Annotation Term="Org.OData.Capabilities.V1.CountRestrictions"><Record><PropertyValue Property="Countable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.TopSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.SkipSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.FilterRestrictions"><Record><PropertyValue Property="Filterable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.SortRestrictions"><Record><PropertyValue Property="Sortable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.ExpandRestrictions"><Record><PropertyValue Property="Expandable" Bool="false"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.SearchRestrictions"><Record><PropertyValue Property="Searchable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.InsertRestrictions"><Record><PropertyValue Property="Insertable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.UpdateRestrictions"><Record><PropertyValue Property="Updatable" Bool="true"/><PropertyValue Property="DeltaUpdateSupported" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.DeleteRestrictions"><Record><PropertyValue Property="Deletable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.ReadRestrictions"><Record><PropertyValue Property="Readable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.IndexableByKey" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.SelectSupport"><Record><PropertyValue Property="Supported" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Core.V1.PositionalInsert" Bool="true"/></EntitySet></EntityContainer><EnumType Name="Colours" UnderlyingType="Edm.Int64" IsFlags="false"><Member Name="Red" Value="1"/><Member Name="Green" Value="2"/><Member Name="Blue" Value="4"/><Member Name="Brown" Value="8"/></EnumType><EnumType Name="MultiColours" UnderlyingType="Edm.Int64" IsFlags="true"><Member Name="Red" Value="1"/><Member Name="Green" Value="2"/><Member Name="Blue" Value="4"/><Member Name="Brown" Value="8"/></EnumType><EntityType Name="passenger" OpenType="true"><Key><PropertyRef Name="id"/></Key><Property Name="id" Type="Edm.Int64" Nullable="false"><Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/></Property><Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/><Property Name="age" Type="Edm.Double" Nullable="true"/><Property Name="dob" Type="Edm.DateTimeOffset" Nullable="true"/><Property Name="chips" Type="Edm.Boolean" Nullable="true"/><Property Name="dq" Type="Edm.Date" Nullable="true"/><Property Name="in_role" Type="Edm.Duration" Nullable="true"/><Property Name="open_time" Type="Edm.TimeOfDay" Nullable="true"/><Property Name="flight_id" Type="Edm.Int64" Nullable="true"/><Property Name="colour" Type="com.example.odata.Colours" Nullable="true"/><Property Name="sock_colours" Type="com.example.odata.MultiColours" Nullable="true"/><Property Name="emails" Type="Collection(Edm.String)" Nullable="false"/></EntityType><Annotations Target="com.example.odata.DefaultContainer"><Annotation Term="Org.OData.Core.V1.ConventionalIDs" Bool="true"/><Annotation Term="Org.OData.Core.V1.DefaultNamespace" Bool="true"/><Annotation Term="Org.OData.Core.V1.DereferencableIDs" Bool="true"/><Annotation Term="Org.OData.Core.V1.ODataVersions" String="4.01"/><Annotation Term="Org.OData.Capabilities.V1.AsynchronousRequestsSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.BatchSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.BatchSupport"><Record><PropertyValue Property="Supported" Bool="true"/><PropertyValue Property="EtagReferencesSupported" Bool="true"/><PropertyValue Property="SupportedFormats"><Collection><String>application/json</String><String>multipart/mixed</String></Collection></PropertyValue></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.CallbackSupported"><Record><PropertyValue Property="CallbackProtocols"><Collection><Record><PropertyValue Property="Id" String="http"/></Record></Collection></PropertyValue></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.ConformanceLevel" EnumMember="Org.OData.Capabilities.V1.ConformanceLevelType/Advanced"/><Annotation Term="Org.OData.Capabilities.V1.KeyAsSegmentSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.QuerySegmentSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.SupportedFormats"><Collection><String>application/json;metadata=full;IEEE754Compatible=true;streaming=true</String><String>application/json;metadata=minimal;IEEE754Compatible=true;streaming=true</String><String>application/json;metadata=none;IEEE754Compatible=true;streaming=true</String></Collection></Annotation><Annotation Term="Org.OData.Capabilities.V1.SupportedMetadataFormats"><Collection><String>application/json</String><String>application/xml</String></Collection></Annotation></Annotations></Schema></edmx:DataServices></edmx:Edmx>
+<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.01"><edmx:Reference Uri="https://oasis-tcs.github.io/odata-vocabularies/vocabularies/Org.OData.Core.V1.xml"><edmx:Include Namespace="Org.OData.Core.V1"/></edmx:Reference><edmx:Reference Uri="https://oasis-tcs.github.io/odata-vocabularies/vocabularies/Org.OData.Capabilities.V1.xml"><edmx:Include Namespace="Org.OData.Capabilities.V1"/></edmx:Reference><edmx:DataServices><Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="com.example.odata"><EntityContainer Name="DefaultContainer"><EntitySet Name="passengers" EntityType="com.example.odata.passenger"><Annotation Term="Org.OData.Capabilities.V1.CountRestrictions"><Record><PropertyValue Property="Countable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.TopSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.SkipSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.FilterRestrictions"><Record><PropertyValue Property="Filterable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.SortRestrictions"><Record><PropertyValue Property="Sortable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.ExpandRestrictions"><Record><PropertyValue Property="Expandable" Bool="false"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.SearchRestrictions"><Record><PropertyValue Property="Searchable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.InsertRestrictions"><Record><PropertyValue Property="Insertable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.UpdateRestrictions"><Record><PropertyValue Property="Updatable" Bool="true"/><PropertyValue Property="DeltaUpdateSupported" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.DeleteRestrictions"><Record><PropertyValue Property="Deletable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.ReadRestrictions"><Record><PropertyValue Property="Readable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.IndexableByKey" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.SelectSupport"><Record><PropertyValue Property="Supported" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Core.V1.PositionalInsert" Bool="true"/></EntitySet></EntityContainer><EnumType Name="Colours" UnderlyingType="Edm.Int64" IsFlags="false"><Member Name="Red" Value="1"/><Member Name="Green" Value="2"/><Member Name="Blue" Value="4"/><Member Name="Brown" Value="8"/></EnumType><EnumType Name="MultiColours" UnderlyingType="Edm.Int64" IsFlags="true"><Member Name="Red" Value="1"/><Member Name="Green" Value="2"/><Member Name="Blue" Value="4"/><Member Name="Brown" Value="8"/></EnumType><EntityType Name="passenger" OpenType="true"><Key><PropertyRef Name="id"/></Key><Property Name="id" Type="Edm.Int64" Nullable="false"><Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/></Property><Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/><Property Name="age" Type="Edm.Double" Nullable="true"/><Property Name="dob" Type="Edm.DateTimeOffset" Nullable="true"/><Property Name="chips" Type="Edm.Boolean" Nullable="true"/><Property Name="dq" Type="Edm.Date" Nullable="true"/><Property Name="in_role" Type="Edm.Duration" Nullable="true"/><Property Name="open_time" Type="Edm.TimeOfDay" Nullable="true"/><Property Name="flight_id" Type="Edm.Int64" Nullable="true"/><Property Name="colour" Type="com.example.odata.Colours" Nullable="true"/><Property Name="sock_colours" Type="com.example.odata.MultiColours" Nullable="true"/><Property Name="emails" Type="Collection(Edm.String)" Nullable="false"/></EntityType><Annotations Target="com.example.odata.DefaultContainer"><Annotation Term="Org.OData.Core.V1.ConventionalIDs" Bool="true"/><Annotation Term="Org.OData.Core.V1.DefaultNamespace" Bool="true"/><Annotation Term="Org.OData.Core.V1.DereferencableIDs" Bool="true"/><Annotation Term="Org.OData.Core.V1.ODataVersions" String="4.01"/><Annotation Term="Org.OData.Capabilities.V1.AsynchronousRequestsSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.BatchSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.BatchSupport"><Record><PropertyValue Property="Supported" Bool="true"/><PropertyValue Property="EtagReferencesSupported" Bool="true"/><PropertyValue Property="SupportedFormats"><Collection><String>application/json</String><String>multipart/mixed</String></Collection></PropertyValue></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.CallbackSupported"><Record><PropertyValue Property="CallbackProtocols"><Collection><Record><PropertyValue Property="Id" String="http"/></Record></Collection></PropertyValue></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.ConformanceLevel" EnumMember="Org.OData.Capabilities.V1.ConformanceLevelType/Advanced"/><Annotation Term="Org.OData.Capabilities.V1.KeyAsSegmentSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.QuerySegmentSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.SupportedFormats"><Collection><String>application/json;metadata=full;IEEE754Compatible=true;streaming=true</String><String>application/json;metadata=minimal;IEEE754Compatible=true;streaming=true</String><String>application/json;metadata=none;IEEE754Compatible=true;streaming=true</String></Collection></Annotation><Annotation Term="Org.OData.Capabilities.V1.SupportedMetadataFormats"><Collection><String>application/json</String><String>application/xml</String></Collection></Annotation></Annotations></Schema></edmx:DataServices></edmx:Edmx>
diff --git a/tests/__snapshots__/Protocol/AsyncTest__test_async_metadata__6.txt b/tests/__snapshots__/Protocol/AsyncTest__test_async_metadata__6.txt
index 33aaeda04..e934c052a 100644
--- a/tests/__snapshots__/Protocol/AsyncTest__test_async_metadata__6.txt
+++ b/tests/__snapshots__/Protocol/AsyncTest__test_async_metadata__6.txt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.01"><edmx:Reference Uri="https://oasis-tcs.github.io/odata-vocabularies/vocabularies/Org.OData.Core.V1.xml"><edmx:Include Namespace="Org.OData.Core.V1"/></edmx:Reference><edmx:Reference Uri="https://oasis-tcs.github.io/odata-vocabularies/vocabularies/Org.OData.Capabilities.V1.xml"><edmx:Include Namespace="Org.OData.Capabilities.V1"/></edmx:Reference><edmx:DataServices><Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="com.example.odata"><EntityContainer Name="DefaultContainer"><EntitySet Name="passengers" EntityType="com.example.odata.passenger"><Annotation Term="Org.OData.Capabilities.V1.CountRestrictions"><Record><PropertyValue Property="Countable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.TopSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.SkipSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.FilterRestrictions"><Record><PropertyValue Property="Filterable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.SortRestrictions"><Record><PropertyValue Property="Sortable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.ExpandRestrictions"><Record><PropertyValue Property="Expandable" Bool="false"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.SearchRestrictions"><Record><PropertyValue Property="Searchable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.InsertRestrictions"><Record><PropertyValue Property="Insertable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.UpdateRestrictions"><Record><PropertyValue Property="Updatable" Bool="true"/><PropertyValue Property="DeltaUpdateSupported" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.DeleteRestrictions"><Record><PropertyValue Property="Deletable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.ReadRestrictions"><Record><PropertyValue Property="Readable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.IndexableByKey" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.SelectSupport"><Record><PropertyValue Property="Supported" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Core.V1.PositionalInsert" Bool="true"/></EntitySet></EntityContainer><EnumType Name="Colours" UnderlyingType="Edm.Int64" IsFlags="false"><Member Name="Red" Value="1"/><Member Name="Green" Value="2"/><Member Name="Blue" Value="4"/><Member Name="Brown" Value="8"/></EnumType><EnumType Name="MultiColours" UnderlyingType="Edm.Int64" IsFlags="true"><Member Name="Red" Value="1"/><Member Name="Green" Value="2"/><Member Name="Blue" Value="4"/><Member Name="Brown" Value="8"/></EnumType><EntityType Name="passenger" OpenType="true"><Key><PropertyRef Name="id"/></Key><Property Name="id" Type="Edm.Int64" Nullable="false"><Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/></Property><Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/><Property Name="age" Type="Edm.Double" Nullable="true"/><Property Name="dob" Type="Edm.DateTimeOffset" Nullable="true"/><Property Name="chips" Type="Edm.Boolean" Nullable="true"/><Property Name="dq" Type="Edm.Date" Nullable="true"/><Property Name="in_role" Type="Edm.Duration" Nullable="true"/><Property Name="open_time" Type="Edm.TimeOfDay" Nullable="true"/><Property Name="flight_id" Type="Edm.Int64" Nullable="true"/><Property Name="colour" Type="com.example.odata.Colours" Nullable="true"/><Property Name="sock_colours" Type="com.example.odata.MultiColours" Nullable="true"/><Property Name="emails" Type="Collection(Edm.String)" Nullable="false"/></EntityType><Annotations Target="com.example.odata.DefaultContainer"><Annotation Term="Org.OData.Core.V1.ConventionalIDs" Bool="true"/><Annotation Term="Org.OData.Core.V1.DefaultNamespace" Bool="true"/><Annotation Term="Org.OData.Core.V1.DereferencableIDs" Bool="true"/><Annotation Term="Org.OData.Core.V1.ODataVersions" String="4.01"/><Annotation Term="Org.OData.Capabilities.V1.AsynchronousRequestsSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.BatchSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.BatchSupport"><Record><PropertyValue Property="Supported" Bool="true"/><PropertyValue Property="EtagReferencesSupported" Bool="true"/><PropertyValue Property="SupportedFormats"><Collection><String>application/json</String><String>multipart/mixed</String></Collection></PropertyValue></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.CallbackSupported"><Record><PropertyValue Property="CallbackProtocols"><Collection><Record><PropertyValue Property="Id" String="http"/></Record></Collection></PropertyValue></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.ConformanceLevel" EnumMember="Org.OData.Capabilities.V1.ConformanceLevelType/Advanced"/><Annotation Term="Org.OData.Capabilities.V1.KeyAsSegmentSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.QuerySegmentSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.SupportedFormats"><Collection><String>application/json;metadata=full;IEEE754Compatible=true;streaming=true</String><String>application/json;metadata=minimal;IEEE754Compatible=true;streaming=true</String><String>application/json;metadata=none;IEEE754Compatible=true;streaming=true</String></Collection></Annotation><Annotation Term="Org.OData.Capabilities.V1.SupportedMetadataFormats"><Collection><String>application/json</String><String>application/xml</String></Collection></Annotation></Annotations></Schema></edmx:DataServices></edmx:Edmx>
+<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.01"><edmx:Reference Uri="https://oasis-tcs.github.io/odata-vocabularies/vocabularies/Org.OData.Core.V1.xml"><edmx:Include Namespace="Org.OData.Core.V1"/></edmx:Reference><edmx:Reference Uri="https://oasis-tcs.github.io/odata-vocabularies/vocabularies/Org.OData.Capabilities.V1.xml"><edmx:Include Namespace="Org.OData.Capabilities.V1"/></edmx:Reference><edmx:DataServices><Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="com.example.odata"><EntityContainer Name="DefaultContainer"><EntitySet Name="passengers" EntityType="com.example.odata.passenger"><Annotation Term="Org.OData.Capabilities.V1.CountRestrictions"><Record><PropertyValue Property="Countable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.TopSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.SkipSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.FilterRestrictions"><Record><PropertyValue Property="Filterable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.SortRestrictions"><Record><PropertyValue Property="Sortable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.ExpandRestrictions"><Record><PropertyValue Property="Expandable" Bool="false"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.SearchRestrictions"><Record><PropertyValue Property="Searchable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.InsertRestrictions"><Record><PropertyValue Property="Insertable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.UpdateRestrictions"><Record><PropertyValue Property="Updatable" Bool="true"/><PropertyValue Property="DeltaUpdateSupported" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.DeleteRestrictions"><Record><PropertyValue Property="Deletable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.ReadRestrictions"><Record><PropertyValue Property="Readable" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.IndexableByKey" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.SelectSupport"><Record><PropertyValue Property="Supported" Bool="true"/></Record></Annotation><Annotation Term="Org.OData.Core.V1.PositionalInsert" Bool="true"/></EntitySet></EntityContainer><EnumType Name="Colours" UnderlyingType="Edm.Int64" IsFlags="false"><Member Name="Red" Value="1"/><Member Name="Green" Value="2"/><Member Name="Blue" Value="4"/><Member Name="Brown" Value="8"/></EnumType><EnumType Name="MultiColours" UnderlyingType="Edm.Int64" IsFlags="true"><Member Name="Red" Value="1"/><Member Name="Green" Value="2"/><Member Name="Blue" Value="4"/><Member Name="Brown" Value="8"/></EnumType><EntityType Name="passenger" OpenType="true"><Key><PropertyRef Name="id"/></Key><Property Name="id" Type="Edm.Int64" Nullable="false"><Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/></Property><Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/><Property Name="age" Type="Edm.Double" Nullable="true"/><Property Name="dob" Type="Edm.DateTimeOffset" Nullable="true"/><Property Name="chips" Type="Edm.Boolean" Nullable="true"/><Property Name="dq" Type="Edm.Date" Nullable="true"/><Property Name="in_role" Type="Edm.Duration" Nullable="true"/><Property Name="open_time" Type="Edm.TimeOfDay" Nullable="true"/><Property Name="flight_id" Type="Edm.Int64" Nullable="true"/><Property Name="colour" Type="com.example.odata.Colours" Nullable="true"/><Property Name="sock_colours" Type="com.example.odata.MultiColours" Nullable="true"/><Property Name="emails" Type="Collection(Edm.String)" Nullable="false"/></EntityType><Annotations Target="com.example.odata.DefaultContainer"><Annotation Term="Org.OData.Core.V1.ConventionalIDs" Bool="true"/><Annotation Term="Org.OData.Core.V1.DefaultNamespace" Bool="true"/><Annotation Term="Org.OData.Core.V1.DereferencableIDs" Bool="true"/><Annotation Term="Org.OData.Core.V1.ODataVersions" String="4.01"/><Annotation Term="Org.OData.Capabilities.V1.AsynchronousRequestsSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.BatchSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.BatchSupport"><Record><PropertyValue Property="Supported" Bool="true"/><PropertyValue Property="EtagReferencesSupported" Bool="true"/><PropertyValue Property="SupportedFormats"><Collection><String>application/json</String><String>multipart/mixed</String></Collection></PropertyValue></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.CallbackSupported"><Record><PropertyValue Property="CallbackProtocols"><Collection><Record><PropertyValue Property="Id" String="http"/></Record></Collection></PropertyValue></Record></Annotation><Annotation Term="Org.OData.Capabilities.V1.ConformanceLevel" EnumMember="Org.OData.Capabilities.V1.ConformanceLevelType/Advanced"/><Annotation Term="Org.OData.Capabilities.V1.KeyAsSegmentSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.QuerySegmentSupported" Bool="true"/><Annotation Term="Org.OData.Capabilities.V1.SupportedFormats"><Collection><String>application/json;metadata=full;IEEE754Compatible=true;streaming=true</String><String>application/json;metadata=minimal;IEEE754Compatible=true;streaming=true</String><String>application/json;metadata=none;IEEE754Compatible=true;streaming=true</String></Collection></Annotation><Annotation Term="Org.OData.Capabilities.V1.SupportedMetadataFormats"><Collection><String>application/json</String><String>application/xml</String></Collection></Annotation></Annotations></Schema></edmx:DataServices></edmx:Edmx>
diff --git a/tests/__snapshots__/Protocol/ServiceMetadataTest__test_has_flight_metadata_document_at_document_root__1.xml b/tests/__snapshots__/Protocol/ServiceMetadataTest__test_has_flight_metadata_document_at_document_root__1.xml
index 4fa2dd8c0..01c75b417 100644
--- a/tests/__snapshots__/Protocol/ServiceMetadataTest__test_has_flight_metadata_document_at_document_root__1.xml
+++ b/tests/__snapshots__/Protocol/ServiceMetadataTest__test_has_flight_metadata_document_at_document_root__1.xml
@@ -86,7 +86,7 @@
           <PropertyRef Name="id"/>
         </Key>
         <Property Name="id" Type="Edm.Int64" Nullable="false">
-          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" Bool="true"/>
+          <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/>
         </Property>
         <Property Name="name" Type="Edm.String" Nullable="false" MaxLength="255"/>
         <Property Name="age" Type="Edm.Double" Nullable="true"/>
diff --git a/tests/__snapshots__/Protocol/ServiceMetadataTest__test_has_flight_metadata_document_at_document_root__3.json b/tests/__snapshots__/Protocol/ServiceMetadataTest__test_has_flight_metadata_document_at_document_root__3.json
index 637914cba..38495e10f 100644
--- a/tests/__snapshots__/Protocol/ServiceMetadataTest__test_has_flight_metadata_document_at_document_root__3.json
+++ b/tests/__snapshots__/Protocol/ServiceMetadataTest__test_has_flight_metadata_document_at_document_root__3.json
@@ -128,7 +128,7 @@
         "id": {
             "$Type": "Edm.Int64",
             "$Nullable": false,
-            "@Org.OData.Core.V1.ComputedDefaultValue": true
+            "@Org.OData.Core.V1.Computed": true
         },
         "name": {
             "$Type": "Edm.String",
diff --git a/tests/__snapshots__/Queries/DefaultExpressionTest__test_metadata__4.json b/tests/__snapshots__/Queries/DefaultExpressionTest__test_metadata__4.json
index 09fc585ef..f879636b9 100644
--- a/tests/__snapshots__/Queries/DefaultExpressionTest__test_metadata__4.json
+++ b/tests/__snapshots__/Queries/DefaultExpressionTest__test_metadata__4.json
@@ -250,7 +250,14 @@
             "com.example.odata.dex-create": {
                 "type": "object",
                 "title": "dex (Create schema)",
-                "properties": {}
+                "properties": {
+                    "now": {
+                        "type": "string",
+                        "format": "date-time",
+                        "pattern": "^[0-9]{4,}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]([.][0-9]{1,12})?(Z|[+-][0-9][0-9]:[0-9][0-9])$",
+                        "nullable": false
+                    }
+                }
             },
             "com.example.odata.dex-update": {
                 "type": "object",
diff --git a/tests/__snapshots__/Queries/DefaultValueTest__test_default__4.json b/tests/__snapshots__/Queries/DefaultValueTest__test_default__4.json
index b3cbd5ebf..360dfe6b1 100644
--- a/tests/__snapshots__/Queries/DefaultValueTest__test_default__4.json
+++ b/tests/__snapshots__/Queries/DefaultValueTest__test_default__4.json
@@ -257,6 +257,11 @@
                 "type": "object",
                 "title": "test (Create schema)",
                 "properties": {
+                    "a": {
+                        "type": "string",
+                        "nullable": false,
+                        "default": {}
+                    },
                     "b": {
                         "type": "string",
                         "nullable": true