diff --git a/tweed5-attributes-extension/src/main/java/de/siphalor/tweed5/attributesextension/api/AttributesExtension.java b/tweed5-attributes-extension/src/main/java/de/siphalor/tweed5/attributesextension/api/AttributesExtension.java index 052ed1e..bbf10e0 100644 --- a/tweed5-attributes-extension/src/main/java/de/siphalor/tweed5/attributesextension/api/AttributesExtension.java +++ b/tweed5-attributes-extension/src/main/java/de/siphalor/tweed5/attributesextension/api/AttributesExtension.java @@ -11,6 +11,11 @@ import java.util.function.Consumer; public interface AttributesExtension extends TweedExtension { Class DEFAULT = AttributesExtensionImpl.class; + String EXTENSION_ID = "attributes"; + + default String getId() { + return EXTENSION_ID; + } static > Consumer attribute(String key, String value) { return entry -> entry.container().extension(AttributesExtension.class) diff --git a/tweed5-attributes-extension/src/main/java/de/siphalor/tweed5/attributesextension/api/serde/filter/AttributesReadWriteFilterExtension.java b/tweed5-attributes-extension/src/main/java/de/siphalor/tweed5/attributesextension/api/serde/filter/AttributesReadWriteFilterExtension.java index 4051487..49ab903 100644 --- a/tweed5-attributes-extension/src/main/java/de/siphalor/tweed5/attributesextension/api/serde/filter/AttributesReadWriteFilterExtension.java +++ b/tweed5-attributes-extension/src/main/java/de/siphalor/tweed5/attributesextension/api/serde/filter/AttributesReadWriteFilterExtension.java @@ -6,6 +6,11 @@ import de.siphalor.tweed5.patchwork.api.Patchwork; public interface AttributesReadWriteFilterExtension extends TweedExtension { Class DEFAULT = AttributesReadWriteFilterExtensionImpl.class; + String EXTENSION_ID = "attributes-read-write-filter"; + + default String getId() { + return EXTENSION_ID; + } void markAttributeForFiltering(String key); diff --git a/tweed5-attributes-extension/src/main/java/de/siphalor/tweed5/attributesextension/impl/AttributesExtensionImpl.java b/tweed5-attributes-extension/src/main/java/de/siphalor/tweed5/attributesextension/impl/AttributesExtensionImpl.java index 93e65f2..497a8d7 100644 --- a/tweed5-attributes-extension/src/main/java/de/siphalor/tweed5/attributesextension/impl/AttributesExtensionImpl.java +++ b/tweed5-attributes-extension/src/main/java/de/siphalor/tweed5/attributesextension/impl/AttributesExtensionImpl.java @@ -26,11 +26,6 @@ public class AttributesExtensionImpl implements AttributesExtension { this.dataAccess = setupContext.registerEntryExtensionData(CustomEntryData.class); } - @Override - public String getId() { - return "attributes"; - } - @Override public void setAttribute(ConfigEntry entry, String key, List values) { requireEditable(); diff --git a/tweed5-attributes-extension/src/main/java/de/siphalor/tweed5/attributesextension/impl/serde/filter/AttributesReadWriteFilterExtensionImpl.java b/tweed5-attributes-extension/src/main/java/de/siphalor/tweed5/attributesextension/impl/serde/filter/AttributesReadWriteFilterExtensionImpl.java index 834a40f..5accf27 100644 --- a/tweed5-attributes-extension/src/main/java/de/siphalor/tweed5/attributesextension/impl/serde/filter/AttributesReadWriteFilterExtensionImpl.java +++ b/tweed5-attributes-extension/src/main/java/de/siphalor/tweed5/attributesextension/impl/serde/filter/AttributesReadWriteFilterExtensionImpl.java @@ -15,7 +15,6 @@ import de.siphalor.tweed5.data.extension.api.TweedEntryWriter; import de.siphalor.tweed5.data.extension.api.TweedReadContext; import de.siphalor.tweed5.data.extension.api.extension.ReadWriteExtensionSetupContext; import de.siphalor.tweed5.data.extension.api.extension.ReadWriteRelatedExtension; -import de.siphalor.tweed5.data.extension.api.readwrite.TweedEntryReaderWriters; import de.siphalor.tweed5.data.extension.impl.TweedEntryReaderWriterImpls; import de.siphalor.tweed5.dataapi.api.DelegatingTweedDataVisitor; import de.siphalor.tweed5.dataapi.api.TweedDataReader; @@ -25,7 +24,10 @@ import de.siphalor.tweed5.dataapi.api.decoration.TweedDataDecoration; import de.siphalor.tweed5.patchwork.api.Patchwork; import de.siphalor.tweed5.patchwork.api.PatchworkPartAccess; import de.siphalor.tweed5.utils.api.UniqueSymbol; -import lombok.*; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import lombok.Setter; +import lombok.var; import org.jspecify.annotations.NonNull; import org.jspecify.annotations.Nullable; @@ -33,7 +35,6 @@ import java.util.*; public class AttributesReadWriteFilterExtensionImpl implements AttributesReadWriteFilterExtension, AttributesRelatedExtension, ReadWriteRelatedExtension { - private static final String ID = "attributes-serde-filter"; private static final Set MIDDLEWARES_MUST_COME_BEFORE = new HashSet<>(Arrays.asList( Middleware.DEFAULT_START, "validation" @@ -53,11 +54,6 @@ public class AttributesReadWriteFilterExtensionImpl entryDataAccess = setupContext.registerEntryExtensionData(EntryCustomData.class); } - @Override - public String getId() { - return ID; - } - @Override public void setupReadWriteExtension(ReadWriteExtensionSetupContext context) { readWriteContextDataAccess = context.registerReadWriteContextExtensionData(ReadWriteContextCustomData.class); @@ -178,7 +174,7 @@ public class AttributesReadWriteFilterExtensionImpl private class ReaderMiddleware implements Middleware> { @Override public String id() { - return ID; + return EXTENSION_ID; } @Override @@ -220,7 +216,7 @@ public class AttributesReadWriteFilterExtensionImpl private class WriterMiddleware implements Middleware> { @Override public String id() { - return ID; + return EXTENSION_ID; } @Override diff --git a/tweed5-default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/comment/api/CommentExtension.java b/tweed5-default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/comment/api/CommentExtension.java index 8032875..9e11d40 100644 --- a/tweed5-default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/comment/api/CommentExtension.java +++ b/tweed5-default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/comment/api/CommentExtension.java @@ -9,6 +9,7 @@ import java.util.function.Consumer; public interface CommentExtension extends TweedExtension { Class DEFAULT = CommentExtensionImpl.class; + String EXTENSION_ID = "comment"; static > Consumer baseComment(String baseComment) { return entry -> { diff --git a/tweed5-default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/comment/impl/CommentExtensionImpl.java b/tweed5-default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/comment/impl/CommentExtensionImpl.java index 57c5899..28b2492 100644 --- a/tweed5-default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/comment/impl/CommentExtensionImpl.java +++ b/tweed5-default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/comment/impl/CommentExtensionImpl.java @@ -34,7 +34,7 @@ public class CommentExtensionImpl implements ReadWriteRelatedExtension, CommentE @Override public String getId() { - return "comment"; + return EXTENSION_ID; } @Override diff --git a/tweed5-default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/pather/api/PatherExtension.java b/tweed5-default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/pather/api/PatherExtension.java index c523f21..578d9b6 100644 --- a/tweed5-default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/pather/api/PatherExtension.java +++ b/tweed5-default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/pather/api/PatherExtension.java @@ -7,6 +7,12 @@ import de.siphalor.tweed5.defaultextensions.pather.impl.PatherExtensionImpl; public interface PatherExtension extends TweedExtension { Class DEFAULT = PatherExtensionImpl.class; + String EXTENSION_ID = "pather"; + + @Override + default String getId() { + return EXTENSION_ID; + } String getPath(TweedReadContext context); String getPath(TweedWriteContext context); diff --git a/tweed5-default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/pather/impl/PatherExtensionImpl.java b/tweed5-default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/pather/impl/PatherExtensionImpl.java index abdac95..e8d3a15 100644 --- a/tweed5-default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/pather/impl/PatherExtensionImpl.java +++ b/tweed5-default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/pather/impl/PatherExtensionImpl.java @@ -2,7 +2,6 @@ package de.siphalor.tweed5.defaultextensions.pather.impl; import com.google.auto.service.AutoService; import de.siphalor.tweed5.core.api.entry.ConfigEntry; -import de.siphalor.tweed5.core.api.extension.TweedExtension; import de.siphalor.tweed5.core.api.middleware.Middleware; import de.siphalor.tweed5.data.extension.api.*; import de.siphalor.tweed5.data.extension.api.extension.ReadWriteExtensionSetupContext; @@ -20,16 +19,9 @@ import org.jspecify.annotations.NonNull; import org.jspecify.annotations.Nullable; @AutoService(PatherExtension.class) -public class PatherExtensionImpl implements PatherExtension, TweedExtension, ReadWriteRelatedExtension { - private static final String PATHER_ID = "pather"; - +public class PatherExtensionImpl implements PatherExtension, ReadWriteRelatedExtension { private @Nullable PatchworkPartAccess rwContextPathTrackingAccess; - @Override - public String getId() { - return PATHER_ID; - } - @Override public void setupReadWriteExtension(ReadWriteExtensionSetupContext context) { rwContextPathTrackingAccess = context.registerReadWriteContextExtensionData(PathTracking.class); @@ -63,7 +55,7 @@ public class PatherExtensionImpl implements PatherExtension, TweedExtension, Rea return new Middleware>() { @Override public String id() { - return PATHER_ID; + return EXTENSION_ID; } @Override @@ -105,7 +97,7 @@ public class PatherExtensionImpl implements PatherExtension, TweedExtension, Rea return new Middleware>() { @Override public String id() { - return PATHER_ID; + return EXTENSION_ID; } @Override diff --git a/tweed5-default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/validation/api/ValidationExtension.java b/tweed5-default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/validation/api/ValidationExtension.java index af241bb..c6dcfc3 100644 --- a/tweed5-default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/validation/api/ValidationExtension.java +++ b/tweed5-default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/validation/api/ValidationExtension.java @@ -16,6 +16,12 @@ import java.util.function.Function; public interface ValidationExtension extends TweedExtension { Class DEFAULT = ValidationExtensionImpl.class; + String EXTENSION_ID = "validation"; + + @Override + default String getId() { + return EXTENSION_ID; + } static , T> Consumer validators(ConfigEntryValidator... validators) { return entry -> { diff --git a/tweed5-default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/validation/impl/ValidationExtensionImpl.java b/tweed5-default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/validation/impl/ValidationExtensionImpl.java index a3b61f7..ac1fc2e 100644 --- a/tweed5-default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/validation/impl/ValidationExtensionImpl.java +++ b/tweed5-default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/validation/impl/ValidationExtensionImpl.java @@ -79,11 +79,6 @@ public class ValidationExtensionImpl implements ReadWriteRelatedExtension, Valid context.registerExtension(PatherExtension.class); } - @Override - public String getId() { - return "validation"; - } - @Override public void extensionsFinalized() { for (TweedExtension extension : configContainer.extensions()) { @@ -104,7 +99,7 @@ public class ValidationExtensionImpl implements ReadWriteRelatedExtension, Valid return new Middleware() { @Override public String id() { - return "validation"; + return EXTENSION_ID; } @Override @@ -205,12 +200,12 @@ public class ValidationExtensionImpl implements ReadWriteRelatedExtension, Valid private class EntryValidationReaderMiddleware implements Middleware> { @Override public String id() { - return "validation"; + return EXTENSION_ID; } @Override public Set mustComeAfter() { - return Collections.singleton("pather"); + return Collections.singleton(PatherExtension.EXTENSION_ID); } @Override diff --git a/tweed5-default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/validationfallback/api/ValidationFallbackExtension.java b/tweed5-default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/validationfallback/api/ValidationFallbackExtension.java index b0553f0..d5fd857 100644 --- a/tweed5-default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/validationfallback/api/ValidationFallbackExtension.java +++ b/tweed5-default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/validationfallback/api/ValidationFallbackExtension.java @@ -8,6 +8,12 @@ import java.util.function.Consumer; public interface ValidationFallbackExtension extends TweedExtension { Class DEFAULT = ValidationFallbackExtensionImpl.class; + String EXTENSION_ID = "validation-fallback"; + + @Override + default String getId() { + return EXTENSION_ID; + } static , T> Consumer validationFallbackValue(T value) { return entry -> { diff --git a/tweed5-default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/validationfallback/impl/ValidationFallbackExtensionImpl.java b/tweed5-default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/validationfallback/impl/ValidationFallbackExtensionImpl.java index 5f515ca..fbf51c4 100644 --- a/tweed5-default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/validationfallback/impl/ValidationFallbackExtensionImpl.java +++ b/tweed5-default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/validationfallback/impl/ValidationFallbackExtensionImpl.java @@ -28,11 +28,6 @@ public class ValidationFallbackExtensionImpl implements ValidationFallbackExtens customEntryDataAccess = context.registerEntryExtensionData(CustomEntryData.class); } - @Override - public String getId() { - return "validation-fallback"; - } - @Override public void setFallbackValue(ConfigEntry entry, T value) { getOrCreateCustomEntryData(entry).fallbackValue(value); @@ -60,7 +55,7 @@ public class ValidationFallbackExtensionImpl implements ValidationFallbackExtens private class ValidationFallbackMiddleware implements Middleware { @Override public String id() { - return "validation-fallback"; + return EXTENSION_ID; } @Override diff --git a/tweed5-serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/ReadWriteExtension.java b/tweed5-serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/ReadWriteExtension.java index 4b5ac87..e40a906 100644 --- a/tweed5-serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/ReadWriteExtension.java +++ b/tweed5-serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/ReadWriteExtension.java @@ -14,6 +14,12 @@ import java.util.function.Function; public interface ReadWriteExtension extends TweedExtension { Class DEFAULT = ReadWriteExtensionImpl.class; + String EXTENSION_ID = "read-write"; + + @Override + default String getId() { + return EXTENSION_ID; + } static Consumer> entryReaderWriter( TweedEntryReaderWriter> entryReaderWriter diff --git a/tweed5-serde-extension/src/main/java/de/siphalor/tweed5/data/extension/impl/ReadWriteExtensionImpl.java b/tweed5-serde-extension/src/main/java/de/siphalor/tweed5/data/extension/impl/ReadWriteExtensionImpl.java index 1f8a303..c3e64b6 100644 --- a/tweed5-serde-extension/src/main/java/de/siphalor/tweed5/data/extension/impl/ReadWriteExtensionImpl.java +++ b/tweed5-serde-extension/src/main/java/de/siphalor/tweed5/data/extension/impl/ReadWriteExtensionImpl.java @@ -38,11 +38,6 @@ public class ReadWriteExtensionImpl implements ReadWriteExtension { this.customEntryDataAccess = context.registerEntryExtensionData(CustomEntryData.class); } - @Override - public String getId() { - return "read-write"; - } - @Override public void extensionsFinalized() { Collection extensions = configContainer.extensions();