refactor!(serde-*): Repackaged all serde modules

CHANGELOG.md

@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 - **Breaking**@`core`: Refactored type hierarchy and methods of `StructuredConfigEntry`.
+- **Breaking**@`serde-*`: Repackaged all classes to bear `tweed5.serde` instead of `tweed5.data` in their packages.
 - `weaver-pojo-serde-extension`: Slightly changed the `SerdePojoReaderWriterSpec`
   to be more closely aligned with Java's identifier rules.
 - `attributes-extension`: The `AttributesReadWriteFilterExtension` now correctly skips non-matching compound entries

tweed5-minecraft/coat-bridge/src/main/java/de/siphalor/tweed5/coat/bridge/impl/TweedCoatMappersImpl.java

@@ -20,12 +20,15 @@ import de.siphalor.tweed5.coat.bridge.api.mapping.handler.BasicTweedCoatEntryHan
 import de.siphalor.tweed5.coat.bridge.api.mapping.handler.ConvertingTweedCoatEntryHandler;
 import de.siphalor.tweed5.core.api.entry.CompoundConfigEntry;
 import de.siphalor.tweed5.core.api.entry.ConfigEntry;
-import de.siphalor.tweed5.data.extension.api.ReadWriteExtension;
+import de.siphalor.tweed5.serde.extension.api.ReadWriteExtension;
-import de.siphalor.tweed5.data.extension.api.TweedEntryReadException;
+import de.siphalor.tweed5.serde.extension.api.TweedEntryReadException;
-import de.siphalor.tweed5.data.extension.api.TweedEntryReader;
+import de.siphalor.tweed5.serde.extension.api.TweedEntryReader;
-import de.siphalor.tweed5.data.extension.api.TweedReadContext;
+import de.siphalor.tweed5.serde.extension.api.TweedReadContext;
-import de.siphalor.tweed5.dataapi.api.*;
+import de.siphalor.tweed5.serde_api.api.TweedDataReadException;
-import de.siphalor.tweed5.dataapi.api.decoration.TweedDataDecoration;
+import de.siphalor.tweed5.serde_api.api.TweedDataReader;
+import de.siphalor.tweed5.serde_api.api.TweedDataToken;
+import de.siphalor.tweed5.serde_api.api.TweedDataVisitor;
+import de.siphalor.tweed5.serde_api.api.decoration.TweedDataDecoration;
 import de.siphalor.tweed5.patchwork.api.Patchwork;
 import lombok.RequiredArgsConstructor;
 import lombok.Value;

tweed5-minecraft/coat-bridge/src/testmod/java/de/siphalor/tweed5/coat/bridge/testmod/TweedCoatBridgeTestMod.java

@@ -6,8 +6,8 @@ import de.siphalor.tweed5.coat.bridge.api.ConfigScreenCreateParams;
 import de.siphalor.tweed5.coat.bridge.api.TweedCoatBridgeExtension;
 import de.siphalor.tweed5.coat.bridge.api.TweedCoatMappers;
 import de.siphalor.tweed5.core.api.container.ConfigContainer;
-import de.siphalor.tweed5.data.hjson.HjsonSerde;
+import de.siphalor.tweed5.serde.hjson.HjsonSerde;
-import de.siphalor.tweed5.data.hjson.HjsonWriter;
+import de.siphalor.tweed5.serde.hjson.HjsonWriter;
 import de.siphalor.tweed5.fabric.helper.api.FabricConfigContainerHelper;
 import de.siphalor.tweed5.weaver.pojo.api.TweedPojoWeaver;
 import lombok.CustomLog;

tweed5-minecraft/fabric-helper/src/main/java/de/siphalor/tweed5/fabric/helper/api/DefaultTweedMinecraftWeaving.java

@@ -3,7 +3,7 @@ package de.siphalor.tweed5.fabric.helper.api;
 import de.siphalor.tweed5.annotationinheritance.api.AnnotationInheritance;
 import de.siphalor.tweed5.attributesextension.api.AttributesExtension;
 import de.siphalor.tweed5.attributesextension.api.serde.filter.AttributesReadWriteFilterExtension;
-import de.siphalor.tweed5.data.extension.api.ReadWriteExtension;
+import de.siphalor.tweed5.serde.extension.api.ReadWriteExtension;
 import de.siphalor.tweed5.defaultextensions.presets.api.PresetsExtension;
 import de.siphalor.tweed5.defaultextensions.validation.api.ValidationExtension;
 import de.siphalor.tweed5.defaultextensions.validationfallback.api.ValidationFallbackExtension;

tweed5-minecraft/fabric-helper/src/main/java/de/siphalor/tweed5/fabric/helper/api/FabricConfigCommentLoader.java

@@ -4,8 +4,8 @@ import com.google.gson.stream.JsonReader;
 import de.siphalor.tweed5.commentloaderextension.api.CommentLoaderExtension;
 import de.siphalor.tweed5.commentloaderextension.api.CommentPathProcessor;
 import de.siphalor.tweed5.core.api.container.ConfigContainer;
-import de.siphalor.tweed5.dataapi.api.TweedDataReader;
+import de.siphalor.tweed5.serde_api.api.TweedDataReader;
-import de.siphalor.tweed5.data.gson.GsonReader;
+import de.siphalor.tweed5.serde.gson.GsonReader;
 import lombok.Builder;
 import lombok.extern.apachecommons.CommonsLog;
 import org.jspecify.annotations.Nullable;

tweed5-minecraft/fabric-helper/src/main/java/de/siphalor/tweed5/fabric/helper/api/FabricConfigContainerHelper.java

@@ -2,10 +2,10 @@ package de.siphalor.tweed5.fabric.helper.api;
 
 import de.siphalor.tweed5.core.api.container.ConfigContainer;
 import de.siphalor.tweed5.core.api.container.ConfigContainerSetupPhase;
-import de.siphalor.tweed5.data.extension.api.ReadWriteExtension;
+import de.siphalor.tweed5.serde.extension.api.ReadWriteExtension;
-import de.siphalor.tweed5.dataapi.api.TweedDataReader;
+import de.siphalor.tweed5.serde_api.api.TweedDataReader;
-import de.siphalor.tweed5.dataapi.api.TweedDataWriter;
+import de.siphalor.tweed5.serde_api.api.TweedDataWriter;
-import de.siphalor.tweed5.dataapi.api.TweedSerde;
+import de.siphalor.tweed5.serde_api.api.TweedSerde;
 import de.siphalor.tweed5.defaultextensions.patch.api.PatchExtension;
 import de.siphalor.tweed5.defaultextensions.patch.api.PatchInfo;
 import de.siphalor.tweed5.defaultextensions.presets.api.PresetsExtension;

tweed5-minecraft/fabric-helper/src/testmod/java/de/siphalor/tweed5/fabric/helper/testmod/FabricHelperTestMod.java

@@ -2,8 +2,8 @@ package de.siphalor.tweed5.fabric.helper.testmod;
 
 import de.siphalor.tweed5.attributesextension.api.serde.filter.AttributesReadWriteFilterExtension;
 import de.siphalor.tweed5.core.api.container.ConfigContainer;
-import de.siphalor.tweed5.data.hjson.HjsonSerde;
+import de.siphalor.tweed5.serde.hjson.HjsonSerde;
-import de.siphalor.tweed5.data.hjson.HjsonWriter;
+import de.siphalor.tweed5.serde.hjson.HjsonWriter;
 import de.siphalor.tweed5.fabric.helper.api.FabricConfigCommentLoader;
 import de.siphalor.tweed5.fabric.helper.api.FabricConfigContainerHelper;
 import de.siphalor.tweed5.weaver.pojo.api.TweedPojoWeaver;

tweed5-minecraft/networking/src/main/java/de/siphalor/tweed5/minecraft/networking/api/ByteBufReader.java

@@ -1,9 +1,9 @@
 package de.siphalor.tweed5.minecraft.networking.api;
 
-import de.siphalor.tweed5.dataapi.api.TweedDataReadException;
+import de.siphalor.tweed5.serde_api.api.TweedDataReadException;
-import de.siphalor.tweed5.dataapi.api.TweedDataReader;
+import de.siphalor.tweed5.serde_api.api.TweedDataReader;
-import de.siphalor.tweed5.dataapi.api.TweedDataToken;
+import de.siphalor.tweed5.serde_api.api.TweedDataToken;
-import de.siphalor.tweed5.dataapi.api.TweedDataTokens;
+import de.siphalor.tweed5.serde_api.api.TweedDataTokens;
 import de.siphalor.tweed5.minecraft.networking.impl.ByteBufSerdeConstants;
 import io.netty.buffer.ByteBuf;
 import lombok.RequiredArgsConstructor;

tweed5-minecraft/networking/src/main/java/de/siphalor/tweed5/minecraft/networking/api/RawByteBufWriter.java

@@ -1,7 +1,7 @@
 package de.siphalor.tweed5.minecraft.networking.api;
 
-import de.siphalor.tweed5.dataapi.api.TweedDataWriter;
+import de.siphalor.tweed5.serde_api.api.TweedDataWriter;
-import de.siphalor.tweed5.dataapi.api.decoration.TweedDataDecoration;
+import de.siphalor.tweed5.serde_api.api.decoration.TweedDataDecoration;
 import de.siphalor.tweed5.minecraft.networking.impl.ByteBufSerdeConstants;
 import io.netty.buffer.ByteBuf;
 import lombok.RequiredArgsConstructor;

tweed5-minecraft/networking/src/test/java/de/siphalor/tweed5/minecraft/network/api/ByteBufReaderWriterTest.java

@@ -1,8 +1,8 @@
 package de.siphalor.tweed5.minecraft.network.api;
 
-import de.siphalor.tweed5.dataapi.api.TweedDataReadException;
+import de.siphalor.tweed5.serde_api.api.TweedDataReadException;
-import de.siphalor.tweed5.dataapi.api.TweedDataToken;
+import de.siphalor.tweed5.serde_api.api.TweedDataToken;
-import de.siphalor.tweed5.dataapi.api.TweedDataWriter;
+import de.siphalor.tweed5.serde_api.api.TweedDataWriter;
 import de.siphalor.tweed5.minecraft.networking.api.ByteBufReader;
 import de.siphalor.tweed5.minecraft.networking.api.RawByteBufWriter;
 import de.siphalor.tweed5.minecraft.networking.api.SlightlyCompressedByteBufWriter;

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

@@ -10,15 +10,18 @@ import de.siphalor.tweed5.core.api.entry.ConfigEntry;
 import de.siphalor.tweed5.core.api.entry.ConfigEntryVisitor;
 import de.siphalor.tweed5.core.api.extension.TweedExtensionSetupContext;
 import de.siphalor.tweed5.core.api.middleware.Middleware;
-import de.siphalor.tweed5.data.extension.api.TweedEntryReadException;
+import de.siphalor.tweed5.serde.extension.api.TweedEntryReadException;
-import de.siphalor.tweed5.data.extension.api.TweedEntryReader;
+import de.siphalor.tweed5.serde.extension.api.TweedEntryReader;
-import de.siphalor.tweed5.data.extension.api.TweedEntryWriter;
+import de.siphalor.tweed5.serde.extension.api.TweedEntryWriter;
-import de.siphalor.tweed5.data.extension.api.TweedReadContext;
+import de.siphalor.tweed5.serde.extension.api.TweedReadContext;
-import de.siphalor.tweed5.data.extension.api.extension.ReadWriteExtensionSetupContext;
+import de.siphalor.tweed5.serde.extension.api.extension.ReadWriteExtensionSetupContext;
-import de.siphalor.tweed5.data.extension.api.extension.ReadWriteRelatedExtension;
+import de.siphalor.tweed5.serde.extension.api.extension.ReadWriteRelatedExtension;
-import de.siphalor.tweed5.data.extension.impl.TweedEntryReaderWriterImpls;
+import de.siphalor.tweed5.serde.extension.impl.TweedEntryReaderWriterImpls;
-import de.siphalor.tweed5.dataapi.api.*;
+import de.siphalor.tweed5.serde_api.api.DelegatingTweedDataWriter;
-import de.siphalor.tweed5.dataapi.api.decoration.TweedDataDecoration;
+import de.siphalor.tweed5.serde_api.api.TweedDataReader;
+import de.siphalor.tweed5.serde_api.api.TweedDataUnsupportedValueException;
+import de.siphalor.tweed5.serde_api.api.TweedDataVisitor;
+import de.siphalor.tweed5.serde_api.api.decoration.TweedDataDecoration;
 import de.siphalor.tweed5.patchwork.api.Patchwork;
 import de.siphalor.tweed5.patchwork.api.PatchworkPartAccess;
 import de.siphalor.tweed5.utils.api.UniqueSymbol;

tweed5/attributes-extension/src/test/java/de/siphalor/tweed5/attributesextension/impl/serde/filter/AttributesReadWriteFilterExtensionImplTest.java

@@ -8,10 +8,10 @@ import de.siphalor.tweed5.core.api.entry.SimpleConfigEntry;
 import de.siphalor.tweed5.core.impl.DefaultConfigContainer;
 import de.siphalor.tweed5.core.impl.entry.SimpleConfigEntryImpl;
 import de.siphalor.tweed5.core.impl.entry.StaticMapCompoundConfigEntryImpl;
-import de.siphalor.tweed5.data.extension.api.ReadWriteExtension;
+import de.siphalor.tweed5.serde.extension.api.ReadWriteExtension;
-import de.siphalor.tweed5.data.hjson.HjsonLexer;
+import de.siphalor.tweed5.serde.hjson.HjsonLexer;
-import de.siphalor.tweed5.data.hjson.HjsonReader;
+import de.siphalor.tweed5.serde.hjson.HjsonReader;
-import de.siphalor.tweed5.data.hjson.HjsonWriter;
+import de.siphalor.tweed5.serde.hjson.HjsonWriter;
 import org.jspecify.annotations.NullUnmarked;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -26,9 +26,9 @@ import java.util.Map;
 
 import static de.siphalor.tweed5.attributesextension.api.AttributesExtension.attribute;
 import static de.siphalor.tweed5.attributesextension.api.AttributesExtension.attributeDefault;
-import static de.siphalor.tweed5.data.extension.api.ReadWriteExtension.*;
+import static de.siphalor.tweed5.serde.extension.api.ReadWriteExtension.*;
-import static de.siphalor.tweed5.data.extension.api.readwrite.TweedEntryReaderWriters.compoundReaderWriter;
+import static de.siphalor.tweed5.serde.extension.api.readwrite.TweedEntryReaderWriters.compoundReaderWriter;
-import static de.siphalor.tweed5.data.extension.api.readwrite.TweedEntryReaderWriters.stringReaderWriter;
+import static de.siphalor.tweed5.serde.extension.api.readwrite.TweedEntryReaderWriters.stringReaderWriter;
 import static de.siphalor.tweed5.testutils.generic.MapTestUtils.sequencedMap;
 import static java.util.Map.entry;
 import static org.assertj.core.api.Assertions.assertThat;

tweed5/attributes-extension/src/test/java/de/siphalor/tweed5/attributesextension/impl/serde/filter/AttributesReadWriteFilterExtensionImplWithPatchInfoTest.java

@@ -6,9 +6,9 @@ import de.siphalor.tweed5.core.api.container.ConfigContainer;
 import de.siphalor.tweed5.core.impl.DefaultConfigContainer;
 import de.siphalor.tweed5.core.impl.entry.SimpleConfigEntryImpl;
 import de.siphalor.tweed5.core.impl.entry.StaticMapCompoundConfigEntryImpl;
-import de.siphalor.tweed5.data.extension.api.ReadWriteExtension;
+import de.siphalor.tweed5.serde.extension.api.ReadWriteExtension;
-import de.siphalor.tweed5.data.hjson.HjsonLexer;
+import de.siphalor.tweed5.serde.hjson.HjsonLexer;
-import de.siphalor.tweed5.data.hjson.HjsonReader;
+import de.siphalor.tweed5.serde.hjson.HjsonReader;
 import de.siphalor.tweed5.defaultextensions.patch.api.PatchExtension;
 import lombok.SneakyThrows;
 import org.junit.jupiter.api.Test;
@@ -19,9 +19,9 @@ import java.util.List;
 import java.util.Map;
 
 import static de.siphalor.tweed5.attributesextension.api.AttributesExtension.attribute;
-import static de.siphalor.tweed5.data.extension.api.ReadWriteExtension.entryReaderWriter;
+import static de.siphalor.tweed5.serde.extension.api.ReadWriteExtension.entryReaderWriter;
-import static de.siphalor.tweed5.data.extension.api.readwrite.TweedEntryReaderWriters.compoundReaderWriter;
+import static de.siphalor.tweed5.serde.extension.api.readwrite.TweedEntryReaderWriters.compoundReaderWriter;
-import static de.siphalor.tweed5.data.extension.api.readwrite.TweedEntryReaderWriters.stringReaderWriter;
+import static de.siphalor.tweed5.serde.extension.api.readwrite.TweedEntryReaderWriters.stringReaderWriter;
 import static de.siphalor.tweed5.testutils.generic.MapTestUtils.sequencedMap;
 import static java.util.Map.entry;
 import static org.assertj.core.api.Assertions.assertThat;

tweed5/comment-loader-extension/src/main/java/de/siphalor/tweed5/commentloaderextension/api/CommentLoaderExtension.java

@@ -2,7 +2,7 @@ package de.siphalor.tweed5.commentloaderextension.api;
 
 import de.siphalor.tweed5.commentloaderextension.impl.CommentLoaderExtensionImpl;
 import de.siphalor.tweed5.core.api.extension.TweedExtension;
-import de.siphalor.tweed5.dataapi.api.TweedDataReader;
+import de.siphalor.tweed5.serde_api.api.TweedDataReader;
 
 public interface CommentLoaderExtension extends TweedExtension {
 	Class<? extends CommentLoaderExtension> DEFAULT = CommentLoaderExtensionImpl.class;

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

@@ -6,11 +6,11 @@ import de.siphalor.tweed5.core.api.container.ConfigContainer;
 import de.siphalor.tweed5.core.api.container.ConfigContainerSetupPhase;
 import de.siphalor.tweed5.core.api.extension.TweedExtensionSetupContext;
 import de.siphalor.tweed5.core.api.middleware.Middleware;
-import de.siphalor.tweed5.dataapi.api.IntuitiveVisitingTweedDataReader;
+import de.siphalor.tweed5.serde_api.api.IntuitiveVisitingTweedDataReader;
-import de.siphalor.tweed5.dataapi.api.TweedDataReadException;
+import de.siphalor.tweed5.serde_api.api.TweedDataReadException;
-import de.siphalor.tweed5.dataapi.api.TweedDataReader;
+import de.siphalor.tweed5.serde_api.api.TweedDataReader;
-import de.siphalor.tweed5.dataapi.api.TweedDataVisitor;
+import de.siphalor.tweed5.serde_api.api.TweedDataVisitor;
-import de.siphalor.tweed5.dataapi.api.decoration.TweedDataDecoration;
+import de.siphalor.tweed5.serde_api.api.decoration.TweedDataDecoration;
 import de.siphalor.tweed5.defaultextensions.comment.api.CommentExtension;
 import de.siphalor.tweed5.defaultextensions.comment.api.CommentModifyingExtension;
 import de.siphalor.tweed5.defaultextensions.comment.api.CommentProducer;

tweed5/comment-loader-extension/src/test/java/de/siphalor/tweed5/commentloaderextension/impl/CommentLoaderExtensionImplTest.java

@@ -7,7 +7,7 @@ import de.siphalor.tweed5.core.impl.DefaultConfigContainer;
 import de.siphalor.tweed5.core.impl.entry.SimpleConfigEntryImpl;
 import de.siphalor.tweed5.core.impl.entry.StaticMapCompoundConfigEntryImpl;
 import de.siphalor.tweed5.defaultextensions.comment.api.CommentExtension;
-import de.siphalor.tweed5.data.gson.GsonReader;
+import de.siphalor.tweed5.serde.gson.GsonReader;
 import lombok.SneakyThrows;
 import org.junit.jupiter.api.Test;
 

tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/comment/impl/CommentExtensionImpl.java

@@ -6,8 +6,8 @@ import de.siphalor.tweed5.core.api.entry.ConfigEntry;
 import de.siphalor.tweed5.core.api.extension.TweedExtension;
 import de.siphalor.tweed5.core.api.extension.TweedExtensionSetupContext;
 import de.siphalor.tweed5.core.api.middleware.DefaultMiddlewareContainer;
-import de.siphalor.tweed5.data.extension.api.extension.ReadWriteExtensionSetupContext;
+import de.siphalor.tweed5.serde.extension.api.extension.ReadWriteExtensionSetupContext;
-import de.siphalor.tweed5.data.extension.api.extension.ReadWriteRelatedExtension;
+import de.siphalor.tweed5.serde.extension.api.extension.ReadWriteRelatedExtension;
 import de.siphalor.tweed5.defaultextensions.comment.api.CommentExtension;
 import de.siphalor.tweed5.defaultextensions.comment.api.CommentModifyingExtension;
 import de.siphalor.tweed5.defaultextensions.comment.api.CommentProducer;

tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/comment/impl/TweedEntryWriterCommentMiddleware.java

@@ -2,12 +2,11 @@ package de.siphalor.tweed5.defaultextensions.comment.impl;
 
 import de.siphalor.tweed5.core.api.entry.ConfigEntry;
 import de.siphalor.tweed5.core.api.middleware.Middleware;
-import de.siphalor.tweed5.data.extension.api.TweedEntryWriter;
+import de.siphalor.tweed5.serde.extension.api.TweedEntryWriter;
-import de.siphalor.tweed5.dataapi.api.DelegatingTweedDataWriter;
+import de.siphalor.tweed5.serde_api.api.DelegatingTweedDataWriter;
-import de.siphalor.tweed5.dataapi.api.TweedDataVisitor;
+import de.siphalor.tweed5.serde_api.api.TweedDataVisitor;
-import de.siphalor.tweed5.dataapi.api.TweedDataWriter;
+import de.siphalor.tweed5.serde_api.api.decoration.TweedDataCommentDecoration;
-import de.siphalor.tweed5.dataapi.api.decoration.TweedDataCommentDecoration;
+import de.siphalor.tweed5.serde_api.api.decoration.TweedDataDecoration;
-import de.siphalor.tweed5.dataapi.api.decoration.TweedDataDecoration;
 import de.siphalor.tweed5.patchwork.api.PatchworkPartAccess;
 import lombok.RequiredArgsConstructor;
 import lombok.Value;

tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/patch/impl/PatchExtensionImpl.java

@@ -3,12 +3,12 @@ package de.siphalor.tweed5.defaultextensions.patch.impl;
 import de.siphalor.tweed5.core.api.entry.CompoundConfigEntry;
 import de.siphalor.tweed5.core.api.entry.ConfigEntry;
 import de.siphalor.tweed5.core.api.middleware.Middleware;
-import de.siphalor.tweed5.data.extension.api.TweedEntryReadException;
+import de.siphalor.tweed5.serde.extension.api.TweedEntryReadException;
-import de.siphalor.tweed5.data.extension.api.TweedEntryReader;
+import de.siphalor.tweed5.serde.extension.api.TweedEntryReader;
-import de.siphalor.tweed5.data.extension.api.TweedReadContext;
+import de.siphalor.tweed5.serde.extension.api.TweedReadContext;
-import de.siphalor.tweed5.data.extension.api.extension.ReadWriteExtensionSetupContext;
+import de.siphalor.tweed5.serde.extension.api.extension.ReadWriteExtensionSetupContext;
-import de.siphalor.tweed5.data.extension.api.extension.ReadWriteRelatedExtension;
+import de.siphalor.tweed5.serde.extension.api.extension.ReadWriteRelatedExtension;
-import de.siphalor.tweed5.dataapi.api.TweedDataReader;
+import de.siphalor.tweed5.serde_api.api.TweedDataReader;
 import de.siphalor.tweed5.defaultextensions.patch.api.PatchExtension;
 import de.siphalor.tweed5.defaultextensions.patch.api.PatchInfo;
 import de.siphalor.tweed5.patchwork.api.Patchwork;

tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/pather/api/PathTrackingDataReader.java

@@ -1,8 +1,8 @@
 package de.siphalor.tweed5.defaultextensions.pather.api;
 
-import de.siphalor.tweed5.dataapi.api.TweedDataReadException;
+import de.siphalor.tweed5.serde_api.api.TweedDataReadException;
-import de.siphalor.tweed5.dataapi.api.TweedDataReader;
+import de.siphalor.tweed5.serde_api.api.TweedDataReader;
-import de.siphalor.tweed5.dataapi.api.TweedDataToken;
+import de.siphalor.tweed5.serde_api.api.TweedDataToken;
 import lombok.RequiredArgsConstructor;
 
 import java.util.ArrayDeque;

tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/pather/api/PathTrackingDataVisitor.java

@@ -1,8 +1,8 @@
 package de.siphalor.tweed5.defaultextensions.pather.api;
 
-import de.siphalor.tweed5.dataapi.api.TweedDataUnsupportedValueException;
+import de.siphalor.tweed5.serde_api.api.TweedDataUnsupportedValueException;
-import de.siphalor.tweed5.dataapi.api.TweedDataVisitor;
+import de.siphalor.tweed5.serde_api.api.TweedDataVisitor;
-import de.siphalor.tweed5.dataapi.api.decoration.TweedDataDecoration;
+import de.siphalor.tweed5.serde_api.api.decoration.TweedDataDecoration;
 import lombok.RequiredArgsConstructor;
 import org.jspecify.annotations.Nullable;
 

tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/pather/api/PatherExtension.java

@@ -1,8 +1,8 @@
 package de.siphalor.tweed5.defaultextensions.pather.api;
 
 import de.siphalor.tweed5.core.api.extension.TweedExtension;
-import de.siphalor.tweed5.data.extension.api.TweedReadContext;
+import de.siphalor.tweed5.serde.extension.api.TweedReadContext;
-import de.siphalor.tweed5.data.extension.api.TweedWriteContext;
+import de.siphalor.tweed5.serde.extension.api.TweedWriteContext;
 import de.siphalor.tweed5.defaultextensions.pather.impl.PatherExtensionImpl;
 
 public interface PatherExtension extends TweedExtension {

tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/pather/impl/PatherExtensionImpl.java

@@ -2,11 +2,11 @@ package de.siphalor.tweed5.defaultextensions.pather.impl;
 
 import de.siphalor.tweed5.core.api.entry.ConfigEntry;
 import de.siphalor.tweed5.core.api.middleware.Middleware;
-import de.siphalor.tweed5.data.extension.api.*;
+import de.siphalor.tweed5.serde.extension.api.*;
-import de.siphalor.tweed5.data.extension.api.extension.ReadWriteExtensionSetupContext;
+import de.siphalor.tweed5.serde.extension.api.extension.ReadWriteExtensionSetupContext;
-import de.siphalor.tweed5.data.extension.api.extension.ReadWriteRelatedExtension;
+import de.siphalor.tweed5.serde.extension.api.extension.ReadWriteRelatedExtension;
-import de.siphalor.tweed5.dataapi.api.TweedDataReader;
+import de.siphalor.tweed5.serde_api.api.TweedDataReader;
-import de.siphalor.tweed5.dataapi.api.TweedDataVisitor;
+import de.siphalor.tweed5.serde_api.api.TweedDataVisitor;
 import de.siphalor.tweed5.defaultextensions.pather.api.PathTracking;
 import de.siphalor.tweed5.defaultextensions.pather.api.PathTrackingDataReader;
 import de.siphalor.tweed5.defaultextensions.pather.api.PathTrackingDataVisitor;

tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/readfallback/impl/ReadFallbackExtensionImpl.java

@@ -3,10 +3,10 @@ package de.siphalor.tweed5.defaultextensions.readfallback.impl;
 import de.siphalor.tweed5.core.api.container.ConfigContainer;
 import de.siphalor.tweed5.core.api.entry.ConfigEntry;
 import de.siphalor.tweed5.core.api.middleware.Middleware;
-import de.siphalor.tweed5.data.extension.api.TweedEntryReadException;
+import de.siphalor.tweed5.serde.extension.api.TweedEntryReadException;
-import de.siphalor.tweed5.data.extension.api.TweedEntryReader;
+import de.siphalor.tweed5.serde.extension.api.TweedEntryReader;
-import de.siphalor.tweed5.data.extension.api.extension.ReadWriteExtensionSetupContext;
+import de.siphalor.tweed5.serde.extension.api.extension.ReadWriteExtensionSetupContext;
-import de.siphalor.tweed5.data.extension.api.extension.ReadWriteRelatedExtension;
+import de.siphalor.tweed5.serde.extension.api.extension.ReadWriteRelatedExtension;
 import de.siphalor.tweed5.defaultextensions.pather.api.PatherExtension;
 import de.siphalor.tweed5.defaultextensions.presets.api.PresetsExtension;
 import de.siphalor.tweed5.defaultextensions.readfallback.api.ReadFallbackExtension;

tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/validation/impl/ValidationExtensionImpl.java

@@ -9,12 +9,12 @@ import de.siphalor.tweed5.core.api.extension.TweedExtensionSetupContext;
 import de.siphalor.tweed5.core.api.middleware.DefaultMiddlewareContainer;
 import de.siphalor.tweed5.core.api.middleware.Middleware;
 import de.siphalor.tweed5.core.api.middleware.MiddlewareContainer;
-import de.siphalor.tweed5.data.extension.api.TweedEntryReadException;
+import de.siphalor.tweed5.serde.extension.api.TweedEntryReadException;
-import de.siphalor.tweed5.data.extension.api.TweedEntryReader;
+import de.siphalor.tweed5.serde.extension.api.TweedEntryReader;
-import de.siphalor.tweed5.data.extension.api.TweedReadContext;
+import de.siphalor.tweed5.serde.extension.api.TweedReadContext;
-import de.siphalor.tweed5.data.extension.api.extension.ReadWriteExtensionSetupContext;
+import de.siphalor.tweed5.serde.extension.api.extension.ReadWriteExtensionSetupContext;
-import de.siphalor.tweed5.data.extension.api.extension.ReadWriteRelatedExtension;
+import de.siphalor.tweed5.serde.extension.api.extension.ReadWriteRelatedExtension;
-import de.siphalor.tweed5.dataapi.api.TweedDataReader;
+import de.siphalor.tweed5.serde_api.api.TweedDataReader;
 import de.siphalor.tweed5.defaultextensions.comment.api.CommentModifyingExtension;
 import de.siphalor.tweed5.defaultextensions.comment.api.CommentProducer;
 import de.siphalor.tweed5.defaultextensions.pather.api.PathTracking;

tweed5/default-extensions/src/test/java/de/siphalor/tweed5/defaultextensions/comment/impl/CommentExtensionImplTest.java

@@ -9,9 +9,9 @@ import de.siphalor.tweed5.core.impl.DefaultConfigContainer;
 import de.siphalor.tweed5.core.impl.entry.NullableConfigEntryImpl;
 import de.siphalor.tweed5.core.impl.entry.SimpleConfigEntryImpl;
 import de.siphalor.tweed5.core.impl.entry.StaticMapCompoundConfigEntryImpl;
-import de.siphalor.tweed5.data.extension.api.ReadWriteExtension;
+import de.siphalor.tweed5.serde.extension.api.ReadWriteExtension;
-import de.siphalor.tweed5.data.hjson.HjsonCommentType;
+import de.siphalor.tweed5.serde.hjson.HjsonCommentType;
-import de.siphalor.tweed5.data.hjson.HjsonWriter;
+import de.siphalor.tweed5.serde.hjson.HjsonWriter;
 import de.siphalor.tweed5.defaultextensions.comment.api.CommentExtension;
 import de.siphalor.tweed5.defaultextensions.comment.api.CommentModifyingExtension;
 import de.siphalor.tweed5.defaultextensions.comment.api.CommentProducer;
@@ -26,9 +26,9 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import static de.siphalor.tweed5.data.extension.api.ReadWriteExtension.entryReaderWriter;
+import static de.siphalor.tweed5.serde.extension.api.ReadWriteExtension.entryReaderWriter;
-import static de.siphalor.tweed5.data.extension.api.readwrite.TweedEntryReaderWriters.*;
 import static de.siphalor.tweed5.defaultextensions.comment.api.CommentExtension.baseComment;
+import static de.siphalor.tweed5.serde.extension.api.readwrite.TweedEntryReaderWriters.*;
 import static de.siphalor.tweed5.testutils.generic.MapTestUtils.sequencedMap;
 import static java.util.Map.entry;
 import static org.junit.jupiter.api.Assertions.*;

tweed5/default-extensions/src/test/java/de/siphalor/tweed5/defaultextensions/patch/impl/PatchExtensionImplTest.java

@@ -8,9 +8,9 @@ import de.siphalor.tweed5.core.impl.entry.CollectionConfigEntryImpl;
 import de.siphalor.tweed5.core.impl.entry.NullableConfigEntryImpl;
 import de.siphalor.tweed5.core.impl.entry.SimpleConfigEntryImpl;
 import de.siphalor.tweed5.core.impl.entry.StaticMapCompoundConfigEntryImpl;
-import de.siphalor.tweed5.data.extension.api.ReadWriteExtension;
+import de.siphalor.tweed5.serde.extension.api.ReadWriteExtension;
-import de.siphalor.tweed5.data.hjson.HjsonLexer;
+import de.siphalor.tweed5.serde.hjson.HjsonLexer;
-import de.siphalor.tweed5.data.hjson.HjsonReader;
+import de.siphalor.tweed5.serde.hjson.HjsonReader;
 import de.siphalor.tweed5.defaultextensions.patch.api.PatchExtension;
 import de.siphalor.tweed5.defaultextensions.patch.api.PatchInfo;
 import lombok.SneakyThrows;
@@ -26,9 +26,9 @@ import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Stream;
 
-import static de.siphalor.tweed5.data.extension.api.ReadWriteExtension.entryReaderWriter;
+import static de.siphalor.tweed5.serde.extension.api.ReadWriteExtension.entryReaderWriter;
-import static de.siphalor.tweed5.data.extension.api.ReadWriteExtension.read;
+import static de.siphalor.tweed5.serde.extension.api.ReadWriteExtension.read;
-import static de.siphalor.tweed5.data.extension.api.readwrite.TweedEntryReaderWriters.*;
+import static de.siphalor.tweed5.serde.extension.api.readwrite.TweedEntryReaderWriters.*;
 import static de.siphalor.tweed5.testutils.generic.MapTestUtils.sequencedMap;
 import static java.util.Map.entry;
 import static org.assertj.core.api.Assertions.assertThat;

tweed5/default-extensions/src/test/java/de/siphalor/tweed5/defaultextensions/pather/api/PathTrackingDataReaderTest.java

@@ -1,8 +1,8 @@
 package de.siphalor.tweed5.defaultextensions.pather.api;
 
-import de.siphalor.tweed5.dataapi.api.TweedDataReader;
+import de.siphalor.tweed5.serde_api.api.TweedDataReader;
-import de.siphalor.tweed5.dataapi.api.TweedDataToken;
+import de.siphalor.tweed5.serde_api.api.TweedDataToken;
-import de.siphalor.tweed5.dataapi.api.TweedDataTokens;
+import de.siphalor.tweed5.serde_api.api.TweedDataTokens;
 import lombok.EqualsAndHashCode;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;

tweed5/default-extensions/src/test/java/de/siphalor/tweed5/defaultextensions/readfallback/impl/ReadFallbackExtensionImplTest.java

@@ -7,18 +7,18 @@ import de.siphalor.tweed5.core.api.entry.ConfigEntry;
 import de.siphalor.tweed5.core.impl.DefaultConfigContainer;
 import de.siphalor.tweed5.core.impl.entry.SimpleConfigEntryImpl;
 import de.siphalor.tweed5.core.impl.entry.StaticMapCompoundConfigEntryImpl;
-import de.siphalor.tweed5.data.extension.api.ReadWriteExtension;
+import de.siphalor.tweed5.serde.extension.api.ReadWriteExtension;
-import de.siphalor.tweed5.data.extension.api.TweedEntryReadException;
+import de.siphalor.tweed5.serde.extension.api.TweedEntryReadException;
-import de.siphalor.tweed5.data.extension.api.TweedReadContext;
+import de.siphalor.tweed5.serde.extension.api.TweedReadContext;
-import de.siphalor.tweed5.data.extension.api.TweedWriteContext;
+import de.siphalor.tweed5.serde.extension.api.TweedWriteContext;
-import de.siphalor.tweed5.data.extension.api.readwrite.TweedEntryReaderWriter;
+import de.siphalor.tweed5.serde.extension.api.readwrite.TweedEntryReaderWriter;
-import de.siphalor.tweed5.data.extension.api.readwrite.TweedEntryReaderWriters;
+import de.siphalor.tweed5.serde.extension.api.readwrite.TweedEntryReaderWriters;
-import de.siphalor.tweed5.data.hjson.HjsonLexer;
+import de.siphalor.tweed5.serde.hjson.HjsonLexer;
-import de.siphalor.tweed5.data.hjson.HjsonReader;
+import de.siphalor.tweed5.serde.hjson.HjsonReader;
-import de.siphalor.tweed5.dataapi.api.TweedDataReadException;
+import de.siphalor.tweed5.serde_api.api.TweedDataReadException;
-import de.siphalor.tweed5.dataapi.api.TweedDataReader;
+import de.siphalor.tweed5.serde_api.api.TweedDataReader;
-import de.siphalor.tweed5.dataapi.api.TweedDataVisitor;
+import de.siphalor.tweed5.serde_api.api.TweedDataVisitor;
-import de.siphalor.tweed5.dataapi.api.TweedDataWriteException;
+import de.siphalor.tweed5.serde_api.api.TweedDataWriteException;
 import de.siphalor.tweed5.defaultextensions.pather.api.PatherExtension;
 import de.siphalor.tweed5.defaultextensions.presets.api.PresetsExtension;
 import de.siphalor.tweed5.defaultextensions.readfallback.api.ReadFallbackExtension;
@@ -34,9 +34,9 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-import static de.siphalor.tweed5.data.extension.api.ReadWriteExtension.entryReaderWriter;
+import static de.siphalor.tweed5.serde.extension.api.ReadWriteExtension.entryReaderWriter;
-import static de.siphalor.tweed5.data.extension.api.ReadWriteExtension.read;
+import static de.siphalor.tweed5.serde.extension.api.ReadWriteExtension.read;
-import static de.siphalor.tweed5.data.extension.api.readwrite.TweedEntryReaderWriters.compoundReaderWriter;
+import static de.siphalor.tweed5.serde.extension.api.readwrite.TweedEntryReaderWriters.compoundReaderWriter;
 import static de.siphalor.tweed5.defaultextensions.presets.api.PresetsExtension.presetValue;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.InstanceOfAssertFactories.STRING;

tweed5/default-extensions/src/test/java/de/siphalor/tweed5/defaultextensions/validation/impl/ValidationExtensionImplTest.java

@@ -6,11 +6,11 @@ import de.siphalor.tweed5.core.api.entry.SimpleConfigEntry;
 import de.siphalor.tweed5.core.impl.DefaultConfigContainer;
 import de.siphalor.tweed5.core.impl.entry.SimpleConfigEntryImpl;
 import de.siphalor.tweed5.core.impl.entry.StaticMapCompoundConfigEntryImpl;
-import de.siphalor.tweed5.data.extension.api.ReadWriteExtension;
+import de.siphalor.tweed5.serde.extension.api.ReadWriteExtension;
-import de.siphalor.tweed5.data.hjson.HjsonCommentType;
+import de.siphalor.tweed5.serde.hjson.HjsonCommentType;
-import de.siphalor.tweed5.data.hjson.HjsonLexer;
+import de.siphalor.tweed5.serde.hjson.HjsonLexer;
-import de.siphalor.tweed5.data.hjson.HjsonReader;
+import de.siphalor.tweed5.serde.hjson.HjsonReader;
-import de.siphalor.tweed5.data.hjson.HjsonWriter;
+import de.siphalor.tweed5.serde.hjson.HjsonWriter;
 import de.siphalor.tweed5.defaultextensions.comment.api.CommentExtension;
 import de.siphalor.tweed5.defaultextensions.validation.api.ValidationExtension;
 import de.siphalor.tweed5.defaultextensions.validation.api.result.ValidationIssueLevel;
@@ -31,10 +31,10 @@ import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 
-import static de.siphalor.tweed5.data.extension.api.ReadWriteExtension.*;
-import static de.siphalor.tweed5.data.extension.api.readwrite.TweedEntryReaderWriters.*;
 import static de.siphalor.tweed5.defaultextensions.comment.api.CommentExtension.baseComment;
 import static de.siphalor.tweed5.defaultextensions.validation.api.ValidationExtension.validators;
+import static de.siphalor.tweed5.serde.extension.api.ReadWriteExtension.*;
+import static de.siphalor.tweed5.serde.extension.api.readwrite.TweedEntryReaderWriters.*;
 import static de.siphalor.tweed5.testutils.generic.MapTestUtils.sequencedMap;
 import static java.util.Map.entry;
 import static org.assertj.core.api.Assertions.assertThat;

tweed5/default-extensions/src/test/java/de/siphalor/tweed5/defaultextensions/validationfallback/impl/ValidationFallbackExtensionImplTest.java

@@ -4,11 +4,11 @@ import de.siphalor.tweed5.core.api.entry.ConfigEntry;
 import de.siphalor.tweed5.core.api.entry.SimpleConfigEntry;
 import de.siphalor.tweed5.core.impl.DefaultConfigContainer;
 import de.siphalor.tweed5.core.impl.entry.SimpleConfigEntryImpl;
-import de.siphalor.tweed5.data.extension.api.ReadWriteExtension;
+import de.siphalor.tweed5.serde.extension.api.ReadWriteExtension;
-import de.siphalor.tweed5.data.hjson.HjsonCommentType;
+import de.siphalor.tweed5.serde.hjson.HjsonCommentType;
-import de.siphalor.tweed5.data.hjson.HjsonLexer;
+import de.siphalor.tweed5.serde.hjson.HjsonLexer;
-import de.siphalor.tweed5.data.hjson.HjsonReader;
+import de.siphalor.tweed5.serde.hjson.HjsonReader;
-import de.siphalor.tweed5.data.hjson.HjsonWriter;
+import de.siphalor.tweed5.serde.hjson.HjsonWriter;
 import de.siphalor.tweed5.defaultextensions.comment.api.CommentExtension;
 import de.siphalor.tweed5.defaultextensions.validation.api.ConfigEntryValidator;
 import de.siphalor.tweed5.defaultextensions.validation.api.ValidationExtension;
@@ -26,10 +26,10 @@ import java.io.StringReader;
 import java.io.StringWriter;
 import java.util.Collections;
 
-import static de.siphalor.tweed5.data.extension.api.ReadWriteExtension.*;
-import static de.siphalor.tweed5.data.extension.api.readwrite.TweedEntryReaderWriters.*;
 import static de.siphalor.tweed5.defaultextensions.presets.api.PresetsExtension.presetValue;
 import static de.siphalor.tweed5.defaultextensions.validation.api.ValidationExtension.validators;
+import static de.siphalor.tweed5.serde.extension.api.ReadWriteExtension.*;
+import static de.siphalor.tweed5.serde.extension.api.readwrite.TweedEntryReaderWriters.*;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class ValidationFallbackExtensionImplTest {

tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/DelegatingTweedDataWriter.java

@@ -1,6 +1,6 @@
-package de.siphalor.tweed5.dataapi.api;
+package de.siphalor.tweed5.serde_api.api;
 
-import de.siphalor.tweed5.dataapi.api.decoration.TweedDataDecoration;
+import de.siphalor.tweed5.serde_api.api.decoration.TweedDataDecoration;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/IntuitiveVisitingTweedDataReader.java

@@ -1,4 +1,4 @@
-package de.siphalor.tweed5.dataapi.api;
+package de.siphalor.tweed5.serde_api.api;
 
 import lombok.RequiredArgsConstructor;
 

tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/TweedDataReadException.java

@@ -1,4 +1,4 @@
-package de.siphalor.tweed5.dataapi.api;
+package de.siphalor.tweed5.serde_api.api;
 
 import lombok.AccessLevel;
 import lombok.Getter;

tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/TweedDataReader.java

@@ -1,4 +1,4 @@
-package de.siphalor.tweed5.dataapi.api;
+package de.siphalor.tweed5.serde_api.api;
 
 public interface TweedDataReader extends AutoCloseable {
 	TweedDataToken peekToken() throws TweedDataReadException;

tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/TweedDataReaderRecoverMode.java

@@ -1,4 +1,4 @@
-package de.siphalor.tweed5.dataapi.api;
+package de.siphalor.tweed5.serde_api.api;
 
 public enum TweedDataReaderRecoverMode {
 	SKIP,

tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/TweedDataToken.java

@@ -1,4 +1,4 @@
-package de.siphalor.tweed5.dataapi.api;
+package de.siphalor.tweed5.serde_api.api;
 
 public interface TweedDataToken {
 	default boolean isNull() {

tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/TweedDataTokens.java

@@ -1,4 +1,4 @@
-package de.siphalor.tweed5.dataapi.api;
+package de.siphalor.tweed5.serde_api.api;
 
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;

tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/TweedDataUnsupportedValueException.java

@@ -1,4 +1,4 @@
-package de.siphalor.tweed5.dataapi.api;
+package de.siphalor.tweed5.serde_api.api;
 
 import lombok.Getter;
 

tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/TweedDataVisitor.java

@@ -1,6 +1,6 @@
-package de.siphalor.tweed5.dataapi.api;
+package de.siphalor.tweed5.serde_api.api;
 
-import de.siphalor.tweed5.dataapi.api.decoration.TweedDataDecoration;
+import de.siphalor.tweed5.serde_api.api.decoration.TweedDataDecoration;
 import org.jspecify.annotations.Nullable;
 
 public interface TweedDataVisitor {

tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/TweedDataWriteException.java

@@ -1,4 +1,4 @@
-package de.siphalor.tweed5.dataapi.api;
+package de.siphalor.tweed5.serde_api.api;
 
 public class TweedDataWriteException extends RuntimeException {
 	public TweedDataWriteException() {

tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/TweedDataWriter.java

@@ -1,4 +1,4 @@
-package de.siphalor.tweed5.dataapi.api;
+package de.siphalor.tweed5.serde_api.api;
 
 public interface TweedDataWriter extends TweedDataVisitor, AutoCloseable {
 }

tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/TweedSerde.java

@@ -1,4 +1,4 @@
-package de.siphalor.tweed5.dataapi.api;
+package de.siphalor.tweed5.serde_api.api;
 
 import java.io.IOException;
 import java.io.InputStream;

tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/decoration/TweedDataCommentDecoration.java

@@ -1,4 +1,4 @@
-package de.siphalor.tweed5.dataapi.api.decoration;
+package de.siphalor.tweed5.serde_api.api.decoration;
 
 public interface TweedDataCommentDecoration extends TweedDataDecoration {
 	String comment();

tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/decoration/TweedDataDecoration.java

@@ -1,4 +1,4 @@
-package de.siphalor.tweed5.dataapi.api.decoration;
+package de.siphalor.tweed5.serde_api.api.decoration;
 
 /**
  * Marker interface for "decorative" information during (de)serialization.

tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/decoration/package-info.java

@@ -1,4 +1,4 @@
 @NullMarked
-package de.siphalor.tweed5.dataapi.api.decoration;
+package de.siphalor.tweed5.serde_api.api.decoration;
 
 import org.jspecify.annotations.NullMarked;

tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/package-info.java

@@ -1,4 +1,4 @@
 @NullMarked
-package de.siphalor.tweed5.data.jackson;
+package de.siphalor.tweed5.serde_api.api;
 
 import org.jspecify.annotations.NullMarked;

tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/readwrite/package-info.java

@@ -1,4 +0,0 @@
-@NullMarked
-package de.siphalor.tweed5.data.extension.api.readwrite;
-
-import org.jspecify.annotations.NullMarked;

tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/impl/TweedReadWriteContextImpl.java

@@ -1,13 +0,0 @@
-package de.siphalor.tweed5.data.extension.impl;
-
-import de.siphalor.tweed5.data.extension.api.ReadWriteExtension;
-import de.siphalor.tweed5.data.extension.api.TweedReadContext;
-import de.siphalor.tweed5.data.extension.api.TweedWriteContext;
-import de.siphalor.tweed5.patchwork.api.Patchwork;
-import lombok.Value;
-
-@Value
-public class TweedReadWriteContextImpl implements TweedReadContext, TweedWriteContext {
-	ReadWriteExtension readWriteExtension;
-	Patchwork extensionsData;
-}

tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/ReadWriteExtension.java

@@ -1,11 +1,11 @@
-package de.siphalor.tweed5.data.extension.api;
+package de.siphalor.tweed5.serde.extension.api;
 
 import de.siphalor.tweed5.core.api.entry.ConfigEntry;
 import de.siphalor.tweed5.core.api.extension.TweedExtension;
-import de.siphalor.tweed5.data.extension.api.readwrite.TweedEntryReaderWriter;
+import de.siphalor.tweed5.serde.extension.api.readwrite.TweedEntryReaderWriter;
-import de.siphalor.tweed5.data.extension.impl.ReadWriteExtensionImpl;
+import de.siphalor.tweed5.serde.extension.impl.ReadWriteExtensionImpl;
-import de.siphalor.tweed5.dataapi.api.TweedDataReader;
+import de.siphalor.tweed5.serde_api.api.TweedDataReader;
-import de.siphalor.tweed5.dataapi.api.TweedDataVisitor;
+import de.siphalor.tweed5.serde_api.api.TweedDataVisitor;
 import de.siphalor.tweed5.patchwork.api.Patchwork;
 import org.jspecify.annotations.Nullable;
 

tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/TweedEntryReadException.java

@@ -1,4 +1,4 @@
-package de.siphalor.tweed5.data.extension.api;
+package de.siphalor.tweed5.serde.extension.api;
 
 import lombok.Getter;
 

tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/TweedEntryReader.java

@@ -1,7 +1,7 @@
-package de.siphalor.tweed5.data.extension.api;
+package de.siphalor.tweed5.serde.extension.api;
 
 import de.siphalor.tweed5.core.api.entry.ConfigEntry;
-import de.siphalor.tweed5.dataapi.api.TweedDataReader;
+import de.siphalor.tweed5.serde_api.api.TweedDataReader;
 import org.jspecify.annotations.Nullable;
 
 @FunctionalInterface

tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/TweedEntryWriteException.java

@@ -1,4 +1,4 @@
-package de.siphalor.tweed5.data.extension.api;
+package de.siphalor.tweed5.serde.extension.api;
 
 import lombok.Getter;
 

tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/TweedEntryWriter.java

@@ -1,8 +1,8 @@
-package de.siphalor.tweed5.data.extension.api;
+package de.siphalor.tweed5.serde.extension.api;
 
 import de.siphalor.tweed5.core.api.entry.ConfigEntry;
-import de.siphalor.tweed5.dataapi.api.TweedDataVisitor;
+import de.siphalor.tweed5.serde_api.api.TweedDataVisitor;
-import de.siphalor.tweed5.dataapi.api.TweedDataWriteException;
+import de.siphalor.tweed5.serde_api.api.TweedDataWriteException;
 import org.jspecify.annotations.Nullable;
 
 @FunctionalInterface

tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/TweedReadContext.java

@@ -1,4 +1,4 @@
-package de.siphalor.tweed5.data.extension.api;
+package de.siphalor.tweed5.serde.extension.api;
 
 import de.siphalor.tweed5.patchwork.api.Patchwork;
 

tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/TweedReaderWriterProvider.java

@@ -1,4 +1,4 @@
-package de.siphalor.tweed5.data.extension.api;
+package de.siphalor.tweed5.serde.extension.api;
 
 import lombok.RequiredArgsConstructor;
 

tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/TweedWriteContext.java

@@ -1,4 +1,4 @@
-package de.siphalor.tweed5.data.extension.api;
+package de.siphalor.tweed5.serde.extension.api;
 
 import de.siphalor.tweed5.patchwork.api.Patchwork;
 

tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/extension/ReadWriteExtensionSetupContext.java

@@ -1,8 +1,8 @@
-package de.siphalor.tweed5.data.extension.api.extension;
+package de.siphalor.tweed5.serde.extension.api.extension;
 
 import de.siphalor.tweed5.core.api.middleware.Middleware;
-import de.siphalor.tweed5.data.extension.api.TweedEntryReader;
+import de.siphalor.tweed5.serde.extension.api.TweedEntryReader;
-import de.siphalor.tweed5.data.extension.api.TweedEntryWriter;
+import de.siphalor.tweed5.serde.extension.api.TweedEntryWriter;
 import de.siphalor.tweed5.patchwork.api.PatchworkPartAccess;
 
 public interface ReadWriteExtensionSetupContext {

tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/extension/ReadWriteRelatedExtension.java

@@ -1,4 +1,4 @@
-package de.siphalor.tweed5.data.extension.api.extension;
+package de.siphalor.tweed5.serde.extension.api.extension;
 
 public interface ReadWriteRelatedExtension {
 	default void setupReadWriteExtension(ReadWriteExtensionSetupContext context) {

tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/package-info.java

@@ -1,4 +1,4 @@
 @NullMarked
-package de.siphalor.tweed5.data.extension.api;
+package de.siphalor.tweed5.serde.extension.api;
 
 import org.jspecify.annotations.NullMarked;

tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/readwrite/TweedEntryReaderWriter.java

@@ -1,8 +1,8 @@
-package de.siphalor.tweed5.data.extension.api.readwrite;
+package de.siphalor.tweed5.serde.extension.api.readwrite;
 
 import de.siphalor.tweed5.core.api.entry.ConfigEntry;
-import de.siphalor.tweed5.data.extension.api.TweedEntryReader;
+import de.siphalor.tweed5.serde.extension.api.TweedEntryReader;
-import de.siphalor.tweed5.data.extension.api.TweedEntryWriter;
+import de.siphalor.tweed5.serde.extension.api.TweedEntryWriter;
 import org.jspecify.annotations.Nullable;
 
 public interface TweedEntryReaderWriter<T extends @Nullable Object, C extends ConfigEntry<T>> extends TweedEntryReader<T, C>, TweedEntryWriter<T, C> {}

tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/readwrite/TweedEntryReaderWriters.java

@@ -1,12 +1,12 @@
-package de.siphalor.tweed5.data.extension.api.readwrite;
+package de.siphalor.tweed5.serde.extension.api.readwrite;
 
 import de.siphalor.tweed5.core.api.entry.CollectionConfigEntry;
 import de.siphalor.tweed5.core.api.entry.CompoundConfigEntry;
 import de.siphalor.tweed5.core.api.entry.ConfigEntry;
 import de.siphalor.tweed5.core.api.entry.NullableConfigEntry;
-import de.siphalor.tweed5.data.extension.api.TweedEntryReader;
+import de.siphalor.tweed5.serde.extension.api.TweedEntryReader;
-import de.siphalor.tweed5.data.extension.api.TweedEntryWriter;
+import de.siphalor.tweed5.serde.extension.api.TweedEntryWriter;
-import de.siphalor.tweed5.data.extension.impl.TweedEntryReaderWriterImpls;
+import de.siphalor.tweed5.serde.extension.impl.TweedEntryReaderWriterImpls;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.jspecify.annotations.NonNull;

tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/readwrite/package-info.java

@@ -0,0 +1,4 @@
+@NullMarked
+package de.siphalor.tweed5.serde.extension.api.readwrite;
+
+import org.jspecify.annotations.NullMarked;

tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/impl/DefaultTweedEntryReaderWriterImplsProvider.java

@@ -1,15 +1,15 @@
-package de.siphalor.tweed5.data.extension.impl;
+package de.siphalor.tweed5.serde.extension.impl;
 
 import com.google.auto.service.AutoService;
-import de.siphalor.tweed5.data.extension.api.TweedEntryReader;
+import de.siphalor.tweed5.serde.extension.api.TweedEntryReader;
-import de.siphalor.tweed5.data.extension.api.TweedEntryWriter;
+import de.siphalor.tweed5.serde.extension.api.TweedEntryWriter;
-import de.siphalor.tweed5.data.extension.api.TweedReaderWriterProvider;
+import de.siphalor.tweed5.serde.extension.api.TweedReaderWriterProvider;
-import de.siphalor.tweed5.data.extension.api.readwrite.TweedEntryReaderWriters;
+import de.siphalor.tweed5.serde.extension.api.readwrite.TweedEntryReaderWriters;
 import lombok.RequiredArgsConstructor;
 
 import java.util.function.Function;
 
-import static de.siphalor.tweed5.data.extension.api.readwrite.TweedEntryReaderWriters.*;
+import static de.siphalor.tweed5.serde.extension.api.readwrite.TweedEntryReaderWriters.*;
 
 @AutoService(TweedReaderWriterProvider.class)
 public class DefaultTweedEntryReaderWriterImplsProvider implements TweedReaderWriterProvider {

tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/impl/ReadWriteExtensionImpl.java

@@ -1,4 +1,4 @@
-package de.siphalor.tweed5.data.extension.impl;
+package de.siphalor.tweed5.serde.extension.impl;
 
 import de.siphalor.tweed5.core.api.container.ConfigContainer;
 import de.siphalor.tweed5.core.api.entry.ConfigEntry;
@@ -6,12 +6,12 @@ import de.siphalor.tweed5.core.api.extension.TweedExtension;
 import de.siphalor.tweed5.core.api.extension.TweedExtensionSetupContext;
 import de.siphalor.tweed5.core.api.middleware.DefaultMiddlewareContainer;
 import de.siphalor.tweed5.core.api.middleware.Middleware;
-import de.siphalor.tweed5.data.extension.api.*;
+import de.siphalor.tweed5.serde.extension.api.*;
-import de.siphalor.tweed5.data.extension.api.extension.ReadWriteExtensionSetupContext;
+import de.siphalor.tweed5.serde.extension.api.extension.ReadWriteExtensionSetupContext;
-import de.siphalor.tweed5.data.extension.api.extension.ReadWriteRelatedExtension;
+import de.siphalor.tweed5.serde.extension.api.extension.ReadWriteRelatedExtension;
-import de.siphalor.tweed5.dataapi.api.TweedDataReader;
+import de.siphalor.tweed5.serde_api.api.TweedDataReader;
-import de.siphalor.tweed5.dataapi.api.TweedDataVisitor;
+import de.siphalor.tweed5.serde_api.api.TweedDataVisitor;
-import de.siphalor.tweed5.dataapi.api.TweedDataWriteException;
+import de.siphalor.tweed5.serde_api.api.TweedDataWriteException;
 import de.siphalor.tweed5.patchwork.api.Patchwork;
 import de.siphalor.tweed5.patchwork.api.PatchworkFactory;
 import de.siphalor.tweed5.patchwork.api.PatchworkPartAccess;

tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/impl/TweedEntryReaderWriterImpls.java

@@ -1,12 +1,12 @@
-package de.siphalor.tweed5.data.extension.impl;
+package de.siphalor.tweed5.serde.extension.impl;
 
 import de.siphalor.tweed5.core.api.entry.CollectionConfigEntry;
 import de.siphalor.tweed5.core.api.entry.CompoundConfigEntry;
 import de.siphalor.tweed5.core.api.entry.ConfigEntry;
 import de.siphalor.tweed5.core.api.entry.NullableConfigEntry;
-import de.siphalor.tweed5.data.extension.api.*;
+import de.siphalor.tweed5.serde.extension.api.*;
-import de.siphalor.tweed5.data.extension.api.readwrite.TweedEntryReaderWriter;
+import de.siphalor.tweed5.serde.extension.api.readwrite.TweedEntryReaderWriter;
-import de.siphalor.tweed5.dataapi.api.*;
+import de.siphalor.tweed5.serde_api.api.*;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import lombok.RequiredArgsConstructor;
@@ -19,7 +19,8 @@ import java.util.function.Predicate;
 
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class TweedEntryReaderWriterImpls {
-	public static final TweedEntryReaderWriter<Boolean, ConfigEntry<Boolean>> BOOLEAN_READER_WRITER = new PrimitiveReaderWriter<>(TweedDataToken::readAsBoolean, TweedDataVisitor::visitBoolean);
+	public static final TweedEntryReaderWriter<Boolean, ConfigEntry<Boolean>> BOOLEAN_READER_WRITER = new PrimitiveReaderWriter<>(
+			TweedDataToken::readAsBoolean, TweedDataVisitor::visitBoolean);
 	public static final TweedEntryReaderWriter<Byte, ConfigEntry<Byte>> BYTE_READER_WRITER = new PrimitiveReaderWriter<>(TweedDataToken::readAsByte, TweedDataVisitor::visitByte);
 	public static final TweedEntryReaderWriter<Short, ConfigEntry<Short>> SHORT_READER_WRITER = new PrimitiveReaderWriter<>(TweedDataToken::readAsShort, TweedDataVisitor::visitShort);
 	public static final TweedEntryReaderWriter<Integer, ConfigEntry<Integer>> INT_READER_WRITER = new PrimitiveReaderWriter<>(TweedDataToken::readAsInt, TweedDataVisitor::visitInt);

tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/impl/TweedReadWriteContextImpl.java

@@ -0,0 +1,13 @@
+package de.siphalor.tweed5.serde.extension.impl;
+
+import de.siphalor.tweed5.serde.extension.api.ReadWriteExtension;
+import de.siphalor.tweed5.serde.extension.api.TweedReadContext;
+import de.siphalor.tweed5.serde.extension.api.TweedWriteContext;
+import de.siphalor.tweed5.patchwork.api.Patchwork;
+import lombok.Value;
+
+@Value
+public class TweedReadWriteContextImpl implements TweedReadContext, TweedWriteContext {
+	ReadWriteExtension readWriteExtension;
+	Patchwork extensionsData;
+}

tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/impl/package-info.java

@@ -1,6 +1,6 @@
 @ApiStatus.Internal
 @NullMarked
-package de.siphalor.tweed5.data.extension.impl;
+package de.siphalor.tweed5.serde.extension.impl;
 
 import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;

tweed5/serde-extension/src/test/java/de/siphalor/tweed5/serde/extension/impl/ReadWriteExtensionImplTest.java

@@ -1,4 +1,4 @@
-package de.siphalor.tweed5.data.extension.impl;
+package de.siphalor.tweed5.serde.extension.impl;
 
 import de.siphalor.tweed5.core.api.container.ConfigContainer;
 import de.siphalor.tweed5.core.api.entry.CollectionConfigEntry;
@@ -8,11 +8,11 @@ import de.siphalor.tweed5.core.impl.DefaultConfigContainer;
 import de.siphalor.tweed5.core.impl.entry.CollectionConfigEntryImpl;
 import de.siphalor.tweed5.core.impl.entry.SimpleConfigEntryImpl;
 import de.siphalor.tweed5.core.impl.entry.StaticMapCompoundConfigEntryImpl;
-import de.siphalor.tweed5.data.extension.api.ReadWriteExtension;
+import de.siphalor.tweed5.serde.extension.api.ReadWriteExtension;
-import de.siphalor.tweed5.data.hjson.HjsonLexer;
+import de.siphalor.tweed5.serde.hjson.HjsonLexer;
-import de.siphalor.tweed5.data.hjson.HjsonReader;
+import de.siphalor.tweed5.serde.hjson.HjsonReader;
-import de.siphalor.tweed5.data.hjson.HjsonWriter;
+import de.siphalor.tweed5.serde.hjson.HjsonWriter;
-import de.siphalor.tweed5.dataapi.api.TweedDataVisitor;
+import de.siphalor.tweed5.serde_api.api.TweedDataVisitor;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -22,8 +22,8 @@ import java.io.Writer;
 import java.util.*;
 import java.util.function.Function;
 
-import static de.siphalor.tweed5.data.extension.api.ReadWriteExtension.entryReaderWriter;
+import static de.siphalor.tweed5.serde.extension.api.ReadWriteExtension.entryReaderWriter;
-import static de.siphalor.tweed5.data.extension.api.readwrite.TweedEntryReaderWriters.*;
+import static de.siphalor.tweed5.serde.extension.api.readwrite.TweedEntryReaderWriters.*;
 import static de.siphalor.tweed5.testutils.generic.MapTestUtils.sequencedMap;
 import static java.util.Map.entry;
 import static org.assertj.core.api.Assertions.assertThat;

tweed5/serde-gson/src/main/java/de/siphalor/tweed5/serde/gson/GsonReader.java

@@ -1,10 +1,10 @@
-package de.siphalor.tweed5.data.gson;
+package de.siphalor.tweed5.serde.gson;
 
 import com.google.gson.stream.JsonReader;
-import de.siphalor.tweed5.dataapi.api.TweedDataReadException;
+import de.siphalor.tweed5.serde_api.api.TweedDataReadException;
-import de.siphalor.tweed5.dataapi.api.TweedDataReader;
+import de.siphalor.tweed5.serde_api.api.TweedDataReader;
-import de.siphalor.tweed5.dataapi.api.TweedDataToken;
+import de.siphalor.tweed5.serde_api.api.TweedDataToken;
-import de.siphalor.tweed5.dataapi.api.TweedDataTokens;
+import de.siphalor.tweed5.serde_api.api.TweedDataTokens;
 import org.jspecify.annotations.Nullable;
 
 import java.io.IOException;

tweed5/serde-gson/src/main/java/de/siphalor/tweed5/serde/gson/GsonWriter.java

@@ -1,10 +1,10 @@
-package de.siphalor.tweed5.data.gson;
+package de.siphalor.tweed5.serde.gson;
 
 import com.google.gson.stream.JsonWriter;
-import de.siphalor.tweed5.dataapi.api.TweedDataWriteException;
+import de.siphalor.tweed5.serde_api.api.TweedDataWriteException;
-import de.siphalor.tweed5.dataapi.api.TweedDataWriter;
+import de.siphalor.tweed5.serde_api.api.TweedDataWriter;
-import de.siphalor.tweed5.dataapi.api.decoration.TweedDataCommentDecoration;
+import de.siphalor.tweed5.serde_api.api.decoration.TweedDataCommentDecoration;
-import de.siphalor.tweed5.dataapi.api.decoration.TweedDataDecoration;
+import de.siphalor.tweed5.serde_api.api.decoration.TweedDataDecoration;
 
 import java.io.IOException;
 import java.util.ArrayDeque;

tweed5/serde-gson/src/main/java/de/siphalor/tweed5/serde/gson/package-info.java

@@ -1,4 +1,4 @@
 @NullMarked
-package de.siphalor.tweed5.data.gson;
+package de.siphalor.tweed5.serde.gson;
 
 import org.jspecify.annotations.NullMarked;

tweed5/serde-gson/src/test/java/de/siphalor/tweed5/serde/gson/GsonReaderTest.java

@@ -1,8 +1,9 @@
-package de.siphalor.tweed5.data.gson;
+package de.siphalor.tweed5.serde.gson;
 
 import com.google.gson.GsonBuilder;
 import com.google.gson.stream.JsonReader;
-import de.siphalor.tweed5.dataapi.api.TweedDataReader;
+import de.siphalor.tweed5.serde.gson.GsonReader;
+import de.siphalor.tweed5.serde_api.api.TweedDataReader;
 import de.siphalor.tweed5.testutils.serde.json.JsonReaderTest;
 
 import java.io.StringReader;

tweed5/serde-gson/src/test/java/de/siphalor/tweed5/serde/gson/GsonWriterTest.java

@@ -1,7 +1,8 @@
-package de.siphalor.tweed5.data.gson;
+package de.siphalor.tweed5.serde.gson;
 
 import com.google.gson.GsonBuilder;
-import de.siphalor.tweed5.dataapi.api.TweedDataWriter;
+import de.siphalor.tweed5.serde.gson.GsonWriter;
+import de.siphalor.tweed5.serde_api.api.TweedDataWriter;
 import de.siphalor.tweed5.testutils.serde.json.JsonWriterTest;
 import lombok.SneakyThrows;
 

tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/serde/hjson/HjsonCommentType.java

@@ -1,4 +1,4 @@
-package de.siphalor.tweed5.data.hjson;
+package de.siphalor.tweed5.serde.hjson;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/serde/hjson/HjsonLexer.java

@@ -1,6 +1,6 @@
-package de.siphalor.tweed5.data.hjson;
+package de.siphalor.tweed5.serde.hjson;
 
-import de.siphalor.tweed5.dataapi.api.TweedDataReadException;
+import de.siphalor.tweed5.serde_api.api.TweedDataReadException;
 import lombok.RequiredArgsConstructor;
 import org.jspecify.annotations.Nullable;
 

tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/serde/hjson/HjsonLexerToken.java

@@ -1,4 +1,4 @@
-package de.siphalor.tweed5.data.hjson;
+package de.siphalor.tweed5.serde.hjson;
 
 import lombok.EqualsAndHashCode;
 import lombok.Value;

tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/serde/hjson/HjsonReadPosition.java

@@ -1,4 +1,4 @@
-package de.siphalor.tweed5.data.hjson;
+package de.siphalor.tweed5.serde.hjson;
 
 import lombok.*;
 import org.jetbrains.annotations.ApiStatus;

tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/serde/hjson/HjsonReader.java

@@ -1,6 +1,6 @@
-package de.siphalor.tweed5.data.hjson;
+package de.siphalor.tweed5.serde.hjson;
 
-import de.siphalor.tweed5.dataapi.api.*;
+import de.siphalor.tweed5.serde_api.api.*;
 import org.jspecify.annotations.NullUnmarked;
 import org.jspecify.annotations.Nullable;
 

tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/serde/hjson/HjsonSerde.java

@@ -1,8 +1,8 @@
-package de.siphalor.tweed5.data.hjson;
+package de.siphalor.tweed5.serde.hjson;
 
-import de.siphalor.tweed5.dataapi.api.TweedDataReader;
+import de.siphalor.tweed5.serde_api.api.TweedDataReader;
-import de.siphalor.tweed5.dataapi.api.TweedDataWriter;
+import de.siphalor.tweed5.serde_api.api.TweedDataWriter;
-import de.siphalor.tweed5.dataapi.api.TweedSerde;
+import de.siphalor.tweed5.serde_api.api.TweedSerde;
 import lombok.RequiredArgsConstructor;
 
 import java.io.*;

tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/serde/hjson/HjsonStringType.java

@@ -1,4 +1,4 @@
-package de.siphalor.tweed5.data.hjson;
+package de.siphalor.tweed5.serde.hjson;
 
 public enum HjsonStringType {
 	INLINE_QUOTELESS,

tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/serde/hjson/HjsonWriter.java

@@ -1,9 +1,9 @@
-package de.siphalor.tweed5.data.hjson;
+package de.siphalor.tweed5.serde.hjson;
 
-import de.siphalor.tweed5.dataapi.api.TweedDataWriteException;
+import de.siphalor.tweed5.serde_api.api.TweedDataWriteException;
-import de.siphalor.tweed5.dataapi.api.TweedDataWriter;
+import de.siphalor.tweed5.serde_api.api.TweedDataWriter;
-import de.siphalor.tweed5.dataapi.api.decoration.TweedDataCommentDecoration;
+import de.siphalor.tweed5.serde_api.api.decoration.TweedDataCommentDecoration;
-import de.siphalor.tweed5.dataapi.api.decoration.TweedDataDecoration;
+import de.siphalor.tweed5.serde_api.api.decoration.TweedDataDecoration;
 import lombok.Data;
 
 import java.io.IOException;

tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/serde/hjson/package-info.java

@@ -1,4 +1,4 @@
 @NullMarked
-package de.siphalor.tweed5.dataapi.api;
+package de.siphalor.tweed5.serde.hjson;
 
 import org.jspecify.annotations.NullMarked;

tweed5/serde-hjson/src/test/java/de/siphalor/tweed5/serde/hjson/HjsonLexerTest.java

@@ -1,5 +1,8 @@
-package de.siphalor.tweed5.data.hjson;
+package de.siphalor.tweed5.serde.hjson;
 
+import de.siphalor.tweed5.serde.hjson.HjsonLexer;
+import de.siphalor.tweed5.serde.hjson.HjsonLexerToken;
+import de.siphalor.tweed5.serde.hjson.HjsonReadPosition;
 import lombok.SneakyThrows;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;

tweed5/serde-hjson/src/test/java/de/siphalor/tweed5/serde/hjson/HjsonReaderTest.java

@@ -1,7 +1,9 @@
-package de.siphalor.tweed5.data.hjson;
+package de.siphalor.tweed5.serde.hjson;
 
-import de.siphalor.tweed5.dataapi.api.TweedDataReader;
+import de.siphalor.tweed5.serde.hjson.HjsonLexer;
-import de.siphalor.tweed5.dataapi.api.TweedDataToken;
+import de.siphalor.tweed5.serde.hjson.HjsonReader;
+import de.siphalor.tweed5.serde_api.api.TweedDataReader;
+import de.siphalor.tweed5.serde_api.api.TweedDataToken;
 import de.siphalor.tweed5.testutils.serde.json.JsonReaderTest;
 import lombok.SneakyThrows;
 import org.junit.jupiter.params.ParameterizedTest;

tweed5/serde-hjson/src/test/java/de/siphalor/tweed5/serde/hjson/HjsonWriterTest.java

@@ -1,5 +1,6 @@
-package de.siphalor.tweed5.data.hjson;
+package de.siphalor.tweed5.serde.hjson;
 
+import de.siphalor.tweed5.serde.hjson.HjsonWriter;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -54,4 +55,4 @@ class HjsonWriterTest {
 	void setUpHjsonWriter(HjsonWriter.Options options) {
 		writer = new HjsonWriter(stringWriter, options);
 	}
-}
+}

tweed5/serde-jackson/src/main/java/de/siphalor/tweed5/serde/jackson/JacksonReader.java

@@ -1,11 +1,11 @@
-package de.siphalor.tweed5.data.jackson;
+package de.siphalor.tweed5.serde.jackson;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
-import de.siphalor.tweed5.dataapi.api.TweedDataReadException;
+import de.siphalor.tweed5.serde_api.api.TweedDataReadException;
-import de.siphalor.tweed5.dataapi.api.TweedDataReader;
+import de.siphalor.tweed5.serde_api.api.TweedDataReader;
-import de.siphalor.tweed5.dataapi.api.TweedDataToken;
+import de.siphalor.tweed5.serde_api.api.TweedDataToken;
-import de.siphalor.tweed5.dataapi.api.TweedDataTokens;
+import de.siphalor.tweed5.serde_api.api.TweedDataTokens;
 import org.jspecify.annotations.Nullable;
 
 import java.io.IOException;

tweed5/serde-jackson/src/main/java/de/siphalor/tweed5/serde/jackson/JacksonWriter.java

@@ -1,10 +1,10 @@
-package de.siphalor.tweed5.data.jackson;
+package de.siphalor.tweed5.serde.jackson;
 
 import com.fasterxml.jackson.core.JsonGenerator;
-import de.siphalor.tweed5.dataapi.api.TweedDataWriteException;
+import de.siphalor.tweed5.serde_api.api.TweedDataWriteException;
-import de.siphalor.tweed5.dataapi.api.TweedDataWriter;
+import de.siphalor.tweed5.serde_api.api.TweedDataWriter;
-import de.siphalor.tweed5.dataapi.api.decoration.TweedDataCommentDecoration;
+import de.siphalor.tweed5.serde_api.api.decoration.TweedDataCommentDecoration;
-import de.siphalor.tweed5.dataapi.api.decoration.TweedDataDecoration;
+import de.siphalor.tweed5.serde_api.api.decoration.TweedDataDecoration;
 
 import java.io.IOException;
 import java.util.ArrayDeque;

tweed5/serde-jackson/src/main/java/de/siphalor/tweed5/serde/jackson/package-info.java

@@ -1,4 +1,4 @@
 @NullMarked
-package de.siphalor.tweed5.data.hjson;
+package de.siphalor.tweed5.serde.jackson;
 
 import org.jspecify.annotations.NullMarked;

tweed5/serde-jackson/src/test/java/de/siphalor/tweed5/serde/jackson/JacksonReaderTest.java

@@ -1,8 +1,9 @@
-package de.siphalor.tweed5.data.jackson;
+package de.siphalor.tweed5.serde.jackson;
 
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.StreamReadFeature;
-import de.siphalor.tweed5.dataapi.api.TweedDataReader;
+import de.siphalor.tweed5.serde.jackson.JacksonReader;
+import de.siphalor.tweed5.serde_api.api.TweedDataReader;
 import de.siphalor.tweed5.testutils.serde.json.JsonReaderTest;
 import lombok.SneakyThrows;
 import org.junit.jupiter.api.Disabled;

tweed5/serde-jackson/src/test/java/de/siphalor/tweed5/serde/jackson/JacksonWriterTest.java

@@ -1,10 +1,11 @@
-package de.siphalor.tweed5.data.jackson;
+package de.siphalor.tweed5.serde.jackson;
 
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.util.DefaultIndenter;
 import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
 import com.fasterxml.jackson.core.util.Separators;
-import de.siphalor.tweed5.dataapi.api.TweedDataWriter;
+import de.siphalor.tweed5.serde.jackson.JacksonWriter;
+import de.siphalor.tweed5.serde_api.api.TweedDataWriter;
 import de.siphalor.tweed5.testutils.serde.json.JsonWriterTest;
 import lombok.SneakyThrows;
 

tweed5/test-utils/serde-json/src/main/java/de/siphalor/tweed5/testutils/serde/json/JsonReaderTest.java

@@ -1,7 +1,7 @@
 package de.siphalor.tweed5.testutils.serde.json;
 
-import de.siphalor.tweed5.dataapi.api.TweedDataReader;
+import de.siphalor.tweed5.serde_api.api.TweedDataReader;
-import de.siphalor.tweed5.dataapi.api.TweedDataToken;
+import de.siphalor.tweed5.serde_api.api.TweedDataToken;
 import lombok.SneakyThrows;
 import org.assertj.core.data.Offset;
 import org.junit.jupiter.api.Test;

tweed5/test-utils/serde-json/src/main/java/de/siphalor/tweed5/testutils/serde/json/JsonWriterTest.java

@@ -1,7 +1,7 @@
 package de.siphalor.tweed5.testutils.serde.json;
 
-import de.siphalor.tweed5.dataapi.api.TweedDataWriter;
+import de.siphalor.tweed5.serde_api.api.TweedDataWriter;
-import de.siphalor.tweed5.dataapi.api.decoration.TweedDataCommentDecoration;
+import de.siphalor.tweed5.serde_api.api.decoration.TweedDataCommentDecoration;
 import lombok.SneakyThrows;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;

tweed5/weaver-pojo-serde-extension/src/main/java/de/siphalor/tweed5/weaver/pojoext/serde/api/ReadWritePojoWeavingProcessor.java

@@ -2,11 +2,11 @@ package de.siphalor.tweed5.weaver.pojoext.serde.api;
 
 import de.siphalor.tweed5.core.api.container.ConfigContainer;
 import de.siphalor.tweed5.core.api.entry.ConfigEntry;
-import de.siphalor.tweed5.data.extension.api.ReadWriteExtension;
+import de.siphalor.tweed5.serde.extension.api.ReadWriteExtension;
-import de.siphalor.tweed5.data.extension.api.TweedEntryReader;
+import de.siphalor.tweed5.serde.extension.api.TweedEntryReader;
-import de.siphalor.tweed5.data.extension.api.TweedEntryWriter;
+import de.siphalor.tweed5.serde.extension.api.TweedEntryWriter;
-import de.siphalor.tweed5.data.extension.api.TweedReaderWriterProvider;
+import de.siphalor.tweed5.serde.extension.api.TweedReaderWriterProvider;
-import de.siphalor.tweed5.data.extension.impl.TweedEntryReaderWriterImpls;
+import de.siphalor.tweed5.serde.extension.impl.TweedEntryReaderWriterImpls;
 import de.siphalor.tweed5.typeutils.api.type.ActualType;
 import de.siphalor.tweed5.weaver.pojo.api.weaving.TweedPojoWeavingExtension;
 import de.siphalor.tweed5.weaver.pojo.api.weaving.WeavingContext;

tweed5/weaver-pojo-serde-extension/src/main/java/de/siphalor/tweed5/weaver/pojoext/serde/api/auto/AutoReadWritePojoWeavingProcessor.java

@@ -3,12 +3,12 @@ package de.siphalor.tweed5.weaver.pojoext.serde.api.auto;
 import de.siphalor.tweed5.core.api.container.ConfigContainer;
 import de.siphalor.tweed5.core.api.entry.ConfigEntry;
 import de.siphalor.tweed5.core.api.entry.NullableConfigEntry;
-import de.siphalor.tweed5.data.extension.api.ReadWriteExtension;
+import de.siphalor.tweed5.serde.extension.api.ReadWriteExtension;
-import de.siphalor.tweed5.data.extension.api.TweedEntryReader;
+import de.siphalor.tweed5.serde.extension.api.TweedEntryReader;
-import de.siphalor.tweed5.data.extension.api.TweedEntryWriter;
+import de.siphalor.tweed5.serde.extension.api.TweedEntryWriter;
-import de.siphalor.tweed5.data.extension.api.TweedReaderWriterProvider;
+import de.siphalor.tweed5.serde.extension.api.TweedReaderWriterProvider;
-import de.siphalor.tweed5.data.extension.api.readwrite.TweedEntryReaderWriters;
+import de.siphalor.tweed5.serde.extension.api.readwrite.TweedEntryReaderWriters;
-import de.siphalor.tweed5.data.extension.impl.TweedEntryReaderWriterImpls;
+import de.siphalor.tweed5.serde.extension.impl.TweedEntryReaderWriterImpls;
 import de.siphalor.tweed5.patchwork.api.Patchwork;
 import de.siphalor.tweed5.patchwork.api.PatchworkPartAccess;
 import de.siphalor.tweed5.typeutils.api.type.ActualType;

tweed5/weaver-pojo-serde-extension/src/main/java/de/siphalor/tweed5/weaver/pojoext/serde/api/nullable/AutoNullableReadWritePojoWeavingProcessor.java

@@ -2,8 +2,8 @@ package de.siphalor.tweed5.weaver.pojoext.serde.api.nullable;
 
 import de.siphalor.tweed5.core.api.container.ConfigContainer;
 import de.siphalor.tweed5.core.api.entry.ConfigEntry;
-import de.siphalor.tweed5.data.extension.api.ReadWriteExtension;
+import de.siphalor.tweed5.serde.extension.api.ReadWriteExtension;
-import de.siphalor.tweed5.data.extension.impl.TweedEntryReaderWriterImpls;
+import de.siphalor.tweed5.serde.extension.impl.TweedEntryReaderWriterImpls;
 import de.siphalor.tweed5.patchwork.api.Patchwork;
 import de.siphalor.tweed5.patchwork.api.PatchworkPartAccess;
 import de.siphalor.tweed5.typeutils.api.type.ActualType;

tweed5/weaver-pojo-serde-extension/src/main/java/de/siphalor/tweed5/weaver/pojoext/serde/impl/ReaderWriterLoader.java

@@ -1,9 +1,9 @@
 package de.siphalor.tweed5.weaver.pojoext.serde.impl;
 
-import de.siphalor.tweed5.data.extension.api.TweedEntryReader;
+import de.siphalor.tweed5.serde.extension.api.TweedEntryReader;
-import de.siphalor.tweed5.data.extension.api.TweedEntryWriter;
+import de.siphalor.tweed5.serde.extension.api.TweedEntryWriter;
-import de.siphalor.tweed5.data.extension.api.TweedReaderWriterProvider;
+import de.siphalor.tweed5.serde.extension.api.TweedReaderWriterProvider;
-import de.siphalor.tweed5.data.extension.impl.TweedEntryReaderWriterImpls;
+import de.siphalor.tweed5.serde.extension.impl.TweedEntryReaderWriterImpls;
 import lombok.Getter;
 import lombok.extern.apachecommons.CommonsLog;
 import org.jspecify.annotations.Nullable;
@@ -14,7 +14,6 @@ import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Optional;
 
 @CommonsLog
 public class ReaderWriterLoader {

tweed5/weaver-pojo-serde-extension/src/test/java/de/siphalor/tweed5/weaver/pojoext/serde/api/ReadWritePojoWeavingProcessorTest.java

@@ -3,18 +3,17 @@ package de.siphalor.tweed5.weaver.pojoext.serde.api;
 import com.google.auto.service.AutoService;
 import de.siphalor.tweed5.core.api.container.ConfigContainer;
 import de.siphalor.tweed5.core.api.entry.ConfigEntry;
-import de.siphalor.tweed5.data.extension.api.ReadWriteExtension;
+import de.siphalor.tweed5.serde.extension.api.ReadWriteExtension;
-import de.siphalor.tweed5.data.extension.api.TweedEntryWriter;
+import de.siphalor.tweed5.serde.extension.api.TweedEntryWriter;
-import de.siphalor.tweed5.data.extension.api.TweedReaderWriterProvider;
+import de.siphalor.tweed5.serde.extension.api.TweedReaderWriterProvider;
-import de.siphalor.tweed5.data.extension.api.TweedWriteContext;
+import de.siphalor.tweed5.serde.extension.api.TweedWriteContext;
-import de.siphalor.tweed5.data.hjson.HjsonLexer;
+import de.siphalor.tweed5.serde.hjson.HjsonLexer;
-import de.siphalor.tweed5.data.hjson.HjsonReader;
+import de.siphalor.tweed5.serde.hjson.HjsonReader;
-import de.siphalor.tweed5.data.hjson.HjsonWriter;
+import de.siphalor.tweed5.serde.hjson.HjsonWriter;
-import de.siphalor.tweed5.dataapi.api.TweedDataVisitor;
+import de.siphalor.tweed5.serde_api.api.TweedDataVisitor;
-import de.siphalor.tweed5.dataapi.api.TweedDataWriteException;
+import de.siphalor.tweed5.serde_api.api.TweedDataWriteException;
 import de.siphalor.tweed5.weaver.pojo.api.TweedPojoWeaver;
 import de.siphalor.tweed5.weaver.pojo.api.annotation.*;
-import de.siphalor.tweed5.weaver.pojo.impl.weaving.TweedPojoWeaverImpl;
 import lombok.*;
 import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.Test;
@@ -22,8 +21,8 @@ import org.junit.jupiter.api.Test;
 import java.io.StringReader;
 import java.io.StringWriter;
 
-import static de.siphalor.tweed5.data.extension.api.ReadWriteExtension.read;
+import static de.siphalor.tweed5.serde.extension.api.ReadWriteExtension.read;
-import static de.siphalor.tweed5.data.extension.api.ReadWriteExtension.write;
+import static de.siphalor.tweed5.serde.extension.api.ReadWriteExtension.write;
 import static org.assertj.core.api.Assertions.assertThat;
 
 class ReadWritePojoWeavingProcessorTest {

tweed5/weaver-pojo-serde-extension/src/test/java/de/siphalor/tweed5/weaver/pojoext/serde/api/auto/AutoReadWritePojoWeavingProcessorTest.java

@@ -5,14 +5,13 @@ import de.siphalor.tweed5.core.api.entry.CollectionConfigEntry;
 import de.siphalor.tweed5.core.api.entry.CompoundConfigEntry;
 import de.siphalor.tweed5.core.api.entry.ConfigEntry;
 import de.siphalor.tweed5.core.api.entry.NullableConfigEntry;
-import de.siphalor.tweed5.data.extension.api.ReadWriteExtension;
+import de.siphalor.tweed5.serde.extension.api.ReadWriteExtension;
-import de.siphalor.tweed5.data.extension.api.readwrite.TweedEntryReaderWriter;
+import de.siphalor.tweed5.serde.extension.api.readwrite.TweedEntryReaderWriter;
-import de.siphalor.tweed5.data.extension.impl.TweedEntryReaderWriterImpls;
+import de.siphalor.tweed5.serde.extension.impl.TweedEntryReaderWriterImpls;
-import de.siphalor.tweed5.data.hjson.HjsonWriter;
+import de.siphalor.tweed5.serde.hjson.HjsonWriter;
 import de.siphalor.tweed5.weaver.pojo.api.TweedPojoWeaver;
 import de.siphalor.tweed5.weaver.pojo.api.annotation.*;
 import de.siphalor.tweed5.weaver.pojo.api.weaving.NullablePojoWeaver;
-import de.siphalor.tweed5.weaver.pojo.impl.weaving.TweedPojoWeaverImpl;
 import lombok.Data;
 import org.jspecify.annotations.NullUnmarked;
 import org.jspecify.annotations.Nullable;
@@ -23,7 +22,7 @@ import java.io.StringWriter;
 import java.util.Arrays;
 import java.util.List;
 
-import static de.siphalor.tweed5.data.extension.api.ReadWriteExtension.write;
+import static de.siphalor.tweed5.serde.extension.api.ReadWriteExtension.write;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.InstanceOfAssertFactories.type;
 

tweed5/weaver-pojo-serde-extension/src/test/java/de/siphalor/tweed5/weaver/pojoext/serde/api/nullable/AutoNullableReadWritePojoWeavingProcessorTest.java

@@ -3,14 +3,13 @@ package de.siphalor.tweed5.weaver.pojoext.serde.api.nullable;
 import de.siphalor.tweed5.core.api.container.ConfigContainer;
 import de.siphalor.tweed5.core.api.entry.CompoundConfigEntry;
 import de.siphalor.tweed5.core.api.entry.ConfigEntry;
-import de.siphalor.tweed5.data.extension.api.ReadWriteExtension;
+import de.siphalor.tweed5.serde.extension.api.ReadWriteExtension;
-import de.siphalor.tweed5.data.extension.api.TweedEntryWriteException;
+import de.siphalor.tweed5.serde.extension.api.TweedEntryWriteException;
-import de.siphalor.tweed5.data.extension.impl.TweedEntryReaderWriterImpls;
+import de.siphalor.tweed5.serde.extension.impl.TweedEntryReaderWriterImpls;
-import de.siphalor.tweed5.data.hjson.HjsonWriter;
+import de.siphalor.tweed5.serde.hjson.HjsonWriter;
 import de.siphalor.tweed5.defaultextensions.pather.api.PatherExtension;
 import de.siphalor.tweed5.weaver.pojo.api.TweedPojoWeaver;
 import de.siphalor.tweed5.weaver.pojo.api.annotation.*;
-import de.siphalor.tweed5.weaver.pojo.impl.weaving.TweedPojoWeaverImpl;
 import de.siphalor.tweed5.weaver.pojoext.serde.api.ReadWritePojoWeavingProcessor;
 import de.siphalor.tweed5.weaver.pojoext.serde.api.auto.AutoReadWritePojoWeavingProcessor;
 import de.siphalor.tweed5.weaver.pojoext.serde.api.auto.DefaultReadWriteMappings;