From 5bfbad301ee903ea8bc342b97cade3392394774b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leon=20M=C3=B6ller?= <leon.moeller@plt.rwth-aachen.de>
Date: Fri, 15 Mar 2024 18:18:28 +0100
Subject: [PATCH] adapter.http: remove `/submodel` submount from Submodel
 repository

---
 basyx/aas/adapter/http.py | 68 ++++++++++++++++++---------------------
 1 file changed, 32 insertions(+), 36 deletions(-)

diff --git a/basyx/aas/adapter/http.py b/basyx/aas/adapter/http.py
index e55fddff3..6601befcc 100644
--- a/basyx/aas/adapter/http.py
+++ b/basyx/aas/adapter/http.py
@@ -438,47 +438,43 @@ def __init__(self, object_store: model.AbstractObjectStore):
                         Rule("/", methods=["GET"], endpoint=self.get_submodel),
                         Rule("/", methods=["PUT"], endpoint=self.put_submodel),
                         Rule("/", methods=["DELETE"], endpoint=self.delete_submodel),
-                        Submount("/submodel", [
-                            Rule("/", methods=["GET"], endpoint=self.get_submodel),
-                            Rule("/", methods=["PUT"], endpoint=self.put_submodel),
-                            Submount("/submodel-elements", [
-                                Rule("/", methods=["GET"], endpoint=self.get_submodel_submodel_elements),
+                        Submount("/submodel-elements", [
+                            Rule("/", methods=["GET"], endpoint=self.get_submodel_submodel_elements),
+                            Rule("/", methods=["POST"],
+                                 endpoint=self.post_submodel_submodel_elements_id_short_path),
+                            Submount("/<id_short_path:id_shorts>", [
+                                Rule("/", methods=["GET"],
+                                     endpoint=self.get_submodel_submodel_elements_id_short_path),
                                 Rule("/", methods=["POST"],
                                      endpoint=self.post_submodel_submodel_elements_id_short_path),
-                                Submount("/<id_short_path:id_shorts>", [
+                                Rule("/", methods=["PUT"],
+                                     endpoint=self.put_submodel_submodel_elements_id_short_path),
+                                Rule("/", methods=["DELETE"],
+                                     endpoint=self.delete_submodel_submodel_elements_id_short_path),
+                                Submount("/constraints", [
                                     Rule("/", methods=["GET"],
-                                         endpoint=self.get_submodel_submodel_elements_id_short_path),
+                                         endpoint=self.get_submodel_submodel_element_constraints),
                                     Rule("/", methods=["POST"],
-                                         endpoint=self.post_submodel_submodel_elements_id_short_path),
-                                    Rule("/", methods=["PUT"],
-                                         endpoint=self.put_submodel_submodel_elements_id_short_path),
-                                    Rule("/", methods=["DELETE"],
-                                         endpoint=self.delete_submodel_submodel_elements_id_short_path),
-                                    Submount("/constraints", [
-                                        Rule("/", methods=["GET"],
-                                             endpoint=self.get_submodel_submodel_element_constraints),
-                                        Rule("/", methods=["POST"],
-                                             endpoint=self.post_submodel_submodel_element_constraints),
-                                        Rule("/<path:qualifier_type>/", methods=["GET"],
-                                             endpoint=self.get_submodel_submodel_element_constraints),
-                                        Rule("/<path:qualifier_type>/", methods=["PUT"],
-                                             endpoint=self.put_submodel_submodel_element_constraints),
-                                        Rule("/<path:qualifier_type>/", methods=["DELETE"],
-                                             endpoint=self.delete_submodel_submodel_element_constraints),
-                                    ])
-                                ]),
+                                         endpoint=self.post_submodel_submodel_element_constraints),
+                                    Rule("/<path:qualifier_type>/", methods=["GET"],
+                                         endpoint=self.get_submodel_submodel_element_constraints),
+                                    Rule("/<path:qualifier_type>/", methods=["PUT"],
+                                         endpoint=self.put_submodel_submodel_element_constraints),
+                                    Rule("/<path:qualifier_type>/", methods=["DELETE"],
+                                         endpoint=self.delete_submodel_submodel_element_constraints),
+                                ])
                             ]),
-                            Submount("/constraints", [
-                                Rule("/", methods=["GET"], endpoint=self.get_submodel_submodel_element_constraints),
-                                Rule("/", methods=["POST"],
-                                     endpoint=self.post_submodel_submodel_element_constraints),
-                                Rule("/<path:qualifier_type>/", methods=["GET"],
-                                     endpoint=self.get_submodel_submodel_element_constraints),
-                                Rule("/<path:qualifier_type>/", methods=["PUT"],
-                                     endpoint=self.put_submodel_submodel_element_constraints),
-                                Rule("/<path:qualifier_type>/", methods=["DELETE"],
-                                     endpoint=self.delete_submodel_submodel_element_constraints),
-                            ])
+                        ]),
+                        Submount("/constraints", [
+                            Rule("/", methods=["GET"], endpoint=self.get_submodel_submodel_element_constraints),
+                            Rule("/", methods=["POST"],
+                                 endpoint=self.post_submodel_submodel_element_constraints),
+                            Rule("/<path:qualifier_type>/", methods=["GET"],
+                                 endpoint=self.get_submodel_submodel_element_constraints),
+                            Rule("/<path:qualifier_type>/", methods=["PUT"],
+                                 endpoint=self.put_submodel_submodel_element_constraints),
+                            Rule("/<path:qualifier_type>/", methods=["DELETE"],
+                                 endpoint=self.delete_submodel_submodel_element_constraints),
                         ])
                     ])
                 ])