Skip to content

fix(v6): add defensive checks to JSON deserialization #435

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

Merged
bevzzz merged 2 commits into from
Jul 28, 2025
Merged

fix(v6): add defensive checks to JSON deserialization #435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b85639f
fix: only read 'properties' if present
bevzzz Jul 28, 2025
a93b9d7
chore: add more defensive checks for moduleConfig
bevzzz Jul 28, 2025
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
19 changes: 11 additions & 8 deletions src/main/java/io/weaviate/client6/v1/api/collections/CollectionConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,16 +264,19 @@ public void write(JsonWriter out, CollectionConfig value) throws IOException {
public CollectionConfig read(JsonReader in) throws IOException {
var jsonObject = JsonParser.parseReader(in).getAsJsonObject();

var mixedProperties = jsonObject.get("properties").getAsJsonArray();
var references = new JsonArray();
var properties = new JsonArray();

for (var property : mixedProperties) {
var dataTypes = property.getAsJsonObject().get("dataType").getAsJsonArray();
if (dataTypes.size() == 1 && DataType.KNOWN_TYPES.contains(dataTypes.get(0).getAsString())) {
properties.add(property);
} else {
references.add(property);
if (jsonObject.has("properties") && jsonObject.get("properties").isJsonArray()) {
var mixedProperties = jsonObject.get("properties").getAsJsonArray();

for (var property : mixedProperties) {
var dataTypes = property.getAsJsonObject().get("dataType").getAsJsonArray();
if (dataTypes.size() == 1 && DataType.KNOWN_TYPES.contains(dataTypes.get(0).getAsString())) {
properties.add(property);
} else {
references.add(property);
}
}
}

Expand All @@ -286,7 +289,7 @@ public CollectionConfig read(JsonReader in) throws IOException {

// Separate modules into reranker- and generative- modules.
var rerankerModules = new JsonArray();
if (jsonObject.has("moduleConfig")) {
if (jsonObject.has("moduleConfig") && jsonObject.get("moduleConfig").isJsonObject()) {
var moduleConfig = jsonObject.remove("moduleConfig").getAsJsonObject();

moduleConfig.entrySet().stream()
Expand Down
10 changes: 10 additions & 0 deletions src/test/java/io/weaviate/client6/v1/internal/json/JSONTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,4 +413,14 @@ public void test_ReferenceAddManyResponse_CustomDeserializer() {
.as("response contains 1 error")
.hasSize(1);
}

@Test
public void test_CollectionConfig_read_empty() {
var json = """
{ "class": "BarebonesCollection" }
""";
Assertions.assertThatCode(() -> JSON.deserialize(json, CollectionConfig.class))
.as("deserialize CollectionConfig with no properties")
.doesNotThrowAnyException();
}
}