DATAREST-956 handle add and remove item to nested collections #245
Conversation
mduesterhoeft
force-pushed
the
feature/DATAREST-956
branch
from
6ca037b
to
e591e97
Compare
mduesterhoeft
force-pushed
the
feature/DATAREST-956
branch
from
e591e97
to
45ab9ab
Compare
| @@ -240,13 +241,18 @@ private boolean handleArrayNode(ArrayNode array, Collection<Object> collection, | |||
| for (JsonNode jsonNode : array) { | |||
|
|
|||
| if (!value.hasNext()) { | |||
| if (componentType != null) { | |||
| collection.add(mapper.treeToValue(jsonNode, componentType)); | |||
| } | |||
There was a problem hiding this comment.
I think we have to extend the algorithm here as this will only work if there's exactly one more item provided. It will get added but then the iteration is stopped so that all subsequent incoming elements are ignored, right? I guess we could just trigger a continue if there are more elements in the array only resorting to the eventual return if we have maxed out the array elements.
I am kind of wondering whether we could or should actually invert the processing here: iterating over the existing elements first, removing items if we max out the array first and resort to adding everything thats left in the array after that?
| return nestedObjectFound; | ||
| } | ||
|
|
||
| Object next = value.next(); | ||
|
|
||
| if (ArrayNode.class.isInstance(jsonNode)) { | ||
| return handleArrayNode(array, asCollection(next), mapper); | ||
| final Collection<Object> nestedCollection = asCollection(next); |
|
That said, I am happy to take it from here if you don't fancy investing more time :). |
|
@olivergierke thanks for the feedback - sure I am willing to do the improvements - just overlooked that I missed the case for adding multiple items. |
|
@olivergierke what do you think. Is my fix already considered a hack? ;-) |
…val for PUT requests. DomainObjectMerger now properly adds and removes elements to and from collections. Original pull request: #245.
Some tiny refactorings in DomainObjectReader. We're now using TypeInformation instead of Class to preserve more generics information when it comes to deeper nesting. Moved some code around in the unit tests. Original pull request: #245.
…val for PUT requests. DomainObjectMerger now properly adds and removes elements to and from collections. Original pull request: #245.
Some tiny refactorings in DomainObjectReader. We're now using TypeInformation instead of Class to preserve more generics information when it comes to deeper nesting. Moved some code around in the unit tests. Original pull request: #245.
…val for PUT requests. DomainObjectMerger now properly adds and removes elements to and from collections. Original pull request: #245.
Some tiny refactorings in DomainObjectReader. We're now using TypeInformation instead of Class to preserve more generics information when it comes to deeper nesting. Moved some code around in the unit tests. Original pull request: #245.
|
That's polished, merged, bacl- and forward-ported, thanks! |
addresses https://jira.spring.io/browse/DATAREST-956