Skip to content

Commit d947485

Browse files
committed
Remove redundant code
1 parent e7bb854 commit d947485

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

src/main/java/org/jenkinsci/plugins/scriptsecurity/sandbox/groovy/SecureGroovyScript.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import hudson.model.AbstractDescribableImpl;
3434
import hudson.model.Descriptor;
3535
import hudson.model.Item;
36+
import hudson.model.Run;
3637
import hudson.model.TaskListener;
3738
import hudson.util.FormValidation;
3839

src/main/java/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -483,15 +483,15 @@ public synchronized String using(@NonNull String script, @NonNull Language langu
483483
if (script.length() == 0) {
484484
// As a special case, always consider the empty script preapproved, as this is usually the default for new fields,
485485
// and in many cases there is some sensible behavior for an emoty script which we want to permit.
486-
ScriptListener.fireScriptFromConsoleEvent(script, run);
486+
ScriptListener.fireScriptFromPipelineEvent(script, run);
487487
return script;
488488
}
489489
String hash = hash(script, language.getName());
490490
if (!approvedScriptHashes.contains(hash)) {
491491
// Probably need not add to pendingScripts, since generally that would have happened already in configuring.
492492
throw new UnapprovedUsageException(hash);
493493
}
494-
ScriptListener.fireScriptFromConsoleEvent(script, run);
494+
ScriptListener.fireScriptFromPipelineEvent(script, run);
495495
return script;
496496
}
497497
// Only for testing

src/main/java/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptListener.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,32 @@
22

33
import hudson.ExtensionPoint;
44
import hudson.model.Run;
5-
import jenkins.model.Jenkins;
65
import jenkins.util.Listeners;
76

87
/**
98
* A listener to track usage of Groovy scripts running outside of a sandbox.
109
*
11-
* @see org.jenkinsci.plugins.scriptsecurity.sandbox.groovy.SecureGroovyScript#evaluate(groovy.lang.GroovyClassLoader, groovy.lang.Binding, hudson.model.TaskListener)
10+
* @see org.jenkinsci.plugins.scriptsecurity.sandbox.groovy.SecureGroovyScript#evaluate(ClassLoader, groovy.lang.Binding, hudson.model.TaskListener)
1211
*/
1312
public interface ScriptListener extends ExtensionPoint {
1413

1514
/**
1615
* Called when a groovy script is executed in a pipeline outside of a sandbox.
1716
*
18-
* @see org.jenkinsci.plugins.scriptsecurity.sandbox.groovy.SecureGroovyScript#evaluate(groovy.lang.GroovyClassLoader, groovy.lang.Binding, hudson.model.TaskListener)
17+
* @see org.jenkinsci.plugins.scriptsecurity.sandbox.groovy.SecureGroovyScript#evaluate(ClassLoader, groovy.lang.Binding, hudson.model.TaskListener)
1918
* @param script The Groovy script that is excecuted.
2019
* @param run The run calling the Groovy script.
2120
*/
2221
void onScriptFromPipeline(String script, Run run);
2322

24-
2523
/**
2624
* Fires the {@link #onScriptFromPipeline(String, Run)} event to track the usage of the script console.
2725
*
28-
* @see org.jenkinsci.plugins.scriptsecurity.sandbox.groovy.SecureGroovyScript#evaluate(ClassLoader, Binding, TaskListener)
26+
* @see org.jenkinsci.plugins.scriptsecurity.sandbox.groovy.SecureGroovyScript#evaluate(ClassLoader, groovy.lang.Binding, hudson.model.TaskListener)
2927
* @param script The Groovy script that is excecuted.
3028
* @param run The run calling the Groovy script.
3129
*/
32-
static void fireScriptFromConsoleEvent(String script, Run run) {
30+
static void fireScriptFromPipelineEvent(String script, Run run) {
3331
Listeners.notify(ScriptListener.class, true, listener -> listener.onScriptFromPipeline(script, run));
3432
}
3533
}

0 commit comments

Comments
 (0)