Fix for groovy 4.0 change, should no longer require 'def'

xpdota · Feb 5, 2024 · 6c19ee8 · 6c19ee8
1 parent 29d3610
commit 6c19ee8
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/...src/main/java/org/jenkinsci/plugins/scriptsecurity/sandbox/groovy/SandboxInterceptor.java b/...src/main/java/org/jenkinsci/plugins/scriptsecurity/sandbox/groovy/SandboxInterceptor.java
@@ -212,7 +212,7 @@ final class SandboxInterceptor extends GroovyInterceptor {
             if (whitelist.permitsMethod(setPropertyMethod, receiver, propertyValueArgs)) {
                 return super.onSetProperty(invoker, receiver, property, value);
             } else if (rejector == null) {
-                rejector = () -> StaticWhitelist.rejectMethod(setPropertyMethod, receiver.getClass().getName() + "." + property);
+                rejector = () -> StaticWhitelist.rejectMethod(setPropertyMethod, receiver.getClass().getName() + '.' + property);
             }
         }
         final Field instanceField = GroovyCallSiteSelector.field(receiver, property);

diff --git a/trigger-support/src/main/java/gg/xp/xivsupport/groovy/GroovyTriggers.java b/trigger-support/src/main/java/gg/xp/xivsupport/groovy/GroovyTriggers.java
@@ -20,6 +20,7 @@
 import gg.xp.xivsupport.speech.CalloutEvent;
 import gg.xp.xivsupport.speech.HasCalloutTrackingKey;
 import gg.xp.xivsupport.speech.ProcessedCalloutEvent;
+import groovy.lang.Binding;
 import groovy.lang.Closure;
 import groovy.lang.DelegatesTo;
 import groovy.lang.GString;
@@ -218,11 +219,13 @@ private void finish() {
 							// This doesn't work right unless we clone
 							if (concurrencyMode == SequentialTriggerConcurrencyMode.CONCURRENT) {
 								Closure<?> clonedSqHandler = (Closure<?>) rawSqHandler.clone();
+								clonedSqHandler.setResolveStrategy(Closure.DELEGATE_FIRST);
 								clonedSqHandler.setDelegate(new GroovySqHelper<>(s));
 								clonedSqHandler.call(e1, s);
 							}
 							else {
 								rawSqHandler.setDelegate(new GroovySqHelper<>(s));
+								rawSqHandler.setResolveStrategy(Closure.DELEGATE_FIRST);
 								sq.accept(e1, s);
 							}
 						}
@@ -282,10 +285,12 @@ private <X> Supplier<X> wrapSupplier(Supplier<X> supplier) {
 	 */
 	public class GroovySqHelper<X extends BaseEvent> extends GroovyObjectSupport {
 		private final SequentialTriggerController<X> controller;
+		private final Binding binding;
 		private HasCalloutTrackingKey last;
 
 		public GroovySqHelper(SequentialTriggerController<X> controller) {
 			this.controller = controller;
+			this.binding = new Binding();
 		}
 
 		public CalloutEvent callout(@DelegatesTo(GroovyCalloutBuilder.class) Closure<?> closure) {
@@ -327,6 +332,19 @@ public void waitMs(int ms) {
 		public Object invokeMethod(String name, Object args) {
 			return super.invokeMethod(name, args);
 		}
+
+		@Override
+		public Object getProperty(String propertyName) {
+			if (binding.hasVariable(propertyName)) {
+				return binding.getVariable(propertyName);
+			}
+			return super.getProperty(propertyName);
+		}
+
+		@Override
+		public void setProperty(String propertyName, Object newValue) {
+			binding.setVariable(propertyName, newValue);
+		}
 	}
 
 	public class GroovyCalloutBuilder extends GroovyObjectSupport {