diff --git a/acmeair-acmeair/model_re/README.md b/acmeair-acmeair/model_re/README.md
index 04edba6735..22a255f1dc 100644
--- a/acmeair-acmeair/model_re/README.md
+++ b/acmeair-acmeair/model_re/README.md
@@ -2,13 +2,13 @@
| Attribute | Value |
| ------------------ | ----- |
| Retriever Version | v5.2.0.202408280745 |
-| Date | Sun Sep 1 18:39:47 UTC 2024 |
+| Date | Mon Sep 2 06:33:01 UTC 2024 |
| #Components | 19 |
| #Source Files | 106 |
| Lines of Code | 7426 |
| #Technologies | 6 |
| Abstraction | 5.57 |
-| Execution Time [s] | 8.32 |
+| Execution Time [s] | 4.574 ± 0.096 |
## Git repository information
| Attribute | Value |
@@ -27,26 +27,18 @@
| OS | Linux |
| Distro | Ubuntu 22.04.4 LTS x86_64 |
| Kernel | 6.5.0-1025-azure |
-| CPU | AMD EPYC 7763 (4) @ 2.939GHz |
+| CPU | AMD EPYC 7763 (4) @ 3.247GHz |
| GPU | 00:08.0 Microsoft Corporation Hyper-V virtual VGA |
-| Memory | 790MiB / 15981MiB |
+| Memory | 784MiB / 15981MiB |
## Retriever execution time
-| Metric | Time (seconds) |
-| --- | ---: |
-| Real CPU Time | 8.32 |
-| User CPU Time | 17.95 |
-| System CPU Time | 0.76 |
-
+| Mean [s] | Min [s] | Max [s] | Relative |
+|---:|---:|---:|---:|
+| 4.574 ± 0.096 | 4.418 | 4.705 | 1.00 |
## Cloc analysis
-
+
|Technology|files|blank|comment|code|
|:-------|-------:|-------:|-------:|-------:|
diff --git a/acmeair-acmeair/model_re/pcm/acmeair-acmeair.resourceenvironment b/acmeair-acmeair/model_re/pcm/acmeair-acmeair.resourceenvironment
index e22f71b756..d2aaf3ac40 100644
--- a/acmeair-acmeair/model_re/pcm/acmeair-acmeair.resourceenvironment
+++ b/acmeair-acmeair/model_re/pcm/acmeair-acmeair.resourceenvironment
@@ -1,88 +1,88 @@
-
+
-
+
-
-
-
-
+
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
+
-
-
+
+
-
+
-
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/acmeair-acmeair/model_re/uml/componentDiagram.svg b/acmeair-acmeair/model_re/uml/componentDiagram.svg
index 1342b5d15d..750cece308 100644
--- a/acmeair-acmeair/model_re/uml/componentDiagram.svg
+++ b/acmeair-acmeair/model_re/uml/componentDiagram.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/acmeair-acmeair/model_re/uml/systemDiagram.svg b/acmeair-acmeair/model_re/uml/systemDiagram.svg
index 2196a53283..4008e71ef3 100644
--- a/acmeair-acmeair/model_re/uml/systemDiagram.svg
+++ b/acmeair-acmeair/model_re/uml/systemDiagram.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/anilallewar-microservices-basics-spring-boot/model_re/README.md b/anilallewar-microservices-basics-spring-boot/model_re/README.md
index bdbeeec753..66a0798b4c 100644
--- a/anilallewar-microservices-basics-spring-boot/model_re/README.md
+++ b/anilallewar-microservices-basics-spring-boot/model_re/README.md
@@ -2,13 +2,13 @@
| Attribute | Value |
| ------------------ | ----- |
| Retriever Version | v5.2.0.202408280745 |
-| Date | Sun Sep 1 18:20:58 UTC 2024 |
+| Date | Mon Sep 2 06:33:10 UTC 2024 |
| #Components | 10 |
| #Source Files | 107 |
| Lines of Code | 3859 |
| #Technologies | 7 |
| Abstraction | 10.70 |
-| Execution Time [s] | 6.68 |
+| Execution Time [s] | 3.387 ± 0.028 |
## Git repository information
| Attribute | Value |
@@ -17,7 +17,7 @@
| Branch | master |
| Commit | ac0a249156471ad98fa5ba5508fda9deabba6975 |
| Number of Commits | 46 |
-| Stars | 711 |
+| Stars | 712 |
| Contributors | 5 |
@@ -27,26 +27,18 @@
| OS | Linux |
| Distro | Ubuntu 22.04.4 LTS x86_64 |
| Kernel | 6.5.0-1025-azure |
-| CPU | AMD EPYC 7763 (4) @ 2.692GHz |
+| CPU | AMD EPYC 7763 (4) @ 2.445GHz |
| GPU | 00:08.0 Microsoft Corporation Hyper-V virtual VGA |
-| Memory | 786MiB / 15981MiB |
+| Memory | 805MiB / 15981MiB |
## Retriever execution time
-| Metric | Time (seconds) |
-| --- | ---: |
-| Real CPU Time | 6.68 |
-| User CPU Time | 13.62 |
-| System CPU Time | 0.65 |
-
+| Mean [s] | Min [s] | Max [s] | Relative |
+|---:|---:|---:|---:|
+| 3.387 ± 0.028 | 3.347 | 3.429 | 1.00 |
## Cloc analysis
-
+
|Technology|files|blank|comment|code|
|:-------|-------:|-------:|-------:|-------:|
diff --git a/anilallewar-microservices-basics-spring-boot/model_re/pcm/anilallewar-microservices-basics-spring-boot.resourceenvironment b/anilallewar-microservices-basics-spring-boot/model_re/pcm/anilallewar-microservices-basics-spring-boot.resourceenvironment
index 91a668e936..b1b373ff48 100644
--- a/anilallewar-microservices-basics-spring-boot/model_re/pcm/anilallewar-microservices-basics-spring-boot.resourceenvironment
+++ b/anilallewar-microservices-basics-spring-boot/model_re/pcm/anilallewar-microservices-basics-spring-boot.resourceenvironment
@@ -1,19 +1,19 @@
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/anilallewar-microservices-basics-spring-boot/model_re/uml/systemDiagram.svg b/anilallewar-microservices-basics-spring-boot/model_re/uml/systemDiagram.svg
index d61d47224a..e8a247f464 100644
--- a/anilallewar-microservices-basics-spring-boot/model_re/uml/systemDiagram.svg
+++ b/anilallewar-microservices-basics-spring-boot/model_re/uml/systemDiagram.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/apssouza22-java-microservice/model_re/pcm/apssouza22-java-microservice.resourceenvironment b/apssouza22-java-microservice/model_re/pcm/apssouza22-java-microservice.resourceenvironment
index b5f0452f68..8fa152a294 100644
--- a/apssouza22-java-microservice/model_re/pcm/apssouza22-java-microservice.resourceenvironment
+++ b/apssouza22-java-microservice/model_re/pcm/apssouza22-java-microservice.resourceenvironment
@@ -1,110 +1,110 @@
-
+
-
+
-
-
-
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
+
+
+
-
+
-
-
-
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
+
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apssouza22-java-microservice/model_re/uml/allocationDiagram.puml b/apssouza22-java-microservice/model_re/uml/allocationDiagram.puml
index 3219a7510b..eebf7c5aba 100644
--- a/apssouza22-java-microservice/model_re/uml/allocationDiagram.puml
+++ b/apssouza22-java-microservice/model_re/uml/allocationDiagram.puml
@@ -3,80 +3,80 @@ skinparam fixCircleLabelOverlapping true
skinparam componentStyle uml2
node nodecom_apssouza {
component com_apssouza {
-[com_apssouza_bootstrap_UserLoader] [[apssouza22-java-microservice.system#__Q6LvGiGEe-yX_VezXGozw]]
-[com_apssouza_controllers_AccountController] [[apssouza22-java-microservice.system#__Q6LvGiGEe-yX_VezXGozw]]
-[com_apssouza_repositories_AccountRepository] [[apssouza22-java-microservice.system#__Q6LvGiGEe-yX_VezXGozw]]
-[com_apssouza_services_AccountServiceImpl] [[apssouza22-java-microservice.system#__Q6LvGiGEe-yX_VezXGozw]]
+[com_apssouza_eventsourcing_commands_EmailCommandHandler] [[apssouza22-java-microservice.system#_Q4Bpamj1Ee-KeOD_Iaqkxg]]
+[com_apssouza_mailservice_controllers_NotifyController] [[apssouza22-java-microservice.system#_Q4Bpamj1Ee-KeOD_Iaqkxg]]
}
}
node nodecom_apssouza_2 {
component com_apssouza_2 {
-[com_apssouza_controllers_TodoChangesController] [[apssouza22-java-microservice.system#__Q6LvGiGEe-yX_VezXGozw]]
-[com_apssouza_monitors_TodoStoreEventChanges] [[apssouza22-java-microservice.system#__Q6LvGiGEe-yX_VezXGozw]]
+[com_apssouza_bootstrap_UserLoader] [[apssouza22-java-microservice.system#_Q4Bpamj1Ee-KeOD_Iaqkxg]]
+[com_apssouza_controllers_AccountController] [[apssouza22-java-microservice.system#_Q4Bpamj1Ee-KeOD_Iaqkxg]]
+[com_apssouza_repositories_AccountRepository] [[apssouza22-java-microservice.system#_Q4Bpamj1Ee-KeOD_Iaqkxg]]
+[com_apssouza_services_AccountServiceImpl] [[apssouza22-java-microservice.system#_Q4Bpamj1Ee-KeOD_Iaqkxg]]
}
}
node nodecom_apssouza_3 {
component com_apssouza_3 {
-[com_apssouza_controllers_TodoServiceStatisticsController] [[apssouza22-java-microservice.system#__Q6LvGiGEe-yX_VezXGozw]]
-[com_apssouza_monitors_TodoServiceMethodInvokedStore] [[apssouza22-java-microservice.system#__Q6LvGiGEe-yX_VezXGozw]]
+[com_apssouza_controllers_TodoChangesController] [[apssouza22-java-microservice.system#_Q4Bpamj1Ee-KeOD_Iaqkxg]]
+[com_apssouza_monitors_TodoStoreEventChanges] [[apssouza22-java-microservice.system#_Q4Bpamj1Ee-KeOD_Iaqkxg]]
}
}
node nodecom_apssouza_4 {
component com_apssouza_4 {
-[TodoController] [[apssouza22-java-microservice.system#__Q6LvGiGEe-yX_VezXGozw]]
-[com_apssouza_bootstrap_TodoLoader] [[apssouza22-java-microservice.system#__Q6LvGiGEe-yX_VezXGozw]]
-[com_apssouza_controllers_TodoController] [[apssouza22-java-microservice.system#__Q6LvGiGEe-yX_VezXGozw]]
-[com_apssouza_controllers_UserController] [[apssouza22-java-microservice.system#__Q6LvGiGEe-yX_VezXGozw]]
-[com_apssouza_infra_EventPublisher] [[apssouza22-java-microservice.system#__Q6LvGiGEe-yX_VezXGozw]]
-[com_apssouza_repositories_TodoRepository] [[apssouza22-java-microservice.system#__Q6LvGiGEe-yX_VezXGozw]]
-[com_apssouza_services_TodoServiceImpl] [[apssouza22-java-microservice.system#__Q6LvGiGEe-yX_VezXGozw]]
-[com_apssouza_services_UserServiceImpl] [[apssouza22-java-microservice.system#__Q6LvGiGEe-yX_VezXGozw]]
+[com_apssouza_controllers_TodoServiceStatisticsController] [[apssouza22-java-microservice.system#_Q4Bpamj1Ee-KeOD_Iaqkxg]]
+[com_apssouza_monitors_TodoServiceMethodInvokedStore] [[apssouza22-java-microservice.system#_Q4Bpamj1Ee-KeOD_Iaqkxg]]
}
}
node nodecom_apssouza_5 {
component com_apssouza_5 {
-[com_apssouza_eventsourcing_commands_EmailCommandHandler] [[apssouza22-java-microservice.system#__Q6LvGiGEe-yX_VezXGozw]]
-[com_apssouza_mailservice_controllers_NotifyController] [[apssouza22-java-microservice.system#__Q6LvGiGEe-yX_VezXGozw]]
+[TodoController] [[apssouza22-java-microservice.system#_Q4Bpamj1Ee-KeOD_Iaqkxg]]
+[com_apssouza_bootstrap_TodoLoader] [[apssouza22-java-microservice.system#_Q4Bpamj1Ee-KeOD_Iaqkxg]]
+[com_apssouza_controllers_TodoController] [[apssouza22-java-microservice.system#_Q4Bpamj1Ee-KeOD_Iaqkxg]]
+[com_apssouza_controllers_UserController] [[apssouza22-java-microservice.system#_Q4Bpamj1Ee-KeOD_Iaqkxg]]
+[com_apssouza_infra_EventPublisher] [[apssouza22-java-microservice.system#_Q4Bpamj1Ee-KeOD_Iaqkxg]]
+[com_apssouza_repositories_TodoRepository] [[apssouza22-java-microservice.system#_Q4Bpamj1Ee-KeOD_Iaqkxg]]
+[com_apssouza_services_TodoServiceImpl] [[apssouza22-java-microservice.system#_Q4Bpamj1Ee-KeOD_Iaqkxg]]
+[com_apssouza_services_UserServiceImpl] [[apssouza22-java-microservice.system#_Q4Bpamj1Ee-KeOD_Iaqkxg]]
}
}
node nodecom_apssouza_eventsourcing {
component com_apssouza_eventsourcing {
-[com_apssouza_eventsourcing_eventstore_EventSerializer] [[apssouza22-java-microservice.system#__Q6LvGiGEe-yX_VezXGozw]]
-[com_apssouza_eventsourcing_eventstore_EventStoreRepository] [[apssouza22-java-microservice.system#__Q6LvGiGEe-yX_VezXGozw]]
-[com_apssouza_eventsourcing_services_EventSourcingServiceImpl] [[apssouza22-java-microservice.system#__Q6LvGiGEe-yX_VezXGozw]]
+[com_apssouza_eventsourcing_eventstore_EventSerializer] [[apssouza22-java-microservice.system#_Q4Bpamj1Ee-KeOD_Iaqkxg]]
+[com_apssouza_eventsourcing_eventstore_EventStoreRepository] [[apssouza22-java-microservice.system#_Q4Bpamj1Ee-KeOD_Iaqkxg]]
+[com_apssouza_eventsourcing_services_EventSourcingServiceImpl] [[apssouza22-java-microservice.system#_Q4Bpamj1Ee-KeOD_Iaqkxg]]
}
}
node nodecom_apssouza_mailservice {
component com_apssouza_mailservice {
-[com_apssouza_mailservice_controllers_EmailController] [[apssouza22-java-microservice.system#__Q6LvGiGEe-yX_VezXGozw]]
-[com_apssouza_mailservice_repository_EmailRepository] [[apssouza22-java-microservice.system#__Q6LvGiGEe-yX_VezXGozw]]
+[com_apssouza_mailservice_controllers_EmailController] [[apssouza22-java-microservice.system#_Q4Bpamj1Ee-KeOD_Iaqkxg]]
+[com_apssouza_mailservice_repository_EmailRepository] [[apssouza22-java-microservice.system#_Q4Bpamj1Ee-KeOD_Iaqkxg]]
}
}
node nodeUserClient {
-[UserClient] [[apssouza22-java-microservice.system#__Q6LvGiGEe-yX_VezXGozw]]
+[UserClient] [[apssouza22-java-microservice.system#_Q4Bpamj1Ee-KeOD_Iaqkxg]]
}
node nodecom_apssouza_clients_UserClient {
-[com_apssouza_clients_UserClient] [[apssouza22-java-microservice.system#__Q6LvGiGEe-yX_VezXGozw]]
+[com_apssouza_clients_UserClient] [[apssouza22-java-microservice.system#_Q4Bpamj1Ee-KeOD_Iaqkxg]]
}
node nodecom_apssouza_eventsourcing_services_ApplicationEventPublisher_Provider {
-[com_apssouza_eventsourcing_services_ApplicationEventPublisher_Provider] [[apssouza22-java-microservice.system#__Q6LvGiGEe-yX_VezXGozw]]
+[com_apssouza_eventsourcing_services_ApplicationEventPublisher_Provider] [[apssouza22-java-microservice.system#_Q4Bpamj1Ee-KeOD_Iaqkxg]]
}
node nodecom_apssouza_infra_ApplicationEventPublisher_Provider {
-[com_apssouza_infra_ApplicationEventPublisher_Provider] [[apssouza22-java-microservice.system#__Q6LvGiGEe-yX_VezXGozw]]
+[com_apssouza_infra_ApplicationEventPublisher_Provider] [[apssouza22-java-microservice.system#_Q4Bpamj1Ee-KeOD_Iaqkxg]]
}
node nodecom_apssouza_infra_Source_Provider {
-[com_apssouza_infra_Source_Provider] [[apssouza22-java-microservice.system#__Q6LvGiGEe-yX_VezXGozw]]
+[com_apssouza_infra_Source_Provider] [[apssouza22-java-microservice.system#_Q4Bpamj1Ee-KeOD_Iaqkxg]]
}
node nodecom_apssouza_integrations_socket_TodoSocketController {
-[com_apssouza_integrations_socket_TodoSocketController] [[apssouza22-java-microservice.system#__Q6LvGiGEe-yX_VezXGozw]]
+[com_apssouza_integrations_socket_TodoSocketController] [[apssouza22-java-microservice.system#_Q4Bpamj1Ee-KeOD_Iaqkxg]]
}
node nodeuser_users_Provider {
-[user_users_Provider] [[apssouza22-java-microservice.system#__Q6LvGiGEe-yX_VezXGozw]]
+[user_users_Provider] [[apssouza22-java-microservice.system#_Q4Bpamj1Ee-KeOD_Iaqkxg]]
}
+[nodecom_apssouza_2] - [nodecom_apssouza_clients_UserClient]
[nodecom_apssouza_eventsourcing_services_ApplicationEventPublisher_Provider] - [nodecom_apssouza_eventsourcing]
-[nodecom_apssouza_infra_ApplicationEventPublisher_Provider] - [nodecom_apssouza_4]
-[nodecom_apssouza_infra_Source_Provider] - [nodecom_apssouza_4]
-[nodecom_apssouza] - [nodeUserClient]
+[nodecom_apssouza_infra_ApplicationEventPublisher_Provider] - [nodecom_apssouza_5]
+[nodecom_apssouza_infra_Source_Provider] - [nodecom_apssouza_5]
[nodeuser_users_Provider] - [nodeUserClient]
@enduml
diff --git a/apssouza22-java-microservice/model_re/uml/allocationDiagram.svg b/apssouza22-java-microservice/model_re/uml/allocationDiagram.svg
index a0cbcc38c4..3d68d56062 100644
--- a/apssouza22-java-microservice/model_re/uml/allocationDiagram.svg
+++ b/apssouza22-java-microservice/model_re/uml/allocationDiagram.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/apssouza22-java-microservice/model_re/uml/componentDiagram.puml b/apssouza22-java-microservice/model_re/uml/componentDiagram.puml
index 0e60979f47..58a38db6c7 100644
--- a/apssouza22-java-microservice/model_re/uml/componentDiagram.puml
+++ b/apssouza22-java-microservice/model_re/uml/componentDiagram.puml
@@ -2,94 +2,94 @@
skinparam fixCircleLabelOverlapping true
skinparam componentStyle uml2
component "com_apssouza\n\n\n\n\n\n" {
-[com_apssouza_bootstrap_UserLoader]
-[com_apssouza_services_AccountServiceImpl]
-[com_apssouza_controllers_AccountController]
+[com_apssouza_eventsourcing_commands_EmailCommandHandler]
+[com_apssouza_mailservice_controllers_NotifyController]
+portin " " as com_apssouza_requires_mailer_send_email_GET_
+[com_apssouza_mailservice_controllers_NotifyController]..>[com_apssouza_eventsourcing_commands_EmailCommandHandler] : requires
+"com_apssouza_requires_mailer_send_email_GET_"--[com_apssouza_mailservice_controllers_NotifyController]
+}
+interface "mailer/send/email[GET]" as interface.mailer_send_email_GET_
+interface.mailer_send_email_GET_--"com_apssouza_requires_mailer_send_email_GET_"
+component "com_apssouza 2\n\n\n\n\n\n" {
[com_apssouza_repositories_AccountRepository]
-portin " " as com_apssouza_requires_user_accounts
-portin " " as com_apssouza_requires_user_accounts_search_GET_
-portin " " as com_apssouza_requires_user_accounts_POST_
-portin " " as com_apssouza_requires_user_accounts_GET_2
-portin " " as com_apssouza_requires_user_accounts_GET_
-[com_apssouza_services_AccountServiceImpl]..>[com_apssouza_repositories_AccountRepository] : requires
+[com_apssouza_controllers_AccountController]
+[com_apssouza_services_AccountServiceImpl]
+[com_apssouza_bootstrap_UserLoader]
+portin " " as com_apssouza_2_requires_user_accounts_GET_2
+portin " " as com_apssouza_2_requires_user_accounts
+portin " " as com_apssouza_2_requires_user_accounts_search_GET_
+portin " " as com_apssouza_2_requires_user_accounts_POST_
+portin " " as com_apssouza_2_requires_user_accounts_GET_
[com_apssouza_bootstrap_UserLoader]..>[com_apssouza_repositories_AccountRepository] : requires
[com_apssouza_controllers_AccountController]..>[com_apssouza_services_AccountServiceImpl] : requires
-"com_apssouza_requires_user_accounts_POST_"--[com_apssouza_controllers_AccountController]
-"com_apssouza_requires_user_accounts_GET_2"--[com_apssouza_controllers_AccountController]
-"com_apssouza_requires_user_accounts_search_GET_"--[com_apssouza_controllers_AccountController]
-"com_apssouza_requires_user_accounts_GET_"--[com_apssouza_controllers_AccountController]
+[com_apssouza_services_AccountServiceImpl]..>[com_apssouza_repositories_AccountRepository] : requires
+"com_apssouza_2_requires_user_accounts_GET_"--[com_apssouza_controllers_AccountController]
+"com_apssouza_2_requires_user_accounts_GET_2"--[com_apssouza_controllers_AccountController]
+"com_apssouza_2_requires_user_accounts_search_GET_"--[com_apssouza_controllers_AccountController]
+"com_apssouza_2_requires_user_accounts_POST_"--[com_apssouza_controllers_AccountController]
}
interface "user/accounts[GET]$2" as interface.user_accounts_GET_2
-interface.user_accounts_GET_2--"com_apssouza_requires_user_accounts_GET_2"
+interface.user_accounts_GET_2--"com_apssouza_2_requires_user_accounts_GET_2"
interface "user/accounts[GET]" as interface.user_accounts_GET_
-interface.user_accounts_GET_--"com_apssouza_requires_user_accounts_GET_"
+interface.user_accounts_GET_--"com_apssouza_2_requires_user_accounts_GET_"
interface "user/accounts[POST]" as interface.user_accounts_POST_
-interface.user_accounts_POST_--"com_apssouza_requires_user_accounts_POST_"
+interface.user_accounts_POST_--"com_apssouza_2_requires_user_accounts_POST_"
interface "user/accounts" as interface.user_accounts
-interface.user_accounts--"com_apssouza_requires_user_accounts"
+interface.user_accounts--"com_apssouza_2_requires_user_accounts"
interface "user/accounts/search[GET]" as interface.user_accounts_search_GET_
-interface.user_accounts_search_GET_--"com_apssouza_requires_user_accounts_search_GET_"
-component "com_apssouza 2\n\n\n\n\n\n" {
+interface.user_accounts_search_GET_--"com_apssouza_2_requires_user_accounts_search_GET_"
+component "com_apssouza 3\n\n\n\n\n\n" {
[com_apssouza_controllers_TodoChangesController]
[com_apssouza_monitors_TodoStoreEventChanges]
-portin " " as com_apssouza_2_requires_reminder_todo_changes_GET_
+portin " " as com_apssouza_3_requires_reminder_todo_changes_GET_
[com_apssouza_controllers_TodoChangesController]..>[com_apssouza_monitors_TodoStoreEventChanges] : requires
-"com_apssouza_2_requires_reminder_todo_changes_GET_"--[com_apssouza_controllers_TodoChangesController]
+"com_apssouza_3_requires_reminder_todo_changes_GET_"--[com_apssouza_controllers_TodoChangesController]
}
interface "reminder/todo-changes[GET]" as interface.reminder_todo_changes_GET_
-interface.reminder_todo_changes_GET_--"com_apssouza_2_requires_reminder_todo_changes_GET_"
-component "com_apssouza 3\n\n\n\n\n\n" {
-[com_apssouza_controllers_TodoServiceStatisticsController]
+interface.reminder_todo_changes_GET_--"com_apssouza_3_requires_reminder_todo_changes_GET_"
+component "com_apssouza 4\n\n\n\n\n\n" {
[com_apssouza_monitors_TodoServiceMethodInvokedStore]
-portin " " as com_apssouza_3_requires_reminder_todo_statistics_GET_
+[com_apssouza_controllers_TodoServiceStatisticsController]
+portin " " as com_apssouza_4_requires_reminder_todo_statistics_GET_
[com_apssouza_controllers_TodoServiceStatisticsController]..>[com_apssouza_monitors_TodoServiceMethodInvokedStore] : requires
-"com_apssouza_3_requires_reminder_todo_statistics_GET_"--[com_apssouza_controllers_TodoServiceStatisticsController]
+"com_apssouza_4_requires_reminder_todo_statistics_GET_"--[com_apssouza_controllers_TodoServiceStatisticsController]
}
interface "reminder/todo-statistics[GET]" as interface.reminder_todo_statistics_GET_
-interface.reminder_todo_statistics_GET_--"com_apssouza_3_requires_reminder_todo_statistics_GET_"
-component "com_apssouza 4\n\n\n\n\n\n" {
-[com_apssouza_services_TodoServiceImpl]
+interface.reminder_todo_statistics_GET_--"com_apssouza_4_requires_reminder_todo_statistics_GET_"
+component "com_apssouza 5\n\n\n\n\n\n" {
+[com_apssouza_controllers_TodoController]
[com_apssouza_controllers_UserController]
-[com_apssouza_bootstrap_TodoLoader]
+[com_apssouza_services_TodoServiceImpl]
[com_apssouza_services_UserServiceImpl]
-[com_apssouza_repositories_TodoRepository]
-[com_apssouza_controllers_TodoController]
-[com_apssouza_infra_EventPublisher]
+[com_apssouza_bootstrap_TodoLoader]
[TodoController]
-portin " " as com_apssouza_4_requires_api_gateway_accounts
-portin " " as com_apssouza_4_requires_reminder_todos
-portin " " as com_apssouza_4_requires_api_gateway_todos_GET_
-[com_apssouza_controllers_TodoController]..>[com_apssouza_services_TodoServiceImpl] : requires
-[com_apssouza_controllers_UserController]..>[com_apssouza_services_TodoServiceImpl] : requires
+[com_apssouza_infra_EventPublisher]
+[com_apssouza_repositories_TodoRepository]
+portin " " as com_apssouza_5_requires_api_gateway_todos_GET_
+portin " " as com_apssouza_5_requires_reminder_todos
+portin " " as com_apssouza_5_requires_api_gateway_accounts
[com_apssouza_bootstrap_TodoLoader]..>[com_apssouza_repositories_TodoRepository] : requires
+[com_apssouza_controllers_UserController]..>[com_apssouza_services_UserServiceImpl] : requires
[com_apssouza_services_TodoServiceImpl]..>[com_apssouza_infra_EventPublisher] : requires
+[com_apssouza_controllers_UserController]..>[com_apssouza_services_TodoServiceImpl] : requires
+[com_apssouza_controllers_TodoController]..>[com_apssouza_services_TodoServiceImpl] : requires
[com_apssouza_services_TodoServiceImpl]..>[com_apssouza_repositories_TodoRepository] : requires
-[com_apssouza_controllers_UserController]..>[com_apssouza_services_UserServiceImpl] : requires
-"com_apssouza_4_requires_api_gateway_todos_GET_"--[com_apssouza_controllers_TodoController]
-"com_apssouza_4_requires_api_gateway_accounts"--[com_apssouza_controllers_UserController]
-"com_apssouza_4_requires_reminder_todos"--[TodoController]
+"com_apssouza_5_requires_api_gateway_todos_GET_"--[com_apssouza_controllers_TodoController]
+"com_apssouza_5_requires_api_gateway_accounts"--[com_apssouza_controllers_UserController]
+"com_apssouza_5_requires_reminder_todos"--[TodoController]
}
interface "api-gateway/accounts" as interface.api_gateway_accounts
-interface.api_gateway_accounts--"com_apssouza_4_requires_api_gateway_accounts"
+interface.api_gateway_accounts--"com_apssouza_5_requires_api_gateway_accounts"
interface "api-gateway/todos[GET]" as interface.api_gateway_todos_GET_
-interface.api_gateway_todos_GET_--"com_apssouza_4_requires_api_gateway_todos_GET_"
+interface.api_gateway_todos_GET_--"com_apssouza_5_requires_api_gateway_todos_GET_"
interface "reminder/todos" as interface.reminder_todos
-interface.reminder_todos--"com_apssouza_4_requires_reminder_todos"
-component "com_apssouza 5\n\n\n\n\n\n" {
-[com_apssouza_eventsourcing_commands_EmailCommandHandler]
-[com_apssouza_mailservice_controllers_NotifyController]
-portin " " as com_apssouza_5_requires_mailer_send_email_GET_
-[com_apssouza_mailservice_controllers_NotifyController]..>[com_apssouza_eventsourcing_commands_EmailCommandHandler] : requires
-"com_apssouza_5_requires_mailer_send_email_GET_"--[com_apssouza_mailservice_controllers_NotifyController]
-}
-interface "mailer/send/email[GET]" as interface.mailer_send_email_GET_
-interface.mailer_send_email_GET_--"com_apssouza_5_requires_mailer_send_email_GET_"
+interface.reminder_todos--"com_apssouza_5_requires_reminder_todos"
component "com_apssouza_eventsourcing\n\n\n\n\n\n" {
[com_apssouza_eventsourcing_eventstore_EventSerializer]
[com_apssouza_eventsourcing_services_EventSourcingServiceImpl]
[com_apssouza_eventsourcing_eventstore_EventStoreRepository]
-[com_apssouza_eventsourcing_services_EventSourcingServiceImpl]..>[com_apssouza_eventsourcing_eventstore_EventSerializer] : requires
[com_apssouza_eventsourcing_services_EventSourcingServiceImpl]..>[com_apssouza_eventsourcing_eventstore_EventStoreRepository] : requires
+[com_apssouza_eventsourcing_services_EventSourcingServiceImpl]..>[com_apssouza_eventsourcing_eventstore_EventSerializer] : requires
}
component "com_apssouza_integrations_socket_TodoSocketController\n\n\n\n\n\n" {
[com_apssouza_integrations_socket_TodoSocketController]
diff --git a/apssouza22-java-microservice/model_re/uml/componentDiagram.svg b/apssouza22-java-microservice/model_re/uml/componentDiagram.svg
index 32a0f7ec8b..c1192b9fd5 100644
--- a/apssouza22-java-microservice/model_re/uml/componentDiagram.svg
+++ b/apssouza22-java-microservice/model_re/uml/componentDiagram.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/apssouza22-java-microservice/model_re/uml/systemDiagram.svg b/apssouza22-java-microservice/model_re/uml/systemDiagram.svg
index 8754c9bcaa..cbd8d52968 100644
--- a/apssouza22-java-microservice/model_re/uml/systemDiagram.svg
+++ b/apssouza22-java-microservice/model_re/uml/systemDiagram.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/callistaenterprise-blog-microservices/model_re/pcm/callistaenterprise-blog-microservices.resourceenvironment b/callistaenterprise-blog-microservices/model_re/pcm/callistaenterprise-blog-microservices.resourceenvironment
index ad8d6d54e6..4fff084d3f 100644
--- a/callistaenterprise-blog-microservices/model_re/pcm/callistaenterprise-blog-microservices.resourceenvironment
+++ b/callistaenterprise-blog-microservices/model_re/pcm/callistaenterprise-blog-microservices.resourceenvironment
@@ -1,17 +1,17 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/callistaenterprise-blog-microservices/model_re/uml/componentDiagram.puml b/callistaenterprise-blog-microservices/model_re/uml/componentDiagram.puml
index d6767aaecf..d5a4481b59 100644
--- a/callistaenterprise-blog-microservices/model_re/uml/componentDiagram.puml
+++ b/callistaenterprise-blog-microservices/model_re/uml/componentDiagram.puml
@@ -25,8 +25,8 @@ interface "SPRING-APPLICATION/set-processing-time" as interface.SPRING_APPLICATI
interface.SPRING_APPLICATION_set_processing_time--"se_callista_microservices_core_product_service_ProductService_requires_SPRING_APPLICATION_set_processing_time"
component "se_callista_microservices_core_recommendation_service_RecommendationService\n\n\n\n\n\n" {
[se_callista_microservices_core_recommendation_service_RecommendationService]
-portin " " as se_callista_microservices_core_recommendation_service_RecommendationService_requires_SPRING_APPLICATION_recommendation
portin " " as se_callista_microservices_core_recommendation_service_RecommendationService_requires_SPRING_APPLICATION_set_processing_time_3
+portin " " as se_callista_microservices_core_recommendation_service_RecommendationService_requires_SPRING_APPLICATION_recommendation
"se_callista_microservices_core_recommendation_service_RecommendationService_requires_SPRING_APPLICATION_set_processing_time_3"--[se_callista_microservices_core_recommendation_service_RecommendationService]
"se_callista_microservices_core_recommendation_service_RecommendationService_requires_SPRING_APPLICATION_recommendation"--[se_callista_microservices_core_recommendation_service_RecommendationService]
}
diff --git a/callistaenterprise-blog-microservices/model_re/uml/componentDiagram.svg b/callistaenterprise-blog-microservices/model_re/uml/componentDiagram.svg
index f1fefe4d36..e252c29e1b 100644
--- a/callistaenterprise-blog-microservices/model_re/uml/componentDiagram.svg
+++ b/callistaenterprise-blog-microservices/model_re/uml/componentDiagram.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/callistaenterprise-blog-microservices/model_re/uml/systemDiagram.puml b/callistaenterprise-blog-microservices/model_re/uml/systemDiagram.puml
index 797c21e749..771c7a51bf 100644
--- a/callistaenterprise-blog-microservices/model_re/uml/systemDiagram.puml
+++ b/callistaenterprise-blog-microservices/model_re/uml/systemDiagram.puml
@@ -12,13 +12,13 @@ skinparam componentStyle uml2
() SPRING_APPLICATION_set_processing_time_Delegation_Provider
() SPRING_APPLICATION_user_Delegation_Provider
rectangle System {
-[se_callista_microservices_composite_product_service_ProductCompositeService] [[callistaenterprise-blog-microservices.repository#_9kFdiGiGEe-VOfHhjgIPHQ]]
-[se_callista_microservices_core_product_service_ProductService] [[callistaenterprise-blog-microservices.repository#_9kFdiGiGEe-VOfHhjgIPHQ]]
-[se_callista_microservices_core_recommendation_service_RecommendationService] [[callistaenterprise-blog-microservices.repository#_9kFdiGiGEe-VOfHhjgIPHQ]]
-[se_callista_microservices_core_review_service_ReviewService] [[callistaenterprise-blog-microservices.repository#_9kFdiGiGEe-VOfHhjgIPHQ]]
-[se_callista_microservises_support_edge_ZuulApplication] [[callistaenterprise-blog-microservices.repository#_9kFdiGiGEe-VOfHhjgIPHQ]]
-[se_callista_microservises_support_monitordashboard_HystrixDashboardApplication] [[callistaenterprise-blog-microservices.repository#_9kFdiGiGEe-VOfHhjgIPHQ]]
-[se_callista_microservises_support_oauth_AuthserverApplication] [[callistaenterprise-blog-microservices.repository#_9kFdiGiGEe-VOfHhjgIPHQ]]
+[se_callista_microservices_composite_product_service_ProductCompositeService] [[callistaenterprise-blog-microservices.repository#_U6gnamj1Ee-_-LNFr15azA]]
+[se_callista_microservices_core_product_service_ProductService] [[callistaenterprise-blog-microservices.repository#_U6gnamj1Ee-_-LNFr15azA]]
+[se_callista_microservices_core_recommendation_service_RecommendationService] [[callistaenterprise-blog-microservices.repository#_U6gnamj1Ee-_-LNFr15azA]]
+[se_callista_microservices_core_review_service_ReviewService] [[callistaenterprise-blog-microservices.repository#_U6gnamj1Ee-_-LNFr15azA]]
+[se_callista_microservises_support_edge_ZuulApplication] [[callistaenterprise-blog-microservices.repository#_U6gnamj1Ee-_-LNFr15azA]]
+[se_callista_microservises_support_monitordashboard_HystrixDashboardApplication] [[callistaenterprise-blog-microservices.repository#_U6gnamj1Ee-_-LNFr15azA]]
+[se_callista_microservises_support_oauth_AuthserverApplication] [[callistaenterprise-blog-microservices.repository#_U6gnamj1Ee-_-LNFr15azA]]
port SPRING_APPLICATION_2_Provider
SPRING_APPLICATION_2_Delegation_Provider - SPRING_APPLICATION_2_Provider
SPRING_APPLICATION_2_Provider - [se_callista_microservices_composite_product_service_ProductCompositeService]
diff --git a/callistaenterprise-blog-microservices/model_re/uml/systemDiagram.svg b/callistaenterprise-blog-microservices/model_re/uml/systemDiagram.svg
index 69a1932229..597bf6face 100644
--- a/callistaenterprise-blog-microservices/model_re/uml/systemDiagram.svg
+++ b/callistaenterprise-blog-microservices/model_re/uml/systemDiagram.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/cloudscale-project-cloudstore/model_re/README.md b/cloudscale-project-cloudstore/model_re/README.md
index 81fa985420..e3b079558b 100644
--- a/cloudscale-project-cloudstore/model_re/README.md
+++ b/cloudscale-project-cloudstore/model_re/README.md
@@ -2,13 +2,13 @@
| Attribute | Value |
| ------------------ | ----- |
| Retriever Version | v5.2.0.202408280745 |
-| Date | Sun Sep 1 17:24:04 UTC 2024 |
+| Date | Mon Sep 2 06:33:01 UTC 2024 |
| #Components | 35 |
| #Source Files | 113 |
| Lines of Code | 9777 |
| #Technologies | 4 |
| Abstraction | 3.22 |
-| Execution Time [s] | 4.189 ± 0.056 |
+| Execution Time [s] | 4.171 ± 0.064 |
## Git repository information
| Attribute | Value |
@@ -27,18 +27,18 @@
| OS | Linux |
| Distro | Ubuntu 22.04.4 LTS x86_64 |
| Kernel | 6.5.0-1025-azure |
-| CPU | AMD EPYC 7763 (4) @ 2.445GHz |
+| CPU | AMD EPYC 7763 (4) @ 3.045GHz |
| GPU | 00:08.0 Microsoft Corporation Hyper-V virtual VGA |
-| Memory | 780MiB / 15981MiB |
+| Memory | 793MiB / 15981MiB |
## Retriever execution time
| Mean [s] | Min [s] | Max [s] | Relative |
|---:|---:|---:|---:|
-| 4.189 ± 0.056 | 4.070 | 4.240 | 1.00 |
+| 4.171 ± 0.064 | 4.092 | 4.271 | 1.00 |
## Cloc analysis
-
+
|Technology|files|blank|comment|code|
|:-------|-------:|-------:|-------:|-------:|
diff --git a/cloudscale-project-cloudstore/model_re/pcm/cloudscale-project-cloudstore.allocation b/cloudscale-project-cloudstore/model_re/pcm/cloudscale-project-cloudstore.allocation
index ddfae2eb54..6c1a066c8a 100644
--- a/cloudscale-project-cloudstore/model_re/pcm/cloudscale-project-cloudstore.allocation
+++ b/cloudscale-project-cloudstore/model_re/pcm/cloudscale-project-cloudstore.allocation
@@ -1,145 +1,145 @@
-
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
diff --git a/cloudscale-project-cloudstore/model_re/pcm/cloudscale-project-cloudstore.repository b/cloudscale-project-cloudstore/model_re/pcm/cloudscale-project-cloudstore.repository
index 9a438b7259..e0d1266911 100644
--- a/cloudscale-project-cloudstore/model_re/pcm/cloudscale-project-cloudstore.repository
+++ b/cloudscale-project-cloudstore/model_re/pcm/cloudscale-project-cloudstore.repository
@@ -1,39 +1,14 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -43,24 +18,27 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
@@ -70,13 +48,13 @@
-
+
-
-
+
+
@@ -86,47 +64,37 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
+
+
@@ -136,30 +104,18 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -169,50 +125,154 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -222,142 +282,121 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
@@ -367,111 +406,110 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
@@ -481,21 +519,21 @@
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
@@ -505,12 +543,12 @@
-
+
-
+
@@ -520,18 +558,23 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -541,63 +584,76 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -607,114 +663,83 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
-
-
+
+
+
+
@@ -724,155 +749,114 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -882,119 +866,119 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
+
+
+
@@ -1004,98 +988,114 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
+
+
+
+
+
-
+
-
-
-
-
+
+
+
+
+
+
-
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
@@ -1105,118 +1105,100 @@
-
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
+
+
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -1226,139 +1208,157 @@
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/cloudscale-project-cloudstore/model_re/pcm/cloudscale-project-cloudstore.resourceenvironment b/cloudscale-project-cloudstore/model_re/pcm/cloudscale-project-cloudstore.resourceenvironment
index 04b8b53d44..9c767fe789 100644
--- a/cloudscale-project-cloudstore/model_re/pcm/cloudscale-project-cloudstore.resourceenvironment
+++ b/cloudscale-project-cloudstore/model_re/pcm/cloudscale-project-cloudstore.resourceenvironment
@@ -1,41 +1,41 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cloudscale-project-cloudstore/model_re/pcm/cloudscale-project-cloudstore.system b/cloudscale-project-cloudstore/model_re/pcm/cloudscale-project-cloudstore.system
index 878ed3e25e..8ea03413c0 100644
--- a/cloudscale-project-cloudstore/model_re/pcm/cloudscale-project-cloudstore.system
+++ b/cloudscale-project-cloudstore/model_re/pcm/cloudscale-project-cloudstore.system
@@ -1,202 +1,202 @@
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/cloudscale-project-cloudstore/model_re/uml/allocationDiagram.puml b/cloudscale-project-cloudstore/model_re/uml/allocationDiagram.puml
index f076c542ec..8e6d4a7b14 100644
--- a/cloudscale-project-cloudstore/model_re/uml/allocationDiagram.puml
+++ b/cloudscale-project-cloudstore/model_re/uml/allocationDiagram.puml
@@ -3,57 +3,57 @@ skinparam fixCircleLabelOverlapping true
skinparam componentStyle uml2
node nodeeu_cloudscale_showcase_servlets {
component eu_cloudscale_showcase_servlets {
-[eu_cloudscale_showcase_servlets_PaymentController] [[cloudscale-project-cloudstore.system#_-8yV1miGEe-ZIcdaksbGZQ]]
-[eu_cloudscale_showcase_servlets_helpers_PaymentService] [[cloudscale-project-cloudstore.system#_-8yV1miGEe-ZIcdaksbGZQ]]
+[eu_cloudscale_showcase_servlets_PaymentController] [[cloudscale-project-cloudstore.system#_MsL7GGj1Ee-wo5wt5CeHTQ]]
+[eu_cloudscale_showcase_servlets_helpers_PaymentService] [[cloudscale-project-cloudstore.system#_MsL7GGj1Ee-wo5wt5CeHTQ]]
}
}
node nodeeu_cloudscale_showcase_db_services_HibernateService {
-[eu_cloudscale_showcase_db_services_HibernateService] [[cloudscale-project-cloudstore.system#_-8yV1miGEe-ZIcdaksbGZQ]]
+[eu_cloudscale_showcase_db_services_HibernateService] [[cloudscale-project-cloudstore.system#_MsL7GGj1Ee-wo5wt5CeHTQ]]
}
node nodeeu_cloudscale_showcase_db_services_MongoService {
-[eu_cloudscale_showcase_db_services_MongoService] [[cloudscale-project-cloudstore.system#_-8yV1miGEe-ZIcdaksbGZQ]]
+[eu_cloudscale_showcase_db_services_MongoService] [[cloudscale-project-cloudstore.system#_MsL7GGj1Ee-wo5wt5CeHTQ]]
}
node nodeeu_cloudscale_showcase_servlets_AdminConfirmController {
-[eu_cloudscale_showcase_servlets_AdminConfirmController] [[cloudscale-project-cloudstore.system#_-8yV1miGEe-ZIcdaksbGZQ]]
+[eu_cloudscale_showcase_servlets_AdminConfirmController] [[cloudscale-project-cloudstore.system#_MsL7GGj1Ee-wo5wt5CeHTQ]]
}
node nodeeu_cloudscale_showcase_servlets_AdminRequestController {
-[eu_cloudscale_showcase_servlets_AdminRequestController] [[cloudscale-project-cloudstore.system#_-8yV1miGEe-ZIcdaksbGZQ]]
+[eu_cloudscale_showcase_servlets_AdminRequestController] [[cloudscale-project-cloudstore.system#_MsL7GGj1Ee-wo5wt5CeHTQ]]
}
node nodeeu_cloudscale_showcase_servlets_BestSellersController {
-[eu_cloudscale_showcase_servlets_BestSellersController] [[cloudscale-project-cloudstore.system#_-8yV1miGEe-ZIcdaksbGZQ]]
+[eu_cloudscale_showcase_servlets_BestSellersController] [[cloudscale-project-cloudstore.system#_MsL7GGj1Ee-wo5wt5CeHTQ]]
}
node nodeeu_cloudscale_showcase_servlets_BuyConfirmController {
-[eu_cloudscale_showcase_servlets_BuyConfirmController] [[cloudscale-project-cloudstore.system#_-8yV1miGEe-ZIcdaksbGZQ]]
+[eu_cloudscale_showcase_servlets_BuyConfirmController] [[cloudscale-project-cloudstore.system#_MsL7GGj1Ee-wo5wt5CeHTQ]]
}
node nodeeu_cloudscale_showcase_servlets_BuyController {
-[eu_cloudscale_showcase_servlets_BuyController] [[cloudscale-project-cloudstore.system#_-8yV1miGEe-ZIcdaksbGZQ]]
+[eu_cloudscale_showcase_servlets_BuyController] [[cloudscale-project-cloudstore.system#_MsL7GGj1Ee-wo5wt5CeHTQ]]
}
node nodeeu_cloudscale_showcase_servlets_CustomerRegistrationController {
-[eu_cloudscale_showcase_servlets_CustomerRegistrationController] [[cloudscale-project-cloudstore.system#_-8yV1miGEe-ZIcdaksbGZQ]]
+[eu_cloudscale_showcase_servlets_CustomerRegistrationController] [[cloudscale-project-cloudstore.system#_MsL7GGj1Ee-wo5wt5CeHTQ]]
}
node nodeeu_cloudscale_showcase_servlets_HomeController {
-[eu_cloudscale_showcase_servlets_HomeController] [[cloudscale-project-cloudstore.system#_-8yV1miGEe-ZIcdaksbGZQ]]
+[eu_cloudscale_showcase_servlets_HomeController] [[cloudscale-project-cloudstore.system#_MsL7GGj1Ee-wo5wt5CeHTQ]]
}
node nodeeu_cloudscale_showcase_servlets_LoginController {
-[eu_cloudscale_showcase_servlets_LoginController] [[cloudscale-project-cloudstore.system#_-8yV1miGEe-ZIcdaksbGZQ]]
+[eu_cloudscale_showcase_servlets_LoginController] [[cloudscale-project-cloudstore.system#_MsL7GGj1Ee-wo5wt5CeHTQ]]
}
node nodeeu_cloudscale_showcase_servlets_NewProductsController {
-[eu_cloudscale_showcase_servlets_NewProductsController] [[cloudscale-project-cloudstore.system#_-8yV1miGEe-ZIcdaksbGZQ]]
+[eu_cloudscale_showcase_servlets_NewProductsController] [[cloudscale-project-cloudstore.system#_MsL7GGj1Ee-wo5wt5CeHTQ]]
}
node nodeeu_cloudscale_showcase_servlets_OrderDisplayController {
-[eu_cloudscale_showcase_servlets_OrderDisplayController] [[cloudscale-project-cloudstore.system#_-8yV1miGEe-ZIcdaksbGZQ]]
+[eu_cloudscale_showcase_servlets_OrderDisplayController] [[cloudscale-project-cloudstore.system#_MsL7GGj1Ee-wo5wt5CeHTQ]]
}
node nodeeu_cloudscale_showcase_servlets_OrderInquiryController {
-[eu_cloudscale_showcase_servlets_OrderInquiryController] [[cloudscale-project-cloudstore.system#_-8yV1miGEe-ZIcdaksbGZQ]]
+[eu_cloudscale_showcase_servlets_OrderInquiryController] [[cloudscale-project-cloudstore.system#_MsL7GGj1Ee-wo5wt5CeHTQ]]
}
node nodeeu_cloudscale_showcase_servlets_ProductDetailServlet {
-[eu_cloudscale_showcase_servlets_ProductDetailServlet] [[cloudscale-project-cloudstore.system#_-8yV1miGEe-ZIcdaksbGZQ]]
+[eu_cloudscale_showcase_servlets_ProductDetailServlet] [[cloudscale-project-cloudstore.system#_MsL7GGj1Ee-wo5wt5CeHTQ]]
}
node nodeeu_cloudscale_showcase_servlets_SearchController {
-[eu_cloudscale_showcase_servlets_SearchController] [[cloudscale-project-cloudstore.system#_-8yV1miGEe-ZIcdaksbGZQ]]
+[eu_cloudscale_showcase_servlets_SearchController] [[cloudscale-project-cloudstore.system#_MsL7GGj1Ee-wo5wt5CeHTQ]]
}
node nodeeu_cloudscale_showcase_servlets_ShoppingCartController {
-[eu_cloudscale_showcase_servlets_ShoppingCartController] [[cloudscale-project-cloudstore.system#_-8yV1miGEe-ZIcdaksbGZQ]]
+[eu_cloudscale_showcase_servlets_ShoppingCartController] [[cloudscale-project-cloudstore.system#_MsL7GGj1Ee-wo5wt5CeHTQ]]
}
@enduml
diff --git a/cloudscale-project-cloudstore/model_re/uml/allocationDiagram.svg b/cloudscale-project-cloudstore/model_re/uml/allocationDiagram.svg
index 7005170329..7540d3677e 100644
--- a/cloudscale-project-cloudstore/model_re/uml/allocationDiagram.svg
+++ b/cloudscale-project-cloudstore/model_re/uml/allocationDiagram.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/cloudscale-project-cloudstore/model_re/uml/componentDiagram.puml b/cloudscale-project-cloudstore/model_re/uml/componentDiagram.puml
index 626570971c..1e9a0e5eac 100644
--- a/cloudscale-project-cloudstore/model_re/uml/componentDiagram.puml
+++ b/cloudscale-project-cloudstore/model_re/uml/componentDiagram.puml
@@ -8,8 +8,8 @@ component "eu_cloudscale_showcase_db_services_MongoService\n\n\n\n\n\n" {
[eu_cloudscale_showcase_db_services_MongoService]
}
component "eu_cloudscale_showcase_servlets\n\n\n\n\n\n" {
-[eu_cloudscale_showcase_servlets_PaymentController]
[eu_cloudscale_showcase_servlets_helpers_PaymentService]
+[eu_cloudscale_showcase_servlets_PaymentController]
portin " " as eu_cloudscale_showcase_servlets_requires_SPRING_APPLICATION_payment
[eu_cloudscale_showcase_servlets_PaymentController]..>[eu_cloudscale_showcase_servlets_helpers_PaymentService] : requires
"eu_cloudscale_showcase_servlets_requires_SPRING_APPLICATION_payment"--[eu_cloudscale_showcase_servlets_PaymentController]
diff --git a/cloudscale-project-cloudstore/model_re/uml/componentDiagram.svg b/cloudscale-project-cloudstore/model_re/uml/componentDiagram.svg
index 2a94f7b0db..aefdea05f7 100644
--- a/cloudscale-project-cloudstore/model_re/uml/componentDiagram.svg
+++ b/cloudscale-project-cloudstore/model_re/uml/componentDiagram.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/cloudscale-project-cloudstore/model_re/uml/systemDiagram.puml b/cloudscale-project-cloudstore/model_re/uml/systemDiagram.puml
index 6ec79305f5..ab88704aa7 100644
--- a/cloudscale-project-cloudstore/model_re/uml/systemDiagram.puml
+++ b/cloudscale-project-cloudstore/model_re/uml/systemDiagram.puml
@@ -17,24 +17,24 @@ skinparam componentStyle uml2
() SPRING_APPLICATION_search_Delegation_Provider
() SPRING_APPLICATION_shopping_cart_Delegation_Provider
rectangle System {
-[eu_cloudscale_showcase_db_services_HibernateService] [[cloudscale-project-cloudstore.repository#_-8pL6miGEe-ZIcdaksbGZQ]]
-[eu_cloudscale_showcase_db_services_MongoService] [[cloudscale-project-cloudstore.repository#_-8pL6miGEe-ZIcdaksbGZQ]]
-[eu_cloudscale_showcase_servlets_AdminConfirmController] [[cloudscale-project-cloudstore.repository#_-8pL6miGEe-ZIcdaksbGZQ]]
-[eu_cloudscale_showcase_servlets_AdminRequestController] [[cloudscale-project-cloudstore.repository#_-8pL6miGEe-ZIcdaksbGZQ]]
-[eu_cloudscale_showcase_servlets_BestSellersController] [[cloudscale-project-cloudstore.repository#_-8pL6miGEe-ZIcdaksbGZQ]]
-[eu_cloudscale_showcase_servlets_BuyConfirmController] [[cloudscale-project-cloudstore.repository#_-8pL6miGEe-ZIcdaksbGZQ]]
-[eu_cloudscale_showcase_servlets_BuyController] [[cloudscale-project-cloudstore.repository#_-8pL6miGEe-ZIcdaksbGZQ]]
-[eu_cloudscale_showcase_servlets_CustomerRegistrationController] [[cloudscale-project-cloudstore.repository#_-8pL6miGEe-ZIcdaksbGZQ]]
-[eu_cloudscale_showcase_servlets_HomeController] [[cloudscale-project-cloudstore.repository#_-8pL6miGEe-ZIcdaksbGZQ]]
-[eu_cloudscale_showcase_servlets_LoginController] [[cloudscale-project-cloudstore.repository#_-8pL6miGEe-ZIcdaksbGZQ]]
-[eu_cloudscale_showcase_servlets_NewProductsController] [[cloudscale-project-cloudstore.repository#_-8pL6miGEe-ZIcdaksbGZQ]]
-[eu_cloudscale_showcase_servlets_OrderDisplayController] [[cloudscale-project-cloudstore.repository#_-8pL6miGEe-ZIcdaksbGZQ]]
-[eu_cloudscale_showcase_servlets_OrderInquiryController] [[cloudscale-project-cloudstore.repository#_-8pL6miGEe-ZIcdaksbGZQ]]
-[eu_cloudscale_showcase_servlets_PaymentController] [[cloudscale-project-cloudstore.repository#_-8pL6miGEe-ZIcdaksbGZQ]]
-[eu_cloudscale_showcase_servlets_ProductDetailServlet] [[cloudscale-project-cloudstore.repository#_-8pL6miGEe-ZIcdaksbGZQ]]
-[eu_cloudscale_showcase_servlets_SearchController] [[cloudscale-project-cloudstore.repository#_-8pL6miGEe-ZIcdaksbGZQ]]
-[eu_cloudscale_showcase_servlets_ShoppingCartController] [[cloudscale-project-cloudstore.repository#_-8pL6miGEe-ZIcdaksbGZQ]]
-[eu_cloudscale_showcase_servlets_helpers_PaymentService] [[cloudscale-project-cloudstore.repository#_-8pL6miGEe-ZIcdaksbGZQ]]
+[eu_cloudscale_showcase_db_services_HibernateService] [[cloudscale-project-cloudstore.repository#_MsCKJmj1Ee-wo5wt5CeHTQ]]
+[eu_cloudscale_showcase_db_services_MongoService] [[cloudscale-project-cloudstore.repository#_MsCKJmj1Ee-wo5wt5CeHTQ]]
+[eu_cloudscale_showcase_servlets_AdminConfirmController] [[cloudscale-project-cloudstore.repository#_MsCKJmj1Ee-wo5wt5CeHTQ]]
+[eu_cloudscale_showcase_servlets_AdminRequestController] [[cloudscale-project-cloudstore.repository#_MsCKJmj1Ee-wo5wt5CeHTQ]]
+[eu_cloudscale_showcase_servlets_BestSellersController] [[cloudscale-project-cloudstore.repository#_MsCKJmj1Ee-wo5wt5CeHTQ]]
+[eu_cloudscale_showcase_servlets_BuyConfirmController] [[cloudscale-project-cloudstore.repository#_MsCKJmj1Ee-wo5wt5CeHTQ]]
+[eu_cloudscale_showcase_servlets_BuyController] [[cloudscale-project-cloudstore.repository#_MsCKJmj1Ee-wo5wt5CeHTQ]]
+[eu_cloudscale_showcase_servlets_CustomerRegistrationController] [[cloudscale-project-cloudstore.repository#_MsCKJmj1Ee-wo5wt5CeHTQ]]
+[eu_cloudscale_showcase_servlets_HomeController] [[cloudscale-project-cloudstore.repository#_MsCKJmj1Ee-wo5wt5CeHTQ]]
+[eu_cloudscale_showcase_servlets_LoginController] [[cloudscale-project-cloudstore.repository#_MsCKJmj1Ee-wo5wt5CeHTQ]]
+[eu_cloudscale_showcase_servlets_NewProductsController] [[cloudscale-project-cloudstore.repository#_MsCKJmj1Ee-wo5wt5CeHTQ]]
+[eu_cloudscale_showcase_servlets_OrderDisplayController] [[cloudscale-project-cloudstore.repository#_MsCKJmj1Ee-wo5wt5CeHTQ]]
+[eu_cloudscale_showcase_servlets_OrderInquiryController] [[cloudscale-project-cloudstore.repository#_MsCKJmj1Ee-wo5wt5CeHTQ]]
+[eu_cloudscale_showcase_servlets_PaymentController] [[cloudscale-project-cloudstore.repository#_MsCKJmj1Ee-wo5wt5CeHTQ]]
+[eu_cloudscale_showcase_servlets_ProductDetailServlet] [[cloudscale-project-cloudstore.repository#_MsCKJmj1Ee-wo5wt5CeHTQ]]
+[eu_cloudscale_showcase_servlets_SearchController] [[cloudscale-project-cloudstore.repository#_MsCKJmj1Ee-wo5wt5CeHTQ]]
+[eu_cloudscale_showcase_servlets_ShoppingCartController] [[cloudscale-project-cloudstore.repository#_MsCKJmj1Ee-wo5wt5CeHTQ]]
+[eu_cloudscale_showcase_servlets_helpers_PaymentService] [[cloudscale-project-cloudstore.repository#_MsCKJmj1Ee-wo5wt5CeHTQ]]
port SPRING_APPLICATION_Provider
SPRING_APPLICATION_Delegation_Provider - SPRING_APPLICATION_Provider
SPRING_APPLICATION_Provider - [eu_cloudscale_showcase_servlets_HomeController]
diff --git a/cloudscale-project-cloudstore/model_re/uml/systemDiagram.svg b/cloudscale-project-cloudstore/model_re/uml/systemDiagram.svg
index fd5506e05b..9d357222da 100644
--- a/cloudscale-project-cloudstore/model_re/uml/systemDiagram.svg
+++ b/cloudscale-project-cloudstore/model_re/uml/systemDiagram.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/corona-warn-app-cwa-dcc-server/model_re/README.md b/corona-warn-app-cwa-dcc-server/model_re/README.md
index 68c0ee0f21..3a68e1c5a3 100644
--- a/corona-warn-app-cwa-dcc-server/model_re/README.md
+++ b/corona-warn-app-cwa-dcc-server/model_re/README.md
@@ -2,13 +2,13 @@
| Attribute | Value |
| ------------------ | ----- |
| Retriever Version | v5.2.0.202408280745 |
-| Date | Sun Sep 1 17:23:59 UTC 2024 |
+| Date | Mon Sep 2 06:33:02 UTC 2024 |
| #Components | 20 |
| #Source Files | 77 |
| Lines of Code | 4723 |
| #Technologies | 7 |
| Abstraction | 3.85 |
-| Execution Time [s] | 3.763 ± 0.043 |
+| Execution Time [s] | 3.845 ± 0.038 |
## Git repository information
| Attribute | Value |
@@ -27,18 +27,18 @@
| OS | Linux |
| Distro | Ubuntu 22.04.4 LTS x86_64 |
| Kernel | 6.5.0-1025-azure |
-| CPU | AMD EPYC 7763 (4) @ 3.243GHz |
+| CPU | AMD EPYC 7763 (4) @ 2.445GHz |
| GPU | 00:08.0 Microsoft Corporation Hyper-V virtual VGA |
-| Memory | 788MiB / 15981MiB |
+| Memory | 824MiB / 15981MiB |
## Retriever execution time
| Mean [s] | Min [s] | Max [s] | Relative |
|---:|---:|---:|---:|
-| 3.763 ± 0.043 | 3.687 | 3.812 | 1.00 |
+| 3.845 ± 0.038 | 3.771 | 3.898 | 1.00 |
## Cloc analysis
-
+
|Technology|files|blank|comment|code|
|:-------|-------:|-------:|-------:|-------:|
diff --git a/corona-warn-app-cwa-dcc-server/model_re/pcm/corona-warn-app-cwa-dcc-server.allocation b/corona-warn-app-cwa-dcc-server/model_re/pcm/corona-warn-app-cwa-dcc-server.allocation
index 6cae93188a..9e697a3028 100644
--- a/corona-warn-app-cwa-dcc-server/model_re/pcm/corona-warn-app-cwa-dcc-server.allocation
+++ b/corona-warn-app-cwa-dcc-server/model_re/pcm/corona-warn-app-cwa-dcc-server.allocation
@@ -1,85 +1,85 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/corona-warn-app-cwa-dcc-server/model_re/pcm/corona-warn-app-cwa-dcc-server.repository b/corona-warn-app-cwa-dcc-server/model_re/pcm/corona-warn-app-cwa-dcc-server.repository
index db0eea4953..b10512caa6 100644
--- a/corona-warn-app-cwa-dcc-server/model_re/pcm/corona-warn-app-cwa-dcc-server.repository
+++ b/corona-warn-app-cwa-dcc-server/model_re/pcm/corona-warn-app-cwa-dcc-server.repository
@@ -1,129 +1,192 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -133,16 +196,16 @@
-
+
-
-
-
-
-
+
+
+
+
+
@@ -152,13 +215,13 @@
-
+
-
-
+
+
@@ -168,262 +231,199 @@
-
+
-
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
+
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
+
-
+
-
+
-
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
-
-
-
-
+
+
-
-
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
+
-
+
-
-
-
-
-
+
+
+
+
+
+
-
+
-
-
-
+
+
-
+
-
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
+
-
-
-
-
-
+
+
+
+
+
diff --git a/corona-warn-app-cwa-dcc-server/model_re/pcm/corona-warn-app-cwa-dcc-server.resourceenvironment b/corona-warn-app-cwa-dcc-server/model_re/pcm/corona-warn-app-cwa-dcc-server.resourceenvironment
index 9943d5ff3d..b8db4263a3 100644
--- a/corona-warn-app-cwa-dcc-server/model_re/pcm/corona-warn-app-cwa-dcc-server.resourceenvironment
+++ b/corona-warn-app-cwa-dcc-server/model_re/pcm/corona-warn-app-cwa-dcc-server.resourceenvironment
@@ -1,35 +1,35 @@
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/corona-warn-app-cwa-dcc-server/model_re/pcm/corona-warn-app-cwa-dcc-server.system b/corona-warn-app-cwa-dcc-server/model_re/pcm/corona-warn-app-cwa-dcc-server.system
index 3f8e91df6b..dd44e15ff7 100644
--- a/corona-warn-app-cwa-dcc-server/model_re/pcm/corona-warn-app-cwa-dcc-server.system
+++ b/corona-warn-app-cwa-dcc-server/model_re/pcm/corona-warn-app-cwa-dcc-server.system
@@ -1,109 +1,109 @@
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/corona-warn-app-cwa-dcc-server/model_re/uml/allocationDiagram.puml b/corona-warn-app-cwa-dcc-server/model_re/uml/allocationDiagram.puml
index 19bacd9ce1..fa23199314 100644
--- a/corona-warn-app-cwa-dcc-server/model_re/uml/allocationDiagram.puml
+++ b/corona-warn-app-cwa-dcc-server/model_re/uml/allocationDiagram.puml
@@ -3,35 +3,35 @@ skinparam fixCircleLabelOverlapping true
skinparam componentStyle uml2
node nodeapp_coronawarn_dcc {
component app_coronawarn_dcc {
-[app_coronawarn_dcc_repository_DccRegistrationRepository] [[corona-warn-app-cwa-dcc-server.system#_-NEwIWiGEe-QUdfMyjv9Mw]]
-[app_coronawarn_dcc_service_DccRegistrationCleanupService] [[corona-warn-app-cwa-dcc-server.system#_-NEwIWiGEe-QUdfMyjv9Mw]]
-[app_coronawarn_dcc_service_DccRegistrationService] [[corona-warn-app-cwa-dcc-server.system#_-NEwIWiGEe-QUdfMyjv9Mw]]
+[app_coronawarn_dcc_repository_DccRegistrationRepository] [[corona-warn-app-cwa-dcc-server.system#_MvcDZGj1Ee-PgZMUkxTx2Q]]
+[app_coronawarn_dcc_service_DccRegistrationCleanupService] [[corona-warn-app-cwa-dcc-server.system#_MvcDZGj1Ee-PgZMUkxTx2Q]]
+[app_coronawarn_dcc_service_DccRegistrationService] [[corona-warn-app-cwa-dcc-server.system#_MvcDZGj1Ee-PgZMUkxTx2Q]]
}
}
node nodeapp_coronawarn_dcc_2 {
component app_coronawarn_dcc_2 {
-[app_coronawarn_dcc_repository_LabIdClaimRepository] [[corona-warn-app-cwa-dcc-server.system#_-NEwIWiGEe-QUdfMyjv9Mw]]
-[app_coronawarn_dcc_service_LabIdClaimCleanupService] [[corona-warn-app-cwa-dcc-server.system#_-NEwIWiGEe-QUdfMyjv9Mw]]
-[app_coronawarn_dcc_service_LabIdClaimService] [[corona-warn-app-cwa-dcc-server.system#_-NEwIWiGEe-QUdfMyjv9Mw]]
+[app_coronawarn_dcc_repository_LabIdClaimRepository] [[corona-warn-app-cwa-dcc-server.system#_MvcDZGj1Ee-PgZMUkxTx2Q]]
+[app_coronawarn_dcc_service_LabIdClaimCleanupService] [[corona-warn-app-cwa-dcc-server.system#_MvcDZGj1Ee-PgZMUkxTx2Q]]
+[app_coronawarn_dcc_service_LabIdClaimService] [[corona-warn-app-cwa-dcc-server.system#_MvcDZGj1Ee-PgZMUkxTx2Q]]
}
}
node nodeapp_coronawarn_dcc_controller_ExternalDccClaimController {
-[app_coronawarn_dcc_controller_ExternalDccClaimController] [[corona-warn-app-cwa-dcc-server.system#_-NEwIWiGEe-QUdfMyjv9Mw]]
+[app_coronawarn_dcc_controller_ExternalDccClaimController] [[corona-warn-app-cwa-dcc-server.system#_MvcDZGj1Ee-PgZMUkxTx2Q]]
}
node nodeapp_coronawarn_dcc_controller_ExternalPublicKeyController {
-[app_coronawarn_dcc_controller_ExternalPublicKeyController] [[corona-warn-app-cwa-dcc-server.system#_-NEwIWiGEe-QUdfMyjv9Mw]]
+[app_coronawarn_dcc_controller_ExternalPublicKeyController] [[corona-warn-app-cwa-dcc-server.system#_MvcDZGj1Ee-PgZMUkxTx2Q]]
}
node nodeapp_coronawarn_dcc_controller_InternalDccController {
-[app_coronawarn_dcc_controller_InternalDccController] [[corona-warn-app-cwa-dcc-server.system#_-NEwIWiGEe-QUdfMyjv9Mw]]
+[app_coronawarn_dcc_controller_InternalDccController] [[corona-warn-app-cwa-dcc-server.system#_MvcDZGj1Ee-PgZMUkxTx2Q]]
}
node nodeapp_coronawarn_dcc_controller_InternalLabIdClaimController {
-[app_coronawarn_dcc_controller_InternalLabIdClaimController] [[corona-warn-app-cwa-dcc-server.system#_-NEwIWiGEe-QUdfMyjv9Mw]]
+[app_coronawarn_dcc_controller_InternalLabIdClaimController] [[corona-warn-app-cwa-dcc-server.system#_MvcDZGj1Ee-PgZMUkxTx2Q]]
}
node nodeapp_coronawarn_dcc_controller_InternalPublicKeyController {
-[app_coronawarn_dcc_controller_InternalPublicKeyController] [[corona-warn-app-cwa-dcc-server.system#_-NEwIWiGEe-QUdfMyjv9Mw]]
+[app_coronawarn_dcc_controller_InternalPublicKeyController] [[corona-warn-app-cwa-dcc-server.system#_MvcDZGj1Ee-PgZMUkxTx2Q]]
}
node nodeapp_coronawarn_dcc_service_DccService {
-[app_coronawarn_dcc_service_DccService] [[corona-warn-app-cwa-dcc-server.system#_-NEwIWiGEe-QUdfMyjv9Mw]]
+[app_coronawarn_dcc_service_DccService] [[corona-warn-app-cwa-dcc-server.system#_MvcDZGj1Ee-PgZMUkxTx2Q]]
}
@enduml
diff --git a/corona-warn-app-cwa-dcc-server/model_re/uml/allocationDiagram.svg b/corona-warn-app-cwa-dcc-server/model_re/uml/allocationDiagram.svg
index cae867670f..80fb414586 100644
--- a/corona-warn-app-cwa-dcc-server/model_re/uml/allocationDiagram.svg
+++ b/corona-warn-app-cwa-dcc-server/model_re/uml/allocationDiagram.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/corona-warn-app-cwa-dcc-server/model_re/uml/componentDiagram.puml b/corona-warn-app-cwa-dcc-server/model_re/uml/componentDiagram.puml
index 6fa542f3b7..eacf355448 100644
--- a/corona-warn-app-cwa-dcc-server/model_re/uml/componentDiagram.puml
+++ b/corona-warn-app-cwa-dcc-server/model_re/uml/componentDiagram.puml
@@ -2,16 +2,16 @@
skinparam fixCircleLabelOverlapping true
skinparam componentStyle uml2
component "app_coronawarn_dcc\n\n\n\n\n\n" {
-[app_coronawarn_dcc_service_DccRegistrationCleanupService]
[app_coronawarn_dcc_repository_DccRegistrationRepository]
+[app_coronawarn_dcc_service_DccRegistrationCleanupService]
[app_coronawarn_dcc_service_DccRegistrationService]
[app_coronawarn_dcc_service_DccRegistrationService]..>[app_coronawarn_dcc_repository_DccRegistrationRepository] : requires
[app_coronawarn_dcc_service_DccRegistrationCleanupService]..>[app_coronawarn_dcc_repository_DccRegistrationRepository] : requires
}
component "app_coronawarn_dcc 2\n\n\n\n\n\n" {
-[app_coronawarn_dcc_service_LabIdClaimCleanupService]
-[app_coronawarn_dcc_service_LabIdClaimService]
[app_coronawarn_dcc_repository_LabIdClaimRepository]
+[app_coronawarn_dcc_service_LabIdClaimService]
+[app_coronawarn_dcc_service_LabIdClaimCleanupService]
[app_coronawarn_dcc_service_LabIdClaimService]..>[app_coronawarn_dcc_repository_LabIdClaimRepository] : requires
[app_coronawarn_dcc_service_LabIdClaimCleanupService]..>[app_coronawarn_dcc_repository_LabIdClaimRepository] : requires
}
diff --git a/corona-warn-app-cwa-dcc-server/model_re/uml/componentDiagram.svg b/corona-warn-app-cwa-dcc-server/model_re/uml/componentDiagram.svg
index 35583bcdde..e9c08e382b 100644
--- a/corona-warn-app-cwa-dcc-server/model_re/uml/componentDiagram.svg
+++ b/corona-warn-app-cwa-dcc-server/model_re/uml/componentDiagram.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/corona-warn-app-cwa-dcc-server/model_re/uml/systemDiagram.puml b/corona-warn-app-cwa-dcc-server/model_re/uml/systemDiagram.puml
index 4801ef4188..c3a8a37a33 100644
--- a/corona-warn-app-cwa-dcc-server/model_re/uml/systemDiagram.puml
+++ b/corona-warn-app-cwa-dcc-server/model_re/uml/systemDiagram.puml
@@ -7,18 +7,18 @@ skinparam componentStyle uml2
() SPRING_APPLICATION_version_v1_publicKey_search_GET_Delegation_Provider
() SPRING_APPLICATION_version_v1_test_dcc_POST_Delegation_Provider
rectangle System {
-[app_coronawarn_dcc_controller_ExternalDccClaimController] [[corona-warn-app-cwa-dcc-server.repository#_-M7mRGiGEe-QUdfMyjv9Mw]]
-[app_coronawarn_dcc_controller_ExternalPublicKeyController] [[corona-warn-app-cwa-dcc-server.repository#_-M7mRGiGEe-QUdfMyjv9Mw]]
-[app_coronawarn_dcc_controller_InternalDccController] [[corona-warn-app-cwa-dcc-server.repository#_-M7mRGiGEe-QUdfMyjv9Mw]]
-[app_coronawarn_dcc_controller_InternalLabIdClaimController] [[corona-warn-app-cwa-dcc-server.repository#_-M7mRGiGEe-QUdfMyjv9Mw]]
-[app_coronawarn_dcc_controller_InternalPublicKeyController] [[corona-warn-app-cwa-dcc-server.repository#_-M7mRGiGEe-QUdfMyjv9Mw]]
-[app_coronawarn_dcc_repository_DccRegistrationRepository] [[corona-warn-app-cwa-dcc-server.repository#_-M7mRGiGEe-QUdfMyjv9Mw]]
-[app_coronawarn_dcc_repository_LabIdClaimRepository] [[corona-warn-app-cwa-dcc-server.repository#_-M7mRGiGEe-QUdfMyjv9Mw]]
-[app_coronawarn_dcc_service_DccRegistrationCleanupService] [[corona-warn-app-cwa-dcc-server.repository#_-M7mRGiGEe-QUdfMyjv9Mw]]
-[app_coronawarn_dcc_service_DccRegistrationService] [[corona-warn-app-cwa-dcc-server.repository#_-M7mRGiGEe-QUdfMyjv9Mw]]
-[app_coronawarn_dcc_service_DccService] [[corona-warn-app-cwa-dcc-server.repository#_-M7mRGiGEe-QUdfMyjv9Mw]]
-[app_coronawarn_dcc_service_LabIdClaimCleanupService] [[corona-warn-app-cwa-dcc-server.repository#_-M7mRGiGEe-QUdfMyjv9Mw]]
-[app_coronawarn_dcc_service_LabIdClaimService] [[corona-warn-app-cwa-dcc-server.repository#_-M7mRGiGEe-QUdfMyjv9Mw]]
+[app_coronawarn_dcc_controller_ExternalDccClaimController] [[corona-warn-app-cwa-dcc-server.repository#_MvTgjGj1Ee-PgZMUkxTx2Q]]
+[app_coronawarn_dcc_controller_ExternalPublicKeyController] [[corona-warn-app-cwa-dcc-server.repository#_MvTgjGj1Ee-PgZMUkxTx2Q]]
+[app_coronawarn_dcc_controller_InternalDccController] [[corona-warn-app-cwa-dcc-server.repository#_MvTgjGj1Ee-PgZMUkxTx2Q]]
+[app_coronawarn_dcc_controller_InternalLabIdClaimController] [[corona-warn-app-cwa-dcc-server.repository#_MvTgjGj1Ee-PgZMUkxTx2Q]]
+[app_coronawarn_dcc_controller_InternalPublicKeyController] [[corona-warn-app-cwa-dcc-server.repository#_MvTgjGj1Ee-PgZMUkxTx2Q]]
+[app_coronawarn_dcc_repository_DccRegistrationRepository] [[corona-warn-app-cwa-dcc-server.repository#_MvTgjGj1Ee-PgZMUkxTx2Q]]
+[app_coronawarn_dcc_repository_LabIdClaimRepository] [[corona-warn-app-cwa-dcc-server.repository#_MvTgjGj1Ee-PgZMUkxTx2Q]]
+[app_coronawarn_dcc_service_DccRegistrationCleanupService] [[corona-warn-app-cwa-dcc-server.repository#_MvTgjGj1Ee-PgZMUkxTx2Q]]
+[app_coronawarn_dcc_service_DccRegistrationService] [[corona-warn-app-cwa-dcc-server.repository#_MvTgjGj1Ee-PgZMUkxTx2Q]]
+[app_coronawarn_dcc_service_DccService] [[corona-warn-app-cwa-dcc-server.repository#_MvTgjGj1Ee-PgZMUkxTx2Q]]
+[app_coronawarn_dcc_service_LabIdClaimCleanupService] [[corona-warn-app-cwa-dcc-server.repository#_MvTgjGj1Ee-PgZMUkxTx2Q]]
+[app_coronawarn_dcc_service_LabIdClaimService] [[corona-warn-app-cwa-dcc-server.repository#_MvTgjGj1Ee-PgZMUkxTx2Q]]
port SPRING_APPLICATION_version_v1_dcc_POST_Provider
SPRING_APPLICATION_version_v1_dcc_POST_Delegation_Provider - SPRING_APPLICATION_version_v1_dcc_POST_Provider
SPRING_APPLICATION_version_v1_dcc_POST_Provider - [app_coronawarn_dcc_controller_ExternalDccClaimController]
diff --git a/corona-warn-app-cwa-dcc-server/model_re/uml/systemDiagram.svg b/corona-warn-app-cwa-dcc-server/model_re/uml/systemDiagram.svg
index 6516d6b1da..6604f278b5 100644
--- a/corona-warn-app-cwa-dcc-server/model_re/uml/systemDiagram.svg
+++ b/corona-warn-app-cwa-dcc-server/model_re/uml/systemDiagram.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/corona-warn-app-cwa-log-upload/model_re/README.md b/corona-warn-app-cwa-log-upload/model_re/README.md
index c457e2f34b..f2611d9844 100644
--- a/corona-warn-app-cwa-log-upload/model_re/README.md
+++ b/corona-warn-app-cwa-log-upload/model_re/README.md
@@ -2,13 +2,13 @@
| Attribute | Value |
| ------------------ | ----- |
| Retriever Version | v5.2.0.202408280745 |
-| Date | Sun Sep 1 17:24:02 UTC 2024 |
+| Date | Mon Sep 2 06:33:15 UTC 2024 |
| #Components | 15 |
| #Source Files | 59 |
| Lines of Code | 3466 |
| #Technologies | 6 |
| Abstraction | 3.93 |
-| Execution Time [s] | 3.637 ± 0.049 |
+| Execution Time [s] | 3.621 ± 0.045 |
## Git repository information
| Attribute | Value |
@@ -29,16 +29,16 @@
| Kernel | 6.5.0-1025-azure |
| CPU | AMD EPYC 7763 (4) @ 3.244GHz |
| GPU | 00:08.0 Microsoft Corporation Hyper-V virtual VGA |
-| Memory | 783MiB / 15981MiB |
+| Memory | 793MiB / 15981MiB |
## Retriever execution time
| Mean [s] | Min [s] | Max [s] | Relative |
|---:|---:|---:|---:|
-| 3.637 ± 0.049 | 3.561 | 3.700 | 1.00 |
+| 3.621 ± 0.045 | 3.525 | 3.695 | 1.00 |
## Cloc analysis
-
+
|Technology|files|blank|comment|code|
|:-------|-------:|-------:|-------:|-------:|
diff --git a/corona-warn-app-cwa-log-upload/model_re/pcm/corona-warn-app-cwa-log-upload.allocation b/corona-warn-app-cwa-log-upload/model_re/pcm/corona-warn-app-cwa-log-upload.allocation
index a212396857..ef75b31c11 100644
--- a/corona-warn-app-cwa-log-upload/model_re/pcm/corona-warn-app-cwa-log-upload.allocation
+++ b/corona-warn-app-cwa-log-upload/model_re/pcm/corona-warn-app-cwa-log-upload.allocation
@@ -1,65 +1,65 @@
-
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
diff --git a/corona-warn-app-cwa-log-upload/model_re/pcm/corona-warn-app-cwa-log-upload.repository b/corona-warn-app-cwa-log-upload/model_re/pcm/corona-warn-app-cwa-log-upload.repository
index eb1c7faf93..4071d3e32a 100644
--- a/corona-warn-app-cwa-log-upload/model_re/pcm/corona-warn-app-cwa-log-upload.repository
+++ b/corona-warn-app-cwa-log-upload/model_re/pcm/corona-warn-app-cwa-log-upload.repository
@@ -1,84 +1,119 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -88,14 +123,14 @@
-
+
-
-
-
+
+
+
@@ -105,265 +140,230 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
+
-
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
-
+
-
+
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
+
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
+
+
-
-
-
-
+
+
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
diff --git a/corona-warn-app-cwa-log-upload/model_re/pcm/corona-warn-app-cwa-log-upload.resourceenvironment b/corona-warn-app-cwa-log-upload/model_re/pcm/corona-warn-app-cwa-log-upload.resourceenvironment
index b6ca9570a6..37cecbe8d6 100644
--- a/corona-warn-app-cwa-log-upload/model_re/pcm/corona-warn-app-cwa-log-upload.resourceenvironment
+++ b/corona-warn-app-cwa-log-upload/model_re/pcm/corona-warn-app-cwa-log-upload.resourceenvironment
@@ -1,27 +1,27 @@
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/corona-warn-app-cwa-log-upload/model_re/pcm/corona-warn-app-cwa-log-upload.system b/corona-warn-app-cwa-log-upload/model_re/pcm/corona-warn-app-cwa-log-upload.system
index 101a59de85..60cc7a1a4b 100644
--- a/corona-warn-app-cwa-log-upload/model_re/pcm/corona-warn-app-cwa-log-upload.system
+++ b/corona-warn-app-cwa-log-upload/model_re/pcm/corona-warn-app-cwa-log-upload.system
@@ -1,102 +1,102 @@
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/corona-warn-app-cwa-log-upload/model_re/uml/allocationDiagram.puml b/corona-warn-app-cwa-log-upload/model_re/uml/allocationDiagram.puml
index f038fb13e8..d6bbe02ec5 100644
--- a/corona-warn-app-cwa-log-upload/model_re/uml/allocationDiagram.puml
+++ b/corona-warn-app-cwa-log-upload/model_re/uml/allocationDiagram.puml
@@ -3,26 +3,26 @@ skinparam fixCircleLabelOverlapping true
skinparam componentStyle uml2
node nodeapp_coronawarn_logupload {
component app_coronawarn_logupload {
-[app_coronawarn_logupload_repository_LogRepository] [[corona-warn-app-cwa-log-upload.system#_-YpG9miGEe-P28sWgV4UbQ]]
-[app_coronawarn_logupload_service_FileStorageService] [[corona-warn-app-cwa-log-upload.system#_-YpG9miGEe-P28sWgV4UbQ]]
-[app_coronawarn_logupload_service_LogCleanupService] [[corona-warn-app-cwa-log-upload.system#_-YpG9miGEe-P28sWgV4UbQ]]
-[app_coronawarn_logupload_service_LogService] [[corona-warn-app-cwa-log-upload.system#_-YpG9miGEe-P28sWgV4UbQ]]
+[app_coronawarn_logupload_repository_LogRepository] [[corona-warn-app-cwa-log-upload.system#_OYcolGj1Ee-EB7qxgule5Q]]
+[app_coronawarn_logupload_service_FileStorageService] [[corona-warn-app-cwa-log-upload.system#_OYcolGj1Ee-EB7qxgule5Q]]
+[app_coronawarn_logupload_service_LogCleanupService] [[corona-warn-app-cwa-log-upload.system#_OYcolGj1Ee-EB7qxgule5Q]]
+[app_coronawarn_logupload_service_LogService] [[corona-warn-app-cwa-log-upload.system#_OYcolGj1Ee-EB7qxgule5Q]]
}
}
node nodeapp_coronawarn_logupload_controller_LogDownloadApiController {
-[app_coronawarn_logupload_controller_LogDownloadApiController] [[corona-warn-app-cwa-log-upload.system#_-YpG9miGEe-P28sWgV4UbQ]]
+[app_coronawarn_logupload_controller_LogDownloadApiController] [[corona-warn-app-cwa-log-upload.system#_OYcolGj1Ee-EB7qxgule5Q]]
}
node nodeapp_coronawarn_logupload_controller_LogUploadApiController {
-[app_coronawarn_logupload_controller_LogUploadApiController] [[corona-warn-app-cwa-log-upload.system#_-YpG9miGEe-P28sWgV4UbQ]]
+[app_coronawarn_logupload_controller_LogUploadApiController] [[corona-warn-app-cwa-log-upload.system#_OYcolGj1Ee-EB7qxgule5Q]]
}
node nodeapp_coronawarn_logupload_controller_LogUploadErrorController {
-[app_coronawarn_logupload_controller_LogUploadErrorController] [[corona-warn-app-cwa-log-upload.system#_-YpG9miGEe-P28sWgV4UbQ]]
+[app_coronawarn_logupload_controller_LogUploadErrorController] [[corona-warn-app-cwa-log-upload.system#_OYcolGj1Ee-EB7qxgule5Q]]
}
node nodeapp_coronawarn_logupload_controller_LogUploadPortalController {
-[app_coronawarn_logupload_controller_LogUploadPortalController] [[corona-warn-app-cwa-log-upload.system#_-YpG9miGEe-P28sWgV4UbQ]]
+[app_coronawarn_logupload_controller_LogUploadPortalController] [[corona-warn-app-cwa-log-upload.system#_OYcolGj1Ee-EB7qxgule5Q]]
}
node nodeapp_coronawarn_logupload_service_OtpService {
-[app_coronawarn_logupload_service_OtpService] [[corona-warn-app-cwa-log-upload.system#_-YpG9miGEe-P28sWgV4UbQ]]
+[app_coronawarn_logupload_service_OtpService] [[corona-warn-app-cwa-log-upload.system#_OYcolGj1Ee-EB7qxgule5Q]]
}
@enduml
diff --git a/corona-warn-app-cwa-log-upload/model_re/uml/allocationDiagram.svg b/corona-warn-app-cwa-log-upload/model_re/uml/allocationDiagram.svg
index 8ea43d3774..39bfcabc3f 100644
--- a/corona-warn-app-cwa-log-upload/model_re/uml/allocationDiagram.svg
+++ b/corona-warn-app-cwa-log-upload/model_re/uml/allocationDiagram.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/corona-warn-app-cwa-log-upload/model_re/uml/componentDiagram.puml b/corona-warn-app-cwa-log-upload/model_re/uml/componentDiagram.puml
index 1dda327d80..8c4ce35fc6 100644
--- a/corona-warn-app-cwa-log-upload/model_re/uml/componentDiagram.puml
+++ b/corona-warn-app-cwa-log-upload/model_re/uml/componentDiagram.puml
@@ -2,12 +2,12 @@
skinparam fixCircleLabelOverlapping true
skinparam componentStyle uml2
component "app_coronawarn_logupload\n\n\n\n\n\n" {
-[app_coronawarn_logupload_service_LogCleanupService]
-[app_coronawarn_logupload_service_FileStorageService]
[app_coronawarn_logupload_repository_LogRepository]
[app_coronawarn_logupload_service_LogService]
-[app_coronawarn_logupload_service_LogCleanupService]..>[app_coronawarn_logupload_repository_LogRepository] : requires
+[app_coronawarn_logupload_service_FileStorageService]
+[app_coronawarn_logupload_service_LogCleanupService]
[app_coronawarn_logupload_service_LogService]..>[app_coronawarn_logupload_repository_LogRepository] : requires
+[app_coronawarn_logupload_service_LogCleanupService]..>[app_coronawarn_logupload_repository_LogRepository] : requires
[app_coronawarn_logupload_service_FileStorageService]..>[app_coronawarn_logupload_repository_LogRepository] : requires
}
component "app_coronawarn_logupload_controller_LogDownloadApiController\n\n\n\n\n\n" {
@@ -34,13 +34,13 @@ interface.SPRING_APPLICATION_error--"app_coronawarn_logupload_controller_LogUplo
component "app_coronawarn_logupload_controller_LogUploadPortalController\n\n\n\n\n\n" {
[app_coronawarn_logupload_controller_LogUploadPortalController]
portin " " as app_coronawarn_logupload_controller_LogUploadPortalController_requires_SPRING_APPLICATION_GET_
-portin " " as app_coronawarn_logupload_controller_LogUploadPortalController_requires_SPRING_APPLICATION_portal_start_GET_
-portin " " as app_coronawarn_logupload_controller_LogUploadPortalController_requires_SPRING_APPLICATION_portal_logout_POST_
portin " " as app_coronawarn_logupload_controller_LogUploadPortalController_requires_SPRING_APPLICATION_portal_search_POST_
-"app_coronawarn_logupload_controller_LogUploadPortalController_requires_SPRING_APPLICATION_portal_start_GET_"--[app_coronawarn_logupload_controller_LogUploadPortalController]
-"app_coronawarn_logupload_controller_LogUploadPortalController_requires_SPRING_APPLICATION_portal_logout_POST_"--[app_coronawarn_logupload_controller_LogUploadPortalController]
+portin " " as app_coronawarn_logupload_controller_LogUploadPortalController_requires_SPRING_APPLICATION_portal_logout_POST_
+portin " " as app_coronawarn_logupload_controller_LogUploadPortalController_requires_SPRING_APPLICATION_portal_start_GET_
"app_coronawarn_logupload_controller_LogUploadPortalController_requires_SPRING_APPLICATION_portal_search_POST_"--[app_coronawarn_logupload_controller_LogUploadPortalController]
+"app_coronawarn_logupload_controller_LogUploadPortalController_requires_SPRING_APPLICATION_portal_start_GET_"--[app_coronawarn_logupload_controller_LogUploadPortalController]
"app_coronawarn_logupload_controller_LogUploadPortalController_requires_SPRING_APPLICATION_GET_"--[app_coronawarn_logupload_controller_LogUploadPortalController]
+"app_coronawarn_logupload_controller_LogUploadPortalController_requires_SPRING_APPLICATION_portal_logout_POST_"--[app_coronawarn_logupload_controller_LogUploadPortalController]
}
interface "SPRING-APPLICATION/[GET]" as interface.SPRING_APPLICATION_GET_
interface.SPRING_APPLICATION_GET_--"app_coronawarn_logupload_controller_LogUploadPortalController_requires_SPRING_APPLICATION_GET_"
diff --git a/corona-warn-app-cwa-log-upload/model_re/uml/componentDiagram.svg b/corona-warn-app-cwa-log-upload/model_re/uml/componentDiagram.svg
index be445e31b4..4ff9c18267 100644
--- a/corona-warn-app-cwa-log-upload/model_re/uml/componentDiagram.svg
+++ b/corona-warn-app-cwa-log-upload/model_re/uml/componentDiagram.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/corona-warn-app-cwa-log-upload/model_re/uml/systemDiagram.puml b/corona-warn-app-cwa-log-upload/model_re/uml/systemDiagram.puml
index 3bf323bab7..56bd74f29e 100644
--- a/corona-warn-app-cwa-log-upload/model_re/uml/systemDiagram.puml
+++ b/corona-warn-app-cwa-log-upload/model_re/uml/systemDiagram.puml
@@ -9,15 +9,15 @@ skinparam componentStyle uml2
() SPRING_APPLICATION_portal_search_POST_Delegation_Provider
() SPRING_APPLICATION_portal_start_GET_Delegation_Provider
rectangle System {
-[app_coronawarn_logupload_controller_LogDownloadApiController] [[corona-warn-app-cwa-log-upload.repository#_-YgkEGiGEe-P28sWgV4UbQ]]
-[app_coronawarn_logupload_controller_LogUploadApiController] [[corona-warn-app-cwa-log-upload.repository#_-YgkEGiGEe-P28sWgV4UbQ]]
-[app_coronawarn_logupload_controller_LogUploadErrorController] [[corona-warn-app-cwa-log-upload.repository#_-YgkEGiGEe-P28sWgV4UbQ]]
-[app_coronawarn_logupload_controller_LogUploadPortalController] [[corona-warn-app-cwa-log-upload.repository#_-YgkEGiGEe-P28sWgV4UbQ]]
-[app_coronawarn_logupload_repository_LogRepository] [[corona-warn-app-cwa-log-upload.repository#_-YgkEGiGEe-P28sWgV4UbQ]]
-[app_coronawarn_logupload_service_FileStorageService] [[corona-warn-app-cwa-log-upload.repository#_-YgkEGiGEe-P28sWgV4UbQ]]
-[app_coronawarn_logupload_service_LogCleanupService] [[corona-warn-app-cwa-log-upload.repository#_-YgkEGiGEe-P28sWgV4UbQ]]
-[app_coronawarn_logupload_service_LogService] [[corona-warn-app-cwa-log-upload.repository#_-YgkEGiGEe-P28sWgV4UbQ]]
-[app_coronawarn_logupload_service_OtpService] [[corona-warn-app-cwa-log-upload.repository#_-YgkEGiGEe-P28sWgV4UbQ]]
+[app_coronawarn_logupload_controller_LogDownloadApiController] [[corona-warn-app-cwa-log-upload.repository#_OYTeomj1Ee-EB7qxgule5Q]]
+[app_coronawarn_logupload_controller_LogUploadApiController] [[corona-warn-app-cwa-log-upload.repository#_OYTeomj1Ee-EB7qxgule5Q]]
+[app_coronawarn_logupload_controller_LogUploadErrorController] [[corona-warn-app-cwa-log-upload.repository#_OYTeomj1Ee-EB7qxgule5Q]]
+[app_coronawarn_logupload_controller_LogUploadPortalController] [[corona-warn-app-cwa-log-upload.repository#_OYTeomj1Ee-EB7qxgule5Q]]
+[app_coronawarn_logupload_repository_LogRepository] [[corona-warn-app-cwa-log-upload.repository#_OYTeomj1Ee-EB7qxgule5Q]]
+[app_coronawarn_logupload_service_FileStorageService] [[corona-warn-app-cwa-log-upload.repository#_OYTeomj1Ee-EB7qxgule5Q]]
+[app_coronawarn_logupload_service_LogCleanupService] [[corona-warn-app-cwa-log-upload.repository#_OYTeomj1Ee-EB7qxgule5Q]]
+[app_coronawarn_logupload_service_LogService] [[corona-warn-app-cwa-log-upload.repository#_OYTeomj1Ee-EB7qxgule5Q]]
+[app_coronawarn_logupload_service_OtpService] [[corona-warn-app-cwa-log-upload.repository#_OYTeomj1Ee-EB7qxgule5Q]]
port SPRING_APPLICATION_GET_Provider
SPRING_APPLICATION_GET_Delegation_Provider - SPRING_APPLICATION_GET_Provider
SPRING_APPLICATION_GET_Provider - [app_coronawarn_logupload_controller_LogUploadPortalController]
@@ -39,8 +39,8 @@ SPRING_APPLICATION_portal_search_POST_Provider - [app_coronawarn_logupload_contr
port SPRING_APPLICATION_portal_start_GET_Provider
SPRING_APPLICATION_portal_start_GET_Delegation_Provider - SPRING_APPLICATION_portal_start_GET_Provider
SPRING_APPLICATION_portal_start_GET_Provider - [app_coronawarn_logupload_controller_LogUploadPortalController]
-[app_coronawarn_logupload_service_LogCleanupService] -(0- [app_coronawarn_logupload_repository_LogRepository] : app_coronawarn_logupload_repository_LogRepository_Provider
[app_coronawarn_logupload_service_LogService] -(0- [app_coronawarn_logupload_repository_LogRepository] : app_coronawarn_logupload_repository_LogRepository_Provider
+[app_coronawarn_logupload_service_LogCleanupService] -(0- [app_coronawarn_logupload_repository_LogRepository] : app_coronawarn_logupload_repository_LogRepository_Provider
[app_coronawarn_logupload_service_FileStorageService] -(0- [app_coronawarn_logupload_repository_LogRepository] : app_coronawarn_logupload_repository_LogRepository_Provider
}
diff --git a/corona-warn-app-cwa-log-upload/model_re/uml/systemDiagram.svg b/corona-warn-app-cwa-log-upload/model_re/uml/systemDiagram.svg
index 6ed294e760..10c7a1c004 100644
--- a/corona-warn-app-cwa-log-upload/model_re/uml/systemDiagram.svg
+++ b/corona-warn-app-cwa-log-upload/model_re/uml/systemDiagram.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/corona-warn-app-cwa-ppa-server/model_re/README.md b/corona-warn-app-cwa-ppa-server/model_re/README.md
index e8a5883afc..f8d2f81442 100644
--- a/corona-warn-app-cwa-ppa-server/model_re/README.md
+++ b/corona-warn-app-cwa-ppa-server/model_re/README.md
@@ -2,13 +2,13 @@
| Attribute | Value |
| ------------------ | ----- |
| Retriever Version | v5.2.0.202408280745 |
-| Date | Sun Sep 1 17:24:26 UTC 2024 |
+| Date | Mon Sep 2 06:33:25 UTC 2024 |
| #Components | 49 |
| #Source Files | 391 |
| Lines of Code | 21241 |
| #Technologies | 6 |
| Abstraction | 7.97 |
-| Execution Time [s] | 6.011 ± 0.107 |
+| Execution Time [s] | 6.060 ± 0.167 |
## Git repository information
| Attribute | Value |
@@ -27,18 +27,18 @@
| OS | Linux |
| Distro | Ubuntu 22.04.4 LTS x86_64 |
| Kernel | 6.5.0-1025-azure |
-| CPU | AMD EPYC 7763 (4) @ 3.242GHz |
+| CPU | AMD EPYC 7763 (4) @ 3.226GHz |
| GPU | 00:08.0 Microsoft Corporation Hyper-V virtual VGA |
-| Memory | 793MiB / 15981MiB |
+| Memory | 791MiB / 15981MiB |
## Retriever execution time
| Mean [s] | Min [s] | Max [s] | Relative |
|---:|---:|---:|---:|
-| 6.011 ± 0.107 | 5.859 | 6.195 | 1.00 |
+| 6.060 ± 0.167 | 5.865 | 6.338 | 1.00 |
## Cloc analysis
-
+
|Technology|files|blank|comment|code|
|:-------|-------:|-------:|-------:|-------:|
diff --git a/corona-warn-app-cwa-ppa-server/model_re/pcm/corona-warn-app-cwa-ppa-server.allocation b/corona-warn-app-cwa-ppa-server/model_re/pcm/corona-warn-app-cwa-ppa-server.allocation
index 286187bc4d..8a6b4e7ece 100644
--- a/corona-warn-app-cwa-ppa-server/model_re/pcm/corona-warn-app-cwa-ppa-server.allocation
+++ b/corona-warn-app-cwa-ppa-server/model_re/pcm/corona-warn-app-cwa-ppa-server.allocation
@@ -1,201 +1,201 @@
-
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
diff --git a/corona-warn-app-cwa-ppa-server/model_re/pcm/corona-warn-app-cwa-ppa-server.repository b/corona-warn-app-cwa-ppa-server/model_re/pcm/corona-warn-app-cwa-ppa-server.repository
index b4c97ff8bf..82b514fd81 100644
--- a/corona-warn-app-cwa-ppa-server/model_re/pcm/corona-warn-app-cwa-ppa-server.repository
+++ b/corona-warn-app-cwa-ppa-server/model_re/pcm/corona-warn-app-cwa-ppa-server.repository
@@ -1,165 +1,252 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -169,119 +256,139 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
@@ -291,13 +398,13 @@
-
+
-
-
-
-
-
+
+
+
+
+
@@ -307,12 +414,12 @@
-
+
-
-
-
-
+
+
+
+
@@ -330,7 +437,7 @@
-
+
@@ -356,9 +463,9 @@
-
-
-
+
+
+
@@ -368,150 +475,43 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -521,303 +521,303 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
+
-
+
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
-
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/corona-warn-app-cwa-ppa-server/model_re/pcm/corona-warn-app-cwa-ppa-server.resourceenvironment b/corona-warn-app-cwa-ppa-server/model_re/pcm/corona-warn-app-cwa-ppa-server.resourceenvironment
index 26bc92272c..0978f09481 100644
--- a/corona-warn-app-cwa-ppa-server/model_re/pcm/corona-warn-app-cwa-ppa-server.resourceenvironment
+++ b/corona-warn-app-cwa-ppa-server/model_re/pcm/corona-warn-app-cwa-ppa-server.resourceenvironment
@@ -1,127 +1,127 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
+
-
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/corona-warn-app-cwa-ppa-server/model_re/pcm/corona-warn-app-cwa-ppa-server.system b/corona-warn-app-cwa-ppa-server/model_re/pcm/corona-warn-app-cwa-ppa-server.system
index df9b1c629b..9e78aea2ae 100644
--- a/corona-warn-app-cwa-ppa-server/model_re/pcm/corona-warn-app-cwa-ppa-server.system
+++ b/corona-warn-app-cwa-ppa-server/model_re/pcm/corona-warn-app-cwa-ppa-server.system
@@ -1,346 +1,346 @@
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/corona-warn-app-cwa-ppa-server/model_re/uml/allocationDiagram.puml b/corona-warn-app-cwa-ppa-server/model_re/uml/allocationDiagram.puml
index fcbd8d31c9..e611cb6e14 100644
--- a/corona-warn-app-cwa-ppa-server/model_re/uml/allocationDiagram.puml
+++ b/corona-warn-app-cwa-ppa-server/model_re/uml/allocationDiagram.puml
@@ -3,80 +3,80 @@ skinparam fixCircleLabelOverlapping true
skinparam componentStyle uml2
node nodeapp_coronawarn_datadonation {
component app_coronawarn_datadonation {
-[app_coronawarn_datadonation_common_persistence_repository_DeviceTokenRepository] [[corona-warn-app-cwa-ppa-server.system#_CQtktmiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_services_ppac_ios_verification_devicetoken_DeviceTokenService] [[corona-warn-app-cwa-ppa-server.system#_CQtktmiHEe-kD40mSWIY8A]]
+[app_coronawarn_datadonation_common_persistence_repository_ppac_android_SaltRepository] [[corona-warn-app-cwa-ppa-server.system#_QOHJvmj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_common_persistence_service_SaltService] [[corona-warn-app-cwa-ppa-server.system#_QOHJvmj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_services_ppac_android_controller_DeleteSaltController] [[corona-warn-app-cwa-ppa-server.system#_QOHJvmj1Ee-0Lo713-JUsw]]
}
}
node nodeapp_coronawarn_datadonation_2 {
component app_coronawarn_datadonation_2 {
-[app_coronawarn_datadonation_common_persistence_repository_AndroidIdRepository] [[corona-warn-app-cwa-ppa-server.system#_CQtktmiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_common_persistence_service_AndroidIdService] [[corona-warn-app-cwa-ppa-server.system#_CQtktmiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_services_ppac_android_attestation_DeviceAttestationVerifier] [[corona-warn-app-cwa-ppa-server.system#_CQtktmiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_services_ppac_android_attestation_ProdAndroidIdVerificationStrategy] [[corona-warn-app-cwa-ppa-server.system#_CQtktmiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_services_ppac_android_attestation_ProdSrsRateLimitVerificationStrategy] [[corona-warn-app-cwa-ppa-server.system#_CQtktmiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_services_ppac_android_attestation_TestSrsRateLimitVerificationStrategy] [[corona-warn-app-cwa-ppa-server.system#_CQtktmiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_services_ppac_android_controller_AndroidController] [[corona-warn-app-cwa-ppa-server.system#_CQtktmiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_services_ppac_android_controller_PpaDataRequestAndroidConverter] [[corona-warn-app-cwa-ppa-server.system#_CQtktmiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_services_ppac_android_controller_validation_PpaDataRequestAndroidValidator] [[corona-warn-app-cwa-ppa-server.system#_CQtktmiHEe-kD40mSWIY8A]]
+[app_coronawarn_datadonation_common_persistence_service_OtpService] [[corona-warn-app-cwa-ppa-server.system#_QOHJvmj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_services_edus_otp_GenerateOtpController] [[corona-warn-app-cwa-ppa-server.system#_QOHJvmj1Ee-0Lo713-JUsw]]
}
}
node nodeapp_coronawarn_datadonation_3 {
component app_coronawarn_datadonation_3 {
-[app_coronawarn_datadonation_common_persistence_repository_ppac_android_SaltRepository] [[corona-warn-app-cwa-ppa-server.system#_CQtktmiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_common_persistence_service_SaltService] [[corona-warn-app-cwa-ppa-server.system#_CQtktmiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_services_ppac_android_controller_DeleteSaltController] [[corona-warn-app-cwa-ppa-server.system#_CQtktmiHEe-kD40mSWIY8A]]
+[app_coronawarn_datadonation_common_persistence_service_SrsOtpService] [[corona-warn-app-cwa-ppa-server.system#_QOHJvmj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_services_ppac_otp_GenerateSrsOtpController] [[corona-warn-app-cwa-ppa-server.system#_QOHJvmj1Ee-0Lo713-JUsw]]
}
}
node nodeapp_coronawarn_datadonation_4 {
component app_coronawarn_datadonation_4 {
-[app_coronawarn_datadonation_common_persistence_service_OtpService] [[corona-warn-app-cwa-ppa-server.system#_CQtktmiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_services_edus_otp_GenerateOtpController] [[corona-warn-app-cwa-ppa-server.system#_CQtktmiHEe-kD40mSWIY8A]]
+[app_coronawarn_datadonation_common_persistence_repository_DeviceTokenRepository] [[corona-warn-app-cwa-ppa-server.system#_QOHJvmj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_services_ppac_ios_verification_devicetoken_DeviceTokenService] [[corona-warn-app-cwa-ppa-server.system#_QOHJvmj1Ee-0Lo713-JUsw]]
}
}
node nodeapp_coronawarn_datadonation_5 {
component app_coronawarn_datadonation_5 {
-[app_coronawarn_datadonation_common_persistence_service_ElsOtpService] [[corona-warn-app-cwa-ppa-server.system#_CQtktmiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_services_els_otp_GenerateElsOtpController] [[corona-warn-app-cwa-ppa-server.system#_CQtktmiHEe-kD40mSWIY8A]]
+[app_coronawarn_datadonation_common_persistence_service_ElsOtpService] [[corona-warn-app-cwa-ppa-server.system#_QOHJvmj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_services_els_otp_GenerateElsOtpController] [[corona-warn-app-cwa-ppa-server.system#_QOHJvmj1Ee-0Lo713-JUsw]]
}
}
node nodeapp_coronawarn_datadonation_6 {
component app_coronawarn_datadonation_6 {
-[app_coronawarn_datadonation_common_persistence_service_SrsOtpService] [[corona-warn-app-cwa-ppa-server.system#_CQtktmiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_services_ppac_otp_GenerateSrsOtpController] [[corona-warn-app-cwa-ppa-server.system#_CQtktmiHEe-kD40mSWIY8A]]
+[app_coronawarn_datadonation_common_persistence_repository_AndroidIdRepository] [[corona-warn-app-cwa-ppa-server.system#_QOHJvmj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_common_persistence_service_AndroidIdService] [[corona-warn-app-cwa-ppa-server.system#_QOHJvmj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_services_ppac_android_attestation_DeviceAttestationVerifier] [[corona-warn-app-cwa-ppa-server.system#_QOHJvmj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_services_ppac_android_attestation_ProdAndroidIdVerificationStrategy] [[corona-warn-app-cwa-ppa-server.system#_QOHJvmj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_services_ppac_android_attestation_ProdSrsRateLimitVerificationStrategy] [[corona-warn-app-cwa-ppa-server.system#_QOHJvmj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_services_ppac_android_attestation_TestSrsRateLimitVerificationStrategy] [[corona-warn-app-cwa-ppa-server.system#_QOHJvmj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_services_ppac_android_controller_AndroidController] [[corona-warn-app-cwa-ppa-server.system#_QOHJvmj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_services_ppac_android_controller_PpaDataRequestAndroidConverter] [[corona-warn-app-cwa-ppa-server.system#_QOHJvmj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_services_ppac_android_controller_validation_PpaDataRequestAndroidValidator] [[corona-warn-app-cwa-ppa-server.system#_QOHJvmj1Ee-0Lo713-JUsw]]
}
}
node nodeapp_coronawarn_datadonation_common_persistence {
component app_coronawarn_datadonation_common_persistence {
-[app_coronawarn_datadonation_common_persistence_repository_metrics_ClientMetadataRepository] [[corona-warn-app-cwa-ppa-server.system#_CQtktmiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_common_persistence_repository_metrics_ExposureRiskMetadataRepository] [[corona-warn-app-cwa-ppa-server.system#_CQtktmiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_common_persistence_repository_metrics_ExposureWindowRepository] [[corona-warn-app-cwa-ppa-server.system#_CQtktmiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_common_persistence_repository_metrics_ExposureWindowTestResultsRepository] [[corona-warn-app-cwa-ppa-server.system#_CQtktmiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_common_persistence_repository_metrics_KeySubmissionMetadataWithClientMetadataRepository] [[corona-warn-app-cwa-ppa-server.system#_CQtktmiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_common_persistence_repository_metrics_KeySubmissionMetadataWithUserMetadataRepository] [[corona-warn-app-cwa-ppa-server.system#_CQtktmiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_common_persistence_repository_metrics_SummarizedExposureWindowsWithUserMetadataRepository] [[corona-warn-app-cwa-ppa-server.system#_CQtktmiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_common_persistence_repository_metrics_TestResultMetadataRepository] [[corona-warn-app-cwa-ppa-server.system#_CQtktmiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_common_persistence_repository_metrics_UserMetadataRepository] [[corona-warn-app-cwa-ppa-server.system#_CQtktmiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_common_persistence_service_PpaDataService] [[corona-warn-app-cwa-ppa-server.system#_CQtktmiHEe-kD40mSWIY8A]]
+[app_coronawarn_datadonation_common_persistence_repository_metrics_ClientMetadataRepository] [[corona-warn-app-cwa-ppa-server.system#_QOHJvmj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_common_persistence_repository_metrics_ExposureRiskMetadataRepository] [[corona-warn-app-cwa-ppa-server.system#_QOHJvmj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_common_persistence_repository_metrics_ExposureWindowRepository] [[corona-warn-app-cwa-ppa-server.system#_QOHJvmj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_common_persistence_repository_metrics_ExposureWindowTestResultsRepository] [[corona-warn-app-cwa-ppa-server.system#_QOHJvmj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_common_persistence_repository_metrics_KeySubmissionMetadataWithClientMetadataRepository] [[corona-warn-app-cwa-ppa-server.system#_QOHJvmj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_common_persistence_repository_metrics_KeySubmissionMetadataWithUserMetadataRepository] [[corona-warn-app-cwa-ppa-server.system#_QOHJvmj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_common_persistence_repository_metrics_SummarizedExposureWindowsWithUserMetadataRepository] [[corona-warn-app-cwa-ppa-server.system#_QOHJvmj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_common_persistence_repository_metrics_TestResultMetadataRepository] [[corona-warn-app-cwa-ppa-server.system#_QOHJvmj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_common_persistence_repository_metrics_UserMetadataRepository] [[corona-warn-app-cwa-ppa-server.system#_QOHJvmj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_common_persistence_service_PpaDataService] [[corona-warn-app-cwa-ppa-server.system#_QOHJvmj1Ee-0Lo713-JUsw]]
}
}
node nodeapp_coronawarn_datadonation_services_ppac_ios {
component app_coronawarn_datadonation_services_ppac_ios {
-[app_coronawarn_datadonation_services_ppac_ios_controller_IosController] [[corona-warn-app-cwa-ppa-server.system#_CQtktmiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_services_ppac_ios_controller_PpaDataRequestIosConverter] [[corona-warn-app-cwa-ppa-server.system#_CQtktmiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_services_ppac_ios_verification_PpacProcessor] [[corona-warn-app-cwa-ppa-server.system#_CQtktmiHEe-kD40mSWIY8A]]
+[app_coronawarn_datadonation_services_ppac_ios_controller_IosController] [[corona-warn-app-cwa-ppa-server.system#_QOHJvmj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_services_ppac_ios_controller_PpaDataRequestIosConverter] [[corona-warn-app-cwa-ppa-server.system#_QOHJvmj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_services_ppac_ios_verification_PpacProcessor] [[corona-warn-app-cwa-ppa-server.system#_QOHJvmj1Ee-0Lo713-JUsw]]
}
}
node nodeapp_coronawarn_datadonation_services_edus_otp_OtpController {
-[app_coronawarn_datadonation_services_edus_otp_OtpController] [[corona-warn-app-cwa-ppa-server.system#_CQtktmiHEe-kD40mSWIY8A]]
+[app_coronawarn_datadonation_services_edus_otp_OtpController] [[corona-warn-app-cwa-ppa-server.system#_QOHJvmj1Ee-0Lo713-JUsw]]
}
node nodeapp_coronawarn_datadonation_services_els_otp_ElsOtpController {
-[app_coronawarn_datadonation_services_els_otp_ElsOtpController] [[corona-warn-app-cwa-ppa-server.system#_CQtktmiHEe-kD40mSWIY8A]]
+[app_coronawarn_datadonation_services_els_otp_ElsOtpController] [[corona-warn-app-cwa-ppa-server.system#_QOHJvmj1Ee-0Lo713-JUsw]]
}
node nodeapp_coronawarn_datadonation_services_ppac_commons_FakeRequestController {
-[app_coronawarn_datadonation_services_ppac_commons_FakeRequestController] [[corona-warn-app-cwa-ppa-server.system#_CQtktmiHEe-kD40mSWIY8A]]
+[app_coronawarn_datadonation_services_ppac_commons_FakeRequestController] [[corona-warn-app-cwa-ppa-server.system#_QOHJvmj1Ee-0Lo713-JUsw]]
}
node nodeapp_coronawarn_datadonation_services_srs_otp_SrsOtpController {
-[app_coronawarn_datadonation_services_srs_otp_SrsOtpController] [[corona-warn-app-cwa-ppa-server.system#_CQtktmiHEe-kD40mSWIY8A]]
+[app_coronawarn_datadonation_services_srs_otp_SrsOtpController] [[corona-warn-app-cwa-ppa-server.system#_QOHJvmj1Ee-0Lo713-JUsw]]
}
@enduml
diff --git a/corona-warn-app-cwa-ppa-server/model_re/uml/allocationDiagram.svg b/corona-warn-app-cwa-ppa-server/model_re/uml/allocationDiagram.svg
index a5cd332202..b545c2a19a 100644
--- a/corona-warn-app-cwa-ppa-server/model_re/uml/allocationDiagram.svg
+++ b/corona-warn-app-cwa-ppa-server/model_re/uml/allocationDiagram.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/corona-warn-app-cwa-ppa-server/model_re/uml/componentDiagram.puml b/corona-warn-app-cwa-ppa-server/model_re/uml/componentDiagram.puml
index e912eba95d..c1d6cf4992 100644
--- a/corona-warn-app-cwa-ppa-server/model_re/uml/componentDiagram.puml
+++ b/corona-warn-app-cwa-ppa-server/model_re/uml/componentDiagram.puml
@@ -2,68 +2,42 @@
skinparam fixCircleLabelOverlapping true
skinparam componentStyle uml2
component "app_coronawarn_datadonation\n\n\n\n\n\n" {
-[app_coronawarn_datadonation_services_ppac_ios_verification_devicetoken_DeviceTokenService]
-[app_coronawarn_datadonation_common_persistence_repository_DeviceTokenRepository]
-[app_coronawarn_datadonation_services_ppac_ios_verification_devicetoken_DeviceTokenService]..>[app_coronawarn_datadonation_common_persistence_repository_DeviceTokenRepository] : requires
-}
-component "app_coronawarn_datadonation 2\n\n\n\n\n\n" {
-[app_coronawarn_datadonation_services_ppac_android_controller_validation_PpaDataRequestAndroidValidator]
-[app_coronawarn_datadonation_services_ppac_android_attestation_ProdSrsRateLimitVerificationStrategy]
-[app_coronawarn_datadonation_services_ppac_android_attestation_ProdAndroidIdVerificationStrategy]
-[app_coronawarn_datadonation_services_ppac_android_controller_PpaDataRequestAndroidConverter]
-[app_coronawarn_datadonation_services_ppac_android_controller_AndroidController]
-[app_coronawarn_datadonation_services_ppac_android_attestation_DeviceAttestationVerifier]
-[app_coronawarn_datadonation_common_persistence_service_AndroidIdService]
-[app_coronawarn_datadonation_services_ppac_android_attestation_TestSrsRateLimitVerificationStrategy]
-[app_coronawarn_datadonation_common_persistence_repository_AndroidIdRepository]
-portin " " as app_coronawarn_datadonation_2_requires_SPRING_APPLICATION_srs_POST_2
-portin " " as app_coronawarn_datadonation_2_requires_SPRING_APPLICATION_els_POST_3
-portin " " as app_coronawarn_datadonation_2_requires_SPRING_APPLICATION_otp_POST_2
-portin " " as app_coronawarn_datadonation_2_requires_SPRING_APPLICATION_dat_POST_2
-[app_coronawarn_datadonation_services_ppac_android_controller_AndroidController]..>[app_coronawarn_datadonation_common_persistence_service_AndroidIdService] : requires
-[app_coronawarn_datadonation_services_ppac_android_controller_AndroidController]..>[app_coronawarn_datadonation_services_ppac_android_attestation_TestSrsRateLimitVerificationStrategy] : requires
-[app_coronawarn_datadonation_services_ppac_android_controller_AndroidController]..>[app_coronawarn_datadonation_services_ppac_android_attestation_ProdSrsRateLimitVerificationStrategy] : requires
-[app_coronawarn_datadonation_services_ppac_android_controller_AndroidController]..>[app_coronawarn_datadonation_services_ppac_android_attestation_ProdAndroidIdVerificationStrategy] : requires
-[app_coronawarn_datadonation_services_ppac_android_controller_AndroidController]..>[app_coronawarn_datadonation_services_ppac_android_controller_validation_PpaDataRequestAndroidValidator] : requires
-[app_coronawarn_datadonation_services_ppac_android_controller_AndroidController]..>[app_coronawarn_datadonation_services_ppac_android_attestation_DeviceAttestationVerifier] : requires
-[app_coronawarn_datadonation_common_persistence_service_AndroidIdService]..>[app_coronawarn_datadonation_common_persistence_repository_AndroidIdRepository] : requires
-[app_coronawarn_datadonation_services_ppac_android_controller_AndroidController]..>[app_coronawarn_datadonation_services_ppac_android_controller_PpaDataRequestAndroidConverter] : requires
-"app_coronawarn_datadonation_2_requires_SPRING_APPLICATION_dat_POST_2"--[app_coronawarn_datadonation_services_ppac_android_controller_AndroidController]
-"app_coronawarn_datadonation_2_requires_SPRING_APPLICATION_srs_POST_2"--[app_coronawarn_datadonation_services_ppac_android_controller_AndroidController]
-"app_coronawarn_datadonation_2_requires_SPRING_APPLICATION_otp_POST_2"--[app_coronawarn_datadonation_services_ppac_android_controller_AndroidController]
-"app_coronawarn_datadonation_2_requires_SPRING_APPLICATION_els_POST_3"--[app_coronawarn_datadonation_services_ppac_android_controller_AndroidController]
-}
-interface "SPRING-APPLICATION/dat[POST]$2" as interface.SPRING_APPLICATION_dat_POST_2
-interface.SPRING_APPLICATION_dat_POST_2--"app_coronawarn_datadonation_2_requires_SPRING_APPLICATION_dat_POST_2"
-interface "SPRING-APPLICATION/els[POST]$3" as interface.SPRING_APPLICATION_els_POST_3
-interface.SPRING_APPLICATION_els_POST_3--"app_coronawarn_datadonation_2_requires_SPRING_APPLICATION_els_POST_3"
-interface "SPRING-APPLICATION/otp[POST]$2" as interface.SPRING_APPLICATION_otp_POST_2
-interface.SPRING_APPLICATION_otp_POST_2--"app_coronawarn_datadonation_2_requires_SPRING_APPLICATION_otp_POST_2"
-interface "SPRING-APPLICATION/srs[POST]$2" as interface.SPRING_APPLICATION_srs_POST_2
-interface.SPRING_APPLICATION_srs_POST_2--"app_coronawarn_datadonation_2_requires_SPRING_APPLICATION_srs_POST_2"
-component "app_coronawarn_datadonation 3\n\n\n\n\n\n" {
-[app_coronawarn_datadonation_common_persistence_service_SaltService]
[app_coronawarn_datadonation_common_persistence_repository_ppac_android_SaltRepository]
[app_coronawarn_datadonation_services_ppac_android_controller_DeleteSaltController]
-portin " " as app_coronawarn_datadonation_3_requires_SPRING_APPLICATION_delete_DELETE_
-[app_coronawarn_datadonation_common_persistence_service_SaltService]..>[app_coronawarn_datadonation_common_persistence_repository_ppac_android_SaltRepository] : requires
+[app_coronawarn_datadonation_common_persistence_service_SaltService]
+portin " " as app_coronawarn_datadonation_requires_SPRING_APPLICATION_delete_DELETE_
[app_coronawarn_datadonation_services_ppac_android_controller_DeleteSaltController]..>[app_coronawarn_datadonation_common_persistence_service_SaltService] : requires
-"app_coronawarn_datadonation_3_requires_SPRING_APPLICATION_delete_DELETE_"--[app_coronawarn_datadonation_services_ppac_android_controller_DeleteSaltController]
+[app_coronawarn_datadonation_common_persistence_service_SaltService]..>[app_coronawarn_datadonation_common_persistence_repository_ppac_android_SaltRepository] : requires
+"app_coronawarn_datadonation_requires_SPRING_APPLICATION_delete_DELETE_"--[app_coronawarn_datadonation_services_ppac_android_controller_DeleteSaltController]
}
interface "SPRING-APPLICATION/delete[DELETE]" as interface.SPRING_APPLICATION_delete_DELETE_
-interface.SPRING_APPLICATION_delete_DELETE_--"app_coronawarn_datadonation_3_requires_SPRING_APPLICATION_delete_DELETE_"
-component "app_coronawarn_datadonation 4\n\n\n\n\n\n" {
+interface.SPRING_APPLICATION_delete_DELETE_--"app_coronawarn_datadonation_requires_SPRING_APPLICATION_delete_DELETE_"
+component "app_coronawarn_datadonation 2\n\n\n\n\n\n" {
[app_coronawarn_datadonation_services_edus_otp_GenerateOtpController]
[app_coronawarn_datadonation_common_persistence_service_OtpService]
-portin " " as app_coronawarn_datadonation_4_requires_SPRING_APPLICATION_gen_otp_GET_
+portin " " as app_coronawarn_datadonation_2_requires_SPRING_APPLICATION_gen_otp_GET_
[app_coronawarn_datadonation_services_edus_otp_GenerateOtpController]..>[app_coronawarn_datadonation_common_persistence_service_OtpService] : requires
-"app_coronawarn_datadonation_4_requires_SPRING_APPLICATION_gen_otp_GET_"--[app_coronawarn_datadonation_services_edus_otp_GenerateOtpController]
+"app_coronawarn_datadonation_2_requires_SPRING_APPLICATION_gen_otp_GET_"--[app_coronawarn_datadonation_services_edus_otp_GenerateOtpController]
}
interface "SPRING-APPLICATION/gen/otp[GET]" as interface.SPRING_APPLICATION_gen_otp_GET_
-interface.SPRING_APPLICATION_gen_otp_GET_--"app_coronawarn_datadonation_4_requires_SPRING_APPLICATION_gen_otp_GET_"
+interface.SPRING_APPLICATION_gen_otp_GET_--"app_coronawarn_datadonation_2_requires_SPRING_APPLICATION_gen_otp_GET_"
+component "app_coronawarn_datadonation 3\n\n\n\n\n\n" {
+[app_coronawarn_datadonation_services_ppac_otp_GenerateSrsOtpController]
+[app_coronawarn_datadonation_common_persistence_service_SrsOtpService]
+portin " " as app_coronawarn_datadonation_3_requires_SPRING_APPLICATION_gen_srs_GET_
+[app_coronawarn_datadonation_services_ppac_otp_GenerateSrsOtpController]..>[app_coronawarn_datadonation_common_persistence_service_SrsOtpService] : requires
+"app_coronawarn_datadonation_3_requires_SPRING_APPLICATION_gen_srs_GET_"--[app_coronawarn_datadonation_services_ppac_otp_GenerateSrsOtpController]
+}
+interface "SPRING-APPLICATION/gen/srs[GET]" as interface.SPRING_APPLICATION_gen_srs_GET_
+interface.SPRING_APPLICATION_gen_srs_GET_--"app_coronawarn_datadonation_3_requires_SPRING_APPLICATION_gen_srs_GET_"
+component "app_coronawarn_datadonation 4\n\n\n\n\n\n" {
+[app_coronawarn_datadonation_services_ppac_ios_verification_devicetoken_DeviceTokenService]
+[app_coronawarn_datadonation_common_persistence_repository_DeviceTokenRepository]
+[app_coronawarn_datadonation_services_ppac_ios_verification_devicetoken_DeviceTokenService]..>[app_coronawarn_datadonation_common_persistence_repository_DeviceTokenRepository] : requires
+}
component "app_coronawarn_datadonation 5\n\n\n\n\n\n" {
-[app_coronawarn_datadonation_common_persistence_service_ElsOtpService]
[app_coronawarn_datadonation_services_els_otp_GenerateElsOtpController]
+[app_coronawarn_datadonation_common_persistence_service_ElsOtpService]
portin " " as app_coronawarn_datadonation_5_requires_SPRING_APPLICATION_gen_els_GET_
[app_coronawarn_datadonation_services_els_otp_GenerateElsOtpController]..>[app_coronawarn_datadonation_common_persistence_service_ElsOtpService] : requires
"app_coronawarn_datadonation_5_requires_SPRING_APPLICATION_gen_els_GET_"--[app_coronawarn_datadonation_services_els_otp_GenerateElsOtpController]
@@ -71,34 +45,60 @@ portin " " as app_coronawarn_datadonation_5_requires_SPRING_APPLICATION_gen_els_
interface "SPRING-APPLICATION/gen/els[GET]" as interface.SPRING_APPLICATION_gen_els_GET_
interface.SPRING_APPLICATION_gen_els_GET_--"app_coronawarn_datadonation_5_requires_SPRING_APPLICATION_gen_els_GET_"
component "app_coronawarn_datadonation 6\n\n\n\n\n\n" {
-[app_coronawarn_datadonation_common_persistence_service_SrsOtpService]
-[app_coronawarn_datadonation_services_ppac_otp_GenerateSrsOtpController]
-portin " " as app_coronawarn_datadonation_6_requires_SPRING_APPLICATION_gen_srs_GET_
-[app_coronawarn_datadonation_services_ppac_otp_GenerateSrsOtpController]..>[app_coronawarn_datadonation_common_persistence_service_SrsOtpService] : requires
-"app_coronawarn_datadonation_6_requires_SPRING_APPLICATION_gen_srs_GET_"--[app_coronawarn_datadonation_services_ppac_otp_GenerateSrsOtpController]
+[app_coronawarn_datadonation_services_ppac_android_controller_validation_PpaDataRequestAndroidValidator]
+[app_coronawarn_datadonation_common_persistence_repository_AndroidIdRepository]
+[app_coronawarn_datadonation_services_ppac_android_attestation_ProdSrsRateLimitVerificationStrategy]
+[app_coronawarn_datadonation_services_ppac_android_controller_AndroidController]
+[app_coronawarn_datadonation_common_persistence_service_AndroidIdService]
+[app_coronawarn_datadonation_services_ppac_android_controller_PpaDataRequestAndroidConverter]
+[app_coronawarn_datadonation_services_ppac_android_attestation_ProdAndroidIdVerificationStrategy]
+[app_coronawarn_datadonation_services_ppac_android_attestation_DeviceAttestationVerifier]
+[app_coronawarn_datadonation_services_ppac_android_attestation_TestSrsRateLimitVerificationStrategy]
+portin " " as app_coronawarn_datadonation_6_requires_SPRING_APPLICATION_otp_POST_2
+portin " " as app_coronawarn_datadonation_6_requires_SPRING_APPLICATION_srs_POST_3
+portin " " as app_coronawarn_datadonation_6_requires_SPRING_APPLICATION_els_POST_3
+portin " " as app_coronawarn_datadonation_6_requires_SPRING_APPLICATION_dat_POST_
+[app_coronawarn_datadonation_common_persistence_service_AndroidIdService]..>[app_coronawarn_datadonation_common_persistence_repository_AndroidIdRepository] : requires
+[app_coronawarn_datadonation_services_ppac_android_controller_AndroidController]..>[app_coronawarn_datadonation_common_persistence_service_AndroidIdService] : requires
+[app_coronawarn_datadonation_services_ppac_android_controller_AndroidController]..>[app_coronawarn_datadonation_services_ppac_android_attestation_TestSrsRateLimitVerificationStrategy] : requires
+[app_coronawarn_datadonation_services_ppac_android_controller_AndroidController]..>[app_coronawarn_datadonation_services_ppac_android_controller_validation_PpaDataRequestAndroidValidator] : requires
+[app_coronawarn_datadonation_services_ppac_android_controller_AndroidController]..>[app_coronawarn_datadonation_services_ppac_android_attestation_ProdSrsRateLimitVerificationStrategy] : requires
+[app_coronawarn_datadonation_services_ppac_android_controller_AndroidController]..>[app_coronawarn_datadonation_services_ppac_android_attestation_ProdAndroidIdVerificationStrategy] : requires
+[app_coronawarn_datadonation_services_ppac_android_controller_AndroidController]..>[app_coronawarn_datadonation_services_ppac_android_controller_PpaDataRequestAndroidConverter] : requires
+[app_coronawarn_datadonation_services_ppac_android_controller_AndroidController]..>[app_coronawarn_datadonation_services_ppac_android_attestation_DeviceAttestationVerifier] : requires
+"app_coronawarn_datadonation_6_requires_SPRING_APPLICATION_srs_POST_3"--[app_coronawarn_datadonation_services_ppac_android_controller_AndroidController]
+"app_coronawarn_datadonation_6_requires_SPRING_APPLICATION_dat_POST_"--[app_coronawarn_datadonation_services_ppac_android_controller_AndroidController]
+"app_coronawarn_datadonation_6_requires_SPRING_APPLICATION_els_POST_3"--[app_coronawarn_datadonation_services_ppac_android_controller_AndroidController]
+"app_coronawarn_datadonation_6_requires_SPRING_APPLICATION_otp_POST_2"--[app_coronawarn_datadonation_services_ppac_android_controller_AndroidController]
}
-interface "SPRING-APPLICATION/gen/srs[GET]" as interface.SPRING_APPLICATION_gen_srs_GET_
-interface.SPRING_APPLICATION_gen_srs_GET_--"app_coronawarn_datadonation_6_requires_SPRING_APPLICATION_gen_srs_GET_"
+interface "SPRING-APPLICATION/dat[POST]" as interface.SPRING_APPLICATION_dat_POST_
+interface.SPRING_APPLICATION_dat_POST_--"app_coronawarn_datadonation_6_requires_SPRING_APPLICATION_dat_POST_"
+interface "SPRING-APPLICATION/els[POST]$3" as interface.SPRING_APPLICATION_els_POST_3
+interface.SPRING_APPLICATION_els_POST_3--"app_coronawarn_datadonation_6_requires_SPRING_APPLICATION_els_POST_3"
+interface "SPRING-APPLICATION/otp[POST]$2" as interface.SPRING_APPLICATION_otp_POST_2
+interface.SPRING_APPLICATION_otp_POST_2--"app_coronawarn_datadonation_6_requires_SPRING_APPLICATION_otp_POST_2"
+interface "SPRING-APPLICATION/srs[POST]$3" as interface.SPRING_APPLICATION_srs_POST_3
+interface.SPRING_APPLICATION_srs_POST_3--"app_coronawarn_datadonation_6_requires_SPRING_APPLICATION_srs_POST_3"
component "app_coronawarn_datadonation_common_persistence\n\n\n\n\n\n" {
+[app_coronawarn_datadonation_common_persistence_repository_metrics_ExposureWindowRepository]
+[app_coronawarn_datadonation_common_persistence_repository_metrics_ExposureWindowTestResultsRepository]
+[app_coronawarn_datadonation_common_persistence_repository_metrics_ExposureRiskMetadataRepository]
[app_coronawarn_datadonation_common_persistence_repository_metrics_SummarizedExposureWindowsWithUserMetadataRepository]
+[app_coronawarn_datadonation_common_persistence_repository_metrics_ClientMetadataRepository]
+[app_coronawarn_datadonation_common_persistence_repository_metrics_KeySubmissionMetadataWithUserMetadataRepository]
[app_coronawarn_datadonation_common_persistence_repository_metrics_UserMetadataRepository]
[app_coronawarn_datadonation_common_persistence_service_PpaDataService]
-[app_coronawarn_datadonation_common_persistence_repository_metrics_KeySubmissionMetadataWithClientMetadataRepository]
-[app_coronawarn_datadonation_common_persistence_repository_metrics_ExposureWindowRepository]
-[app_coronawarn_datadonation_common_persistence_repository_metrics_ClientMetadataRepository]
[app_coronawarn_datadonation_common_persistence_repository_metrics_TestResultMetadataRepository]
-[app_coronawarn_datadonation_common_persistence_repository_metrics_KeySubmissionMetadataWithUserMetadataRepository]
-[app_coronawarn_datadonation_common_persistence_repository_metrics_ExposureRiskMetadataRepository]
-[app_coronawarn_datadonation_common_persistence_repository_metrics_ExposureWindowTestResultsRepository]
-[app_coronawarn_datadonation_common_persistence_service_PpaDataService]..>[app_coronawarn_datadonation_common_persistence_repository_metrics_TestResultMetadataRepository] : requires
-[app_coronawarn_datadonation_common_persistence_service_PpaDataService]..>[app_coronawarn_datadonation_common_persistence_repository_metrics_ExposureRiskMetadataRepository] : requires
-[app_coronawarn_datadonation_common_persistence_service_PpaDataService]..>[app_coronawarn_datadonation_common_persistence_repository_metrics_ClientMetadataRepository] : requires
-[app_coronawarn_datadonation_common_persistence_service_PpaDataService]..>[app_coronawarn_datadonation_common_persistence_repository_metrics_KeySubmissionMetadataWithUserMetadataRepository] : requires
+[app_coronawarn_datadonation_common_persistence_repository_metrics_KeySubmissionMetadataWithClientMetadataRepository]
+[app_coronawarn_datadonation_common_persistence_service_PpaDataService]..>[app_coronawarn_datadonation_common_persistence_repository_metrics_ExposureWindowRepository] : requires
[app_coronawarn_datadonation_common_persistence_service_PpaDataService]..>[app_coronawarn_datadonation_common_persistence_repository_metrics_KeySubmissionMetadataWithClientMetadataRepository] : requires
-[app_coronawarn_datadonation_common_persistence_service_PpaDataService]..>[app_coronawarn_datadonation_common_persistence_repository_metrics_UserMetadataRepository] : requires
+[app_coronawarn_datadonation_common_persistence_service_PpaDataService]..>[app_coronawarn_datadonation_common_persistence_repository_metrics_ExposureRiskMetadataRepository] : requires
[app_coronawarn_datadonation_common_persistence_service_PpaDataService]..>[app_coronawarn_datadonation_common_persistence_repository_metrics_SummarizedExposureWindowsWithUserMetadataRepository] : requires
+[app_coronawarn_datadonation_common_persistence_service_PpaDataService]..>[app_coronawarn_datadonation_common_persistence_repository_metrics_UserMetadataRepository] : requires
[app_coronawarn_datadonation_common_persistence_service_PpaDataService]..>[app_coronawarn_datadonation_common_persistence_repository_metrics_ExposureWindowTestResultsRepository] : requires
-[app_coronawarn_datadonation_common_persistence_service_PpaDataService]..>[app_coronawarn_datadonation_common_persistence_repository_metrics_ExposureWindowRepository] : requires
+[app_coronawarn_datadonation_common_persistence_service_PpaDataService]..>[app_coronawarn_datadonation_common_persistence_repository_metrics_TestResultMetadataRepository] : requires
+[app_coronawarn_datadonation_common_persistence_service_PpaDataService]..>[app_coronawarn_datadonation_common_persistence_repository_metrics_ClientMetadataRepository] : requires
+[app_coronawarn_datadonation_common_persistence_service_PpaDataService]..>[app_coronawarn_datadonation_common_persistence_repository_metrics_KeySubmissionMetadataWithUserMetadataRepository] : requires
}
component "app_coronawarn_datadonation_services_edus_otp_OtpController\n\n\n\n\n\n" {
[app_coronawarn_datadonation_services_edus_otp_OtpController]
@@ -122,28 +122,28 @@ portin " " as app_coronawarn_datadonation_services_ppac_commons_FakeRequestContr
interface "SPRING-APPLICATION/[POST]" as interface.SPRING_APPLICATION_POST_
interface.SPRING_APPLICATION_POST_--"app_coronawarn_datadonation_services_ppac_commons_FakeRequestController_requires_SPRING_APPLICATION_POST_"
component "app_coronawarn_datadonation_services_ppac_ios\n\n\n\n\n\n" {
-[app_coronawarn_datadonation_services_ppac_ios_controller_IosController]
[app_coronawarn_datadonation_services_ppac_ios_controller_PpaDataRequestIosConverter]
+[app_coronawarn_datadonation_services_ppac_ios_controller_IosController]
[app_coronawarn_datadonation_services_ppac_ios_verification_PpacProcessor]
-portin " " as app_coronawarn_datadonation_services_ppac_ios_requires_SPRING_APPLICATION_els_POST_
portin " " as app_coronawarn_datadonation_services_ppac_ios_requires_SPRING_APPLICATION_otp_POST_
-portin " " as app_coronawarn_datadonation_services_ppac_ios_requires_SPRING_APPLICATION_srs_POST_3
-portin " " as app_coronawarn_datadonation_services_ppac_ios_requires_SPRING_APPLICATION_dat_POST_
+portin " " as app_coronawarn_datadonation_services_ppac_ios_requires_SPRING_APPLICATION_els_POST_
+portin " " as app_coronawarn_datadonation_services_ppac_ios_requires_SPRING_APPLICATION_srs_POST_2
+portin " " as app_coronawarn_datadonation_services_ppac_ios_requires_SPRING_APPLICATION_dat_POST_2
[app_coronawarn_datadonation_services_ppac_ios_controller_IosController]..>[app_coronawarn_datadonation_services_ppac_ios_controller_PpaDataRequestIosConverter] : requires
[app_coronawarn_datadonation_services_ppac_ios_controller_IosController]..>[app_coronawarn_datadonation_services_ppac_ios_verification_PpacProcessor] : requires
-"app_coronawarn_datadonation_services_ppac_ios_requires_SPRING_APPLICATION_otp_POST_"--[app_coronawarn_datadonation_services_ppac_ios_controller_IosController]
-"app_coronawarn_datadonation_services_ppac_ios_requires_SPRING_APPLICATION_srs_POST_3"--[app_coronawarn_datadonation_services_ppac_ios_controller_IosController]
-"app_coronawarn_datadonation_services_ppac_ios_requires_SPRING_APPLICATION_dat_POST_"--[app_coronawarn_datadonation_services_ppac_ios_controller_IosController]
+"app_coronawarn_datadonation_services_ppac_ios_requires_SPRING_APPLICATION_srs_POST_2"--[app_coronawarn_datadonation_services_ppac_ios_controller_IosController]
"app_coronawarn_datadonation_services_ppac_ios_requires_SPRING_APPLICATION_els_POST_"--[app_coronawarn_datadonation_services_ppac_ios_controller_IosController]
+"app_coronawarn_datadonation_services_ppac_ios_requires_SPRING_APPLICATION_dat_POST_2"--[app_coronawarn_datadonation_services_ppac_ios_controller_IosController]
+"app_coronawarn_datadonation_services_ppac_ios_requires_SPRING_APPLICATION_otp_POST_"--[app_coronawarn_datadonation_services_ppac_ios_controller_IosController]
}
-interface "SPRING-APPLICATION/dat[POST]" as interface.SPRING_APPLICATION_dat_POST_
-interface.SPRING_APPLICATION_dat_POST_--"app_coronawarn_datadonation_services_ppac_ios_requires_SPRING_APPLICATION_dat_POST_"
+interface "SPRING-APPLICATION/dat[POST]$2" as interface.SPRING_APPLICATION_dat_POST_2
+interface.SPRING_APPLICATION_dat_POST_2--"app_coronawarn_datadonation_services_ppac_ios_requires_SPRING_APPLICATION_dat_POST_2"
interface "SPRING-APPLICATION/els[POST]" as interface.SPRING_APPLICATION_els_POST_
interface.SPRING_APPLICATION_els_POST_--"app_coronawarn_datadonation_services_ppac_ios_requires_SPRING_APPLICATION_els_POST_"
interface "SPRING-APPLICATION/otp[POST]" as interface.SPRING_APPLICATION_otp_POST_
interface.SPRING_APPLICATION_otp_POST_--"app_coronawarn_datadonation_services_ppac_ios_requires_SPRING_APPLICATION_otp_POST_"
-interface "SPRING-APPLICATION/srs[POST]$3" as interface.SPRING_APPLICATION_srs_POST_3
-interface.SPRING_APPLICATION_srs_POST_3--"app_coronawarn_datadonation_services_ppac_ios_requires_SPRING_APPLICATION_srs_POST_3"
+interface "SPRING-APPLICATION/srs[POST]$2" as interface.SPRING_APPLICATION_srs_POST_2
+interface.SPRING_APPLICATION_srs_POST_2--"app_coronawarn_datadonation_services_ppac_ios_requires_SPRING_APPLICATION_srs_POST_2"
component "app_coronawarn_datadonation_services_srs_otp_SrsOtpController\n\n\n\n\n\n" {
[app_coronawarn_datadonation_services_srs_otp_SrsOtpController]
portin " " as app_coronawarn_datadonation_services_srs_otp_SrsOtpController_requires_SPRING_APPLICATION_srs_POST_
diff --git a/corona-warn-app-cwa-ppa-server/model_re/uml/componentDiagram.svg b/corona-warn-app-cwa-ppa-server/model_re/uml/componentDiagram.svg
index 8224bbc8c9..f56782e93b 100644
--- a/corona-warn-app-cwa-ppa-server/model_re/uml/componentDiagram.svg
+++ b/corona-warn-app-cwa-ppa-server/model_re/uml/componentDiagram.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/corona-warn-app-cwa-ppa-server/model_re/uml/systemDiagram.puml b/corona-warn-app-cwa-ppa-server/model_re/uml/systemDiagram.puml
index 68fbaaa252..afcead8780 100644
--- a/corona-warn-app-cwa-ppa-server/model_re/uml/systemDiagram.puml
+++ b/corona-warn-app-cwa-ppa-server/model_re/uml/systemDiagram.puml
@@ -18,52 +18,52 @@ skinparam componentStyle uml2
() SPRING_APPLICATION_srs_POST_3_Delegation_Provider
() SPRING_APPLICATION_srs_POST_Delegation_Provider
rectangle System {
-[app_coronawarn_datadonation_common_persistence_repository_AndroidIdRepository] [[corona-warn-app-cwa-ppa-server.repository#_CQgwamiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_common_persistence_repository_DeviceTokenRepository] [[corona-warn-app-cwa-ppa-server.repository#_CQgwamiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_common_persistence_repository_metrics_ClientMetadataRepository] [[corona-warn-app-cwa-ppa-server.repository#_CQgwamiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_common_persistence_repository_metrics_ExposureRiskMetadataRepository] [[corona-warn-app-cwa-ppa-server.repository#_CQgwamiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_common_persistence_repository_metrics_ExposureWindowRepository] [[corona-warn-app-cwa-ppa-server.repository#_CQgwamiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_common_persistence_repository_metrics_ExposureWindowTestResultsRepository] [[corona-warn-app-cwa-ppa-server.repository#_CQgwamiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_common_persistence_repository_metrics_KeySubmissionMetadataWithClientMetadataRepository] [[corona-warn-app-cwa-ppa-server.repository#_CQgwamiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_common_persistence_repository_metrics_KeySubmissionMetadataWithUserMetadataRepository] [[corona-warn-app-cwa-ppa-server.repository#_CQgwamiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_common_persistence_repository_metrics_SummarizedExposureWindowsWithUserMetadataRepository] [[corona-warn-app-cwa-ppa-server.repository#_CQgwamiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_common_persistence_repository_metrics_TestResultMetadataRepository] [[corona-warn-app-cwa-ppa-server.repository#_CQgwamiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_common_persistence_repository_metrics_UserMetadataRepository] [[corona-warn-app-cwa-ppa-server.repository#_CQgwamiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_common_persistence_repository_ppac_android_SaltRepository] [[corona-warn-app-cwa-ppa-server.repository#_CQgwamiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_common_persistence_service_AndroidIdService] [[corona-warn-app-cwa-ppa-server.repository#_CQgwamiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_common_persistence_service_ElsOtpService] [[corona-warn-app-cwa-ppa-server.repository#_CQgwamiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_common_persistence_service_OtpService] [[corona-warn-app-cwa-ppa-server.repository#_CQgwamiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_common_persistence_service_PpaDataService] [[corona-warn-app-cwa-ppa-server.repository#_CQgwamiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_common_persistence_service_SaltService] [[corona-warn-app-cwa-ppa-server.repository#_CQgwamiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_common_persistence_service_SrsOtpService] [[corona-warn-app-cwa-ppa-server.repository#_CQgwamiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_services_edus_otp_GenerateOtpController] [[corona-warn-app-cwa-ppa-server.repository#_CQgwamiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_services_edus_otp_OtpController] [[corona-warn-app-cwa-ppa-server.repository#_CQgwamiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_services_els_otp_ElsOtpController] [[corona-warn-app-cwa-ppa-server.repository#_CQgwamiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_services_els_otp_GenerateElsOtpController] [[corona-warn-app-cwa-ppa-server.repository#_CQgwamiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_services_ppac_android_attestation_DeviceAttestationVerifier] [[corona-warn-app-cwa-ppa-server.repository#_CQgwamiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_services_ppac_android_attestation_ProdAndroidIdVerificationStrategy] [[corona-warn-app-cwa-ppa-server.repository#_CQgwamiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_services_ppac_android_attestation_ProdSrsRateLimitVerificationStrategy] [[corona-warn-app-cwa-ppa-server.repository#_CQgwamiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_services_ppac_android_attestation_TestSrsRateLimitVerificationStrategy] [[corona-warn-app-cwa-ppa-server.repository#_CQgwamiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_services_ppac_android_controller_AndroidController] [[corona-warn-app-cwa-ppa-server.repository#_CQgwamiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_services_ppac_android_controller_DeleteSaltController] [[corona-warn-app-cwa-ppa-server.repository#_CQgwamiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_services_ppac_android_controller_PpaDataRequestAndroidConverter] [[corona-warn-app-cwa-ppa-server.repository#_CQgwamiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_services_ppac_android_controller_validation_PpaDataRequestAndroidValidator] [[corona-warn-app-cwa-ppa-server.repository#_CQgwamiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_services_ppac_commons_FakeRequestController] [[corona-warn-app-cwa-ppa-server.repository#_CQgwamiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_services_ppac_ios_controller_IosController] [[corona-warn-app-cwa-ppa-server.repository#_CQgwamiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_services_ppac_ios_controller_PpaDataRequestIosConverter] [[corona-warn-app-cwa-ppa-server.repository#_CQgwamiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_services_ppac_ios_verification_PpacProcessor] [[corona-warn-app-cwa-ppa-server.repository#_CQgwamiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_services_ppac_ios_verification_devicetoken_DeviceTokenService] [[corona-warn-app-cwa-ppa-server.repository#_CQgwamiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_services_ppac_otp_GenerateSrsOtpController] [[corona-warn-app-cwa-ppa-server.repository#_CQgwamiHEe-kD40mSWIY8A]]
-[app_coronawarn_datadonation_services_srs_otp_SrsOtpController] [[corona-warn-app-cwa-ppa-server.repository#_CQgwamiHEe-kD40mSWIY8A]]
+[app_coronawarn_datadonation_common_persistence_repository_AndroidIdRepository] [[corona-warn-app-cwa-ppa-server.repository#_QN5uamj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_common_persistence_repository_DeviceTokenRepository] [[corona-warn-app-cwa-ppa-server.repository#_QN5uamj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_common_persistence_repository_metrics_ClientMetadataRepository] [[corona-warn-app-cwa-ppa-server.repository#_QN5uamj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_common_persistence_repository_metrics_ExposureRiskMetadataRepository] [[corona-warn-app-cwa-ppa-server.repository#_QN5uamj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_common_persistence_repository_metrics_ExposureWindowRepository] [[corona-warn-app-cwa-ppa-server.repository#_QN5uamj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_common_persistence_repository_metrics_ExposureWindowTestResultsRepository] [[corona-warn-app-cwa-ppa-server.repository#_QN5uamj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_common_persistence_repository_metrics_KeySubmissionMetadataWithClientMetadataRepository] [[corona-warn-app-cwa-ppa-server.repository#_QN5uamj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_common_persistence_repository_metrics_KeySubmissionMetadataWithUserMetadataRepository] [[corona-warn-app-cwa-ppa-server.repository#_QN5uamj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_common_persistence_repository_metrics_SummarizedExposureWindowsWithUserMetadataRepository] [[corona-warn-app-cwa-ppa-server.repository#_QN5uamj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_common_persistence_repository_metrics_TestResultMetadataRepository] [[corona-warn-app-cwa-ppa-server.repository#_QN5uamj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_common_persistence_repository_metrics_UserMetadataRepository] [[corona-warn-app-cwa-ppa-server.repository#_QN5uamj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_common_persistence_repository_ppac_android_SaltRepository] [[corona-warn-app-cwa-ppa-server.repository#_QN5uamj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_common_persistence_service_AndroidIdService] [[corona-warn-app-cwa-ppa-server.repository#_QN5uamj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_common_persistence_service_ElsOtpService] [[corona-warn-app-cwa-ppa-server.repository#_QN5uamj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_common_persistence_service_OtpService] [[corona-warn-app-cwa-ppa-server.repository#_QN5uamj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_common_persistence_service_PpaDataService] [[corona-warn-app-cwa-ppa-server.repository#_QN5uamj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_common_persistence_service_SaltService] [[corona-warn-app-cwa-ppa-server.repository#_QN5uamj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_common_persistence_service_SrsOtpService] [[corona-warn-app-cwa-ppa-server.repository#_QN5uamj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_services_edus_otp_GenerateOtpController] [[corona-warn-app-cwa-ppa-server.repository#_QN5uamj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_services_edus_otp_OtpController] [[corona-warn-app-cwa-ppa-server.repository#_QN5uamj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_services_els_otp_ElsOtpController] [[corona-warn-app-cwa-ppa-server.repository#_QN5uamj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_services_els_otp_GenerateElsOtpController] [[corona-warn-app-cwa-ppa-server.repository#_QN5uamj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_services_ppac_android_attestation_DeviceAttestationVerifier] [[corona-warn-app-cwa-ppa-server.repository#_QN5uamj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_services_ppac_android_attestation_ProdAndroidIdVerificationStrategy] [[corona-warn-app-cwa-ppa-server.repository#_QN5uamj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_services_ppac_android_attestation_ProdSrsRateLimitVerificationStrategy] [[corona-warn-app-cwa-ppa-server.repository#_QN5uamj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_services_ppac_android_attestation_TestSrsRateLimitVerificationStrategy] [[corona-warn-app-cwa-ppa-server.repository#_QN5uamj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_services_ppac_android_controller_AndroidController] [[corona-warn-app-cwa-ppa-server.repository#_QN5uamj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_services_ppac_android_controller_DeleteSaltController] [[corona-warn-app-cwa-ppa-server.repository#_QN5uamj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_services_ppac_android_controller_PpaDataRequestAndroidConverter] [[corona-warn-app-cwa-ppa-server.repository#_QN5uamj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_services_ppac_android_controller_validation_PpaDataRequestAndroidValidator] [[corona-warn-app-cwa-ppa-server.repository#_QN5uamj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_services_ppac_commons_FakeRequestController] [[corona-warn-app-cwa-ppa-server.repository#_QN5uamj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_services_ppac_ios_controller_IosController] [[corona-warn-app-cwa-ppa-server.repository#_QN5uamj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_services_ppac_ios_controller_PpaDataRequestIosConverter] [[corona-warn-app-cwa-ppa-server.repository#_QN5uamj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_services_ppac_ios_verification_PpacProcessor] [[corona-warn-app-cwa-ppa-server.repository#_QN5uamj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_services_ppac_ios_verification_devicetoken_DeviceTokenService] [[corona-warn-app-cwa-ppa-server.repository#_QN5uamj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_services_ppac_otp_GenerateSrsOtpController] [[corona-warn-app-cwa-ppa-server.repository#_QN5uamj1Ee-0Lo713-JUsw]]
+[app_coronawarn_datadonation_services_srs_otp_SrsOtpController] [[corona-warn-app-cwa-ppa-server.repository#_QN5uamj1Ee-0Lo713-JUsw]]
port SPRING_APPLICATION_POST_Provider
SPRING_APPLICATION_POST_Delegation_Provider - SPRING_APPLICATION_POST_Provider
SPRING_APPLICATION_POST_Provider - [app_coronawarn_datadonation_services_ppac_commons_FakeRequestController]
port SPRING_APPLICATION_dat_POST_2_Provider
SPRING_APPLICATION_dat_POST_2_Delegation_Provider - SPRING_APPLICATION_dat_POST_2_Provider
-SPRING_APPLICATION_dat_POST_2_Provider - [app_coronawarn_datadonation_services_ppac_android_controller_AndroidController]
+SPRING_APPLICATION_dat_POST_2_Provider - [app_coronawarn_datadonation_services_ppac_ios_controller_IosController]
port SPRING_APPLICATION_dat_POST_Provider
SPRING_APPLICATION_dat_POST_Delegation_Provider - SPRING_APPLICATION_dat_POST_Provider
-SPRING_APPLICATION_dat_POST_Provider - [app_coronawarn_datadonation_services_ppac_ios_controller_IosController]
+SPRING_APPLICATION_dat_POST_Provider - [app_coronawarn_datadonation_services_ppac_android_controller_AndroidController]
port SPRING_APPLICATION_delete_DELETE_Provider
SPRING_APPLICATION_delete_DELETE_Delegation_Provider - SPRING_APPLICATION_delete_DELETE_Provider
SPRING_APPLICATION_delete_DELETE_Provider - [app_coronawarn_datadonation_services_ppac_android_controller_DeleteSaltController]
@@ -96,10 +96,10 @@ SPRING_APPLICATION_otp_POST_Delegation_Provider - SPRING_APPLICATION_otp_POST_Pr
SPRING_APPLICATION_otp_POST_Provider - [app_coronawarn_datadonation_services_ppac_ios_controller_IosController]
port SPRING_APPLICATION_srs_POST_2_Provider
SPRING_APPLICATION_srs_POST_2_Delegation_Provider - SPRING_APPLICATION_srs_POST_2_Provider
-SPRING_APPLICATION_srs_POST_2_Provider - [app_coronawarn_datadonation_services_ppac_android_controller_AndroidController]
+SPRING_APPLICATION_srs_POST_2_Provider - [app_coronawarn_datadonation_services_ppac_ios_controller_IosController]
port SPRING_APPLICATION_srs_POST_3_Provider
SPRING_APPLICATION_srs_POST_3_Delegation_Provider - SPRING_APPLICATION_srs_POST_3_Provider
-SPRING_APPLICATION_srs_POST_3_Provider - [app_coronawarn_datadonation_services_ppac_ios_controller_IosController]
+SPRING_APPLICATION_srs_POST_3_Provider - [app_coronawarn_datadonation_services_ppac_android_controller_AndroidController]
port SPRING_APPLICATION_srs_POST_Provider
SPRING_APPLICATION_srs_POST_Delegation_Provider - SPRING_APPLICATION_srs_POST_Provider
SPRING_APPLICATION_srs_POST_Provider - [app_coronawarn_datadonation_services_srs_otp_SrsOtpController]
diff --git a/corona-warn-app-cwa-ppa-server/model_re/uml/systemDiagram.svg b/corona-warn-app-cwa-ppa-server/model_re/uml/systemDiagram.svg
index c322def78b..88ab0eb5fb 100644
--- a/corona-warn-app-cwa-ppa-server/model_re/uml/systemDiagram.svg
+++ b/corona-warn-app-cwa-ppa-server/model_re/uml/systemDiagram.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/corona-warn-app-cwa-server/model_re/README.md b/corona-warn-app-cwa-server/model_re/README.md
index 906d91ebb3..1e4c6f22d0 100644
--- a/corona-warn-app-cwa-server/model_re/README.md
+++ b/corona-warn-app-cwa-server/model_re/README.md
@@ -2,13 +2,13 @@
| Attribute | Value |
| ------------------ | ----- |
| Retriever Version | v5.2.0.202408280745 |
-| Date | Sun Sep 1 17:25:12 UTC 2024 |
+| Date | Mon Sep 2 06:34:06 UTC 2024 |
| #Components | 10 |
| #Source Files | 856 |
| Lines of Code | 342858 |
| #Technologies | 6 |
| Abstraction | 85.60 |
-| Execution Time [s] | 9.001 ± 0.158 |
+| Execution Time [s] | 9.067 ± 0.225 |
## Git repository information
| Attribute | Value |
@@ -29,16 +29,16 @@
| Kernel | 6.5.0-1025-azure |
| CPU | AMD EPYC 7763 (4) @ 3.242GHz |
| GPU | 00:08.0 Microsoft Corporation Hyper-V virtual VGA |
-| Memory | 797MiB / 15981MiB |
+| Memory | 774MiB / 15981MiB |
## Retriever execution time
| Mean [s] | Min [s] | Max [s] | Relative |
|---:|---:|---:|---:|
-| 9.001 ± 0.158 | 8.817 | 9.365 | 1.00 |
+| 9.067 ± 0.225 | 8.863 | 9.645 | 1.00 |
## Cloc analysis
-
+
|Technology|files|blank|comment|code|
|:-------|-------:|-------:|-------:|-------:|
diff --git a/corona-warn-app-cwa-server/model_re/pcm/corona-warn-app-cwa-server.allocation b/corona-warn-app-cwa-server/model_re/pcm/corona-warn-app-cwa-server.allocation
index 3ef5bdfef7..3b248999ea 100644
--- a/corona-warn-app-cwa-server/model_re/pcm/corona-warn-app-cwa-server.allocation
+++ b/corona-warn-app-cwa-server/model_re/pcm/corona-warn-app-cwa-server.allocation
@@ -1,45 +1,45 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/corona-warn-app-cwa-server/model_re/pcm/corona-warn-app-cwa-server.repository b/corona-warn-app-cwa-server/model_re/pcm/corona-warn-app-cwa-server.repository
index 990a311e4e..97f28a0dec 100644
--- a/corona-warn-app-cwa-server/model_re/pcm/corona-warn-app-cwa-server.repository
+++ b/corona-warn-app-cwa-server/model_re/pcm/corona-warn-app-cwa-server.repository
@@ -1,17 +1,70 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -21,17 +74,17 @@
-
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -41,20 +94,20 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -64,17 +117,17 @@
-
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -84,15 +137,15 @@
-
+
-
-
-
-
+
+
+
+
@@ -102,16 +155,16 @@
-
+
-
-
-
-
-
+
+
+
+
+
@@ -121,14 +174,14 @@
-
+
-
-
-
+
+
+
@@ -138,71 +191,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -212,67 +212,67 @@
-
+
-
-
+
+
-
-
-
-
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
+
+
-
-
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
+
-
-
-
-
-
-
+
+
+
+
+
diff --git a/corona-warn-app-cwa-server/model_re/pcm/corona-warn-app-cwa-server.resourceenvironment b/corona-warn-app-cwa-server/model_re/pcm/corona-warn-app-cwa-server.resourceenvironment
index 6c934bec81..960d788b67 100644
--- a/corona-warn-app-cwa-server/model_re/pcm/corona-warn-app-cwa-server.resourceenvironment
+++ b/corona-warn-app-cwa-server/model_re/pcm/corona-warn-app-cwa-server.resourceenvironment
@@ -1,13 +1,13 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/corona-warn-app-cwa-server/model_re/pcm/corona-warn-app-cwa-server.system b/corona-warn-app-cwa-server/model_re/pcm/corona-warn-app-cwa-server.system
index c9ac8cef3b..8225769970 100644
--- a/corona-warn-app-cwa-server/model_re/pcm/corona-warn-app-cwa-server.system
+++ b/corona-warn-app-cwa-server/model_re/pcm/corona-warn-app-cwa-server.system
@@ -1,57 +1,57 @@
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/corona-warn-app-cwa-server/model_re/uml/allocationDiagram.puml b/corona-warn-app-cwa-server/model_re/uml/allocationDiagram.puml
index f9c8f93a45..6677150cdd 100644
--- a/corona-warn-app-cwa-server/model_re/uml/allocationDiagram.puml
+++ b/corona-warn-app-cwa-server/model_re/uml/allocationDiagram.puml
@@ -2,19 +2,19 @@
skinparam fixCircleLabelOverlapping true
skinparam componentStyle uml2
node nodeapp_coronawarn_server_services_callback_controller_CallbackController {
-[app_coronawarn_server_services_callback_controller_CallbackController] [[corona-warn-app-cwa-server.system#_JDs7d2iHEe-CCou8OmCbAw]]
+[app_coronawarn_server_services_callback_controller_CallbackController] [[corona-warn-app-cwa-server.system#_WXdGh2j1Ee-OL6_i2To26g]]
}
node nodeapp_coronawarn_server_services_submission_controller_FakeRequestController {
-[app_coronawarn_server_services_submission_controller_FakeRequestController] [[corona-warn-app-cwa-server.system#_JDs7d2iHEe-CCou8OmCbAw]]
+[app_coronawarn_server_services_submission_controller_FakeRequestController] [[corona-warn-app-cwa-server.system#_WXdGh2j1Ee-OL6_i2To26g]]
}
node nodeapp_coronawarn_server_services_submission_controller_SubmissionController {
-[app_coronawarn_server_services_submission_controller_SubmissionController] [[corona-warn-app-cwa-server.system#_JDs7d2iHEe-CCou8OmCbAw]]
+[app_coronawarn_server_services_submission_controller_SubmissionController] [[corona-warn-app-cwa-server.system#_WXdGh2j1Ee-OL6_i2To26g]]
}
node nodeapp_coronawarn_server_services_submission_verification_SrsOtpVerifier {
-[app_coronawarn_server_services_submission_verification_SrsOtpVerifier] [[corona-warn-app-cwa-server.system#_JDs7d2iHEe-CCou8OmCbAw]]
+[app_coronawarn_server_services_submission_verification_SrsOtpVerifier] [[corona-warn-app-cwa-server.system#_WXdGh2j1Ee-OL6_i2To26g]]
}
node nodeapp_coronawarn_server_services_submission_verification_TanVerifier {
-[app_coronawarn_server_services_submission_verification_TanVerifier] [[corona-warn-app-cwa-server.system#_JDs7d2iHEe-CCou8OmCbAw]]
+[app_coronawarn_server_services_submission_verification_TanVerifier] [[corona-warn-app-cwa-server.system#_WXdGh2j1Ee-OL6_i2To26g]]
}
@enduml
diff --git a/corona-warn-app-cwa-server/model_re/uml/allocationDiagram.svg b/corona-warn-app-cwa-server/model_re/uml/allocationDiagram.svg
index eec7146cca..4945eb0b8d 100644
--- a/corona-warn-app-cwa-server/model_re/uml/allocationDiagram.svg
+++ b/corona-warn-app-cwa-server/model_re/uml/allocationDiagram.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/corona-warn-app-cwa-server/model_re/uml/componentDiagram.puml b/corona-warn-app-cwa-server/model_re/uml/componentDiagram.puml
index b3caf3ddc4..7470049aef 100644
--- a/corona-warn-app-cwa-server/model_re/uml/componentDiagram.puml
+++ b/corona-warn-app-cwa-server/model_re/uml/componentDiagram.puml
@@ -10,20 +10,20 @@ interface "SPRING-APPLICATION/version/v1/callback[GET]" as interface.SPRING_APPL
interface.SPRING_APPLICATION_version_v1_callback_GET_--"app_coronawarn_server_services_callback_controller_CallbackController_requires_SPRING_APPLICATION_version_v1_callback_GET_"
component "app_coronawarn_server_services_submission_controller_FakeRequestController\n\n\n\n\n\n" {
[app_coronawarn_server_services_submission_controller_FakeRequestController]
-portin " " as app_coronawarn_server_services_submission_controller_FakeRequestController_requires_SPRING_APPLICATION_version_v1_diagnosis_keys_POST_2
-"app_coronawarn_server_services_submission_controller_FakeRequestController_requires_SPRING_APPLICATION_version_v1_diagnosis_keys_POST_2"--[app_coronawarn_server_services_submission_controller_FakeRequestController]
+portin " " as app_coronawarn_server_services_submission_controller_FakeRequestController_requires_SPRING_APPLICATION_version_v1_diagnosis_keys_POST_
+"app_coronawarn_server_services_submission_controller_FakeRequestController_requires_SPRING_APPLICATION_version_v1_diagnosis_keys_POST_"--[app_coronawarn_server_services_submission_controller_FakeRequestController]
}
-interface "SPRING-APPLICATION/version/v1/diagnosis-keys[POST]$2" as interface.SPRING_APPLICATION_version_v1_diagnosis_keys_POST_2
-interface.SPRING_APPLICATION_version_v1_diagnosis_keys_POST_2--"app_coronawarn_server_services_submission_controller_FakeRequestController_requires_SPRING_APPLICATION_version_v1_diagnosis_keys_POST_2"
+interface "SPRING-APPLICATION/version/v1/diagnosis-keys[POST]" as interface.SPRING_APPLICATION_version_v1_diagnosis_keys_POST_
+interface.SPRING_APPLICATION_version_v1_diagnosis_keys_POST_--"app_coronawarn_server_services_submission_controller_FakeRequestController_requires_SPRING_APPLICATION_version_v1_diagnosis_keys_POST_"
component "app_coronawarn_server_services_submission_controller_SubmissionController\n\n\n\n\n\n" {
[app_coronawarn_server_services_submission_controller_SubmissionController]
-portin " " as app_coronawarn_server_services_submission_controller_SubmissionController_requires_SPRING_APPLICATION_version_v1_diagnosis_keys_POST_
portin " " as app_coronawarn_server_services_submission_controller_SubmissionController_requires_SPRING_APPLICATION_version_v1_submission_on_behalf_POST_
-"app_coronawarn_server_services_submission_controller_SubmissionController_requires_SPRING_APPLICATION_version_v1_diagnosis_keys_POST_"--[app_coronawarn_server_services_submission_controller_SubmissionController]
+portin " " as app_coronawarn_server_services_submission_controller_SubmissionController_requires_SPRING_APPLICATION_version_v1_diagnosis_keys_POST_2
+"app_coronawarn_server_services_submission_controller_SubmissionController_requires_SPRING_APPLICATION_version_v1_diagnosis_keys_POST_2"--[app_coronawarn_server_services_submission_controller_SubmissionController]
"app_coronawarn_server_services_submission_controller_SubmissionController_requires_SPRING_APPLICATION_version_v1_submission_on_behalf_POST_"--[app_coronawarn_server_services_submission_controller_SubmissionController]
}
-interface "SPRING-APPLICATION/version/v1/diagnosis-keys[POST]" as interface.SPRING_APPLICATION_version_v1_diagnosis_keys_POST_
-interface.SPRING_APPLICATION_version_v1_diagnosis_keys_POST_--"app_coronawarn_server_services_submission_controller_SubmissionController_requires_SPRING_APPLICATION_version_v1_diagnosis_keys_POST_"
+interface "SPRING-APPLICATION/version/v1/diagnosis-keys[POST]$2" as interface.SPRING_APPLICATION_version_v1_diagnosis_keys_POST_2
+interface.SPRING_APPLICATION_version_v1_diagnosis_keys_POST_2--"app_coronawarn_server_services_submission_controller_SubmissionController_requires_SPRING_APPLICATION_version_v1_diagnosis_keys_POST_2"
interface "SPRING-APPLICATION/version/v1/submission-on-behalf[POST]" as interface.SPRING_APPLICATION_version_v1_submission_on_behalf_POST_
interface.SPRING_APPLICATION_version_v1_submission_on_behalf_POST_--"app_coronawarn_server_services_submission_controller_SubmissionController_requires_SPRING_APPLICATION_version_v1_submission_on_behalf_POST_"
component "app_coronawarn_server_services_submission_verification_SrsOtpVerifier\n\n\n\n\n\n" {
diff --git a/corona-warn-app-cwa-server/model_re/uml/componentDiagram.svg b/corona-warn-app-cwa-server/model_re/uml/componentDiagram.svg
index 4ad7236398..61b325a7ee 100644
--- a/corona-warn-app-cwa-server/model_re/uml/componentDiagram.svg
+++ b/corona-warn-app-cwa-server/model_re/uml/componentDiagram.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/corona-warn-app-cwa-server/model_re/uml/systemDiagram.puml b/corona-warn-app-cwa-server/model_re/uml/systemDiagram.puml
index 7f4cc494c7..f24ff80518 100644
--- a/corona-warn-app-cwa-server/model_re/uml/systemDiagram.puml
+++ b/corona-warn-app-cwa-server/model_re/uml/systemDiagram.puml
@@ -6,20 +6,20 @@ skinparam componentStyle uml2
() SPRING_APPLICATION_version_v1_diagnosis_keys_POST_Delegation_Provider
() SPRING_APPLICATION_version_v1_submission_on_behalf_POST_Delegation_Provider
rectangle System {
-[app_coronawarn_server_services_callback_controller_CallbackController] [[corona-warn-app-cwa-server.repository#_JDnb6miHEe-CCou8OmCbAw]]
-[app_coronawarn_server_services_submission_controller_FakeRequestController] [[corona-warn-app-cwa-server.repository#_JDnb6miHEe-CCou8OmCbAw]]
-[app_coronawarn_server_services_submission_controller_SubmissionController] [[corona-warn-app-cwa-server.repository#_JDnb6miHEe-CCou8OmCbAw]]
-[app_coronawarn_server_services_submission_verification_SrsOtpVerifier] [[corona-warn-app-cwa-server.repository#_JDnb6miHEe-CCou8OmCbAw]]
-[app_coronawarn_server_services_submission_verification_TanVerifier] [[corona-warn-app-cwa-server.repository#_JDnb6miHEe-CCou8OmCbAw]]
+[app_coronawarn_server_services_callback_controller_CallbackController] [[corona-warn-app-cwa-server.repository#_WXXm-mj1Ee-OL6_i2To26g]]
+[app_coronawarn_server_services_submission_controller_FakeRequestController] [[corona-warn-app-cwa-server.repository#_WXXm-mj1Ee-OL6_i2To26g]]
+[app_coronawarn_server_services_submission_controller_SubmissionController] [[corona-warn-app-cwa-server.repository#_WXXm-mj1Ee-OL6_i2To26g]]
+[app_coronawarn_server_services_submission_verification_SrsOtpVerifier] [[corona-warn-app-cwa-server.repository#_WXXm-mj1Ee-OL6_i2To26g]]
+[app_coronawarn_server_services_submission_verification_TanVerifier] [[corona-warn-app-cwa-server.repository#_WXXm-mj1Ee-OL6_i2To26g]]
port SPRING_APPLICATION_version_v1_callback_GET_Provider
SPRING_APPLICATION_version_v1_callback_GET_Delegation_Provider - SPRING_APPLICATION_version_v1_callback_GET_Provider
SPRING_APPLICATION_version_v1_callback_GET_Provider - [app_coronawarn_server_services_callback_controller_CallbackController]
port SPRING_APPLICATION_version_v1_diagnosis_keys_POST_2_Provider
SPRING_APPLICATION_version_v1_diagnosis_keys_POST_2_Delegation_Provider - SPRING_APPLICATION_version_v1_diagnosis_keys_POST_2_Provider
-SPRING_APPLICATION_version_v1_diagnosis_keys_POST_2_Provider - [app_coronawarn_server_services_submission_controller_FakeRequestController]
+SPRING_APPLICATION_version_v1_diagnosis_keys_POST_2_Provider - [app_coronawarn_server_services_submission_controller_SubmissionController]
port SPRING_APPLICATION_version_v1_diagnosis_keys_POST_Provider
SPRING_APPLICATION_version_v1_diagnosis_keys_POST_Delegation_Provider - SPRING_APPLICATION_version_v1_diagnosis_keys_POST_Provider
-SPRING_APPLICATION_version_v1_diagnosis_keys_POST_Provider - [app_coronawarn_server_services_submission_controller_SubmissionController]
+SPRING_APPLICATION_version_v1_diagnosis_keys_POST_Provider - [app_coronawarn_server_services_submission_controller_FakeRequestController]
port SPRING_APPLICATION_version_v1_submission_on_behalf_POST_Provider
SPRING_APPLICATION_version_v1_submission_on_behalf_POST_Delegation_Provider - SPRING_APPLICATION_version_v1_submission_on_behalf_POST_Provider
SPRING_APPLICATION_version_v1_submission_on_behalf_POST_Provider - [app_coronawarn_server_services_submission_controller_SubmissionController]
diff --git a/corona-warn-app-cwa-server/model_re/uml/systemDiagram.svg b/corona-warn-app-cwa-server/model_re/uml/systemDiagram.svg
index 42552b0538..a19f11f962 100644
--- a/corona-warn-app-cwa-server/model_re/uml/systemDiagram.svg
+++ b/corona-warn-app-cwa-server/model_re/uml/systemDiagram.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/corona-warn-app-cwa-testresult-server/model_re/README.md b/corona-warn-app-cwa-testresult-server/model_re/README.md
index 91970812f1..758f9c3062 100644
--- a/corona-warn-app-cwa-testresult-server/model_re/README.md
+++ b/corona-warn-app-cwa-testresult-server/model_re/README.md
@@ -2,13 +2,13 @@
| Attribute | Value |
| ------------------ | ----- |
| Retriever Version | v5.2.0.202408280745 |
-| Date | Sun Sep 1 17:23:54 UTC 2024 |
+| Date | Mon Sep 2 06:33:09 UTC 2024 |
| #Components | 5 |
| #Source Files | 48 |
| Lines of Code | 2889 |
| #Technologies | 7 |
| Abstraction | 9.60 |
-| Execution Time [s] | 3.338 ± 0.049 |
+| Execution Time [s] | 3.362 ± 0.042 |
## Git repository information
| Attribute | Value |
@@ -27,18 +27,18 @@
| OS | Linux |
| Distro | Ubuntu 22.04.4 LTS x86_64 |
| Kernel | 6.5.0-1025-azure |
-| CPU | AMD EPYC 7763 (4) @ 3.224GHz |
+| CPU | AMD EPYC 7763 (4) @ 2.888GHz |
| GPU | 00:08.0 Microsoft Corporation Hyper-V virtual VGA |
-| Memory | 788MiB / 15981MiB |
+| Memory | 809MiB / 15981MiB |
## Retriever execution time
| Mean [s] | Min [s] | Max [s] | Relative |
|---:|---:|---:|---:|
-| 3.338 ± 0.049 | 3.248 | 3.403 | 1.00 |
+| 3.362 ± 0.042 | 3.279 | 3.429 | 1.00 |
## Cloc analysis
-
+
|Technology|files|blank|comment|code|
|:-------|-------:|-------:|-------:|-------:|
diff --git a/corona-warn-app-cwa-testresult-server/model_re/pcm/corona-warn-app-cwa-testresult-server.allocation b/corona-warn-app-cwa-testresult-server/model_re/pcm/corona-warn-app-cwa-testresult-server.allocation
index 37c7c66e9b..34dc178b64 100644
--- a/corona-warn-app-cwa-testresult-server/model_re/pcm/corona-warn-app-cwa-testresult-server.allocation
+++ b/corona-warn-app-cwa-testresult-server/model_re/pcm/corona-warn-app-cwa-testresult-server.allocation
@@ -1,25 +1,25 @@
-
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
diff --git a/corona-warn-app-cwa-testresult-server/model_re/pcm/corona-warn-app-cwa-testresult-server.repository b/corona-warn-app-cwa-testresult-server/model_re/pcm/corona-warn-app-cwa-testresult-server.repository
index f1e2a6b3d1..20ccd41014 100644
--- a/corona-warn-app-cwa-testresult-server/model_re/pcm/corona-warn-app-cwa-testresult-server.repository
+++ b/corona-warn-app-cwa-testresult-server/model_re/pcm/corona-warn-app-cwa-testresult-server.repository
@@ -1,30 +1,31 @@
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
@@ -34,44 +35,43 @@
-
+
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
@@ -81,61 +81,61 @@
-
+
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
diff --git a/corona-warn-app-cwa-testresult-server/model_re/pcm/corona-warn-app-cwa-testresult-server.resourceenvironment b/corona-warn-app-cwa-testresult-server/model_re/pcm/corona-warn-app-cwa-testresult-server.resourceenvironment
index 401cbd09b2..dd45160d02 100644
--- a/corona-warn-app-cwa-testresult-server/model_re/pcm/corona-warn-app-cwa-testresult-server.resourceenvironment
+++ b/corona-warn-app-cwa-testresult-server/model_re/pcm/corona-warn-app-cwa-testresult-server.resourceenvironment
@@ -1,11 +1,11 @@
-
+
-
-
-
-
-
+
+
+
+
+
diff --git a/corona-warn-app-cwa-testresult-server/model_re/pcm/corona-warn-app-cwa-testresult-server.system b/corona-warn-app-cwa-testresult-server/model_re/pcm/corona-warn-app-cwa-testresult-server.system
index 3ec5104b18..c7479747c8 100644
--- a/corona-warn-app-cwa-testresult-server/model_re/pcm/corona-warn-app-cwa-testresult-server.system
+++ b/corona-warn-app-cwa-testresult-server/model_re/pcm/corona-warn-app-cwa-testresult-server.system
@@ -1,28 +1,28 @@
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
diff --git a/corona-warn-app-cwa-testresult-server/model_re/uml/allocationDiagram.puml b/corona-warn-app-cwa-testresult-server/model_re/uml/allocationDiagram.puml
index c767308c49..e4a25a9294 100644
--- a/corona-warn-app-cwa-testresult-server/model_re/uml/allocationDiagram.puml
+++ b/corona-warn-app-cwa-testresult-server/model_re/uml/allocationDiagram.puml
@@ -3,12 +3,12 @@ skinparam fixCircleLabelOverlapping true
skinparam componentStyle uml2
node nodeapp_coronawarn_testresult {
component app_coronawarn_testresult {
-[app_coronawarn_testresult_TestResultRepository] [[corona-warn-app-cwa-testresult-server.system#_9ZzgIGiGEe-XyuBgyfsjww]]
-[app_coronawarn_testresult_service_TestResultService] [[corona-warn-app-cwa-testresult-server.system#_9ZzgIGiGEe-XyuBgyfsjww]]
+[app_coronawarn_testresult_TestResultRepository] [[corona-warn-app-cwa-testresult-server.system#_N9Ce8Wj1Ee-KetaW5KR5JQ]]
+[app_coronawarn_testresult_service_TestResultService] [[corona-warn-app-cwa-testresult-server.system#_N9Ce8Wj1Ee-KetaW5KR5JQ]]
}
}
node nodeapp_coronawarn_testresult_TestResultController {
-[app_coronawarn_testresult_TestResultController] [[corona-warn-app-cwa-testresult-server.system#_9ZzgIGiGEe-XyuBgyfsjww]]
+[app_coronawarn_testresult_TestResultController] [[corona-warn-app-cwa-testresult-server.system#_N9Ce8Wj1Ee-KetaW5KR5JQ]]
}
@enduml
diff --git a/corona-warn-app-cwa-testresult-server/model_re/uml/allocationDiagram.svg b/corona-warn-app-cwa-testresult-server/model_re/uml/allocationDiagram.svg
index cceb2ba29c..334ab037ef 100644
--- a/corona-warn-app-cwa-testresult-server/model_re/uml/allocationDiagram.svg
+++ b/corona-warn-app-cwa-testresult-server/model_re/uml/allocationDiagram.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/corona-warn-app-cwa-testresult-server/model_re/uml/systemDiagram.puml b/corona-warn-app-cwa-testresult-server/model_re/uml/systemDiagram.puml
index f522a7d121..1c3f7c814d 100644
--- a/corona-warn-app-cwa-testresult-server/model_re/uml/systemDiagram.puml
+++ b/corona-warn-app-cwa-testresult-server/model_re/uml/systemDiagram.puml
@@ -3,9 +3,9 @@ skinparam fixCircleLabelOverlapping true
skinparam componentStyle uml2
() SPRING_APPLICATION_api_v1_Delegation_Provider
rectangle System {
-[app_coronawarn_testresult_TestResultController] [[corona-warn-app-cwa-testresult-server.repository#_9ZsycGiGEe-XyuBgyfsjww]]
-[app_coronawarn_testresult_TestResultRepository] [[corona-warn-app-cwa-testresult-server.repository#_9ZsycGiGEe-XyuBgyfsjww]]
-[app_coronawarn_testresult_service_TestResultService] [[corona-warn-app-cwa-testresult-server.repository#_9ZsycGiGEe-XyuBgyfsjww]]
+[app_coronawarn_testresult_TestResultController] [[corona-warn-app-cwa-testresult-server.repository#_N86jJmj1Ee-KetaW5KR5JQ]]
+[app_coronawarn_testresult_TestResultRepository] [[corona-warn-app-cwa-testresult-server.repository#_N86jJmj1Ee-KetaW5KR5JQ]]
+[app_coronawarn_testresult_service_TestResultService] [[corona-warn-app-cwa-testresult-server.repository#_N86jJmj1Ee-KetaW5KR5JQ]]
port SPRING_APPLICATION_api_v1_Provider
SPRING_APPLICATION_api_v1_Delegation_Provider - SPRING_APPLICATION_api_v1_Provider
SPRING_APPLICATION_api_v1_Provider - [app_coronawarn_testresult_TestResultController]
diff --git a/corona-warn-app-cwa-testresult-server/model_re/uml/systemDiagram.svg b/corona-warn-app-cwa-testresult-server/model_re/uml/systemDiagram.svg
index f51facd949..686288f4c0 100644
--- a/corona-warn-app-cwa-testresult-server/model_re/uml/systemDiagram.svg
+++ b/corona-warn-app-cwa-testresult-server/model_re/uml/systemDiagram.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/corona-warn-app-cwa-verification-portal/model_re/README.md b/corona-warn-app-cwa-verification-portal/model_re/README.md
index 415f859bf5..73aef7ef98 100644
--- a/corona-warn-app-cwa-verification-portal/model_re/README.md
+++ b/corona-warn-app-cwa-verification-portal/model_re/README.md
@@ -2,13 +2,13 @@
| Attribute | Value |
| ------------------ | ----- |
| Retriever Version | v5.2.0.202408280745 |
-| Date | Sun Sep 1 17:23:53 UTC 2024 |
+| Date | Mon Sep 2 06:32:52 UTC 2024 |
| #Components | 8 |
| #Source Files | 35 |
| Lines of Code | 1878 |
| #Technologies | 6 |
| Abstraction | 4.37 |
-| Execution Time [s] | 3.386 ± 0.039 |
+| Execution Time [s] | 3.347 ± 0.052 |
## Git repository information
| Attribute | Value |
@@ -27,18 +27,18 @@
| OS | Linux |
| Distro | Ubuntu 22.04.4 LTS x86_64 |
| Kernel | 6.5.0-1025-azure |
-| CPU | AMD EPYC 7763 (4) @ 3.239GHz |
+| CPU | AMD EPYC 7763 (4) @ 3.243GHz |
| GPU | 00:08.0 Microsoft Corporation Hyper-V virtual VGA |
-| Memory | 773MiB / 15981MiB |
+| Memory | 790MiB / 15981MiB |
## Retriever execution time
| Mean [s] | Min [s] | Max [s] | Relative |
|---:|---:|---:|---:|
-| 3.386 ± 0.039 | 3.291 | 3.421 | 1.00 |
+| 3.347 ± 0.052 | 3.275 | 3.441 | 1.00 |
## Cloc analysis
-
+
|Technology|files|blank|comment|code|
|:-------|-------:|-------:|-------:|-------:|
diff --git a/corona-warn-app-cwa-verification-portal/model_re/pcm/corona-warn-app-cwa-verification-portal.allocation b/corona-warn-app-cwa-verification-portal/model_re/pcm/corona-warn-app-cwa-verification-portal.allocation
index bf6ea1bf78..3f5914b922 100644
--- a/corona-warn-app-cwa-verification-portal/model_re/pcm/corona-warn-app-cwa-verification-portal.allocation
+++ b/corona-warn-app-cwa-verification-portal/model_re/pcm/corona-warn-app-cwa-verification-portal.allocation
@@ -1,37 +1,37 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/corona-warn-app-cwa-verification-portal/model_re/pcm/corona-warn-app-cwa-verification-portal.repository b/corona-warn-app-cwa-verification-portal/model_re/pcm/corona-warn-app-cwa-verification-portal.repository
index 75d8a85bb9..96d4f5288d 100644
--- a/corona-warn-app-cwa-verification-portal/model_re/pcm/corona-warn-app-cwa-verification-portal.repository
+++ b/corona-warn-app-cwa-verification-portal/model_re/pcm/corona-warn-app-cwa-verification-portal.repository
@@ -1,145 +1,34 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
@@ -149,113 +38,113 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
@@ -265,38 +154,145 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
+
+
+
@@ -308,14 +304,18 @@
+
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
diff --git a/corona-warn-app-cwa-verification-portal/model_re/pcm/corona-warn-app-cwa-verification-portal.resourceenvironment b/corona-warn-app-cwa-verification-portal/model_re/pcm/corona-warn-app-cwa-verification-portal.resourceenvironment
index e4ae04c90d..d6659e1269 100644
--- a/corona-warn-app-cwa-verification-portal/model_re/pcm/corona-warn-app-cwa-verification-portal.resourceenvironment
+++ b/corona-warn-app-cwa-verification-portal/model_re/pcm/corona-warn-app-cwa-verification-portal.resourceenvironment
@@ -1,11 +1,11 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/corona-warn-app-cwa-verification-portal/model_re/pcm/corona-warn-app-cwa-verification-portal.system b/corona-warn-app-cwa-verification-portal/model_re/pcm/corona-warn-app-cwa-verification-portal.system
index 0de57f0d20..dd38d5c3c2 100644
--- a/corona-warn-app-cwa-verification-portal/model_re/pcm/corona-warn-app-cwa-verification-portal.system
+++ b/corona-warn-app-cwa-verification-portal/model_re/pcm/corona-warn-app-cwa-verification-portal.system
@@ -1,39 +1,39 @@
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/corona-warn-app-cwa-verification-portal/model_re/uml/allocationDiagram.puml b/corona-warn-app-cwa-verification-portal/model_re/uml/allocationDiagram.puml
index 434012ddf1..d55128ae4e 100644
--- a/corona-warn-app-cwa-verification-portal/model_re/uml/allocationDiagram.puml
+++ b/corona-warn-app-cwa-verification-portal/model_re/uml/allocationDiagram.puml
@@ -2,16 +2,16 @@
skinparam fixCircleLabelOverlapping true
skinparam componentStyle uml2
node nodeapp_coronawarn_verification_portal_controller_VerificationPortalController {
-[app_coronawarn_verification_portal_controller_VerificationPortalController] [[corona-warn-app-cwa-verification-portal.system#_9VmVk2iGEe-bUMwgj1aTWw]]
+[app_coronawarn_verification_portal_controller_VerificationPortalController] [[corona-warn-app-cwa-verification-portal.system#_LQgnQ2j1Ee-9LflCFhZ_aQ]]
}
node nodeapp_coronawarn_verification_portal_controller_VerificationPortalErrorController {
-[app_coronawarn_verification_portal_controller_VerificationPortalErrorController] [[corona-warn-app-cwa-verification-portal.system#_9VmVk2iGEe-bUMwgj1aTWw]]
+[app_coronawarn_verification_portal_controller_VerificationPortalErrorController] [[corona-warn-app-cwa-verification-portal.system#_LQgnQ2j1Ee-9LflCFhZ_aQ]]
}
node nodeapp_coronawarn_verification_portal_service_HealthAuthorityService {
-[app_coronawarn_verification_portal_service_HealthAuthorityService] [[corona-warn-app-cwa-verification-portal.system#_9VmVk2iGEe-bUMwgj1aTWw]]
+[app_coronawarn_verification_portal_service_HealthAuthorityService] [[corona-warn-app-cwa-verification-portal.system#_LQgnQ2j1Ee-9LflCFhZ_aQ]]
}
node nodeapp_coronawarn_verification_portal_service_TeleTanService {
-[app_coronawarn_verification_portal_service_TeleTanService] [[corona-warn-app-cwa-verification-portal.system#_9VmVk2iGEe-bUMwgj1aTWw]]
+[app_coronawarn_verification_portal_service_TeleTanService] [[corona-warn-app-cwa-verification-portal.system#_LQgnQ2j1Ee-9LflCFhZ_aQ]]
}
@enduml
diff --git a/corona-warn-app-cwa-verification-portal/model_re/uml/allocationDiagram.svg b/corona-warn-app-cwa-verification-portal/model_re/uml/allocationDiagram.svg
index 0cc4bfbed4..298ce719e7 100644
--- a/corona-warn-app-cwa-verification-portal/model_re/uml/allocationDiagram.svg
+++ b/corona-warn-app-cwa-verification-portal/model_re/uml/allocationDiagram.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/corona-warn-app-cwa-verification-portal/model_re/uml/systemDiagram.puml b/corona-warn-app-cwa-verification-portal/model_re/uml/systemDiagram.puml
index 1e9c8cd1f8..1cd6aeb360 100644
--- a/corona-warn-app-cwa-verification-portal/model_re/uml/systemDiagram.puml
+++ b/corona-warn-app-cwa-verification-portal/model_re/uml/systemDiagram.puml
@@ -4,10 +4,10 @@ skinparam componentStyle uml2
() SPRING_APPLICATION_cwa_Delegation_Provider
() SPRING_APPLICATION_error_Delegation_Provider
rectangle System {
-[app_coronawarn_verification_portal_controller_VerificationPortalController] [[corona-warn-app-cwa-verification-portal.repository#_9VhdGGiGEe-bUMwgj1aTWw]]
-[app_coronawarn_verification_portal_controller_VerificationPortalErrorController] [[corona-warn-app-cwa-verification-portal.repository#_9VhdGGiGEe-bUMwgj1aTWw]]
-[app_coronawarn_verification_portal_service_HealthAuthorityService] [[corona-warn-app-cwa-verification-portal.repository#_9VhdGGiGEe-bUMwgj1aTWw]]
-[app_coronawarn_verification_portal_service_TeleTanService] [[corona-warn-app-cwa-verification-portal.repository#_9VhdGGiGEe-bUMwgj1aTWw]]
+[app_coronawarn_verification_portal_controller_VerificationPortalController] [[corona-warn-app-cwa-verification-portal.repository#_LQagqGj1Ee-9LflCFhZ_aQ]]
+[app_coronawarn_verification_portal_controller_VerificationPortalErrorController] [[corona-warn-app-cwa-verification-portal.repository#_LQagqGj1Ee-9LflCFhZ_aQ]]
+[app_coronawarn_verification_portal_service_HealthAuthorityService] [[corona-warn-app-cwa-verification-portal.repository#_LQagqGj1Ee-9LflCFhZ_aQ]]
+[app_coronawarn_verification_portal_service_TeleTanService] [[corona-warn-app-cwa-verification-portal.repository#_LQagqGj1Ee-9LflCFhZ_aQ]]
port SPRING_APPLICATION_cwa_Provider
SPRING_APPLICATION_cwa_Delegation_Provider - SPRING_APPLICATION_cwa_Provider
SPRING_APPLICATION_cwa_Provider - [app_coronawarn_verification_portal_controller_VerificationPortalController]
diff --git a/corona-warn-app-cwa-verification-portal/model_re/uml/systemDiagram.svg b/corona-warn-app-cwa-verification-portal/model_re/uml/systemDiagram.svg
index f99562a63c..dc89634c22 100644
--- a/corona-warn-app-cwa-verification-portal/model_re/uml/systemDiagram.svg
+++ b/corona-warn-app-cwa-verification-portal/model_re/uml/systemDiagram.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/corona-warn-app-cwa-verification-server/model_re/README.md b/corona-warn-app-cwa-verification-server/model_re/README.md
index e357a7107c..9c7b113656 100644
--- a/corona-warn-app-cwa-verification-server/model_re/README.md
+++ b/corona-warn-app-cwa-verification-server/model_re/README.md
@@ -2,13 +2,13 @@
| Attribute | Value |
| ------------------ | ----- |
| Retriever Version | v5.2.0.202408280745 |
-| Date | Sun Sep 1 17:24:01 UTC 2024 |
+| Date | Mon Sep 2 06:33:02 UTC 2024 |
| #Components | 12 |
| #Source Files | 85 |
| Lines of Code | 5121 |
| #Technologies | 7 |
| Abstraction | 7.08 |
-| Execution Time [s] | 3.822 ± 0.067 |
+| Execution Time [s] | 3.865 ± 0.057 |
## Git repository information
| Attribute | Value |
@@ -17,7 +17,7 @@
| Branch | master |
| Commit | bbc28be761c89bdda30f761f79f3a190e4c3a7c6 |
| Number of Commits | 211 |
-| Stars | 345 |
+| Stars | 344 |
| Contributors | 35 |
@@ -27,18 +27,18 @@
| OS | Linux |
| Distro | Ubuntu 22.04.4 LTS x86_64 |
| Kernel | 6.5.0-1025-azure |
-| CPU | AMD EPYC 7763 (4) @ 3.243GHz |
+| CPU | AMD EPYC 7763 (4) @ 3.244GHz |
| GPU | 00:08.0 Microsoft Corporation Hyper-V virtual VGA |
-| Memory | 783MiB / 15981MiB |
+| Memory | 773MiB / 15981MiB |
## Retriever execution time
| Mean [s] | Min [s] | Max [s] | Relative |
|---:|---:|---:|---:|
-| 3.822 ± 0.067 | 3.717 | 3.961 | 1.00 |
+| 3.865 ± 0.057 | 3.793 | 3.961 | 1.00 |
## Cloc analysis
-
+
|Technology|files|blank|comment|code|
|:-------|-------:|-------:|-------:|-------:|
diff --git a/corona-warn-app-cwa-verification-server/model_re/pcm/corona-warn-app-cwa-verification-server.allocation b/corona-warn-app-cwa-verification-server/model_re/pcm/corona-warn-app-cwa-verification-server.allocation
index 1c5956c970..036e70c002 100644
--- a/corona-warn-app-cwa-verification-server/model_re/pcm/corona-warn-app-cwa-verification-server.allocation
+++ b/corona-warn-app-cwa-verification-server/model_re/pcm/corona-warn-app-cwa-verification-server.allocation
@@ -1,53 +1,53 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/corona-warn-app-cwa-verification-server/model_re/pcm/corona-warn-app-cwa-verification-server.repository b/corona-warn-app-cwa-verification-server/model_re/pcm/corona-warn-app-cwa-verification-server.repository
index 5cc5f4dd2d..eb773cf016 100644
--- a/corona-warn-app-cwa-verification-server/model_re/pcm/corona-warn-app-cwa-verification-server.repository
+++ b/corona-warn-app-cwa-verification-server/model_re/pcm/corona-warn-app-cwa-verification-server.repository
@@ -1,205 +1,14 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -209,45 +18,45 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -257,11 +66,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -271,19 +80,19 @@
-
-
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -293,39 +102,38 @@
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -335,64 +143,64 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -402,52 +210,125 @@
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -457,28 +338,28 @@
-
+
-
-
-
-
+
+
+
+
-
+
-
+
-
-
-
+
+
+
@@ -488,84 +369,203 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
+
+
+
+
-
-
-
-
+
+
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/corona-warn-app-cwa-verification-server/model_re/pcm/corona-warn-app-cwa-verification-server.resourceenvironment b/corona-warn-app-cwa-verification-server/model_re/pcm/corona-warn-app-cwa-verification-server.resourceenvironment
index be72c8fa3f..6351236c02 100644
--- a/corona-warn-app-cwa-verification-server/model_re/pcm/corona-warn-app-cwa-verification-server.resourceenvironment
+++ b/corona-warn-app-cwa-verification-server/model_re/pcm/corona-warn-app-cwa-verification-server.resourceenvironment
@@ -1,15 +1,15 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/corona-warn-app-cwa-verification-server/model_re/pcm/corona-warn-app-cwa-verification-server.system b/corona-warn-app-cwa-verification-server/model_re/pcm/corona-warn-app-cwa-verification-server.system
index 8ad52f4c35..cb65f67024 100644
--- a/corona-warn-app-cwa-verification-server/model_re/pcm/corona-warn-app-cwa-verification-server.system
+++ b/corona-warn-app-cwa-verification-server/model_re/pcm/corona-warn-app-cwa-verification-server.system
@@ -1,75 +1,75 @@
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/corona-warn-app-cwa-verification-server/model_re/uml/allocationDiagram.puml b/corona-warn-app-cwa-verification-server/model_re/uml/allocationDiagram.puml
index aaa55a6884..aae8a743ea 100644
--- a/corona-warn-app-cwa-verification-server/model_re/uml/allocationDiagram.puml
+++ b/corona-warn-app-cwa-verification-server/model_re/uml/allocationDiagram.puml
@@ -2,22 +2,22 @@
skinparam fixCircleLabelOverlapping true
skinparam componentStyle uml2
node nodeapp_coronawarn_verification_controller_ExternalTanController {
-[app_coronawarn_verification_controller_ExternalTanController] [[corona-warn-app-cwa-verification-server.system#_-gqai2iGEe-W8ph3ZNSvqw]]
+[app_coronawarn_verification_controller_ExternalTanController] [[corona-warn-app-cwa-verification-server.system#_MoAltmj1Ee-s5_ogCNka1g]]
}
node nodeapp_coronawarn_verification_controller_ExternalTestStateController {
-[app_coronawarn_verification_controller_ExternalTestStateController] [[corona-warn-app-cwa-verification-server.system#_-gqai2iGEe-W8ph3ZNSvqw]]
+[app_coronawarn_verification_controller_ExternalTestStateController] [[corona-warn-app-cwa-verification-server.system#_MoAltmj1Ee-s5_ogCNka1g]]
}
node nodeapp_coronawarn_verification_controller_ExternalTokenController {
-[app_coronawarn_verification_controller_ExternalTokenController] [[corona-warn-app-cwa-verification-server.system#_-gqai2iGEe-W8ph3ZNSvqw]]
+[app_coronawarn_verification_controller_ExternalTokenController] [[corona-warn-app-cwa-verification-server.system#_MoAltmj1Ee-s5_ogCNka1g]]
}
node nodeapp_coronawarn_verification_controller_InternalTanController {
-[app_coronawarn_verification_controller_InternalTanController] [[corona-warn-app-cwa-verification-server.system#_-gqai2iGEe-W8ph3ZNSvqw]]
+[app_coronawarn_verification_controller_InternalTanController] [[corona-warn-app-cwa-verification-server.system#_MoAltmj1Ee-s5_ogCNka1g]]
}
node nodeapp_coronawarn_verification_controller_InternalTestStateController {
-[app_coronawarn_verification_controller_InternalTestStateController] [[corona-warn-app-cwa-verification-server.system#_-gqai2iGEe-W8ph3ZNSvqw]]
+[app_coronawarn_verification_controller_InternalTestStateController] [[corona-warn-app-cwa-verification-server.system#_MoAltmj1Ee-s5_ogCNka1g]]
}
node nodeapp_coronawarn_verification_service_FakeRequestService {
-[app_coronawarn_verification_service_FakeRequestService] [[corona-warn-app-cwa-verification-server.system#_-gqai2iGEe-W8ph3ZNSvqw]]
+[app_coronawarn_verification_service_FakeRequestService] [[corona-warn-app-cwa-verification-server.system#_MoAltmj1Ee-s5_ogCNka1g]]
}
@enduml
diff --git a/corona-warn-app-cwa-verification-server/model_re/uml/allocationDiagram.svg b/corona-warn-app-cwa-verification-server/model_re/uml/allocationDiagram.svg
index a69f193a9b..027c26ea92 100644
--- a/corona-warn-app-cwa-verification-server/model_re/uml/allocationDiagram.svg
+++ b/corona-warn-app-cwa-verification-server/model_re/uml/allocationDiagram.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/corona-warn-app-cwa-verification-server/model_re/uml/componentDiagram.puml b/corona-warn-app-cwa-verification-server/model_re/uml/componentDiagram.puml
index 343e44bd3c..9e9df3bf29 100644
--- a/corona-warn-app-cwa-verification-server/model_re/uml/componentDiagram.puml
+++ b/corona-warn-app-cwa-verification-server/model_re/uml/componentDiagram.puml
@@ -26,8 +26,8 @@ component "app_coronawarn_verification_controller_InternalTanController\n\n\n\n\
[app_coronawarn_verification_controller_InternalTanController]
portin " " as app_coronawarn_verification_controller_InternalTanController_requires_SPRING_APPLICATION_version_v1_tan_teletan_POST_
portin " " as app_coronawarn_verification_controller_InternalTanController_requires_SPRING_APPLICATION_version_v1_tan_verify_POST_
-"app_coronawarn_verification_controller_InternalTanController_requires_SPRING_APPLICATION_version_v1_tan_teletan_POST_"--[app_coronawarn_verification_controller_InternalTanController]
"app_coronawarn_verification_controller_InternalTanController_requires_SPRING_APPLICATION_version_v1_tan_verify_POST_"--[app_coronawarn_verification_controller_InternalTanController]
+"app_coronawarn_verification_controller_InternalTanController_requires_SPRING_APPLICATION_version_v1_tan_teletan_POST_"--[app_coronawarn_verification_controller_InternalTanController]
}
interface "SPRING-APPLICATION/version/v1/tan/teletan[POST]" as interface.SPRING_APPLICATION_version_v1_tan_teletan_POST_
interface.SPRING_APPLICATION_version_v1_tan_teletan_POST_--"app_coronawarn_verification_controller_InternalTanController_requires_SPRING_APPLICATION_version_v1_tan_teletan_POST_"
diff --git a/corona-warn-app-cwa-verification-server/model_re/uml/componentDiagram.svg b/corona-warn-app-cwa-verification-server/model_re/uml/componentDiagram.svg
index 6e30d170c9..807a93fb8a 100644
--- a/corona-warn-app-cwa-verification-server/model_re/uml/componentDiagram.svg
+++ b/corona-warn-app-cwa-verification-server/model_re/uml/componentDiagram.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/corona-warn-app-cwa-verification-server/model_re/uml/systemDiagram.puml b/corona-warn-app-cwa-verification-server/model_re/uml/systemDiagram.puml
index de6e05c1d6..7e9c3c6f02 100644
--- a/corona-warn-app-cwa-verification-server/model_re/uml/systemDiagram.puml
+++ b/corona-warn-app-cwa-verification-server/model_re/uml/systemDiagram.puml
@@ -8,12 +8,12 @@ skinparam componentStyle uml2
() SPRING_APPLICATION_version_v1_testresult_POST_2_Delegation_Provider
() SPRING_APPLICATION_version_v1_testresult_POST_Delegation_Provider
rectangle System {
-[app_coronawarn_verification_controller_ExternalTanController] [[corona-warn-app-cwa-verification-server.repository#_-gkT7GiGEe-W8ph3ZNSvqw]]
-[app_coronawarn_verification_controller_ExternalTestStateController] [[corona-warn-app-cwa-verification-server.repository#_-gkT7GiGEe-W8ph3ZNSvqw]]
-[app_coronawarn_verification_controller_ExternalTokenController] [[corona-warn-app-cwa-verification-server.repository#_-gkT7GiGEe-W8ph3ZNSvqw]]
-[app_coronawarn_verification_controller_InternalTanController] [[corona-warn-app-cwa-verification-server.repository#_-gkT7GiGEe-W8ph3ZNSvqw]]
-[app_coronawarn_verification_controller_InternalTestStateController] [[corona-warn-app-cwa-verification-server.repository#_-gkT7GiGEe-W8ph3ZNSvqw]]
-[app_coronawarn_verification_service_FakeRequestService] [[corona-warn-app-cwa-verification-server.repository#_-gkT7GiGEe-W8ph3ZNSvqw]]
+[app_coronawarn_verification_controller_ExternalTanController] [[corona-warn-app-cwa-verification-server.repository#_Mn7GIGj1Ee-s5_ogCNka1g]]
+[app_coronawarn_verification_controller_ExternalTestStateController] [[corona-warn-app-cwa-verification-server.repository#_Mn7GIGj1Ee-s5_ogCNka1g]]
+[app_coronawarn_verification_controller_ExternalTokenController] [[corona-warn-app-cwa-verification-server.repository#_Mn7GIGj1Ee-s5_ogCNka1g]]
+[app_coronawarn_verification_controller_InternalTanController] [[corona-warn-app-cwa-verification-server.repository#_Mn7GIGj1Ee-s5_ogCNka1g]]
+[app_coronawarn_verification_controller_InternalTestStateController] [[corona-warn-app-cwa-verification-server.repository#_Mn7GIGj1Ee-s5_ogCNka1g]]
+[app_coronawarn_verification_service_FakeRequestService] [[corona-warn-app-cwa-verification-server.repository#_Mn7GIGj1Ee-s5_ogCNka1g]]
port SPRING_APPLICATION_version_v1_registrationToken_POST_Provider
SPRING_APPLICATION_version_v1_registrationToken_POST_Delegation_Provider - SPRING_APPLICATION_version_v1_registrationToken_POST_Provider
SPRING_APPLICATION_version_v1_registrationToken_POST_Provider - [app_coronawarn_verification_controller_ExternalTokenController]
diff --git a/corona-warn-app-cwa-verification-server/model_re/uml/systemDiagram.svg b/corona-warn-app-cwa-verification-server/model_re/uml/systemDiagram.svg
index a5db33f72e..bc75d703c1 100644
--- a/corona-warn-app-cwa-verification-server/model_re/uml/systemDiagram.svg
+++ b/corona-warn-app-cwa-verification-server/model_re/uml/systemDiagram.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/corona-warn-app/model_re/README.md b/corona-warn-app/model_re/README.md
index e4f5e88ee3..a48ded0da2 100644
--- a/corona-warn-app/model_re/README.md
+++ b/corona-warn-app/model_re/README.md
@@ -2,13 +2,13 @@
| Attribute | Value |
| ------------------ | ----- |
| Retriever Version | v5.2.0.202408280745 |
-| Date | Sun Sep 1 17:26:56 UTC 2024 |
+| Date | Mon Sep 2 06:36:03 UTC 2024 |
| #Components | 117 |
| #Source Files | 1516 |
| Lines of Code | 380470 |
| #Technologies | 8 |
| Abstraction | 12.95 |
-| Execution Time [s] | 16.764 ± 0.266 |
+| Execution Time [s] | 16.871 ± 0.213 |
## Git repository information
| Attribute | Value |
@@ -71,7 +71,7 @@
| Branch | master |
| Commit | bbc28be761c89bdda30f761f79f3a190e4c3a7c6 |
| Number of Commits | 211 |
-| Stars | 345 |
+| Stars | 344 |
| Contributors | 35 |
@@ -81,18 +81,18 @@
| OS | Linux |
| Distro | Ubuntu 22.04.4 LTS x86_64 |
| Kernel | 6.5.0-1025-azure |
-| CPU | AMD EPYC 7763 (4) @ 3.243GHz |
+| CPU | AMD EPYC 7763 (4) @ 3.248GHz |
| GPU | 00:08.0 Microsoft Corporation Hyper-V virtual VGA |
-| Memory | 772MiB / 15981MiB |
+| Memory | 809MiB / 15981MiB |
## Retriever execution time
| Mean [s] | Min [s] | Max [s] | Relative |
|---:|---:|---:|---:|
-| 16.764 ± 0.266 | 16.455 | 17.300 | 1.00 |
+| 16.871 ± 0.213 | 16.568 | 17.208 | 1.00 |
## Cloc analysis
-
+
|Technology|files|blank|comment|code|
|:-------|-------:|-------:|-------:|-------:|
diff --git a/corona-warn-app/model_re/pcm/corona-warn-app.allocation b/corona-warn-app/model_re/pcm/corona-warn-app.allocation
index e27e99814f..3e09e2296a 100644
--- a/corona-warn-app/model_re/pcm/corona-warn-app.allocation
+++ b/corona-warn-app/model_re/pcm/corona-warn-app.allocation
@@ -1,473 +1,473 @@
-
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
diff --git a/corona-warn-app/model_re/pcm/corona-warn-app.repository b/corona-warn-app/model_re/pcm/corona-warn-app.repository
index bdbbb2f0d8..0856c3b485 100644
--- a/corona-warn-app/model_re/pcm/corona-warn-app.repository
+++ b/corona-warn-app/model_re/pcm/corona-warn-app.repository
@@ -1,354 +1,243 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
-
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
-
+
+
+
+
+
-
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
@@ -358,13 +247,13 @@
-
+
-
-
-
-
-
+
+
+
+
+
@@ -374,29 +263,145 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
@@ -406,205 +411,193 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
@@ -614,497 +607,383 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
-
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1114,21 +993,21 @@
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -1138,17 +1017,17 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -1158,31 +1037,31 @@
-
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1192,246 +1071,177 @@
-
+
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -1441,12 +1251,12 @@
-
+
-
-
-
-
+
+
+
+
@@ -1456,28 +1266,29 @@
-
+
-
-
-
-
+
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
@@ -1487,119 +1298,158 @@
-
+
-
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
+
-
+
@@ -1609,1301 +1459,1451 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
-
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
-
-
+
+
+
-
-
-
-
-
-
+
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
-
+
-
-
-
-
-
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
-
-
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
-
+
-
-
-
+
+
+
+
+
+
+
+
-
+
+
+
+
-
+
-
-
-
-
-
-
+
+
+
-
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
-
+
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/corona-warn-app/model_re/pcm/corona-warn-app.resourceenvironment b/corona-warn-app/model_re/pcm/corona-warn-app.resourceenvironment
index 2c11bbbc59..9df70f141d 100644
--- a/corona-warn-app/model_re/pcm/corona-warn-app.resourceenvironment
+++ b/corona-warn-app/model_re/pcm/corona-warn-app.resourceenvironment
@@ -1,219 +1,219 @@
-
+
-
-
-
-
+
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
+
-
+
+
+
+
-
+
-
-
-
-
+
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/corona-warn-app/model_re/pcm/corona-warn-app.system b/corona-warn-app/model_re/pcm/corona-warn-app.system
index 503dfeed3e..2086f93cad 100644
--- a/corona-warn-app/model_re/pcm/corona-warn-app.system
+++ b/corona-warn-app/model_re/pcm/corona-warn-app.system
@@ -1,732 +1,732 @@
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+