Merge pull request #2 from BenjaminArp/main

Fixed Bug in .txt files of model variants using the provided error_replacer.py

Author: SimonAdrian

dataset/anilallewar_microservices-basics-spring-boot/model_variants/12.txt

@@ -49,7 +49,7 @@ digraph dfd2{
         auth_server -> api_gateway [label = " --restful_http--\n"]
         api_gateway -> user_webservice [label = " --restful_http--\n--load_balanced_link--\n--circuit_breaker_link--\n"]
         api_gateway -> task_webservice [label = " --restful_http--\n--load_balanced_link--\n--circuit_breaker_link--\n"]
-        message_broker [label = "{Process: message_broker | --infrastructural--\n--message_broker--}" shape = Mrecord];
+        message_broker [label = "{Process: message_broker | --infrastructural--\n--message_broker--\n}" shape = Mrecord];
         message_broker -> web_portal [label = " --restful_http--\n"]
         user_webservice -> message_broker [label = " --restful_http--\n"]
         comments_webservice -> message_broker [label = " --restful_http--\n"]

dataset/anilallewar_microservices-basics-spring-boot/model_variants/18.txt

@@ -49,7 +49,7 @@ digraph dfd2{
         auth_server -> api_gateway [label = " --restful_http--\n"]
         api_gateway -> user_webservice [label = " --restful_http--\n--load_balanced_link--\n--circuit_breaker_link--\n"]
         api_gateway -> task_webservice [label = " --restful_http--\n--load_balanced_link--\n--circuit_breaker_link--\n"]
-        secret_manager [label = "{Process: secret_manager | --infrastructural--\n--secret_manager--}" shape = Mrecord];
+        secret_manager [label = "{Process: secret_manager | --infrastructural--\n--secret_manager--\n}" shape = Mrecord];
         api_gateway -> secret_manager [label = " --restful_http--"]
         configserver -> secret_manager [label = " --restful_http--"]
         webservice_registry -> secret_manager [label = " --restful_http--"]

dataset/apssouza22_java-microservice/model_variants/18.txt

@@ -57,7 +57,7 @@ digraph dfd2{
         mailer -> logstash [label = " --restful_http--\n"]
         jmx_monitoring [label = "{Process: jmx_monitoring | --internal--\n}" shape = Mrecord];
         todo_infra [label = "{Process: todo_infra | --internal--\n}" shape = Mrecord];
-        secret_manager [label = "{Process: secret_manager | --infrastructural-- \n --secret_manager--}" shape = Mrecord];
+        secret_manager [label = "{Process: secret_manager | --infrastructural-- \n --secret_manager--\n}" shape = Mrecord];
         config_server -> secret_manager [label = " --restful_http--\n"]
         admin -> secret_manager [label = " --restful_http--\n"]
         eureka_server -> secret_manager [label = " --restful_http--\n"]

dataset/callistaenterprise_blog-microservices/model_variants/18.txt

@@ -58,7 +58,7 @@ digraph dfd2{
         config_server -> edge_server [label = " --restful_http--\n"]
         edge_server -> auth_server [label = " --restful_http--\n"]
 
-        secret_manager [label = "{Process: secret_manager | --infrastructural-- \n --secret_manager--}" shape = Mrecord];
+        secret_manager [label = "{Process: secret_manager | --infrastructural-- \n --secret_manager--\n}" shape = Mrecord];
         elasticsearch -> secret_manager [label = " --restful_http--\n"]
         kibana -> secret_manager [label = " --restful_http--\n"]
         logstash -> secret_manager [label = " --restful_http--\n"]

dataset/error_replacer.py

@@ -0,0 +1,30 @@
+from pathlib import Path
+import re
+
+def replace_in_file(file_path):
+    try:
+        if not file_path.exists():
+            print(f"File does not exist: {file_path}")
+            return
+
+        content = file_path.read_text(encoding='utf-8')
+        modified_content = re.sub(r'--\}', r'--\\n}', content)
+
+        if content != modified_content:
+            file_path.write_text(modified_content, encoding='utf-8')
+            print(f"Updated file: {file_path}")
+        else:
+            print(f"No changes needed: {file_path}")
+
+    except Exception as e:
+        print(f"Error processing file {file_path}: {e}")
+
+def process_all_subfolders(root_dir):
+    root_path = Path(root_dir)
+    # Using rglob to recursively find all .txt files
+    for file_path in root_path.rglob('*.txt'):
+        replace_in_file(file_path)
+
+# Example usage:
+root_dir = Path(r'put\your\root\dir\here') #set root dir
+process_all_subfolders(root_dir)

dataset/ewolff_microservice-kafka/model_variants/10.txt

@@ -29,8 +29,8 @@ digraph dfd2{
         postgres -> shipping [label = " --jdbc--\n--plaintext_credentials_link--\n'Username': dbuser\n 'Password': dbpass\n"]
         postgres -> invoicing [label = " --jdbc--\n--plaintext_credentials_link--\n'Username': dbuser\n 'Password': dbpass\n"]
 
-        monitoring_dashboard [label = "{Process: monitoring_dashboard | \n--infrastructural--\n--monitoring_dashboard--\n--local_logging--}" shape = Mrecord];
-        logging_server [label = "{Process: logging_server | --infrastructural--\n--logging_server--}" shape = Mrecord];
+        monitoring_dashboard [label = "{Process: monitoring_dashboard | \n--infrastructural--\n--monitoring_dashboard--\n--local_logging--\n}" shape = Mrecord];
+        logging_server [label = "{Process: logging_server | --infrastructural--\n--logging_server--\n}" shape = Mrecord];
         logging_server -> monitoring_dashboard [label = " --restful_http--\n"]
         zookeeper -> logging_server [label = " --restful_http--\n"]
         kafka -> logging_server [label = " --restful_http--\n"]

dataset/ewolff_microservice-kafka/model_variants/11.txt

@@ -29,8 +29,8 @@ digraph dfd2{
         postgres -> shipping [label = " --jdbc--\n--plaintext_credentials_link--\n'Username': dbuser\n 'Password': dbpass\n"]
         postgres -> invoicing [label = " --jdbc--\n--plaintext_credentials_link--\n'Username': dbuser\n 'Password': dbpass\n"]
 
-        monitoring_dashboard [label = "{Process: monitoring_dashboard | \n--infrastructural--\n--monitoring_dashboard--\n--local_logging--}" shape = Mrecord];
-        logging_server [label = "{Process: logging_server | --infrastructural--\n--logging_server--}" shape = Mrecord];
+        monitoring_dashboard [label = "{Process: monitoring_dashboard | \n--infrastructural--\n--monitoring_dashboard--\n--local_logging--\n}" shape = Mrecord];
+        logging_server [label = "{Process: logging_server | --infrastructural--\n--logging_server--\n}" shape = Mrecord];
         logging_server -> monitoring_dashboard [label = " --restful_http--\n"]
         zookeeper -> logging_server [label = " --restful_http--\n"]
         kafka -> logging_server [label = " --restful_http--\n"]

dataset/ewolff_microservice-kafka/model_variants/12.txt

@@ -29,8 +29,8 @@ digraph dfd2{
         postgres -> shipping [label = " --jdbc--\n--plaintext_credentials_link--\n'Username': dbuser\n 'Password': dbpass\n"]
         postgres -> invoicing [label = " --jdbc--\n--plaintext_credentials_link--\n'Username': dbuser\n 'Password': dbpass\n"]
 
-        monitoring_dashboard [label = "{Process: monitoring_dashboard | \n--infrastructural--\n--monitoring_dashboard--\n--local_logging--}" shape = Mrecord];
-        logging_server [label = "{Process: logging_server | --infrastructural--\n--logging_server--}" shape = Mrecord];
+        monitoring_dashboard [label = "{Process: monitoring_dashboard | \n--infrastructural--\n--monitoring_dashboard--\n--local_logging--\n}" shape = Mrecord];
+        logging_server [label = "{Process: logging_server | --infrastructural--\n--logging_server--\n}" shape = Mrecord];
         logging_server -> monitoring_dashboard [label = " --restful_http--\n"]
         kafka -> logging_server [label = " --restful_http--\n"]
         zookeeper -> kafka [label = " --restful_http--\n"]

dataset/ewolff_microservice-kafka/model_variants/16.txt

@@ -29,7 +29,7 @@ digraph dfd2{
         postgres -> shipping [label = " --jdbc--\n--plaintext_credentials_link--\n'Username': dbuser\n 'Password': dbpass\n"]
         postgres -> invoicing [label = " --jdbc--\n--plaintext_credentials_link--\n'Username': dbuser\n 'Password': dbpass\n"]
 
-        service_discovery [label = "{Process: service_discovery | --infrastructural--\n--service_discovery--}" shape = Mrecord];
+        service_discovery [label = "{Process: service_discovery | --infrastructural--\n--service_discovery--\n}" shape = Mrecord];
         zookeeper -> service_discovery [label = " --restful_http--\n"]
         kafka -> service_discovery [label = " --restful_http--\n"]
         order -> service_discovery [label = " --restful_http--\n"]

dataset/ewolff_microservice-kafka/model_variants/17.txt

@@ -29,7 +29,7 @@ digraph dfd2{
         postgres -> shipping [label = " --jdbc--\n--plaintext_credentials_link--\n'Username': dbuser\n 'Password': dbpass\n"]
         postgres -> invoicing [label = " --jdbc--\n--plaintext_credentials_link--\n'Username': dbuser\n 'Password': dbpass\n"]
 
-        service_discovery [label = "{Process: service_discovery | --infrastructural--\n--service_discovery--\n--validate_registration--}" shape = Mrecord];
+        service_discovery [label = "{Process: service_discovery | --infrastructural--\n--service_discovery--\n--validate_registration--\n}" shape = Mrecord];
         zookeeper -> service_discovery [label = " --restful_http--\n"]
         kafka -> service_discovery [label = " --restful_http--\n"]
         order -> service_discovery [label = " --restful_http--\n"]