Merge pull request #761 from basil/javax

Avoid `javax` imports in Groovy views
jenkinsci · Aug 16, 2023 · 04158d8 · 04158d8
2 parents b77c00a + 1816c5d
commit 04158d8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/globals.groovy b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/globals.groovy
@@ -4,8 +4,6 @@ package org.jenkinsci.plugins.workflow.cps.Snippetizer
 import org.jenkinsci.plugins.workflow.cps.GlobalVariable
 import org.jenkinsci.plugins.workflow.cps.Snippetizer
 
-import javax.servlet.RequestDispatcher
-
 Snippetizer snippetizer = my;
 
 def l = namespace(lib.LayoutTagLib)
@@ -32,7 +30,7 @@ l.layout(title:_("Pipeline Syntax: Global Variable Reference"), norefresh: true)
                 }
               }
               dd{
-                RequestDispatcher rd = request.getView(v, "help");
+                def rd = request.getView(v, "help");
                 div(class:"help", style:"display: block") {
                   if (rd != null) {
                     st.include(page: "help", it: v)

diff --git a/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/html.groovy b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/html.groovy
@@ -14,8 +14,6 @@ import org.jenkinsci.plugins.workflow.cps.GlobalVariable
 import org.jenkinsci.plugins.workflow.cps.Snippetizer
 import org.jenkinsci.plugins.workflow.steps.StepDescriptor
 
-import javax.servlet.RequestDispatcher
-
 // keeps track of recursion inside generateHelp
 stack = new Stack();