Upgrade the samples to Spring Boot 2.4.x

Closes gh-723

Author: wilkinsona

samples/junit5/build.gradle

@@ -1,19 +1,10 @@
-buildscript {
-	repositories {
-		mavenCentral()
-	}
-	dependencies {
-		classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.1.9.RELEASE'
-	}
-}
-
 plugins {
+	id "eclipse"
+	id "java"
 	id "org.asciidoctor.jvm.convert" version "3.3.2"
+	id "org.springframework.boot" version "2.4.7"
 }
 
-apply plugin: 'java'
-apply plugin: 'org.springframework.boot'
-apply plugin: 'eclipse'
 apply plugin: 'io.spring.dependency-management'
 
 repositories {

samples/rest-assured/build.gradle

@@ -1,19 +1,10 @@
-buildscript {
-	repositories {
-		mavenCentral()
-	}
-	dependencies {
-		classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.1.9.RELEASE'
-	}
-}
-
 plugins {
+	id "eclipse"
+	id "java"
 	id "org.asciidoctor.jvm.convert" version "3.3.2"
+	id "org.springframework.boot" version "2.4.7"
 }
 
-apply plugin: 'java'
-apply plugin: 'org.springframework.boot'
-apply plugin: 'eclipse'
 apply plugin: 'io.spring.dependency-management'
 
 repositories {
@@ -44,6 +35,9 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 
 	testImplementation 'io.rest-assured:rest-assured:3.0.2'
+	testImplementation('org.junit.vintage:junit-vintage-engine') {
+		exclude group: 'org.hamcrest', module: 'hamcrest-core'
+	}
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.restdocs:spring-restdocs-restassured'
 }

samples/rest-notes-slate/build.gradle

@@ -1,15 +1,9 @@
-buildscript {
-	repositories {
-		mavenCentral()
-	}
-	dependencies {
-		classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.1.9.RELEASE'
-	}
+plugins {
+	id "eclipse"
+	id "java"
+	id "org.springframework.boot" version "2.4.7"
 }
 
-apply plugin: 'java'
-apply plugin: 'org.springframework.boot'
-apply plugin: 'eclipse'
 apply plugin: 'io.spring.dependency-management'
 
 repositories {
@@ -38,6 +32,9 @@ dependencies {
 	runtimeOnly 'org.atteo:evo-inflector:1.2.1'
 
 	testImplementation 'com.jayway.jsonpath:json-path'
+	testImplementation('org.junit.vintage:junit-vintage-engine') {
+		exclude group: 'org.hamcrest', module: 'hamcrest-core'
+	}
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.restdocs:spring-restdocs-mockmvc'
 }

samples/rest-notes-spring-data-rest/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.9.RELEASE</version>
+		<version>2.4.7</version>
 		<relativePath />
 	</parent>
 
@@ -37,6 +37,17 @@
 			<scope>runtime</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>org.junit.vintage</groupId>
+			<artifactId>junit-vintage-engine</artifactId>
+			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.hamcrest</groupId>
+					<artifactId>hamcrest-core</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>

samples/rest-notes-spring-hateoas/build.gradle

@@ -1,19 +1,10 @@
-buildscript {
-	repositories {
-		mavenCentral()
-	}
-	dependencies {
-		classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.1.9.RELEASE'
-	}
-}
-
 plugins {
+	id "eclipse"
+	id "java"
 	id "org.asciidoctor.jvm.convert" version "3.3.2"
+	id "org.springframework.boot" version "2.4.7"
 }
 
-apply plugin: 'java'
-apply plugin: 'org.springframework.boot'
-apply plugin: 'eclipse'
 apply plugin: 'io.spring.dependency-management'
 
 repositories {
@@ -43,12 +34,16 @@ dependencies {
 
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 	implementation 'org.springframework.boot:spring-boot-starter-hateoas'
+	implementation 'org.springframework.boot:spring-boot-starter-validation'
 
 	runtimeOnly 'com.h2database:h2'
 	runtimeOnly 'org.atteo:evo-inflector:1.2.1'
 
 	testImplementation 'com.jayway.jsonpath:json-path'
 	testImplementation 'org.assertj:assertj-core'
+	testImplementation('org.junit.vintage:junit-vintage-engine') {
+		exclude group: 'org.hamcrest', module: 'hamcrest-core'
+	}
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.restdocs:spring-restdocs-mockmvc'
 }

samples/rest-notes-spring-hateoas/src/main/java/com/example/notes/ExceptionSupressingErrorAttributes.java

@@ -18,6 +18,7 @@
 
 import java.util.Map;
 
+import org.springframework.boot.web.error.ErrorAttributeOptions;
 import org.springframework.boot.web.servlet.error.DefaultErrorAttributes;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestAttributes;
@@ -28,8 +29,8 @@ class ExceptionSupressingErrorAttributes extends DefaultErrorAttributes {
 
 	@Override
 	public Map<String, Object> getErrorAttributes(WebRequest webRequest,
-			boolean includeStackTrace) {
-		Map<String, Object> errorAttributes = super.getErrorAttributes(webRequest, includeStackTrace);
+			ErrorAttributeOptions options) {
+		Map<String, Object> errorAttributes = super.getErrorAttributes(webRequest, options);
 		errorAttributes.remove("exception");
 		Object message = webRequest.getAttribute("javax.servlet.error.message", RequestAttributes.SCOPE_REQUEST);
 		if (message != null) {

samples/rest-notes-spring-hateoas/src/main/java/com/example/notes/IndexController.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2021 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.
@@ -16,20 +16,20 @@
 
 package com.example.notes;
 
-import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo;
+import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.linkTo;
 
-import org.springframework.hateoas.ResourceSupport;
+import org.springframework.hateoas.RepresentationModel;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping("/")
-public class IndexController {
+class IndexController {
 
 	@RequestMapping(method=RequestMethod.GET)
-	public ResourceSupport index() {
-		ResourceSupport index = new ResourceSupport();
+	public RepresentationModel<?> index() {
+		RepresentationModel<?> index = new RepresentationModel<>();
 		index.add(linkTo(NotesController.class).withRel("notes"));
 		index.add(linkTo(TagsController.class).withRel("tags"));
 		return index;

samples/rest-notes-spring-hateoas/src/main/java/com/example/notes/NestedContentResource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2021 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.
@@ -24,8 +24,6 @@
 import javax.persistence.Id;
 import javax.persistence.ManyToMany;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
 @Entity
 public class Note {
 
@@ -40,7 +38,6 @@ public class Note {
 	@ManyToMany
 	private List<Tag> tags;
 
-	@JsonIgnore
 	public long getId() {
 		return id;
 	}
@@ -65,12 +62,12 @@ public void setBody(String body) {
 		this.body = body;
 	}
 
-	@JsonIgnore
 	public List<Tag> getTags() {
 		return tags;
 	}
 
 	public void setTags(List<Tag> tags) {
 		this.tags = tags;
 	}
+
 }

samples/rest-notes-spring-hateoas/src/main/java/com/example/notes/Note.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2021 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.
@@ -25,7 +25,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-public class NoteInput {
+class NoteInput {
 
 	@NotBlank
 	private final String title;
@@ -35,23 +35,23 @@ public class NoteInput {
 	private final List<URI> tagUris;
 
 	@JsonCreator
-	public NoteInput(@JsonProperty("title") String title,
+	NoteInput(@JsonProperty("title") String title,
 			@JsonProperty("body") String body, @JsonProperty("tags") List<URI> tagUris) {
 		this.title = title;
 		this.body = body;
 		this.tagUris = tagUris == null ? Collections.<URI>emptyList() : tagUris;
 	}
 
-	public String getTitle() {
+	String getTitle() {
 		return title;
 	}
 
-	public String getBody() {
+	String getBody() {
 		return body;
 	}
 
 	@JsonProperty("tags")
-	public List<URI> getTagUris() {
+	List<URI> getTagUris() {
 		return this.tagUris;
 	}
 

samples/rest-notes-spring-hateoas/src/main/java/com/example/notes/NoteInput.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2021 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.
@@ -23,7 +23,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-public class NotePatchInput {
+class NotePatchInput {
 
 	@NullOrNotBlank 
 	private final String title;
@@ -33,23 +33,23 @@ public class NotePatchInput {
 	private final List<URI> tagUris;
 
 	@JsonCreator
-	public NotePatchInput(@JsonProperty("title") String title,
+	NotePatchInput(@JsonProperty("title") String title,
 			@JsonProperty("body") String body, @JsonProperty("tags") List<URI> tagUris) {
 		this.title = title;
 		this.body = body;
 		this.tagUris = tagUris == null ? Collections.<URI>emptyList() : tagUris;
 	}
 
-	public String getTitle() {
+	String getTitle() {
 		return title;
 	}
 
-	public String getBody() {
+	String getBody() {
 		return body;
 	}
 
 	@JsonProperty("tags")
-	public List<URI> getTagUris() {
+	List<URI> getTagUris() {
 		return this.tagUris;
 	}
 }

samples/rest-notes-spring-hateoas/src/main/java/com/example/notes/NotePatchInput.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 the original author or authors.
+ * Copyright 2014-2021 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.
@@ -21,9 +21,10 @@
 
 import org.springframework.data.repository.CrudRepository;
 
-public interface NoteRepository extends CrudRepository<Note, Long> {
+interface NoteRepository extends CrudRepository<Note, Long> {
 
 	Note findById(long id);
 
 	List<Note> findByTagsIn(Collection<Tag> tags);
+	
 }