hostsharing/hs.hsadmin.ng
6
0
Fork 0
Code Pull Requests 4 Activity

test deep patch into properties and fix typing while patching array properties #99

Merged
hsh-michaelhoennig merged 3 commits from test-deep-patch-into-properties into master 2024-09-11 18:16:50 +02:00
Conversation 0 Commits 3 Files Changed 6 +6 -3
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6ed179951e - Show all commits

8
src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsDomainSetupHostingAssetValidator.java
View File

@ -26,9 +26,11 @@ class HsDomainSetupHostingAssetValidator extends HostingAssetEntityValidator {
@Override
public List<String> validateEntity(final HsHostingAsset assetEntity) {
final var violations = // new ArrayList<String>();
super.validateEntity(assetEntity);
if (!violations.isEmpty()) {
final var violations = super.validateEntity(assetEntity);
if (!violations.isEmpty() || assetEntity.isLoaded()) {
// it makes no sense to do DNS-based validation
// if the entity is already persisted or
// if the identifier (domain name) or structure is already invalid
return violations;
}

1
src/test/java/net/hostsharing/hsadminng/hs/migration/ImportHostingAssets.java
View File

@ -1450,6 +1450,7 @@ public class ImportHostingAssets extends BaseOfficeDataImport {
// nothing here
))
.build();
domainSetupAsset.markAsLoaded(); // to skip setup verification
domainSetupsByName.put(domain_name, domainSetupAsset);
domainSetupAssets.put(domain_id, domainSetupAsset);
domainSetupAsset.setSubHostingAssets(new ArrayList<>());