Merge pull request #5070 from eugenp/update-neo4j

update neo4j

persistence-modules/spring-data-neo4j/pom.xml

@@ -37,18 +37,6 @@
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-neo4j</artifactId>
             <version>${spring-data-neo4j.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-neo4j</artifactId>
-            <version>${spring-data-neo4j.version}</version>
-            <type>test-jar</type>
         </dependency>
         <dependency>
             <groupId>com.voodoodyne.jackson.jsog</groupId>
@@ -86,6 +74,11 @@
             <version>${neo4j-ogm.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.neo4j</groupId>
+            <artifactId>neo4j-ogm-embedded-driver</artifactId>
+            <version>${neo4j-ogm.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.neo4j.test</groupId>
             <artifactId>neo4j-harness</artifactId>
@@ -96,23 +89,17 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
             <version>${spring-test.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
     </dependencies>
 
     <properties>
-        <neo4j-java-driver.version>1.1.1</neo4j-java-driver.version>
+        <neo4j-java-driver.version>1.6.2</neo4j-java-driver.version>
-        <neo4j.version>3.1.0</neo4j.version>
+        <neo4j.version>3.4.6</neo4j.version>
-        <spring-data-neo4j.version>4.1.6.RELEASE</spring-data-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>1.5.13.RELEASE</spring-boot.version>
+        <spring-boot.version>2.0.1.RELEASE</spring-boot.version>
-        <spring-test.version>4.3.17.RELEASE</spring-test.version>
+        <spring-test.version>5.0.1.RELEASE</spring-test.version>
-        <neo4j-ogm.version>2.1.1</neo4j-ogm.version>
+        <neo4j-ogm.version>3.1.2</neo4j-ogm.version>
     </properties>
 
 </project>

persistence-modules/spring-data-neo4j/src/main/java/com/baeldung/spring/data/neo4j/config/MovieDatabaseNeo4jConfiguration.java

@@ -1,5 +1,6 @@
 package com.baeldung.spring.data.neo4j.config;
 
+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;
@@ -8,15 +9,14 @@ import org.springframework.data.neo4j.repository.config.EnableNeo4jRepositories;
 
 @ComponentScan(basePackages = { "com.baeldung.spring.data.neo4j.services" })
 @Configuration
-@EnableNeo4jRepositories(basePackages = "com.baeldung.spring.data.neo4j.repostory")
+@EnableNeo4jRepositories(basePackages = "com.baeldung.spring.data.neo4j.repository")
 public class MovieDatabaseNeo4jConfiguration {
 
     public static final String URL = System.getenv("NEO4J_URL") != null ? System.getenv("NEO4J_URL") : "http://neo4j:movies@localhost:7474";
 
     @Bean
     public org.neo4j.ogm.config.Configuration getConfiguration() {
-        org.neo4j.ogm.config.Configuration config = new org.neo4j.ogm.config.Configuration();
+    	org.neo4j.ogm.config.Configuration config = new Builder().uri(URL).build();
-        config.driverConfiguration().setDriverClassName("org.neo4j.ogm.drivers.http.driver.HttpDriver").setURI(URL);
         return config;
     }
 

persistence-modules/spring-data-neo4j/src/main/java/com/baeldung/spring/data/neo4j/config/MovieDatabaseNeo4jTestConfiguration.java

@@ -1,26 +1,25 @@
 package com.baeldung.spring.data.neo4j.config;
 
+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.config.Neo4jConfiguration;
 import org.springframework.data.neo4j.repository.config.EnableNeo4jRepositories;
+import org.springframework.data.neo4j.transaction.Neo4jTransactionManager;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @Configuration
 @EnableTransactionManagement
 @ComponentScan(basePackages = { "com.baeldung.spring.data.neo4j.services" })
-@EnableNeo4jRepositories(basePackages = "com.baeldung.spring.data.neo4j.repostory")
+@EnableNeo4jRepositories(basePackages = "com.baeldung.spring.data.neo4j.repository")
 @Profile({ "embedded", "test" })
-public class MovieDatabaseNeo4jTestConfiguration extends Neo4jConfiguration {
+public class MovieDatabaseNeo4jTestConfiguration {
 
     @Bean
     public org.neo4j.ogm.config.Configuration getConfiguration() {
-        final org.neo4j.ogm.config.Configuration config = new org.neo4j.ogm.config.Configuration();
+    	org.neo4j.ogm.config.Configuration config = new Builder().build();
-        config.driverConfiguration()
-            .setDriverClassName("org.neo4j.ogm.drivers.embedded.driver.EmbeddedDriver");
         return config;
     }
 
@@ -29,4 +28,9 @@ public class MovieDatabaseNeo4jTestConfiguration extends Neo4jConfiguration {
         return new SessionFactory(getConfiguration(), "com.baeldung.spring.data.neo4j.domain");
     }
     
+    @Bean
+    public Neo4jTransactionManager transactionManager() {
+        return new Neo4jTransactionManager(getSessionFactory());
+    }
+
 }

persistence-modules/spring-data-neo4j/src/main/java/com/baeldung/spring/data/neo4j/domain/Car.java

@@ -1,12 +1,13 @@
 package com.baeldung.spring.data.neo4j.domain;
 
-import org.neo4j.ogm.annotation.GraphId;
+import org.neo4j.ogm.annotation.GeneratedValue;
+import org.neo4j.ogm.annotation.Id;
 import org.neo4j.ogm.annotation.NodeEntity;
 import org.neo4j.ogm.annotation.Relationship;
 
 @NodeEntity
 public class Car {
-    @GraphId
+    @Id @GeneratedValue
     private Long id;
 
     private String make;

persistence-modules/spring-data-neo4j/src/main/java/com/baeldung/spring/data/neo4j/domain/Movie.java

@@ -2,7 +2,9 @@ package com.baeldung.spring.data.neo4j.domain;
 
 import com.fasterxml.jackson.annotation.JsonIdentityInfo;
 import com.voodoodyne.jackson.jsog.JSOGGenerator;
-import org.neo4j.ogm.annotation.GraphId;
+
+import org.neo4j.ogm.annotation.GeneratedValue;
+import org.neo4j.ogm.annotation.Id;
 import org.neo4j.ogm.annotation.NodeEntity;
 import org.neo4j.ogm.annotation.Relationship;
 
@@ -13,7 +15,7 @@ import java.util.List;
 
 @NodeEntity
 public class Movie {
-    @GraphId
+    @Id @GeneratedValue
     Long id;
 
     private String title;

persistence-modules/spring-data-neo4j/src/main/java/com/baeldung/spring/data/neo4j/domain/Person.java

@@ -2,7 +2,9 @@ package com.baeldung.spring.data.neo4j.domain;
 
 import com.fasterxml.jackson.annotation.JsonIdentityInfo;
 import com.voodoodyne.jackson.jsog.JSOGGenerator;
-import org.neo4j.ogm.annotation.GraphId;
+
+import org.neo4j.ogm.annotation.GeneratedValue;
+import org.neo4j.ogm.annotation.Id;
 import org.neo4j.ogm.annotation.NodeEntity;
 import org.neo4j.ogm.annotation.Relationship;
 
@@ -11,7 +13,7 @@ import java.util.List;
 @JsonIdentityInfo(generator = JSOGGenerator.class)
 @NodeEntity
 public class Person {
-    @GraphId
+    @Id @GeneratedValue
     Long id;
 
     private String name;

persistence-modules/spring-data-neo4j/src/main/java/com/baeldung/spring/data/neo4j/domain/Role.java

@@ -3,7 +3,8 @@ package com.baeldung.spring.data.neo4j.domain;
 import com.fasterxml.jackson.annotation.JsonIdentityInfo;
 import com.voodoodyne.jackson.jsog.JSOGGenerator;
 import org.neo4j.ogm.annotation.EndNode;
-import org.neo4j.ogm.annotation.GraphId;
+import org.neo4j.ogm.annotation.GeneratedValue;
+import org.neo4j.ogm.annotation.Id;
 import org.neo4j.ogm.annotation.RelationshipEntity;
 import org.neo4j.ogm.annotation.StartNode;
 
@@ -12,7 +13,7 @@ import java.util.Collection;
 @JsonIdentityInfo(generator = JSOGGenerator.class)
 @RelationshipEntity(type = "ACTED_IN")
 public class Role {
-    @GraphId
+    @Id @GeneratedValue
 	Long id;
     private Collection<String> roles;
     @StartNode

persistence-modules/spring-data-neo4j/src/main/java/com/baeldung/spring/data/neo4j/repository/MovieRepository.java

@@ -1,8 +1,8 @@
-package com.baeldung.spring.data.neo4j.repostory;
+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.GraphRepository;
+import org.springframework.data.neo4j.repository.Neo4jRepository;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
@@ -11,7 +11,7 @@ import java.util.List;
 import java.util.Map;
 
 @Repository
-public interface MovieRepository extends GraphRepository<Movie> {
+public interface MovieRepository extends Neo4jRepository<Movie, Long> {
 
     Movie findByTitle(@Param("title") String title);
 

persistence-modules/spring-data-neo4j/src/main/java/com/baeldung/spring/data/neo4j/repository/PersonRepository.java

@@ -0,0 +1,9 @@
+package com.baeldung.spring.data.neo4j.repository;
+
+import com.baeldung.spring.data.neo4j.domain.Person;
+import org.springframework.data.neo4j.repository.Neo4jRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface PersonRepository extends Neo4jRepository<Person, Long> {
+}

persistence-modules/spring-data-neo4j/src/main/java/com/baeldung/spring/data/neo4j/repostory/PersonRepository.java

@@ -1,9 +0,0 @@
-package com.baeldung.spring.data.neo4j.repostory;
-
-import com.baeldung.spring.data.neo4j.domain.Person;
-import org.springframework.data.neo4j.repository.GraphRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface PersonRepository extends GraphRepository<Person> {
-}

persistence-modules/spring-data-neo4j/src/main/java/com/baeldung/spring/data/neo4j/services/MovieService.java

@@ -1,10 +1,11 @@
 package com.baeldung.spring.data.neo4j.services;
 
-import com.baeldung.spring.data.neo4j.repostory.MovieRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.baeldung.spring.data.neo4j.repository.MovieRepository;
+
 import java.util.*;
 
 @Service

persistence-modules/spring-data-neo4j/src/test/java/com/baeldung/neo4j/Neo4jOgmLiveTest.java

@@ -12,14 +12,12 @@ import org.neo4j.ogm.session.SessionFactory;
 
 import com.baeldung.spring.data.neo4j.domain.Car;
 import com.baeldung.spring.data.neo4j.domain.Company;
-import org.neo4j.ogm.transaction.Transaction;
 
 public class Neo4jOgmLiveTest {
 
     @Test
     public void testOgm() {
-        Configuration conf = new Configuration();
+        Configuration conf = new Configuration.Builder().build();
-        conf.driverConfiguration().setDriverClassName("org.neo4j.ogm.drivers.embedded.driver.EmbeddedDriver");
 
         SessionFactory factory = new SessionFactory(conf, "com.baeldung.spring.data.neo4j.domain");
         Session session = factory.openSession();

persistence-modules/spring-data-neo4j/src/test/java/com/baeldung/spring/data/neo4j/MovieRepositoryIntegrationTest.java

@@ -4,8 +4,9 @@ import com.baeldung.spring.data.neo4j.config.MovieDatabaseNeo4jTestConfiguration
 import com.baeldung.spring.data.neo4j.domain.Movie;
 import com.baeldung.spring.data.neo4j.domain.Person;
 import com.baeldung.spring.data.neo4j.domain.Role;
-import com.baeldung.spring.data.neo4j.repostory.MovieRepository;
+import com.baeldung.spring.data.neo4j.repository.MovieRepository;
-import com.baeldung.spring.data.neo4j.repostory.PersonRepository;
+import com.baeldung.spring.data.neo4j.repository.PersonRepository;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -50,10 +51,10 @@ public class MovieRepositoryIntegrationTest {
         Role charlie = new Role();
         charlie.setMovie(italianJob);
         charlie.setPerson(mark);
-        Collection<String> roleNames = new HashSet();
+        Collection<String> roleNames = new HashSet<>();
         roleNames.add("Charlie Croker");
         charlie.setRoles(roleNames);
-        List<Role> roles = new ArrayList();
+        List<Role> roles = new ArrayList<>();
         roles.add(charlie);
         italianJob.setRoles(roles);
         movieRepository.save(italianJob);