diff --git a/mantis-control-plane/mantis-control-plane-client/src/main/java/io/mantisrx/server/master/client/HttpUtility.java b/mantis-control-plane/mantis-control-plane-client/src/main/java/io/mantisrx/server/master/client/HttpUtility.java index 641d341f8..87b59bc8e 100644 --- a/mantis-control-plane/mantis-control-plane-client/src/main/java/io/mantisrx/server/master/client/HttpUtility.java +++ b/mantis-control-plane/mantis-control-plane-client/src/main/java/io/mantisrx/server/master/client/HttpUtility.java @@ -60,7 +60,7 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception { if (msg instanceof HttpRequest) { HttpRequest request = (HttpRequest) msg; - uri = request.getUri(); + uri = request.uri(); logger.info("Sending request on channel id: " + ctx.channel().toString() + ", request URI: " + uri); } diff --git a/mantis-control-plane/mantis-control-plane-client/src/main/java/io/mantisrx/server/master/client/MantisMasterClientApi.java b/mantis-control-plane/mantis-control-plane-client/src/main/java/io/mantisrx/server/master/client/MantisMasterClientApi.java index 59d3f851b..ea32ddee1 100644 --- a/mantis-control-plane/mantis-control-plane-client/src/main/java/io/mantisrx/server/master/client/MantisMasterClientApi.java +++ b/mantis-control-plane/mantis-control-plane-client/src/main/java/io/mantisrx/server/master/client/MantisMasterClientApi.java @@ -27,7 +27,7 @@ import io.mantisrx.runtime.MantisJobDefinition; import io.mantisrx.runtime.MantisJobState; import io.mantisrx.runtime.WorkerMigrationConfig; -import io.mantisrx.runtime.codec.JsonCodec; +import io.mantisrx.runtime.codec.JacksonCodecs; import io.mantisrx.runtime.descriptor.DeploymentStrategy; import io.mantisrx.runtime.descriptor.SchedulingInfo; import io.mantisrx.runtime.parameter.Parameter; @@ -775,7 +775,8 @@ public Observable assignmentResults(String jobId) { new ConnectToObservable.Builder() .subscribeAttempts(subscribeAttemptsToMaster) .name("/v1/api/master/assignmentresults") - .decoder(new JsonCodec(JobAssignmentResult.class)); + .decoder(JacksonCodecs.pojo(JobAssignmentResult.class)); + if (jobId != null && !jobId.isEmpty()) { Map subscriptionParams = new HashMap<>(); subscriptionParams.put("jobId", jobId);