fix conflict

litestar/_openapi/responses.py

@@ -223,7 +223,7 @@ def set_success_response_headers(self, response: OpenAPIResponse) -> None:
 
             response.headers[response_header.name] = header
 
-        if cookies := self.route_handler.resolve_response_cookies():
+        if cookies := self.route_handler.response_cookies:
             response.headers["Set-Cookie"] = OpenAPIHeader(
                 schema=Schema(
                     all_of=[create_cookie_schema(cookie=cookie) for cookie in sorted(cookies, key=attrgetter("key"))]

litestar/app.py

@@ -565,7 +565,7 @@ def _get_default_plugins(plugins: list[PluginProtocol]) -> list[PluginProtocol]:
             if not pydantic_plugin_found and not pydantic_serialization_plugin_found:
                 plugins.append(PydanticDIPlugin())
         with suppress(MissingDependencyException):
-            from litestar.contrib.attrs import AttrsSchemaPlugin
+            from litestar.plugins.attrs import AttrsSchemaPlugin
 
             pre_configured = any(isinstance(plugin, AttrsSchemaPlugin) for plugin in plugins)
             if not pre_configured:

litestar/handlers/http_handlers/base.py

@@ -535,7 +535,7 @@ def on_registration(self, route: BaseRoute, app: Litestar) -> None:
         self._default_response_handler, self._response_type_handler = self._create_response_handlers(
             media_type=self.media_type,
             response_class=self.response_class,
-            cookies=self.resolve_response_cookies(),
+            cookies=self.response_cookies,
             headers=self.response_headers,
             type_encoders=self.type_encoders,
             return_type=self.parsed_fn_signature.return_type,

litestar/handlers/http_handlers/decorators.py

@@ -614,7 +614,7 @@ def patch(
     type_decoders: TypeDecodersSequence | None = None,
     type_encoders: TypeEncodersMap | None = None,
     handler_class: type[HTTPRouteHandler] = HTTPRouteHandler,
-    handler_class: type[HTTPRouteHandler] = HTTPRouteHandler,**kwargs: Any,
+    **kwargs: Any,
 ) -> Callable[[AnyCallable], HTTPRouteHandler]:
     """Create an :class:`HTTPRouteHandler` with a ``PATCH`` method.
 
@@ -786,7 +786,7 @@ def post(
     type_decoders: TypeDecodersSequence | None = None,
     type_encoders: TypeEncodersMap | None = None,
     handler_class: type[HTTPRouteHandler] = HTTPRouteHandler,
-    handler_class: type[HTTPRouteHandler] = HTTPRouteHandler,**kwargs: Any,
+    **kwargs: Any,
 ) -> Callable[[AnyCallable], HTTPRouteHandler]:
     """Create an :class:`HTTPRouteHandler` with a ``POST`` method.
 
@@ -958,7 +958,7 @@ def put(
     type_decoders: TypeDecodersSequence | None = None,
     type_encoders: TypeEncodersMap | None = None,
     handler_class: type[HTTPRouteHandler] = HTTPRouteHandler,
-    handler_class: type[HTTPRouteHandler] = HTTPRouteHandler,**kwargs: Any,
+    **kwargs: Any,
 ) -> Callable[[AnyCallable], HTTPRouteHandler]:
     """Create an :class:`HTTPRouteHandler` with a ``PUT`` method.
 

tests/unit/test_response/test_response_cookies.py

@@ -38,7 +38,7 @@ def test_method(self) -> None:
         route_handlers=[first_router, second_router],
     )
     route_handler = app.routes[0].route_handler_map["GET"]  # type: ignore[union-attr]
-    response_cookies = {cookie.key: cookie.value for cookie in route_handler.resolve_response_cookies()}
+    response_cookies = {cookie.key: cookie.value for cookie in route_handler.response_cookies}
     assert response_cookies["first"] == local_first.value
     assert response_cookies["second"] == controller_second.value
     assert response_cookies["third"] == router_second.value
@@ -55,7 +55,7 @@ def handler_one() -> None:
     def handler_two() -> None:
         pass
 
-    assert handler_one.resolve_response_cookies() == handler_two.resolve_response_cookies()
+    assert handler_one.resolve_response_cookies() == handler_two.response_cookies
 
 
 def test_response_cookie_rendering() -> None: