Fix JsonNodeDriver for nested side tables

Author: prdoyle

bosk-jackson/src/main/java/works/bosk/jackson/JsonNodeDriver.java

@@ -1,6 +1,5 @@
 package works.bosk.jackson;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.IOException;
@@ -110,10 +109,9 @@ private <T> void doReplacement(NodeInfo nodeInfo, String lastSegment, T newValue
 
 	void traceCurrentState(String description) {
 		if (LOGGER.isTraceEnabled()) {
-			try {
-				LOGGER.trace("State {} {}:\n{}", ++updateNumber, description, mapper.writerWithDefaultPrettyPrinter().writeValueAsString(currentRoot));
-			} catch (JsonProcessingException e) {
-				throw new IllegalStateException(e);
+			LOGGER.trace("State {} {}:\n{}", ++updateNumber, description, currentRoot.toPrettyString());
+			if (updateNumber == 9) {
+				LOGGER.trace("Stopping at update {}", updateNumber);
 			}
 		}
 	}

bosk-jackson/src/main/java/works/bosk/jackson/JsonNodeSurgeon.java

@@ -21,7 +21,7 @@
 import static java.util.Objects.requireNonNull;
 import static works.bosk.jackson.JsonNodeSurgeon.ReplacementStyle.ID_ONLY;
 import static works.bosk.jackson.JsonNodeSurgeon.ReplacementStyle.PLAIN;
-import static works.bosk.jackson.JsonNodeSurgeon.ReplacementStyle.WRAPPED_ENTITY;
+import static works.bosk.jackson.JsonNodeSurgeon.ReplacementStyle.WRAPPED;
 
 /**
  * Utilities to find and modify the {@link JsonNode} corresponding to
@@ -56,7 +56,7 @@ record ArrayElement(ArrayNode parent, int elementIndex) implements NodeLocation
 		 * <p>
 		 * (Note that the parent {@link JsonNode} is not always the node corresponding
 		 * to the {@link Reference#enclosingReference enclosing reference}.
-		 * They're two related but different concepts. See {@link ReplacementStyle#WRAPPED_ENTITY WRAPPED_ENTITY}.)
+		 * They're two related but different concepts. See {@link ReplacementStyle#WRAPPED WRAPPED_ENTITY}.)
 		 */
 		record NonexistentParent() implements NodeLocation {}
 	}
@@ -78,8 +78,7 @@ public enum ReplacementStyle {
 
 		/**
 		 * Use an {@link ObjectNode} having a single member whose name is the desired
-		 * entity's {@link works.bosk.Entity#id id} and whose value is the serialized
-		 * form of the desired entity.
+		 * last segment of the {@link Reference} pointing at the desired node,
 		 *
 		 * <p>
 		 * Note that this is the style that causes the {@link NodeInfo#valueLocation value location}
@@ -93,7 +92,7 @@ public enum ReplacementStyle {
 		 * something other than {@link NonexistentParent NonexistentParent})
 		 * and will indicate where the wrapper object should be.
 		 */
-		WRAPPED_ENTITY,
+		WRAPPED,
 	}
 
 	/**
@@ -125,8 +124,8 @@ static NodeInfo idOnly(NodeLocation theLocation) {
 			return new NodeInfo(theLocation, theLocation, ID_ONLY);
 		}
 
-		static NodeInfo wrappedEntity(NodeLocation valueLocation, NodeLocation replacementLocation) {
-			return new NodeInfo(valueLocation, replacementLocation, WRAPPED_ENTITY);
+		static NodeInfo wrapped(NodeLocation valueLocation, NodeLocation replacementLocation) {
+			return new NodeInfo(valueLocation, replacementLocation, WRAPPED);
 		}
 	}
 
@@ -174,30 +173,33 @@ public NodeInfo nodeInfo(JsonNode doc, Reference<?> ref) {
 			return NodeInfo.idOnly(new ArrayElement(ids, ids.size()));
 		} else if (Catalog.class.isAssignableFrom(enclosingRef.targetClass())) {
 			if (parent == null) {
-				return NodeInfo.wrappedEntity(new NonexistentParent(), new NonexistentParent());
+				return NodeInfo.wrapped(new NonexistentParent(), new NonexistentParent());
 			} else {
 				String entryID = ref.path().lastSegment();
 				NodeLocation element = findArrayElementWithId(parent, entryID);
 				JsonNode elementNode = getNode(element, doc);
 				if (elementNode == null) {
 					// Doesn't exist yet
-					return NodeInfo.wrappedEntity (new NonexistentParent(), element);
+					return NodeInfo.wrapped(new NonexistentParent(), element);
 				} else {
-					return NodeInfo.wrappedEntity (getMapEntryValueLocation(elementNode, entryID), element);
+					return NodeInfo.wrapped(getMapEntryValueLocation(elementNode, entryID), element);
 				}
 			}
 		} else if (SideTable.class.isAssignableFrom(enclosingRef.targetClass())) {
 			if (parent == null) {
-				return NodeInfo.wrappedEntity(new NonexistentParent(), new NonexistentParent());
+				NodeLocation valueLocation = new NonexistentParent();
+				return NodeInfo.wrapped(valueLocation, new NonexistentParent());
 			} else {
 				String entryID = ref.path().lastSegment();
 				NodeLocation element = findArrayElementWithId(parent.get("valuesById"), entryID);
 				JsonNode elementNode = getNode(element, doc);
 				if (elementNode == null) {
 					// Doesn't exist yet
-					return NodeInfo.wrappedEntity(new NonexistentParent(), element);
+					NodeLocation valueLocation = new NonexistentParent();
+					return NodeInfo.wrapped(valueLocation, element);
 				} else {
-					return NodeInfo.wrappedEntity(getMapEntryValueLocation(elementNode, entryID), element);
+					NodeLocation valueLocation = getMapEntryValueLocation(elementNode, entryID);
+					return NodeInfo.wrapped(valueLocation, element);
 				}
 			}
 		}
@@ -219,7 +221,7 @@ private static NodeLocation findArrayElementWithId(JsonNode entries, String id)
 			ObjectNode entryObject = (ObjectNode) entries.get(i);
 			var properties = entryObject.properties();
 			if (properties.size() != 1) {
-				throw new NotYetImplementedException(properties.toString());
+				throw new NotYetImplementedException("SO MANY PROPERTIES" + properties);
 			}
 			Map.Entry<String, JsonNode> entry = properties.iterator().next();
 			if (id.equals(entry.getKey())) {
@@ -269,11 +271,8 @@ public JsonNode replacementNode(NodeInfo nodeInfo, String lastSegment, Supplier<
 		return switch (nodeInfo.replacementStyle()) {
 			case PLAIN -> newValue.get();
 			case ID_ONLY -> new TextNode(lastSegment);
-			case WRAPPED_ENTITY -> {
-				JsonNode entityNode = newValue.get();
-				String id = entityNode.get("id").textValue();
-				yield new ObjectNode(JsonNodeFactory.instance, Map.of(id, entityNode));
-			}
+			case WRAPPED -> new ObjectNode(JsonNodeFactory.instance)
+				.set(lastSegment, newValue.get());
 		};
 	}
 

bosk-jackson/src/test/java/works/bosk/jackson/JsonNodeSurgeonTest.java

@@ -152,14 +152,14 @@ void catalogEntry() throws IOException, InterruptedException {
 		JsonNode catalogArray = doc.get("catalog");
 		JsonNode catalogEntry = catalogArray.get(0);
 		{
-			NodeInfo expected = NodeInfo.wrappedEntity(
+			NodeInfo expected = NodeInfo.wrapped(
 				new ObjectMember((ObjectNode) catalogEntry, "testEntry"),
 				new ArrayElement((ArrayNode) catalogArray, 0));
 			NodeInfo actual = surgeon.nodeInfo(doc, refs.catalogEntry(id));
 			assertEquals(expected, actual);
 		}
 		{
-			NodeInfo expected = NodeInfo.wrappedEntity(
+			NodeInfo expected = NodeInfo.wrapped(
 				new NonexistentParent(),
 				new ArrayElement((ArrayNode) catalogArray, 1));
 			NodeInfo actual = surgeon.nodeInfo(doc, refs.catalogEntry(Identifier.from("NONEXISTENT")));
@@ -212,14 +212,14 @@ void sideTableEntry() throws IOException, InterruptedException {
 		JsonNode valuesById = doc.get("sideTable").get("valuesById");
 		JsonNode entry = valuesById.get(0);
 		{
-			NodeInfo expected = NodeInfo.wrappedEntity(
+			NodeInfo expected = NodeInfo.wrapped(
 				new ObjectMember((ObjectNode) entry, "testKey"),
 				new ArrayElement((ArrayNode) valuesById, 0));
 			NodeInfo actual = surgeon.nodeInfo(doc, refs.sideTableEntry(id));
 			assertEquals(expected, actual);
 		}
 		{
-			NodeInfo expected = NodeInfo.wrappedEntity(
+			NodeInfo expected = NodeInfo.wrapped(
 				new NonexistentParent(),
 				new ArrayElement((ArrayNode) valuesById, 1));
 			NodeInfo actual = surgeon.nodeInfo(doc, refs.sideTableEntry(Identifier.from("NONEXISTENT")));