Skip to content

Commit 38fda9e

Browse files
author
Reinout van Schouwen
authored
Merge pull request #6 from mendix/upgrade-8-12-0
Upgrade to 8.12.0 for Mx9 compatibility
2 parents c53fbe9 + 726405b commit 38fda9e

23 files changed

Lines changed: 129 additions & 99 deletions
236 KB
Binary file not shown.

src/ObjectHandling/javasource/objecthandling/ORM.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -300,20 +300,6 @@ public static IMendixObject getCreatedByUser(IContext context,
300300
return Core.retrieveId(context, itemId);
301301
}
302302

303-
// public static boolean encryptMemberIfChanged(IContext context, IMendixObject item,
304-
// String member, String key) throws Exception
305-
// {
306-
// if (memberHasChanged(context, item, member)) {
307-
//
308-
// if (item.getMetaObject().getMetaPrimitive(member).getType() != PrimitiveType.String)
309-
// throw new IllegalArgumentException("The member '" + member + "' is not a string attribute!");
310-
//
311-
// item.setValue(context, member, StringUtils.encryptString(key, (String) item.getValue(context, member)));
312-
// return true;
313-
// }
314-
// return false;
315-
// }
316-
317303
public static void commitSilent(IContext c, IMendixObject mendixObject)
318304
{
319305
try

src/ObjectHandling/javasource/objecthandling/XPath.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,15 @@ public String getXPath() {
256256
return "//" + this.entity + "[" + builder.toString() + "]";
257257
return "//" + this.entity;
258258
}
259+
public XPath<T> gte(Object attr, Object valuecomparison) {
260+
return compare(attr,">=", valuecomparison);
261+
}
262+
263+
public XPath<T> gte(Object... pathAndValue) {
264+
assertEven(pathAndValue);
265+
return compare(Arrays.copyOfRange(pathAndValue, 0, pathAndValue.length -1), ">=", pathAndValue[pathAndValue.length -1 ]);
266+
}
267+
259268

260269
private void assertEmptyStack() throws IllegalStateException
261270
{

src/ObjectHandling/javasource/unittesting/RemoteApiServlet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import javax.servlet.http.HttpServletResponse;
77

88
import org.apache.commons.io.IOUtils;
9-
import org.apache.http.auth.InvalidCredentialsException;
9+
import org.apache.hc.client5.http.auth.InvalidCredentialsException;
1010
import com.mendix.core.Core;
1111
import com.mendix.core.CoreException;
1212
import com.mendix.externalinterface.connector.RequestHandler;

0 commit comments

Comments
 (0)