[OpenAPI] - Address review feedback

Author: keyz182

rest_framework_json_api/django_filters/backends.py

@@ -131,9 +131,8 @@ def get_schema_operation_parameters(self, view):
 
         This is basically the reverse of `get_filterset_kwargs` above.
         """
-        result = []
-        for res in super(DjangoFilterBackend, self).get_schema_operation_parameters(view):
+        result = super(DjangoFilterBackend, self).get_schema_operation_parameters(view)
+        for res in result:
             if 'name' in res:
                 res['name'] = 'filter[{}]'.format(res['name']).replace('__', '.')
-            result.append(res)
         return result

rest_framework_json_api/schemas/openapi.py

@@ -271,27 +271,14 @@ class SchemaGenerator(drf_openapi.SchemaGenerator):
     Extend DRF's SchemaGenerator to implement jsonapi-flavored generateschema command
     """
     def __init__(self, *args, **kwargs):
-        self.openapi_schema = {}
         super().__init__(*args, **kwargs)
 
     def get_schema(self, request=None, public=False):
         """
         Generate a JSONAPI OpenAPI schema.
         """
-        self._initialise_endpoints()
-
-        paths = self.get_paths(None if public else request)
-        if not paths:
-            return None
-
-        schema = {
-            'openapi': '3.0.2',
-            'info': self.get_info(),
-            'paths': paths,
-            'components': JSONAPI_COMPONENTS,
-        }
-
-        return {**schema, **self.openapi_schema}
+        schema = super().get_schema(request, public)
+        return {**schema, 'components': JSONAPI_COMPONENTS}
 
     def get_paths(self, request=None):
         """
@@ -346,9 +333,6 @@ def get_paths(self, request=None):
 
             result.setdefault(path, {})
             result[path][method.lower()] = operation
-            if hasattr(view.schema, 'openapi_schema'):
-                # TODO: shallow or deep merge?
-                self.openapi_schema = {**self.openapi_schema, **view.schema.openapi_schema}
 
         return result
 
@@ -439,21 +423,11 @@ class AutoSchema(drf_openapi.AutoSchema):
     """
     content_types = ['application/vnd.api+json']
 
-    def __init__(self, openapi_schema={}):
+    def __init__(self):
         """
         Initialize the JSONAPI OAS schema generator
-        :param openapi_schema: dict: OAS 3.0 document with initial values.
         """
         super().__init__()
-        #: allow initialization of OAS schema doc
-        self.openapi_schema = openapi_schema
-        # static JSONAPI fields that get $ref'd to in the view mappings
-        jsonapi_ref = {
-            'components': JSONAPI_COMPONENTS
-        }
-        # merge in our reference data on top of anything provided by the init.
-        # TODO: shallow or deep merge?
-        self.openapi_schema = {**self.openapi_schema, **jsonapi_ref}
 
     def get_operation(self, path, method, action=None):
         """ basically a copy of AutoSchema.get_operation """

tox.ini

@@ -15,7 +15,6 @@ deps =
     drf310: djangorestframework>=3.10.2,<3.11
     drf311: djangorestframework>=3.11,<3.12
     drfmaster: https://github.com/encode/django-rest-framework/archive/master.zip
-    coreapi>=2.3.1
     snapshottest>=0.5.1
     -rrequirements/requirements-testing.txt
     -rrequirements/requirements-optionals.txt