Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions dfu/src/main/java/org/enginehub/linbus/dfu/LinOps.java
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,6 @@ public static LinOps getInstance() {
return INSTANCE;
}

private final LinRecordBuilder recordBuilder = new LinRecordBuilder(this);

private LinOps() {
}

Expand Down Expand Up @@ -450,7 +448,7 @@ public LinTag<?> remove(LinTag<?> input, String key) {

@Override
public RecordBuilder<LinTag<?>> mapBuilder() {
return recordBuilder;
return new LinRecordBuilder(this);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package org.enginehub.linbus.dfu;

import com.mojang.serialization.DataResult;
import com.mojang.serialization.RecordBuilder;
import org.enginehub.linbus.tree.LinCompoundTag;
import org.enginehub.linbus.tree.LinEndTag;
import org.enginehub.linbus.tree.LinIntTag;
Expand Down Expand Up @@ -78,10 +79,22 @@ void addRejectsEndValue() {
.hasErrorWithMessageThat().startsWith("Cannot add END tag to compound: ");
}

@Test
@DisplayName("each mapBuilder() call is independent, so concurrent builders don't leak into each other")
void mapBuilderCallsAreIndependent() {
RecordBuilder<LinTag<?>> first = OPS.mapBuilder().add("a", LinIntTag.of(1));
RecordBuilder<LinTag<?>> second = OPS.mapBuilder().add("b", LinIntTag.of(2));

assertThat(first.build(OPS.empty()))
.hasResultThat().isEqualTo(LinCompoundTag.builder().putInt("a", 1).build());
assertThat(second.build(OPS.empty()))
.hasResultThat().isEqualTo(LinCompoundTag.builder().putInt("b", 2).build());
}

@Test
void addRejectsEndValueFromDataResult() {
assertThat(
OPS.mapBuilder().add("a", DataResult.success((LinTag<?>) LinEndTag.instance())).build(OPS.empty())
OPS.mapBuilder().add("a", DataResult.success(LinEndTag.instance())).build(OPS.empty())
).hasErrorWithMessageThat().startsWith("Cannot add END tag to compound: ");
}
}