wip

Author: rymsha

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

@@ -2,7 +2,6 @@
 
 import java.time.Instant;
 import java.util.List;
-import java.util.Objects;
 
 import com.enonic.xp.annotation.PublicApi;
 import com.enonic.xp.security.PrincipalKey;
@@ -37,8 +36,6 @@ public final class ContentVersion
 
     private final PrincipalKey unpublishedBy;
 
-    private final ContentVersionCommitInfo commitInfo;
-
     private final String comment;
 
     private final Attributes attributes;
@@ -59,7 +56,6 @@ private ContentVersion( Builder builder )
         this.publishedTo = builder.publishedTo;
         this.unpublishedTime = builder.unpublished;
         this.unpublishedBy = builder.unpublishedBy;
-        this.commitInfo = builder.commitInfo;
         this.attributes = builder.attributes;
     }
 
@@ -88,11 +84,6 @@ public ContentVersionId getId()
         return id;
     }
 
-    public ContentVersionCommitInfo getCommitInfo()
-    {
-        return commitInfo;
-    }
-
     public ContentPath getPath()
     {
         return path;
@@ -167,8 +158,6 @@ public static final class Builder
 
         private ContentVersionId id;
 
-        private ContentVersionCommitInfo commitInfo;
-
         private Instant published;
 
         private PrincipalKey publishedBy;

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

@@ -18,18 +18,6 @@ void testBuilder()
         final Instant now1 = Instant.now();
         final Instant now2 = Instant.now();
 
-        final ContentVersionCommitInfo commitInfo = ContentVersionCommitInfo.create()
-            .message( "My version 1" )
-            .type( ContentVersionCommitInfo.CommitType.ARCHIVED )
-            .commiter( PrincipalKey.ofAnonymous() )
-            .timestamp( Instant.ofEpochSecond( 1562056003L ) )
-            .build();
-
-        assertEquals( ContentVersionCommitInfo.CommitType.ARCHIVED, commitInfo.getType() );
-        assertEquals( "My version 1", commitInfo.getMessage() );
-        assertEquals( PrincipalKey.ofAnonymous(), commitInfo.getCommiter() );
-        assertEquals( Instant.ofEpochSecond( 1562056003L ), commitInfo.getTimestamp() );
-
         final ContentVersion version = ContentVersion.create()
             .id( ContentVersionId.from( "a" ) )
             .path( ContentPath.from( ContentPath.ROOT, "a" ) )

modules/core/core-api/src/test/java/com/enonic/xp/content/ContentVersionTest.java

@@ -7,7 +7,6 @@
 import com.enonic.xp.content.ContentPropertyNames;
 import com.enonic.xp.content.ContentPublishInfo;
 import com.enonic.xp.content.ContentVersion;
-import com.enonic.xp.content.ContentVersionCommitInfo;
 import com.enonic.xp.content.ContentVersionId;
 import com.enonic.xp.content.ContentVersions;
 import com.enonic.xp.content.FindContentVersionsResult;
@@ -143,30 +142,6 @@ else if ( message.startsWith( ContentConstants.ARCHIVE_COMMIT_PREFIX + ContentCo
         }
     }
 
-    private static ContentVersionCommitInfo.CommitType getType( final String message )
-    {
-        if ( message.startsWith( ContentConstants.PUBLISH_COMMIT_PREFIX ) )
-        {
-            return ContentVersionCommitInfo.CommitType.PUBLISHED;
-        }
-        else if ( message.startsWith( ContentConstants.UNPUBLISH_COMMIT_PREFIX ) )
-        {
-            return ContentVersionCommitInfo.CommitType.UNPUBLISHED;
-        }
-        else if ( message.startsWith( ContentConstants.ARCHIVE_COMMIT_PREFIX ) )
-        {
-            return ContentVersionCommitInfo.CommitType.ARCHIVED;
-        }
-        else if ( message.startsWith( ContentConstants.RESTORE_COMMIT_PREFIX ) )
-        {
-            return ContentVersionCommitInfo.CommitType.RESTORED;
-        }
-        else
-        {
-            return ContentVersionCommitInfo.CommitType.CUSTOM;
-        }
-    }
-
     public static final class Builder
         extends AbstractContentCommand.Builder<Builder>
 

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

@@ -294,8 +294,7 @@ void archive_with_message()
         assertTrue( iterator.hasNext() );
 
         ContentVersion version = iterator.next();
-        assertNotNull( version.getCommitInfo().getTimestamp() );
-        assertEquals( "COM_ENONIC_XP_CONTENT_ARCHIVE Archive test message", version.getCommitInfo().getMessage() );
+        assertEquals( "Archive test message", version.getComment() );
     }
 
     private static final class TestListener

modules/itest/itest-core/src/test/java/com/enonic/xp/core/content/ContentServiceImplTest_archive.java

@@ -406,9 +406,7 @@ void publish_with_message()
         assertTrue( iterator.hasNext() );
 
         ContentVersion version = iterator.next();
-        assertNotNull( version.getCommitInfo().getTimestamp() );
-        assertEquals( "user:system:test-user", version.getCommitInfo().getCommiter().toString() );
-        assertEquals( "COM_ENONIC_XP_CONTENT_PUBLISH My message", version.getCommitInfo().getMessage() );
+        assertEquals( "My message", version.getComment() );
     }
 
     @Test
@@ -425,9 +423,8 @@ void publish_with_message_no_message()
         assertTrue( iterator.hasNext() );
 
         ContentVersion version = iterator.next();
-        assertNotNull( version.getCommitInfo().getTimestamp() );
-        assertEquals( "user:system:test-user", version.getCommitInfo().getCommiter().toString() );
-        assertEquals( "COM_ENONIC_XP_CONTENT_PUBLISH", version.getCommitInfo().getMessage() );
+        assertEquals( "user:system:test-user", version.getPublishedBy().toString() );
+        assertEquals( "", version.getComment() );
     }
 
     @Test

modules/itest/itest-core/src/test/java/com/enonic/xp/core/content/ContentServiceImplTest_publish.java

@@ -6,7 +6,7 @@
 import com.enonic.xp.archive.RestoreContentParams;
 import com.enonic.xp.content.Content;
 import com.enonic.xp.content.ContentPath;
-import com.enonic.xp.content.ContentVersionCommitInfo;
+import com.enonic.xp.content.ContentVersion;
 import com.enonic.xp.content.CreateContentParams;
 import com.enonic.xp.content.FindContentVersionsParams;
 import com.enonic.xp.content.FindContentVersionsResult;
@@ -72,8 +72,8 @@ void get_archived_versions()
         assertEquals( 3, result.getTotalHits() );
 
         assertThat( result.getContentVersions() ).elements( 0, 1 )
-            .extracting( v -> v.getCommitInfo().getType() )
-            .containsExactly( ContentVersionCommitInfo.CommitType.RESTORED, ContentVersionCommitInfo.CommitType.ARCHIVED );
+            .extracting( ContentVersion::getChange )
+            .containsExactly( "content.restore", "content.archive" );
     }
 }