Skip to content
This repository was archived by the owner on May 16, 2025. It is now read-only.

Commit ec7f7a3

Browse files
TobiasNxTobiasNx
committed
Revert "Change further use of set_array to add_array and set_hash to set_hash #374"
This reverts commit aea03a8.
1 parent 840db07 commit ec7f7a3

File tree

9 files changed

+97
-123
lines changed

9 files changed

+97
-123
lines changed

‎README.md

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -303,19 +303,6 @@ Options:
303303

304304
#### Record-level functions
305305

306-
##### `add_array`
307-
308-
Creates a new array (with optional values).
309-
310-
```perl
311-
add_array("<targetFieldName>")
312-
add_array("<targetFieldName>", "<value_1>"[, ...])
313-
```
314-
315-
[Example in Playground](https://metafacture.org/playground/?example=add_array)
316-
317-
[Java Code](https://github.com/search?type=code&q=repo:metafacture/metafacture-fix+path:FixMethod.java+"+add_array+{")
318-
319306
##### `add_field`
320307

321308
Creates a field with a defined value.
@@ -328,19 +315,6 @@ add_field("<targetFieldName>", "<fieldValue>")
328315

329316
[Java Code](https://github.com/search?type=code&q=repo:metafacture/metafacture-fix+path:FixMethod.java+"+add_field+{")
330317

331-
##### `add_hash`
332-
333-
Creates a new hash (with optional values).
334-
335-
```perl
336-
add_hash("<targetFieldName>")
337-
add_hash("<targetFieldName>", "subfieldName": "<subfieldValue>"[, ...])
338-
```
339-
340-
[Example in Playground](https://metafacture.org/playground/?example=add_hash)
341-
342-
[Java Code](https://github.com/search?type=code&q=repo:metafacture/metafacture-fix+path:FixMethod.java+"+add_hash+{")
343-
344318
##### `array`
345319

346320
Converts a hash/object into an array.
@@ -1053,7 +1027,7 @@ E.g.:
10531027
```perl
10541028
# "ccm:university":["https://ror.org/0304hq317"]
10551029
# "ccm:university_DISPLAYNAME":["Gottfried Wilhelm Leibniz Universität Hannover"]
1056-
add_array("sourceOrga[]")
1030+
set_array("sourceOrga[]")
10571031
do list_as(orgId: "ccm:university[]", orgName: "ccm:university_DISPLAYNAME[]")
10581032
copy_field(orgId, "sourceOrga[].$append.id")
10591033
copy_field(orgName, "sourceOrga[].$last.name")

‎metafix/src/test/java/org/metafacture/metafix/MetafixBindTest.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public void doList() {
6464
@Test
6565
public void doListExplicitAppend() {
6666
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
67-
"add_array('author')",
67+
"set_array('author')",
6868
"do list('path': 'name', 'var': 'n')",
6969
" upcase('n')",
7070
" trim('n')",
@@ -212,7 +212,7 @@ public void doListPathWithDots() {
212212
@Test
213213
public void doListPathWithDotsExplicitAppend() {
214214
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
215-
"add_array('author')",
215+
"set_array('author')",
216216
"do list('path': 'some.name', 'var': 'n')",
217217
" upcase('n')",
218218
" trim('n')",
@@ -237,7 +237,7 @@ public void doListPathWithDotsExplicitAppend() {
237237
@Test
238238
public void doListWithAppendAndLast() {
239239
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
240-
"add_array('author[]')",
240+
"set_array('author[]')",
241241
"do list('path': 'creator', 'var': 'c')",
242242
" copy_field('c.name', 'author[].$append.name')",
243243
" add_field('author[].$last.type', 'Default')",
@@ -295,7 +295,7 @@ public void doListEntitesToLiterals() {
295295
@Test
296296
public void doListEntitesToLiteralsExplicitAppend() {
297297
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
298-
"add_array('author')",
298+
"set_array('author')",
299299
"do list('path': 'creator', 'var': 'c')",
300300
" upcase('c.name')",
301301
" trim('c.name')",
@@ -322,7 +322,7 @@ public void doListEntitesToLiteralsExplicitAppend() {
322322
@Test
323323
public void doListEntitesToEntities() {
324324
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
325-
"add_array('author[]')",
325+
"set_array('author[]')",
326326
"do list('path': 'creator', 'var': 'c')",
327327
" copy_field('c.name', 'author[].$append.name')",
328328
" if all_contain('c.name', 'University')",
@@ -359,7 +359,7 @@ public void doListEntitesToEntities() {
359359
@Test
360360
public void wildcardForNestedEntities() {
361361
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
362-
"add_array('author[]')",
362+
"set_array('author[]')",
363363
"do list('path': 'creator', 'var': 'c')",
364364
" if any_match('c.role.*.roleTerm.*.value','aut|cre')",
365365
" copy_field('c.name', 'author[].$append.name')",
@@ -430,7 +430,7 @@ public void doListIndexedArray() {
430430
@Test
431431
public void doListIndexedArrayToArrayOfObjects() {
432432
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
433-
"add_array('author[]')",
433+
"set_array('author[]')",
434434
"do list('path': 'name[]', 'var': 'n')",
435435
" copy_field('n', 'author[].$append.name')",
436436
"end",
@@ -483,7 +483,7 @@ public void doListIndexedArrayOfObjects() {
483483
@Test
484484
public void doListIndexedArrayOfObjectsExplicitAppend() {
485485
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
486-
"add_array('author')",
486+
"set_array('author')",
487487
"do list('path': 'name[]', 'var': 'n')",
488488
" copy_field('n.name', 'author.$append')",
489489
"end",
@@ -510,7 +510,7 @@ public void doListIndexedArrayOfObjectsExplicitAppend() {
510510
@Test
511511
public void doListIndexedArrayOfObjectsToArrayOfObjects() {
512512
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
513-
"add_array('author[]')",
513+
"set_array('author[]')",
514514
"do list('path': 'name[]', 'var': 'n')",
515515
" copy_field('n.name', 'author[].$append.name')",
516516
"end",
@@ -670,7 +670,7 @@ public void ifInCollectorCombine() {
670670

671671
private void shouldIterateOverList(final String path, final int expectedCount) {
672672
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
673-
"add_array('trace')",
673+
"set_array('trace')",
674674
"do list(path: '" + path + "', 'var': '$i')",
675675
" add_field('trace.$append', 'true')",
676676
"end",
@@ -716,7 +716,7 @@ public void shouldIterateOverListWithWildcard() {
716716

717717
private void shouldIterateOverListOfHashes(final String path, final int expectedCount) {
718718
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
719-
"add_array('trace')",
719+
"set_array('trace')",
720720
"do list(path: '" + path + "', 'var': '$i')",
721721
" add_field('trace.$append', 'true')",
722722
"end",
@@ -771,7 +771,7 @@ public void shouldIterateOverListOfHashesWithWildcard() {
771771
// See https://github.com/metafacture/metafacture-fix/issues/119
772772
public void shouldPerformComplexOperationWithPathWildcard() {
773773
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
774-
"add_array('coll[]')",
774+
"set_array('coll[]')",
775775
"do list(path: 'feld?', 'var': '$i')",
776776
" add_field('coll[].$append.feldtest', 'true')",
777777
" copy_field('$i.a.value', 'coll[].$last.a')",
@@ -847,7 +847,7 @@ public void shouldPerformComplexOperationWithPathWildcard() {
847847
@Test
848848
public void shouldDoListAsWithSingleList() {
849849
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
850-
"add_array('sourceOrga[]')",
850+
"set_array('sourceOrga[]')",
851851
"do list_as(orgId: 'ccm:university[]')",
852852
" copy_field(orgId, 'sourceOrga[].$append.id')",
853853
"end"
@@ -881,7 +881,7 @@ public void shouldDoListAsWithSingleList() {
881881
@Test
882882
public void shouldDoListAsWithMultipleLists() {
883883
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
884-
"add_array('sourceOrga[]')",
884+
"set_array('sourceOrga[]')",
885885
"do list_as(orgId: 'ccm:university[]', orgName: 'ccm:university_DISPLAYNAME[]', orgLoc: 'ccm:university_LOCATION[]')",
886886
" copy_field(orgId, 'sourceOrga[].$append.id')",
887887
" copy_field(orgName, 'sourceOrga[].$last.name')",
@@ -937,9 +937,9 @@ public void shouldDoListAsWithMultipleLists() {
937937
@Test // checkstyle-disable-line JavaNCSS
938938
public void shouldDoListAsWithMultipleListsOfDifferentSizes() {
939939
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
940-
"add_array('sourceOrga[]')",
940+
"set_array('sourceOrga[]')",
941941
"do list_as(orgId: 'ccm:university[]', orgName: 'ccm:university_DISPLAYNAME[]', orgLoc: 'ccm:university_LOCATION[]')",
942-
" add_hash('sourceOrga[].$append')",
942+
" set_hash('sourceOrga[].$append')",
943943
" copy_field(orgId, 'sourceOrga[].$last.id')",
944944
" copy_field(orgName, 'sourceOrga[].$last.name')",
945945
" copy_field(orgLoc, 'sourceOrga[].$last.location')",

‎metafix/src/test/java/org/metafacture/metafix/MetafixIfTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1624,7 +1624,7 @@ public void shouldReportArrayEntityAsArray() {
16241624
@Test
16251625
public void shouldReportEmptyArrayAsArray() {
16261626
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
1627-
"add_array(foo)",
1627+
"set_array(foo)",
16281628
"if is_array(foo)",
16291629
" add_field(test,ok)",
16301630
"end"
@@ -1767,7 +1767,7 @@ public void shouldReportEmptyArrayEntityAsEmpty() {
17671767
@Test
17681768
public void shouldReportEmptyArrayAsEmpty() {
17691769
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
1770-
"add_array(foo)",
1770+
"set_array(foo)",
17711771
"if is_empty(foo)",
17721772
" add_field(test,ok)",
17731773
"end"
@@ -2127,7 +2127,7 @@ public void shouldReportHashAsObject() {
21272127
@Test
21282128
public void shouldReportEmptyHashAsObject() {
21292129
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
2130-
"add_hash(foo)",
2130+
"set_hash(foo)",
21312131
"if is_object(foo)",
21322132
" add_field(test,ok)",
21332133
"end"
@@ -2499,7 +2499,7 @@ public void shouldMatchString() {
24992499
@Test
25002500
public void shouldTestMacroVariable() {
25012501
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
2502-
"add_array('type')",
2502+
"set_array('type')",
25032503
"do put_macro('test')",
25042504
" if str_contain('name', 'a$[var]')",
25052505
" add_field('type.$append', 'Organization: $[var]')",

‎metafix/src/test/java/org/metafacture/metafix/MetafixLookupTest.java

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public void inlineDotNotationNested() {
144144
@Test
145145
public void shouldLookupInternalArrayWithAsterisk() {
146146
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
147-
"add_array('title', 'Aloha')",
147+
"set_array('title', 'Aloha')",
148148
LOOKUP + " Aloha: Alohaeha)"
149149
),
150150
i -> {
@@ -162,7 +162,7 @@ public void shouldLookupInternalArrayWithAsterisk() {
162162
@Test
163163
public void shouldLookupDeduplicatedInternalArrayWithAsterisk() {
164164
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
165-
"add_array('title', 'Aloha', 'Aloha')",
165+
"set_array('title', 'Aloha', 'Aloha')",
166166
"uniq('title')",
167167
LOOKUP + " Aloha: Alohaeha)"
168168
),
@@ -182,8 +182,8 @@ public void shouldLookupDeduplicatedInternalArrayWithAsterisk() {
182182
public void shouldNotLookupCopiedInternalArrayWithAsterisk() {
183183
MetafixTestHelpers.assertExecutionException(IllegalStateException.class, "Expected Array or Hash, got String", () ->
184184
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
185-
"add_array('data', 'Aloha')",
186-
"add_array('title')",
185+
"set_array('data', 'Aloha')",
186+
"set_array('title')",
187187
"copy_field('data', 'title')",
188188
LOOKUP + " Aloha: Alohaeha)"
189189
),
@@ -200,8 +200,8 @@ public void shouldNotLookupCopiedInternalArrayWithAsterisk() {
200200
@Test
201201
public void shouldLookupCopiedInternalArrayWithAsteriskExplicitAppend() {
202202
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
203-
"add_array('data', 'Aloha')",
204-
"add_array('title')",
203+
"set_array('data', 'Aloha')",
204+
"set_array('title')",
205205
"copy_field('data', 'title.$append')",
206206
LOOKUP + " Aloha: Alohaeha)"
207207
),
@@ -222,9 +222,9 @@ public void shouldLookupCopiedInternalArrayWithAsteriskExplicitAppend() {
222222
public void shouldNotLookupCopiedDeduplicatedInternalArrayWithAsterisk() {
223223
MetafixTestHelpers.assertExecutionException(IllegalStateException.class, "Expected Array or Hash, got String", () ->
224224
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
225-
"add_array('data', 'Aloha', 'Aloha')",
225+
"set_array('data', 'Aloha', 'Aloha')",
226226
"uniq('data')",
227-
"add_array('title')",
227+
"set_array('title')",
228228
"copy_field('data', 'title')",
229229
LOOKUP + " Aloha: Alohaeha)"
230230
),
@@ -241,9 +241,9 @@ public void shouldNotLookupCopiedDeduplicatedInternalArrayWithAsterisk() {
241241
@Test
242242
public void shouldLookupCopiedDeduplicatedInternalArrayWithAsteriskExplicitAppend() {
243243
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
244-
"add_array('data', 'Aloha', 'Aloha')",
244+
"set_array('data', 'Aloha', 'Aloha')",
245245
"uniq('data')",
246-
"add_array('title')",
246+
"set_array('title')",
247247
"copy_field('data', 'title.$append')",
248248
LOOKUP + " Aloha: Alohaeha)"
249249
),
@@ -263,7 +263,7 @@ public void shouldLookupCopiedDeduplicatedInternalArrayWithAsteriskExplicitAppen
263263
@Test
264264
public void shouldLookupCopiedExternalArrayWithAsteriskExplicitAppend() {
265265
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
266-
"add_array('title')",
266+
"set_array('title')",
267267
"copy_field('data', 'title.$append')",
268268
LOOKUP + " Aloha: Alohaeha)"
269269
),
@@ -285,7 +285,7 @@ public void shouldLookupCopiedExternalArrayWithAsteriskExplicitAppend() {
285285
public void shouldLookupCopiedDeduplicatedExternalArrayWithAsteriskExplicitAppend() {
286286
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
287287
"uniq('data')",
288-
"add_array('title')",
288+
"set_array('title')",
289289
"copy_field('data', 'title.$append')",
290290
LOOKUP + " Aloha: Alohaeha)"
291291
),
@@ -309,7 +309,7 @@ public void shouldNotLookupMovedDeduplicatedExternalArrayWithAsterisk() {
309309
MetafixTestHelpers.assertExecutionException(IllegalStateException.class, "Expected Array or Hash, got String", () ->
310310
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
311311
"uniq('data')",
312-
"add_array('title')",
312+
"set_array('title')",
313313
"move_field('data', 'title')",
314314
LOOKUP + " Aloha: Alohaeha)"
315315
),
@@ -329,7 +329,7 @@ public void shouldNotLookupMovedDeduplicatedExternalArrayWithAsterisk() {
329329
public void shouldLookupMovedDeduplicatedExternalArrayWithAsteriskExplicitAppend() {
330330
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
331331
"uniq('data')",
332-
"add_array('title')",
332+
"set_array('title')",
333333
"move_field('data', 'title.$append')",
334334
LOOKUP + " Aloha: Alohaeha)"
335335
),
@@ -351,7 +351,7 @@ public void shouldLookupMovedDeduplicatedExternalArrayWithAsteriskExplicitAppend
351351
public void shouldNotLookupMovedExternalArrayWithAsterisk() {
352352
MetafixTestHelpers.assertExecutionException(IllegalStateException.class, "Expected Array or Hash, got String", () ->
353353
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
354-
"add_array('title')",
354+
"set_array('title')",
355355
"move_field('data', 'title')",
356356
LOOKUP + " Aloha: Alohaeha)"
357357
),
@@ -369,7 +369,7 @@ public void shouldNotLookupMovedExternalArrayWithAsterisk() {
369369
@Test
370370
public void shouldLookupMovedExternalArrayWithAsteriskExplicitAppend() {
371371
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
372-
"add_array('title')",
372+
"set_array('title')",
373373
"move_field('data', 'title.$append')",
374374
LOOKUP + " Aloha: Alohaeha)"
375375
),
@@ -994,9 +994,9 @@ public void shouldLookupInCopiedNestedArraysCreatedWithPrepend() {
994994
private void shouldLookupInCopiedNestedArraysCreatedWith(final String reservedField) {
995995
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
996996
"put_map('rswk-indicator', s: 'SubjectHeading')",
997-
"add_array('subject[]')",
998-
"add_array('subject[]." + reservedField + ".componentList[]')",
999-
"add_array('subject[].$last.componentList[]." + reservedField + ".type[]')",
997+
"set_array('subject[]')",
998+
"set_array('subject[]." + reservedField + ".componentList[]')",
999+
"set_array('subject[].$last.componentList[]." + reservedField + ".type[]')",
10001000
"do list(path: 'D', 'var': '$i')",
10011001
" copy_field('$i', 'subject[].$last.componentList[].$last.type[]." + reservedField + "')",
10021002
"end",
@@ -1247,7 +1247,7 @@ public void shouldExplicitLookupRdfUrlWithRedirection() {
12471247
@Test // Scenario 1
12481248
public void shouldLookupInExternalRdfMapGetObjectOfSubjectWithTargetedPredicateOfSpecificLanguage() {
12491249
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
1250-
"add_array('prefLabel', 'https://w3id.org/kim/hochschulfaechersystematik/n4')",
1250+
"set_array('prefLabel', 'https://w3id.org/kim/hochschulfaechersystematik/n4')",
12511251
"put_rdfmap('" + RDF_MAP + "', 'rdfmap', target: 'skos:prefLabel', select_language: 'de')",
12521252
"lookup('prefLabel.*', 'rdfmap')"
12531253
),
@@ -1266,7 +1266,7 @@ public void shouldLookupInExternalRdfMapGetObjectOfSubjectWithTargetedPredicateO
12661266
@Test // Scenario 2
12671267
public void shouldLookupInExternalRdfMapGetSubjectWithTargetedPredicateOfSpecificLanguage() {
12681268
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
1269-
"add_array('id', 'Mathematics, Natural Sciences')",
1269+
"set_array('id', 'Mathematics, Natural Sciences')",
12701270
"put_rdfmap('" + RDF_MAP + "', 'rdfmap', target: 'skos:prefLabel', select_language: 'en')",
12711271
"lookup('id.*', 'rdfmap')"
12721272
),
@@ -1408,7 +1408,7 @@ public void shouldLookupRdfDefinedPropertyToSubject() {
14081408

14091409
private void shouldLookupInExternalRdfMapGetObjectWithTargetedPredicateOfSpecificLanguage(final String target) {
14101410
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
1411-
"add_array('prefLabel', 'Mathematics, Natural Sciences')",
1411+
"set_array('prefLabel', 'Mathematics, Natural Sciences')",
14121412
"put_rdfmap('" + RDF_MAP + "', 'rdfmap', target: '" + target + "', select_language: 'de')",
14131413
"lookup('prefLabel.*', 'rdfmap')"
14141414
),

0 commit comments

Comments
 (0)