Revert "JAVA-20167 Migrating spring-data-neo4j"

This reverts commit 2fd4c39a21.
This commit is contained in:
n 2023-06-15 20:37:30 +03:00
parent 17d635bd0d
commit a0bf12b9d4
12 changed files with 108 additions and 295 deletions

View File

@ -40,6 +40,8 @@
<module>java-jpa</module> <!-- long running -->
<module>java-jpa-2</module>
<module>java-jpa-3</module>
<!-- enable it when persistence-modules is migrated to JDK9+ -->
<!-- <module>java-mongodb</module>--> <!-- long running -->
<module>java-mongodb-2</module> <!-- long running -->
<module>java-mongodb-3</module> <!-- long running -->
<module>java-mongodb-queries</module> <!-- long running -->
@ -88,10 +90,10 @@
<module>spring-data-jpa-repo-2</module>
<module>spring-data-jdbc</module>
<module>spring-data-keyvalue</module>
<module>spring-data-mongodb</module>
<!-- <module>spring-data-mongodb</module> FAILED -->
<module>spring-data-mongodb-2</module>
<module>spring-data-mongodb-reactive</module>
<module>spring-data-neo4j</module>
<!-- <module>spring-data-neo4j</module> FAILED -->
<module>spring-data-redis</module>
<!-- Moved to JDK9+ profiles-->
<!-- <module>spring-data-rest</module>-->

View File

@ -27,11 +27,6 @@
<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j-ogm-embedded-driver</artifactId>
<version>${neo4j-ogm-embedded-driver.version}</version>
</dependency>
<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j-ogm-bolt-driver</artifactId>
<version>${neo4j-ogm.version}</version>
</dependency>
<dependency>
@ -39,12 +34,6 @@
<artifactId>neo4j-java-driver</artifactId>
<version>${neo4j-java-driver.version}</version>
</dependency>
<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j-jdbc-driver</artifactId>
<version>${neo4j-jdbc.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-neo4j</artifactId>
@ -80,43 +69,33 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j-ogm-test</artifactId>
<version>${neo4j-ogm.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.neo4j.test</groupId>
<artifactId>neo4j-harness</artifactId>
<version>${neo4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${spring-test.version}</version>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>neo4j</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</exclusion>
<exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<properties>
<neo4j-java-driver.version>5.6.0</neo4j-java-driver.version>
<neo4j.version>5.8.0</neo4j.version>
<spring-data-neo4j.version>7.0.3</spring-data-neo4j.version>
<jackson-jsog.version>1.1.2</jackson-jsog.version>
<spring-boot.version>3.1.0</spring-boot.version>
<spring-test.version>6.0.8</spring-test.version>
<neo4j-ogm.version>4.0.4</neo4j-ogm.version>
<neo4j-jdbc.version>4.0.9</neo4j-jdbc.version>
<neo4j-ogm-embedded-driver.version>3.2.39</neo4j-ogm-embedded-driver.version>
<neo4j-java-driver.version>1.6.2</neo4j-java-driver.version>
<neo4j.version>3.4.6</neo4j.version>
<spring-data-neo4j.version>5.0.1.RELEASE</spring-data-neo4j.version>
<jackson-jsog.version>1.1</jackson-jsog.version>
<spring-boot.version>2.0.1.RELEASE</spring-boot.version>
<spring-test.version>5.0.1.RELEASE</spring-test.version>
<neo4j-ogm.version>3.1.2</neo4j-ogm.version>
</properties>
</project>

View File

@ -1,16 +1,13 @@
package com.baeldung.spring.data.neo4j.config;
import org.neo4j.driver.Driver;
import org.neo4j.ogm.config.Configuration.Builder;
import org.neo4j.ogm.session.SessionFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;
import org.springframework.data.neo4j.core.DatabaseSelectionProvider;
import org.springframework.data.neo4j.core.UserSelectionProvider;
import org.springframework.data.neo4j.core.transaction.Neo4jTransactionManager;
import org.springframework.data.neo4j.repository.config.EnableNeo4jRepositories;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.data.neo4j.transaction.Neo4jTransactionManager;
import org.springframework.transaction.annotation.EnableTransactionManagement;
@Configuration
@ -22,23 +19,18 @@ public class MovieDatabaseNeo4jTestConfiguration {
@Bean
public org.neo4j.ogm.config.Configuration getConfiguration() {
return new org.neo4j.ogm.config.Configuration.Builder().build();
org.neo4j.ogm.config.Configuration config = new Builder().build();
return config;
}
@Bean
public SessionFactory getSessionFactory() {
return new SessionFactory(getConfiguration(), "com.baeldung.spring.data.neo4j.domain");
}
@Bean
public PlatformTransactionManager transactionManager(Driver driver,
DatabaseSelectionProvider databaseSelectionProvider, UserSelectionProvider userSelectionProvider) {
return Neo4jTransactionManager
.with(driver)
.withDatabaseSelectionProvider(databaseSelectionProvider)
.withUserSelectionProvider(userSelectionProvider)
.build();
public Neo4jTransactionManager transactionManager() {
return new Neo4jTransactionManager(getSessionFactory());
}
}

View File

@ -1,7 +1,5 @@
package com.baeldung.spring.data.neo4j.domain;
import static org.neo4j.ogm.annotation.Relationship.Direction.INCOMING;
import org.neo4j.ogm.annotation.GeneratedValue;
import org.neo4j.ogm.annotation.Id;
import org.neo4j.ogm.annotation.NodeEntity;
@ -14,7 +12,7 @@ public class Car {
private String make;
@Relationship(direction = INCOMING)
@Relationship(direction = "INCOMING")
private Company company;
public Car(String make, String model) {

View File

@ -1,7 +1,5 @@
package com.baeldung.spring.data.neo4j.domain;
import static org.neo4j.ogm.annotation.Relationship.Direction.INCOMING;
import com.fasterxml.jackson.annotation.JsonIdentityInfo;
import com.voodoodyne.jackson.jsog.JSOGGenerator;
@ -14,6 +12,7 @@ import java.util.Collection;
import java.util.List;
@JsonIdentityInfo(generator = JSOGGenerator.class)
@NodeEntity
public class Movie {
@Id @GeneratedValue
@ -24,7 +23,7 @@ public class Movie {
private int released;
private String tagline;
@Relationship(type = "ACTED_IN", direction = INCOMING)
@Relationship(type = "ACTED_IN", direction = Relationship.INCOMING)
private List<Role> roles;
public Movie() {

View File

@ -1,8 +1,8 @@
package com.baeldung.spring.data.neo4j.repository;
import com.baeldung.spring.data.neo4j.domain.Movie;
import org.springframework.data.neo4j.annotation.Query;
import org.springframework.data.neo4j.repository.Neo4jRepository;
import org.springframework.data.neo4j.repository.query.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
@ -13,7 +13,7 @@ import java.util.Map;
@Repository
public interface MovieRepository extends Neo4jRepository<Movie, Long> {
Movie findByTitle(String title);
Movie findByTitle(@Param("title") String title);
@Query("MATCH (m:Movie) WHERE m.title =~ ('(?i).*'+{title}+'.*') RETURN m")
Collection<Movie> findByTitleContaining(@Param("title") String title);

View File

@ -1,16 +1,19 @@
package com.baeldung;
import org.junit.jupiter.api.Test;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import com.baeldung.spring.data.neo4j.config.MovieDatabaseNeo4jTestConfiguration;
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(classes = MovieDatabaseNeo4jTestConfiguration.class)
@ActiveProfiles(profiles = "test")
class SpringContextTest {
public class SpringContextTest {
@Test
void whenSpringContextIsBootstrapped_thenNoExceptions() {
public void whenSpringContextIsBootstrapped_thenNoExceptions() {
}
}

View File

@ -1,132 +0,0 @@
package com.baeldung;
import static org.neo4j.ogm.drivers.bolt.driver.BoltDriver.CONFIG_PARAMETER_BOLT_LOGGING;
import java.util.Locale;
import java.util.Optional;
import org.neo4j.driver.AccessMode;
import org.neo4j.driver.AuthTokens;
import org.neo4j.driver.GraphDatabase;
import org.neo4j.driver.Logging;
import org.neo4j.driver.Session;
import org.neo4j.driver.SessionConfig;
import org.neo4j.ogm.config.Configuration;
import org.neo4j.ogm.driver.Driver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.Neo4jContainer;
import org.testcontainers.utility.TestcontainersConfiguration;
/**
* Reference: https://github.com/neo4j/neo4j-ogm/blob/master/neo4j-ogm-tests/neo4j-ogm-integration-tests/src/test/java/org/neo4j/ogm/testutil/TestContainersTestBase.java
*/
public class TestContainersTestBase {
public static final Logger LOGGER = LoggerFactory.getLogger(TestContainersTestBase.class);
public static final Driver driver;
public static final String version;
public static final String DEFAULT_IMAGE = "neo4j:5";
public static final String SYS_PROPERTY_ACCEPT_AND_USE_COMMERCIAL_EDITION = "NEO4J_OGM_NEO4J_ACCEPT_AND_USE_COMMERCIAL_EDITION";
public static final String SYS_PROPERTY_IMAGE_NAME = "NEO4J_OGM_NEO4J_IMAGE_NAME";
public static final String SYS_PROPERTY_NEO4J_URL = "NEO4J_OGM_NEO4J_URL";
public static final String SYS_PROPERTY_NEO4J_PASSWORD = "NEO4J_OGM_NEO4J_PASSWORD";
public static final String DEFAULT_PASSWORD = "verysecret";
public static Neo4jContainer neo4jServer;
public static Configuration.Builder baseConfigurationBuilder;
public static final String NEO4J_URL = Optional.ofNullable(System.getenv(SYS_PROPERTY_NEO4J_URL)).orElse("");
public static final String NEO4J_PASSWORD = Optional.ofNullable(System.getenv(SYS_PROPERTY_NEO4J_PASSWORD)).orElse("").trim();
static {
boolean acceptAndUseCommercialEdition = hasAcceptedAndWantsToUseCommercialEdition();
if (!(NEO4J_URL.isEmpty() || NEO4J_PASSWORD.isEmpty())) {
LOGGER.info("Using Neo4j instance at {}.", NEO4J_URL);
driver = new org.neo4j.ogm.drivers.bolt.driver.BoltDriver();
baseConfigurationBuilder = new Configuration.Builder()
.uri(NEO4J_URL)
.verifyConnection(true)
.withCustomProperty(CONFIG_PARAMETER_BOLT_LOGGING, Logging.slf4j())
.credentials("neo4j", NEO4J_PASSWORD);
driver.configure(baseConfigurationBuilder.build());
version = extractVersionFromBolt();
} else {
LOGGER.info("Using Neo4j test container.");
String imageName = Optional.ofNullable(System.getenv(SYS_PROPERTY_IMAGE_NAME))
.orElse(DEFAULT_IMAGE + (acceptAndUseCommercialEdition ? "-enterprise" : ""));
version = extractVersionFromDockerImage(imageName);
boolean containerReuseSupported = TestcontainersConfiguration
.getInstance().environmentSupportsReuse();
neo4jServer = new Neo4jContainer<>(imageName)
.withReuse(containerReuseSupported);
if (acceptAndUseCommercialEdition) {
neo4jServer.withEnv("NEO4J_ACCEPT_LICENSE_AGREEMENT", "yes");
}
neo4jServer.withAdminPassword(DEFAULT_PASSWORD).start();
driver = new org.neo4j.ogm.drivers.bolt.driver.BoltDriver();
baseConfigurationBuilder = new Configuration.Builder()
.uri(neo4jServer.getBoltUrl())
.credentials("neo4j", DEFAULT_PASSWORD)
.verifyConnection(true)
.withCustomProperty(CONFIG_PARAMETER_BOLT_LOGGING, Logging.slf4j());
driver.configure(baseConfigurationBuilder.build());
Runtime.getRuntime().addShutdownHook(new Thread(neo4jServer::stop));
}
}
public static org.neo4j.driver.Driver getNewBoltConnection() {
if (neo4jServer != null) {
return GraphDatabase.driver(neo4jServer.getBoltUrl(), AuthTokens.basic("neo4j", DEFAULT_PASSWORD));
} else {
return GraphDatabase.driver(NEO4J_URL, AuthTokens.basic("neo4j", NEO4J_PASSWORD));
}
}
public static boolean hasAcceptedAndWantsToUseCommercialEdition() {
return Optional.ofNullable(
System.getenv(TestContainersTestBase.SYS_PROPERTY_ACCEPT_AND_USE_COMMERCIAL_EDITION))
.orElse("no").toLowerCase(Locale.ENGLISH).equals("yes");
}
public static Driver getDriver() {
return driver;
}
private static String extractVersionFromDockerImage(String imageName) {
return imageName.replace("neo4j:", "").replace("neo4j/neo4j-experimental:", "").replace("-enterprise", "");
}
private static String extractVersionFromBolt() {
org.neo4j.driver.Driver driver = getDriver().unwrap(org.neo4j.driver.Driver.class);
String version;
SessionConfig sessionConfig = SessionConfig.builder().withDefaultAccessMode(AccessMode.READ).build();
try (Session session = driver.session(sessionConfig)) {
version = (String) session.run("CALL dbms.components() YIELD versions").single().get("versions").asList().get(0);
}
return version.toLowerCase(Locale.ENGLISH);
}
}

View File

@ -1,59 +1,45 @@
package com.baeldung.neo4j;
import static com.baeldung.TestContainersTestBase.DEFAULT_PASSWORD;
import static com.baeldung.TestContainersTestBase.getNewBoltConnection;
import static com.baeldung.TestContainersTestBase.neo4jServer;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.ResultSet;
import java.sql.Statement;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.neo4j.driver.Driver;
import org.neo4j.driver.Result;
import org.neo4j.driver.Session;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
import org.neo4j.driver.v1.AuthTokens;
import org.neo4j.driver.v1.Driver;
import org.neo4j.driver.v1.GraphDatabase;
import org.neo4j.driver.v1.Session;
import org.neo4j.driver.v1.StatementResult;
class Neo4JServerLiveTest {
private static Session session;
private static Driver driver;
@BeforeAll
public static void setup() {
driver = getNewBoltConnection();
}
@AfterAll
public static void tearDown() {
driver.close();
}
@Ignore
public class Neo4JServerLiveTest {
@Test
void standAloneDriver() {
session = driver.session();
public void standAloneDriver() {
Driver driver = GraphDatabase.driver("bolt://localhost:7687", AuthTokens.basic("neo4j", "12345"));
Session session = driver.session();
session.run("CREATE (baeldung:Company {name:\"Baeldung\"}) " +
"-[:owns]-> (tesla:Car {make: 'tesla', model: 'modelX'})" +
"RETURN baeldung, tesla");
Result result = session.run("MATCH (company:Company)-[:owns]-> (car:Car)" +
StatementResult result = session.run("MATCH (company:Company)-[:owns]-> (car:Car)" +
"WHERE car.make='tesla' and car.model='modelX'" +
"RETURN company.name");
assertTrue(result.hasNext());
assertEquals("Baeldung", result.next().get("company.name").asString());
Assert.assertTrue(result.hasNext());
Assert.assertEquals(result.next().get("company.name").asString(), "Baeldung");
session.close();
driver.close();
}
@Test
void standAloneJdbc() throws Exception {
String uri = "jdbc:neo4j:" + neo4jServer.getBoltUrl() + "/?user=neo4j,password=" + DEFAULT_PASSWORD + ",scheme=basic";
Connection con = DriverManager.getConnection(uri);
public void standAloneJdbc() throws Exception {
Connection con = DriverManager.getConnection("jdbc:neo4j:bolt://localhost/?user=neo4j,password=12345,scheme=basic");
// Querying
try (Statement stmt = con.createStatement()) {
@ -66,7 +52,7 @@ class Neo4JServerLiveTest {
"RETURN company.name");
while (rs.next()) {
assertEquals("Baeldung", rs.getString("company.name"));
Assert.assertEquals(rs.getString("company.name"), "Baeldung");
}
}
con.close();

View File

@ -1,10 +1,7 @@
package com.baeldung.neo4j;
import static org.neo4j.configuration.GraphDatabaseSettings.DEFAULT_DATABASE_NAME;
import java.io.File;
import java.time.Duration;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
@ -13,107 +10,101 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.neo4j.configuration.GraphDatabaseSettings;
import org.neo4j.dbms.api.DatabaseManagementService;
import org.neo4j.dbms.api.DatabaseManagementServiceBuilder;
import org.neo4j.graphdb.GraphDatabaseService;
import org.neo4j.graphdb.Label;
import org.neo4j.graphdb.Node;
import org.neo4j.graphdb.NotFoundException;
import org.neo4j.graphdb.RelationshipType;
import org.neo4j.graphdb.Result;
import org.neo4j.graphdb.Transaction;
import org.neo4j.graphdb.factory.GraphDatabaseFactory;
public class Neo4jLiveTest {
private static GraphDatabaseService graphDb;
private static Transaction transaction;
private static DatabaseManagementService managementService;
@Before
public void setUp() {
managementService = new DatabaseManagementServiceBuilder(new File("data/cars").toPath())
.setConfig( GraphDatabaseSettings.transaction_timeout, Duration.ofSeconds( 60 ) )
.setConfig( GraphDatabaseSettings.preallocate_logical_logs, false ).build();
graphDb = managementService.database( DEFAULT_DATABASE_NAME );
GraphDatabaseFactory graphDbFactory = new GraphDatabaseFactory();
graphDb = graphDbFactory.newEmbeddedDatabase(new File("data/cars"));
}
@After
public void tearDown() {
managementService.shutdown();
graphDb.shutdown();
}
@Test
public void testPersonCar() {
transaction = graphDb.beginTx();
Node car = transaction.createNode(Label.label("Car"));
graphDb.beginTx();
Node car = graphDb.createNode(Label.label("Car"));
car.setProperty("make", "tesla");
car.setProperty("model", "model3");
Node owner = transaction.createNode(Label.label("Person"));
Node owner = graphDb.createNode(Label.label("Person"));
owner.setProperty("firstName", "baeldung");
owner.setProperty("lastName", "baeldung");
owner.createRelationshipTo(car, RelationshipType.withName("owner"));
Result result = transaction.execute("MATCH (c:Car) <-[owner]- (p:Person) " +
Result result = graphDb.execute("MATCH (c:Car) <-[owner]- (p:Person) " +
"WHERE c.make = 'tesla'" +
"RETURN p.firstName, p.lastName");
Map<String, Object> firstResult = result.next();
Assert.assertEquals("baeldung", firstResult.get("p.firstName"));
}
@Test
public void testCreateNode() {
transaction = graphDb.beginTx();
Result result = transaction.execute("CREATE (baeldung:Company {name:\"Baeldung\"})" +
graphDb.beginTx();
Result result = graphDb.execute("CREATE (baeldung:Company {name:\"Baeldung\"})" +
"RETURN baeldung");
Map<String, Object> firstResult = result.next();
Node firstNode = (Node) firstResult.get("baeldung");
Assert.assertEquals(firstNode.getProperty("name"), "Baeldung");
}
@Test
public void testCreateNodeAndLink() {
transaction = graphDb.beginTx();
Result result = transaction.execute("CREATE (baeldung:Company {name:\"Baeldung\"}) " +
graphDb.beginTx();
Result result = graphDb.execute("CREATE (baeldung:Company {name:\"Baeldung\"}) " +
"-[:owns]-> (tesla:Car {make: 'tesla', model: 'modelX'})" +
"RETURN baeldung, tesla");
Map<String, Object> firstResult = result.next();
Assert.assertTrue(firstResult.containsKey("baeldung"));
Assert.assertTrue(firstResult.containsKey("tesla"));
}
@Test
public void testFindAndReturn() {
transaction = graphDb.beginTx();
transaction.execute("CREATE (baeldung:Company {name:\"Baeldung\"}) " +
graphDb.beginTx();
graphDb.execute("CREATE (baeldung:Company {name:\"Baeldung\"}) " +
"-[:owns]-> (tesla:Car {make: 'tesla', model: 'modelX'})" +
"RETURN baeldung, tesla");
Result result = transaction.execute("MATCH (company:Company)-[:owns]-> (car:Car)" +
Result result = graphDb.execute("MATCH (company:Company)-[:owns]-> (car:Car)" +
"WHERE car.make='tesla' and car.model='modelX'" +
"RETURN company.name");
Map<String, Object> firstResult = result.next();
Assert.assertEquals(firstResult.get("company.name"), "Baeldung");
}
@Test
public void testUpdate() {
transaction = graphDb.beginTx();
transaction.execute("CREATE (baeldung:Company {name:\"Baeldung\"}) " +
graphDb.beginTx();
graphDb.execute("CREATE (baeldung:Company {name:\"Baeldung\"}) " +
"-[:owns]-> (tesla:Car {make: 'tesla', model: 'modelX'})" +
"RETURN baeldung, tesla");
Result result = transaction.execute("MATCH (car:Car)" +
Result result = graphDb.execute("MATCH (car:Car)" +
"WHERE car.make='tesla'" +
" SET car.milage=120" +
" SET car :Car:Electro" +
@ -136,16 +127,17 @@ public class Neo4jLiveTest {
@Test
public void testDelete() {
transaction = graphDb.beginTx();
transaction.execute("CREATE (baeldung:Company {name:\"Baeldung\"}) " +
graphDb.beginTx();
graphDb.execute("CREATE (baeldung:Company {name:\"Baeldung\"}) " +
"-[:owns]-> (tesla:Car {make: 'tesla', model: 'modelX'})" +
"RETURN baeldung, tesla");
transaction.execute("MATCH (company:Company)" +
graphDb.execute("MATCH (company:Company)" +
" WHERE company.name='Baeldung'" +
" DELETE company");
Result result = transaction.execute("MATCH (company:Company)" +
Result result = graphDb.execute("MATCH (company:Company)" +
" WHERE company.name='Baeldung'" +
" RETURN company");
@ -154,13 +146,14 @@ public class Neo4jLiveTest {
@Test
public void testBindings() {
transaction = graphDb.beginTx();
graphDb.beginTx();
Map<String, Object> params = new HashMap<>();
params.put("name", "baeldung");
params.put("make", "tesla");
params.put("model", "modelS");
Result result = transaction.execute("CREATE (baeldung:Company {name:$name}) " +
Result result = graphDb.execute("CREATE (baeldung:Company {name:$name}) " +
"-[:owns]-> (tesla:Car {make: $make, model: $model})" +
"RETURN baeldung, tesla", params);

View File

@ -1,13 +1,11 @@
package com.baeldung.neo4j;
import static com.baeldung.TestContainersTestBase.getDriver;
import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.HashMap;
import java.util.Map;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.Assert;
import org.junit.Test;
import org.neo4j.ogm.config.Configuration;
import org.neo4j.ogm.model.Result;
import org.neo4j.ogm.session.Session;
import org.neo4j.ogm.session.SessionFactory;
@ -17,18 +15,13 @@ import com.baeldung.spring.data.neo4j.domain.Company;
public class Neo4jOgmLiveTest {
private static SessionFactory sessionFactory;
private static Session session;
@BeforeAll
public static void oneTimeSetUp() {
sessionFactory = new SessionFactory(getDriver(), "com.baeldung.spring.data.neo4j.domain");
session = sessionFactory.openSession();
session.purgeDatabase();
}
@Test
void testOgm() {
public void testOgm() {
Configuration conf = new Configuration.Builder().build();
SessionFactory factory = new SessionFactory(conf, "com.baeldung.spring.data.neo4j.domain");
Session session = factory.openSession();
Car tesla = new Car("tesla", "modelS");
Company baeldung = new Company("baeldung");
@ -36,7 +29,7 @@ public class Neo4jOgmLiveTest {
session.save(baeldung);
assertEquals(1, session.countEntitiesOfType(Company.class));
Assert.assertEquals(1, session.countEntitiesOfType(Company.class));
Map<String, String> params = new HashMap<>();
params.put("make", "tesla");
@ -46,9 +39,9 @@ public class Neo4jOgmLiveTest {
Map<String, Object> firstResult = result.iterator().next();
assertEquals(1, firstResult.size());
Assert.assertEquals(firstResult.size(), 1);
Company actual = (Company) firstResult.get("company");
assertEquals(actual.getName(), baeldung.getName());
Assert.assertEquals(actual.getName(), baeldung.getName());
}
}

View File

@ -75,7 +75,7 @@ public class MovieRepositoryIntegrationTest {
public void testCount() {
System.out.println("count");
long movieCount = movieRepository.count();
assertNotNull(movieCount);
assertEquals(1, movieCount);
}
@ -83,7 +83,7 @@ public class MovieRepositoryIntegrationTest {
@DirtiesContext
public void testFindAll() {
System.out.println("findAll");
Collection<Movie> result = movieRepository.findAll();
Collection<Movie> result = (Collection<Movie>) movieRepository.findAll();
assertNotNull(result);
assertEquals(1, result.size());
}
@ -125,7 +125,7 @@ public class MovieRepositoryIntegrationTest {
public void testDeleteAll() {
System.out.println("deleteAll");
movieRepository.deleteAll();
Collection<Movie> result = movieRepository.findAll();
Collection<Movie> result = (Collection<Movie>) movieRepository.findAll();
assertEquals(0, result.size());
}
}