Projects >> xp >>5236ad1643b3e285d7dbaf4e3129576ed6da58c2

Chunk
Conflicting content 
            return this;
        }

<<<<<<< HEAD
        public Builder nodeVersionId( final NodeVersionId nodeVersionId )
        {
            this.nodeVersionId = nodeVersionId;
            return this;
=======
        private void validate()
        {
            if ( ROOT_UUID.equals( this.id ) )
            {
                Preconditions.checkNotNull( this.childOrder );
            }
>>>>>>> d2e0bf70dc8fdcee6af30a9f3b5d3386daafe651
        }

        public Node build()
Solution content 
            return this;
        }

        public Builder nodeVersionId( final NodeVersionId nodeVersionId )
        {
            this.nodeVersionId = nodeVersionId;
            return this;
        }

        private void validate()
        {
            if ( ROOT_UUID.equals( this.id ) )
            {
                Preconditions.checkNotNull( this.childOrder );
            }
        }

        public Node build()
File
Node.java
Developer's decision
Concatenation
Kind of conflict
Attribute
If statement
Method signature
Return statement
Chunk
Conflicting content 
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.datatype.jsr310.JSR310Module;

<<<<<<< HEAD:modules/core/core-repo/src/main/java/com/enonic/xp/repo/impl/node/json/NodeVersionJsonSerializer.java
import com.enonic.xp.node.NodeVersion;
=======
import com.enonic.xp.node.Node;
>>>>>>> d2e0bf70dc8fdcee6af30a9f3b5d3386daafe651:modules/core/core-repo/src/main/java/com/enonic/xp/repo/impl/node/json/NodeJsonSerializer.java
import com.enonic.xp.util.Exceptions;

public final class NodeVersionJsonSerializer
Solution content 
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.datatype.jsr310.JSR310Module;

import com.enonic.xp.node.NodeVersion;
import com.enonic.xp.util.Exceptions;

public final class NodeVersionJsonSerializer
File
NodeVersionJsonSerializer.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
        {
            final NodeVersionJson nodeVersionJson = this.mapper.readValue( serialized, NodeVersionJson.class );

<<<<<<< HEAD:modules/core/core-repo/src/main/java/com/enonic/xp/repo/impl/node/json/NodeVersionJsonSerializer.java
            return nodeVersionJson.fromJson();
=======
            final Node node = nodeJson.fromJson();

            if ( node.isRoot() )
            {
                return Node.createRoot().
                    permissions( node.getPermissions() ).
                    childOrder( node.getChildOrder() ).
                    build();
            }

            return node;
>>>>>>> d2e0bf70dc8fdcee6af30a9f3b5d3386daafe651:modules/core/core-repo/src/main/java/com/enonic/xp/repo/impl/node/json/NodeJsonSerializer.java
        }
        catch ( final IOException e )
        {
Solution content 
        {
            final NodeVersionJson nodeVersionJson = this.mapper.readValue( serialized, NodeVersionJson.class );

            return nodeVersionJson.fromJson();
        }
        catch ( final IOException e )
        {
File
NodeVersionJsonSerializer.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Return statement
Variable
Chunk
Conflicting content 
        final NodeVersion nodeVersion = nodeVersionDao.get( nodeBranchMetadata.getVersionId() );

<<<<<<< HEAD
        final Node node = NodeFactory.create( nodeVersion, nodeBranchMetadata );
=======
    private Node populateWithMetaData( final Node node, final BranchNodeVersion branchNodeVersion )
    {
        if ( node != null && node.isRoot() )
        {
            return node;
        }
>>>>>>> d2e0bf70dc8fdcee6af30a9f3b5d3386daafe651

        return canRead( node.getPermissions() ) ? node : null;
    }
Solution content 
        final NodeVersion nodeVersion = nodeVersionDao.get( nodeBranchMetadata.getVersionId() );

        final Node node = NodeFactory.create( nodeVersion, nodeBranchMetadata );

        return canRead( node.getPermissions() ) ? node : null;
    }
File
StorageServiceImpl.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Method signature
Variable
Chunk
Conflicting content 
        return canRead( node.getPermissions() ) ? node : null;
    }

<<<<<<< HEAD
    private Nodes doReturnNodes( final NodesBranchMetadata nodesBranchMetadata )
=======
    private Node populateWithMetaData( final Node node, final NodeVersion nodeVersion )
    {
        if ( node != null && node.isRoot() )
        {
            return node;
        }

        final NodePath nodePath = nodeVersion.getNodePath();
        final NodePath parentPath = nodePath.getParentPath();
        final NodeName nodeName = NodeName.from( nodePath.getLastElement().toString() );

        return Node.create( node ).
            parentPath( parentPath ).
            name( nodeName ).
            nodeState( NodeState.ARCHIVED ).
            timestamp( nodeVersion.getTimestamp() ).
            build();
    }

    private Nodes doReturnNodes( final BranchNodeVersions branchNodeVersions )
>>>>>>> d2e0bf70dc8fdcee6af30a9f3b5d3386daafe651
    {
        final NodeVersionIds.Builder builder = NodeVersionIds.create();
        nodesBranchMetadata.forEach( ( nodeBranchVersion ) -> builder.add( nodeBranchVersion.getVersionId() ) );
Solution content 
        return canRead( node.getPermissions() ) ? node : null;
    }

    private Nodes doReturnNodes( final NodesBranchMetadata nodesBranchMetadata )
    {
        final NodeVersionIds.Builder builder = NodeVersionIds.create();
        nodesBranchMetadata.forEach( ( nodeBranchVersion ) -> builder.add( nodeBranchVersion.getVersionId() ) );
File
StorageServiceImpl.java
Developer's decision
Version 1
Kind of conflict
Method declaration
Method signature