Skip to content

Commit 5523868

Browse files
committed
change type of possibleValues in EnumSchema from Set to List
1 parent 22cc738 commit 5523868

File tree

3 files changed

+17
-18
lines changed

3 files changed

+17
-18
lines changed

core/src/main/java/org/everit/json/schema/EnumSchema.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package org.everit.json.schema;
22

3-
import static java.util.stream.Collectors.toSet;
3+
import static java.util.stream.Collectors.toList;
44

55
import java.util.Collections;
6-
import java.util.HashSet;
6+
import java.util.ArrayList;
77
import java.util.Objects;
8-
import java.util.Set;
8+
import java.util.List;
99

1010
import org.everit.json.schema.internal.JSONPrinter;
1111
import org.json.JSONArray;
@@ -28,16 +28,16 @@ static Object toJavaValue(Object orig) {
2828
}
2929
}
3030

31-
static Set<Object> toJavaValues(Set<Object> orgJsons) {
32-
return orgJsons.stream().map(EnumSchema::toJavaValue).collect(toSet());
31+
static List<Object> toJavaValues(List<Object> orgJsons) {
32+
return orgJsons.stream().map(EnumSchema::toJavaValue).collect(toList());
3333
}
3434

3535
/**
3636
* Builder class for {@link EnumSchema}.
3737
*/
3838
public static class Builder extends Schema.Builder<EnumSchema> {
3939

40-
private Set<Object> possibleValues = new HashSet<>();
40+
private List<Object> possibleValues = new ArrayList<>();
4141

4242
@Override
4343
public EnumSchema build() {
@@ -49,7 +49,7 @@ public Builder possibleValue(Object possibleValue) {
4949
return this;
5050
}
5151

52-
public Builder possibleValues(Set<Object> possibleValues) {
52+
public Builder possibleValues(List<Object> possibleValues) {
5353
this.possibleValues = possibleValues;
5454
return this;
5555
}
@@ -59,14 +59,14 @@ public static Builder builder() {
5959
return new Builder();
6060
}
6161

62-
private final Set<Object> possibleValues;
62+
private final List<Object> possibleValues;
6363

6464
public EnumSchema(Builder builder) {
6565
super(builder);
66-
possibleValues = Collections.unmodifiableSet(toJavaValues(builder.possibleValues));
66+
possibleValues = Collections.unmodifiableList(toJavaValues(builder.possibleValues));
6767
}
6868

69-
public Set<Object> getPossibleValues() {
69+
public List<Object> getPossibleValues() {
7070
return possibleValues;
7171
}
7272

core/src/main/java/org/everit/json/schema/loader/SchemaExtractor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ class EnumSchemaExtractor extends AbstractSchemaExtractor {
143143
return emptyList();
144144
}
145145
EnumSchema.Builder builder = EnumSchema.builder();
146-
Set<Object> possibleValues = new HashSet<>();
146+
List<Object> possibleValues = new ArrayList<>();
147147
require("enum").requireArray().forEach((i, item) -> possibleValues.add(item.unwrap()));
148148
builder.possibleValues(possibleValues);
149149
return singletonList(builder);

core/src/test/java/org/everit/json/schema/EnumSchemaTest.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,9 @@
2020

2121
import java.io.StringWriter;
2222
import java.util.HashMap;
23-
import java.util.HashSet;
23+
import java.util.ArrayList;
2424
import java.util.List;
2525
import java.util.Map;
26-
import java.util.Set;
2726
import java.util.stream.Collectors;
2827
import java.util.stream.IntStream;
2928

@@ -38,11 +37,11 @@
3837

3938
public class EnumSchemaTest {
4039

41-
private Set<Object> possibleValues;
40+
private List<Object> possibleValues;
4241

4342
@Before
4443
public void before() {
45-
possibleValues = new HashSet<>();
44+
possibleValues = new ArrayList<>();
4645
possibleValues.add(true);
4746
possibleValues.add("foo");
4847
}
@@ -86,10 +85,10 @@ public void objectInArrayMatches() {
8685
subject.validate(list);
8786
}
8887

89-
private Set<Object> asSet(final JSONArray array) {
90-
return new HashSet<>(IntStream.range(0, array.length())
88+
private List<Object> asSet(final JSONArray array) {
89+
return new ArrayList<>(IntStream.range(0, array.length())
9190
.mapToObj(i -> array.get(i))
92-
.collect(Collectors.toSet()));
91+
.collect(Collectors.toList()));
9392
}
9493

9594
@Test

0 commit comments

Comments
 (0)