XWIKI-9292: Creating/removing an object and adding/updating/removing an attachment or the document's class changes the content author

xwiki-platform-core/xwiki-platform-gwt/xwiki-platform-gwt-api/src/main/java/com/xpn/xwiki/gwt/api/server/XWikiServiceImpl.java

@@ -441,7 +441,7 @@ public boolean updateProperty(String docname, String className, String propertyn
                 bobject.setName(doc.getFullName());
                 bobject.setClassName(className);
                 bobject.set(propertyname, value, context);
-                doc.setContentDirty(true);
+                doc.setMetaDataDirty(true);
                 doc.setAuthor(context.getUser());
                 context.getWiki().saveDocument(doc, localizePlainOrKey("core.comment.updateProperty"),
                     context);

xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-oldcore/src/main/aspect/com/xpn/xwiki/doc/XWikiDocumentCompatibilityAspect.aj

@@ -88,7 +88,7 @@ privileged public aspect XWikiDocumentCompatibilityAspect
         bobject.setName(getFullName());
         bobject.setClassName(className);
         bobject.setListValue(fieldName, value);
-        setContentDirty(true);
+        setMetaDataDirty(true);
     }
 
     /**

xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/doc/XWikiAttachmentContent.java

@@ -227,7 +227,7 @@ public void setContentDirty(boolean contentDirty)
     {
         this.isContentDirty = contentDirty;
         if (contentDirty && this.ownerDocument != null) {
-            this.ownerDocument.setContentDirty(contentDirty);
+            this.ownerDocument.setMetaDataDirty(contentDirty);
         }
     }
 
@@ -332,7 +332,7 @@ public void setOwnerDocument(XWikiDocument ownerDocument)
     {
         this.ownerDocument = ownerDocument;
         if (this.isContentDirty && ownerDocument != null) {
-            ownerDocument.setContentDirty(true);
+            ownerDocument.setMetaDataDirty(true);
         }
     }
 }

xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java

@@ -476,7 +476,7 @@ private static ObjectReferenceResolver<EntityReference> getCurrentReferenceObjec
         @Override
         public void onUpdate()
         {
-            setContentDirty(true);
+            setMetaDataDirty(true);
         }
     };
 
@@ -1505,6 +1505,8 @@ public String getRenderedTitle(XWikiContext context)
     public void setTitle(String title)
     {
         if (title != null && !title.equals(this.title)) {
+            // Document titles usually contain velocity script, so it is not enough to set the metadata dirty, since we
+            // want to content author to be updated for programming or script rights to be updated.
             setContentDirty(true);
         }
         this.title = title;
@@ -2226,12 +2228,26 @@ public Map<DocumentReference, List<BaseObject>> getXObjects()
      */
     public void setXObjects(Map<DocumentReference, List<BaseObject>> objects)
     {
+        if (objects == null) {
+            // Make sure we don`t set a null objects map since we assume everywhere that it is not null when using it.
+            objects = new HashMap<>();
+        }
+
+        boolean isDirty = false;
+
         for (List<BaseObject> objList : objects.values()) {
             for (BaseObject obj : objList) {
                 obj.setOwnerDocument(this);
+                isDirty = true;
             }
         }
-        setContentDirty(true);
+
+        // This operation resulted in marking the current document dirty.
+        if (isDirty) {
+            setMetaDataDirty(true);
+        }
+
+        // Replace the current objects with the provided ones.
         this.xObjects = objects;
     }
 
@@ -2304,7 +2320,7 @@ public int createXObject(EntityReference classReference, XWikiContext context) t
         objects.add(object);
         int nb = objects.size() - 1;
         object.setNumber(nb);
-        setContentDirty(true);
+        setMetaDataDirty(true);
         return nb;
     }
 
@@ -2402,7 +2418,7 @@ public void setXObjects(DocumentReference classReference, List<BaseObject> objec
             }
         }
 
-        setContentDirty(true);
+        setMetaDataDirty(true);
     }
 
     /**
@@ -2672,11 +2688,11 @@ public void setXObject(DocumentReference classReference, int nb, BaseObject obje
             objects.add(null);
         }
         objects.set(nb, object);
-        setContentDirty(true);
+        setMetaDataDirty(true);
     }
 
     /**
-     * Replaces the object at the specified position and for the specified object xclass.
+     * Replaces the object at the specified position and for the specified object's xclass.
      *
      * @param nb index of the element to replace
      * @param object the xobject to insert
@@ -2698,7 +2714,7 @@ public void setXObject(int nb, BaseObject object)
             objects.add(null);
         }
         objects.set(nb, object);
-        setContentDirty(true);
+        setMetaDataDirty(true);
     }
 
     /**
@@ -2737,7 +2753,7 @@ public void mergeXClass(XWikiDocument templatedoc)
                 getXClass().merge(tbclass.clone());
             }
         }
-        setContentDirty(true);
+        setMetaDataDirty(true);
     }
 
     /**
@@ -2769,7 +2785,6 @@ public void mergeXObjects(XWikiDocument templateDoc)
                 }
             }
         }
-        setContentDirty(true);
     }
 
     /**
@@ -3930,24 +3945,25 @@ private void cloneAttachments(final XWikiDocument sourceDocument)
      */
     public void copyAttachments(XWikiDocument sourceDocument)
     {
+        // Note: when clearing the attachment list, we automatically mark the document's metadata as dirty.
         getAttachmentList().clear();
+
         Iterator<XWikiAttachment> attit = sourceDocument.getAttachmentList().iterator();
         while (attit.hasNext()) {
             XWikiAttachment attachment = attit.next();
             XWikiAttachment newattachment = (XWikiAttachment) attachment.clone();
             newattachment.setDoc(this);
 
             // We need to set the content of the attachment to be dirty because the dirty bit
-            // is used to signal that there is a reason to save the attachment and while the
-            // old attachment has already been saved so there is not, the copy has not been
-            // saved so it should be.
+            // is used to signal that there is a reason to save the copied attachment, otherwise
+            // the copied attachment will be empty since the original attachment content is not
+            // modified in this operation.
             if (newattachment.getAttachment_content() != null) {
                 newattachment.getAttachment_content().setContentDirty(true);
             }
 
             getAttachmentList().add(newattachment);
         }
-        setContentDirty(true);
     }
 
     /**
@@ -5237,6 +5253,7 @@ public void renameProperties(DocumentReference classReference, Map<String, Strin
             return;
         }
 
+        boolean isDirty = false;
         for (BaseObject bobject : objects) {
             if (bobject == null) {
                 continue;
@@ -5250,11 +5267,16 @@ public void renameProperties(DocumentReference classReference, Map<String, Strin
                     bobject.removeField(origname);
                     prop.setName(newname);
                     bobject.addField(newname, prop);
+
+                    isDirty = true;
                 }
             }
         }
 
-        setContentDirty(true);
+        // If at least one property was renamed, mark the document dirty.
+        if (isDirty) {
+            setMetaDataDirty(true);
+        }
     }
 
     /**
@@ -5273,7 +5295,7 @@ public void addXObjectToRemove(BaseObject object)
     {
         getXObjectsToRemove().add(object);
         object.setOwnerDocument(null);
-        setContentDirty(true);
+        setMetaDataDirty(true);
     }
 
     /**
@@ -5294,8 +5316,7 @@ public void addXObjectsToRemoveFromVersion(XWikiDocument previousVersion)
                     BaseObject newObj = getXObject(originalObj.getXClassReference(), originalObj.getNumber());
                     if (newObj == null) {
                         // The object was deleted.
-                        getXObjectsToRemove().add(originalObj);
-                        setContentDirty(true);
+                        this.addXObjectToRemove(originalObj);
                     }
                 }
             }
@@ -5334,7 +5355,7 @@ public ArrayList<BaseObject> getObjectsToRemove()
     public void setXObjectsToRemove(List<BaseObject> objectsToRemove)
     {
         this.xObjectsToRemove = objectsToRemove;
-        setContentDirty(true);
+        setMetaDataDirty(true);
     }
 
     public List<String> getIncludedPages(XWikiContext context)
@@ -8530,7 +8551,7 @@ private BaseObject prepareXObject(EntityReference classReference)
             addXObject(bobject);
         }
         bobject.setDocumentReference(getDocumentReference());
-        setContentDirty(true);
+        setMetaDataDirty(true);
         return bobject;
     }
 

xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/objects/classes/BaseClass.java

@@ -1333,7 +1333,7 @@ public void setOwnerDocument(XWikiDocument ownerDocument)
         }
 
         if (ownerDocument != null && this.isDirty) {
-            ownerDocument.setContentDirty(true);
+            ownerDocument.setMetaDataDirty(true);
         }
     }
 
@@ -1345,7 +1345,7 @@ public void setDirty(boolean isDirty)
     {
         this.isDirty = isDirty;
         if (isDirty && this.ownerDocument != null) {
-            this.ownerDocument.setContentDirty(true);
+            this.ownerDocument.setMetaDataDirty(true);
         }
     }
 }

xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/CommentAddAction.java

@@ -67,6 +67,7 @@ public boolean action(XWikiContext context) throws XWikiException
         } else {
             // className = XWiki.XWikiComments
             String className = baseclass.getName();
+            // Create a new comment object and mark the document as dirty.
             BaseObject object = doc.newObject(className, context);
             // TODO The map should be pre-filled with empty strings for all class properties, just like in
             // ObjectAddAction, so that properties missing from the request are still added to the database.
@@ -88,10 +89,8 @@ public boolean action(XWikiContext context) throws XWikiException
                 object.set(AUTHOR_PROPERTY_NAME, context.getUser(), context);
             }
             doc.setAuthorReference(context.getUserReference());
-            // Consider comments not being content.
-            doc.setContentDirty(false);
-            // if contentDirty is false, in order for the change to create a new version metaDataDirty must be true.
-            doc.setMetaDataDirty(true);
+
+            // Save the new comment.
             xwiki.saveDocument(doc, localizePlainOrKey("core.comment.addComment"), true, context);
         }
         // If xpage is specified then allow the specified template to be parsed.