mashalling refactoring

m-m-m · Oct 5, 2024 · d2985c1 · d2985c1
1 parent d32f442
commit d2985c1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/bean/src/main/java/io/github/mmm/entity/property/id/IdProperty.java b/bean/src/main/java/io/github/mmm/entity/property/id/IdProperty.java
@@ -89,16 +89,19 @@ public V parse(String valueAsString) {
 
   @Override
   @SuppressWarnings("unchecked")
-  protected void readValue(StructuredReader reader) {
+  protected V readValue(StructuredReader reader, boolean apply) {
 
     V id = (V) ((GenericId<?, ?, ?, ?>) this.value).readObject(reader);
-    set(id);
+    if (apply) {
+      set(id);
+    }
+    return id;
   }
 
   @Override
-  public void write(StructuredWriter writer) {
+  public void writeValue(StructuredWriter writer, V id) {
 
-    ((GenericId<?, ?, ?, ?>) this.value).write(writer);
+    ((GenericId<?, ?, ?, ?>) id).write(writer);
   }
 
 }
diff --git a/bean/src/main/java/io/github/mmm/entity/property/link/LinkProperty.java b/bean/src/main/java/io/github/mmm/entity/property/link/LinkProperty.java
@@ -196,18 +196,20 @@ protected Supplier<? extends Link<E>> createReadOnlyExpression() {
   }
 
   @Override
-  protected void readValue(StructuredReader reader) {
+  protected Link<E> readValue(StructuredReader reader, boolean apply) {
 
     Id<E> id = IdMarshalling.get().readObject(reader, this.entityClass);
     IdLink<E> link = IdLink.of(id, this.resolver);
-    setValue(link);
+    if (apply) {
+      setValue(link);
+    }
+    return link;
   }
 
   @Override
-  public void write(StructuredWriter writer) {
+  public void writeValue(StructuredWriter writer, Link<E> link) {
 
     Id<E> id = null;
-    Link<E> link = getValue();
     if (link != null) {
       id = link.getId();
     }