From 654815c6a059249a9334225e889f1a266a8270e9 Mon Sep 17 00:00:00 2001 From: Michael Hoennig Date: Tue, 16 Jul 2024 10:31:51 +0200 Subject: [PATCH] amendments after code-review --- doc/hs-hosting-asset-type-structure.md | 14 +++++++++++++- .../hs/booking/item/HsBookingItemType.java | 2 +- .../hs/hosting/asset/HsHostingAssetType.java | 2 +- .../asset/HsHostingAssetControllerRestTest.java | 4 ++-- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/doc/hs-hosting-asset-type-structure.md b/doc/hs-hosting-asset-type-structure.md index a64e2ff0..5fec7cff 100644 --- a/doc/hs-hosting-asset-type-structure.md +++ b/doc/hs-hosting-asset-type-structure.md @@ -1,7 +1,7 @@ ## HostingAsset Type Structure -### Webspace+Server +### Server+Webspace ```plantuml @startuml @@ -22,6 +22,12 @@ package Hosting #feb28c{ entity HA_IPV6_NUMBER } + package Webspace #99bcdb { + entity HA_MANAGED_WEBSPACE + entity HA_UNIX_USER + entity HA_EMAIL_ALIAS + } + } BI_CLOUD_SERVER *--> BI_PRIVATE_CLOUD @@ -30,10 +36,16 @@ BI_MANAGED_WEBSPACE *--> BI_MANAGED_SERVER HA_CLOUD_SERVER *==> BI_CLOUD_SERVER HA_MANAGED_SERVER *==> BI_MANAGED_SERVER +HA_MANAGED_WEBSPACE *==> BI_MANAGED_WEBSPACE +HA_MANAGED_WEBSPACE o..> HA_MANAGED_SERVER +HA_UNIX_USER *==> HA_MANAGED_WEBSPACE +HA_EMAIL_ALIAS *==> HA_MANAGED_WEBSPACE HA_IPV4_NUMBER o..> HA_CLOUD_SERVER HA_IPV4_NUMBER o..> HA_MANAGED_SERVER +HA_IPV4_NUMBER o..> HA_MANAGED_WEBSPACE HA_IPV6_NUMBER o..> HA_CLOUD_SERVER HA_IPV6_NUMBER o..> HA_MANAGED_SERVER +HA_IPV6_NUMBER o..> HA_MANAGED_WEBSPACE package Legend #white { SUB_ENTITY1 *--> REQUIRED_PARENT_ENTITY diff --git a/src/main/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemType.java b/src/main/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemType.java index 9defc478..eee5c1eb 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemType.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemType.java @@ -30,7 +30,7 @@ public enum HsBookingItemType implements Node { @Override public boolean belongsToAny(final Set groups) { - return true; + return true; // we currently do not filter booking item types } @Override diff --git a/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetType.java b/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetType.java index de7f937b..747133d4 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetType.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetType.java @@ -316,7 +316,7 @@ public enum HsHostingAssetType implements Node { .collect(toSet())); markdown - .append(renderAsPlantUML("Webspace+Server", Set.of("Server"))) + .append(renderAsPlantUML("Server+Webspace", Set.of("Server", "Webspace"))) .append(renderAsPlantUML("Domain", Set.of("Domain", "Webspace"))) .append(renderAsPlantUML("MariaDB", Set.of("MariaDB", "Webspace"))) .append(renderAsPlantUML("PostgreSQL", Set.of("PostgreSQL", "Webspace"))); diff --git a/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetControllerRestTest.java b/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetControllerRestTest.java index 3faaed22..f20006c2 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetControllerRestTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetControllerRestTest.java @@ -511,7 +511,7 @@ public class HsHostingAssetControllerRestTest { IPV6_NUMBER( List.of( HsHostingAssetEntity.builder() - .type(HsHostingAssetType.IPV4_NUMBER) + .type(HsHostingAssetType.IPV6_NUMBER) .assignedToAsset(TEST_MANAGED_SERVER_HOSTING_ASSET) .identifier("2001:db8:3333:4444:5555:6666:7777:8888") .caption("some fake IPv6 number") @@ -519,7 +519,7 @@ public class HsHostingAssetControllerRestTest { """ [ { - "type": "IPV4_NUMBER", + "type": "IPV6_NUMBER", "identifier": "2001:db8:3333:4444:5555:6666:7777:8888", "caption": "some fake IPv6 number", "alarmContact": null,