Skip to content
This repository has been archived by the owner on Jan 27, 2025. It is now read-only.

Commit

Permalink
Merge pull request #217 from metafacture/130-156-171-insert
Browse files Browse the repository at this point in the history 
Fix issues when inserting into arrays
  • Loading branch information
@fsteeg
fsteeg authored May 6, 2022
2 parents d82e1b8 + c557c16 commit 1f9d5c2
Show file tree
Hide file tree
Showing 17 changed files with 152 additions and 73 deletions.
62 changes: 21 additions & 41 deletions metafix/src/main/java/org/metafacture/metafix/FixPath.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ else if (isReference(currentSegment)) {

private Value findInValue(final Value value, final String[] p) {
// TODO: move impl into enum elements, here call only value.find
return value == null ? null : value.extractType((m, c) -> m
return p.length == 0 ? value : value == null ? null : value.extractType((m, c) -> m
.ifArray(a -> c.accept(new FixPath(p).findIn(a)))
.ifHash(h -> c.accept(new FixPath(p).findIn(h)))
.orElse(c)
Expand Down Expand Up @@ -249,24 +249,15 @@ private void removeNestedFrom(final Value value) {
/*package-private*/ private Value insertInto(final Array array, final InsertMode mode, final Value newValue) {
// basic idea: reuse findIn logic here? setIn(findIn(array), newValue)
final String field = path[0];
if (field.equals(ASTERISK)) {
if (path.length == 1) {
for (int i = 0; i < array.size(); ++i) {
mode.apply(array, String.valueOf(i + 1), newValue);
}
}
else {
array.add(Value.newHash(h -> new FixPath(tail(path)).insertInto(h, mode, newValue)));
}
if (path.length == 1) {
mode.apply(array, field, newValue);
}
else {
if (path.length == 1) {
mode.apply(array, field, newValue);
if (ASTERISK.equals(field)) {
array.forEach(value -> insertInto(value, mode, newValue, field, tail(path)));
}
else {
if (isReference(field)) {
return processRef(getReferencedValue(array, field), mode, newValue, field, tail(path));
}
else if (isReference(field)) {
insertInto(getReferencedValue(array, field), mode, newValue, field, tail(path));
}
}
return new Value(array);
Expand All @@ -279,45 +270,34 @@ private void removeNestedFrom(final Value value) {
mode.apply(hash, field, newValue);
}
else {
final String[] tail = tail(path);
if (isReference(field)) {
return processRef(hash.get(field), mode, newValue, field, tail);
}
if (!hash.containsField(field)) {
hash.put(field, Value.newHash());
}
final Value value = hash.get(field);
if (value != null) {
// TODO: move impl into enum elements, here call only value.insert
value.matchType()
.ifArray(a -> new FixPath(tail).insertInto(a, mode, newValue))
.ifHash(h -> new FixPath(tail).insertInto(h, mode, newValue))
.orElseThrow();
}
insertInto(hash.get(field), mode, newValue, field, tail(path));
}

return new Value(hash);
}

private String[] tail(final String[] fields) {
return Arrays.copyOfRange(fields, 1, fields.length);
}

private Value processRef(final Value referencedValue, final InsertMode mode, final Value newValue, final String field,
private Value insertInto(final Value value, final InsertMode mode, final Value newValue, final String field,
final String[] tail) {
if (referencedValue != null) {
if (value != null) {
final FixPath fixPath = new FixPath(tail);
newValue.updatePathAddBase(referencedValue, field);
return referencedValue.extractType((m, c) -> m
.ifArray(a -> c.accept(fixPath.insertInto(referencedValue.asArray(), mode, newValue)))
.ifHash(h -> c.accept(fixPath.insertInto(referencedValue.asHash(), mode, newValue)))
newValue.updatePathAddBase(value, field);
return value.extractType((m, c) -> m
.ifArray(a -> c.accept(fixPath.insertInto(a, mode, newValue)))
.ifHash(h -> c.accept(fixPath.insertInto(h, mode, newValue)))
.orElseThrow());
}
else {
throw new IllegalArgumentException("Using ref, but can't find: " + field + " in: " + referencedValue);
throw new IllegalArgumentException("Using ref, but can't find: " + field + " in: " + value);
}
}

private String[] tail(final String[] fields) {
return Arrays.copyOfRange(fields, 1, fields.length);
}

private enum ReservedField {
$append, $first, $last;

Expand Down Expand Up @@ -348,10 +328,10 @@ private Value getReferencedValue(final Array array, final String field) {
if (reservedField != null) {
switch (reservedField) {
case $first:
referencedValue = array.get(0);
referencedValue = getReferencedValue(array, "1");
break;
case $last:
referencedValue = array.get(array.size() - 1);
referencedValue = getReferencedValue(array, String.valueOf(array.size()));
break;
case $append:
referencedValue = Value.newHash(); // TODO: append non-hash?
Expand Down
60 changes: 52 additions & 8 deletions metafix/src/test/java/org/metafacture/metafix/MetafixMethodTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1844,10 +1844,34 @@ public void copyFieldToSubfieldOfArrayOfObjectsWithIndexExplicitAppend() {
}

@Test
@MetafixToDo("See https://github.com/metafacture/metafacture-fix/pull/205")
public void addFieldIntoArrayOfObjectsWithLastWildcardImplicitSkip() {
// We currently fail on unresolved references, see MetafixRecordTests#assertThrowsOnEmptyArray
public void addFieldIntoArrayOfObjectsWithLastWildcardMissingError() {
MetafixTestHelpers.assertProcessException(IllegalArgumentException.class, "Using ref, but can't find: $last in: null", () -> {
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
"add_field('animals[].$last.key', 'value')"
),
i -> {
i.startRecord("1");
i.startEntity("animals[]");
i.endEntity();
i.endRecord();
},
(o, f) -> {
o.get().startRecord("1");
o.get().startEntity("animals[]");
o.get().endEntity();
o.get().endRecord();
}
);
});
}

@Test
public void addFieldIntoArrayOfObjectsWithLastWildcardAllEmpty() {
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
"add_field('animals[].$last.key', 'value')"
"if exists('animals[].$last')",
" add_field('animals[].$last.key', 'value')",
"end"
),
i -> {
i.startRecord("1");
Expand All @@ -1865,8 +1889,7 @@ public void addFieldIntoArrayOfObjectsWithLastWildcardImplicitSkip() {
}

@Test
@MetafixToDo("See https://github.com/metafacture/metafacture-fix/pull/205")
public void addFieldIntoArrayOfObjectsWithLastWildcardExplicitSkip() {
public void addFieldIntoArrayOfObjectsWithLastWildcardLastEmpty() {
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
"if exists('animals[].$last')",
" add_field('animals[].$last.key', 'value')",
Expand All @@ -1875,12 +1898,36 @@ public void addFieldIntoArrayOfObjectsWithLastWildcardExplicitSkip() {
i -> {
i.startRecord("1");
i.startEntity("animals[]");
i.startEntity("1");
i.literal("name", "Jake");
i.literal("type", "dog");
i.endEntity();
i.startEntity("2");
i.literal("name", "Blacky");
i.literal("type", "bird");
i.endEntity();
i.endEntity();
i.endRecord();
i.startRecord("2");
i.startEntity("animals[]");
i.endEntity();
i.endRecord();
},
(o, f) -> {
o.get().startRecord("1");
o.get().startEntity("animals[]");
o.get().startEntity("1");
o.get().literal("name", "Jake");
o.get().literal("type", "dog");
o.get().endEntity();
o.get().startEntity("2");
o.get().literal("name", "Blacky");
o.get().literal("type", "bird");
o.get().literal("key", "value");
f.apply(2).endEntity();
o.get().endRecord();
o.get().startRecord("2");
o.get().startEntity("animals[]");
o.get().endEntity();
o.get().endRecord();
}
Expand Down Expand Up @@ -2369,7 +2416,6 @@ public void shouldSortFieldAndRemoveDuplicates() {
}

@Test
@MetafixToDo("See https://github.com/metafacture/metafacture-fix/issues/121")
public void shouldSortArrayFieldWithAsterisk() {
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
"sort_field('OTHERS[].*.dnimals[]')"
Expand Down Expand Up @@ -2558,7 +2604,6 @@ public void shouldSplitHashField() {
}

@Test
@MetafixToDo("See https://github.com/metafacture/metafacture-fix/issues/100 and https://github.com/metafacture/metafacture-fix/issues/121")
public void shouldSplitNestedField() {
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
"split_field('others[].*.tools', '--')"
Expand Down Expand Up @@ -2607,7 +2652,6 @@ public void shouldSumNumbers() {
}

@Test
@MetafixToDo("java.lang.IllegalStateException: Expected String, got Array; see https://github.com/metafacture/metafacture-fix/issues/121")
public void shouldSumArrayFieldWithAsterisk() {
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
"sum('OTHERS[].*.dumbers[]')"
Expand Down
80 changes: 71 additions & 9 deletions metafix/src/test/java/org/metafacture/metafix/MetafixRecordTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,7 @@ public void appendWithAsteriksWildcardAtTheEnd() {
}

@Test
// See https://github.com/metafacture/metafacture-fix/pull/142
@MetafixToDo("See https://github.com/metafacture/metafacture-fix/pull/113")
public void shouldCopyArrayFieldWithoutAsterisk() {
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
"set_array('TEST_TWO[]')",
Expand All @@ -691,23 +691,51 @@ public void shouldCopyArrayFieldWithoutAsterisk() {
i.endEntity();
i.endRecord();
},
o -> {
(o, f) -> {
o.get().startRecord("1");
o.get().startEntity("test[]");
o.get().literal("1", "One");
o.get().literal("2", "Two");
o.get().literal("3", "Three");
o.get().endEntity();
o.get().startEntity("TEST_TWO[]");
o.get().startEntity("1");
o.get().literal("1", "One");
o.get().literal("2", "Two");
o.get().literal("3", "Three");
o.get().endEntity();
f.apply(2).endEntity();
o.get().endRecord();
}
);
}

@Test
@MetafixToDo("See https://github.com/metafacture/metafacture-fix/issues/113")
public void copyFieldArrayOfObjectsAndListNewArrayOfObjectsAndMoveSubfield() {
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
"copy_field('author[]','creator[]')",
"do list(path:'creator[]')",
" move_field('name','label')",
"end",
"retain('creator[]')"),
i -> {
i.startRecord("1");
i.startEntity("author[]");
i.startEntity("1");
i.literal("name", "A University");
i.endEntity();
i.endEntity();
i.endRecord();
}, (o, f) -> {
o.get().startRecord("1");
o.get().startEntity("creator[]");
o.get().startEntity("1");
o.get().literal("label", "A University");
f.apply(2).endEntity();
o.get().endRecord();
});
}

@Test
// See https://github.com/metafacture/metafacture-fix/issues/121
public void shouldCopyArrayFieldWithAsterisk() {
Expand Down Expand Up @@ -1070,26 +1098,28 @@ public void addFieldToObjectByIndexInIndexedArray() {

@Test
public void addFieldToFirstObjectMissing() {
assertThrowsOnEmptyRecord("$first");
assertThrowsOnEmptyArray("$first");
}

@Test
public void addFieldToLastObjectMissing() {
assertThrowsOnEmptyRecord("$last");
assertThrowsOnEmptyArray("$last");
}

@Test
public void addFieldToObjectByIndexMissing() {
assertThrowsOnEmptyRecord("2");
assertThrowsOnEmptyArray("2");
}

private void assertThrowsOnEmptyRecord(final String index) {
private void assertThrowsOnEmptyArray(final String index) {
MetafixTestHelpers.assertProcessException(IllegalArgumentException.class, "Using ref, but can't find: " + index + " in: null", () -> {
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
"add_field('animals[]." + index + ".kind','nice')"
),
i -> {
i.startRecord("1");
i.startEntity("animals[]");
i.endEntity();
i.endRecord();
},
o -> {
Expand All @@ -1099,7 +1129,6 @@ private void assertThrowsOnEmptyRecord(final String index) {
}

@Test
@MetafixToDo("See https://github.com/metafacture/metafacture-fix/issues/121")
public void shouldAddArraySubFieldWithAsterisk() {
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
"add_field('coll[].*.c', 'test')"
Expand Down Expand Up @@ -1144,7 +1173,7 @@ public void shouldAddArraySubFieldWithAsterisk() {
o.get().startEntity("4");
o.get().literal("a", "Crocodile");
o.get().literal("c", "test");
f.apply(3).endEntity();
f.apply(2).endEntity();
o.get().endRecord();
}
);
Expand Down Expand Up @@ -1685,6 +1714,39 @@ public void setArrayReplaceExisting() {
});
}

@Test
// See https://github.com/metafacture/metafacture-fix/issues/130
public void setArrayInArrayWithAsterisk() {
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
"set_array('foo[].*.test[]', 'test')"),
i -> {
i.startRecord("1");
i.startEntity("foo[]");
i.startEntity("1");
i.literal("id", "A");
i.endEntity();
i.startEntity("2");
i.literal("id", "B");
i.endEntity();
i.endEntity();
i.endRecord();
}, (o, f) -> {
o.get().startRecord("1");
o.get().startEntity("foo[]");
o.get().startEntity("1");
o.get().literal("id", "A");
o.get().startEntity("test[]");
o.get().literal("1", "test");
f.apply(2).endEntity();
o.get().startEntity("2");
o.get().literal("id", "B");
o.get().startEntity("test[]");
o.get().literal("1", "test");
f.apply(3).endEntity();
o.get().endRecord();
});
}

@Test
public void setHash() {
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
Expand Down
1 change: 0 additions & 1 deletion ...e/metafix/integration/record/fromJson/toJson/add_fieldAsteriskIntoArrayOfObjects/todo.txt
View file

This file was deleted.

4 changes: 3 additions & 1 deletion ...x/integration/record/fromJson/toJson/add_fieldIntoArrayOfObjectsWithLastWildcard/test.fix
View file
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
add_field("animals[].$last.key", "value")
if exists("animals[].$last")
add_field("animals[].$last.key", "value")
end
1 change: 0 additions & 1 deletion ...x/integration/record/fromJson/toJson/add_fieldIntoArrayOfObjectsWithLastWildcard/todo.txt
View file

This file was deleted.

1 change: 0 additions & 1 deletion ...etafacture/metafix/integration/record/fromJson/toJson/add_fieldSimpleSubsubfield/todo.txt
View file

This file was deleted.

4 changes: 2 additions & 2 deletions ...romJson/toJson/copy_fieldArrayOfObjectsAndListNewArrayOfObjectsAndMoveSubfield/input.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
{
"author": [
{
"@type": "Person",
"name": "Jürgen Böhner"
"name": "Jürgen Böhner",
"@type": "Person"
}
]
}
2 changes: 1 addition & 1 deletion ...bjectsAsRepeatedObjectAndThenArrayOfStringsIntoTheArrayOfObjectsWithLastWildcard/todo.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
See issue #132 may also be related to #113
See issue #132
1 change: 0 additions & 1 deletion ...d/fromJson/toJson/copy_fieldArrayOfStringsIntoArrayOfObjectsWithAsteriskWildcard/todo.txt
View file

This file was deleted.

Loading

0 comments on commit 1f9d5c2

Please sign in to comment.