Reorganize validation endpoints under the same validation namespace

Author: cwang39403

esdlvalidator/api/controller/validationToMessages.py

@@ -12,17 +12,16 @@
 parser.add_argument("schemas", type=str, help="List of schema id's, comma separated", required=True)
 
 
-@app.ns_validation_to_msgs.route('/')
+@app.ns_validation.route('/validationToMessages')
 class ValidationToMessagesController(Resource):
-    """Validate an ESDL file and return an ESDL with notes"""
 
-    @app.ns_validation_to_msgs.doc(description="Post a new validation schema", responses={
+    @app.ns_validation.doc(description="Post a new validation schema", responses={
         200: "Ok",
         404: "Schema not found",
         400: "Unknown filetype, Invalid ESDL"})
     @app.api.expect(parser, validate=True)
     def post(self):
-        """Validate an ESDL file against one or more validation schemas"""
+        """Validate an ESDL file against one or more validation schemas and return JSON"""
         if request.data:
             # 'Contains the incoming request data as string in case it came with a mimetype Flask does not handle'
             # > Happens with requests from the mapeditor

esdlvalidator/api/controller/validationToNotes.py

@@ -15,17 +15,16 @@
 parser = app.api.parser()
 
 
-@app.ns_validation_to_notes.route('/')
+@app.ns_validation.route('/validationToNotes')
 class ValidationToNotesController(Resource):
-    """Validate an ESDL file and return an ESDL with notes"""
 
-    @app.ns_validation_to_notes.doc(deprecated=True, description="Post a new validation schema", responses={
+    @app.ns_validation.doc(deprecated=True, description="Post a new validation schema", responses={
         200: "Ok",
         404: "Schema not found",
         400: "Unknown filetype, Invalid ESDL"})
     @app.api.expect(parser, validate=True)
     def post(self):
-        """Validate an ESDL file against one or more validation schemas"""
+        """Validate an ESDL file against one or more validation schemas and return an ESDL with notes"""
 
         file = request.data.decode('utf-8')
         if "schemas" not in request.args:

esdlvalidator/api/setup.py

@@ -48,6 +48,4 @@ def __init__(self):
         self.apiBlueprint = Blueprint("api", __name__)
         self.api = Api(self.apiBlueprint, version=self.settings.version, title=self.settings.title, description=self.settings.description)
         self.ns_validation = self.api.namespace("validation", "ESDL validation endpoint")
-        self.ns_validation_to_notes = self.api.namespace("validationToNotes", "ESDL validation endpoint")
-        self.ns_validation_to_msgs = self.api.namespace("validationToMessages", "ESDL validation endpoint to return JSON")
         self.ns_schema = self.api.namespace("schema", "Validation schema endpoint")