just do get call to next link for single operation dpg paging (#1307)

Azure · Jun 17, 2022 · 7cd43fc · 7cd43fc
1 parent 4497bc6
commit 7cd43fc
Show file tree

Hide file tree

Showing 19 changed files with 159 additions and 535 deletions.
diff --git a/autorest/codegen/serializers/builder_serializer.py b/autorest/codegen/serializers/builder_serializer.py
@@ -1133,9 +1133,16 @@ def call_next_link_request_builder(self, builder: PagingOperationType) -> List[s
             template_url = "next_link"
 
         request_builder = builder.next_request_builder or builder.request_builder
-        return self._call_request_builder_helper(
-            builder, request_builder, template_url=template_url, is_next_request=True
-        )
+        if builder.next_request_builder or self.code_model.is_legacy:
+            return self._call_request_builder_helper(
+                builder,
+                request_builder,
+                template_url=template_url,
+                is_next_request=True,
+            )
+        retval = ['request = HttpRequest("GET", next_link)']
+        retval.extend(self._postprocess_http_request(builder, "request.url"))
+        return retval
 
     def _prepare_request_callback(self, builder: PagingOperationType) -> List[str]:
         retval = ["def prepare_request(next_link=None):"]
@@ -1148,10 +1155,7 @@ def _prepare_request_callback(self, builder: PagingOperationType) -> List[str]:
         retval.extend(
             [f"        {line}" for line in self.call_next_link_request_builder(builder)]
         )
-        if not builder.next_request_builder and builder.parameters.path:
-            retval.append("")
-            retval.extend([f"        {line}" for line in self.serialize_path(builder)])
-        if not builder.next_request_builder:
+        if not builder.next_request_builder and self.code_model.is_legacy:
             retval.append('        request.method = "GET"')
         else:
             retval.append("")

diff --git a/...les/specification/directives/generated/azure/directives/sample/_operations/_operations.py b/...les/specification/directives/generated/azure/directives/sample/_operations/_operations.py
@@ -311,13 +311,9 @@ def prepare_request(next_link=None):
                 request.url = self._client.format_url(request.url)  # type: ignore
 
             else:
+                request = HttpRequest("GET", next_link)
+                request.url = self._client.format_url(request.url)  # type: ignore
 
-                request = build_basic_paging_request(
-                    headers=_headers,
-                    params=_params,
-                )
-                request.url = self._client.format_url(next_link)  # type: ignore
-                request.method = "GET"
             return request
 
         def extract_data(pipeline_response):

diff --git a/...specification/directives/generated/azure/directives/sample/aio/_operations/_operations.py b/...specification/directives/generated/azure/directives/sample/aio/_operations/_operations.py
@@ -283,13 +283,9 @@ def prepare_request(next_link=None):
                 request.url = self._client.format_url(request.url)  # type: ignore
 
             else:
+                request = HttpRequest("GET", next_link)
+                request.url = self._client.format_url(request.url)  # type: ignore
 
-                request = build_basic_paging_request(
-                    headers=_headers,
-                    params=_params,
-                )
-                request.url = self._client.format_url(next_link)  # type: ignore
-                request.method = "GET"
             return request
 
         async def extract_data(pipeline_response):

diff --git a/.../AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/operations/_paging_operations.py b/.../AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/operations/_paging_operations.py
@@ -100,11 +100,6 @@ def prepare_request(next_link=None):
                     "host": self._serialize.url("self._config.host", self._config.host, "str", skip_quote=True),
                 }
                 request.url = self._client.format_url(request.url, **path_format_arguments)  # type: ignore
-
-                path_format_arguments = {
-                    "accountName": self._serialize.url("account_name", account_name, "str", skip_quote=True),
-                    "host": self._serialize.url("self._config.host", self._config.host, "str", skip_quote=True),
-                }
                 request.method = "GET"
             return request
 

diff --git a/...cted/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/operations/_paging_operations.py b/...cted/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/operations/_paging_operations.py
@@ -147,11 +147,6 @@ def prepare_request(next_link=None):
                     "host": self._serialize.url("self._config.host", self._config.host, "str", skip_quote=True),
                 }
                 request.url = self._client.format_url(request.url, **path_format_arguments)  # type: ignore
-
-                path_format_arguments = {
-                    "accountName": self._serialize.url("account_name", account_name, "str", skip_quote=True),
-                    "host": self._serialize.url("self._config.host", self._config.host, "str", skip_quote=True),
-                }
                 request.method = "GET"
             return request
 

diff --git a/...PollerPagerVersionTolerant/custompollerpagerversiontolerant/aio/operations/_operations.py b/...PollerPagerVersionTolerant/custompollerpagerversiontolerant/aio/operations/_operations.py
@@ -115,13 +115,9 @@ def prepare_request(next_link=None):
                 request.url = self._client.format_url(request.url)  # type: ignore
 
             else:
+                request = HttpRequest("GET", next_link)
+                request.url = self._client.format_url(request.url)  # type: ignore
 
-                request = build_paging_get_no_item_name_pages_request(
-                    headers=_headers,
-                    params=_params,
-                )
-                request.url = self._client.format_url(next_link)  # type: ignore
-                request.method = "GET"
             return request
 
         async def extract_data(pipeline_response):
@@ -184,13 +180,9 @@ def prepare_request(next_link=None):
                 request.url = self._client.format_url(request.url)  # type: ignore
 
             else:
+                request = HttpRequest("GET", next_link)
+                request.url = self._client.format_url(request.url)  # type: ignore
 
-                request = build_paging_get_null_next_link_name_pages_request(
-                    headers=_headers,
-                    params=_params,
-                )
-                request.url = self._client.format_url(next_link)  # type: ignore
-                request.method = "GET"
             return request
 
         async def extract_data(pipeline_response):
@@ -253,13 +245,9 @@ def prepare_request(next_link=None):
                 request.url = self._client.format_url(request.url)  # type: ignore
 
             else:
+                request = HttpRequest("GET", next_link)
+                request.url = self._client.format_url(request.url)  # type: ignore
 
-                request = build_paging_get_single_pages_request(
-                    headers=_headers,
-                    params=_params,
-                )
-                request.url = self._client.format_url(next_link)  # type: ignore
-                request.method = "GET"
             return request
 
         async def extract_data(pipeline_response):
@@ -323,13 +311,9 @@ def prepare_request(next_link=None):
                 request.url = self._client.format_url(request.url)  # type: ignore
 
             else:
+                request = HttpRequest("GET", next_link)
+                request.url = self._client.format_url(request.url)  # type: ignore
 
-                request = build_paging_first_response_empty_request(
-                    headers=_headers,
-                    params=_params,
-                )
-                request.url = self._client.format_url(next_link)  # type: ignore
-                request.method = "GET"
             return request
 
         async def extract_data(pipeline_response):
@@ -410,16 +394,9 @@ def prepare_request(next_link=None):
                 request.url = self._client.format_url(request.url)  # type: ignore
 
             else:
+                request = HttpRequest("GET", next_link)
+                request.url = self._client.format_url(request.url)  # type: ignore
 
-                request = build_paging_get_multiple_pages_request(
-                    client_request_id=client_request_id,
-                    maxresults=maxresults,
-                    timeout=timeout,
-                    headers=_headers,
-                    params=_params,
-                )
-                request.url = self._client.format_url(next_link)  # type: ignore
-                request.method = "GET"
             return request
 
         async def extract_data(pipeline_response):
@@ -568,13 +545,9 @@ def prepare_request(next_link=None):
                 request.url = self._client.format_url(request.url)  # type: ignore
 
             else:
+                request = HttpRequest("GET", next_link)
+                request.url = self._client.format_url(request.url)  # type: ignore
 
-                request = build_paging_duplicate_params_request(
-                    headers=_headers,
-                    params=_params,
-                )
-                request.url = self._client.format_url(next_link)  # type: ignore
-                request.method = "GET"
             return request
 
         async def extract_data(pipeline_response):
@@ -655,16 +628,9 @@ def prepare_request(next_link=None):
                 request.url = self._client.format_url(request.url)  # type: ignore
 
             else:
+                request = HttpRequest("GET", next_link)
+                request.url = self._client.format_url(request.url)  # type: ignore
 
-                request = build_paging_get_odata_multiple_pages_request(
-                    client_request_id=client_request_id,
-                    maxresults=maxresults,
-                    timeout=timeout,
-                    headers=_headers,
-                    params=_params,
-                )
-                request.url = self._client.format_url(next_link)  # type: ignore
-                request.method = "GET"
             return request
 
         async def extract_data(pipeline_response):
@@ -749,17 +715,9 @@ def prepare_request(next_link=None):
                 request.url = self._client.format_url(request.url)  # type: ignore
 
             else:
+                request = HttpRequest("GET", next_link)
+                request.url = self._client.format_url(request.url)  # type: ignore
 
-                request = build_paging_get_multiple_pages_with_offset_request(
-                    offset=offset,
-                    client_request_id=client_request_id,
-                    maxresults=maxresults,
-                    timeout=timeout,
-                    headers=_headers,
-                    params=_params,
-                )
-                request.url = self._client.format_url(next_link)  # type: ignore
-                request.method = "GET"
             return request
 
         async def extract_data(pipeline_response):
@@ -823,13 +781,9 @@ def prepare_request(next_link=None):
                 request.url = self._client.format_url(request.url)  # type: ignore
 
             else:
+                request = HttpRequest("GET", next_link)
+                request.url = self._client.format_url(request.url)  # type: ignore
 
-                request = build_paging_get_multiple_pages_retry_first_request(
-                    headers=_headers,
-                    params=_params,
-                )
-                request.url = self._client.format_url(next_link)  # type: ignore
-                request.method = "GET"
             return request
 
         async def extract_data(pipeline_response):
@@ -893,13 +847,9 @@ def prepare_request(next_link=None):
                 request.url = self._client.format_url(request.url)  # type: ignore
 
             else:
+                request = HttpRequest("GET", next_link)
+                request.url = self._client.format_url(request.url)  # type: ignore
 
-                request = build_paging_get_multiple_pages_retry_second_request(
-                    headers=_headers,
-                    params=_params,
-                )
-                request.url = self._client.format_url(next_link)  # type: ignore
-                request.method = "GET"
             return request
 
         async def extract_data(pipeline_response):
@@ -962,13 +912,9 @@ def prepare_request(next_link=None):
                 request.url = self._client.format_url(request.url)  # type: ignore
 
             else:
+                request = HttpRequest("GET", next_link)
+                request.url = self._client.format_url(request.url)  # type: ignore
 
-                request = build_paging_get_single_pages_failure_request(
-                    headers=_headers,
-                    params=_params,
-                )
-                request.url = self._client.format_url(next_link)  # type: ignore
-                request.method = "GET"
             return request
 
         async def extract_data(pipeline_response):
@@ -1031,13 +977,9 @@ def prepare_request(next_link=None):
                 request.url = self._client.format_url(request.url)  # type: ignore
 
             else:
+                request = HttpRequest("GET", next_link)
+                request.url = self._client.format_url(request.url)  # type: ignore
 
-                request = build_paging_get_multiple_pages_failure_request(
-                    headers=_headers,
-                    params=_params,
-                )
-                request.url = self._client.format_url(next_link)  # type: ignore
-                request.method = "GET"
             return request
 
         async def extract_data(pipeline_response):
@@ -1100,13 +1042,9 @@ def prepare_request(next_link=None):
                 request.url = self._client.format_url(request.url)  # type: ignore
 
             else:
+                request = HttpRequest("GET", next_link)
+                request.url = self._client.format_url(request.url)  # type: ignore
 
-                request = build_paging_get_multiple_pages_failure_uri_request(
-                    headers=_headers,
-                    params=_params,
-                )
-                request.url = self._client.format_url(next_link)  # type: ignore
-                request.method = "GET"
             return request
 
         async def extract_data(pipeline_response):
@@ -1401,16 +1339,9 @@ def prepare_request(next_link=None):
                 request.url = self._client.format_url(request.url)  # type: ignore
 
             else:
+                request = HttpRequest("GET", next_link)
+                request.url = self._client.format_url(request.url)  # type: ignore
 
-                request = build_paging_get_multiple_pages_lro_request(
-                    client_request_id=client_request_id,
-                    maxresults=maxresults,
-                    timeout=timeout,
-                    headers=_headers,
-                    params=_params,
-                )
-                request.url = self._client.format_url(next_link)  # type: ignore
-                request.method = "GET"
             return request
 
         async def extract_data(pipeline_response):
@@ -1510,13 +1441,9 @@ def prepare_request(next_link=None):
                 request.url = self._client.format_url(request.url)  # type: ignore
 
             else:
+                request = HttpRequest("GET", next_link)
+                request.url = self._client.format_url(request.url)  # type: ignore
 
-                request = build_paging_get_paging_model_with_item_name_with_xms_client_name_request(
-                    headers=_headers,
-                    params=_params,
-                )
-                request.url = self._client.format_url(next_link)  # type: ignore
-                request.method = "GET"
             return request
 
         async def extract_data(pipeline_response):