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

still a bit hacky, but now working generically

Browse Source
This commit is contained in:
Michael Hoennig 2024-06-25 17:50:54 +02:00
parent 680b67f162
commit 6318497294
4 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsHostingAssetEntityValidatorRegistry.java
View File

@ -52,12 +52,16 @@ public class HsHostingAssetEntityValidatorRegistry {
public static void cleanup(final HsHostingAssetEntity entity, final HsHostingAssetResource resource) {
final var validator = HsHostingAssetEntityValidatorRegistry.forType(entity.getType());
// final var validated = validator.cleanup(hostingAsset);
//validator.cleanup()
final var config = new HashMap<>((Map<String, Object>) resource.getConfig());
config.remove("password"); // FIXME
config.remove("totpKey"); // FIXME
final var config = validator.cleanup(asMap(resource));
resource.setConfig(config);
}
@SuppressWarnings("unchecked")
private static Map<String, Object> asMap(final HsHostingAssetResource resource) {
if (resource.getConfig() instanceof Map map) {
return map;
}
throw new IllegalArgumentException("expected a Map, but got a " + resource.getConfig().getClass());
}
}

7
src/main/java/net/hostsharing/hsadminng/hs/validation/HsEntityValidator.java
View File

@ -3,6 +3,7 @@ package net.hostsharing.hsadminng.hs.validation;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Supplier;
@ -86,4 +87,10 @@ public abstract class HsEntityValidator<E> {
}
throw new IllegalArgumentException("Integer value (or null) expected, but got " + value);
}
public Map<String, Object> cleanup(final Map<String, Object> config) {
final var copy = new HashMap<>(config);
stream(propertyValidators).filter(p -> p.writeOnly).forEach(p -> copy.remove(p.propertyName));
return copy;
}
}

14
src/main/java/net/hostsharing/hsadminng/hs/validation/StringProperty.java
View File

@ -17,8 +17,6 @@ public class StringProperty extends ValidatableProperty<String> {
private Pattern regExPattern;
private Integer minLength;
private Integer maxLength;
private boolean writeOnly;
private boolean readOnly;
private boolean hidden;
protected StringProperty(final String propertyName) {
@ -49,18 +47,6 @@ public class StringProperty extends ValidatableProperty<String> {
return this;
}
public StringProperty writeOnly() {
this.writeOnly = true;
super.optional();
return this;
}
public StringProperty readOnly() {
this.readOnly = true;
super.optional();
return this;
}
@Override
protected void validate(final List<String> result, final String propValue, final PropertiesProvider propProvider) {
if (minLength != null && propValue.length()<minLength) {

17
src/main/java/net/hostsharing/hsadminng/hs/validation/ValidatableProperty.java
View File

@ -32,6 +32,9 @@ public abstract class ValidatableProperty<T> {
private final String[] keyOrder;
private Boolean required;
private T defaultValue;
protected boolean readOnly;
protected boolean writeOnly;
protected Function<ValidatableProperty<?>[], T[]> deferredInit;
private boolean isTotalsValidator = false;
@JsonIgnore
@ -43,6 +46,20 @@ public abstract class ValidatableProperty<T> {
return null;
}
public ValidatableProperty<T> writeOnly() {
this.writeOnly = true;
optional();
return this;
}
public ValidatableProperty<T> readOnly() {
this.readOnly = true;
optional();
return this;
}
public ValidatableProperty<T> required() {
required = TRUE;
return this;