Merge pull request #18 from mendix/run/4620-upgrade-to-10.21

[RUN-4620][RUN-4565] Upgrade project to 10.21.0

Author: atennapel

.gitignore

@@ -4,6 +4,7 @@
 .classpath
 .mendix-cache
 .project
+.vscode
 
 /.gradle/
 /.mendix-cache
@@ -34,3 +35,4 @@ src/ObjectHandling/modeler-merge-marker
 src/ObjectHandling/project-settings.user.json
 src/ObjectHandling/theme-cache
 src/ObjectHandling/userlib
+src/ObjectHandling/vendorlib

build.gradle

@@ -8,16 +8,16 @@ import com.github.jk1.license.render.*
 
 plugins {
     id 'java'
-    id 'com.mendix.gradle.publish-module-plugin' version '1.20'
+    id 'com.mendix.gradle.publish-module-plugin' version '1.21'
     id 'net.researchgate.release' version '2.8.1'
     id 'com.github.jk1.dependency-license-report' version '2.0'
 }
 
-sourceCompatibility = '11'
+sourceCompatibility = '21'
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 
 project.ext {
-    mendixPublicApiVersion = '9.18.0'
+    mendixPublicApiVersion = '10.21.0'
 }
 
 def mprDir = "$projectDir/src/ObjectHandling"
@@ -29,11 +29,12 @@ mxMarketplace {
     moduleLicense = 'Apache V2'
     appDirectory = "src/ObjectHandling"
     versionPathPrefix = "_Docs/version " // the path prefix within the module to the version folder
-    createMigrationFile = true
-    includeFiles = ["$mprDir/License.txt", "$mprDir/SiemensMendixObjectHandling__4.0.3__READMEOSS.html"]
+    includeFiles = ["$mprDir/License.txt", "$mprDir/SiemensMendixObjectHandling__5.0.0__READMEOSS.html"]
+    syncJavaDependenciesBeforeBuild = true
 }
 
 def userLibDir = "$mprDir/userlib"
+def vendorLibDir = "$mprDir/vendorlib"
 
 repositories {
     maven {
@@ -59,16 +60,13 @@ dependencies {
             [group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '5.0.3']
     )
 
-    compileOnly([group: 'com.mendix', name: 'public-api', version: "$mendixPublicApiVersion"])
+    testImplementation fileTree(vendorLibDir) { include '*.jar' }
 
-    implementation(
-            [group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'],
-            [group: 'org.apache.commons', name: 'commons-text', version: '1.10.0']
-    )
+    compileOnly([group: 'com.mendix', name: 'public-api', version: "$mendixPublicApiVersion"])
 }
 
 tasks.withType(JavaCompile) {
-    options.compilerArgs << "-Xlint:deprecation"
+    options.deprecation = true
 }
 
 sourceSets {
@@ -101,6 +99,7 @@ task copyAllToUserlib(type: Copy) {
 
 clean {
     delete "$userLibDir"
+    delete "$vendorLibDir"
 }
 
 tasks.named('mxBuild') {

gradle.properties

@@ -1 +1 @@
-version=4.0.4-SNAPSHOT
+version=5.0.0-SNAPSHOT

marketplace/release-notes/5.0.0.txt

@@ -0,0 +1 @@
+We upgraded the Object Handling module to Mendix version 10.21.0

src/ObjectHandling/ObjectHandling.mpr

@@ -20,7 +20,6 @@
 import com.mendix.systemwideinterfaces.core.IMendixObject;
 import com.mendix.systemwideinterfaces.core.IMendixObject.ObjectState;
 import com.mendix.systemwideinterfaces.core.IMendixObjectMember;
-import com.mendix.systemwideinterfaces.core.IMendixObjectMember.MemberState;
 import com.mendix.systemwideinterfaces.core.meta.IMetaAssociation;
 import com.mendix.systemwideinterfaces.core.meta.IMetaAssociation.AssociationType;
 import com.mendix.systemwideinterfaces.core.meta.IMetaEnumValue;
@@ -40,7 +39,7 @@ public static Long getGUID(IMendixObject item)
 	public static String getOriginalValueAsString(IContext context, IMendixObject item,
 			String member)
 	{
-		return String.valueOf(item.getMember(context, member).getOriginalValue(context));
+		return String.valueOf(item.getMember(member).getOriginalValue(context));
 	}
 
 	public static boolean objectHasChanged(IMendixObject anyobject) {
@@ -62,7 +61,7 @@ public static boolean memberHasChanged(IContext context, IMendixObject item, Str
 			throw new IllegalArgumentException("The provided object is empty");
 		if (!item.hasMember(member))
 			throw new IllegalArgumentException("Unknown member: " + member);
-		return item.getMember(context, member).getState() == MemberState.CHANGED || item.getState() != ObjectState.NORMAL; 
+		return item.getMember(member).isChanged() || item.getState() != ObjectState.NORMAL; 
 	}
 
 	public static void deepClone(IContext c, IMendixObject source, IMendixObject target, String membersToSkip, String membersToKeep, String reverseAssociations, String excludeEntities, String excludeModules) throws CoreException
@@ -97,16 +96,16 @@ private static void duplicate(IContext ctx, IMendixObject src, IMendixObject tar
 				if (m instanceof MendixObjectReference && !keep && m.getValue(ctx) != null) {
 					IMendixObject o = Core.retrieveId(ctx, ((MendixObjectReference) m).getValue(ctx));
 					IMendixIdentifier refObj = getCloneOfObject(ctx, o, toskip, tokeep, revAssoc, skipEntities, skipModules, mappedObjects);
-                    tar.setValue(ctx, key, refObj);                 
+					tar.setValue(ctx, key, refObj);                 
 				}
 
 				else if (m instanceof MendixObjectReferenceSet && !keep && m.getValue(ctx) != null) {
 					MendixObjectReferenceSet rs = (MendixObjectReferenceSet) m;
 					List<IMendixIdentifier> res = new ArrayList<IMendixIdentifier>();
 					for(IMendixIdentifier item : rs.getValue(ctx)) {
 						IMendixObject o = Core.retrieveId(ctx, item);
-	                    IMendixIdentifier refObj = getCloneOfObject(ctx, o, toskip, tokeep, revAssoc, skipEntities, skipModules, mappedObjects);
-                        res.add(refObj);
+						IMendixIdentifier refObj = getCloneOfObject(ctx, o, toskip, tokeep, revAssoc, skipEntities, skipModules, mappedObjects);
+						res.add(refObj);
 					}
 					tar.setValue(ctx, key, res);
 				}
@@ -123,31 +122,31 @@ else if (m instanceof MendixAutoNumber) //skip autonumbers! Ticket 14893
 	}
 
 	private static IMendixIdentifier getCloneOfObject(IContext ctx, IMendixObject src,
-            List<String> toskip, List<String> tokeep, List<String> revAssoc,
-            List<String> skipEntities, List<String> skipModules,
-            Map<IMendixIdentifier, IMendixIdentifier> mappedObjects) throws CoreException
+			List<String> toskip, List<String> tokeep, List<String> revAssoc,
+			List<String> skipEntities, List<String> skipModules,
+			Map<IMendixIdentifier, IMendixIdentifier> mappedObjects) throws CoreException
 	{
-	    String objType = src.getMetaObject().getName();
-	    String modName = src.getMetaObject().getModuleName();
-	    
-	    // if object is already being cloned, return ref to clone
-	    if (mappedObjects.containsKey(src.getId())) {
-            return mappedObjects.get(src.getId());
-        // if object should be skipped based on module or entity, return source object
-        } else if (skipEntities.contains(objType) || skipModules.contains(modName)) {
-            return src.getId();            
-         // if not already being cloned, create clone
-        } else { 
-            IMendixObject clone = Core.instantiate(ctx, src.getType());
-            duplicate(ctx, src, clone, toskip, tokeep, revAssoc, skipEntities, skipModules, mappedObjects);
-            return clone.getId();               
-        }
+		String objType = src.getMetaObject().getName();
+		String modName = src.getMetaObject().getModuleName();
+
+		// if object is already being cloned, return ref to clone
+		if (mappedObjects.containsKey(src.getId())) {
+			return mappedObjects.get(src.getId());
+		// if object should be skipped based on module or entity, return source object
+		} else if (skipEntities.contains(objType) || skipModules.contains(modName)) {
+			return src.getId();
+		// if not already being cloned, create clone
+		} else { 
+			IMendixObject clone = Core.instantiate(ctx, src.getType());
+			duplicate(ctx, src, clone, toskip, tokeep, revAssoc, skipEntities, skipModules, mappedObjects);
+			return clone.getId();
+		}
 	}
 
 	private static void duplicateReverseAssociations(IContext ctx, IMendixObject src, IMendixObject tar, 
-	        List<String> toskip, List<String> tokeep, List<String> revAssocs, 
-	        List<String> skipEntities, List<String> skipModules,
-	        Map<IMendixIdentifier, IMendixIdentifier> mappedObjects) throws CoreException
+			List<String> toskip, List<String> tokeep, List<String> revAssocs, 
+			List<String> skipEntities, List<String> skipModules,
+			Map<IMendixIdentifier, IMendixIdentifier> mappedObjects) throws CoreException
 	{
 		for(String fullAssocName : revAssocs) {
 			String[] parts = fullAssocName.split("/"); 
@@ -158,29 +157,28 @@ private static void duplicateReverseAssociations(IContext ctx, IMendixObject src
 			String assocname = parts.length == 3 ? parts[1] : parts[0]; //support length 3 for backward compatibility
 
 			IMetaAssociation massoc = src.getMetaObject().getDeclaredMetaAssociationChild(assocname);
-	
+
 			if (massoc != null) {
 				IMetaObject relationParent = massoc.getParent();
 			    // if the parent is in the exclude list, we can't clone the parent, and setting the 
 				// references to the newly cloned target object will screw up the source data.
 				if (skipEntities.contains(relationParent.getName()) || skipModules.contains(relationParent.getModuleName())){
-			        throw new IllegalArgumentException("A reverse reference has been specified that starts at an entity in the exclude list, this is not possible to clone: '" + fullAssocName + "'");
-			    }
-			    
-			    //MWE: what to do with reverse reference sets? -> to avoid spam creating objects on 
-			    //reverse references, do not support referenceset (todo: we could keep a map of converted guids and reuse that!)
+					throw new IllegalArgumentException("A reverse reference has been specified that starts at an entity in the exclude list, this is not possible to clone: '" + fullAssocName + "'");
+				}
+
+				//MWE: what to do with reverse reference sets? -> to avoid spam creating objects on 
+				//reverse references, do not support referenceset (todo: we could keep a map of converted guids and reuse that!)
 				if (massoc.getType() == AssociationType.REFERENCESET) {
 					throw new IllegalArgumentException("It is not possible to clone reverse referencesets: '" + fullAssocName + "'");
 				}
 
-				List<IMendixObject> objs = Core.retrieveXPathQuery(ctx, String.format("//%s[%s='%s']", 
-				        relationParent.getName(), assocname, String.valueOf(src.getId().toLong())));
+				List<IMendixObject> objs = Core.createXPathQuery(String.format("//%s[%s='%s']", 
+					relationParent.getName(), assocname, String.valueOf(src.getId().toLong()))).execute(ctx);
 
 				for(IMendixObject obj : objs) {
-				    @SuppressWarnings("unused") // object is unused on purpose
-                    IMendixIdentifier refObj = getCloneOfObject(ctx, obj, toskip, tokeep, revAssocs, skipEntities, skipModules, mappedObjects);
-                    // setting reference explicitly is not necessary, this has been done in the 
-                    // duplicate() call.
+					@SuppressWarnings("unused") // object is unused on purpose
+					IMendixIdentifier refObj = getCloneOfObject(ctx, obj, toskip, tokeep, revAssocs, skipEntities, skipModules, mappedObjects);
+					// setting reference explicitly is not necessary, this has been done in the duplicate() call.
 				}
 			}
 		}
@@ -196,7 +194,7 @@ public static String getValueOfPath(IContext context, IMendixObject substitute,
 	{
 		String[] path = fullpath.split("/");
 		if (path.length == 1) {
-			IMendixObjectMember<?> member = substitute.getMember(context, path[0]);
+			IMendixObjectMember<?> member = substitute.getMember(path[0]);
 
 			//special case, see ticket 9135, format datetime.
 			if (member instanceof MendixDateTime) {
@@ -224,7 +222,7 @@ else if (path.length == 0)
 			throw new Exception("communitycommons.ORM.getValueOfPath: Unexpected end of path.");
 
 		else {
-			IMendixObjectMember<?> member = substitute.getMember(context, path[0]);
+			IMendixObjectMember<?> member = substitute.getMember(path[0]);
 			if (member instanceof MendixObjectReference) {
 				MendixObjectReference ref = (MendixObjectReference) member;
 				IMendixIdentifier id = ref.getValue(context);

src/ObjectHandling/SiemensMendixObjectHandling__4.0.3__READMEOSS.html renamed to src/ObjectHandling/SiemensMendixObjectHandling__5.0.0__READMEOSS.html

@@ -29,6 +29,7 @@
 
 import com.mendix.core.Core;
 import com.mendix.core.CoreException;
+import com.mendix.datastorage.XPathQuery;
 import com.mendix.systemwideinterfaces.core.IContext;
 import com.mendix.systemwideinterfaces.core.IMendixIdentifier;
 import com.mendix.systemwideinterfaces.core.IMendixObject;
@@ -350,13 +351,17 @@ private void assertEmptyStack() throws IllegalStateException {
 	public long count() throws CoreException {
 		assertEmptyStack();
 
-		return Core.retrieveXPathQueryAggregate(context, "count(" + getXPath() + ")");
+		return Core.createXPathQuery("count(" + getXPath() + ")").executeAggregateLong(context);
 	}
 
 	public IMendixObject firstMendixObject() throws CoreException {
 		assertEmptyStack();
 
-		List<IMendixObject> result = Core.retrieveXPathQuery(context, getXPath(), 1, offset, sorting);
+		XPathQuery query = (XPathQuery) Core.createXPathQuery(getXPath()).setAmount(1).setOffset(offset);
+		for (Map.Entry<String, String> sort : sorting.entrySet())
+			query.addSort(sort.getKey(), sort.getValue() == "asc");
+		List<IMendixObject> result = query.execute(context);
+
 		if (result.isEmpty())
 			return null;
 		return result.get(0);
@@ -541,7 +546,10 @@ public T firstOrWait(long timeoutMSecs) throws CoreException, InterruptedExcepti
 	public List<IMendixObject> allMendixObjects() throws CoreException {
 		assertEmptyStack();
 
-		return Core.retrieveXPathQuery(context, getXPath(), limit, offset, sorting);
+		XPathQuery query = (XPathQuery) Core.createXPathQuery(getXPath()).setAmount(limit).setOffset(offset);
+		for (Map.Entry<String, String> sort : sorting.entrySet())
+			query.addSort(sort.getKey(), sort.getValue() == "asc");
+		return query.execute(context);
 	}
 
 	public List<T> all() throws CoreException {

src/ObjectHandling/javasource/objecthandling/ORM.java

@@ -10,12 +10,12 @@
 package objecthandling.actions;
 
 import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
+import com.mendix.systemwideinterfaces.core.UserAction;
 
 /**
  * Ends the current transaction.
  */
-public class EndTransaction extends CustomJavaAction<java.lang.Boolean>
+public class EndTransaction extends UserAction<java.lang.Boolean>
 {
 	public EndTransaction(IContext context)
 	{

src/ObjectHandling/javasource/objecthandling/XPath.java

@@ -10,12 +10,12 @@
 package objecthandling.actions;
 
 import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
+import com.mendix.systemwideinterfaces.core.UserAction;
 
 /**
  * Starts a new transaction.
  */
-public class StartTransaction extends CustomJavaAction<java.lang.Boolean>
+public class StartTransaction extends UserAction<java.lang.Boolean>
 {
 	public StartTransaction(IContext context)
 	{