From adb06930f92d1dae241344dc4f83087b6e75d778 Mon Sep 17 00:00:00 2001
From: Fabian Steeg <steeg@hbz-nrw.de>
Date: Thu, 9 Dec 2021 17:15:59 +0100
Subject: [PATCH] Integrate feedback from PR #87 (see #80, #82)

Co-authored-by: Jens Wille <jens.wille@hbz-nrw.de>
---
 .../src/main/java/org/metafacture/metafix/Value.java |  4 +---
 .../org/metafacture/metafix/MetafixRecordTest.java   | 12 ++++--------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/metafix/src/main/java/org/metafacture/metafix/Value.java b/metafix/src/main/java/org/metafacture/metafix/Value.java
index bbcdce61..33b9cd27 100644
--- a/metafix/src/main/java/org/metafacture/metafix/Value.java
+++ b/metafix/src/main/java/org/metafacture/metafix/Value.java
@@ -273,9 +273,7 @@ void apply(final Hash hash, final String field, final String value) {
             INDEXED {
                 @Override
                 void apply(final Hash hash, final String field, final String value) {
-                    final Value newHash = newHash();
-                    newHash.asHash().put(field, new Value(value));
-                    hash.add(nextIndex(hash), newHash);
+                    hash.add(nextIndex(hash), newHash(h -> h.put(field, new Value(value))));
                 }
 
                 private String nextIndex(final Hash hash) {
diff --git a/metafix/src/test/java/org/metafacture/metafix/MetafixRecordTest.java b/metafix/src/test/java/org/metafacture/metafix/MetafixRecordTest.java
index b7ec596f..05455b28 100644
--- a/metafix/src/test/java/org/metafacture/metafix/MetafixRecordTest.java
+++ b/metafix/src/test/java/org/metafacture/metafix/MetafixRecordTest.java
@@ -267,8 +267,7 @@ public void add() {
     @Test
     public void addWithAppendInArray() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
-                "add_field('names.$append','patrick')",
-                "vacuum()"),
+                "add_field('names.$append','patrick')"),
             i -> {
                 i.startRecord("1");
                 i.literal("names", "max");
@@ -288,8 +287,7 @@ public void addWithAppendInArray() {
     @Test
     public void addWithAppendInHash() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
-                "add_field('author.names.$append','patrick')",
-                "vacuum()"),
+                "add_field('author.names.$append','patrick')"),
             i -> {
                 i.startRecord("1");
                 i.startEntity("author");
@@ -312,8 +310,7 @@ public void addWithAppendInHash() {
     @Test
     public void addWithAppendInArrayWithSubfieldFromRepeatedField() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
-                "add_field('authors.$append.name','patrick')",
-                "vacuum()"),
+                "add_field('authors.$append.name','patrick')"),
             i -> {
                 i.startRecord("1");
                 i.startEntity("authors");
@@ -342,8 +339,7 @@ public void addWithAppendInArrayWithSubfieldFromRepeatedField() {
     @Test
     public void addWithAppendInArrayWithSubfieldFromIndexedArray() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
-                "add_field('authors[].$append.name','patrick')",
-                "vacuum()"),
+                "add_field('authors[].$append.name','patrick')"),
             i -> {
                 i.startRecord("1");
                 i.startEntity("authors[]");