Rework the samples to avoid depending on Spring Boot

Closes gh-711

samples/rest-notes-slate/build.gradle

@@ -1,11 +1,7 @@
 plugins {
-	id "eclipse"
 	id "java"
-	id "org.springframework.boot" version "2.4.7"
 }
 
-apply plugin: 'io.spring.dependency-management'
-
 repositories {
 	mavenLocal()
 	maven { url 'https://repo.spring.io/milestone' }
@@ -19,24 +15,31 @@ sourceCompatibility = 17
 targetCompatibility = 17
 
 ext {
+	restdocsVersion = '3.0.0-SNAPSHOT'
 	snippetsDir = file('build/generated-snippets')
 }
 
 ext['spring-restdocs.version'] = '3.0.0-SNAPSHOT'
 
 dependencies {
-	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-	implementation 'org.springframework.boot:spring-boot-starter-data-rest'
+	implementation "com.fasterxml.jackson.core:jackson-databind:2.12.5"
+	implementation "jakarta.servlet:jakarta.servlet-api:5.0.0"
+	implementation "org.hibernate.validator:hibernate-validator:7.0.0.Final"
+	implementation "org.hibernate:hibernate-core-jakarta:5.5.7.Final"
+	implementation "org.springframework:spring-webmvc:6.0.0-SNAPSHOT"
+	implementation "org.springframework.data:spring-data-jpa:3.0.0-SNAPSHOT"
+	implementation "org.springframework.data:spring-data-rest-webmvc:4.0.0-SNAPSHOT"
 
-	runtimeOnly 'com.h2database:h2'
+	runtimeOnly 'com.h2database:h2:1.4.200'
 	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'
+	testImplementation 'com.jayway.jsonpath:json-path:2.6.0'
+	testImplementation 'junit:junit:4.12'
+	testImplementation 'org.assertj:assertj-core:3.21.0'
+	testImplementation 'org.hamcrest:hamcrest-library:2.2'
+	testImplementation "org.springframework.restdocs:spring-restdocs-mockmvc:$restdocsVersion"
+
+	testRuntimeOnly 'org.glassfish:jakarta.el:4.0.2'
 }
 
 test {
@@ -59,6 +62,3 @@ task(slate, type: Exec) {
 build {
 	dependsOn 'slate'
 }
-
-eclipseJdt.onlyIf { false }
-cleanEclipseJdt.onlyIf { false }

samples/rest-notes-slate/src/main/java/com/example/notes/ErrorController.java

@@ -0,0 +1,45 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://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 com.example.notes;
+
+import java.time.Instant;
+import java.util.Map;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.http.HttpServletRequest;
+
+@RestController
+class ErrorController {
+
+	@RequestMapping("/error")
+	ResponseEntity<Map<String, Object>> handleError(HttpServletRequest request) {
+		HttpStatus httpStatus = HttpStatus.valueOf((int)request.getAttribute(RequestDispatcher.ERROR_STATUS_CODE));
+		Map<String, Object> body = Map.of("status", httpStatus.value(),
+				"error", httpStatus.getReasonPhrase(),
+				"path", request.getAttribute(RequestDispatcher.ERROR_REQUEST_URI),
+				"message", request.getAttribute(RequestDispatcher.ERROR_MESSAGE),
+				"timestamp", Instant.now().toEpochMilli());
+		ResponseEntity<Map<String, Object>> response = new ResponseEntity<>(body, httpStatus);
+		return response;
+	}
+	
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 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.
@@ -18,11 +18,11 @@ package com.example.notes;
 
 import java.util.List;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToMany;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 

samples/rest-notes-slate/src/main/java/com/example/notes/RestNotesSlate.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 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,14 +16,58 @@
 
 package com.example.notes;
 
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
+import javax.sql.DataSource;
 
-@SpringBootApplication
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.data.rest.webmvc.config.RepositoryRestMvcConfiguration;
+import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
+import org.springframework.jdbc.datasource.DriverManagerDataSource;
+import org.springframework.orm.jpa.JpaTransactionManager;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import jakarta.persistence.EntityManagerFactory;
+
+@EnableWebMvc
+@ComponentScan
+@Configuration
+@EnableJpaRepositories
+@Import(RepositoryRestMvcConfiguration.class)
 public class RestNotesSlate {
-
-	public static void main(String[] args) {
-		SpringApplication.run(RestNotesSlate.class, args);
+	
+	@Bean
+	ObjectMapper objectMapper() {
+		return Jackson2ObjectMapperBuilder.json().build();
+	}
+	
+	@Bean
+	LocalContainerEntityManagerFactoryBean entityManagerFactory(DataSource dataSource) {
+		LocalContainerEntityManagerFactoryBean factory = new LocalContainerEntityManagerFactoryBean();
+		factory.setPackagesToScan("com.example.notes");
+		HibernateJpaVendorAdapter jpaVendorAdapter = new HibernateJpaVendorAdapter();
+		jpaVendorAdapter.setShowSql(true);
+		jpaVendorAdapter.setGenerateDdl(true);
+		factory.setJpaVendorAdapter(jpaVendorAdapter);
+		factory.setDataSource(dataSource);
+		return factory;
+	}
+	
+	@Bean
+	DataSource dataSource() {
+		return new DriverManagerDataSource("jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1");
+	}
+	
+	@Bean
+	PlatformTransactionManager transactionManager(EntityManagerFactory entityManagerFactory) {
+		return new JpaTransactionManager(entityManagerFactory);
 	}
 
 }

samples/rest-notes-slate/src/main/java/com/example/notes/Tag.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.
@@ -18,11 +18,11 @@ package com.example.notes;
 
 import java.util.List;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToMany;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 

samples/rest-notes-slate/src/main/resources/application.properties

@@ -1 +0,0 @@
-spring.jackson.serialization.indent_output: true

samples/rest-notes-slate/src/test/java/com/example/notes/ApiDocumentation.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 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.
@@ -38,26 +38,28 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
-import jakarta.servlet.RequestDispatcher;
-
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.hateoas.MediaTypes;
 import org.springframework.restdocs.JUnitRestDocumentation;
 import org.springframework.restdocs.payload.JsonFieldType;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import jakarta.servlet.RequestDispatcher;
+
+@WebAppConfiguration
 @RunWith(SpringRunner.class)
-@SpringBootTest
+@ContextConfiguration(classes = RestNotesSlate.class)
 public class ApiDocumentation {
 
 	@Rule