Spring/spring-data-examples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#131 - Polished Spring Data Neo4j example.

Browse Source 
Switched to milestone version of Spring Data Neo4j. Used Lombok in domain types. Used assertThat(…) matchers in test case for consistency. Inlined Spring configuration into test case. Upgraded to Lombok 1.16.6 along the way.

Fixed indentation in pom.xml files to use tabs instead of spaces.

Original pull requests: #129, #130.
This commit is contained in:
Oliver Gierke
2015-09-03 17:06:05 +02:00
parent f90bed38e2
commit 0fa8c12806
9 changed files with 152 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
neo4j/example/pom.xml
View File

@@ -2,70 +2,58 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-data-neo4j-example</artifactId>
<name>Spring Data Neo4j - Example</name>
<properties>
<spring-data-neo4j.version>4.0.0.BUILD-SNAPSHOT</spring-data-neo4j.version>
<neo4j-ogm.version>1.1.2-SNAPSHOT</neo4j-ogm.version>
<neo4j.version>2.2.4</neo4j.version>
</properties>
<artifactId>spring-data-neo4j-example</artifactId>
<name>Spring Data Neo4j - Example</name>
<properties>
<spring-data-neo4j.version>4.0.0.RC2</spring-data-neo4j.version>
<neo4j-ogm.version>1.1.1</neo4j-ogm.version>
<neo4j.version>2.2.4</neo4j.version>
</properties>
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-neo4j-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-neo4j-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
<dependencies>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-neo4j</artifactId>
<version>${spring-data-neo4j.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-neo4j</artifactId>
<version>${spring-data-neo4j.version}</version>
</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>org.neo4j</groupId>
<artifactId>neo4j-ogm</artifactId>
<version>${neo4j-ogm.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.neo4j.app</groupId>
<artifactId>neo4j-server</artifactId>
<version>${neo4j.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.neo4j.test</groupId>
<artifactId>neo4j-harness</artifactId>
<version>${neo4j.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-neo4j</artifactId>
<version>${spring-data-neo4j.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j-ogm</artifactId>
<version>${neo4j-ogm.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.neo4j.app</groupId>
<artifactId>neo4j-server</artifactId>
<version>${neo4j.version}</version>
</dependency>
<dependency>
<groupId>org.neo4j.test</groupId>
<artifactId>neo4j-harness</artifactId>
<version>${neo4j.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<repositories>
<repository>
<id>spring-libs-snapshot</id>
<name>Spring</name>
<url>http://repo.spring.io/libs-snapshot</url>
</repository>
</repositories>
</project>

44
neo4j/example/src/main/java/example/springdata/neo4j/domain/Actor.java → neo4j/example/src/main/java/example/springdata/neo4j/Actor.java
View File

@@ -14,7 +14,12 @@
* limitations under the License.
*/
package example.springdata.neo4j.domain;
package example.springdata.neo4j;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.RequiredArgsConstructor;
import java.util.HashSet;
import java.util.Set;
@@ -27,41 +32,22 @@ import org.neo4j.ogm.annotation.Relationship;
* An Actor node entity.
*
* @author Luanne Misquitta
* @author Oliver Gierke
*/
@NodeEntity(label = "Actor")
@NoArgsConstructor(force = true, access = AccessLevel.PRIVATE)
@RequiredArgsConstructor
@Getter
public class Actor {
@GraphId private Long id;
private String name;
@Relationship(type = "ACTED_IN")
private Set<Role> roles = new HashSet<>();
public Actor() {
}
public Actor(String name) {
this.name = name;
}
public String getName() {
return name;
}
public Long getId() {
return id;
}
public Set<Role> getRoles() {
return roles;
}
private @GraphId Long id;
private final String name;
private final @Relationship(type = "ACTED_IN") Set<Role> roles = new HashSet<>();
public void actedIn(Movie movie, String roleName) {
Role role = new Role();
role.setRole(roleName);
role.setActor(this);
role.setMovie(movie);
Role role = new Role(this, roleName, movie);
roles.add(role);
movie.getRoles().add(role);
}

10
neo4j/example/src/main/java/example/springdata/neo4j/repo/ActorRepository.java → neo4j/example/src/main/java/example/springdata/neo4j/ActorRepository.java
View File

@@ -13,15 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package example.springdata.neo4j.repo;
package example.springdata.neo4j;
import example.springdata.neo4j.domain.Actor;
import org.springframework.data.neo4j.repository.GraphRepository;
/**
* GraphRepository for Actors.
* {@link GraphRepository} for {@link Actor}s.
*
* @author Luanne Misquitta
*/
public interface ActorRepository extends GraphRepository<Actor> {
}
public interface ActorRepository extends GraphRepository<Actor> {}

40
neo4j/example/src/main/java/example/springdata/neo4j/domain/Movie.java → neo4j/example/src/main/java/example/springdata/neo4j/Movie.java
View File

@@ -14,7 +14,12 @@
* limitations under the License.
*/
package example.springdata.neo4j.domain;
package example.springdata.neo4j;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.RequiredArgsConstructor;
import java.util.HashSet;
import java.util.Set;
@@ -27,34 +32,15 @@ import org.neo4j.ogm.annotation.Relationship;
* A Movie node entity.
*
* @author Luanne Misquitta
* @author Oliver Gierke
*/
@NodeEntity(label = "Movie")
@NoArgsConstructor(force = true, access = AccessLevel.PRIVATE)
@RequiredArgsConstructor
@Getter
public class Movie {
@GraphId private Long id;
private String title;
@Relationship(type = "ACTED_IN", direction = "INCOMING")
private Set<Role> roles = new HashSet<>();
public Movie() {
}
public Movie(String title) {
this.title = title;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
@Relationship(type = "ACTED_IN", direction = "INCOMING")
public Set<Role> getRoles() {
return roles;
}
private @GraphId Long id;
private final String title;
private final @Relationship(type = "ACTED_IN", direction = "INCOMING") Set<Role> roles = new HashSet<>();
}

46
neo4j/example/src/main/java/example/springdata/neo4j/domain/Role.java → neo4j/example/src/main/java/example/springdata/neo4j/Role.java
View File

@@ -13,7 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package example.springdata.neo4j.domain;
package example.springdata.neo4j;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.RequiredArgsConstructor;
import org.neo4j.ogm.annotation.EndNode;
import org.neo4j.ogm.annotation.GraphId;
@@ -22,40 +27,17 @@ import org.neo4j.ogm.annotation.StartNode;
/**
* A Role relationship entity between an actor and movie.
*
* @author Luanne Misquitta
*/
@RelationshipEntity(type = "ACTED_IN")
@NoArgsConstructor(force = true, access = AccessLevel.PRIVATE)
@RequiredArgsConstructor
@Getter
public class Role {
@GraphId private Long id;
@StartNode private Actor actor;
@EndNode private Movie movie;
private String role;
public Role() {
}
public Actor getActor() {
return actor;
}
public void setActor(Actor actor) {
this.actor = actor;
}
public Movie getMovie() {
return movie;
}
public void setMovie(Movie movie) {
this.movie = movie;
}
public String getRole() {
return role;
}
public void setRole(String role) {
this.role = role;
}
private @GraphId Long id;
private final @StartNode Actor actor;
private final String role;
private final @EndNode Movie movie;
}

61
neo4j/example/src/test/java/example/springdata/neo4j/ActorRepositoryIntegrationTest.java
View File

@@ -13,52 +13,75 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package example.springdata.neo4j;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import example.springdata.neo4j.domain.Actor;
import example.springdata.neo4j.domain.Movie;
import example.springdata.neo4j.domain.Role;
import example.springdata.neo4j.repo.ActorRepository;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.neo4j.ogm.session.SessionFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.neo4j.config.Neo4jConfiguration;
import org.springframework.data.neo4j.repository.config.EnableNeo4jRepositories;
import org.springframework.data.neo4j.server.InProcessServer;
import org.springframework.data.neo4j.server.Neo4jServer;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.EnableTransactionManagement;
import org.springframework.transaction.annotation.Transactional;
/**
* Simple integration test demonstrating the use of the ActorRepository
*
* @author Luanne Misquitta
* @author Oliver Gierke
*/
@ContextConfiguration(classes = {ExampleConfig.class})
@RunWith(SpringJUnit4ClassRunner.class)
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
@ContextConfiguration
@Transactional
public class ActorRepositoryIntegrationTest {
@Configuration
@EnableTransactionManagement
@EnableNeo4jRepositories
static class ExampleConfig extends Neo4jConfiguration {
@Override
public Neo4jServer neo4jServer() {
return new InProcessServer();
}
@Override
public SessionFactory getSessionFactory() {
return new SessionFactory("example.springdata.neo4j");
}
}
@Autowired ActorRepository actorRepository;
/**
* @see DATAGRAPH-752
* Test case to demonstrate saving node and relationship entities, and loading them via the repository.
* @see #131
*/
@Test
public void shouldBeAbleToSaveAndLoadActor() {
Actor daniel = new Actor("Daniel Radcliffe");
Movie goblet = new Movie("Harry Potter and the Goblet of Fire");
daniel.actedIn(goblet,"Harry Potter");
actorRepository.save(daniel); //saves the actor and the movie
Actor daniel = new Actor("Daniel Radcliffe");
daniel.actedIn(goblet, "Harry Potter");
actorRepository.save(daniel); // saves the actor and the movie
Actor actor = actorRepository.findOne(daniel.getId());
assertNotNull(actor);
assertEquals(daniel.getName(),actor.getName());
assertEquals(1,actor.getRoles().size());
Role role = actor.getRoles().iterator().next();
assertEquals("Harry Potter", role.getRole());
}
assertThat(actor, is(notNullValue()));
assertThat(actor.getName(), is(daniel.getName()));
assertThat(actor.getRoles(), hasSize(1));
Role role = actor.getRoles().iterator().next();
assertThat(role.getRole(), is("Harry Potter"));
}
}

44
neo4j/example/src/test/java/example/springdata/neo4j/ExampleConfig.java
View File

@@ -1,44 +0,0 @@
/*
* Copyright 2015 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
*
* http://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 example.springdata.neo4j;
import org.neo4j.ogm.session.SessionFactory;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.neo4j.config.Neo4jConfiguration;
import org.springframework.data.neo4j.repository.config.EnableNeo4jRepositories;
import org.springframework.data.neo4j.server.InProcessServer;
import org.springframework.data.neo4j.server.Neo4jServer;
import org.springframework.transaction.annotation.EnableTransactionManagement;
/**
* @author Luanne Misquitta
*/
@Configuration
@EnableTransactionManagement
@EnableNeo4jRepositories("example.springdata.neo4j.repo")
public class ExampleConfig extends Neo4jConfiguration{
@Override
public Neo4jServer neo4jServer() {
return new InProcessServer();
}
@Override
public SessionFactory getSessionFactory() {
return new SessionFactory("example.springdata.neo4j.domain");
}
}

30
neo4j/pom.xml
View File

@@ -2,24 +2,24 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-data-neo4j-examples</artifactId>
<packaging>pom</packaging>
<artifactId>spring-data-neo4j-examples</artifactId>
<packaging>pom</packaging>
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
</parent>
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
</parent>
<name>Spring Data Neo4j 4 - Examples</name>
<description>Sample projects for Spring Data Neo4j 4</description>
<name>Spring Data Neo4j 4 - Examples</name>
<description>Sample projects for Spring Data Neo4j 4</description>
<modules>
<module>example</module>
</modules>
<modules>
<module>example</module>
</modules>
</project>

2
pom.xml
View File

@@ -69,7 +69,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.16.4</version>
<version>1.16.6</version>
<scope>provided</scope>
</dependency>