diff --git a/src/main/java/org/jenkinsci/plugins/workflow/job/views/GraphVizAction.java b/src/main/java/org/jenkinsci/plugins/workflow/job/views/GraphVizAction.java index 20c40f8b..69e22fcd 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/job/views/GraphVizAction.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/job/views/GraphVizAction.java @@ -24,6 +24,7 @@ package org.jenkinsci.plugins.workflow.job.views; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.Extension; import hudson.model.Action; import hudson.util.HttpResponses; @@ -76,7 +77,7 @@ public HttpResponse doDot() throws IOException { return HttpResponses.plainText(sw.toString()); } - @edu.umd.cs.findbugs.annotations.SuppressWarnings("DM_DEFAULT_ENCODING") + @SuppressFBWarnings("DM_DEFAULT_ENCODING") public void doIndex(StaplerResponse rsp) throws IOException { Process p = new ProcessBuilder("dot", "-Tpng").start(); writeDot(new PrintWriter(p.getOutputStream())); diff --git a/src/test/java/org/jenkinsci/plugins/workflow/job/WorkflowRunTest.java b/src/test/java/org/jenkinsci/plugins/workflow/job/WorkflowRunTest.java index 02989e50..097e0d37 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/job/WorkflowRunTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/job/WorkflowRunTest.java @@ -444,10 +444,10 @@ private void assertCulprits(WorkflowRun b, String... expectedIds) throws IOExcep WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "p"); p.setDefinition(new CpsFlowDefinition("", true)); // Control case: - QueueItemAuthenticatorConfiguration.get().getAuthenticators().add(new MockQueueItemAuthenticator(Collections.singletonMap("p", User.get("admin").impersonate()))); + QueueItemAuthenticatorConfiguration.get().getAuthenticators().add(new MockQueueItemAuthenticator(Collections.singletonMap("p", User.getById("admin", true).impersonate()))); r.buildAndAssertSuccess(p); // Test case: build is never scheduled, queue item hangs with “Waiting for next available executor on master” - QueueItemAuthenticatorConfiguration.get().getAuthenticators().replace(new MockQueueItemAuthenticator(Collections.singletonMap("p", User.get("dev").impersonate()))); + QueueItemAuthenticatorConfiguration.get().getAuthenticators().replace(new MockQueueItemAuthenticator(Collections.singletonMap("p", User.getById("dev", true).impersonate()))); r.buildAndAssertSuccess(p); }