Move get_filter_fields to descriptor

Author: carltongibson

rest_framework/schemas.py

@@ -280,9 +280,9 @@ def get_link(self, path, method, generator):
         fields = self.get_path_fields(path, method)
         fields += self.get_serializer_fields(path, method)
         fields += self.get_pagination_fields(path, method)
+        fields += self.get_filter_fields(path, method)
 
         # TEMP: now we proxy back to the generator
-        fields += generator.get_filter_fields(path, method, view)
 
         if fields and any([field.location in ('form', 'body') for field in fields]):
             encoding = generator.get_encoding(path, method, view)
@@ -442,6 +442,19 @@ def get_pagination_fields(self, path, method):
         paginator = view.pagination_class()
         return paginator.get_schema_fields(view)
 
+    def get_filter_fields(self, path, method):
+        view = self.view
+
+        if not is_list_view(path, method, view):
+            return []
+
+        if not getattr(view, 'filter_backends', None):
+            return []
+
+        fields = []
+        for filter_backend in view.filter_backends:
+            fields += filter_backend().get_schema_fields(view)
+        return fields
 
 # TODO: Where should this live?
 #   - We import APIView here. So we can't import the descriptor into `views`
@@ -650,18 +663,6 @@ def get_encoding(self, path, method, view):
 
         return None
 
-    def get_filter_fields(self, path, method, view):
-        if not is_list_view(path, method, view):
-            return []
-
-        if not getattr(view, 'filter_backends', None):
-            return []
-
-        fields = []
-        for filter_backend in view.filter_backends:
-            fields += filter_backend().get_schema_fields(view)
-        return fields
-
     # Method for generating the link layout....
 
     def get_keys(self, subpath, method, view):