wip

Author: rymsha

modules/core/core-api/src/main/java/com/enonic/xp/audit/LogAuditLogParams.java

@@ -3,11 +3,8 @@
 import java.time.Instant;
 import java.util.Objects;
 
-import com.enonic.xp.context.Context;
-import com.enonic.xp.context.ContextAccessor;
 import com.enonic.xp.data.PropertyTree;
 import com.enonic.xp.security.PrincipalKey;
-import com.enonic.xp.security.User;
 
 public final class LogAuditLogParams
 {
@@ -25,21 +22,14 @@ public final class LogAuditLogParams
 
     private LogAuditLogParams( final Builder builder )
     {
-        type = Objects.requireNonNull( builder.type, "AuditLogParams type cannot be null" );
+        type = Objects.requireNonNull( builder.type, "LogAuditLogParams type cannot be null" );
         time = Objects.requireNonNullElseGet( builder.time, Instant::now );
         source = Objects.requireNonNullElse( builder.source, "" );
-        user = Objects.requireNonNullElseGet( builder.user, this::getUserKey );
+        user = builder.user;
         objectUris = Objects.requireNonNullElse( builder.objectUris, AuditLogUris.empty() );
         data = Objects.requireNonNullElse( builder.data, new PropertyTree() );
     }
 
-    private PrincipalKey getUserKey()
-    {
-        final Context context = ContextAccessor.current();
-        final User user = context.getAuthInfo().getUser() != null ? context.getAuthInfo().getUser() : User.ANONYMOUS;
-        return user.getKey();
-    }
-
     public String getType()
     {
         return type;

modules/core/core-api/src/main/java/com/enonic/xp/content/ActiveContentVersionEntry.java

@@ -80,8 +80,6 @@ public interface ContentService
 
     FindContentVersionsResult getVersions( FindContentVersionsParams params );
 
-    GetActiveContentVersionsResult getActiveVersions( GetActiveContentVersionsParams params );
-
     ByteSource getBinary( ContentId contentId, BinaryReference binaryReference );
 
     ByteSource getBinary( ContentId contentId, ContentVersionId contentVersionId, BinaryReference binaryReference );

modules/core/core-api/src/main/java/com/enonic/xp/content/ContentService.java

@@ -7,6 +7,7 @@
 import com.enonic.xp.index.ChildOrder;
 import com.enonic.xp.security.PrincipalKey;
 import com.enonic.xp.security.acl.AccessControlList;
+import com.enonic.xp.util.Attributes;
 
 @PublicApi
 public final class ContentVersion
@@ -27,12 +28,16 @@ public final class ContentVersion
 
     private final String comment;
 
-    private final ContentVersionPublishInfo publishInfo;
+    private final ContentVersionCommitInfo commitInfo;
+
+    private final ContentPublishInfo publishInfo;
 
     private final WorkflowInfo workflowInfo;
 
     private final AccessControlList permissions;
 
+    private final Attributes attributes;
+
     private ContentVersion( Builder builder )
     {
         this.modifier = builder.modifier;
@@ -44,8 +49,10 @@ private ContentVersion( Builder builder )
         this.childOrder = builder.childOrder;
         this.id = builder.id;
         this.publishInfo = builder.publishInfo;
+        this.commitInfo = builder.commitInfo;
         this.workflowInfo = builder.workflowInfo;
         this.permissions = builder.permissions;
+        this.attributes = builder.attributes;
     }
 
     public PrincipalKey getModifier()
@@ -83,11 +90,16 @@ public ContentVersionId getId()
         return id;
     }
 
-    public ContentVersionPublishInfo getPublishInfo()
+    public ContentPublishInfo getPublishInfo()
     {
         return publishInfo;
     }
 
+    public ContentVersionCommitInfo getCommitInfo()
+    {
+        return commitInfo;
+    }
+
     public WorkflowInfo getWorkflowInfo()
     {
         return workflowInfo;
@@ -103,6 +115,11 @@ public AccessControlList getPermissions()
         return permissions;
     }
 
+    public Attributes getAttributes()
+    {
+        return attributes;
+    }
+
     public static Builder create()
     {
         return new Builder();
@@ -124,15 +141,16 @@ public boolean equals( final Object o )
             Objects.equals( displayName, that.displayName ) && Objects.equals( modified, that.modified ) &&
             Objects.equals( timestamp, that.timestamp ) && Objects.equals( childOrder, that.childOrder ) &&
             Objects.equals( comment, that.comment ) && Objects.equals( publishInfo, that.publishInfo ) &&
-            Objects.equals( workflowInfo, that.workflowInfo ) && Objects.equals( permissions, that.permissions ) &&
-            Objects.equals( path, that.path );
+            Objects.equals( commitInfo, that.commitInfo ) && Objects.equals( workflowInfo, that.workflowInfo ) &&
+            Objects.equals( permissions, that.permissions ) && Objects.equals( path, that.path ) &&
+            Objects.equals( attributes, that.attributes );
     }
 
     @Override
     public int hashCode()
     {
-        return Objects.hash( id, modifier, displayName, modified, timestamp, childOrder, comment, publishInfo, workflowInfo, path,
-                             permissions );
+        return Objects.hash( id, modifier, displayName, modified, timestamp, childOrder, comment, publishInfo, commitInfo, workflowInfo,
+                             path, permissions, attributes );
     }
 
     public static final class Builder
@@ -153,12 +171,16 @@ public static final class Builder
 
         private ContentVersionId id;
 
-        private ContentVersionPublishInfo publishInfo;
+        private ContentPublishInfo publishInfo;
+
+        private ContentVersionCommitInfo commitInfo;
 
         private WorkflowInfo workflowInfo;
 
         private AccessControlList permissions;
 
+        private Attributes attributes;
+
         private Builder()
         {
         }
@@ -169,61 +191,73 @@ public Builder id( final ContentVersionId id )
             return this;
         }
 
-        public Builder modifier( PrincipalKey modifier )
+        public Builder modifier( final PrincipalKey modifier )
         {
             this.modifier = modifier;
             return this;
         }
 
-        public Builder displayName( String displayName )
+        public Builder displayName( final String displayName )
         {
             this.displayName = displayName;
             return this;
         }
 
-        public Builder path( ContentPath path )
+        public Builder path( final ContentPath path )
         {
             this.path = path;
             return this;
         }
 
-        public Builder modified( Instant modified )
+        public Builder modified( final Instant modified )
         {
             this.modified = modified;
             return this;
         }
 
-        public Builder timestamp( Instant timestamp )
+        public Builder timestamp( final Instant timestamp )
         {
             this.timestamp = timestamp;
             return this;
         }
 
-        public Builder childOrder( ChildOrder childOrder )
+        public Builder childOrder( final ChildOrder childOrder )
         {
             this.childOrder = childOrder;
             return this;
         }
 
-        public Builder comment( String comment )
+        public Builder comment( final String comment )
         {
             this.comment = comment;
             return this;
         }
 
-        public Builder publishInfo( ContentVersionPublishInfo publishInfo )
+        public Builder publishInfo( final ContentPublishInfo publishInfo )
         {
             this.publishInfo = publishInfo;
             return this;
         }
 
-        public Builder workflowInfo( WorkflowInfo workflowInfo )
+        public Builder commitInfo( final ContentVersionCommitInfo commitInfo )
+        {
+            this.commitInfo = commitInfo;
+            return this;
+        }
+
+        public Builder attributes( final Attributes attributes )
+        {
+            this.attributes = attributes;
+            return this;
+        }
+
+        public Builder workflowInfo( final WorkflowInfo workflowInfo )
         {
             this.workflowInfo = workflowInfo;
             return this;
         }
 
-        public Builder permissions( AccessControlList permissions )
+        public Builder permissions( final AccessControlList permissions )
         {
             this.permissions = permissions;
             return this;

modules/core/core-api/src/main/java/com/enonic/xp/content/ContentVersion.java

@@ -5,7 +5,7 @@
 
 import com.enonic.xp.security.PrincipalKey;
 
-public final class ContentVersionPublishInfo
+public final class ContentVersionCommitInfo
 {
     private final PrincipalKey publisher;
 
@@ -15,14 +15,11 @@ public final class ContentVersionPublishInfo
 
     private final CommitType type;
 
-    private final ContentPublishInfo contentPublishInfo;
-
-    private ContentVersionPublishInfo( Builder builder )
+    private ContentVersionCommitInfo( Builder builder )
     {
         publisher = builder.publisher;
         timestamp = builder.timestamp;
         message = builder.message;
-        contentPublishInfo = builder.contentPublishInfo;
         type = builder.type;
     }
 
@@ -46,11 +43,6 @@ public String getMessage()
         return message;
     }
 
-    public ContentPublishInfo getContentPublishInfo()
-    {
-        return contentPublishInfo;
-    }
-
     public CommitType getType()
     {
         return type;
@@ -63,20 +55,20 @@ public boolean equals( final Object o )
         {
             return true;
         }
-        if ( !( o instanceof ContentVersionPublishInfo ) )
+        if ( !( o instanceof ContentVersionCommitInfo ) )
         {
             return false;
         }
-        final ContentVersionPublishInfo that = (ContentVersionPublishInfo) o;
+        final ContentVersionCommitInfo that = (ContentVersionCommitInfo) o;
         return Objects.equals( publisher, that.publisher ) && Objects.equals( timestamp, that.timestamp ) &&
-            Objects.equals( message, that.message ) && Objects.equals( contentPublishInfo, that.contentPublishInfo ) &&
+            Objects.equals( message, that.message ) &&
             Objects.equals( type, that.type );
     }
 
     @Override
     public int hashCode()
     {
-        return Objects.hash( publisher, timestamp, message, contentPublishInfo );
+        return Objects.hash( publisher, timestamp, message );
     }
 
     public enum CommitType
@@ -92,15 +84,13 @@ public static final class Builder
 
         private String message;
 
-        private ContentPublishInfo contentPublishInfo;
-
         private CommitType type;
 
         private Builder()
         {
         }
 
-        public Builder publisher( final PrincipalKey publisher )
+        public Builder commiter( final PrincipalKey publisher )
         {
             this.publisher = publisher;
             return this;
@@ -118,21 +108,15 @@ public Builder message( final String message )
             return this;
         }
 
-        public Builder contentPublishInfo( final ContentPublishInfo contentPublishInfo )
-        {
-            this.contentPublishInfo = contentPublishInfo;
-            return this;
-        }
-
         public Builder type( final CommitType type )
         {
             this.type = type;
             return this;
         }
 
-        public ContentVersionPublishInfo build()
+        public ContentVersionCommitInfo build()
         {
-            return new ContentVersionPublishInfo( this );
+            return new ContentVersionCommitInfo( this );
         }
     }
 }