From 784309b426edfaa632ff10949f167eb5d9cef69c Mon Sep 17 00:00:00 2001 From: Siphalor Date: Tue, 17 Mar 2026 11:07:41 +0100 Subject: [PATCH] refactor!(serde-*): Repackaged all serde modules --- CHANGELOG.md | 1 + .../bridge/impl/TweedCoatMappersImpl.java | 15 ++++++---- .../testmod/TweedCoatBridgeTestMod.java | 4 +-- .../api/DefaultTweedMinecraftWeaving.java | 2 +- .../helper/api/FabricConfigCommentLoader.java | 4 +-- .../api/FabricConfigContainerHelper.java | 8 ++--- .../helper/testmod/FabricHelperTestMod.java | 4 +-- .../networking/api/ByteBufReader.java | 8 ++--- .../networking/api/RawByteBufWriter.java | 4 +-- .../network/api/ByteBufReaderWriterTest.java | 6 ++-- ...ttributesReadWriteFilterExtensionImpl.java | 21 +++++++------ ...butesReadWriteFilterExtensionImplTest.java | 14 ++++----- ...eFilterExtensionImplWithPatchInfoTest.java | 12 ++++---- .../api/CommentLoaderExtension.java | 2 +- .../impl/CommentLoaderExtensionImpl.java | 10 +++---- .../impl/CommentLoaderExtensionImplTest.java | 2 +- .../comment/impl/CommentExtensionImpl.java | 4 +-- .../TweedEntryWriterCommentMiddleware.java | 11 ++++--- .../patch/impl/PatchExtensionImpl.java | 12 ++++---- .../pather/api/PathTrackingDataReader.java | 6 ++-- .../pather/api/PathTrackingDataVisitor.java | 6 ++-- .../pather/api/PatherExtension.java | 4 +-- .../pather/impl/PatherExtensionImpl.java | 10 +++---- .../impl/ReadFallbackExtensionImpl.java | 8 ++--- .../impl/ValidationExtensionImpl.java | 12 ++++---- .../impl/CommentExtensionImplTest.java | 10 +++---- .../patch/impl/PatchExtensionImplTest.java | 12 ++++---- .../api/PathTrackingDataReaderTest.java | 6 ++-- .../impl/ReadFallbackExtensionImplTest.java | 30 +++++++++---------- .../impl/ValidationExtensionImplTest.java | 14 ++++----- .../ValidationFallbackExtensionImplTest.java | 14 ++++----- .../api/DelegatingTweedDataWriter.java | 4 +-- .../api/IntuitiveVisitingTweedDataReader.java | 2 +- .../api/TweedDataReadException.java | 2 +- .../api/TweedDataReader.java | 2 +- .../api/TweedDataReaderRecoverMode.java | 2 +- .../api/TweedDataToken.java | 2 +- .../api/TweedDataTokens.java | 2 +- .../TweedDataUnsupportedValueException.java | 2 +- .../api/TweedDataVisitor.java | 4 +-- .../api/TweedDataWriteException.java | 2 +- .../api/TweedDataWriter.java | 2 +- .../api/TweedSerde.java | 2 +- .../TweedDataCommentDecoration.java | 2 +- .../api/decoration/TweedDataDecoration.java | 2 +- .../api/decoration/package-info.java | 2 +- .../tweed5/serde_api/api}/package-info.java | 2 +- .../extension/api/readwrite/package-info.java | 4 --- .../impl/TweedReadWriteContextImpl.java | 13 -------- .../extension/api/ReadWriteExtension.java | 10 +++---- .../api/TweedEntryReadException.java | 2 +- .../extension/api/TweedEntryReader.java | 4 +-- .../api/TweedEntryWriteException.java | 2 +- .../extension/api/TweedEntryWriter.java | 6 ++-- .../extension/api/TweedReadContext.java | 2 +- .../api/TweedReaderWriterProvider.java | 2 +- .../extension/api/TweedWriteContext.java | 2 +- .../ReadWriteExtensionSetupContext.java | 6 ++-- .../extension/ReadWriteRelatedExtension.java | 2 +- .../extension/api/package-info.java | 2 +- .../api/readwrite/TweedEntryReaderWriter.java | 6 ++-- .../readwrite/TweedEntryReaderWriters.java | 8 ++--- .../extension/api/readwrite/package-info.java | 4 +++ ...ltTweedEntryReaderWriterImplsProvider.java | 12 ++++---- .../impl/ReadWriteExtensionImpl.java | 14 ++++----- .../impl/TweedEntryReaderWriterImpls.java | 11 +++---- .../impl/TweedReadWriteContextImpl.java | 13 ++++++++ .../extension/impl/package-info.java | 2 +- .../impl/ReadWriteExtensionImplTest.java | 16 +++++----- .../{data => serde}/gson/GsonReader.java | 10 +++---- .../{data => serde}/gson/GsonWriter.java | 10 +++---- .../{data => serde}/gson/package-info.java | 2 +- .../{data => serde}/gson/GsonReaderTest.java | 5 ++-- .../{data => serde}/gson/GsonWriterTest.java | 5 ++-- .../hjson/HjsonCommentType.java | 2 +- .../{data => serde}/hjson/HjsonLexer.java | 4 +-- .../hjson/HjsonLexerToken.java | 2 +- .../hjson/HjsonReadPosition.java | 2 +- .../{data => serde}/hjson/HjsonReader.java | 4 +-- .../{data => serde}/hjson/HjsonSerde.java | 8 ++--- .../hjson/HjsonStringType.java | 2 +- .../{data => serde}/hjson/HjsonWriter.java | 10 +++---- .../tweed5/serde/hjson}/package-info.java | 2 +- .../{data => serde}/hjson/HjsonLexerTest.java | 5 +++- .../hjson/HjsonReaderTest.java | 8 +++-- .../hjson/HjsonWriterTest.java | 5 ++-- .../jackson/JacksonReader.java | 10 +++---- .../jackson/JacksonWriter.java | 10 +++---- .../tweed5/serde/jackson}/package-info.java | 2 +- .../jackson/JacksonReaderTest.java | 5 ++-- .../jackson/JacksonWriterTest.java | 5 ++-- .../testutils/serde/json/JsonReaderTest.java | 4 +-- .../testutils/serde/json/JsonWriterTest.java | 4 +-- .../api/ReadWritePojoWeavingProcessor.java | 10 +++---- .../AutoReadWritePojoWeavingProcessor.java | 12 ++++---- ...NullableReadWritePojoWeavingProcessor.java | 4 +-- .../serde/impl/ReaderWriterLoader.java | 9 +++--- .../ReadWritePojoWeavingProcessorTest.java | 23 +++++++------- ...AutoReadWritePojoWeavingProcessorTest.java | 11 ++++--- ...ableReadWritePojoWeavingProcessorTest.java | 9 +++--- 100 files changed, 336 insertions(+), 323 deletions(-) rename tweed5/serde-api/src/main/java/de/siphalor/tweed5/{dataapi => serde_api}/api/DelegatingTweedDataWriter.java (95%) rename tweed5/serde-api/src/main/java/de/siphalor/tweed5/{dataapi => serde_api}/api/IntuitiveVisitingTweedDataReader.java (98%) rename tweed5/serde-api/src/main/java/de/siphalor/tweed5/{dataapi => serde_api}/api/TweedDataReadException.java (95%) rename tweed5/serde-api/src/main/java/de/siphalor/tweed5/{dataapi => serde_api}/api/TweedDataReader.java (80%) rename tweed5/serde-api/src/main/java/de/siphalor/tweed5/{dataapi => serde_api}/api/TweedDataReaderRecoverMode.java (58%) rename tweed5/serde-api/src/main/java/de/siphalor/tweed5/{dataapi => serde_api}/api/TweedDataToken.java (97%) rename tweed5/serde-api/src/main/java/de/siphalor/tweed5/{dataapi => serde_api}/api/TweedDataTokens.java (99%) rename tweed5/serde-api/src/main/java/de/siphalor/tweed5/{dataapi => serde_api}/api/TweedDataUnsupportedValueException.java (87%) rename tweed5/serde-api/src/main/java/de/siphalor/tweed5/{dataapi => serde_api}/api/TweedDataVisitor.java (95%) rename tweed5/serde-api/src/main/java/de/siphalor/tweed5/{dataapi => serde_api}/api/TweedDataWriteException.java (89%) rename tweed5/serde-api/src/main/java/de/siphalor/tweed5/{dataapi => serde_api}/api/TweedDataWriter.java (65%) rename tweed5/serde-api/src/main/java/de/siphalor/tweed5/{dataapi => serde_api}/api/TweedSerde.java (91%) rename tweed5/serde-api/src/main/java/de/siphalor/tweed5/{dataapi => serde_api}/api/decoration/TweedDataCommentDecoration.java (64%) rename tweed5/serde-api/src/main/java/de/siphalor/tweed5/{dataapi => serde_api}/api/decoration/TweedDataDecoration.java (70%) rename tweed5/serde-api/src/main/java/de/siphalor/tweed5/{dataapi => serde_api}/api/decoration/package-info.java (51%) rename tweed5/{serde-jackson/src/main/java/de/siphalor/tweed5/data/jackson => serde-api/src/main/java/de/siphalor/tweed5/serde_api/api}/package-info.java (57%) delete mode 100644 tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/readwrite/package-info.java delete mode 100644 tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/impl/TweedReadWriteContextImpl.java rename tweed5/serde-extension/src/main/java/de/siphalor/tweed5/{data => serde}/extension/api/ReadWriteExtension.java (93%) rename tweed5/serde-extension/src/main/java/de/siphalor/tweed5/{data => serde}/extension/api/TweedEntryReadException.java (93%) rename tweed5/serde-extension/src/main/java/de/siphalor/tweed5/{data => serde}/extension/api/TweedEntryReader.java (74%) rename tweed5/serde-extension/src/main/java/de/siphalor/tweed5/{data => serde}/extension/api/TweedEntryWriteException.java (93%) rename tweed5/serde-extension/src/main/java/de/siphalor/tweed5/{data => serde}/extension/api/TweedEntryWriter.java (68%) rename tweed5/serde-extension/src/main/java/de/siphalor/tweed5/{data => serde}/extension/api/TweedReadContext.java (77%) rename tweed5/serde-extension/src/main/java/de/siphalor/tweed5/{data => serde}/extension/api/TweedReaderWriterProvider.java (96%) rename tweed5/serde-extension/src/main/java/de/siphalor/tweed5/{data => serde}/extension/api/TweedWriteContext.java (77%) rename tweed5/serde-extension/src/main/java/de/siphalor/tweed5/{data => serde}/extension/api/extension/ReadWriteExtensionSetupContext.java (69%) rename tweed5/serde-extension/src/main/java/de/siphalor/tweed5/{data => serde}/extension/api/extension/ReadWriteRelatedExtension.java (69%) rename tweed5/serde-extension/src/main/java/de/siphalor/tweed5/{data => serde}/extension/api/package-info.java (54%) rename tweed5/serde-extension/src/main/java/de/siphalor/tweed5/{data => serde}/extension/api/readwrite/TweedEntryReaderWriter.java (57%) rename tweed5/serde-extension/src/main/java/de/siphalor/tweed5/{data => serde}/extension/api/readwrite/TweedEntryReaderWriters.java (92%) create mode 100644 tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/readwrite/package-info.java rename tweed5/serde-extension/src/main/java/de/siphalor/tweed5/{data => serde}/extension/impl/DefaultTweedEntryReaderWriterImplsProvider.java (90%) rename tweed5/serde-extension/src/main/java/de/siphalor/tweed5/{data => serde}/extension/impl/ReadWriteExtensionImpl.java (93%) rename tweed5/serde-extension/src/main/java/de/siphalor/tweed5/{data => serde}/extension/impl/TweedEntryReaderWriterImpls.java (97%) create mode 100644 tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/impl/TweedReadWriteContextImpl.java rename tweed5/serde-extension/src/main/java/de/siphalor/tweed5/{data => serde}/extension/impl/package-info.java (71%) rename tweed5/serde-extension/src/test/java/de/siphalor/tweed5/{data => serde}/extension/impl/ReadWriteExtensionImplTest.java (88%) rename tweed5/serde-gson/src/main/java/de/siphalor/tweed5/{data => serde}/gson/GsonReader.java (95%) rename tweed5/serde-gson/src/main/java/de/siphalor/tweed5/{data => serde}/gson/GsonWriter.java (94%) rename tweed5/serde-gson/src/main/java/de/siphalor/tweed5/{data => serde}/gson/package-info.java (59%) rename tweed5/serde-gson/src/test/java/de/siphalor/tweed5/{data => serde}/gson/GsonReaderTest.java (74%) rename tweed5/serde-gson/src/test/java/de/siphalor/tweed5/{data => serde}/gson/GsonWriterTest.java (74%) rename tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/{data => serde}/hjson/HjsonCommentType.java (83%) rename tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/{data => serde}/hjson/HjsonLexer.java (99%) rename tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/{data => serde}/hjson/HjsonLexerToken.java (96%) rename tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/{data => serde}/hjson/HjsonReadPosition.java (92%) rename tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/{data => serde}/hjson/HjsonReader.java (99%) rename tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/{data => serde}/hjson/HjsonSerde.java (77%) rename tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/{data => serde}/hjson/HjsonStringType.java (75%) rename tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/{data => serde}/hjson/HjsonWriter.java (97%) rename tweed5/{serde-api/src/main/java/de/siphalor/tweed5/dataapi/api => serde-hjson/src/main/java/de/siphalor/tweed5/serde/hjson}/package-info.java (58%) rename tweed5/serde-hjson/src/test/java/de/siphalor/tweed5/{data => serde}/hjson/HjsonLexerTest.java (95%) rename tweed5/serde-hjson/src/test/java/de/siphalor/tweed5/{data => serde}/hjson/HjsonReaderTest.java (92%) rename tweed5/serde-hjson/src/test/java/de/siphalor/tweed5/{data => serde}/hjson/HjsonWriterTest.java (92%) rename tweed5/serde-jackson/src/main/java/de/siphalor/tweed5/{data => serde}/jackson/JacksonReader.java (96%) rename tweed5/serde-jackson/src/main/java/de/siphalor/tweed5/{data => serde}/jackson/JacksonWriter.java (94%) rename tweed5/{serde-hjson/src/main/java/de/siphalor/tweed5/data/hjson => serde-jackson/src/main/java/de/siphalor/tweed5/serde/jackson}/package-info.java (57%) rename tweed5/serde-jackson/src/test/java/de/siphalor/tweed5/{data => serde}/jackson/JacksonReaderTest.java (89%) rename tweed5/serde-jackson/src/test/java/de/siphalor/tweed5/{data => serde}/jackson/JacksonWriterTest.java (84%) diff --git a/CHANGELOG.md b/CHANGELOG.md index d03ccdf..40cb956 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/tweed5-minecraft/coat-bridge/src/main/java/de/siphalor/tweed5/coat/bridge/impl/TweedCoatMappersImpl.java b/tweed5-minecraft/coat-bridge/src/main/java/de/siphalor/tweed5/coat/bridge/impl/TweedCoatMappersImpl.java index 1e67c28..7882807 100644 --- a/tweed5-minecraft/coat-bridge/src/main/java/de/siphalor/tweed5/coat/bridge/impl/TweedCoatMappersImpl.java +++ b/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.data.extension.api.TweedEntryReadException; -import de.siphalor.tweed5.data.extension.api.TweedEntryReader; -import de.siphalor.tweed5.data.extension.api.TweedReadContext; -import de.siphalor.tweed5.dataapi.api.*; -import de.siphalor.tweed5.dataapi.api.decoration.TweedDataDecoration; +import de.siphalor.tweed5.serde.extension.api.ReadWriteExtension; +import de.siphalor.tweed5.serde.extension.api.TweedEntryReadException; +import de.siphalor.tweed5.serde.extension.api.TweedEntryReader; +import de.siphalor.tweed5.serde.extension.api.TweedReadContext; +import de.siphalor.tweed5.serde_api.api.TweedDataReadException; +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; diff --git a/tweed5-minecraft/coat-bridge/src/testmod/java/de/siphalor/tweed5/coat/bridge/testmod/TweedCoatBridgeTestMod.java b/tweed5-minecraft/coat-bridge/src/testmod/java/de/siphalor/tweed5/coat/bridge/testmod/TweedCoatBridgeTestMod.java index 7baba82..6e1a326 100644 --- a/tweed5-minecraft/coat-bridge/src/testmod/java/de/siphalor/tweed5/coat/bridge/testmod/TweedCoatBridgeTestMod.java +++ b/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.data.hjson.HjsonWriter; +import de.siphalor.tweed5.serde.hjson.HjsonSerde; +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; diff --git a/tweed5-minecraft/fabric-helper/src/main/java/de/siphalor/tweed5/fabric/helper/api/DefaultTweedMinecraftWeaving.java b/tweed5-minecraft/fabric-helper/src/main/java/de/siphalor/tweed5/fabric/helper/api/DefaultTweedMinecraftWeaving.java index 40d57c8..7cc061f 100644 --- a/tweed5-minecraft/fabric-helper/src/main/java/de/siphalor/tweed5/fabric/helper/api/DefaultTweedMinecraftWeaving.java +++ b/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; diff --git a/tweed5-minecraft/fabric-helper/src/main/java/de/siphalor/tweed5/fabric/helper/api/FabricConfigCommentLoader.java b/tweed5-minecraft/fabric-helper/src/main/java/de/siphalor/tweed5/fabric/helper/api/FabricConfigCommentLoader.java index 7097bf4..a7d2df3 100644 --- a/tweed5-minecraft/fabric-helper/src/main/java/de/siphalor/tweed5/fabric/helper/api/FabricConfigCommentLoader.java +++ b/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.data.gson.GsonReader; +import de.siphalor.tweed5.serde_api.api.TweedDataReader; +import de.siphalor.tweed5.serde.gson.GsonReader; import lombok.Builder; import lombok.extern.apachecommons.CommonsLog; import org.jspecify.annotations.Nullable; diff --git a/tweed5-minecraft/fabric-helper/src/main/java/de/siphalor/tweed5/fabric/helper/api/FabricConfigContainerHelper.java b/tweed5-minecraft/fabric-helper/src/main/java/de/siphalor/tweed5/fabric/helper/api/FabricConfigContainerHelper.java index 467dc85..4434c94 100644 --- a/tweed5-minecraft/fabric-helper/src/main/java/de/siphalor/tweed5/fabric/helper/api/FabricConfigContainerHelper.java +++ b/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.dataapi.api.TweedDataReader; -import de.siphalor.tweed5.dataapi.api.TweedDataWriter; -import de.siphalor.tweed5.dataapi.api.TweedSerde; +import de.siphalor.tweed5.serde.extension.api.ReadWriteExtension; +import de.siphalor.tweed5.serde_api.api.TweedDataReader; +import de.siphalor.tweed5.serde_api.api.TweedDataWriter; +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; diff --git a/tweed5-minecraft/fabric-helper/src/testmod/java/de/siphalor/tweed5/fabric/helper/testmod/FabricHelperTestMod.java b/tweed5-minecraft/fabric-helper/src/testmod/java/de/siphalor/tweed5/fabric/helper/testmod/FabricHelperTestMod.java index ca7dbbb..3ffaba1 100644 --- a/tweed5-minecraft/fabric-helper/src/testmod/java/de/siphalor/tweed5/fabric/helper/testmod/FabricHelperTestMod.java +++ b/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.data.hjson.HjsonWriter; +import de.siphalor.tweed5.serde.hjson.HjsonSerde; +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; diff --git a/tweed5-minecraft/networking/src/main/java/de/siphalor/tweed5/minecraft/networking/api/ByteBufReader.java b/tweed5-minecraft/networking/src/main/java/de/siphalor/tweed5/minecraft/networking/api/ByteBufReader.java index 9f17792..4d1a02a 100644 --- a/tweed5-minecraft/networking/src/main/java/de/siphalor/tweed5/minecraft/networking/api/ByteBufReader.java +++ b/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.dataapi.api.TweedDataReader; -import de.siphalor.tweed5.dataapi.api.TweedDataToken; -import de.siphalor.tweed5.dataapi.api.TweedDataTokens; +import de.siphalor.tweed5.serde_api.api.TweedDataReadException; +import de.siphalor.tweed5.serde_api.api.TweedDataReader; +import de.siphalor.tweed5.serde_api.api.TweedDataToken; +import de.siphalor.tweed5.serde_api.api.TweedDataTokens; import de.siphalor.tweed5.minecraft.networking.impl.ByteBufSerdeConstants; import io.netty.buffer.ByteBuf; import lombok.RequiredArgsConstructor; diff --git a/tweed5-minecraft/networking/src/main/java/de/siphalor/tweed5/minecraft/networking/api/RawByteBufWriter.java b/tweed5-minecraft/networking/src/main/java/de/siphalor/tweed5/minecraft/networking/api/RawByteBufWriter.java index f158242..efe14a1 100644 --- a/tweed5-minecraft/networking/src/main/java/de/siphalor/tweed5/minecraft/networking/api/RawByteBufWriter.java +++ b/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.dataapi.api.decoration.TweedDataDecoration; +import de.siphalor.tweed5.serde_api.api.TweedDataWriter; +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; diff --git a/tweed5-minecraft/networking/src/test/java/de/siphalor/tweed5/minecraft/network/api/ByteBufReaderWriterTest.java b/tweed5-minecraft/networking/src/test/java/de/siphalor/tweed5/minecraft/network/api/ByteBufReaderWriterTest.java index 36573ac..291e748 100644 --- a/tweed5-minecraft/networking/src/test/java/de/siphalor/tweed5/minecraft/network/api/ByteBufReaderWriterTest.java +++ b/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.dataapi.api.TweedDataToken; -import de.siphalor.tweed5.dataapi.api.TweedDataWriter; +import de.siphalor.tweed5.serde_api.api.TweedDataReadException; +import de.siphalor.tweed5.serde_api.api.TweedDataToken; +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; 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 dfac85e..44d1ba9 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 @@ -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.data.extension.api.TweedEntryReader; -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.impl.TweedEntryReaderWriterImpls; -import de.siphalor.tweed5.dataapi.api.*; -import de.siphalor.tweed5.dataapi.api.decoration.TweedDataDecoration; +import de.siphalor.tweed5.serde.extension.api.TweedEntryReadException; +import de.siphalor.tweed5.serde.extension.api.TweedEntryReader; +import de.siphalor.tweed5.serde.extension.api.TweedEntryWriter; +import de.siphalor.tweed5.serde.extension.api.TweedReadContext; +import de.siphalor.tweed5.serde.extension.api.extension.ReadWriteExtensionSetupContext; +import de.siphalor.tweed5.serde.extension.api.extension.ReadWriteRelatedExtension; +import de.siphalor.tweed5.serde.extension.impl.TweedEntryReaderWriterImpls; +import de.siphalor.tweed5.serde_api.api.DelegatingTweedDataWriter; +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; diff --git a/tweed5/attributes-extension/src/test/java/de/siphalor/tweed5/attributesextension/impl/serde/filter/AttributesReadWriteFilterExtensionImplTest.java b/tweed5/attributes-extension/src/test/java/de/siphalor/tweed5/attributesextension/impl/serde/filter/AttributesReadWriteFilterExtensionImplTest.java index f743115..ed87d57 100644 --- a/tweed5/attributes-extension/src/test/java/de/siphalor/tweed5/attributesextension/impl/serde/filter/AttributesReadWriteFilterExtensionImplTest.java +++ b/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.data.hjson.HjsonLexer; -import de.siphalor.tweed5.data.hjson.HjsonReader; -import de.siphalor.tweed5.data.hjson.HjsonWriter; +import de.siphalor.tweed5.serde.extension.api.ReadWriteExtension; +import de.siphalor.tweed5.serde.hjson.HjsonLexer; +import de.siphalor.tweed5.serde.hjson.HjsonReader; +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.data.extension.api.readwrite.TweedEntryReaderWriters.compoundReaderWriter; -import static de.siphalor.tweed5.data.extension.api.readwrite.TweedEntryReaderWriters.stringReaderWriter; +import static de.siphalor.tweed5.serde.extension.api.ReadWriteExtension.*; +import static de.siphalor.tweed5.serde.extension.api.readwrite.TweedEntryReaderWriters.compoundReaderWriter; +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; diff --git a/tweed5/attributes-extension/src/test/java/de/siphalor/tweed5/attributesextension/impl/serde/filter/AttributesReadWriteFilterExtensionImplWithPatchInfoTest.java b/tweed5/attributes-extension/src/test/java/de/siphalor/tweed5/attributesextension/impl/serde/filter/AttributesReadWriteFilterExtensionImplWithPatchInfoTest.java index 7c691b0..f0e2b68 100644 --- a/tweed5/attributes-extension/src/test/java/de/siphalor/tweed5/attributesextension/impl/serde/filter/AttributesReadWriteFilterExtensionImplWithPatchInfoTest.java +++ b/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.data.hjson.HjsonLexer; -import de.siphalor.tweed5.data.hjson.HjsonReader; +import de.siphalor.tweed5.serde.extension.api.ReadWriteExtension; +import de.siphalor.tweed5.serde.hjson.HjsonLexer; +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.data.extension.api.readwrite.TweedEntryReaderWriters.compoundReaderWriter; -import static de.siphalor.tweed5.data.extension.api.readwrite.TweedEntryReaderWriters.stringReaderWriter; +import static de.siphalor.tweed5.serde.extension.api.ReadWriteExtension.entryReaderWriter; +import static de.siphalor.tweed5.serde.extension.api.readwrite.TweedEntryReaderWriters.compoundReaderWriter; +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; diff --git a/tweed5/comment-loader-extension/src/main/java/de/siphalor/tweed5/commentloaderextension/api/CommentLoaderExtension.java b/tweed5/comment-loader-extension/src/main/java/de/siphalor/tweed5/commentloaderextension/api/CommentLoaderExtension.java index cee9ec3..15d0403 100644 --- a/tweed5/comment-loader-extension/src/main/java/de/siphalor/tweed5/commentloaderextension/api/CommentLoaderExtension.java +++ b/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 DEFAULT = CommentLoaderExtensionImpl.class; diff --git a/tweed5/comment-loader-extension/src/main/java/de/siphalor/tweed5/commentloaderextension/impl/CommentLoaderExtensionImpl.java b/tweed5/comment-loader-extension/src/main/java/de/siphalor/tweed5/commentloaderextension/impl/CommentLoaderExtensionImpl.java index ea34be6..8fe1de4 100644 --- a/tweed5/comment-loader-extension/src/main/java/de/siphalor/tweed5/commentloaderextension/impl/CommentLoaderExtensionImpl.java +++ b/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.dataapi.api.TweedDataReadException; -import de.siphalor.tweed5.dataapi.api.TweedDataReader; -import de.siphalor.tweed5.dataapi.api.TweedDataVisitor; -import de.siphalor.tweed5.dataapi.api.decoration.TweedDataDecoration; +import de.siphalor.tweed5.serde_api.api.IntuitiveVisitingTweedDataReader; +import de.siphalor.tweed5.serde_api.api.TweedDataReadException; +import de.siphalor.tweed5.serde_api.api.TweedDataReader; +import de.siphalor.tweed5.serde_api.api.TweedDataVisitor; +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; diff --git a/tweed5/comment-loader-extension/src/test/java/de/siphalor/tweed5/commentloaderextension/impl/CommentLoaderExtensionImplTest.java b/tweed5/comment-loader-extension/src/test/java/de/siphalor/tweed5/commentloaderextension/impl/CommentLoaderExtensionImplTest.java index fa809a4..f911a46 100644 --- a/tweed5/comment-loader-extension/src/test/java/de/siphalor/tweed5/commentloaderextension/impl/CommentLoaderExtensionImplTest.java +++ b/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; 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 20e57da..0b6122f 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 @@ -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.data.extension.api.extension.ReadWriteRelatedExtension; +import de.siphalor.tweed5.serde.extension.api.extension.ReadWriteExtensionSetupContext; +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; diff --git a/tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/comment/impl/TweedEntryWriterCommentMiddleware.java b/tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/comment/impl/TweedEntryWriterCommentMiddleware.java index ffc8641..c2a1058 100644 --- a/tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/comment/impl/TweedEntryWriterCommentMiddleware.java +++ b/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.dataapi.api.DelegatingTweedDataWriter; -import de.siphalor.tweed5.dataapi.api.TweedDataVisitor; -import de.siphalor.tweed5.dataapi.api.TweedDataWriter; -import de.siphalor.tweed5.dataapi.api.decoration.TweedDataCommentDecoration; -import de.siphalor.tweed5.dataapi.api.decoration.TweedDataDecoration; +import de.siphalor.tweed5.serde.extension.api.TweedEntryWriter; +import de.siphalor.tweed5.serde_api.api.DelegatingTweedDataWriter; +import de.siphalor.tweed5.serde_api.api.TweedDataVisitor; +import de.siphalor.tweed5.serde_api.api.decoration.TweedDataCommentDecoration; +import de.siphalor.tweed5.serde_api.api.decoration.TweedDataDecoration; import de.siphalor.tweed5.patchwork.api.PatchworkPartAccess; import lombok.RequiredArgsConstructor; import lombok.Value; diff --git a/tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/patch/impl/PatchExtensionImpl.java b/tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/patch/impl/PatchExtensionImpl.java index 341d27e..e371d88 100644 --- a/tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/patch/impl/PatchExtensionImpl.java +++ b/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.data.extension.api.TweedEntryReader; -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.dataapi.api.TweedDataReader; +import de.siphalor.tweed5.serde.extension.api.TweedEntryReadException; +import de.siphalor.tweed5.serde.extension.api.TweedEntryReader; +import de.siphalor.tweed5.serde.extension.api.TweedReadContext; +import de.siphalor.tweed5.serde.extension.api.extension.ReadWriteExtensionSetupContext; +import de.siphalor.tweed5.serde.extension.api.extension.ReadWriteRelatedExtension; +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; diff --git a/tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/pather/api/PathTrackingDataReader.java b/tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/pather/api/PathTrackingDataReader.java index 2603f86..a0c47e8 100644 --- a/tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/pather/api/PathTrackingDataReader.java +++ b/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.dataapi.api.TweedDataReader; -import de.siphalor.tweed5.dataapi.api.TweedDataToken; +import de.siphalor.tweed5.serde_api.api.TweedDataReadException; +import de.siphalor.tweed5.serde_api.api.TweedDataReader; +import de.siphalor.tweed5.serde_api.api.TweedDataToken; import lombok.RequiredArgsConstructor; import java.util.ArrayDeque; diff --git a/tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/pather/api/PathTrackingDataVisitor.java b/tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/pather/api/PathTrackingDataVisitor.java index 329a361..1a5b02b 100644 --- a/tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/pather/api/PathTrackingDataVisitor.java +++ b/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.dataapi.api.TweedDataVisitor; -import de.siphalor.tweed5.dataapi.api.decoration.TweedDataDecoration; +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 lombok.RequiredArgsConstructor; import org.jspecify.annotations.Nullable; 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 578d9b6..92edc19 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 @@ -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.data.extension.api.TweedWriteContext; +import de.siphalor.tweed5.serde.extension.api.TweedReadContext; +import de.siphalor.tweed5.serde.extension.api.TweedWriteContext; import de.siphalor.tweed5.defaultextensions.pather.impl.PatherExtensionImpl; public interface PatherExtension extends TweedExtension { 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 0bdfaaa..fcf82d5 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,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.data.extension.api.extension.ReadWriteExtensionSetupContext; -import de.siphalor.tweed5.data.extension.api.extension.ReadWriteRelatedExtension; -import de.siphalor.tweed5.dataapi.api.TweedDataReader; -import de.siphalor.tweed5.dataapi.api.TweedDataVisitor; +import de.siphalor.tweed5.serde.extension.api.*; +import de.siphalor.tweed5.serde.extension.api.extension.ReadWriteExtensionSetupContext; +import de.siphalor.tweed5.serde.extension.api.extension.ReadWriteRelatedExtension; +import de.siphalor.tweed5.serde_api.api.TweedDataReader; +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; diff --git a/tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/readfallback/impl/ReadFallbackExtensionImpl.java b/tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/readfallback/impl/ReadFallbackExtensionImpl.java index 1cb7157..3353de3 100644 --- a/tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/readfallback/impl/ReadFallbackExtensionImpl.java +++ b/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.data.extension.api.TweedEntryReader; -import de.siphalor.tweed5.data.extension.api.extension.ReadWriteExtensionSetupContext; -import de.siphalor.tweed5.data.extension.api.extension.ReadWriteRelatedExtension; +import de.siphalor.tweed5.serde.extension.api.TweedEntryReadException; +import de.siphalor.tweed5.serde.extension.api.TweedEntryReader; +import de.siphalor.tweed5.serde.extension.api.extension.ReadWriteExtensionSetupContext; +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; 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 66443a5..1df3026 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 @@ -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.data.extension.api.TweedEntryReader; -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.dataapi.api.TweedDataReader; +import de.siphalor.tweed5.serde.extension.api.TweedEntryReadException; +import de.siphalor.tweed5.serde.extension.api.TweedEntryReader; +import de.siphalor.tweed5.serde.extension.api.TweedReadContext; +import de.siphalor.tweed5.serde.extension.api.extension.ReadWriteExtensionSetupContext; +import de.siphalor.tweed5.serde.extension.api.extension.ReadWriteRelatedExtension; +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; diff --git a/tweed5/default-extensions/src/test/java/de/siphalor/tweed5/defaultextensions/comment/impl/CommentExtensionImplTest.java b/tweed5/default-extensions/src/test/java/de/siphalor/tweed5/defaultextensions/comment/impl/CommentExtensionImplTest.java index 3d2dd45..db00136 100644 --- a/tweed5/default-extensions/src/test/java/de/siphalor/tweed5/defaultextensions/comment/impl/CommentExtensionImplTest.java +++ b/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.data.hjson.HjsonCommentType; -import de.siphalor.tweed5.data.hjson.HjsonWriter; +import de.siphalor.tweed5.serde.extension.api.ReadWriteExtension; +import de.siphalor.tweed5.serde.hjson.HjsonCommentType; +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.data.extension.api.readwrite.TweedEntryReaderWriters.*; +import static de.siphalor.tweed5.serde.extension.api.ReadWriteExtension.entryReaderWriter; 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.*; diff --git a/tweed5/default-extensions/src/test/java/de/siphalor/tweed5/defaultextensions/patch/impl/PatchExtensionImplTest.java b/tweed5/default-extensions/src/test/java/de/siphalor/tweed5/defaultextensions/patch/impl/PatchExtensionImplTest.java index e262065..4478309 100644 --- a/tweed5/default-extensions/src/test/java/de/siphalor/tweed5/defaultextensions/patch/impl/PatchExtensionImplTest.java +++ b/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.data.hjson.HjsonLexer; -import de.siphalor.tweed5.data.hjson.HjsonReader; +import de.siphalor.tweed5.serde.extension.api.ReadWriteExtension; +import de.siphalor.tweed5.serde.hjson.HjsonLexer; +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.data.extension.api.ReadWriteExtension.read; -import static de.siphalor.tweed5.data.extension.api.readwrite.TweedEntryReaderWriters.*; +import static de.siphalor.tweed5.serde.extension.api.ReadWriteExtension.entryReaderWriter; +import static de.siphalor.tweed5.serde.extension.api.ReadWriteExtension.read; +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; diff --git a/tweed5/default-extensions/src/test/java/de/siphalor/tweed5/defaultextensions/pather/api/PathTrackingDataReaderTest.java b/tweed5/default-extensions/src/test/java/de/siphalor/tweed5/defaultextensions/pather/api/PathTrackingDataReaderTest.java index ae41c5d..c0ca2e9 100644 --- a/tweed5/default-extensions/src/test/java/de/siphalor/tweed5/defaultextensions/pather/api/PathTrackingDataReaderTest.java +++ b/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.dataapi.api.TweedDataToken; -import de.siphalor.tweed5.dataapi.api.TweedDataTokens; +import de.siphalor.tweed5.serde_api.api.TweedDataReader; +import de.siphalor.tweed5.serde_api.api.TweedDataToken; +import de.siphalor.tweed5.serde_api.api.TweedDataTokens; import lombok.EqualsAndHashCode; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; diff --git a/tweed5/default-extensions/src/test/java/de/siphalor/tweed5/defaultextensions/readfallback/impl/ReadFallbackExtensionImplTest.java b/tweed5/default-extensions/src/test/java/de/siphalor/tweed5/defaultextensions/readfallback/impl/ReadFallbackExtensionImplTest.java index 8bb7fd3..40cf9da 100644 --- a/tweed5/default-extensions/src/test/java/de/siphalor/tweed5/defaultextensions/readfallback/impl/ReadFallbackExtensionImplTest.java +++ b/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.data.extension.api.TweedEntryReadException; -import de.siphalor.tweed5.data.extension.api.TweedReadContext; -import de.siphalor.tweed5.data.extension.api.TweedWriteContext; -import de.siphalor.tweed5.data.extension.api.readwrite.TweedEntryReaderWriter; -import de.siphalor.tweed5.data.extension.api.readwrite.TweedEntryReaderWriters; -import de.siphalor.tweed5.data.hjson.HjsonLexer; -import de.siphalor.tweed5.data.hjson.HjsonReader; -import de.siphalor.tweed5.dataapi.api.TweedDataReadException; -import de.siphalor.tweed5.dataapi.api.TweedDataReader; -import de.siphalor.tweed5.dataapi.api.TweedDataVisitor; -import de.siphalor.tweed5.dataapi.api.TweedDataWriteException; +import de.siphalor.tweed5.serde.extension.api.ReadWriteExtension; +import de.siphalor.tweed5.serde.extension.api.TweedEntryReadException; +import de.siphalor.tweed5.serde.extension.api.TweedReadContext; +import de.siphalor.tweed5.serde.extension.api.TweedWriteContext; +import de.siphalor.tweed5.serde.extension.api.readwrite.TweedEntryReaderWriter; +import de.siphalor.tweed5.serde.extension.api.readwrite.TweedEntryReaderWriters; +import de.siphalor.tweed5.serde.hjson.HjsonLexer; +import de.siphalor.tweed5.serde.hjson.HjsonReader; +import de.siphalor.tweed5.serde_api.api.TweedDataReadException; +import de.siphalor.tweed5.serde_api.api.TweedDataReader; +import de.siphalor.tweed5.serde_api.api.TweedDataVisitor; +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.data.extension.api.ReadWriteExtension.read; -import static de.siphalor.tweed5.data.extension.api.readwrite.TweedEntryReaderWriters.compoundReaderWriter; +import static de.siphalor.tweed5.serde.extension.api.ReadWriteExtension.entryReaderWriter; +import static de.siphalor.tweed5.serde.extension.api.ReadWriteExtension.read; +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; diff --git a/tweed5/default-extensions/src/test/java/de/siphalor/tweed5/defaultextensions/validation/impl/ValidationExtensionImplTest.java b/tweed5/default-extensions/src/test/java/de/siphalor/tweed5/defaultextensions/validation/impl/ValidationExtensionImplTest.java index 8ac3272..3744b66 100644 --- a/tweed5/default-extensions/src/test/java/de/siphalor/tweed5/defaultextensions/validation/impl/ValidationExtensionImplTest.java +++ b/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.data.hjson.HjsonCommentType; -import de.siphalor.tweed5.data.hjson.HjsonLexer; -import de.siphalor.tweed5.data.hjson.HjsonReader; -import de.siphalor.tweed5.data.hjson.HjsonWriter; +import de.siphalor.tweed5.serde.extension.api.ReadWriteExtension; +import de.siphalor.tweed5.serde.hjson.HjsonCommentType; +import de.siphalor.tweed5.serde.hjson.HjsonLexer; +import de.siphalor.tweed5.serde.hjson.HjsonReader; +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; diff --git a/tweed5/default-extensions/src/test/java/de/siphalor/tweed5/defaultextensions/validationfallback/impl/ValidationFallbackExtensionImplTest.java b/tweed5/default-extensions/src/test/java/de/siphalor/tweed5/defaultextensions/validationfallback/impl/ValidationFallbackExtensionImplTest.java index 9a24938..8f507a6 100644 --- a/tweed5/default-extensions/src/test/java/de/siphalor/tweed5/defaultextensions/validationfallback/impl/ValidationFallbackExtensionImplTest.java +++ b/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.data.hjson.HjsonCommentType; -import de.siphalor.tweed5.data.hjson.HjsonLexer; -import de.siphalor.tweed5.data.hjson.HjsonReader; -import de.siphalor.tweed5.data.hjson.HjsonWriter; +import de.siphalor.tweed5.serde.extension.api.ReadWriteExtension; +import de.siphalor.tweed5.serde.hjson.HjsonCommentType; +import de.siphalor.tweed5.serde.hjson.HjsonLexer; +import de.siphalor.tweed5.serde.hjson.HjsonReader; +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 { diff --git a/tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/DelegatingTweedDataWriter.java b/tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/DelegatingTweedDataWriter.java similarity index 95% rename from tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/DelegatingTweedDataWriter.java rename to tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/DelegatingTweedDataWriter.java index bc6ad57..4a5b871 100644 --- a/tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/DelegatingTweedDataWriter.java +++ b/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; diff --git a/tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/IntuitiveVisitingTweedDataReader.java b/tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/IntuitiveVisitingTweedDataReader.java similarity index 98% rename from tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/IntuitiveVisitingTweedDataReader.java rename to tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/IntuitiveVisitingTweedDataReader.java index 003a7ca..8352d39 100644 --- a/tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/IntuitiveVisitingTweedDataReader.java +++ b/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; diff --git a/tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/TweedDataReadException.java b/tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/TweedDataReadException.java similarity index 95% rename from tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/TweedDataReadException.java rename to tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/TweedDataReadException.java index 822630e..28353a1 100644 --- a/tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/TweedDataReadException.java +++ b/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; diff --git a/tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/TweedDataReader.java b/tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/TweedDataReader.java similarity index 80% rename from tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/TweedDataReader.java rename to tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/TweedDataReader.java index 95eae9e..87b79fe 100644 --- a/tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/TweedDataReader.java +++ b/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; diff --git a/tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/TweedDataReaderRecoverMode.java b/tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/TweedDataReaderRecoverMode.java similarity index 58% rename from tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/TweedDataReaderRecoverMode.java rename to tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/TweedDataReaderRecoverMode.java index 6fba262..bcbd708 100644 --- a/tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/TweedDataReaderRecoverMode.java +++ b/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, diff --git a/tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/TweedDataToken.java b/tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/TweedDataToken.java similarity index 97% rename from tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/TweedDataToken.java rename to tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/TweedDataToken.java index 5d02fa2..0dbc3fd 100644 --- a/tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/TweedDataToken.java +++ b/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() { diff --git a/tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/TweedDataTokens.java b/tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/TweedDataTokens.java similarity index 99% rename from tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/TweedDataTokens.java rename to tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/TweedDataTokens.java index 964db28..17ce5ca 100644 --- a/tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/TweedDataTokens.java +++ b/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; diff --git a/tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/TweedDataUnsupportedValueException.java b/tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/TweedDataUnsupportedValueException.java similarity index 87% rename from tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/TweedDataUnsupportedValueException.java rename to tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/TweedDataUnsupportedValueException.java index 7478eb9..00a799c 100644 --- a/tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/TweedDataUnsupportedValueException.java +++ b/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; diff --git a/tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/TweedDataVisitor.java b/tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/TweedDataVisitor.java similarity index 95% rename from tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/TweedDataVisitor.java rename to tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/TweedDataVisitor.java index c64dbf9..5dc01fc 100644 --- a/tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/TweedDataVisitor.java +++ b/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 { diff --git a/tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/TweedDataWriteException.java b/tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/TweedDataWriteException.java similarity index 89% rename from tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/TweedDataWriteException.java rename to tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/TweedDataWriteException.java index fb40e3c..ff4d8ad 100644 --- a/tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/TweedDataWriteException.java +++ b/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() { diff --git a/tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/TweedDataWriter.java b/tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/TweedDataWriter.java similarity index 65% rename from tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/TweedDataWriter.java rename to tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/TweedDataWriter.java index 9ded985..5d848b8 100644 --- a/tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/TweedDataWriter.java +++ b/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 { } diff --git a/tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/TweedSerde.java b/tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/TweedSerde.java similarity index 91% rename from tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/TweedSerde.java rename to tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/TweedSerde.java index 8494780..b08fa3b 100644 --- a/tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/TweedSerde.java +++ b/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; diff --git a/tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/decoration/TweedDataCommentDecoration.java b/tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/decoration/TweedDataCommentDecoration.java similarity index 64% rename from tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/decoration/TweedDataCommentDecoration.java rename to tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/decoration/TweedDataCommentDecoration.java index 8f442a7..fc701fc 100644 --- a/tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/decoration/TweedDataCommentDecoration.java +++ b/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(); diff --git a/tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/decoration/TweedDataDecoration.java b/tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/decoration/TweedDataDecoration.java similarity index 70% rename from tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/decoration/TweedDataDecoration.java rename to tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/decoration/TweedDataDecoration.java index e52be32..5f3fcf3 100644 --- a/tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/decoration/TweedDataDecoration.java +++ b/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. diff --git a/tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/decoration/package-info.java b/tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/decoration/package-info.java similarity index 51% rename from tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/decoration/package-info.java rename to tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/decoration/package-info.java index 406c9d2..fc3d031 100644 --- a/tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/decoration/package-info.java +++ b/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; diff --git a/tweed5/serde-jackson/src/main/java/de/siphalor/tweed5/data/jackson/package-info.java b/tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/package-info.java similarity index 57% rename from tweed5/serde-jackson/src/main/java/de/siphalor/tweed5/data/jackson/package-info.java rename to tweed5/serde-api/src/main/java/de/siphalor/tweed5/serde_api/api/package-info.java index b6bfd12..3fe1b44 100644 --- a/tweed5/serde-jackson/src/main/java/de/siphalor/tweed5/data/jackson/package-info.java +++ b/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; diff --git a/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/readwrite/package-info.java b/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/readwrite/package-info.java deleted file mode 100644 index e56b614..0000000 --- a/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/readwrite/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -@NullMarked -package de.siphalor.tweed5.data.extension.api.readwrite; - -import org.jspecify.annotations.NullMarked; diff --git a/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/impl/TweedReadWriteContextImpl.java b/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/impl/TweedReadWriteContextImpl.java deleted file mode 100644 index 0fbc9de..0000000 --- a/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/impl/TweedReadWriteContextImpl.java +++ /dev/null @@ -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; -} 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/serde/extension/api/ReadWriteExtension.java similarity index 93% rename from tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/ReadWriteExtension.java rename to tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/ReadWriteExtension.java index e40a906..bd1f4bf 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/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.data.extension.impl.ReadWriteExtensionImpl; -import de.siphalor.tweed5.dataapi.api.TweedDataReader; -import de.siphalor.tweed5.dataapi.api.TweedDataVisitor; +import de.siphalor.tweed5.serde.extension.api.readwrite.TweedEntryReaderWriter; +import de.siphalor.tweed5.serde.extension.impl.ReadWriteExtensionImpl; +import de.siphalor.tweed5.serde_api.api.TweedDataReader; +import de.siphalor.tweed5.serde_api.api.TweedDataVisitor; import de.siphalor.tweed5.patchwork.api.Patchwork; import org.jspecify.annotations.Nullable; diff --git a/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/TweedEntryReadException.java b/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/TweedEntryReadException.java similarity index 93% rename from tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/TweedEntryReadException.java rename to tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/TweedEntryReadException.java index 655e58f..a89ca67 100644 --- a/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/TweedEntryReadException.java +++ b/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; diff --git a/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/TweedEntryReader.java b/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/TweedEntryReader.java similarity index 74% rename from tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/TweedEntryReader.java rename to tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/TweedEntryReader.java index b29c4a7..ca72509 100644 --- a/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/TweedEntryReader.java +++ b/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 diff --git a/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/TweedEntryWriteException.java b/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/TweedEntryWriteException.java similarity index 93% rename from tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/TweedEntryWriteException.java rename to tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/TweedEntryWriteException.java index ddee64b..7542512 100644 --- a/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/TweedEntryWriteException.java +++ b/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; diff --git a/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/TweedEntryWriter.java b/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/TweedEntryWriter.java similarity index 68% rename from tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/TweedEntryWriter.java rename to tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/TweedEntryWriter.java index 76b1cbb..b4a9fa9 100644 --- a/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/TweedEntryWriter.java +++ b/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.dataapi.api.TweedDataWriteException; +import de.siphalor.tweed5.serde_api.api.TweedDataVisitor; +import de.siphalor.tweed5.serde_api.api.TweedDataWriteException; import org.jspecify.annotations.Nullable; @FunctionalInterface diff --git a/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/TweedReadContext.java b/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/TweedReadContext.java similarity index 77% rename from tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/TweedReadContext.java rename to tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/TweedReadContext.java index 8badb75..10ecb64 100644 --- a/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/TweedReadContext.java +++ b/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; diff --git a/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/TweedReaderWriterProvider.java b/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/TweedReaderWriterProvider.java similarity index 96% rename from tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/TweedReaderWriterProvider.java rename to tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/TweedReaderWriterProvider.java index 1d5dc70..a8a230d 100644 --- a/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/TweedReaderWriterProvider.java +++ b/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; diff --git a/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/TweedWriteContext.java b/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/TweedWriteContext.java similarity index 77% rename from tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/TweedWriteContext.java rename to tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/TweedWriteContext.java index 5c955de..1ec9aec 100644 --- a/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/TweedWriteContext.java +++ b/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; diff --git a/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/extension/ReadWriteExtensionSetupContext.java b/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/extension/ReadWriteExtensionSetupContext.java similarity index 69% rename from tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/extension/ReadWriteExtensionSetupContext.java rename to tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/extension/ReadWriteExtensionSetupContext.java index 2a7c993..48cfbc0 100644 --- a/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/extension/ReadWriteExtensionSetupContext.java +++ b/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.data.extension.api.TweedEntryWriter; +import de.siphalor.tweed5.serde.extension.api.TweedEntryReader; +import de.siphalor.tweed5.serde.extension.api.TweedEntryWriter; import de.siphalor.tweed5.patchwork.api.PatchworkPartAccess; public interface ReadWriteExtensionSetupContext { diff --git a/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/extension/ReadWriteRelatedExtension.java b/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/extension/ReadWriteRelatedExtension.java similarity index 69% rename from tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/extension/ReadWriteRelatedExtension.java rename to tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/extension/ReadWriteRelatedExtension.java index 5222fae..2bd9d08 100644 --- a/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/extension/ReadWriteRelatedExtension.java +++ b/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) { diff --git a/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/package-info.java b/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/package-info.java similarity index 54% rename from tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/package-info.java rename to tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/package-info.java index 2c89bbe..797c9d8 100644 --- a/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/package-info.java +++ b/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; diff --git a/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/readwrite/TweedEntryReaderWriter.java b/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/readwrite/TweedEntryReaderWriter.java similarity index 57% rename from tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/readwrite/TweedEntryReaderWriter.java rename to tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/readwrite/TweedEntryReaderWriter.java index fbf4c3d..1af9383 100644 --- a/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/readwrite/TweedEntryReaderWriter.java +++ b/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.data.extension.api.TweedEntryWriter; +import de.siphalor.tweed5.serde.extension.api.TweedEntryReader; +import de.siphalor.tweed5.serde.extension.api.TweedEntryWriter; import org.jspecify.annotations.Nullable; public interface TweedEntryReaderWriter> extends TweedEntryReader, TweedEntryWriter {} diff --git a/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/readwrite/TweedEntryReaderWriters.java b/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/readwrite/TweedEntryReaderWriters.java similarity index 92% rename from tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/readwrite/TweedEntryReaderWriters.java rename to tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/readwrite/TweedEntryReaderWriters.java index cf8d74c..ddce881 100644 --- a/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/api/readwrite/TweedEntryReaderWriters.java +++ b/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.data.extension.api.TweedEntryWriter; -import de.siphalor.tweed5.data.extension.impl.TweedEntryReaderWriterImpls; +import de.siphalor.tweed5.serde.extension.api.TweedEntryReader; +import de.siphalor.tweed5.serde.extension.api.TweedEntryWriter; +import de.siphalor.tweed5.serde.extension.impl.TweedEntryReaderWriterImpls; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.jspecify.annotations.NonNull; diff --git a/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/readwrite/package-info.java b/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/readwrite/package-info.java new file mode 100644 index 0000000..70fa1ba --- /dev/null +++ b/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; diff --git a/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/impl/DefaultTweedEntryReaderWriterImplsProvider.java b/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/impl/DefaultTweedEntryReaderWriterImplsProvider.java similarity index 90% rename from tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/impl/DefaultTweedEntryReaderWriterImplsProvider.java rename to tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/impl/DefaultTweedEntryReaderWriterImplsProvider.java index 04b2153..14e944a 100644 --- a/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/impl/DefaultTweedEntryReaderWriterImplsProvider.java +++ b/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.data.extension.api.TweedEntryWriter; -import de.siphalor.tweed5.data.extension.api.TweedReaderWriterProvider; -import de.siphalor.tweed5.data.extension.api.readwrite.TweedEntryReaderWriters; +import de.siphalor.tweed5.serde.extension.api.TweedEntryReader; +import de.siphalor.tweed5.serde.extension.api.TweedEntryWriter; +import de.siphalor.tweed5.serde.extension.api.TweedReaderWriterProvider; +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 { 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/serde/extension/impl/ReadWriteExtensionImpl.java similarity index 93% rename from tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/impl/ReadWriteExtensionImpl.java rename to tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/impl/ReadWriteExtensionImpl.java index 6d5ab83..fe44a72 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/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.data.extension.api.extension.ReadWriteExtensionSetupContext; -import de.siphalor.tweed5.data.extension.api.extension.ReadWriteRelatedExtension; -import de.siphalor.tweed5.dataapi.api.TweedDataReader; -import de.siphalor.tweed5.dataapi.api.TweedDataVisitor; -import de.siphalor.tweed5.dataapi.api.TweedDataWriteException; +import de.siphalor.tweed5.serde.extension.api.*; +import de.siphalor.tweed5.serde.extension.api.extension.ReadWriteExtensionSetupContext; +import de.siphalor.tweed5.serde.extension.api.extension.ReadWriteRelatedExtension; +import de.siphalor.tweed5.serde_api.api.TweedDataReader; +import de.siphalor.tweed5.serde_api.api.TweedDataVisitor; +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; diff --git a/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/impl/TweedEntryReaderWriterImpls.java b/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/impl/TweedEntryReaderWriterImpls.java similarity index 97% rename from tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/impl/TweedEntryReaderWriterImpls.java rename to tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/impl/TweedEntryReaderWriterImpls.java index e0959a4..6d6158a 100644 --- a/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/impl/TweedEntryReaderWriterImpls.java +++ b/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.data.extension.api.readwrite.TweedEntryReaderWriter; -import de.siphalor.tweed5.dataapi.api.*; +import de.siphalor.tweed5.serde.extension.api.*; +import de.siphalor.tweed5.serde.extension.api.readwrite.TweedEntryReaderWriter; +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_READER_WRITER = new PrimitiveReaderWriter<>(TweedDataToken::readAsBoolean, TweedDataVisitor::visitBoolean); + public static final TweedEntryReaderWriter> BOOLEAN_READER_WRITER = new PrimitiveReaderWriter<>( + TweedDataToken::readAsBoolean, TweedDataVisitor::visitBoolean); public static final TweedEntryReaderWriter> BYTE_READER_WRITER = new PrimitiveReaderWriter<>(TweedDataToken::readAsByte, TweedDataVisitor::visitByte); public static final TweedEntryReaderWriter> SHORT_READER_WRITER = new PrimitiveReaderWriter<>(TweedDataToken::readAsShort, TweedDataVisitor::visitShort); public static final TweedEntryReaderWriter> INT_READER_WRITER = new PrimitiveReaderWriter<>(TweedDataToken::readAsInt, TweedDataVisitor::visitInt); diff --git a/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/impl/TweedReadWriteContextImpl.java b/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/impl/TweedReadWriteContextImpl.java new file mode 100644 index 0000000..71a2067 --- /dev/null +++ b/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; +} diff --git a/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/impl/package-info.java b/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/impl/package-info.java similarity index 71% rename from tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/impl/package-info.java rename to tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/impl/package-info.java index 6062ecd..e0c684f 100644 --- a/tweed5/serde-extension/src/main/java/de/siphalor/tweed5/data/extension/impl/package-info.java +++ b/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; diff --git a/tweed5/serde-extension/src/test/java/de/siphalor/tweed5/data/extension/impl/ReadWriteExtensionImplTest.java b/tweed5/serde-extension/src/test/java/de/siphalor/tweed5/serde/extension/impl/ReadWriteExtensionImplTest.java similarity index 88% rename from tweed5/serde-extension/src/test/java/de/siphalor/tweed5/data/extension/impl/ReadWriteExtensionImplTest.java rename to tweed5/serde-extension/src/test/java/de/siphalor/tweed5/serde/extension/impl/ReadWriteExtensionImplTest.java index 72b2aec..231d356 100644 --- a/tweed5/serde-extension/src/test/java/de/siphalor/tweed5/data/extension/impl/ReadWriteExtensionImplTest.java +++ b/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.data.hjson.HjsonLexer; -import de.siphalor.tweed5.data.hjson.HjsonReader; -import de.siphalor.tweed5.data.hjson.HjsonWriter; -import de.siphalor.tweed5.dataapi.api.TweedDataVisitor; +import de.siphalor.tweed5.serde.extension.api.ReadWriteExtension; +import de.siphalor.tweed5.serde.hjson.HjsonLexer; +import de.siphalor.tweed5.serde.hjson.HjsonReader; +import de.siphalor.tweed5.serde.hjson.HjsonWriter; +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.data.extension.api.readwrite.TweedEntryReaderWriters.*; +import static de.siphalor.tweed5.serde.extension.api.ReadWriteExtension.entryReaderWriter; +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; diff --git a/tweed5/serde-gson/src/main/java/de/siphalor/tweed5/data/gson/GsonReader.java b/tweed5/serde-gson/src/main/java/de/siphalor/tweed5/serde/gson/GsonReader.java similarity index 95% rename from tweed5/serde-gson/src/main/java/de/siphalor/tweed5/data/gson/GsonReader.java rename to tweed5/serde-gson/src/main/java/de/siphalor/tweed5/serde/gson/GsonReader.java index e4a458d..bc4400b 100644 --- a/tweed5/serde-gson/src/main/java/de/siphalor/tweed5/data/gson/GsonReader.java +++ b/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.dataapi.api.TweedDataReader; -import de.siphalor.tweed5.dataapi.api.TweedDataToken; -import de.siphalor.tweed5.dataapi.api.TweedDataTokens; +import de.siphalor.tweed5.serde_api.api.TweedDataReadException; +import de.siphalor.tweed5.serde_api.api.TweedDataReader; +import de.siphalor.tweed5.serde_api.api.TweedDataToken; +import de.siphalor.tweed5.serde_api.api.TweedDataTokens; import org.jspecify.annotations.Nullable; import java.io.IOException; diff --git a/tweed5/serde-gson/src/main/java/de/siphalor/tweed5/data/gson/GsonWriter.java b/tweed5/serde-gson/src/main/java/de/siphalor/tweed5/serde/gson/GsonWriter.java similarity index 94% rename from tweed5/serde-gson/src/main/java/de/siphalor/tweed5/data/gson/GsonWriter.java rename to tweed5/serde-gson/src/main/java/de/siphalor/tweed5/serde/gson/GsonWriter.java index 557a71b..088fe14 100644 --- a/tweed5/serde-gson/src/main/java/de/siphalor/tweed5/data/gson/GsonWriter.java +++ b/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.dataapi.api.TweedDataWriter; -import de.siphalor.tweed5.dataapi.api.decoration.TweedDataCommentDecoration; -import de.siphalor.tweed5.dataapi.api.decoration.TweedDataDecoration; +import de.siphalor.tweed5.serde_api.api.TweedDataWriteException; +import de.siphalor.tweed5.serde_api.api.TweedDataWriter; +import de.siphalor.tweed5.serde_api.api.decoration.TweedDataCommentDecoration; +import de.siphalor.tweed5.serde_api.api.decoration.TweedDataDecoration; import java.io.IOException; import java.util.ArrayDeque; diff --git a/tweed5/serde-gson/src/main/java/de/siphalor/tweed5/data/gson/package-info.java b/tweed5/serde-gson/src/main/java/de/siphalor/tweed5/serde/gson/package-info.java similarity index 59% rename from tweed5/serde-gson/src/main/java/de/siphalor/tweed5/data/gson/package-info.java rename to tweed5/serde-gson/src/main/java/de/siphalor/tweed5/serde/gson/package-info.java index 52ba568..34994f7 100644 --- a/tweed5/serde-gson/src/main/java/de/siphalor/tweed5/data/gson/package-info.java +++ b/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; diff --git a/tweed5/serde-gson/src/test/java/de/siphalor/tweed5/data/gson/GsonReaderTest.java b/tweed5/serde-gson/src/test/java/de/siphalor/tweed5/serde/gson/GsonReaderTest.java similarity index 74% rename from tweed5/serde-gson/src/test/java/de/siphalor/tweed5/data/gson/GsonReaderTest.java rename to tweed5/serde-gson/src/test/java/de/siphalor/tweed5/serde/gson/GsonReaderTest.java index 53fff87..e933024 100644 --- a/tweed5/serde-gson/src/test/java/de/siphalor/tweed5/data/gson/GsonReaderTest.java +++ b/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; diff --git a/tweed5/serde-gson/src/test/java/de/siphalor/tweed5/data/gson/GsonWriterTest.java b/tweed5/serde-gson/src/test/java/de/siphalor/tweed5/serde/gson/GsonWriterTest.java similarity index 74% rename from tweed5/serde-gson/src/test/java/de/siphalor/tweed5/data/gson/GsonWriterTest.java rename to tweed5/serde-gson/src/test/java/de/siphalor/tweed5/serde/gson/GsonWriterTest.java index 8420c37..e96b229 100644 --- a/tweed5/serde-gson/src/test/java/de/siphalor/tweed5/data/gson/GsonWriterTest.java +++ b/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; diff --git a/tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/data/hjson/HjsonCommentType.java b/tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/serde/hjson/HjsonCommentType.java similarity index 83% rename from tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/data/hjson/HjsonCommentType.java rename to tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/serde/hjson/HjsonCommentType.java index 79efd16..3dd1eb5 100644 --- a/tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/data/hjson/HjsonCommentType.java +++ b/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; diff --git a/tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/data/hjson/HjsonLexer.java b/tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/serde/hjson/HjsonLexer.java similarity index 99% rename from tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/data/hjson/HjsonLexer.java rename to tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/serde/hjson/HjsonLexer.java index 3476ecc..45df52e 100644 --- a/tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/data/hjson/HjsonLexer.java +++ b/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; diff --git a/tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/data/hjson/HjsonLexerToken.java b/tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/serde/hjson/HjsonLexerToken.java similarity index 96% rename from tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/data/hjson/HjsonLexerToken.java rename to tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/serde/hjson/HjsonLexerToken.java index 4a0a98d..8cb0fe3 100644 --- a/tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/data/hjson/HjsonLexerToken.java +++ b/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; diff --git a/tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/data/hjson/HjsonReadPosition.java b/tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/serde/hjson/HjsonReadPosition.java similarity index 92% rename from tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/data/hjson/HjsonReadPosition.java rename to tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/serde/hjson/HjsonReadPosition.java index eceb9fa..f9ee01f 100644 --- a/tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/data/hjson/HjsonReadPosition.java +++ b/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; diff --git a/tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/data/hjson/HjsonReader.java b/tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/serde/hjson/HjsonReader.java similarity index 99% rename from tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/data/hjson/HjsonReader.java rename to tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/serde/hjson/HjsonReader.java index aad6b77..a79f30a 100644 --- a/tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/data/hjson/HjsonReader.java +++ b/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; diff --git a/tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/data/hjson/HjsonSerde.java b/tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/serde/hjson/HjsonSerde.java similarity index 77% rename from tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/data/hjson/HjsonSerde.java rename to tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/serde/hjson/HjsonSerde.java index 36fb4ac..8fc168c 100644 --- a/tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/data/hjson/HjsonSerde.java +++ b/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.dataapi.api.TweedDataWriter; -import de.siphalor.tweed5.dataapi.api.TweedSerde; +import de.siphalor.tweed5.serde_api.api.TweedDataReader; +import de.siphalor.tweed5.serde_api.api.TweedDataWriter; +import de.siphalor.tweed5.serde_api.api.TweedSerde; import lombok.RequiredArgsConstructor; import java.io.*; diff --git a/tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/data/hjson/HjsonStringType.java b/tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/serde/hjson/HjsonStringType.java similarity index 75% rename from tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/data/hjson/HjsonStringType.java rename to tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/serde/hjson/HjsonStringType.java index 5a61ec5..e8fe471 100644 --- a/tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/data/hjson/HjsonStringType.java +++ b/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, diff --git a/tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/data/hjson/HjsonWriter.java b/tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/serde/hjson/HjsonWriter.java similarity index 97% rename from tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/data/hjson/HjsonWriter.java rename to tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/serde/hjson/HjsonWriter.java index 259c365..a4584c6 100644 --- a/tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/data/hjson/HjsonWriter.java +++ b/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.dataapi.api.TweedDataWriter; -import de.siphalor.tweed5.dataapi.api.decoration.TweedDataCommentDecoration; -import de.siphalor.tweed5.dataapi.api.decoration.TweedDataDecoration; +import de.siphalor.tweed5.serde_api.api.TweedDataWriteException; +import de.siphalor.tweed5.serde_api.api.TweedDataWriter; +import de.siphalor.tweed5.serde_api.api.decoration.TweedDataCommentDecoration; +import de.siphalor.tweed5.serde_api.api.decoration.TweedDataDecoration; import lombok.Data; import java.io.IOException; diff --git a/tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/package-info.java b/tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/serde/hjson/package-info.java similarity index 58% rename from tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/package-info.java rename to tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/serde/hjson/package-info.java index 6cefc6e..23a5789 100644 --- a/tweed5/serde-api/src/main/java/de/siphalor/tweed5/dataapi/api/package-info.java +++ b/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; diff --git a/tweed5/serde-hjson/src/test/java/de/siphalor/tweed5/data/hjson/HjsonLexerTest.java b/tweed5/serde-hjson/src/test/java/de/siphalor/tweed5/serde/hjson/HjsonLexerTest.java similarity index 95% rename from tweed5/serde-hjson/src/test/java/de/siphalor/tweed5/data/hjson/HjsonLexerTest.java rename to tweed5/serde-hjson/src/test/java/de/siphalor/tweed5/serde/hjson/HjsonLexerTest.java index 70586a3..aa57f7b 100644 --- a/tweed5/serde-hjson/src/test/java/de/siphalor/tweed5/data/hjson/HjsonLexerTest.java +++ b/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; diff --git a/tweed5/serde-hjson/src/test/java/de/siphalor/tweed5/data/hjson/HjsonReaderTest.java b/tweed5/serde-hjson/src/test/java/de/siphalor/tweed5/serde/hjson/HjsonReaderTest.java similarity index 92% rename from tweed5/serde-hjson/src/test/java/de/siphalor/tweed5/data/hjson/HjsonReaderTest.java rename to tweed5/serde-hjson/src/test/java/de/siphalor/tweed5/serde/hjson/HjsonReaderTest.java index 1f34d7d..959a821 100644 --- a/tweed5/serde-hjson/src/test/java/de/siphalor/tweed5/data/hjson/HjsonReaderTest.java +++ b/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.dataapi.api.TweedDataToken; +import de.siphalor.tweed5.serde.hjson.HjsonLexer; +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; diff --git a/tweed5/serde-hjson/src/test/java/de/siphalor/tweed5/data/hjson/HjsonWriterTest.java b/tweed5/serde-hjson/src/test/java/de/siphalor/tweed5/serde/hjson/HjsonWriterTest.java similarity index 92% rename from tweed5/serde-hjson/src/test/java/de/siphalor/tweed5/data/hjson/HjsonWriterTest.java rename to tweed5/serde-hjson/src/test/java/de/siphalor/tweed5/serde/hjson/HjsonWriterTest.java index 3ffb217..9464e7f 100644 --- a/tweed5/serde-hjson/src/test/java/de/siphalor/tweed5/data/hjson/HjsonWriterTest.java +++ b/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); } -} \ No newline at end of file +} diff --git a/tweed5/serde-jackson/src/main/java/de/siphalor/tweed5/data/jackson/JacksonReader.java b/tweed5/serde-jackson/src/main/java/de/siphalor/tweed5/serde/jackson/JacksonReader.java similarity index 96% rename from tweed5/serde-jackson/src/main/java/de/siphalor/tweed5/data/jackson/JacksonReader.java rename to tweed5/serde-jackson/src/main/java/de/siphalor/tweed5/serde/jackson/JacksonReader.java index 5dd0756..e034ed4 100644 --- a/tweed5/serde-jackson/src/main/java/de/siphalor/tweed5/data/jackson/JacksonReader.java +++ b/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.dataapi.api.TweedDataReader; -import de.siphalor.tweed5.dataapi.api.TweedDataToken; -import de.siphalor.tweed5.dataapi.api.TweedDataTokens; +import de.siphalor.tweed5.serde_api.api.TweedDataReadException; +import de.siphalor.tweed5.serde_api.api.TweedDataReader; +import de.siphalor.tweed5.serde_api.api.TweedDataToken; +import de.siphalor.tweed5.serde_api.api.TweedDataTokens; import org.jspecify.annotations.Nullable; import java.io.IOException; diff --git a/tweed5/serde-jackson/src/main/java/de/siphalor/tweed5/data/jackson/JacksonWriter.java b/tweed5/serde-jackson/src/main/java/de/siphalor/tweed5/serde/jackson/JacksonWriter.java similarity index 94% rename from tweed5/serde-jackson/src/main/java/de/siphalor/tweed5/data/jackson/JacksonWriter.java rename to tweed5/serde-jackson/src/main/java/de/siphalor/tweed5/serde/jackson/JacksonWriter.java index dbc9397..d9ed3a9 100644 --- a/tweed5/serde-jackson/src/main/java/de/siphalor/tweed5/data/jackson/JacksonWriter.java +++ b/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.dataapi.api.TweedDataWriter; -import de.siphalor.tweed5.dataapi.api.decoration.TweedDataCommentDecoration; -import de.siphalor.tweed5.dataapi.api.decoration.TweedDataDecoration; +import de.siphalor.tweed5.serde_api.api.TweedDataWriteException; +import de.siphalor.tweed5.serde_api.api.TweedDataWriter; +import de.siphalor.tweed5.serde_api.api.decoration.TweedDataCommentDecoration; +import de.siphalor.tweed5.serde_api.api.decoration.TweedDataDecoration; import java.io.IOException; import java.util.ArrayDeque; diff --git a/tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/data/hjson/package-info.java b/tweed5/serde-jackson/src/main/java/de/siphalor/tweed5/serde/jackson/package-info.java similarity index 57% rename from tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/data/hjson/package-info.java rename to tweed5/serde-jackson/src/main/java/de/siphalor/tweed5/serde/jackson/package-info.java index f91e1eb..8b0a9fe 100644 --- a/tweed5/serde-hjson/src/main/java/de/siphalor/tweed5/data/hjson/package-info.java +++ b/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; diff --git a/tweed5/serde-jackson/src/test/java/de/siphalor/tweed5/data/jackson/JacksonReaderTest.java b/tweed5/serde-jackson/src/test/java/de/siphalor/tweed5/serde/jackson/JacksonReaderTest.java similarity index 89% rename from tweed5/serde-jackson/src/test/java/de/siphalor/tweed5/data/jackson/JacksonReaderTest.java rename to tweed5/serde-jackson/src/test/java/de/siphalor/tweed5/serde/jackson/JacksonReaderTest.java index 6b05296..8b8fc9e 100644 --- a/tweed5/serde-jackson/src/test/java/de/siphalor/tweed5/data/jackson/JacksonReaderTest.java +++ b/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; diff --git a/tweed5/serde-jackson/src/test/java/de/siphalor/tweed5/data/jackson/JacksonWriterTest.java b/tweed5/serde-jackson/src/test/java/de/siphalor/tweed5/serde/jackson/JacksonWriterTest.java similarity index 84% rename from tweed5/serde-jackson/src/test/java/de/siphalor/tweed5/data/jackson/JacksonWriterTest.java rename to tweed5/serde-jackson/src/test/java/de/siphalor/tweed5/serde/jackson/JacksonWriterTest.java index c827716..ab636cf 100644 --- a/tweed5/serde-jackson/src/test/java/de/siphalor/tweed5/data/jackson/JacksonWriterTest.java +++ b/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; diff --git a/tweed5/test-utils/serde-json/src/main/java/de/siphalor/tweed5/testutils/serde/json/JsonReaderTest.java b/tweed5/test-utils/serde-json/src/main/java/de/siphalor/tweed5/testutils/serde/json/JsonReaderTest.java index 634e56e..ab65ee7 100644 --- a/tweed5/test-utils/serde-json/src/main/java/de/siphalor/tweed5/testutils/serde/json/JsonReaderTest.java +++ b/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.dataapi.api.TweedDataToken; +import de.siphalor.tweed5.serde_api.api.TweedDataReader; +import de.siphalor.tweed5.serde_api.api.TweedDataToken; import lombok.SneakyThrows; import org.assertj.core.data.Offset; import org.junit.jupiter.api.Test; diff --git a/tweed5/test-utils/serde-json/src/main/java/de/siphalor/tweed5/testutils/serde/json/JsonWriterTest.java b/tweed5/test-utils/serde-json/src/main/java/de/siphalor/tweed5/testutils/serde/json/JsonWriterTest.java index 72559e5..2bb6ad0 100644 --- a/tweed5/test-utils/serde-json/src/main/java/de/siphalor/tweed5/testutils/serde/json/JsonWriterTest.java +++ b/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.dataapi.api.decoration.TweedDataCommentDecoration; +import de.siphalor.tweed5.serde_api.api.TweedDataWriter; +import de.siphalor.tweed5.serde_api.api.decoration.TweedDataCommentDecoration; import lombok.SneakyThrows; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/tweed5/weaver-pojo-serde-extension/src/main/java/de/siphalor/tweed5/weaver/pojoext/serde/api/ReadWritePojoWeavingProcessor.java b/tweed5/weaver-pojo-serde-extension/src/main/java/de/siphalor/tweed5/weaver/pojoext/serde/api/ReadWritePojoWeavingProcessor.java index 5581cc4..969faa1 100644 --- a/tweed5/weaver-pojo-serde-extension/src/main/java/de/siphalor/tweed5/weaver/pojoext/serde/api/ReadWritePojoWeavingProcessor.java +++ b/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.data.extension.api.TweedEntryReader; -import de.siphalor.tweed5.data.extension.api.TweedEntryWriter; -import de.siphalor.tweed5.data.extension.api.TweedReaderWriterProvider; -import de.siphalor.tweed5.data.extension.impl.TweedEntryReaderWriterImpls; +import de.siphalor.tweed5.serde.extension.api.ReadWriteExtension; +import de.siphalor.tweed5.serde.extension.api.TweedEntryReader; +import de.siphalor.tweed5.serde.extension.api.TweedEntryWriter; +import de.siphalor.tweed5.serde.extension.api.TweedReaderWriterProvider; +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; diff --git a/tweed5/weaver-pojo-serde-extension/src/main/java/de/siphalor/tweed5/weaver/pojoext/serde/api/auto/AutoReadWritePojoWeavingProcessor.java b/tweed5/weaver-pojo-serde-extension/src/main/java/de/siphalor/tweed5/weaver/pojoext/serde/api/auto/AutoReadWritePojoWeavingProcessor.java index 330c89e..d4d75d9 100644 --- a/tweed5/weaver-pojo-serde-extension/src/main/java/de/siphalor/tweed5/weaver/pojoext/serde/api/auto/AutoReadWritePojoWeavingProcessor.java +++ b/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.data.extension.api.TweedEntryReader; -import de.siphalor.tweed5.data.extension.api.TweedEntryWriter; -import de.siphalor.tweed5.data.extension.api.TweedReaderWriterProvider; -import de.siphalor.tweed5.data.extension.api.readwrite.TweedEntryReaderWriters; -import de.siphalor.tweed5.data.extension.impl.TweedEntryReaderWriterImpls; +import de.siphalor.tweed5.serde.extension.api.ReadWriteExtension; +import de.siphalor.tweed5.serde.extension.api.TweedEntryReader; +import de.siphalor.tweed5.serde.extension.api.TweedEntryWriter; +import de.siphalor.tweed5.serde.extension.api.TweedReaderWriterProvider; +import de.siphalor.tweed5.serde.extension.api.readwrite.TweedEntryReaderWriters; +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; diff --git a/tweed5/weaver-pojo-serde-extension/src/main/java/de/siphalor/tweed5/weaver/pojoext/serde/api/nullable/AutoNullableReadWritePojoWeavingProcessor.java b/tweed5/weaver-pojo-serde-extension/src/main/java/de/siphalor/tweed5/weaver/pojoext/serde/api/nullable/AutoNullableReadWritePojoWeavingProcessor.java index deedf2a..9def86d 100644 --- a/tweed5/weaver-pojo-serde-extension/src/main/java/de/siphalor/tweed5/weaver/pojoext/serde/api/nullable/AutoNullableReadWritePojoWeavingProcessor.java +++ b/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.data.extension.impl.TweedEntryReaderWriterImpls; +import de.siphalor.tweed5.serde.extension.api.ReadWriteExtension; +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; diff --git a/tweed5/weaver-pojo-serde-extension/src/main/java/de/siphalor/tweed5/weaver/pojoext/serde/impl/ReaderWriterLoader.java b/tweed5/weaver-pojo-serde-extension/src/main/java/de/siphalor/tweed5/weaver/pojoext/serde/impl/ReaderWriterLoader.java index c457f19..dc354f9 100644 --- a/tweed5/weaver-pojo-serde-extension/src/main/java/de/siphalor/tweed5/weaver/pojoext/serde/impl/ReaderWriterLoader.java +++ b/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.data.extension.api.TweedEntryWriter; -import de.siphalor.tweed5.data.extension.api.TweedReaderWriterProvider; -import de.siphalor.tweed5.data.extension.impl.TweedEntryReaderWriterImpls; +import de.siphalor.tweed5.serde.extension.api.TweedEntryReader; +import de.siphalor.tweed5.serde.extension.api.TweedEntryWriter; +import de.siphalor.tweed5.serde.extension.api.TweedReaderWriterProvider; +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 { diff --git a/tweed5/weaver-pojo-serde-extension/src/test/java/de/siphalor/tweed5/weaver/pojoext/serde/api/ReadWritePojoWeavingProcessorTest.java b/tweed5/weaver-pojo-serde-extension/src/test/java/de/siphalor/tweed5/weaver/pojoext/serde/api/ReadWritePojoWeavingProcessorTest.java index e18a65b..eb81921 100644 --- a/tweed5/weaver-pojo-serde-extension/src/test/java/de/siphalor/tweed5/weaver/pojoext/serde/api/ReadWritePojoWeavingProcessorTest.java +++ b/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.data.extension.api.TweedEntryWriter; -import de.siphalor.tweed5.data.extension.api.TweedReaderWriterProvider; -import de.siphalor.tweed5.data.extension.api.TweedWriteContext; -import de.siphalor.tweed5.data.hjson.HjsonLexer; -import de.siphalor.tweed5.data.hjson.HjsonReader; -import de.siphalor.tweed5.data.hjson.HjsonWriter; -import de.siphalor.tweed5.dataapi.api.TweedDataVisitor; -import de.siphalor.tweed5.dataapi.api.TweedDataWriteException; +import de.siphalor.tweed5.serde.extension.api.ReadWriteExtension; +import de.siphalor.tweed5.serde.extension.api.TweedEntryWriter; +import de.siphalor.tweed5.serde.extension.api.TweedReaderWriterProvider; +import de.siphalor.tweed5.serde.extension.api.TweedWriteContext; +import de.siphalor.tweed5.serde.hjson.HjsonLexer; +import de.siphalor.tweed5.serde.hjson.HjsonReader; +import de.siphalor.tweed5.serde.hjson.HjsonWriter; +import de.siphalor.tweed5.serde_api.api.TweedDataVisitor; +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.data.extension.api.ReadWriteExtension.write; +import static de.siphalor.tweed5.serde.extension.api.ReadWriteExtension.read; +import static de.siphalor.tweed5.serde.extension.api.ReadWriteExtension.write; import static org.assertj.core.api.Assertions.assertThat; class ReadWritePojoWeavingProcessorTest { diff --git a/tweed5/weaver-pojo-serde-extension/src/test/java/de/siphalor/tweed5/weaver/pojoext/serde/api/auto/AutoReadWritePojoWeavingProcessorTest.java b/tweed5/weaver-pojo-serde-extension/src/test/java/de/siphalor/tweed5/weaver/pojoext/serde/api/auto/AutoReadWritePojoWeavingProcessorTest.java index 1bfd13c..7995d6d 100644 --- a/tweed5/weaver-pojo-serde-extension/src/test/java/de/siphalor/tweed5/weaver/pojoext/serde/api/auto/AutoReadWritePojoWeavingProcessorTest.java +++ b/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.data.extension.api.readwrite.TweedEntryReaderWriter; -import de.siphalor.tweed5.data.extension.impl.TweedEntryReaderWriterImpls; -import de.siphalor.tweed5.data.hjson.HjsonWriter; +import de.siphalor.tweed5.serde.extension.api.ReadWriteExtension; +import de.siphalor.tweed5.serde.extension.api.readwrite.TweedEntryReaderWriter; +import de.siphalor.tweed5.serde.extension.impl.TweedEntryReaderWriterImpls; +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; diff --git a/tweed5/weaver-pojo-serde-extension/src/test/java/de/siphalor/tweed5/weaver/pojoext/serde/api/nullable/AutoNullableReadWritePojoWeavingProcessorTest.java b/tweed5/weaver-pojo-serde-extension/src/test/java/de/siphalor/tweed5/weaver/pojoext/serde/api/nullable/AutoNullableReadWritePojoWeavingProcessorTest.java index 0884074..81be4ff 100644 --- a/tweed5/weaver-pojo-serde-extension/src/test/java/de/siphalor/tweed5/weaver/pojoext/serde/api/nullable/AutoNullableReadWritePojoWeavingProcessorTest.java +++ b/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.data.extension.api.TweedEntryWriteException; -import de.siphalor.tweed5.data.extension.impl.TweedEntryReaderWriterImpls; -import de.siphalor.tweed5.data.hjson.HjsonWriter; +import de.siphalor.tweed5.serde.extension.api.ReadWriteExtension; +import de.siphalor.tweed5.serde.extension.api.TweedEntryWriteException; +import de.siphalor.tweed5.serde.extension.impl.TweedEntryReaderWriterImpls; +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;