Clean-up - Unnecessary trailing underscores in Python Flask, AIOHttp, BluePlanet (#16249)

* Remove trailing underscore in security_controller_.py and base_model_.py

* Regenerating sample files

* Clean-up files with trailing underscore in samples

* Update security extension to use the new security_controller

* Regenerate unmaintained samples

samples/server/petstore/python-aiohttp-srclayout/.openapi-generator/FILES

@@ -6,12 +6,12 @@ src/openapi_server/__init__.py
 src/openapi_server/__main__.py
 src/openapi_server/controllers/__init__.py
 src/openapi_server/controllers/pet_controller.py
-src/openapi_server/controllers/security_controller_.py
+src/openapi_server/controllers/security_controller.py
 src/openapi_server/controllers/store_controller.py
 src/openapi_server/controllers/user_controller.py
 src/openapi_server/models/__init__.py
 src/openapi_server/models/api_response.py
-src/openapi_server/models/base_model_.py
+src/openapi_server/models/base_model.py
 src/openapi_server/models/category.py
 src/openapi_server/models/order.py
 src/openapi_server/models/pet.py

samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/models/api_response.py

@@ -4,7 +4,7 @@ from datetime import date, datetime
 
 from typing import List, Dict, Type
 
-from openapi_server.models.base_model_ import Model
+from openapi_server.models.base_model import Model
 from openapi_server import util
 
 

samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/models/category.py

@@ -4,7 +4,7 @@ from datetime import date, datetime
 
 from typing import List, Dict, Type
 
-from openapi_server.models.base_model_ import Model
+from openapi_server.models.base_model import Model
 from openapi_server import util
 
 

samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/models/order.py

@@ -4,7 +4,7 @@ from datetime import date, datetime
 
 from typing import List, Dict, Type
 
-from openapi_server.models.base_model_ import Model
+from openapi_server.models.base_model import Model
 from openapi_server import util
 
 

samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/models/pet.py

@@ -4,7 +4,7 @@ from datetime import date, datetime
 
 from typing import List, Dict, Type
 
-from openapi_server.models.base_model_ import Model
+from openapi_server.models.base_model import Model
 from openapi_server.models.category import Category
 from openapi_server.models.tag import Tag
 from openapi_server import util

samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/models/tag.py

@@ -4,7 +4,7 @@ from datetime import date, datetime
 
 from typing import List, Dict, Type
 
-from openapi_server.models.base_model_ import Model
+from openapi_server.models.base_model import Model
 from openapi_server import util
 
 

samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/models/user.py

@@ -4,7 +4,7 @@ from datetime import date, datetime
 
 from typing import List, Dict, Type
 
-from openapi_server.models.base_model_ import Model
+from openapi_server.models.base_model import Model
 from openapi_server import util
 
 

samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/openapi/openapi.yaml

@@ -819,11 +819,11 @@ components:
             write:pets: modify pets in your account
             read:pets: read your pets
       type: oauth2
-      x-tokenInfoFunc: openapi_server.controllers.security_controller_.info_from_petstore_auth
-      x-scopeValidateFunc: openapi_server.controllers.security_controller_.validate_scope_petstore_auth
+      x-tokenInfoFunc: openapi_server.controllers.security_controller.info_from_petstore_auth
+      x-scopeValidateFunc: openapi_server.controllers.security_controller.validate_scope_petstore_auth
     api_key:
       in: header
       name: api_key
       type: apiKey
-      x-apikeyInfoFunc: openapi_server.controllers.security_controller_.info_from_api_key
+      x-apikeyInfoFunc: openapi_server.controllers.security_controller.info_from_api_key
 x-original-swagger-version: "2.0"