[FLINK-5962] [runtime-web] [tests] Replace deprecated usage og JsonNode#getValueAsText
This closes #3679 Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/3cad3097 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/3cad3097 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/3cad3097 Branch: refs/heads/master Commit: 3cad30974e3bf16d1604096f2b0e138768ae795b Parents: 1b77cc3 Author: zentol <[email protected]> Authored: Wed Apr 5 23:50:12 2017 +0200 Committer: Stephan Ewen <[email protected]> Committed: Fri Apr 21 12:32:32 2017 +0200 ---------------------------------------------------------------------- ...obCancellationWithSavepointHandlersTest.java | 44 ++++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/3cad3097/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JobCancellationWithSavepointHandlersTest.java ---------------------------------------------------------------------- diff --git a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JobCancellationWithSavepointHandlersTest.java b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JobCancellationWithSavepointHandlersTest.java index 8b948aa..8c2d3fc 100644 --- a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JobCancellationWithSavepointHandlersTest.java +++ b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JobCancellationWithSavepointHandlersTest.java @@ -20,6 +20,8 @@ package org.apache.flink.runtime.webmonitor.handlers; import akka.dispatch.ExecutionContexts$; import akka.dispatch.Futures; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; import io.netty.handler.codec.http.FullHttpResponse; import io.netty.handler.codec.http.HttpHeaders; import io.netty.handler.codec.http.HttpResponseStatus; @@ -32,8 +34,6 @@ import org.apache.flink.runtime.instance.ActorGateway; import org.apache.flink.runtime.messages.JobManagerMessages.CancelJobWithSavepoint; import org.apache.flink.runtime.messages.JobManagerMessages.CancellationSuccess; import org.apache.flink.runtime.webmonitor.ExecutionGraphHolder; -import org.codehaus.jackson.JsonNode; -import org.codehaus.jackson.map.ObjectMapper; import org.junit.Assert; import org.junit.Test; import scala.concurrent.ExecutionContext; @@ -201,9 +201,9 @@ public class JobCancellationWithSavepointHandlersTest { String json = response.content().toString(Charset.forName("UTF-8")); JsonNode root = new ObjectMapper().readTree(json); - assertEquals("accepted", root.get("status").getValueAsText()); - assertEquals("1", root.get("request-id").getValueAsText()); - assertEquals(location, root.get("location").getValueAsText()); + assertEquals("accepted", root.get("status").asText()); + assertEquals("1", root.get("request-id").asText()); + assertEquals(location, root.get("location").asText()); // Trigger again response = trigger.handleRequest(params, Collections.<String, String>emptyMap(), jobManager); @@ -215,9 +215,9 @@ public class JobCancellationWithSavepointHandlersTest { json = response.content().toString(Charset.forName("UTF-8")); root = new ObjectMapper().readTree(json); - assertEquals("accepted", root.get("status").getValueAsText()); - assertEquals("1", root.get("request-id").getValueAsText()); - assertEquals(location, root.get("location").getValueAsText()); + assertEquals("accepted", root.get("status").asText()); + assertEquals("1", root.get("request-id").asText()); + assertEquals(location, root.get("location").asText()); // Only single actual request verify(jobManager).ask(eq(new CancelJobWithSavepoint(jobId, "custom-directory")), any(FiniteDuration.class)); @@ -233,8 +233,8 @@ public class JobCancellationWithSavepointHandlersTest { json = response.content().toString(Charset.forName("UTF-8")); root = new ObjectMapper().readTree(json); - assertEquals("in-progress", root.get("status").getValueAsText()); - assertEquals("1", root.get("request-id").getValueAsText()); + assertEquals("in-progress", root.get("status").asText()); + assertEquals("1", root.get("request-id").asText()); // Complete promise.success(new CancellationSuccess(jobId, "_path-savepoint_")); @@ -249,9 +249,9 @@ public class JobCancellationWithSavepointHandlersTest { root = new ObjectMapper().readTree(json); - assertEquals("success", root.get("status").getValueAsText()); - assertEquals("1", root.get("request-id").getValueAsText()); - assertEquals("_path-savepoint_", root.get("savepoint-path").getValueAsText()); + assertEquals("success", root.get("status").asText()); + assertEquals("1", root.get("request-id").asText()); + assertEquals("_path-savepoint_", root.get("savepoint-path").asText()); // Query again, keep recent history @@ -265,9 +265,9 @@ public class JobCancellationWithSavepointHandlersTest { root = new ObjectMapper().readTree(json); - assertEquals("success", root.get("status").getValueAsText()); - assertEquals("1", root.get("request-id").getValueAsText()); - assertEquals("_path-savepoint_", root.get("savepoint-path").getValueAsText()); + assertEquals("success", root.get("status").asText()); + assertEquals("1", root.get("request-id").asText()); + assertEquals("_path-savepoint_", root.get("savepoint-path").asText()); // Query for unknown request params.put("requestId", "9929"); @@ -281,9 +281,9 @@ public class JobCancellationWithSavepointHandlersTest { root = new ObjectMapper().readTree(json); - assertEquals("failed", root.get("status").getValueAsText()); - assertEquals("9929", root.get("request-id").getValueAsText()); - assertEquals("Unknown job/request ID", root.get("cause").getValueAsText()); + assertEquals("failed", root.get("status").asText()); + assertEquals("9929", root.get("request-id").asText()); + assertEquals("Unknown job/request ID", root.get("cause").asText()); } /** @@ -327,8 +327,8 @@ public class JobCancellationWithSavepointHandlersTest { String json = response.content().toString(Charset.forName("UTF-8")); JsonNode root = new ObjectMapper().readTree(json); - assertEquals("failed", root.get("status").getValueAsText()); - assertEquals("1", root.get("request-id").getValueAsText()); - assertEquals("Test Exception", root.get("cause").getValueAsText()); + assertEquals("failed", root.get("status").asText()); + assertEquals("1", root.get("request-id").asText()); + assertEquals("Test Exception", root.get("cause").asText()); } }
