wip

Author: rymsha

modules/core/core-content/src/main/java/com/enonic/xp/core/impl/content/CreateContentCommand.java

@@ -1,5 +1,6 @@
 package com.enonic.xp.core.impl.content;
 
+import java.time.Instant;
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
@@ -39,6 +40,7 @@
 import com.enonic.xp.security.PrincipalKey;
 import com.enonic.xp.security.auth.AuthenticationInfo;
 import com.enonic.xp.site.SiteConfigsDataSerializer;
+import com.enonic.xp.util.Attributes;
 
 import static com.google.common.base.Strings.isNullOrEmpty;
 
@@ -100,6 +102,13 @@ private Content doExecute()
 
         final CreateContentTranslatorParams createContentTranslatorParams = createContentTranslatorParams( processedParams );
 
+        final Attributes versionAttributes = Attributes.create()
+            .attribute( "content.create" )
+            .put( "user", getCurrentUserKey().toString() )
+            .put( "optime", Instant.now().toString() )
+            .end()
+            .build();
+
         final CreateNodeParams createNodeParams = CreateNodeParamsFactory.create( createContentTranslatorParams )
             .contentTypeService( this.contentTypeService )
             .pageDescriptorService( this.pageDescriptorService )
@@ -110,6 +119,7 @@ private Content doExecute()
             .siteService( this.siteService )
             .build()
             .produce()
+            .versionAttributes( versionAttributes )
             .refresh( params.isRefresh() ? RefreshMode.ALL : RefreshMode.STORAGE )
             .build();
 

modules/core/core-content/src/main/java/com/enonic/xp/core/impl/content/ImportContentCommand.java

@@ -1,5 +1,6 @@
 package com.enonic.xp.core.impl.content;
 
+import java.time.Instant;
 import java.util.Objects;
 
 import com.enonic.xp.content.ImportContentParams;
@@ -8,6 +9,7 @@
 import com.enonic.xp.node.ImportNodeResult;
 import com.enonic.xp.node.Node;
 import com.enonic.xp.node.RefreshMode;
+import com.enonic.xp.util.Attributes;
 
 final class ImportContentCommand
     extends AbstractContentCommand
@@ -37,11 +39,19 @@ private ImportContentResult doExecute()
             contentDataSerializer( this.translator.getContentDataSerializer() ).
             build().execute();
 
+        final Attributes versionAttributes = Attributes.create()
+            .attribute( "content.import" )
+            .put( "user", getCurrentUserKey().toString() )
+            .put( "optime", Instant.now().toString() )
+            .end()
+            .build();
+
         final ImportNodeParams importNodeParams = ImportNodeParams.create().importNode( importNode )
             .binaryAttachments( params.getBinaryAttachments() )
             .insertManualStrategy( params.getInsertManualStrategy() )
             .importPermissions( params.isImportPermissions() )
             .importPermissionsOnCreate( params.isImportPermissionsOnCreate() )
+            .versionAttributes( versionAttributes )
             .refresh( RefreshMode.ALL )
             .build();
 

modules/core/core-content/src/main/java/com/enonic/xp/core/impl/content/PatchContentCommand.java

@@ -1,5 +1,6 @@
 package com.enonic.xp.core.impl.content;
 
+import java.time.Instant;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
@@ -19,6 +20,7 @@
 import com.enonic.xp.context.ContextBuilder;
 import com.enonic.xp.node.PatchNodeParams;
 import com.enonic.xp.node.PatchNodeResult;
+import com.enonic.xp.util.Attributes;
 
 import static com.enonic.xp.core.impl.content.Constants.CONTENT_SKIP_SYNC;
 
@@ -61,9 +63,17 @@ private PatchContentResult doExecute()
                 .build();
         }
 
+        final Attributes versionAttributes = Attributes.create()
+            .attribute( "content.patch" )
+            .put( "user", getCurrentUserKey().toString() )
+            .put( "optime", Instant.now().toString() )
+            .end()
+            .build();
+
         final PatchNodeParams patchNodeParams = PatchNodeParamsFactory.create()
             .editedContent( patchedContent )
             .createAttachments( params.getCreateAttachments() )
+            .versionAttributes( versionAttributes )
             .branches( params.getBranches() )
             .contentTypeService( this.contentTypeService )
             .xDataService( this.xDataService )

modules/core/core-repo/src/main/java/com/enonic/xp/repo/impl/node/ImportNodeCommand.java

@@ -19,6 +19,7 @@
 import com.enonic.xp.security.RoleKeys;
 import com.enonic.xp.security.acl.AccessControlList;
 import com.enonic.xp.security.auth.AuthenticationInfo;
+import com.enonic.xp.util.Attributes;
 
 public class ImportNodeCommand
     extends AbstractNodeCommand
@@ -35,6 +36,8 @@ public class ImportNodeCommand
 
     private final boolean importPermissionsOnCreate;
 
+    private final Attributes versionAttributes;
+
     private final RefreshMode refresh;
 
     private ImportNodeCommand( Builder builder )
@@ -47,7 +50,7 @@ private ImportNodeCommand( Builder builder )
         this.importPermissions = builder.importPermissions;
         this.importPermissionsOnCreate = builder.importPermissionsOnCreate;
         this.refresh = builder.refresh;
-
+        this.versionAttributes = builder.versionAttributes;
     }
 
     public static Builder create()
@@ -112,6 +115,7 @@ private Node createNode()
                 .name( this.importNode.name() )
                 .parent( this.importNode.parentPath() )
                 .permissions( permissions )
+                .versionAttributes( versionAttributes )
                 .build();
 
             node = CreateNodeCommand.create( this )
@@ -130,9 +134,8 @@ private Node updateNode( final Node existingNode )
         final PatchNodeParams updateNodeParams = PatchNodeParams.create()
             .id( existingNode.id() )
             .setBinaryAttachments( this.binaryAttachments )
-            .editor( editableNode -> {
-                editableNode.data = this.importNode.data();
-            } )
+            .editor( editableNode -> editableNode.data = this.importNode.data() )
+            .versionAttributes( this.versionAttributes )
             .refresh( RefreshMode.ALL )
             .build();
 
@@ -197,6 +200,8 @@ public static final class Builder
 
         private boolean importPermissionsOnCreate = true;
 
+        private Attributes versionAttributes;
+
         private RefreshMode refresh;
 
         private Builder()
@@ -239,6 +244,12 @@ public Builder importPermissionsOnCreate( boolean importPermissionsOnCreate )
             return this;
         }
 
+        public Builder versionAttributes( final Attributes attributes )
+        {
+            this.versionAttributes = attributes;
+            return this;
+        }
+
         public Builder refresh( final RefreshMode refresh )
         {
             this.refresh = refresh;

modules/core/core-repo/src/main/java/com/enonic/xp/repo/impl/node/NodeServiceImpl.java

@@ -803,6 +803,7 @@ public ImportNodeResult importNode( final ImportNodeParams params )
             .refresh( params.getRefresh() )
             .importPermissions( params.isImportPermissions() )
             .importPermissionsOnCreate( params.isImportPermissionsOnCreate() )
+            .versionAttributes( params.getVersionAttributes() )
             .binaryBlobStore( this.binaryService )
             .indexServiceInternal( this.indexServiceInternal )
             .storageService( this.nodeStorageService )

modules/lib/lib-auditlog/src/test/java/com/enonic/xp/lib/audit/BaseAuditLogHandlerTest.java

@@ -1,6 +1,7 @@
 package com.enonic.xp.lib.audit;
 
 import java.time.Instant;
+import java.util.Objects;
 
 import org.mockito.Mockito;
 
@@ -9,6 +10,7 @@
 import com.enonic.xp.audit.AuditLogService;
 import com.enonic.xp.audit.LogAuditLogParams;
 import com.enonic.xp.form.PropertyTreeMarshallerService;
+import com.enonic.xp.security.PrincipalKey;
 import com.enonic.xp.testing.ScriptTestSupport;
 
 public abstract class BaseAuditLogHandlerTest
@@ -37,7 +39,7 @@ protected AuditLog.Builder auditLogBuilder( LogAuditLogParams p )
             type( p.getType() ).
             time( Instant.ofEpochMilli( 1565599442767L ) ).
             source( p.getSource() ).
-            user( p.getUser() ).
+            user( Objects.requireNonNullElse( p.getUser(), PrincipalKey.ofAnonymous()) ).
             objectUris( p.getObjectUris() ).
             data( p.getData() );
     }