Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #1675 #1716

Merged
merged 3 commits into from
Apr 5, 2023
Merged

Fix #1675 #1716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3391341
Add failing test
Apr 4, 2023
69e3b6e
Use LinkedHasMap in ModelAssembler in order to iterate over files con…
miguel-vila Apr 4, 2023
2017669
use collect method instead to support java 8
miguel-vila Apr 4, 2023
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
3 changes: 2 additions & 1 deletion smithy-model/src/main/java/software/amazon/smithy/model/loader/ModelAssembler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
Expand Down Expand Up @@ -93,7 +94,7 @@ public final class ModelAssembler {
private TraitFactory traitFactory;
private ValidatorFactory validatorFactory;
private boolean disableValidation;
private final Map<String, Supplier<InputStream>> inputStreamModels = new HashMap<>();
private final Map<String, Supplier<InputStream>> inputStreamModels = new LinkedHashMap<>();
private final List<Validator> validators = new ArrayList<>();
private final List<Node> documentNodes = new ArrayList<>();
private final List<Model> mergeModels = new ArrayList<>();
Expand Down
22 changes: 22 additions & 0 deletions smithy-model/src/test/java/software/amazon/smithy/model/loader/ModelAssemblerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@
import java.util.Map;
import java.util.Optional;
import java.util.function.Supplier;
import java.util.stream.Collectors;

import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Assumptions;
Expand Down Expand Up @@ -391,6 +393,26 @@ public void detectsMetadataConflicts() {
containsString("Metadata conflict for key `foo`"));
}

@Test
public void metadataIsNotAffectedByTheSourceName() {
Model model1 = new ModelAssembler()
.addUnparsedModel("a1.smithy", "metadata items = [1]")
.addUnparsedModel("a2.smithy", "metadata items = [2]")
.addUnparsedModel("a3.smithy", "metadata items = [3]")
.assemble()
.unwrap();
Model model2 = new ModelAssembler()
.addUnparsedModel("b1.smithy", "metadata items = [1]")
.addUnparsedModel("b2.smithy", "metadata items = [2]")
.addUnparsedModel("b3.smithy", "metadata items = [3]")
.assemble()
.unwrap();
List<Number> metadata1 = model1.getMetadata().get("items").expectArrayNode().getElements().stream().map(s -> s.expectNumberNode().getValue()).collect(Collectors.toList());
List<Number> metadata2 = model2.getMetadata().get("items").expectArrayNode().getElements().stream().map(s -> s.expectNumberNode().getValue()).collect(Collectors.toList());
assertThat(metadata1, is(metadata2));
}


@Test
public void mergesMultipleModels() {
Model model = new ModelAssembler()
Expand Down