Skip to content

Commit 7fda47c

Browse files
dependabot[bot]stian-sandvoldclaude
authored
chore(deps): bump org.hisp.dhis:json-tree from 1.8.1 to 1.9.4 in /dhis-2/dhis-test-e2e (#23948)
* chore(deps): bump org.hisp.dhis:json-tree in /dhis-2/dhis-test-e2e Bumps [org.hisp.dhis:json-tree](https://github.com/dhis2/json-tree) from 1.8.1 to 1.9.4. - [Release notes](https://github.com/dhis2/json-tree/releases) - [Changelog](https://github.com/dhis2/json-tree/blob/main/CHANGELOG.md) - [Commits](dhis2/json-tree@v1.8.1...v1.9.4) --- updated-dependencies: - dependency-name: org.hisp.dhis:json-tree dependency-version: 1.9.4 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * fix: adapt JsonValueSerializer usage to json-tree 1.9.x API json-tree 1.9.x removed JsonTypedAccess; the default global accessors are now applied by the single-arg JsonMixed.of(content). Drop the obsolete JsonTypedAccess.GLOBAL argument and import so dhis-test-e2e compiles at 1.9.4. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix: send raw JSON body in RelationshipsTests under json-tree 1.9.x json-tree 1.9.x changed JsonNode.getDeclaration() to return Text (a CharSequence) instead of String. postAndGetJobReport(Object,..) passes it to REST-assured .body(), which sends a String raw but JSON-serializes any other object — so the Text was serialized into a malformed body and the expected E4015 'already exists' warning never came back. Call .toString() to restore the raw-JSON String body, matching 1.8.1 behaviour. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Stian Sandvold <stian@dhis2.org> Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
1 parent 14544d0 commit 7fda47c

3 files changed

Lines changed: 3 additions & 4 deletions

File tree

dhis-2/dhis-test-e2e/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<jackson.version.databind>2.21.3</jackson.version.databind>
2121
<jackson.version.annotation>2.21</jackson.version.annotation>
2222
<guava.version>33.6.0-jre</guava.version>
23-
<json-tree.version>1.8.1</json-tree.version>
23+
<json-tree.version>1.9.4</json-tree.version>
2424
<javafaker.version>1.0.2</javafaker.version>
2525
<opencsv.version>5.12.0</opencsv.version>
2626
<owner.version>1.0.12</owner.version>

dhis-2/dhis-test-e2e/src/main/java/org/hisp/dhis/test/e2e/dto/ApiResponse.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import org.apache.commons.lang3.StringUtils;
4242
import org.hisp.dhis.jsontree.JsonMixed;
4343
import org.hisp.dhis.jsontree.JsonNode;
44-
import org.hisp.dhis.jsontree.JsonTypedAccess;
4544
import org.hisp.dhis.test.e2e.helpers.JsonObjectBuilder;
4645

4746
/**
@@ -118,7 +117,7 @@ public JsonObjectBuilder getBodyAsJsonBuilder() {
118117
}
119118

120119
public JsonMixed getBodyAsJsonValue() {
121-
return JsonMixed.of(raw.asString(), JsonTypedAccess.GLOBAL);
120+
return JsonMixed.of(raw.asString());
122121
}
123122

124123
public JsonNode getBodyAsJsonNode() {

dhis-2/dhis-test-e2e/src/test/java/org/hisp/dhis/tracker/imports/relationships/RelationshipsTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public void shouldNotUpdateRelationship() {
148148

149149
trackerImportExportActions
150150
.postAndGetJobReport(
151-
updatedRelationship.getDeclaration(),
151+
updatedRelationship.getDeclaration().toString(),
152152
new QueryParamsBuilder().addAll("importStrategy=UPDATE"))
153153
.validateWarningReport()
154154
.body("warningCode", hasItems("E4015"))

0 commit comments

Comments
 (0)