wip

Author: rymsha

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

@@ -1,7 +1,6 @@
 package com.enonic.xp.content;
 
 import com.enonic.xp.annotation.PublicApi;
-import com.enonic.xp.node.CompareStatus;
 
 @PublicApi
 public final class CompareContentResult

modules/core/core-api/src/main/java/com/enonic/xp/node/CompareStatus.java renamed to modules/core/core-api/src/main/java/com/enonic/xp/content/CompareStatus.java

@@ -1,4 +1,4 @@
-package com.enonic.xp.node;
+package com.enonic.xp.content;
 
 import com.enonic.xp.annotation.PublicApi;
 

modules/core/core-api/src/main/java/com/enonic/xp/node/NodeComparison.java

@@ -1,6 +1,7 @@
 package com.enonic.xp.node;
 
 import com.enonic.xp.annotation.PublicApi;
+import com.enonic.xp.content.CompareStatus;
 
 @PublicApi
 public final class NodeComparison

modules/core/core-api/src/main/java/com/enonic/xp/node/NodeComparisons.java

@@ -8,6 +8,7 @@
 import java.util.stream.Collectors;
 
 import com.enonic.xp.annotation.PublicApi;
+import com.enonic.xp.content.CompareStatus;
 
 @PublicApi
 public final class NodeComparisons

modules/core/core-api/src/main/java/com/enonic/xp/node/NodeService.java

@@ -17,9 +17,7 @@ public interface NodeService
 
     MoveNodeResult move( MoveNodeParams params );
 
-    PushNodesResult push( NodeIds ids, Branch target );
-
-    PushNodesResult push( NodeIds ids, Branch target, PushNodesListener pushListener );
+    PushNodesResult push( PushNodeParams params );
 
     DeleteNodeResult delete( DeleteNodeParams deleteNodeParams );
 

modules/core/core-api/src/main/java/com/enonic/xp/node/PushNodeParams.java

@@ -0,0 +1,109 @@
+package com.enonic.xp.node;
+
+import java.util.Objects;
+
+import com.enonic.xp.branch.Branch;
+
+public final class PushNodeParams
+{
+    private final NodeIds ids;
+
+    private final Branch target;
+
+    private final Attributes versionAttributes;
+
+    private final PushNodesListener pushListener;
+
+    private final NodeDataProcessor processor;
+
+    private PushNodeParams( final Builder builder )
+    {
+        this.ids = Objects.requireNonNull( builder.ids, "ids is required" );
+        this.target = Objects.requireNonNull( builder.target, "target is required" );
+        this.versionAttributes = builder.versionAttributes;
+        this.pushListener = builder.pushListener;
+        this.processor = builder.processor;
+    }
+
+    public NodeIds getIds()
+    {
+        return ids;
+    }
+
+    public Branch getTarget()
+    {
+        return target;
+    }
+
+    public PushNodesListener getPushListener()
+    {
+        return pushListener;
+    }
+
+    public NodeDataProcessor getProcessor()
+    {
+        return processor;
+    }
+
+    public static Builder create()
+    {
+        return new Builder();
+    }
+
+    public Attributes getVersionAttributes()
+    {
+        return versionAttributes;
+    }
+
+    public static class Builder
+    {
+        private NodeIds ids;
+
+        private Branch target;
+
+        private Attributes versionAttributes;
+
+        private PushNodesListener pushListener;
+
+        private NodeDataProcessor processor;
+
+        private Builder()
+        {
+        }
+
+        public Builder ids( final NodeIds ids )
+        {
+            this.ids = ids;
+            return this;
+        }
+
+        public Builder target( final Branch target )
+        {
+            this.target = target;
+            return this;
+        }
+
+        public Builder publishListener( final PushNodesListener pushListener )
+        {
+            this.pushListener = pushListener;
+            return this;
+        }
+
+        public Builder processor( final NodeDataProcessor processor )
+        {
+            this.processor = processor;
+            return this;
+        }
+
+        public Builder versionAttributes( final Attributes versionAttributes )
+        {
+            this.versionAttributes = versionAttributes;
+            return this;
+        }
+
+        public PushNodeParams build()
+        {
+            return new PushNodeParams( this );
+        }
+    }
+}

modules/core/core-api/src/main/java/com/enonic/xp/node/SyncWorkResolverParams.java

@@ -5,6 +5,7 @@
 
 import com.enonic.xp.annotation.PublicApi;
 import com.enonic.xp.branch.Branch;
+import com.enonic.xp.content.CompareStatus;
 
 @PublicApi
 public final class SyncWorkResolverParams

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

@@ -19,6 +19,7 @@
 import com.enonic.xp.node.NodeCommitEntry;
 import com.enonic.xp.node.NodeId;
 import com.enonic.xp.node.NodeIds;
+import com.enonic.xp.node.PushNodeParams;
 import com.enonic.xp.node.PushNodeResult;
 import com.enonic.xp.node.PushNodesResult;
 import com.enonic.xp.node.RoutableNodeVersionId;
@@ -102,7 +103,8 @@ private void doPush( final ContentIds ids )
     private PushNodesResult doPushRoot()
     {
         final Node contentRootNode = nodeService.getByPath( ContentConstants.CONTENT_ROOT_PATH );
-        return nodeService.push( NodeIds.from( contentRootNode.id() ), ContentConstants.BRANCH_MASTER );
+        final NodeIds ids = NodeIds.from( contentRootNode.id() );
+        return nodeService.push( PushNodeParams.create().ids( ids ).target( ContentConstants.BRANCH_MASTER ).build() );
     }
 
     private CompareContentResults getSyncWork()
@@ -143,12 +145,14 @@ private void doPushNodes( final NodeIds nodesToPush )
     {
         setPublishInfo( nodesToPush );
 
-        final PushNodesResult pushNodesResult = nodeService.push( nodesToPush, ContentConstants.BRANCH_MASTER, count -> {
-            if ( publishContentListener != null )
-            {
-                publishContentListener.contentPushed( count );
-            }
-        } );
+        final PushNodeParams.Builder pushNodeParams =
+            PushNodeParams.create().ids( nodesToPush ).target( ContentConstants.BRANCH_MASTER );
+        if ( publishContentListener != null )
+        {
+            pushNodeParams.publishListener( publishContentListener::contentPushed );
+        }
+
+        final PushNodesResult pushNodesResult = nodeService.push( pushNodeParams.build() );
 
         commitPushedNodes( pushNodesResult.getSuccessful() );
 
@@ -218,10 +222,6 @@ private void setPublishInfo( final NodeIds nodesToPush )
                 }
 
             } ).id( id ).build() );
-            if ( publishContentListener != null )
-            {
-                publishContentListener.contentPushed( 1 );
-            }
         }
     }
 

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

@@ -5,7 +5,7 @@
 
 import com.enonic.xp.archive.ArchiveConstants;
 import com.enonic.xp.content.CompareContentResults;
-import com.enonic.xp.node.CompareStatus;
+import com.enonic.xp.content.CompareStatus;
 import com.enonic.xp.content.ContentConstants;
 import com.enonic.xp.content.ContentId;
 import com.enonic.xp.content.ContentIds;

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

@@ -3,7 +3,7 @@
 import java.util.Collection;
 import java.util.Objects;
 
-import com.enonic.xp.node.CompareStatus;
+import com.enonic.xp.content.CompareStatus;
 import com.enonic.xp.content.ContentConstants;
 import com.enonic.xp.content.ContentId;
 import com.enonic.xp.content.ContentIds;