Revert accidental commits

autorest/codegen/models/dictionary_schema.py

@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-from typing import Any, Dict, Optional, Union
+from typing import Any, Dict, Optional
 from .base_schema import BaseSchema
 from .imports import FileImport, ImportType, TypingSection
 
@@ -25,7 +25,6 @@ def __init__(
     ) -> None:
         super(DictionarySchema, self).__init__(namespace=namespace, yaml_data=yaml_data)
         self.element_type = element_type
-        self.nullable_items = self.yaml_data.get("nullableItems", False)
 
     @property
     def serialization_type(self) -> str:
@@ -61,13 +60,6 @@ def docstring_type(self) -> str:
         """
         return f"dict[str, {self.element_type.docstring_type}]"
 
-    @property
-    def validation_map(self) -> Optional[Dict[str, Union[bool, int, str]]]:
-        validation_map: Dict[str, Union[bool, int, str]] = {}
-        if self.nullable_items:
-            validation_map["nullable_items"] = True
-        return validation_map or None
-
     def xml_serialization_ctxt(self) -> Optional[str]:
         raise NotImplementedError("Dictionary schema does not support XML serialization.")
 

autorest/codegen/models/list_schema.py

@@ -14,14 +14,16 @@ def __init__(
         namespace: str,
         yaml_data: Dict[str, Any],
         element_type: BaseSchema,
+        *,
+        max_items: Optional[int] = None,
+        min_items: Optional[int] = None,
+        unique_items: Optional[int] = None,
     ) -> None:
         super(ListSchema, self).__init__(namespace=namespace, yaml_data=yaml_data)
         self.element_type = element_type
-
-        self.max_items = self.yaml_data.get("maxItems", False)
-        self.min_items = self.yaml_data.get("minItems", False)
-        self.unique_items = self.yaml_data.get("uniqueItems", False)
-        self.nullable_items = self.yaml_data.get("nullableItems", False)
+        self.max_items = max_items
+        self.min_items = min_items
+        self.unique_items = unique_items
 
     @property
     def serialization_type(self) -> str:
@@ -53,8 +55,6 @@ def validation_map(self) -> Optional[Dict[str, Union[bool, int, str]]]:
             validation_map["min_items"] = self.min_items
         if self.unique_items:
             validation_map["unique"] = True
-        if self.nullable_items:
-            validation_map["nullable_items"] = True
         return validation_map or None
 
     @property
@@ -94,7 +94,10 @@ def from_yaml(cls, namespace: str, yaml_data: Dict[str, Any], **kwargs) -> "List
         return cls(
             namespace=namespace,
             yaml_data=yaml_data,
-            element_type=element_type
+            element_type=element_type,
+            max_items=yaml_data.get("maxItems"),
+            min_items=yaml_data.get("minItems"),
+            unique_items=yaml_data.get("uniqueItems"),
         )
 
     def imports(self) -> FileImport:

autorest/codegen/models/property.py

@@ -46,9 +46,6 @@ def __init__(
             validation_map["readonly"] = True
         if self.constant:
             validation_map["constant"] = True
-        if self.yaml_data.get("nullable", False):
-            validation_map["nullable"] = True
-
         if self.schema.validation_map:
             validation_map_from_schema = cast(Dict[str, Union[bool, int, str]], self.schema.validation_map)
             validation_map.update(validation_map_from_schema)

autorest/codegen/models/schema_response.py

@@ -31,15 +31,6 @@ def __init__(
         self.status_codes = status_codes
         self.headers = headers
         self.binary = binary
-        self.nullable = self.yaml_data.get("nullable", False)
-
-    @property
-    def operation_type_annotation(self) -> str:
-        if not self.schema:
-            return "None"
-        if self.nullable:
-            return f"Optional[{self.schema.operation_type_annotation}]"
-        return self.schema.operation_type_annotation
 
     @property
     def has_body(self) -> bool:

autorest/codegen/templates/operation_tools.jinja2

@@ -2,9 +2,9 @@
 {%- if return_type -%}
 {{ return_type }}
 {%- else -%}
-{{ ((return_type_wrapper | join("[") + "[") if return_type_wrapper else "") ~ ("Optional[" if operation.has_optional_return_type else "" ) ~ ("Union[" if operation.responses | selectattr('has_body') | map(attribute='operation_type_annotation') | unique | list  | length > 1 else "") ~
-(operation.responses | selectattr('has_body') | map(attribute='operation_type_annotation') | unique | join(', ')) ~
-("]" if operation.responses | selectattr('has_body') | map(attribute='operation_type_annotation')| unique | list | length > 1 else "") ~ ("]" if operation.has_optional_return_type else "") ~ ( ("]" * return_type_wrapper | count ) if return_type_wrapper else "")
+{{ ((return_type_wrapper | join("[") + "[") if return_type_wrapper else "") ~ ("Optional[" if operation.has_optional_return_type else "" ) ~ ("Union[" if operation.responses | selectattr('has_body') | map(attribute='schema') | map(attribute='operation_type_annotation') | unique | list  | length > 1 else "") ~
+(operation.responses | selectattr('has_body') | map(attribute='schema') | map(attribute='operation_type_annotation') | unique | join(', ')) ~
+("]" if operation.responses | selectattr('has_body') | map(attribute='schema') | map(attribute='operation_type_annotation')| unique | list | length > 1 else "") ~ ("]" if operation.has_optional_return_type else "") ~ ( ("]" * return_type_wrapper | count ) if return_type_wrapper else "")
 if operation.responses | selectattr('has_body') | first
 else ((return_type_wrapper | join("[") + "[") if return_type_wrapper else "") ~ ("Optional[" if operation.has_optional_return_type else "" ) ~ "None" ~ ("]" if operation.has_optional_return_type else "") ~ ( ("]" * return_type_wrapper | count ) if return_type_wrapper else "") }}{%- endif -%}{% endmacro %}
 {# get async mypy typing #}

package.json

@@ -27,7 +27,7 @@
   },
   "devDependencies": {
     "@autorest/autorest": "^3.0.0",
-    "@microsoft.azure/autorest.testserver": "^2.10.58"
+    "@microsoft.azure/autorest.testserver": "^2.10.56"
   },
   "files": [
     "autorest/**/*.py",

test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/aio/operations/_duration_operations.py

@@ -45,15 +45,15 @@ def __init__(self, client, config, serializer, deserializer) -> None:
     async def get_null(
         self,
         **kwargs
-    ) -> Optional[datetime.timedelta]:
+    ) -> datetime.timedelta:
         """Get null duration value.
 
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: timedelta, or the result of cls(response)
         :rtype: ~datetime.timedelta
         :raises: ~azure.core.exceptions.HttpResponseError
         """
-        cls = kwargs.pop('cls', None)  # type: ClsType[Optional[datetime.timedelta]]
+        cls = kwargs.pop('cls', None)  # type: ClsType[datetime.timedelta]
         error_map = {
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }

test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/operations/_duration_operations.py

@@ -50,15 +50,15 @@ def get_null(
         self,
         **kwargs  # type: Any
     ):
-        # type: (...) -> Optional[datetime.timedelta]
+        # type: (...) -> datetime.timedelta
         """Get null duration value.
 
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: timedelta, or the result of cls(response)
         :rtype: ~datetime.timedelta
         :raises: ~azure.core.exceptions.HttpResponseError
         """
-        cls = kwargs.pop('cls', None)  # type: ClsType[Optional[datetime.timedelta]]
+        cls = kwargs.pop('cls', None)  # type: ClsType[datetime.timedelta]
         error_map = {
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }

test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/aio/operations/_bool_operations.py

@@ -234,15 +234,15 @@ async def put_false(
     async def get_null(
         self,
         **kwargs
-    ) -> Optional[bool]:
+    ) -> bool:
         """Get null Boolean value.
 
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: bool, or the result of cls(response)
         :rtype: bool
         :raises: ~azure.core.exceptions.HttpResponseError
         """
-        cls = kwargs.pop('cls', None)  # type: ClsType[Optional[bool]]
+        cls = kwargs.pop('cls', None)  # type: ClsType[bool]
         error_map = {
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }

test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/operations/_bool_operations.py

@@ -243,15 +243,15 @@ def get_null(
         self,
         **kwargs  # type: Any
     ):
-        # type: (...) -> Optional[bool]
+        # type: (...) -> bool
         """Get null Boolean value.
 
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: bool, or the result of cls(response)
         :rtype: bool
         :raises: ~azure.core.exceptions.HttpResponseError
         """
-        cls = kwargs.pop('cls', None)  # type: ClsType[Optional[bool]]
+        cls = kwargs.pop('cls', None)  # type: ClsType[bool]
         error_map = {
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }

test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/models/_models.py

@@ -41,10 +41,6 @@ class Basic(msrest.serialization.Model):
     :type color: str or ~bodycomplex.models.CMYKColors
     """
 
-    _validation = {
-        'id': {'nullable': True},
-    }
-
     _attribute_map = {
         'id': {'key': 'id', 'type': 'int'},
         'name': {'key': 'name', 'type': 'str'},
@@ -369,10 +365,6 @@ class DictionaryWrapper(msrest.serialization.Model):
     :type default_program: dict[str, str]
     """
 
-    _validation = {
-        'default_program': {'nullable': True},
-    }
-
     _attribute_map = {
         'default_program': {'key': 'defaultProgram', 'type': '{str}'},
     }

test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/models/_models_py3.py

@@ -48,10 +48,6 @@ class Basic(msrest.serialization.Model):
     :type color: str or ~bodycomplex.models.CMYKColors
     """
 
-    _validation = {
-        'id': {'nullable': True},
-    }
-
     _attribute_map = {
         'id': {'key': 'id', 'type': 'int'},
         'name': {'key': 'name', 'type': 'str'},
@@ -418,10 +414,6 @@ class DictionaryWrapper(msrest.serialization.Model):
     :type default_program: dict[str, str]
     """
 
-    _validation = {
-        'default_program': {'nullable': True},
-    }
-
     _attribute_map = {
         'default_program': {'key': 'defaultProgram', 'type': '{str}'},
     }

test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/aio/operations/_date_operations.py

@@ -45,15 +45,15 @@ def __init__(self, client, config, serializer, deserializer) -> None:
     async def get_null(
         self,
         **kwargs
-    ) -> Optional[datetime.date]:
+    ) -> datetime.date:
         """Get null date value.
 
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: date, or the result of cls(response)
         :rtype: ~datetime.date
         :raises: ~azure.core.exceptions.HttpResponseError
         """
-        cls = kwargs.pop('cls', None)  # type: ClsType[Optional[datetime.date]]
+        cls = kwargs.pop('cls', None)  # type: ClsType[datetime.date]
         error_map = {
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }

test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/operations/_date_operations.py

@@ -50,15 +50,15 @@ def get_null(
         self,
         **kwargs  # type: Any
     ):
-        # type: (...) -> Optional[datetime.date]
+        # type: (...) -> datetime.date
         """Get null date value.
 
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: date, or the result of cls(response)
         :rtype: ~datetime.date
         :raises: ~azure.core.exceptions.HttpResponseError
         """
-        cls = kwargs.pop('cls', None)  # type: ClsType[Optional[datetime.date]]
+        cls = kwargs.pop('cls', None)  # type: ClsType[datetime.date]
         error_map = {
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }

test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/aio/operations/_datetime_operations.py

@@ -45,15 +45,15 @@ def __init__(self, client, config, serializer, deserializer) -> None:
     async def get_null(
         self,
         **kwargs
-    ) -> Optional[datetime.datetime]:
+    ) -> datetime.datetime:
         """Get null datetime value.
 
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: datetime, or the result of cls(response)
         :rtype: ~datetime.datetime
         :raises: ~azure.core.exceptions.HttpResponseError
         """
-        cls = kwargs.pop('cls', None)  # type: ClsType[Optional[datetime.datetime]]
+        cls = kwargs.pop('cls', None)  # type: ClsType[datetime.datetime]
         error_map = {
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }

test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/operations/_datetime_operations.py

@@ -50,15 +50,15 @@ def get_null(
         self,
         **kwargs  # type: Any
     ):
-        # type: (...) -> Optional[datetime.datetime]
+        # type: (...) -> datetime.datetime
         """Get null datetime value.
 
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: datetime, or the result of cls(response)
         :rtype: ~datetime.datetime
         :raises: ~azure.core.exceptions.HttpResponseError
         """
-        cls = kwargs.pop('cls', None)  # type: ClsType[Optional[datetime.datetime]]
+        cls = kwargs.pop('cls', None)  # type: ClsType[datetime.datetime]
         error_map = {
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }

test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/aio/operations/_datetimerfc1123_operations.py

@@ -45,15 +45,15 @@ def __init__(self, client, config, serializer, deserializer) -> None:
     async def get_null(
         self,
         **kwargs
-    ) -> Optional[datetime.datetime]:
+    ) -> datetime.datetime:
         """Get null datetime value.
 
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: datetime, or the result of cls(response)
         :rtype: ~datetime.datetime
         :raises: ~azure.core.exceptions.HttpResponseError
         """
-        cls = kwargs.pop('cls', None)  # type: ClsType[Optional[datetime.datetime]]
+        cls = kwargs.pop('cls', None)  # type: ClsType[datetime.datetime]
         error_map = {
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }

test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/operations/_datetimerfc1123_operations.py

@@ -50,15 +50,15 @@ def get_null(
         self,
         **kwargs  # type: Any
     ):
-        # type: (...) -> Optional[datetime.datetime]
+        # type: (...) -> datetime.datetime
         """Get null datetime value.
 
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: datetime, or the result of cls(response)
         :rtype: ~datetime.datetime
         :raises: ~azure.core.exceptions.HttpResponseError
         """
-        cls = kwargs.pop('cls', None)  # type: ClsType[Optional[datetime.datetime]]
+        cls = kwargs.pop('cls', None)  # type: ClsType[datetime.datetime]
         error_map = {
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }

test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/aio/operations/_duration_operations.py

@@ -45,15 +45,15 @@ def __init__(self, client, config, serializer, deserializer) -> None:
     async def get_null(
         self,
         **kwargs
-    ) -> Optional[datetime.timedelta]:
+    ) -> datetime.timedelta:
         """Get null duration value.
 
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: timedelta, or the result of cls(response)
         :rtype: ~datetime.timedelta
         :raises: ~azure.core.exceptions.HttpResponseError
         """
-        cls = kwargs.pop('cls', None)  # type: ClsType[Optional[datetime.timedelta]]
+        cls = kwargs.pop('cls', None)  # type: ClsType[datetime.timedelta]
         error_map = {
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }

test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/operations/_duration_operations.py

@@ -50,15 +50,15 @@ def get_null(
         self,
         **kwargs  # type: Any
     ):
-        # type: (...) -> Optional[datetime.timedelta]
+        # type: (...) -> datetime.timedelta
         """Get null duration value.
 
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: timedelta, or the result of cls(response)
         :rtype: ~datetime.timedelta
         :raises: ~azure.core.exceptions.HttpResponseError
         """
-        cls = kwargs.pop('cls', None)  # type: ClsType[Optional[datetime.timedelta]]
+        cls = kwargs.pop('cls', None)  # type: ClsType[datetime.timedelta]
         error_map = {
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }