Upgrade to 7.23.3, removed MxModelReflection dependency

jaspervanderhoek · Nov 15, 2019 · bbec06e · bbec06e
1 parent 494d3ae
commit bbec06e
Show file tree

Hide file tree

Showing 210 changed files with 55,473 additions and 44 deletions.
diff --git a/MicroflowScheduledEventManager.mpr b/MicroflowScheduledEventManager.mpr
diff --git a/exports/Scheduler_5120_20150128.mpk b/exports/Scheduler_5120_20150128.mpk
diff --git a/exports/Scheduler_5120_20150130.mpk b/exports/Scheduler_5120_20150130.mpk
diff --git a/exports/Scheduler_5120_20150203.mpk b/exports/Scheduler_5120_20150203.mpk
diff --git a/exports/Scheduler_5120_20150302 (1.0).mpk b/exports/Scheduler_5120_20150302 (1.0).mpk
diff --git a/exports/Scheduler_5120_20160408 (1.0.3).mpk b/exports/Scheduler_5120_20160408 (1.0.3).mpk
diff --git a/exports/Scheduler_680_20170131 (1.1).mpk b/exports/Scheduler_680_20170131 (1.1).mpk
diff --git a/exports/Scheduler_730_20180214 (1.2).mpk → exports/Scheduler_v1.2.0_7.3.0_20180214.mpk b/exports/Scheduler_730_20180214 (1.2).mpk → exports/Scheduler_v1.2.0_7.3.0_20180214.mpk
diff --git a/exports/Scheduler_7.16.0_20190409 (1.3).mpk → exports/Scheduler_v1.3.0_7.16.0_20190409.mpk b/exports/Scheduler_7.16.0_20190409 (1.3).mpk → exports/Scheduler_v1.3.0_7.16.0_20190409.mpk
diff --git a/javasource/scheduler/actions/AquireAdministrativeLock.java b/javasource/scheduler/actions/AquireAdministrativeLock.java
@@ -30,7 +30,7 @@ public AquireAdministrativeLock(IContext context, java.lang.Long TimeoutMS)
 		this.TimeoutMS = TimeoutMS;
 	}
 
-	@Override
+	@java.lang.Override
 	public java.lang.Boolean executeAction() throws Exception
 	{
 		// BEGIN USER CODE
@@ -82,7 +82,7 @@ public java.lang.Boolean executeAction() throws Exception
 	/**
 	 * Returns a string representation of this action
 	 */
-	@Override
+	@java.lang.Override
 	public java.lang.String toString()
 	{
 		return "AquireAdministrativeLock";

diff --git a/javasource/scheduler/actions/BuildCronExpression.java b/javasource/scheduler/actions/BuildCronExpression.java
@@ -25,7 +25,7 @@ public BuildCronExpression(IContext context, IMendixObject action)
 		this.__action = action;
 	}
 
-	@Override
+	@java.lang.Override
 	public java.lang.String executeAction() throws Exception
 	{
 		this.action = __action == null ? null : scheduler.proxies.ScheduledAction.initialize(getContext(), __action);
@@ -38,7 +38,7 @@ public java.lang.String executeAction() throws Exception
 	/**
 	 * Returns a string representation of this action
 	 */
-	@Override
+	@java.lang.Override
 	public java.lang.String toString()
 	{
 		return "BuildCronExpression";

diff --git a/javasource/scheduler/actions/CheckIfMicroflowExists.java b/javasource/scheduler/actions/CheckIfMicroflowExists.java
@@ -0,0 +1,45 @@
+// This file was generated by Mendix Modeler.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package scheduler.actions;
+
+import com.mendix.core.Core;
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+
+public class CheckIfMicroflowExists extends CustomJavaAction<java.lang.Boolean>
+{
+	private java.lang.String MicroflowNameToCheck;
+
+	public CheckIfMicroflowExists(IContext context, java.lang.String MicroflowNameToCheck)
+	{
+		super(context);
+		this.MicroflowNameToCheck = MicroflowNameToCheck;
+	}
+
+	@java.lang.Override
+	public java.lang.Boolean executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		return Core.getMicroflowNames().contains(this.MicroflowNameToCheck);
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "CheckIfMicroflowExists";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/javasource/scheduler/actions/CommitInDifferentContext.java b/javasource/scheduler/actions/CommitInDifferentContext.java
@@ -9,11 +9,10 @@
 
 package scheduler.actions;
 
-import scheduler.proxies.ApplicationSettings;
 import com.mendix.core.Core;
 import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
 import com.mendix.systemwideinterfaces.core.IMendixObject;
+import com.mendix.webui.CustomJavaAction;
 
 public class CommitInDifferentContext extends CustomJavaAction<java.lang.Boolean>
 {
@@ -25,7 +24,7 @@ public CommitInDifferentContext(IContext context, IMendixObject MyObject)
 		this.MyObject = MyObject;
 	}
 
-	@Override
+	@java.lang.Override
 	public java.lang.Boolean executeAction() throws Exception
 	{
 		// BEGIN USER CODE
@@ -50,7 +49,7 @@ public java.lang.Boolean executeAction() throws Exception
 	/**
 	 * Returns a string representation of this action
 	 */
-	@Override
+	@java.lang.Override
 	public java.lang.String toString()
 	{
 		return "CommitInDifferentContext";

diff --git a/javasource/scheduler/actions/EvaluateInstruction.java b/javasource/scheduler/actions/EvaluateInstruction.java
@@ -32,7 +32,7 @@ public EvaluateInstruction(IContext context, IMendixObject JobInstructionParamet
 		this.__JobInstructionParameter1 = JobInstructionParameter1;
 	}
 
-	@Override
+	@java.lang.Override
 	public java.lang.Boolean executeAction() throws Exception
 	{
 		this.JobInstructionParameter1 = __JobInstructionParameter1 == null ? null : scheduler.proxies.JobInstruction.initialize(getContext(), __JobInstructionParameter1);
@@ -43,8 +43,10 @@ public java.lang.Boolean executeAction() throws Exception
 		ScheduledAction action = this.JobInstructionParameter1.getJobInstruction_ScheduledAction(sysContext);
 		if ( action == null && this.JobInstructionParameter1.getActionId() != null ) {
 
-			List<IMendixObject> result = Core.retrieveXPathQueryEscaped(sysContext, "//%s[%s=%s]", ScheduledAction.entityName,
-					ScheduledAction.MemberNames.InternalId.toString(), String.valueOf(this.JobInstructionParameter1.getActionId()));
+			List<IMendixObject> result = Core.createXPathQuery( 
+					String.format("//%s[%s=$actionid]", ScheduledAction.entityName,
+					ScheduledAction.MemberNames.InternalId.toString())
+					).setVariable("actionid", this.JobInstructionParameter1.getActionId()).execute(sysContext);;
 
 			if ( result.size() > 0 ) {
 				action = ScheduledAction.initialize(getContext(), result.get(0));
@@ -117,7 +119,7 @@ else if ( this.JobInstructionParameter1.getActionType() != null ) {
 	/**
 	 * Returns a string representation of this action
 	 */
-	@Override
+	@java.lang.Override
 	public java.lang.String toString()
 	{
 		return "EvaluateInstruction";

diff --git a/javasource/scheduler/actions/GetApplicationSettings.java b/javasource/scheduler/actions/GetApplicationSettings.java
@@ -23,7 +23,7 @@ public GetApplicationSettings(IContext context)
 		super(context);
 	}
 
-	@Override
+	@java.lang.Override
 	public IMendixObject executeAction() throws Exception
 	{
 		// BEGIN USER CODE
@@ -53,7 +53,7 @@ public IMendixObject executeAction() throws Exception
 	/**
 	 * Returns a string representation of this action
 	 */
-	@Override
+	@java.lang.Override
 	public java.lang.String toString()
 	{
 		return "GetApplicationSettings";

diff --git a/javasource/scheduler/actions/GetCurrentXASId.java b/javasource/scheduler/actions/GetCurrentXASId.java
@@ -20,7 +20,7 @@ public GetCurrentXASId(IContext context)
 		super(context);
 	}
 
-	@Override
+	@java.lang.Override
 	public java.lang.String executeAction() throws Exception
 	{
 		// BEGIN USER CODE
@@ -31,7 +31,7 @@ public java.lang.String executeAction() throws Exception
 	/**
 	 * Returns a string representation of this action
 	 */
-	@Override
+	@java.lang.Override
 	public java.lang.String toString()
 	{
 		return "GetCurrentXASId";

diff --git a/javasource/scheduler/actions/GetMicroflowNames.java b/javasource/scheduler/actions/GetMicroflowNames.java
@@ -0,0 +1,55 @@
+// This file was generated by Mendix Modeler.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package scheduler.actions;
+
+import java.util.ArrayList;
+import com.mendix.core.Core;
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+import scheduler.proxies.MicroflowName;
+import com.mendix.systemwideinterfaces.core.IMendixObject;
+
+public class GetMicroflowNames extends CustomJavaAction<java.util.List<IMendixObject>>
+{
+	public GetMicroflowNames(IContext context)
+	{
+		super(context);
+	}
+
+	@java.lang.Override
+	public java.util.List<IMendixObject> executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+
+		ArrayList<IMendixObject> mfList = new ArrayList<IMendixObject>();
+		for( String mfName : Core.getMicroflowNames() ) {
+			IMendixObject obj = Core.instantiate(getContext(), MicroflowName.entityName);
+			obj.setValue(getContext(), MicroflowName.MemberNames.MicroflowName.toString(), mfName);
+
+			mfList.add(obj);
+		}
+
+
+		return mfList;
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "GetMicroflowNames";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/javasource/scheduler/actions/InitializeScheduler.java b/javasource/scheduler/actions/InitializeScheduler.java
@@ -20,7 +20,7 @@ public InitializeScheduler(IContext context)
 		super(context);
 	}
 
-	@Override
+	@java.lang.Override
 	public java.lang.String executeAction() throws Exception
 	{
 		// BEGIN USER CODE
@@ -33,7 +33,7 @@ public java.lang.String executeAction() throws Exception
 	/**
 	 * Returns a string representation of this action
 	 */
-	@Override
+	@java.lang.Override
 	public java.lang.String toString()
 	{
 		return "InitializeScheduler";

diff --git a/javasource/scheduler/actions/ReleaseAdministrativeLock.java b/javasource/scheduler/actions/ReleaseAdministrativeLock.java
@@ -24,7 +24,7 @@ public ReleaseAdministrativeLock(IContext context)
 		super(context);
 	}
 
-	@Override
+	@java.lang.Override
 	public java.lang.Boolean executeAction() throws Exception
 	{
 		// BEGIN USER CODE
@@ -64,7 +64,7 @@ public java.lang.Boolean executeAction() throws Exception
 	/**
 	 * Returns a string representation of this action
 	 */
-	@Override
+	@java.lang.Override
 	public java.lang.String toString()
 	{
 		return "ReleaseAdministrativeLock";

diff --git a/javasource/scheduler/actions/ScheduleAction.java b/javasource/scheduler/actions/ScheduleAction.java
@@ -9,17 +9,10 @@
 
 package scheduler.actions;
 
-import org.quartz.JobBuilder;
-import org.quartz.JobDetail;
-import org.quartz.SimpleScheduleBuilder;
-import org.quartz.SimpleTrigger;
-import org.quartz.Trigger;
-import org.quartz.TriggerBuilder;
-import scheduler.impl.ScheduleManager;
-import scheduler.impl.ScheduledJob;
 import com.mendix.systemwideinterfaces.core.IContext;
 import com.mendix.systemwideinterfaces.core.IMendixObject;
 import com.mendix.webui.CustomJavaAction;
+import scheduler.impl.ScheduleManager;
 
 public class ScheduleAction extends CustomJavaAction<java.lang.Boolean>
 {
@@ -32,7 +25,7 @@ public ScheduleAction(IContext context, IMendixObject ScheduledActionParameter1)
 		this.__ScheduledActionParameter1 = ScheduledActionParameter1;
 	}
 
-	@Override
+	@java.lang.Override
 	public java.lang.Boolean executeAction() throws Exception
 	{
 		this.ScheduledActionParameter1 = __ScheduledActionParameter1 == null ? null : scheduler.proxies.ScheduledAction.initialize(getContext(), __ScheduledActionParameter1);
@@ -48,7 +41,7 @@ public java.lang.Boolean executeAction() throws Exception
 	/**
 	 * Returns a string representation of this action
 	 */
-	@Override
+	@java.lang.Override
 	public java.lang.String toString()
 	{
 		return "ScheduleAction";

diff --git a/javasource/scheduler/actions/ShutdownScheduler.java b/javasource/scheduler/actions/ShutdownScheduler.java
@@ -23,7 +23,7 @@ public ShutdownScheduler(IContext context, java.lang.Boolean WaitForJobsToComple
 		this.WaitForJobsToComplete = WaitForJobsToComplete;
 	}
 
-	@Override
+	@java.lang.Override
 	public java.lang.Boolean executeAction() throws Exception
 	{
 		// BEGIN USER CODE
@@ -37,7 +37,7 @@ public java.lang.Boolean executeAction() throws Exception
 	/**
 	 * Returns a string representation of this action
 	 */
-	@Override
+	@java.lang.Override
 	public java.lang.String toString()
 	{
 		return "ShutdownScheduler";

diff --git a/javasource/scheduler/actions/StopAction.java b/javasource/scheduler/actions/StopAction.java
@@ -25,7 +25,7 @@ public StopAction(IContext context, IMendixObject ScheduledActionParameter1)
 		this.__ScheduledActionParameter1 = ScheduledActionParameter1;
 	}
 
-	@Override
+	@java.lang.Override
 	public java.lang.Boolean executeAction() throws Exception
 	{
 		this.ScheduledActionParameter1 = __ScheduledActionParameter1 == null ? null : scheduler.proxies.ScheduledAction.initialize(getContext(), __ScheduledActionParameter1);
@@ -41,7 +41,7 @@ public java.lang.Boolean executeAction() throws Exception
 	/**
 	 * Returns a string representation of this action
 	 */
-	@Override
+	@java.lang.Override
 	public java.lang.String toString()
 	{
 		return "StopAction";

diff --git a/javasource/scheduler/impl/ScheduleManager.java b/javasource/scheduler/impl/ScheduleManager.java
@@ -86,11 +86,9 @@ public void updateInfo( ScheduledAction action ) throws CoreException {
 				this.hasGroupAssignment = true;
 			}
 
-			mxmodelreflection.proxies.Microflows mf = action.getScheduledAction_Microflows();
-			if ( mf == null )
+			this.microflowName = action.getMicroflowName();
+			if ( this.microflowName == null || "".equals(this.microflowName.trim()) )
 				throw new CoreException("No microflow assigned to action: " + action.getInternalId() + "-" + action.getName());
-
-			this.microflowName = mf.getCompleteName();
 		}
 
 
@@ -200,8 +198,8 @@ public RunningStatus evaluateRunning() throws SchedulerException, CoreException
 			this.sch.getListenerManager().addJobListener(new MxSchedulerListener());
 
 			IContext context = Core.createSystemContext();
-			List<IMendixObject> result = Core.retrieveXPathQueryEscaped(context, "//%s[%s='%s']", RuntimeInstance.getType(),
-					RuntimeInstance.MemberNames.XASId.toString(), Core.getXASId());
+			List<IMendixObject> result = Core.createXPathQuery(String.format("//%s[%s='$xasid']", RuntimeInstance.getType(),
+					RuntimeInstance.MemberNames.XASId.toString()) ).setVariable("xasid", Core.getXASId()).execute(context);
 			if ( result.size() > 0 ) {
 				IMendixObject obj = result.get(0);
 				obj.setValue(context, RuntimeInstance.MemberNames.RequiresRestart.toString(), false);

diff --git a/javasource/test/actions/Sleep.java b/javasource/test/actions/Sleep.java
@@ -22,7 +22,7 @@ public Sleep(IContext context, java.lang.Long Millis)
 		this.Millis = Millis;
 	}
 
-	@Override
+	@java.lang.Override
 	public java.lang.Boolean executeAction() throws Exception
 	{
 		// BEGIN USER CODE
@@ -34,7 +34,7 @@ public java.lang.Boolean executeAction() throws Exception
 	/**
 	 * Returns a string representation of this action
 	 */
-	@Override
+	@java.lang.Override
 	public java.lang.String toString()
 	{
 		return "Sleep";