Merge pull request #45 from mendix/delete-with-unchanged-attrs

Always log unchanged attributes on deletion - Mendix 8

Author: dahfjkg

Audit trail.mpr

@@ -1 +1 @@
-version=8.1.2
+version=8.1.3

gradle.properties

@@ -214,6 +214,8 @@ private static int createLogLines(final IMendixObject inputObject, final IMendix
 			isNew = Constants.getLogAllMembersOnCreate();
 		}
 
+		boolean isDeleting = logType == TypeOfLog.Delete;
+
 		final Collection<? extends IMendixObjectMember<?>> members = inputObject.getMembers(sudoContext).values();
 		final List<IMendixObject> logLineList = new ArrayList<IMendixObject>(members.size());
 
@@ -226,20 +228,20 @@ private static int createLogLines(final IMendixObject inputObject, final IMendix
 
 			if (member instanceof MendixObjectReference) {
 				if (!member.getName().startsWith("System."))
-					logLineList.addAll(createReferenceLogLine(logObject, (MendixObjectReference) member, isNew,
+					logLineList.addAll(createReferenceLogLine(logObject, (MendixObjectReference) member, isNew, isDeleting,
 							sudoContext, currentContext));
 			}
 
 			else if (member instanceof MendixObjectReferenceSet)
-				logLineList.addAll(createReferenceSetLogLine(logObject, (MendixObjectReferenceSet) member, isNew,
+				logLineList.addAll(createReferenceSetLogLine(logObject, (MendixObjectReferenceSet) member, isNew, isDeleting,
 						sudoContext, currentContext));
 
 			else {
 				final String attributeName = member.getName();
 
 				if (!attributeName.startsWith("System.") && !attributeName.equals("changedDate")
 						&& !attributeName.equals("createdDate")) {
-					logLineList.addAll(createSingleLogLine(logObject, member, MemberType.Attribute.toString(), isNew,
+					logLineList.addAll(createSingleLogLine(logObject, member, MemberType.Attribute.toString(), isNew, isDeleting,
 							sudoContext));
 				}
 			}
@@ -256,12 +258,12 @@ else if (member instanceof MendixObjectReferenceSet)
 	}
 
 	private static List<IMendixObject> createSingleLogLine(final IMendixObject logObject, final IMendixObjectMember<?> member,
-			final String memberType, final boolean isNew, final IContext context) throws CoreException {
+			final String memberType, final boolean isNew, final boolean isDeleting, final IContext context) throws CoreException {
 		final String oldValue = getMemberValueString(member, false, context);
 		final String newValue = getMemberValueString(member, true, context);
 
 		final boolean newOrChangedAttribute = isNew || !oldValue.equals(newValue);
-		if (newOrChangedAttribute || !Constants.getIncludeOnlyChangedAttributes()) {
+		if (newOrChangedAttribute || isDeleting || !Constants.getIncludeOnlyChangedAttributes()) {
 			final IMendixObject logLine = Core.instantiate(context, LogLine.getType());
 
 			logLine.setValue(context, LogLine.MemberNames.Member.toString(), member.getName());
@@ -285,15 +287,15 @@ private static List<IMendixObject> createSingleLogLine(final IMendixObject logOb
 	}
 
 	private static List<IMendixObject> createReferenceLogLine(final IMendixObject logObject, final MendixObjectReference member,
-			final boolean isNew, final IContext sudocontext, final IContext currentcontext) throws CoreException {
+			final boolean isNew, final boolean isDeleting, final IContext sudocontext, final IContext currentcontext) throws CoreException {
 		IContext context = member.hasReadAccess(currentcontext) ? currentcontext : sudocontext;
 
 		// get current and previous id
 		final IMendixIdentifier currentId = member.getValue(context);
 		final IMendixIdentifier previousId = member.getOriginalValue(context);
 
-		final boolean newOrChangedObject = !Objects.equals(currentId, previousId) || isNew;
-		if (!Constants.getIncludeOnlyChangedAttributes() || newOrChangedObject) {
+		final boolean newOrChangedObject = isNew || !Objects.equals(currentId, previousId);
+		if (newOrChangedObject || isDeleting || !Constants.getIncludeOnlyChangedAttributes()) {
 			final List<IMendixObject> logLineList = new ArrayList<IMendixObject>();
 			final IMendixObject logLine = Core.instantiate(sudocontext, LogLine.getType());
 
@@ -384,7 +386,8 @@ private static IMendixObject createMendixObject(final String objectType, final M
 			final IMendixIdentifier i2) -> (int) (i1.toLong() - i2.toLong());
 
 	private static List<IMendixObject> createReferenceSetLogLine(final IMendixObject logObject,
-			final MendixObjectReferenceSet member, final boolean isNew, final IContext sudocontext, final IContext currentcontext)
+			final MendixObjectReferenceSet member, final boolean isNew, final boolean isDeleting,
+			final IContext sudocontext, final IContext currentcontext)
 			throws CoreException {
 
 		IContext context = member.hasReadAccess(currentcontext) ? currentcontext : sudocontext;
@@ -395,8 +398,8 @@ private static List<IMendixObject> createReferenceSetLogLine(final IMendixObject
 		currentIdList.sort(IDCOMPARATOR);
 		previousIdList.sort(IDCOMPARATOR);
 
-		final boolean newOrChangedObjects = !Objects.equals(currentIdList, previousIdList) || isNew;
-		if (!Constants.getIncludeOnlyChangedAttributes() || newOrChangedObjects) {
+		final boolean newOrChangedObjects = isNew || !Objects.equals(currentIdList, previousIdList);
+		if (newOrChangedObjects || isDeleting || !Constants.getIncludeOnlyChangedAttributes()) {
 
 			// The size below is just a good guess
 			final List<IMendixObject> logLineList = new ArrayList<IMendixObject>(currentIdList.size() + 1);

javasource/audittrail/log/CreateLogObject.java

@@ -0,0 +1 @@
+We now log all attributes of a deleted object even if 'IncludeOnlyChangedAttributes' is set to True. Before, no attributes would be logged on deletion.