Merge pull request #18750 from dreis2211

snicoll · snicoll · commit 7de861b22448 · 2019-10-26T11:53:31.000+02:00
* pr/18750: Fix JsonParser deprecation Closes gh-18750
diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/elasticsearch/ElasticsearchJestHealthIndicatorTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/elasticsearch/ElasticsearchJestHealthIndicatorTests.java
@@ -132,7 +132,7 @@ private static JestResult createJestResult(int responseCode, boolean succeeded,
 			json = "{\n  \"error\": \"Server Error\",\n  \"status\": \"" + status + "\"\n}";
 		}
 		searchResult.setJsonString(json);
-		searchResult.setJsonObject(new JsonParser().parse(json).getAsJsonObject());
+		searchResult.setJsonObject(JsonParser.parseString(json).getAsJsonObject());
 		searchResult.setResponseCode(responseCode);
 		searchResult.setSucceeded(succeeded);
 		return searchResult;

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ private static JestResult createJestResult(int responseCode, boolean succeeded,`
`132`	`132`	`json = "{\n \"error\": \"Server Error\",\n \"status\": \"" + status + "\"\n}";`
`133`	`133`	`}`
`134`	`134`	`searchResult.setJsonString(json);`
`135`		`- searchResult.setJsonObject(new JsonParser().parse(json).getAsJsonObject());`
	`135`	`+ searchResult.setJsonObject(JsonParser.parseString(json).getAsJsonObject());`
`136`	`136`	`searchResult.setResponseCode(responseCode);`
`137`	`137`	`searchResult.setSucceeded(succeeded);`
`138`	`138`	`return searchResult;`