diff --git a/doc/uml/class-diagram-technical.puml b/doc/uml/class-diagram-technical.puml index 7bbb0aa1..8bac5341 100644 --- a/doc/uml/class-diagram-technical.puml +++ b/doc/uml/class-diagram-technical.puml @@ -1,7 +1,7 @@ @startuml skinparam package { - BackgroundColor #dddddd + BackgroundColor #efefef BorderColor #a0a0a0 BackgroundColor<
> gold BorderColor black @@ -11,8 +11,8 @@ skinparam package { } skinparam class { - BackgroundColor #4AD386 - BorderColor #a0a0a0 + BackgroundColor #white + BorderColor #f4f4f4 BackgroundColor<
> gold BorderColor black ArrowColor black @@ -40,10 +40,20 @@ package java.util { interface Observer <> { +update() {abstract} } - } + +note "Package" as Package +note "Subpackage" as Subpackage +note "Klasse" as Class +note "Interface" as Interface +note "Vererbung" as Vererbung +note "Implementierung" as Implementierung +note "gerichtete Assoziation" as Assoziation +note "generischen Typ binden" as Generics +note "gerichtete Abhängigkeit" as Dependency + class ConcreteObservable { - -state: State + -concreteState: State +getState(): State +setState(s: State) } @@ -52,13 +62,72 @@ Observable <|-- ConcreteObservable hide interface fields -class ConcreteObserver { +abstract class AbstractObserver < T extends Observer > { +update() + #handleUpdate(o: Observer) {abstract} } +class ConcreteObserver { + #handleUpdate(o: Observer) +} + +class StringUtils { + +isEmpty(value: String) {static} +} + +note right of ConcreteObservable::concreteState + Objektvariable + vom Typ State +end note + +note right of ConcreteObservable::getState + Methode mit + Rückgabetyp State +end note + +note right of ConcreteObservable::setState + Methode mit + Parametertyp State +end note + + Observable o- Observer : \t\t -Observer <|.. ConcreteObserver -ConcreteObservable <- ConcreteObserver : \t\t\t +Observer <|.. AbstractObserver +AbstractObserver <|-- ConcreteObserver : <> \n ConcreteObserver> +ConcreteObservable <-left- ConcreteObserver : \t\t + +java .up. Package +util .up. Subpackage +Observable .up. Class +Observable .. Vererbung +ConcreteObservable .up. Vererbung +Observer .up. Interface + +Observer .down. Implementierung +AbstractObserver .up. Implementierung + +ConcreteObserver .down. Assoziation +ConcreteObservable .down. Assoziation +ConcreteObservable .down.> StringUtils : <> + +ConcreteObserver .up. Generics +AbstractObserver .down. Generics + +ConcreteObservable .down. Dependency +StringUtils .up. Dependency + +note right of StringUtils::isEmpty + statische Methode +end note + +note as floating + Sichtbarkeiten + + + public + # protected + ~ package private + - private +end note @enduml diff --git a/doc/uml/component-diagram.puml b/doc/uml/component-diagram-details.puml similarity index 93% rename from doc/uml/component-diagram.puml rename to doc/uml/component-diagram-details.puml index 7dc83cb1..6212ff5e 100644 --- a/doc/uml/component-diagram.puml +++ b/doc/uml/component-diagram-details.puml @@ -12,7 +12,7 @@ skinparam component { } skinparam package { - BackgroundColor #dddddd + BackgroundColor #e4e4e4 BorderColor #a0a0a0 BackgroundColor<
> gold BorderColor black @@ -22,7 +22,7 @@ skinparam package { } skinparam class { - BackgroundColor #4AD386 + BackgroundColor #f4f4f4 BorderColor #a0a0a0 BackgroundColor<
> gold BorderColor black @@ -57,7 +57,7 @@ component "Anwendung" <> as anwendung { component "Fachkomponente" <> as fachkomponente { } -component "org.apache.commons:commons-lang3" <> as library { +component " org.apache.commons:commons-lang3 " <> as library { artifact commons-lang3-3.12.jar <> as lang { } } diff --git a/doc/uml/component-diagram-overview.puml b/doc/uml/component-diagram-overview.puml new file mode 100644 index 00000000..8e72b363 --- /dev/null +++ b/doc/uml/component-diagram-overview.puml @@ -0,0 +1,70 @@ +@startuml + +skinparam component { + BackgroundColor #f8f8f8 + BorderColor #a0a0a0 + BackgroundColor<
> #FFFF00 + BorderColor black + FontName Arial Unicode MS + FontSize 20 + ArrowFontName Arial Unicode MS + ArrowFontSize 18 +} + +skinparam classFontSize 24 +skinparam classAttributeIconSize 0 +skinparam defaultFontSize 20 + +skinparam ArrowColor black +skinparam ArrowThickness 2 + +hide circle + +skinparam componentStyle uml2 + +component "Anwendung" <> as anwendung { + artifact anwendung-1.0.0.war <> as war { + } +} + +component "Fachkomponente" <> as fachkomponente { + artifact fachlogik-1.0.0.jar <> as jar { + } +} + +component " org.apache.commons:commons-lang3 " <> as library { + artifact commons-lang3-3.12.jar <> as lang { + } +} + +anwendung .up.> library : " <>" + +note "Artefakt" as artefact +note "Komponente" as component +note "Schnittstelle" as schnittstelle +note "Implementierung" as Implementierung +note "Aufruf" as Use +note "gerichtete Abhängigkeit" as Dependency + +circle " \t\t\t Fassade " as fassade +circle "RestApi " as api + + +anwendung ..> fassade : " <>" +fassade -- fachkomponente + +anwendung .down. Use +fassade .up. Use + +api .up. schnittstelle +library .up. component +lang .left. artefact + +anwendung -up- api : " " +api .down. Implementierung +anwendung .right. Implementierung + +anwendung .up. Dependency +library .down. Dependency + +@enduml diff --git a/doc/uml/deployment-diagram.puml b/doc/uml/deployment-diagram.puml index 640117fa..0a21eeb3 100644 --- a/doc/uml/deployment-diagram.puml +++ b/doc/uml/deployment-diagram.puml @@ -10,19 +10,15 @@ skinparam componentStyle uml2 skinparam ArrowColor black skinparam node { - BackgroundColor #C6C6C6 + BackgroundColor #f4f4f4 BorderColor #a0a0a0 BackgroundColor<
> gold BorderColor black } skinparam artifact { - BackgroundColor #3E46D9 - StereotypeFontColor #white - FontColor #white + BackgroundColor #e4e4e4 BorderColor #a0a0a0 - BackgroundColor<
> gold - BorderColor #white ArrowColor black FontName Arial Unicode MS FontSize 20 @@ -40,24 +36,33 @@ node ":MacBook" <> { } } + P ..> EI P ..> DI node ":Server" <> { - node ":Ubuntu 22.4" <> { - node ":Docker 20.10.16" <> { - node ":Java VM Temurin-11.0.15+10" <> { node ":Jetty 9.4.45" <> { artifact Warnings <> as W artifact Jenkins.Core <> as C - artifact Echarts.API <> as E - artifact DataTables.API <> as D } } C <. W -W ..> E -W ..> D -W - P : \t\t\t +":Server" -down- ":MacBook" : " <>" + +note "Artefakt" as artifact +note "Kommunikationspfad\nmit Protokoll" as channel +note "Device" as device +note "Execution Environment" as env + +":Server" .up. device +":Safari 15.4" .down. env + +":Server" .. channel +":MacBook" .. channel + +W .right. artifact + + @enduml diff --git a/doc/uml/sequence-diagram.puml b/doc/uml/sequence-diagram.puml index 0db2bbbe..f16d521c 100644 --- a/doc/uml/sequence-diagram.puml +++ b/doc/uml/sequence-diagram.puml @@ -14,12 +14,12 @@ skinparam sequence { LifeLineBorderColor black LifeLineBackgroundColor AE396 - ParticipantBackgroundColor 4AD386 + ParticipantBackgroundColor f4f4f4 ParticipantBorderColor black } skinparam actor { - BackgroundColor #4AD386 + BackgroundColor #f4f4f4 BorderColor #a0a0a0 BackgroundColor<
> gold BorderColor black