Siphalor/tweed5
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects 1 Releases Wiki Activity

refactor!: Invert middleware application order

Browse Source 
The previous ordering was pretty confusing and even led to a mess-up in the serde validation.
This commit is contained in:
Siphalor
2025-12-17 23:55:57 +01:00
parent e83d87b606
commit c71a01452d
5 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tweed5/attributes-extension/src/main/java/de/siphalor/tweed5/attributesextension/impl/serde/filter/AttributesReadWriteFilterExtensionImpl.java
View File

@@ -31,11 +31,11 @@ import java.util.*;
public class AttributesReadWriteFilterExtensionImpl public class AttributesReadWriteFilterExtensionImpl
implements AttributesReadWriteFilterExtension, AttributesRelatedExtension, ReadWriteRelatedExtension { implements AttributesReadWriteFilterExtension, AttributesRelatedExtension, ReadWriteRelatedExtension {
private static final Set<String> MIDDLEWARES_MUST_COME_BEFORE = Collections.emptySet(); private static final Set<String> MIDDLEWARES_MUST_COME_BEFORE = new HashSet<>(Arrays.asList(
private static final Set<String> MIDDLEWARES_MUST_COME_AFTER = new HashSet<>(Arrays.asList( Middleware.DEFAULT_START,
Middleware.DEFAULT_END,
"validation" "validation"
)); ));
private static final Set<String> MIDDLEWARES_MUST_COME_AFTER = Collections.emptySet();
private static final UniqueSymbol TWEED_DATA_NOTHING_VALUE = new UniqueSymbol("nothing (skip value)"); private static final UniqueSymbol TWEED_DATA_NOTHING_VALUE = new UniqueSymbol("nothing (skip value)");
private final ConfigContainer<?> configContainer; private final ConfigContainer<?> configContainer;

4
tweed5/comment-loader-extension/src/main/java/de/siphalor/tweed5/commentloaderextension/impl/CommentLoaderExtensionImpl.java
View File

@@ -53,12 +53,12 @@ public class CommentLoaderExtensionImpl implements CommentLoaderExtension, Comme
@Override @Override
public Set<String> mustComeBefore() { public Set<String> mustComeBefore() {
return Collections.singleton(Middleware.DEFAULT_START); return Collections.emptySet();
} }
@Override @Override
public Set<String> mustComeAfter() { public Set<String> mustComeAfter() {
return Collections.emptySet(); return Collections.singleton(Middleware.DEFAULT_END);
} }
@Override @Override

3
tweed5/core/src/main/java/de/siphalor/tweed5/core/api/middleware/DefaultMiddlewareContainer.java
View File

@@ -112,7 +112,8 @@ public class DefaultMiddlewareContainer<M> implements MiddlewareContainer<M> {
throw new IllegalStateException("Middleware container has not been sealed"); throw new IllegalStateException("Middleware container has not been sealed");
} }
M combined = inner; M combined = inner;
for (Middleware<M> middleware : middlewares) { for (int i = middlewares.size() - 1; i >= 0; i--) {
Middleware<M> middleware = middlewares.get(i);
combined = middleware.process(combined); combined = middleware.process(combined);
} }
return combined; return combined;

8
tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/validation/api/validators/SimpleValidatorMiddleware.java
View File

@@ -19,7 +19,7 @@ public class SimpleValidatorMiddleware implements Middleware<ConfigEntryValidato
return new ConfigEntryValidator() { return new ConfigEntryValidator() {
@Override @Override
public <T extends @Nullable Object> ValidationResult<T> validate(ConfigEntry<T> configEntry, T value) { public <T extends @Nullable Object> ValidationResult<T> validate(ConfigEntry<T> configEntry, T value) {
return inner.validate(configEntry, value).andThen(v -> validator.validate(configEntry, v)); return validator.validate(configEntry, value).andThen(v -> inner.validate(configEntry, v));
} }
@Override @Override
@@ -28,7 +28,11 @@ public class SimpleValidatorMiddleware implements Middleware<ConfigEntryValidato
if (description.isEmpty()) { if (description.isEmpty()) {
return inner.description(configEntry); return inner.description(configEntry);
} }
return inner.description(configEntry) + "\n" + description; String innerDescription = inner.description(configEntry);
if (innerDescription.isEmpty()) {
return description;
}
return description + "\n" + innerDescription;
} }
}; };
} }

4
tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/validationfallback/impl/ValidationFallbackExtensionImpl.java
View File

@@ -74,12 +74,12 @@ public class ValidationFallbackExtensionImpl implements ValidationFallbackExtens
@Override @Override
public Set<String> mustComeBefore() { public Set<String> mustComeBefore() {
return Collections.emptySet(); return Collections.singleton(Middleware.DEFAULT_START);
} }
@Override @Override
public Set<String> mustComeAfter() { public Set<String> mustComeAfter() {
return Collections.singleton("$default.end"); return Collections.emptySet();
} }
@Override @Override