Migrated to Mx 9.12.0

Author: ppoetsma

DOCS/module.md

@@ -1,7 +1,8 @@
 # The module
 
-<h2>Table of contents</h2>
+## Table of contents
 
+- [Table of contents](#table-of-contents)
 - [Requirements](#requirements)
 - [Dependencies](#dependencies)
 - [Terminology and Process](#terminology-and-process)
@@ -42,7 +43,7 @@ Use Docmosis Cloud Console to upload the template.
 
 In your app you have to collect all required data and structure it in such a way that it is compatible with the template you created. The module includes a utility that supports you in generating a non-persistent example data structure based on your template.
 
-If you want to create the structure manually then you can skip the remainder of this paragraph. Otherwise continue reading to see how the example data utility works.  The [example app](example-app.md) shows it in operation.
+If you want to create the structure manually then you can skip the remainder of this paragraph. Otherwise continue reading to see how the example data utility works.  The [example app](https://github.com/Docmosis/mendix-integration/blob/main/DOCS/example-app.md) shows it in operation.
 
 <img align="right" src="assets/getsampledata-microflows.png" alt="GetSampleData microflows">
 
@@ -66,7 +67,7 @@ Once you have a template and a matching data structure then you can render the d
 First initialize the request using microflow `RenderRequest_Initialize`:
 
 - **TemplateName**: path and name of the template to use, for example *samples/InvoiceTemplate.docx*
-- **OutputName**: name of the rendered document, for example *invoice-21I000388.pdf*.  Docmosis will use the file extension to determine the format of document to generate, in this case *pdf*,
+- **OutputName**: name of the rendered document, for example *invoice-21I000388.pdf*.  Docmosis will use the file extension to determine the format of document to generate, in this case *pdf*, 
 - common parameters are [documented here](#common-request-initialization-parameters)
 
 <img align="right" src="assets/render-microflows.png" alt="Render microflows">
@@ -94,7 +95,7 @@ It is extremely flexible and powerful. To help you get started quickly here are
 > Attribute `StreamResultInResponse` is enforced to `true` for module implementation reasons. Changing it yourself will not change the behavior.
 > Attribute `Data` will be populated with your data. Any data you put in here will be overwritten. See the next paragraph for details.
 
-The next step is equally or maybe even more important: the data to be merged with the template. Your app has to generate a JSON string that matches the template. Typically that is a flow that involves data retrieval, creating one or more non-persistent objects and export it to JSON; see also paragraph [Generate the data structure in your app](#generate-the-data-structure-in-your-app). As that is completely specific to your app exact details cannot be given here. The [example app](DOCS/example-app.md) can be used as a guide.
+The next step is equally or maybe even more important: the data to be merged with the template. Your app has to generate a JSON string that matches the template. Typically that is a flow that involves data retrieval, creating one or more non-persistent objects and export it to JSON; see also paragraph [Generate the data structure in your app](#generate-the-data-structure-in-your-app). As that is completely specific to your app exact details cannot be given here. The [example app](https://github.com/Docmosis/mendix-integration/blob/main/DOCS/example-app.md) can be used as a guide.
 
 When the `RenderRequest` object is set as required and a string with JSON data is available then call microflow `CWS_Render` to render the document.
 

Docmosis Cloud.mpr

@@ -23,6 +23,7 @@ public enum MemberNames
 		Password("Password"),
 		LastLogin("LastLogin"),
 		Blocked("Blocked"),
+		BlockedSince("BlockedSince"),
 		Active("Active"),
 		FailedLogins("FailedLogins"),
 		WebServiceUser("WebServiceUser"),
@@ -31,7 +32,7 @@ public enum MemberNames
 		User_Language("System.User_Language"),
 		User_TimeZone("System.User_TimeZone");
 
-		private java.lang.String metaName;
+		private final java.lang.String metaName;
 
 		MemberNames(java.lang.String s)
 		{
@@ -47,14 +48,15 @@ public java.lang.String toString()
 
 	public Account(com.mendix.systemwideinterfaces.core.IContext context)
 	{
-		this(context, com.mendix.core.Core.instantiate(context, "Administration.Account"));
+		this(context, com.mendix.core.Core.instantiate(context, entityName));
 	}
 
 	protected Account(com.mendix.systemwideinterfaces.core.IContext context, com.mendix.systemwideinterfaces.core.IMendixObject accountMendixObject)
 	{
 		super(context, accountMendixObject);
-		if (!com.mendix.core.Core.isSubClassOf("Administration.Account", accountMendixObject.getType()))
-			throw new java.lang.IllegalArgumentException("The given object is not a Administration.Account");
+		if (!com.mendix.core.Core.isSubClassOf(entityName, accountMendixObject.getType())) {
+			throw new java.lang.IllegalArgumentException(String.format("The given object is not a %s", entityName));
+		}	
 	}
 
 	/**
@@ -69,6 +71,9 @@ public static administration.proxies.Account initialize(com.mendix.systemwideint
 	/**
 	 * Initialize a proxy using context (recommended). This context will be used for security checking when the get- and set-methods without context parameters are called.
 	 * The get- and set-methods with context parameter should be used when for instance sudo access is necessary (IContext.createSudoClone() can be used to obtain sudo access).
+	 * @param context The context to be used
+	 * @param mendixObject The Mendix object for the new instance
+	 * @return a new instance of this proxy class
 	 */
 	public static administration.proxies.Account initialize(com.mendix.systemwideinterfaces.core.IContext context, com.mendix.systemwideinterfaces.core.IMendixObject mendixObject)
 	{
@@ -83,10 +88,11 @@ public static administration.proxies.Account load(com.mendix.systemwideinterface
 
 	public static java.util.List<administration.proxies.Account> load(com.mendix.systemwideinterfaces.core.IContext context, java.lang.String xpathConstraint) throws com.mendix.core.CoreException
 	{
-		java.util.List<administration.proxies.Account> result = new java.util.ArrayList<administration.proxies.Account>();
-		for (com.mendix.systemwideinterfaces.core.IMendixObject obj : com.mendix.core.Core.retrieveXPathQuery(context, "//Administration.Account" + xpathConstraint))
-			result.add(administration.proxies.Account.initialize(context, obj));
-		return result;
+		return com.mendix.core.Core.createXPathQuery(String.format("//%1$s%2$s", entityName, xpathConstraint))
+			.execute(context)
+			.stream()
+			.map(obj -> administration.proxies.Account.initialize(context, obj))
+			.collect(java.util.stream.Collectors.toList());
 	}
 
 	/**
@@ -200,9 +206,9 @@ public final void setIsLocalUser(com.mendix.systemwideinterfaces.core.IContext c
 	@java.lang.Override
 	public boolean equals(Object obj)
 	{
-		if (obj == this)
+		if (obj == this) {
 			return true;
-
+		}
 		if (obj != null && getClass().equals(obj.getClass()))
 		{
 			final administration.proxies.Account that = (administration.proxies.Account) obj;
@@ -222,7 +228,7 @@ public int hashCode()
 	 */
 	public static java.lang.String getType()
 	{
-		return "Administration.Account";
+		return entityName;
 	}
 
 	/**

dist/DocmosisCloud101.mpk

@@ -25,7 +25,7 @@ public enum MemberNames
 		ConfirmPassword("ConfirmPassword"),
 		AccountPasswordData_Account("Administration.AccountPasswordData_Account");
 
-		private java.lang.String metaName;
+		private final java.lang.String metaName;
 
 		MemberNames(java.lang.String s)
 		{
@@ -41,15 +41,17 @@ public java.lang.String toString()
 
 	public AccountPasswordData(com.mendix.systemwideinterfaces.core.IContext context)
 	{
-		this(context, com.mendix.core.Core.instantiate(context, "Administration.AccountPasswordData"));
+		this(context, com.mendix.core.Core.instantiate(context, entityName));
 	}
 
 	protected AccountPasswordData(com.mendix.systemwideinterfaces.core.IContext context, com.mendix.systemwideinterfaces.core.IMendixObject accountPasswordDataMendixObject)
 	{
-		if (accountPasswordDataMendixObject == null)
+		if (accountPasswordDataMendixObject == null) {
 			throw new java.lang.IllegalArgumentException("The given object cannot be null.");
-		if (!com.mendix.core.Core.isSubClassOf("Administration.AccountPasswordData", accountPasswordDataMendixObject.getType()))
-			throw new java.lang.IllegalArgumentException("The given object is not a Administration.AccountPasswordData");
+		}
+		if (!com.mendix.core.Core.isSubClassOf(entityName, accountPasswordDataMendixObject.getType())) {
+			throw new java.lang.IllegalArgumentException(String.format("The given object is not a %s", entityName));
+		}	
 
 		this.accountPasswordDataMendixObject = accountPasswordDataMendixObject;
 		this.context = context;
@@ -67,6 +69,9 @@ public static administration.proxies.AccountPasswordData initialize(com.mendix.s
 	/**
 	 * Initialize a proxy using context (recommended). This context will be used for security checking when the get- and set-methods without context parameters are called.
 	 * The get- and set-methods with context parameter should be used when for instance sudo access is necessary (IContext.createSudoClone() can be used to obtain sudo access).
+	 * @param context The context to be used
+	 * @param mendixObject The Mendix object for the new instance
+	 * @return a new instance of this proxy class
 	 */
 	public static administration.proxies.AccountPasswordData initialize(com.mendix.systemwideinterfaces.core.IContext context, com.mendix.systemwideinterfaces.core.IMendixObject mendixObject)
 	{
@@ -81,6 +86,7 @@ public static administration.proxies.AccountPasswordData load(com.mendix.systemw
 
 	/**
 	 * Commit the changes made on this proxy object.
+	 * @throws com.mendix.core.CoreException
 	 */
 	public final void commit() throws com.mendix.core.CoreException
 	{
@@ -89,6 +95,7 @@ public final void commit() throws com.mendix.core.CoreException
 
 	/**
 	 * Commit the changes made on this proxy object using the specified context.
+	 * @throws com.mendix.core.CoreException
 	 */
 	public final void commit(com.mendix.systemwideinterfaces.core.IContext context) throws com.mendix.core.CoreException
 	{
@@ -219,6 +226,7 @@ public final void setConfirmPassword(com.mendix.systemwideinterfaces.core.IConte
 	}
 
 	/**
+	 * @throws com.mendix.core.CoreException
 	 * @return value of AccountPasswordData_Account
 	 */
 	public final administration.proxies.Account getAccountPasswordData_Account() throws com.mendix.core.CoreException
@@ -229,13 +237,15 @@ public final administration.proxies.Account getAccountPasswordData_Account() thr
 	/**
 	 * @param context
 	 * @return value of AccountPasswordData_Account
+	 * @throws com.mendix.core.CoreException
 	 */
 	public final administration.proxies.Account getAccountPasswordData_Account(com.mendix.systemwideinterfaces.core.IContext context) throws com.mendix.core.CoreException
 	{
 		administration.proxies.Account result = null;
 		com.mendix.systemwideinterfaces.core.IMendixIdentifier identifier = getMendixObject().getValue(context, MemberNames.AccountPasswordData_Account.toString());
-		if (identifier != null)
+		if (identifier != null) {
 			result = administration.proxies.Account.load(context, identifier);
+		}
 		return result;
 	}
 
@@ -255,10 +265,11 @@ public final void setAccountPasswordData_Account(administration.proxies.Account
 	 */
 	public final void setAccountPasswordData_Account(com.mendix.systemwideinterfaces.core.IContext context, administration.proxies.Account accountpassworddata_account)
 	{
-		if (accountpassworddata_account == null)
+		if (accountpassworddata_account == null) {
 			getMendixObject().setValue(context, MemberNames.AccountPasswordData_Account.toString(), null);
-		else
+		} else {
 			getMendixObject().setValue(context, MemberNames.AccountPasswordData_Account.toString(), accountpassworddata_account.getMendixObject().getId());
+		}
 	}
 
 	/**
@@ -280,9 +291,9 @@ public final com.mendix.systemwideinterfaces.core.IContext getContext()
 	@java.lang.Override
 	public boolean equals(Object obj)
 	{
-		if (obj == this)
+		if (obj == this) {
 			return true;
-
+		}
 		if (obj != null && getClass().equals(obj.getClass()))
 		{
 			final administration.proxies.AccountPasswordData that = (administration.proxies.AccountPasswordData) obj;
@@ -302,7 +313,7 @@ public int hashCode()
 	 */
 	public static java.lang.String getType()
 	{
-		return "Administration.AccountPasswordData";
+		return entityName;
 	}
 
 	/**

dist/DocmosisCloud200.mpk

@@ -7,13 +7,19 @@
 import java.util.HashMap;
 import java.util.Map;
 import com.mendix.core.Core;
-import com.mendix.core.CoreException;
-import com.mendix.systemwideinterfaces.MendixRuntimeException;
 import com.mendix.systemwideinterfaces.core.IContext;
 import com.mendix.systemwideinterfaces.core.IMendixObject;
 
 public class Microflows
 {
+	/**
+	 * @deprecated
+	 * The default constructor of the Microflows class should not be used.
+	 * Use the static microflow invocation methods instead.
+	 */
+	@java.lang.Deprecated(since = "9.12", forRemoval = true)
+	public Microflows() {}
+
 	// These are the microflows for the Administration module
 	public static void changeMyPassword(IContext context, administration.proxies.AccountPasswordData _accountPasswordData)
 	{
@@ -50,14 +56,13 @@ public static java.util.List<system.proxies.TimeZone> retrieveTimeZones(IContext
 	{
 		Map<java.lang.String, Object> params = new HashMap<>();
 		java.util.List<IMendixObject> objs = Core.microflowCall("Administration.RetrieveTimeZones").withParams(params).execute(context);
-		java.util.List<system.proxies.TimeZone> result = null;
-		if (objs != null)
-		{
-			result = new java.util.ArrayList<>();
-			for (IMendixObject obj : objs)
-				result.add(system.proxies.TimeZone.initialize(context, obj));
+		if (objs == null) {
+			return null;
+		} else {
+			return objs.stream()
+				.map(obj -> system.proxies.TimeZone.initialize(context, obj))
+				.collect(java.util.stream.Collectors.toList());
 		}
-		return result;
 	}
 	public static void saveNewAccount(IContext context, administration.proxies.AccountPasswordData _accountPasswordData)
 	{
@@ -77,4 +82,4 @@ public static void showPasswordForm(IContext context, administration.proxies.Acc
 		params.put("Account", _account == null ? null : _account.getMendixObject());
 		Core.microflowCall("Administration.ShowPasswordForm").withParams(params).execute(context);
 	}
-}
+}

javasource/administration/proxies/Account.java

@@ -25,7 +25,7 @@ public static void debug(String lognode, String message) {
 	}
 
 	public static void warn(String lognode, String message, Throwable e) {
-		log(lognode, LogLevel.Debug, message, e);
+		log(lognode, LogLevel.Warning, message, e);
 	}
 
 	public static void warn(String lognode, String message) {

javasource/administration/proxies/AccountPasswordData.java

@@ -592,6 +592,7 @@ public void run() {
 	 * @return
 	 * @deprecated Native Java function Objects.equals() is available since Java 7
 	 */
+	@Deprecated
 	public static boolean objectsAreEqual(Object left, Object right) {
 		if (left == null && right == null) {
 			return true;