Projects >> cypher-dsl >>fd33e82926b5425e4d41526d99c299ca1bfe77f3

Chunk
Conflicting content 
import org.neo4j.cypherdsl.grammar.Limit;
import org.neo4j.cypherdsl.grammar.Match;
import org.neo4j.cypherdsl.grammar.OrderBy;
<<<<<<< HEAD
=======
import org.neo4j.cypherdsl.grammar.CreateUnique;
>>>>>>> 32b6df91d765263656e1784f518fee232669d60e
import org.neo4j.cypherdsl.grammar.ReturnNext;
import org.neo4j.cypherdsl.grammar.Set;
import org.neo4j.cypherdsl.grammar.Skip;
Solution content 
import org.neo4j.cypherdsl.grammar.Limit;
import org.neo4j.cypherdsl.grammar.Match;
import org.neo4j.cypherdsl.grammar.OrderBy;
import org.neo4j.cypherdsl.grammar.CreateUnique;
import org.neo4j.cypherdsl.grammar.ReturnNext;
import org.neo4j.cypherdsl.grammar.Set;
import org.neo4j.cypherdsl.grammar.Skip;
File
CypherQuery.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import org.neo4j.cypherdsl.query.clause.LimitParameterClause;
import org.neo4j.cypherdsl.query.clause.MatchClause;
import org.neo4j.cypherdsl.query.clause.OrderByClause;
<<<<<<< HEAD
=======
import org.neo4j.cypherdsl.query.clause.CreateUniqueClause;
>>>>>>> 32b6df91d765263656e1784f518fee232669d60e
import org.neo4j.cypherdsl.query.clause.ReturnClause;
import org.neo4j.cypherdsl.query.clause.SetClause;
import org.neo4j.cypherdsl.query.clause.SkipClause;
Solution content 
import org.neo4j.cypherdsl.query.clause.LimitParameterClause;
import org.neo4j.cypherdsl.query.clause.MatchClause;
import org.neo4j.cypherdsl.query.clause.OrderByClause;
import org.neo4j.cypherdsl.query.clause.CreateUniqueClause;
import org.neo4j.cypherdsl.query.clause.ReturnClause;
import org.neo4j.cypherdsl.query.clause.SetClause;
import org.neo4j.cypherdsl.query.clause.SkipClause;
File
CypherQuery.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
    // Grammar
    protected class Grammar
<<<<<<< HEAD
            implements StartNext, With, WithNext, Create, Set, Delete, UpdateNext, Match, ReturnNext, OrderBy,
=======
            implements StartNext, With, WithNext, Create, Set, Delete, CreateUnique, UpdateNext, Match, ReturnNext, OrderBy,
>>>>>>> 32b6df91d765263656e1784f518fee232669d60e
            Skip, Limit, Execute
    {
        // With ---------------------------------------------------------
Solution content 
    // Grammar
    protected class Grammar
            implements StartNext, With, WithNext, Create, Set, Delete, CreateUnique, UpdateNext, Match, ReturnNext, OrderBy,
            Skip, Limit, Execute
    {
        // With ---------------------------------------------------------
File
CypherQuery.java
Developer's decision
Version 2
Kind of conflict
Other
Chunk
Conflicting content 
            return this;
        }

<<<<<<< HEAD
=======
        // createUnique -------------------------------------------------------
        @Override
        public UpdateNext createUnique( PathExpression... expressions )
        {
            query.add( new CreateUniqueClause( Arrays.asList( expressions ) ) );

            return this;
        }

        @Override
        public UpdateNext createUnique( Iterable expressions )
        {
            query.add( new CreateUniqueClause( expressions ) );

            return this;
        }

>>>>>>> 32b6df91d765263656e1784f518fee232669d60e
        // For each -----------------------------------------------------

        @Override
Solution content 
            return this;
        }

        // createUnique -------------------------------------------------------
        @Override
        public UpdateNext createUnique( PathExpression... expressions )
        {
            query.add( new CreateUniqueClause( Arrays.asList( expressions ) ) );

            return this;
        }

        @Override
        public UpdateNext createUnique( Iterable expressions )
        {
            query.add( new CreateUniqueClause( expressions ) );

            return this;
        }

        // For each -----------------------------------------------------

        @Override
File
CypherQuery.java
Developer's decision
Version 2
Kind of conflict
Annotation
Comment
Method declaration
Chunk
Conflicting content 
import org.neo4j.cypherdsl.query.clause.CreateClause;
import org.neo4j.cypherdsl.query.clause.DeleteClause;
import org.neo4j.cypherdsl.query.clause.ForEachClause;
<<<<<<< HEAD
=======
import org.neo4j.cypherdsl.query.clause.CreateUniqueClause;
>>>>>>> 32b6df91d765263656e1784f518fee232669d60e
import org.neo4j.cypherdsl.query.clause.SetClause;

/**
Solution content 
import org.neo4j.cypherdsl.query.clause.CreateClause;
import org.neo4j.cypherdsl.query.clause.DeleteClause;
import org.neo4j.cypherdsl.query.clause.ForEachClause;
import org.neo4j.cypherdsl.query.clause.CreateUniqueClause;
import org.neo4j.cypherdsl.query.clause.SetClause;

/**
File
ForEachStatement.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
    }

    @Override
<<<<<<< HEAD
=======
    public ForEachStatement createUnique( PathExpression... expressions )
    {
        return new ForEachStatement( forEachClause.add( new CreateUniqueClause( Arrays.asList( expressions ) ) ) );
    }

    @Override
    public ForEachStatement createUnique( Iterable expressions )
    {
        return new ForEachStatement( forEachClause.add( new CreateUniqueClause( expressions ) ) );
    }

    @Override
>>>>>>> 32b6df91d765263656e1784f518fee232669d60e
    public ForEachStatement forEach( ForEachStatement statement )
    {
        return new ForEachStatement( forEachClause.add( statement.getClause() ) );
Solution content 
    }

    @Override
    public ForEachStatement createUnique( PathExpression... expressions )
    {
        return new ForEachStatement( forEachClause.add( new CreateUniqueClause( Arrays.asList( expressions ) ) ) );
    }

    @Override
    public ForEachStatement createUnique( Iterable expressions )
    {
        return new ForEachStatement( forEachClause.add( new CreateUniqueClause( expressions ) ) );
    }

    @Override
    public ForEachStatement forEach( ForEachStatement statement )
    {
        return new ForEachStatement( forEachClause.add( statement.getClause() ) );
File
ForEachStatement.java
Developer's decision
Version 2
Kind of conflict
Annotation
Method declaration
Chunk
Conflicting content 
    ForEachStatement delete( Iterable expressions );

<<<<<<< HEAD
=======
    ForEachStatement createUnique( PathExpression... expressions );

    ForEachStatement createUnique( Iterable expressions );

>>>>>>> 32b6df91d765263656e1784f518fee232669d60e
    ForEachStatement forEach( ForEachStatement statement );
}
Solution content 
    ForEachStatement delete( Iterable expressions );

    ForEachStatement createUnique( PathExpression... expressions );

    ForEachStatement createUnique( Iterable expressions );

    ForEachStatement forEach( ForEachStatement statement );
}
File
ForEachStatements.java
Developer's decision
Version 2
Kind of conflict
Method interface
Chunk
Conflicting content 
 * This collects all the update clauses.
 */
public interface Update
<<<<<<< HEAD
        extends Create, Set, Delete
=======
        extends Create, Set, Delete, CreateUnique
>>>>>>> 32b6df91d765263656e1784f518fee232669d60e
{
}
Solution content 
 * This collects all the update clauses.
 */
public interface Update
        extends Create, Set, Delete, CreateUnique
{
}
File
Update.java
Developer's decision
Version 2
Kind of conflict
Other
Chunk
Conflicting content 
    }

    @Override
<<<<<<< HEAD
=======
    public ForEachStatement createUnique( PathExpression... expressions )
    {
        return new ForEachStatement( add( new CreateUniqueClause( Arrays.asList( expressions ) ) ) );
    }

    @Override
    public ForEachStatement createUnique( Iterable expressions )
    {
        return new ForEachStatement( add( new CreateUniqueClause( expressions ) ) );
    }

    @Override
>>>>>>> 32b6df91d765263656e1784f518fee232669d60e
    public ForEachStatement forEach( ForEachStatement statement )
    {
        return new ForEachStatement( add( statement ) );
Solution content 
    }

    @Override
    public ForEachStatement createUnique( PathExpression... expressions )
    {
        return new ForEachStatement( add( new CreateUniqueClause( Arrays.asList( expressions ) ) ) );
    }

    @Override
    public ForEachStatement createUnique( Iterable expressions )
    {
        return new ForEachStatement( add( new CreateUniqueClause( expressions ) ) );
    }

    @Override
    public ForEachStatement forEach( ForEachStatement statement )
    {
        return new ForEachStatement( add( statement ) );
File
ForEachClause.java
Developer's decision
Version 2
Kind of conflict
Annotation
Method declaration
Chunk
Conflicting content 
    }

    @Test
<<<<<<< HEAD
=======
    public void test16_21_1()
    {
        assertEquals( CYPHER+"START left=node(1),right=node(3,4) CREATE UNIQUE (left)-[r:KNOWS]->(right) RETURN r",
                      start( nodesById( "left", 1 ), nodesById( "right", 3, 4 ) ).createUnique(node( "left" ).out( "KNOWS" ).as( "r" ).node( "right" )).returns( identifier( "r" ) ).toString());
    }

    @Test
    public void test16_21_2()
    {
        assertEquals( CYPHER+"START root=node(2) CREATE UNIQUE (root)-[:LOVES]-(someone) RETURN someone",
                      start( nodesById( "root", 2 ) ).createUnique( node( "root" ).both( "LOVES" ).node( "someone" ) ).returns( identifier( "someone" ) ).toString());
    }

    @Test
    public void test16_21_3()
    {
        assertEquals( CYPHER+"START root=node(2) CREATE UNIQUE (root)-[:X]-(leaf {name:\"D\"}) RETURN leaf",
                      start( nodesById( "root", 2 ) ).createUnique( node( "root" ).both( "X" ).node( identifier( "leaf" )).values( value( "name", "D" ) ) ).returns( identifier( "leaf" ) ).toString());
    }

    @Test
    public void test16_21_4()
    {
        assertEquals( CYPHER+"START root=node(2) CREATE UNIQUE (root)-[r:X {since:\"forever\"}]-() RETURN r",
                      start( nodesById( "root", 2 ) ).createUnique( node( "root" ).both( identifier("X")).values( value("since", "forever" ) ).as( "r" ).node() ).returns( identifier( "r" ) ).toString());
    }

    @Test
    public void test16_21_5()
    {
        assertEquals( CYPHER+"START root=node(2) CREATE UNIQUE (root)-[:FOO]->(x),(root)-[:BAR]->(x) RETURN x",
                      start( nodesById( "root", 2 ) ).createUnique( node( "root" ).out( "FOO" ).node( "x" ), node( "root" ).out( "BAR" ).node( "x" ) ).returns( identifier( "x" ) ) .toString());
    }

    @Test
>>>>>>> 32b6df91d765263656e1784f518fee232669d60e
    public void test16_22_1()
    {
        assertQueryEquals( CYPHER+"START begin=node(2),end=node(1) MATCH p=(begin)-->(end) FOREACH(n in nodes(p): SET n.marked=true)",
Solution content 
    }

    @Test
    public void test16_21_1()
    {
        assertEquals( CYPHER+"START left=node(1),right=node(3,4) CREATE UNIQUE (left)-[r:KNOWS]->(right) RETURN r",
                      start( nodesById( "left", 1 ), nodesById( "right", 3, 4 ) ).createUnique(node( "left" ).out( "KNOWS" ).as( "r" ).node( "right" )).returns( identifier( "r" ) ).toString());
    }

    @Test
    public void test16_21_2()
    {
        assertEquals( CYPHER+"START root=node(2) CREATE UNIQUE (root)-[:LOVES]-(someone) RETURN someone",
                      start( nodesById( "root", 2 ) ).createUnique( node( "root" ).both( "LOVES" ).node( "someone" ) ).returns( identifier( "someone" ) ).toString());
    }

    @Test
    public void test16_21_3()
    {
        assertEquals( CYPHER+"START root=node(2) CREATE UNIQUE (root)-[:X]-(leaf {name:\"D\"}) RETURN leaf",
                      start( nodesById( "root", 2 ) ).createUnique( node( "root" ).both( "X" ).node( identifier( "leaf" )).values( value( "name", "D" ) ) ).returns( identifier( "leaf" ) ).toString());
    }

    @Test
    public void test16_21_4()
    {
        assertEquals( CYPHER+"START root=node(2) CREATE UNIQUE (root)-[r:X {since:\"forever\"}]-() RETURN r",
                      start( nodesById( "root", 2 ) ).createUnique( node( "root" ).both( identifier("X")).values( value("since", "forever" ) ).as( "r" ).node() ).returns( identifier( "r" ) ).toString());
    }

    @Test
    public void test16_21_5()
    {
        assertEquals( CYPHER+"START root=node(2) CREATE UNIQUE (root)-[:FOO]->(x),(root)-[:BAR]->(x) RETURN x",
                      start( nodesById( "root", 2 ) ).createUnique( node( "root" ).out( "FOO" ).node( "x" ), node( "root" ).out( "BAR" ).node( "x" ) ).returns( identifier( "x" ) ) .toString());
    }

    @Test
    public void test16_22_1()
    {
        assertQueryEquals( CYPHER+"START begin=node(2),end=node(1) MATCH p=(begin)-->(end) FOREACH(n in nodes(p): SET n.marked=true)",
File
CypherReferenceTest.java
Developer's decision
Version 2
Kind of conflict
Annotation
Method declaration