This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 6605a3176b Use shorthand for return and deactivate
6605a3176b is described below
commit 6605a3176b2d2a3a1fe4784da7d0f0011ad9c64d
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Sep 6 17:35:57 2024 +0100
Use shorthand for return and deactivate
a <<-- b
deactivate b
is replaced by
return
The style of the arrow changes but that seems acceptable for the cleaner
code
---
.../docs/architecture/startup/1_overview.plantuml | 41 +++++------
webapps/docs/architecture/startup/1_overview.png | Bin 46300 -> 48278 bytes
.../architecture/startup/2_catalina_init.plantuml | 52 ++++++--------
.../docs/architecture/startup/2_catalina_init.png | Bin 114163 -> 118930 bytes
.../startup/3_catalina_start_1.plantuml | 75 +++++++--------------
.../architecture/startup/3_catalina_start_1.png | Bin 158947 -> 166720 bytes
6 files changed, 63 insertions(+), 105 deletions(-)
diff --git a/webapps/docs/architecture/startup/1_overview.plantuml
b/webapps/docs/architecture/startup/1_overview.plantuml
index fe7dcf58a0..749d2d4a3c 100644
--- a/webapps/docs/architecture/startup/1_overview.plantuml
+++ b/webapps/docs/architecture/startup/1_overview.plantuml
@@ -25,8 +25,7 @@ Bootstrap -->> Catalina ** : newInstance()
Bootstrap -> Catalina ++: setParentClassLoader()
|||
-Bootstrap <<-- Catalina:
-deactivate Catalina
+return
Bootstrap -> Catalina ++: start()
@@ -46,53 +45,49 @@ note right of Digester
end note
Catalina -> Digester ++: parse()
-|||
Digester -->> Server ** :
-Catalina <<-- Digester:
-deactivate Digester
+return
-Catalina -->> Catalina:
-deactivate Catalina
+return
+|||
Catalina -> Catalina: initStream()
Catalina -> Server ++: init()
|||
-Catalina <<-- Server:
-deactivate Server
+return
-Catalina -->> Catalina:
-deactivate Catalina
+return
+|||
Catalina -> Server ++: start()
-Catalina <<-- Server:
-deactivate Server
+|||
+return
+|||
Catalina -> Catalina ++: await()
note right of Catalina
This is where Tomcat spends
time serving requests
end note
-Catalina -->> Catalina:
-deactivate Catalina
+return
+|||
Catalina -> Catalina ++: stop()
Catalina -> Server ++: stop()
-Catalina <<-- Server:
-deactivate Server
+|||
+return
Catalina -> Server ++: destroy()
-Catalina <<-- Server:
-deactivate Server
+|||
+return
-Catalina -->> Catalina:
-deactivate Catalina
+return
-Bootstrap <<-- Catalina:
-deactivate Catalina
+return
deactivate Bootstrap
@enduml
\ No newline at end of file
diff --git a/webapps/docs/architecture/startup/1_overview.png
b/webapps/docs/architecture/startup/1_overview.png
index b94efeef18..f014d7d9b8 100644
Binary files a/webapps/docs/architecture/startup/1_overview.png and
b/webapps/docs/architecture/startup/1_overview.png differ
diff --git a/webapps/docs/architecture/startup/2_catalina_init.plantuml
b/webapps/docs/architecture/startup/2_catalina_init.plantuml
index 6010e7b1e7..738dac0f69 100644
--- a/webapps/docs/architecture/startup/2_catalina_init.plantuml
+++ b/webapps/docs/architecture/startup/2_catalina_init.plantuml
@@ -27,14 +27,12 @@ Server -> Server: fireLifecycleEvent(\n
BEFORE_INIT_EVENT)
Server -> Server ++: initInternal()
Server -> "Global\nNaming\nResources" as GNR ++: init()
-
GNR -> GNR: fireLifecycleEvent(\n BEFORE_INIT_EVENT)
GNR -> GNR: initInternal()
GNR -> GNR: fireLifecycleEvent(\n AFTER_INIT_EVENT)
+return
-Server <<-- GNR
-deactivate GNR
-
+|||
Server -> "Service(s)" as Services ++: init()
Services -> Services: fireLifecycleEvent(\n BEFORE_INIT_EVENT)
@@ -42,32 +40,26 @@ Services -> Services: fireLifecycleEvent(\n
BEFORE_INIT_EVENT)
Services -> Services ++: initInternal()
Services -> Engine ++: init()
-
Engine -> Engine: fireLifecycleEvent(\n BEFORE_INIT_EVENT)
Engine -> Engine: initInternal()
Engine -> Engine: fireLifecycleEvent(\n AFTER_INIT_EVENT)
+return
-Services <<-- Engine
-deactivate Engine
-
+|||
Services -> "Executor(s)" as Executors ++: init()
-
Executors -> Executors: fireLifecycleEvent(\n BEFORE_INIT_EVENT)
Executors -> Executors: initInternal()
Executors -> Executors: fireLifecycleEvent(\n AFTER_INIT_EVENT)
+return
-Services <<-- Executors
-deactivate Executors
-
+|||
Services -> "Mapper\nListener" as MapperListener ++: init()
-
MapperListener -> MapperListener: fireLifecycleEvent(\n BEFORE_INIT_EVENT)
MapperListener -> MapperListener: initInternal()
MapperListener -> MapperListener: fireLifecycleEvent(\n AFTER_INIT_EVENT)
+return
-Services <<-- MapperListener
-deactivate MapperListener
-
+|||
Services -> "Connector(s)" as Connectors ++: init()
Connectors -> Connectors: fireLifecycleEvent(\n BEFORE_INIT_EVENT)
@@ -77,35 +69,29 @@ Connectors -> Connectors ++: initInternal()
Connectors -->> CoyoteAdapter **
Connectors -> Protocol ++: setAdapter()
-Connectors <<-- Protocol
-deactivate Protocol
+return
Connectors -> Protocol ++: init()
-Connectors <<-- Protocol
-deactivate Protocol
+return
-Connectors -->> Connectors
-deactivate Connectors
+return
+|||
Connectors -> Connectors: fireLifecycleEvent(\n AFTER_INIT_EVENT)
-Services <<-- Connectors
-deactivate Connectors
+return
-Services -->> Services
-deactivate Services
+return
+|||
Services -> Services: fireLifecycleEvent(\n AFTER_INIT_EVENT)
-Server <<-- Services
-deactivate Services
+return
-Server -->> Server
-deactivate Server
+return
+|||
Server -> Server: fireLifecycleEvent(\n AFTER_INIT_EVENT)
-Server -->> Catalina
-deactivate Server
-
+return
@enduml
\ No newline at end of file
diff --git a/webapps/docs/architecture/startup/2_catalina_init.png
b/webapps/docs/architecture/startup/2_catalina_init.png
index 55f9889a62..260ba1b914 100644
Binary files a/webapps/docs/architecture/startup/2_catalina_init.png and
b/webapps/docs/architecture/startup/2_catalina_init.png differ
diff --git a/webapps/docs/architecture/startup/3_catalina_start_1.plantuml
b/webapps/docs/architecture/startup/3_catalina_start_1.plantuml
index 1fe3659e6d..9140895973 100644
--- a/webapps/docs/architecture/startup/3_catalina_start_1.plantuml
+++ b/webapps/docs/architecture/startup/3_catalina_start_1.plantuml
@@ -37,14 +37,13 @@ GNR -> GNR ++: startInternal()
GNR -> GNR: fireLifecycleEvent(\n CONFIGURE_START_EVENT)
GNR -> GNR: fireLifecycleEvent(\n START_EVENT)
-GNR -->> GNR
-deactivate GNR
-
+return
+|||
GNR -> GNR: fireLifecycleEvent(\n AFTER_START_EVENT)
-Server <<-- GNR
-deactivate GNR
+return
+|||
Server -> "Service(s)" as Services ++: start()
Services -> Services: fireLifecycleEvent(\n BEFORE_START_EVENT)
@@ -61,79 +60,57 @@ Engine -> Engine ++: startInternal()
Engine -> Engine: fireLifecycleEvent(\n START_EVENT)
-Engine -->> Engine
-deactivate Engine
+return
+|||
Engine -> Engine: fireLifecycleEvent(\n AFTER_START_EVENT)
-Services <<-- Engine
-deactivate Engine
+return
+|||
Services -> "Executor(s)" as Executors ++: start()
-
Executors -> Executors: fireLifecycleEvent(\n BEFORE_START_EVENT)
-
Executors -> Executors ++: startInternal()
-
Executors -> Executors: fireLifecycleEvent(\n START_EVENT)
-
-Executors -->> Executors
-deactivate Executors
-
+return
+|||
Executors -> Executors: fireLifecycleEvent(\n AFTER_START_EVENT)
+return
-Services <<-- Executors
-deactivate Executors
-
+|||
Services -> "Mapper\nListener" as MapperListener ++: start()
-
MapperListener -> MapperListener: fireLifecycleEvent(\n BEFORE_START_EVENT)
-
MapperListener -> MapperListener ++: startInternal()
-
MapperListener -> MapperListener: fireLifecycleEvent(\n START_EVENT)
-
-MapperListener -->> MapperListener
-deactivate MapperListener
-
+return
+|||
MapperListener -> MapperListener: fireLifecycleEvent(\n AFTER_START_EVENT)
+return
-Services <<-- MapperListener
-deactivate MapperListener
-
+|||
Services -> "Connector(s)" as Connectors ++: start()
-
Connectors -> Connectors: fireLifecycleEvent(\n BEFORE_START_EVENT)
Connectors -> Connectors ++: startInternal()
-
Connectors -> Connectors: fireLifecycleEvent(\n START_EVENT)
-
Connectors -> Protocol ++: start()
-Connectors <<-- Protocol
-deactivate Protocol
-
-Connectors -->> Connectors
-deactivate Connectors
-
+return
+return
+|||
Connectors -> Connectors: fireLifecycleEvent(\n AFTER_INIT_EVENT)
-Services <<-- Connectors
-deactivate Connectors
+return
-Services -->> Services
-deactivate Services
+return
+|||
Services -> Services: fireLifecycleEvent(\n AFTER_START_EVENT)
-Server <<-- Services
-deactivate Services
+return
-Server -->> Server
-deactivate Server
+return
+|||
Server -> Server: fireLifecycleEvent(\n AFTER_START_EVENT)
-Server -->> Catalina
-deactivate Server
-
+return
@enduml
\ No newline at end of file
diff --git a/webapps/docs/architecture/startup/3_catalina_start_1.png
b/webapps/docs/architecture/startup/3_catalina_start_1.png
index b276e0e0c7..10e717112b 100644
Binary files a/webapps/docs/architecture/startup/3_catalina_start_1.png and
b/webapps/docs/architecture/startup/3_catalina_start_1.png differ
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
