Use labels for start/end node during creation of relationships,
The labels of start and end nodes must be taken in consideration when creating relationships for start and end nodes not using internal ids.
This commit is contained in:
Davide Effe
@@ -254,9 +254,12 @@ public enum CypherGenerator {
|
||||
@NonNull
|
||||
public Statement createRelationshipCreationQuery(Neo4jPersistentEntity<?> neo4jPersistentEntity,
|
||||
RelationshipDescription relationship, @Nullable String dynamicRelationshipType, Long relatedInternalId) {
|
||||
final Node startNode = neo4jPersistentEntity.isUsingInternalIds()
|
||||
? anyNode(START_NODE_NAME)
|
||||
: node(neo4jPersistentEntity.getPrimaryLabel(), neo4jPersistentEntity.getAdditionalLabels())
|
||||
.named(START_NODE_NAME);
|
||||
|
||||
Node startNode = anyNode(START_NODE_NAME);
|
||||
Node endNode = anyNode(END_NODE_NAME);
|
||||
final Node endNode = anyNode(END_NODE_NAME);
|
||||
String idPropertyName = neo4jPersistentEntity.getRequiredIdProperty().getPropertyName();
|
||||
|
||||
Parameter idParameter = parameter(FROM_ID_PARAMETER_NAME);
|
||||
@@ -311,9 +314,12 @@ public enum CypherGenerator {
|
||||
@NonNull
|
||||
public Statement createRelationshipRemoveQuery(Neo4jPersistentEntity<?> neo4jPersistentEntity,
|
||||
RelationshipDescription relationshipDescription, Neo4jPersistentEntity relatedNode) {
|
||||
final Node startNode = neo4jPersistentEntity.isUsingInternalIds()
|
||||
? anyNode(START_NODE_NAME)
|
||||
: node(neo4jPersistentEntity.getPrimaryLabel(), neo4jPersistentEntity.getAdditionalLabels())
|
||||
.named(START_NODE_NAME);
|
||||
|
||||
Node startNode = anyNode(START_NODE_NAME);
|
||||
Node endNode = node(relatedNode.getPrimaryLabel(), relatedNode.getAdditionalLabels());
|
||||
final Node endNode = node(relatedNode.getPrimaryLabel(), relatedNode.getAdditionalLabels());
|
||||
String idPropertyName = neo4jPersistentEntity.getRequiredIdProperty().getPropertyName();
|
||||
boolean outgoing = relationshipDescription.isOutgoing();
|
||||
|
||||
|
||||
@@ -0,0 +1,199 @@
|
||||
/*
|
||||
* Copyright (c) 2019-2020 "Neo4j,"
|
||||
* Neo4j Sweden AB [https://neo4j.com]
|
||||
*
|
||||
* This file is part of Neo4j.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package org.neo4j.springframework.data.core.schema;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.mockito.Mockito;
|
||||
import org.neo4j.opencypherdsl.Statement;
|
||||
import org.neo4j.opencypherdsl.renderer.Renderer;
|
||||
import org.neo4j.springframework.data.core.mapping.Neo4jMappingContext;
|
||||
import org.neo4j.springframework.data.core.mapping.Neo4jPersistentEntity;
|
||||
import org.neo4j.springframework.data.core.mapping.Neo4jPersistentProperty;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
/**
|
||||
* @author Davide Fantuzzi
|
||||
* @author Andrea Santurbano
|
||||
*/
|
||||
class CypherGeneratorTest {
|
||||
|
||||
@Test
|
||||
void itShouldCreateRelationshipCreationQueryWithLabelIfPresent() {
|
||||
Neo4jPersistentEntity<?> persistentEntity = new Neo4jMappingContext()
|
||||
.getPersistentEntity(Entity1.class);
|
||||
RelationshipDescription relationshipDescription = Mockito.mock(RelationshipDescription.class);
|
||||
when(relationshipDescription.isDynamic()).thenReturn(true);
|
||||
|
||||
Statement statement = CypherGenerator.INSTANCE.createRelationshipCreationQuery(
|
||||
persistentEntity,
|
||||
relationshipDescription,
|
||||
"REL",
|
||||
1L
|
||||
);
|
||||
|
||||
String expectedQuery = "MATCH (startNode:`Entity1`) WHERE startNode.id = $fromId MATCH (endNode)" +
|
||||
" WHERE id(endNode) = 1 MERGE (startNode)<-[:`REL`]-(endNode)";
|
||||
Assert.assertEquals(expectedQuery, Renderer.getDefaultRenderer().render(statement));
|
||||
}
|
||||
|
||||
@Test
|
||||
void itShouldCreateRelationshipCreationQueryWithMultipleLabels() {
|
||||
Neo4jPersistentEntity<?> persistentEntity = new Neo4jMappingContext()
|
||||
.getPersistentEntity(MultipleLabelEntity1.class);
|
||||
RelationshipDescription relationshipDescription = Mockito.mock(RelationshipDescription.class);
|
||||
when(relationshipDescription.isDynamic()).thenReturn(true);
|
||||
|
||||
Statement statement = CypherGenerator.INSTANCE.createRelationshipCreationQuery(
|
||||
persistentEntity,
|
||||
relationshipDescription,
|
||||
"REL",
|
||||
1L
|
||||
);
|
||||
|
||||
String expectedQuery = "MATCH (startNode:`Entity1`:`MultipleLabel`) WHERE startNode.id = $fromId MATCH (endNode)" +
|
||||
" WHERE id(endNode) = 1 MERGE (startNode)<-[:`REL`]-(endNode)";
|
||||
Assert.assertEquals(expectedQuery, Renderer.getDefaultRenderer().render(statement));
|
||||
}
|
||||
|
||||
@Test
|
||||
void itShouldCreateRelationshipCreationQueryWithoutUsingInternalIds() {
|
||||
RelationshipDescription relationshipDescription = Mockito.mock(RelationshipDescription.class);
|
||||
Neo4jPersistentEntity<?> persistentEntity = Mockito.mock(Neo4jPersistentEntity.class);
|
||||
Neo4jPersistentProperty persistentProperty = Mockito.mock(Neo4jPersistentProperty.class);
|
||||
|
||||
when(relationshipDescription.isDynamic()).thenReturn(true);
|
||||
when(persistentEntity.isUsingInternalIds()).thenReturn(true);
|
||||
when(persistentEntity.getRequiredIdProperty()).thenReturn(persistentProperty);
|
||||
|
||||
Statement statement = CypherGenerator.INSTANCE.createRelationshipCreationQuery(
|
||||
persistentEntity,
|
||||
relationshipDescription,
|
||||
"REL",
|
||||
1L
|
||||
);
|
||||
|
||||
String expectedQuery = "MATCH (startNode) WHERE id(startNode) = $fromId MATCH (endNode)" +
|
||||
" WHERE id(endNode) = 1 MERGE (startNode)<-[:`REL`]-(endNode)";
|
||||
Assert.assertEquals(expectedQuery, Renderer.getDefaultRenderer().render(statement));
|
||||
}
|
||||
|
||||
@Test
|
||||
void itShouldCreateRelationshipRemoveQueryWithLabelIfPresent() {
|
||||
Neo4jPersistentEntity<?> persistentEntity = new Neo4jMappingContext()
|
||||
.getPersistentEntity(Entity1.class);
|
||||
Neo4jPersistentEntity<?> relatedEntity = new Neo4jMappingContext()
|
||||
.getPersistentEntity(Entity2.class);
|
||||
RelationshipDescription relationshipDescription = Mockito.mock(RelationshipDescription.class);
|
||||
|
||||
Statement statement = CypherGenerator.INSTANCE.createRelationshipRemoveQuery(
|
||||
persistentEntity,
|
||||
relationshipDescription,
|
||||
relatedEntity
|
||||
);
|
||||
|
||||
String expectedQuery = "MATCH (startNode:`Entity1`)<-[rel]-(:`Entity2`) WHERE startNode.id = $fromId DELETE rel";
|
||||
Assert.assertEquals(expectedQuery, Renderer.getDefaultRenderer().render(statement));
|
||||
}
|
||||
|
||||
@Test
|
||||
void itShouldCreateRelationshipRemoveQueryWithMultipleLabels() {
|
||||
Neo4jPersistentEntity<?> persistentEntity = new Neo4jMappingContext()
|
||||
.getPersistentEntity(MultipleLabelEntity1.class);
|
||||
Neo4jPersistentEntity<?> relatedEntity = new Neo4jMappingContext()
|
||||
.getPersistentEntity(MultipleLabelEntity2.class);
|
||||
RelationshipDescription relationshipDescription = Mockito.mock(RelationshipDescription.class);
|
||||
|
||||
Statement statement = CypherGenerator.INSTANCE.createRelationshipRemoveQuery(
|
||||
persistentEntity,
|
||||
relationshipDescription,
|
||||
relatedEntity
|
||||
);
|
||||
|
||||
String expectedQuery = "MATCH (startNode:`Entity1`:`MultipleLabel`)<-[rel]-(:`Entity2`:`MultipleLabel`) WHERE startNode.id = $fromId DELETE rel";
|
||||
Assert.assertEquals(expectedQuery, Renderer.getDefaultRenderer().render(statement));
|
||||
}
|
||||
|
||||
@Test
|
||||
void itShouldCreateRelationshipRemoveQueryWithoutUsingInternalIds() {
|
||||
RelationshipDescription relationshipDescription = Mockito.mock(RelationshipDescription.class);
|
||||
Neo4jPersistentEntity<?> persistentEntity = Mockito.mock(Neo4jPersistentEntity.class);
|
||||
Neo4jPersistentProperty persistentProperty = Mockito.mock(Neo4jPersistentProperty.class);
|
||||
|
||||
when(relationshipDescription.isDynamic()).thenReturn(true);
|
||||
when(persistentEntity.isUsingInternalIds()).thenReturn(true);
|
||||
when(persistentEntity.getRequiredIdProperty()).thenReturn(persistentProperty);
|
||||
|
||||
Neo4jPersistentEntity<?> relatedEntity = new Neo4jMappingContext()
|
||||
.getPersistentEntity(Entity2.class);
|
||||
|
||||
Statement statement = CypherGenerator.INSTANCE.createRelationshipRemoveQuery(
|
||||
persistentEntity,
|
||||
relationshipDescription,
|
||||
relatedEntity
|
||||
);
|
||||
|
||||
String expectedQuery = "MATCH (startNode)<-[rel]-(:`Entity2`) WHERE id(startNode) = $fromId DELETE rel";
|
||||
Assert.assertEquals(expectedQuery, Renderer.getDefaultRenderer().render(statement));
|
||||
}
|
||||
|
||||
@Node
|
||||
private static class Entity1 {
|
||||
|
||||
@Id private Long id;
|
||||
|
||||
private String name;
|
||||
|
||||
private Map<String, Entity1> dynamicRelationships;
|
||||
}
|
||||
|
||||
@Node({"Entity1", "MultipleLabel"})
|
||||
private static class MultipleLabelEntity1 {
|
||||
|
||||
@Id private Long id;
|
||||
|
||||
private String name;
|
||||
|
||||
private Map<String, MultipleLabelEntity1> dynamicRelationships;
|
||||
}
|
||||
|
||||
@Node
|
||||
private static class Entity2 {
|
||||
|
||||
@Id private Long id;
|
||||
|
||||
private String name;
|
||||
|
||||
private Map<String, Entity2> dynamicRelationships;
|
||||
}
|
||||
|
||||
@Node({"Entity2", "MultipleLabel"})
|
||||
private static class MultipleLabelEntity2 {
|
||||
|
||||
@Id private Long id;
|
||||
|
||||
private String name;
|
||||
|
||||
private Map<String, MultipleLabelEntity2> dynamicRelationships;
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user