diff --git a/pom.xml b/pom.xml index 64db97f38..511e9ff85 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.springframework.data.build spring-data-parent - 3.1.1-SNAPSHOT + 3.1.0 org.springframework.data @@ -115,7 +115,7 @@ ${skipTests} ../../../../spring-data-commons/src/main/asciidoc - 3.1.1-SNAPSHOT + 3.1.0 diff --git a/src/main/java/org/springframework/data/neo4j/core/Neo4jTemplate.java b/src/main/java/org/springframework/data/neo4j/core/Neo4jTemplate.java index 77822c1f3..fe4888cf6 100644 --- a/src/main/java/org/springframework/data/neo4j/core/Neo4jTemplate.java +++ b/src/main/java/org/springframework/data/neo4j/core/Neo4jTemplate.java @@ -814,7 +814,7 @@ public final class Neo4jTemplate implements relatedInternalId = stateMachine.getObjectId(relatedValueToStore); } else { savedEntity = saveRelatedNode(newRelatedObject, targetEntity, includeProperty, currentPropertyPath); - relatedInternalId = IdentitySupport.getElementId(savedEntity); + relatedInternalId = TemplateSupport.rendererCanUseElementIdIfPresent(renderer) ? savedEntity.elementId() : Long.toString(savedEntity.id()); stateMachine.markEntityAsProcessed(relatedValueToStore, relatedInternalId); if (relatedValueToStore instanceof MappingSupport.RelationshipPropertiesWithEntityHolder) { Object entity = ((MappingSupport.RelationshipPropertiesWithEntityHolder) relatedValueToStore).getRelatedEntity(); diff --git a/src/main/java/org/springframework/data/neo4j/core/ReactiveNeo4jTemplate.java b/src/main/java/org/springframework/data/neo4j/core/ReactiveNeo4jTemplate.java index 12cf223b9..db7b48f8a 100644 --- a/src/main/java/org/springframework/data/neo4j/core/ReactiveNeo4jTemplate.java +++ b/src/main/java/org/springframework/data/neo4j/core/ReactiveNeo4jTemplate.java @@ -952,7 +952,7 @@ public final class ReactiveNeo4jTemplate implements queryOrSave = Mono.just(Tuples.of(relatedInternalId, new AtomicReference<>())); } else { queryOrSave = saveRelatedNode(newRelatedObject, targetEntity, includeProperty, currentPropertyPath) - .map(entity -> Tuples.of(new AtomicReference<>(IdentitySupport.getElementId(entity)), new AtomicReference<>(entity))) + .map(entity -> Tuples.of(new AtomicReference<>(TemplateSupport.rendererCanUseElementIdIfPresent(renderer) ? entity.elementId() : Long.toString(entity.id())), new AtomicReference<>(entity))) .doOnNext(t -> { var relatedInternalId = t.getT1().get(); stateMachine.markEntityAsProcessed(relatedValueToStore, relatedInternalId); diff --git a/src/main/java/org/springframework/data/neo4j/core/TemplateSupport.java b/src/main/java/org/springframework/data/neo4j/core/TemplateSupport.java index e0679e444..032093e4e 100644 --- a/src/main/java/org/springframework/data/neo4j/core/TemplateSupport.java +++ b/src/main/java/org/springframework/data/neo4j/core/TemplateSupport.java @@ -39,6 +39,7 @@ import org.neo4j.cypherdsl.core.Functions; import org.neo4j.cypherdsl.core.Node; import org.neo4j.cypherdsl.core.Relationship; import org.neo4j.cypherdsl.core.Statement; +import org.neo4j.cypherdsl.core.renderer.Renderer; import org.neo4j.driver.types.Entity; import org.neo4j.driver.types.MapAccessor; import org.neo4j.driver.types.TypeSystem; @@ -410,6 +411,15 @@ public final class TemplateSupport { return Objects.requireNonNull(relatedInternalId); } + /** + * Checks if the renderer is configured in such a way that it will use element id or apply toString(id(n)) workaround. + * @return {@literal true} if renderer will use elementId + */ + static boolean rendererCanUseElementIdIfPresent(Renderer renderer) { + return renderer.render(Cypher.returning(Functions.elementId(Cypher.anyNode("n"))).build()) + .equals("RETURN elementId(n)"); + } + private TemplateSupport() { } } diff --git a/src/test/java/org/springframework/data/neo4j/integration/issues/gh2728/AbstractReactiveTestBase.java b/src/test/java/org/springframework/data/neo4j/integration/issues/gh2728/AbstractReactiveTestBase.java new file mode 100644 index 000000000..1872b38d1 --- /dev/null +++ b/src/test/java/org/springframework/data/neo4j/integration/issues/gh2728/AbstractReactiveTestBase.java @@ -0,0 +1,103 @@ +/* + * Copyright 2011-2023 the original author or authors. + * + * 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.springframework.data.neo4j.integration.issues.gh2728; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.neo4j.driver.Driver; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.data.neo4j.core.ReactiveDatabaseSelectionProvider; +import org.springframework.data.neo4j.core.transaction.Neo4jBookmarkManager; +import org.springframework.data.neo4j.core.transaction.ReactiveNeo4jTransactionManager; +import org.springframework.data.neo4j.repository.ReactiveNeo4jRepository; +import org.springframework.data.neo4j.test.BookmarkCapture; +import org.springframework.data.neo4j.test.Neo4jExtension; +import org.springframework.data.neo4j.test.Neo4jIntegrationTest; +import org.springframework.data.neo4j.test.Neo4jReactiveTestConfiguration; +import org.springframework.transaction.ReactiveTransactionManager; + +/** + * @author Michael J. Simons + */ +@Neo4jIntegrationTest +public abstract class AbstractReactiveTestBase { + + protected static Neo4jExtension.Neo4jConnectionSupport neo4jConnectionSupport; + + @Autowired + private TestEntityWithGeneratedDeprecatedId1Repository generatedDeprecatedIdRepository; + + @Autowired + private TestEntityWithAssignedId1Repository assignedIdRepository; + + @Test + public void testGeneratedDeprecatedIds() { + TestEntityWithGeneratedDeprecatedId2 t2 = new TestEntityWithGeneratedDeprecatedId2(null, "v2"); + TestEntityWithGeneratedDeprecatedId1 t1 = new TestEntityWithGeneratedDeprecatedId1(null, "v1", t2); + + TestEntityWithGeneratedDeprecatedId1 result = generatedDeprecatedIdRepository.save(t1).block(); + + TestEntityWithGeneratedDeprecatedId1 freshRetrieved = generatedDeprecatedIdRepository.findById(result.getId()).block(); + + Assertions.assertNotNull(result.getRelatedEntity()); + Assertions.assertNotNull(freshRetrieved.getRelatedEntity()); + } + + /** + * This is a test to ensure if the fix for the failing test above will continue to work for + * assigned ids. For broader test cases please return false for isCypher5Compatible in (Reactive)RepositoryIT + */ + @Test + public void testAssignedIds() { + TestEntityWithAssignedId2 t2 = new TestEntityWithAssignedId2("second", "v2"); + TestEntityWithAssignedId1 t1 = new TestEntityWithAssignedId1("first", "v1", t2); + + TestEntityWithAssignedId1 result = assignedIdRepository.save(t1).block(); + + TestEntityWithAssignedId1 freshRetrieved = assignedIdRepository.findById(result.getAssignedId()).block(); + + Assertions.assertNotNull(result.getRelatedEntity()); + Assertions.assertNotNull(freshRetrieved.getRelatedEntity()); + } + + interface TestEntityWithGeneratedDeprecatedId1Repository extends ReactiveNeo4jRepository { + } + + interface TestEntityWithAssignedId1Repository extends ReactiveNeo4jRepository { + } + + abstract static class Config extends Neo4jReactiveTestConfiguration { + + @Bean + public Driver driver() { + + return neo4jConnectionSupport.getDriver(); + } + + @Bean + public BookmarkCapture bookmarkCapture() { + return new BookmarkCapture(); + } + + @Override + public ReactiveTransactionManager reactiveTransactionManager(Driver driver, ReactiveDatabaseSelectionProvider databaseSelectionProvider) { + + BookmarkCapture bookmarkCapture = bookmarkCapture(); + return new ReactiveNeo4jTransactionManager(driver, databaseSelectionProvider, Neo4jBookmarkManager.create(bookmarkCapture)); + } + } +} diff --git a/src/test/java/org/springframework/data/neo4j/integration/issues/gh2728/AbstractTestBase.java b/src/test/java/org/springframework/data/neo4j/integration/issues/gh2728/AbstractTestBase.java new file mode 100644 index 000000000..3f953fbd9 --- /dev/null +++ b/src/test/java/org/springframework/data/neo4j/integration/issues/gh2728/AbstractTestBase.java @@ -0,0 +1,104 @@ +/* + * Copyright 2011-2023 the original author or authors. + * + * 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.springframework.data.neo4j.integration.issues.gh2728; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.neo4j.driver.Driver; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.data.neo4j.core.DatabaseSelectionProvider; +import org.springframework.data.neo4j.core.transaction.Neo4jBookmarkManager; +import org.springframework.data.neo4j.core.transaction.Neo4jTransactionManager; +import org.springframework.data.neo4j.repository.Neo4jRepository; +import org.springframework.data.neo4j.test.BookmarkCapture; +import org.springframework.data.neo4j.test.Neo4jExtension; +import org.springframework.data.neo4j.test.Neo4jImperativeTestConfiguration; +import org.springframework.data.neo4j.test.Neo4jIntegrationTest; +import org.springframework.transaction.PlatformTransactionManager; + +/** + * @author Gerrit Meier + */ +@Neo4jIntegrationTest +public abstract class AbstractTestBase { + + protected static Neo4jExtension.Neo4jConnectionSupport neo4jConnectionSupport; + + @Autowired + private TestEntityWithGeneratedDeprecatedId1Repository generatedDeprecatedIdRepository; + + @Autowired + private TestEntityWithAssignedId1Repository assignedIdRepository; + + @Test + public void testGeneratedDeprecatedIds() { + TestEntityWithGeneratedDeprecatedId2 t2 = new TestEntityWithGeneratedDeprecatedId2(null, "v2"); + TestEntityWithGeneratedDeprecatedId1 t1 = new TestEntityWithGeneratedDeprecatedId1(null, "v1", t2); + + TestEntityWithGeneratedDeprecatedId1 result = generatedDeprecatedIdRepository.save(t1); + + TestEntityWithGeneratedDeprecatedId1 freshRetrieved = generatedDeprecatedIdRepository.findById(result.getId()).get(); + + Assertions.assertNotNull(result.getRelatedEntity()); + Assertions.assertNotNull(freshRetrieved.getRelatedEntity()); + } + + /** + * This is a test to ensure if the fix for the failing test above will continue to work for + * assigned ids. For broader test cases please return false for isCypher5Compatible in (Reactive)RepositoryIT + */ + @Test + public void testAssignedIds() { + TestEntityWithAssignedId2 t2 = new TestEntityWithAssignedId2("second", "v2"); + TestEntityWithAssignedId1 t1 = new TestEntityWithAssignedId1("first", "v1", t2); + + TestEntityWithAssignedId1 result = assignedIdRepository.save(t1); + + TestEntityWithAssignedId1 freshRetrieved = assignedIdRepository.findById(result.getAssignedId()).get(); + + Assertions.assertNotNull(result.getRelatedEntity()); + Assertions.assertNotNull(freshRetrieved.getRelatedEntity()); + } + + interface TestEntityWithGeneratedDeprecatedId1Repository extends Neo4jRepository { + } + + interface TestEntityWithAssignedId1Repository extends Neo4jRepository { + } + + abstract static class Config extends Neo4jImperativeTestConfiguration { + + @Bean + public Driver driver() { + + return neo4jConnectionSupport.getDriver(); + } + + @Bean + public BookmarkCapture bookmarkCapture() { + return new BookmarkCapture(); + } + + @Override + public PlatformTransactionManager transactionManager(Driver driver, + DatabaseSelectionProvider databaseNameProvider) { + BookmarkCapture bookmarkCapture = bookmarkCapture(); + return new Neo4jTransactionManager(driver, databaseNameProvider, + Neo4jBookmarkManager.create(bookmarkCapture)); + } + } +} diff --git a/src/test/java/org/springframework/data/neo4j/integration/issues/gh2728/CorrectConfigIT.java b/src/test/java/org/springframework/data/neo4j/integration/issues/gh2728/CorrectConfigIT.java new file mode 100644 index 000000000..acfbef8d6 --- /dev/null +++ b/src/test/java/org/springframework/data/neo4j/integration/issues/gh2728/CorrectConfigIT.java @@ -0,0 +1,38 @@ +/* + * Copyright 2011-2023 the original author or authors. + * + * 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.springframework.data.neo4j.integration.issues.gh2728; + +import org.springframework.context.annotation.Configuration; +import org.springframework.data.neo4j.repository.config.EnableNeo4jRepositories; +import org.springframework.data.neo4j.test.Neo4jIntegrationTest; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +/** + * @author Michael J. Simons + */ +@Neo4jIntegrationTest +public class CorrectConfigIT extends AbstractTestBase { + + @Configuration + @EnableTransactionManagement + @EnableNeo4jRepositories(considerNestedRepositories = true) + static class Config extends AbstractTestBase.Config { + @Override + public boolean isCypher5Compatible() { + return AbstractTestBase.neo4jConnectionSupport.isCypher5SyntaxCompatible(); + } + } +} diff --git a/src/test/java/org/springframework/data/neo4j/integration/issues/gh2728/CorrectReactiveConfigIT.java b/src/test/java/org/springframework/data/neo4j/integration/issues/gh2728/CorrectReactiveConfigIT.java new file mode 100644 index 000000000..137211438 --- /dev/null +++ b/src/test/java/org/springframework/data/neo4j/integration/issues/gh2728/CorrectReactiveConfigIT.java @@ -0,0 +1,38 @@ +/* + * Copyright 2011-2023 the original author or authors. + * + * 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.springframework.data.neo4j.integration.issues.gh2728; + +import org.springframework.context.annotation.Configuration; +import org.springframework.data.neo4j.repository.config.EnableReactiveNeo4jRepositories; +import org.springframework.data.neo4j.test.Neo4jIntegrationTest; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +/** + * @author Michael J. Simons + */ +@Neo4jIntegrationTest +public class CorrectReactiveConfigIT extends AbstractReactiveTestBase { + + @Configuration + @EnableTransactionManagement + @EnableReactiveNeo4jRepositories(considerNestedRepositories = true) + static class Config extends AbstractReactiveTestBase.Config { + @Override + public boolean isCypher5Compatible() { + return AbstractReactiveTestBase.neo4jConnectionSupport.isCypher5SyntaxCompatible(); + } + } +} diff --git a/src/test/java/org/springframework/data/neo4j/integration/issues/gh2728/TestEntityWithAssignedId1.java b/src/test/java/org/springframework/data/neo4j/integration/issues/gh2728/TestEntityWithAssignedId1.java new file mode 100644 index 000000000..a5206118a --- /dev/null +++ b/src/test/java/org/springframework/data/neo4j/integration/issues/gh2728/TestEntityWithAssignedId1.java @@ -0,0 +1,50 @@ +/* + * Copyright 2011-2023 the original author or authors. + * + * 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.springframework.data.neo4j.integration.issues.gh2728; + +import org.springframework.data.neo4j.core.schema.Id; +import org.springframework.data.neo4j.core.schema.Node; +import org.springframework.data.neo4j.core.schema.Property; +import org.springframework.data.neo4j.core.schema.Relationship; + +/** + * @author Gerrit Meier + */ +@Node +public class TestEntityWithAssignedId1 { + + @Id + private String assignedId; + + @Property("value_one") + private String valueOne; + + @Relationship("related_to") + private TestEntityWithAssignedId2 relatedEntity; + + public TestEntityWithAssignedId1(String assignedId, String valueOne, TestEntityWithAssignedId2 relatedEntity) { + this.assignedId = assignedId; + this.valueOne = valueOne; + this.relatedEntity = relatedEntity; + } + public String getAssignedId() { + return assignedId; + } + + public TestEntityWithAssignedId2 getRelatedEntity() { + return relatedEntity; + } +} diff --git a/src/test/java/org/springframework/data/neo4j/integration/issues/gh2728/TestEntityWithAssignedId2.java b/src/test/java/org/springframework/data/neo4j/integration/issues/gh2728/TestEntityWithAssignedId2.java new file mode 100644 index 000000000..475d0405f --- /dev/null +++ b/src/test/java/org/springframework/data/neo4j/integration/issues/gh2728/TestEntityWithAssignedId2.java @@ -0,0 +1,38 @@ +/* + * Copyright 2011-2023 the original author or authors. + * + * 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.springframework.data.neo4j.integration.issues.gh2728; + +import org.springframework.data.neo4j.core.schema.Id; +import org.springframework.data.neo4j.core.schema.Node; +import org.springframework.data.neo4j.core.schema.Property; + +/** + * @author Gerrit Meier + */ +@Node +public class TestEntityWithAssignedId2 { + + @Id + private String assignedId; + + @Property("valueTwo") + private String valueTwo; + + public TestEntityWithAssignedId2(String assignedId, String valueTwo) { + this.assignedId = assignedId; + this.valueTwo = valueTwo; + } +} diff --git a/src/test/java/org/springframework/data/neo4j/integration/issues/gh2728/TestEntityWithGeneratedDeprecatedId1.java b/src/test/java/org/springframework/data/neo4j/integration/issues/gh2728/TestEntityWithGeneratedDeprecatedId1.java new file mode 100644 index 000000000..2a26529a6 --- /dev/null +++ b/src/test/java/org/springframework/data/neo4j/integration/issues/gh2728/TestEntityWithGeneratedDeprecatedId1.java @@ -0,0 +1,52 @@ +/* + * Copyright 2011-2023 the original author or authors. + * + * 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.springframework.data.neo4j.integration.issues.gh2728; + +import org.springframework.data.neo4j.core.schema.GeneratedValue; +import org.springframework.data.neo4j.core.schema.Id; +import org.springframework.data.neo4j.core.schema.Node; +import org.springframework.data.neo4j.core.schema.Property; +import org.springframework.data.neo4j.core.schema.Relationship; + +/** + * @author Gerrit Meier + */ +@Node +public class TestEntityWithGeneratedDeprecatedId1 { + + @Id + @GeneratedValue + private Long id; + + @Property("value_one") + private String valueOne; + + @Relationship("related_to") + private TestEntityWithGeneratedDeprecatedId2 relatedEntity; + + public TestEntityWithGeneratedDeprecatedId1(Long id, String valueOne, TestEntityWithGeneratedDeprecatedId2 relatedEntity) { + this.id = id; + this.valueOne = valueOne; + this.relatedEntity = relatedEntity; + } + public Long getId() { + return id; + } + + public TestEntityWithGeneratedDeprecatedId2 getRelatedEntity() { + return relatedEntity; + } +} diff --git a/src/test/java/org/springframework/data/neo4j/integration/issues/gh2728/TestEntityWithGeneratedDeprecatedId2.java b/src/test/java/org/springframework/data/neo4j/integration/issues/gh2728/TestEntityWithGeneratedDeprecatedId2.java new file mode 100644 index 000000000..f716ccbf9 --- /dev/null +++ b/src/test/java/org/springframework/data/neo4j/integration/issues/gh2728/TestEntityWithGeneratedDeprecatedId2.java @@ -0,0 +1,40 @@ +/* + * Copyright 2011-2023 the original author or authors. + * + * 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.springframework.data.neo4j.integration.issues.gh2728; + +import org.springframework.data.neo4j.core.schema.GeneratedValue; +import org.springframework.data.neo4j.core.schema.Id; +import org.springframework.data.neo4j.core.schema.Node; +import org.springframework.data.neo4j.core.schema.Property; + +/** + * @author Gerrit Meier + */ +@Node +public class TestEntityWithGeneratedDeprecatedId2 { + + @Id + @GeneratedValue + private Long id; + + @Property("valueTwo") + private String valueTwo; + + public TestEntityWithGeneratedDeprecatedId2(Long id, String valueTwo) { + this.id = id; + this.valueTwo = valueTwo; + } +} diff --git a/src/test/java/org/springframework/data/neo4j/integration/issues/gh2728/WrongConfigIT.java b/src/test/java/org/springframework/data/neo4j/integration/issues/gh2728/WrongConfigIT.java new file mode 100644 index 000000000..1aa60b71a --- /dev/null +++ b/src/test/java/org/springframework/data/neo4j/integration/issues/gh2728/WrongConfigIT.java @@ -0,0 +1,40 @@ +/* + * Copyright 2011-2023 the original author or authors. + * + * 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.springframework.data.neo4j.integration.issues.gh2728; + +import org.springframework.context.annotation.Configuration; +import org.springframework.data.neo4j.repository.config.EnableNeo4jRepositories; +import org.springframework.data.neo4j.test.Neo4jIntegrationTest; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +/** + * @author Michael J. Simons + */ +@Neo4jIntegrationTest +public class WrongConfigIT extends AbstractTestBase { + + @Configuration + @EnableTransactionManagement + @EnableNeo4jRepositories(considerNestedRepositories = true) + static class Config extends AbstractTestBase.Config { + @Override + public boolean isCypher5Compatible() { + // explicitly not compatible with Neo4j 5 although connected to one + // same as default Cypher-DSL configuration / dialect + return false; + } + } +} diff --git a/src/test/java/org/springframework/data/neo4j/integration/issues/gh2728/WrongReactiveConfigIT.java b/src/test/java/org/springframework/data/neo4j/integration/issues/gh2728/WrongReactiveConfigIT.java new file mode 100644 index 000000000..ca75c9468 --- /dev/null +++ b/src/test/java/org/springframework/data/neo4j/integration/issues/gh2728/WrongReactiveConfigIT.java @@ -0,0 +1,40 @@ +/* + * Copyright 2011-2023 the original author or authors. + * + * 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.springframework.data.neo4j.integration.issues.gh2728; + +import org.springframework.context.annotation.Configuration; +import org.springframework.data.neo4j.repository.config.EnableReactiveNeo4jRepositories; +import org.springframework.data.neo4j.test.Neo4jIntegrationTest; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +/** + * @author Michael J. Simons + */ +@Neo4jIntegrationTest +public class WrongReactiveConfigIT extends AbstractReactiveTestBase { + + @Configuration + @EnableTransactionManagement + @EnableReactiveNeo4jRepositories(considerNestedRepositories = true) + static class Config extends AbstractReactiveTestBase.Config { + @Override + public boolean isCypher5Compatible() { + // explicitly not compatible with Neo4j 5 although connected to one + // same as default Cypher-DSL configuration / dialect + return false; + } + } +}