Unifiy things.

Author: michael-simons

examples/sdn6-rest/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.6.4</version>
+		<version>2.7.0-M2</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>org.neo4j.tips.sdn</groupId>
@@ -27,6 +27,11 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-rest</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-data-neo4j</artifactId>
+			<version>6.3.0-SNAPSHOT</version>
+		</dependency>
 		<dependency>
 			<groupId>eu.michael-simons.neo4j</groupId>
 			<artifactId>neo4j-migrations-spring-boot-starter</artifactId>
@@ -69,5 +74,25 @@
 			</plugin>
 		</plugins>
 	</build>
+	<repositories>
+		<repository>
+			<id>spring-milestones</id>
+			<name>Spring Milestones</name>
+			<url>https://repo.spring.io/milestone</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>spring-milestones</id>
+			<name>Spring Milestones</name>
+			<url>https://repo.spring.io/milestone</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+	</pluginRepositories>
 
 </project>

examples/sdn6-rest/src/main/java/org/neo4j/tips/sdn/sdn6_rest/SpringDataRestConfig.java

@@ -1,15 +1,10 @@
 package org.neo4j.tips.sdn.sdn6_rest;
 
-import org.neo4j.tips.sdn.sdn6_rest.movies.Actor;
 import org.neo4j.tips.sdn.sdn6_rest.movies.Movie;
-import org.neo4j.tips.sdn.sdn6_rest.movies.Person;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.rest.core.config.RepositoryRestConfiguration;
 import org.springframework.data.rest.webmvc.config.RepositoryRestConfigurer;
-import org.springframework.hateoas.EntityModel;
-import org.springframework.hateoas.server.EntityLinks;
-import org.springframework.hateoas.server.RepresentationModelProcessor;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 
 @Configuration(proxyBeanMethods = false)
@@ -25,17 +20,4 @@ public void configureRepositoryRestConfiguration(RepositoryRestConfiguration con
 
 		};
 	}
-
-	@Bean
-	RepresentationModelProcessor<EntityModel<Actor>> actorResourceProcessor(final EntityLinks entityLinks) {
-		// Don't use a lambda here, otherwise the type will evaporate (some Spring thing I really don't wanna debug right now)
-		return new RepresentationModelProcessor<EntityModel<Actor>>() {
-			@Override public EntityModel<Actor> process(EntityModel<Actor> model) {
-				if (model.getContent().getPerson() != null) {
-					model.add(entityLinks.linkToItemResource(Person.class, model.getContent().getPerson().getId()));
-				}
-				return model;
-			}
-		};
-	}
 }

examples/sdn6-rest/src/main/java/org/neo4j/tips/sdn/sdn6_rest/movies/Actor.java

@@ -19,7 +19,8 @@ public final class Actor {
 	private Long id;
 
 	@TargetNode
-	@JsonIgnore
+	@JsonUnwrapped
+	@JsonIgnoreProperties({ "id" })
 	private final Person person;
 
 	private final List<String> roles;
@@ -37,5 +38,3 @@ public List<String> getRoles() {
 		return List.copyOf(roles);
 	}
 }
-
-

examples/sdn6-rest/src/main/java/org/neo4j/tips/sdn/sdn6_rest/movies/InlineName.java

@@ -0,0 +1,9 @@
+package org.neo4j.tips.sdn.sdn6_rest.movies;
+
+import org.springframework.data.rest.core.config.Projection;
+
+@Projection(name = "inlineName", types = { Person.class })
+public interface InlineName {
+
+	String getName();
+}

examples/sdn6-rest/src/main/java/org/neo4j/tips/sdn/sdn6_rest/movies/PeopleRepository.java

@@ -6,12 +6,11 @@
 import org.springframework.data.neo4j.repository.Neo4jRepository;
 import org.springframework.data.neo4j.repository.query.Query;
 import org.springframework.data.rest.core.annotation.RepositoryRestResource;
-import org.springframework.data.rest.core.annotation.RestResource;
 
 /**
  * @author Michael J. Simons
  */
-@RepositoryRestResource(path = "people")
+@RepositoryRestResource(path = "people", excerptProjection = InlineName.class)
 public interface PeopleRepository extends Neo4jRepository<Person, UUID> {
 
 	@Query("""

examples/sdn6-rest/src/main/java/org/neo4j/tips/sdn/sdn6_rest/movies/Person.java

@@ -3,6 +3,7 @@
 import java.util.UUID;
 
 import org.springframework.data.annotation.PersistenceConstructor;
+import org.springframework.data.annotation.PersistenceCreator;
 import org.springframework.data.neo4j.core.schema.GeneratedValue;
 import org.springframework.data.neo4j.core.schema.Id;
 import org.springframework.data.neo4j.core.schema.Node;
@@ -19,7 +20,7 @@ public final class Person {
 
 	private Integer born;
 
-	@PersistenceConstructor
+	@PersistenceCreator
 	private Person(UUID id, String name, Integer born) {
 		this.id = id;
 		this.born = born;