Rework the samples to avoid depending on Spring Boot

Closes gh-711

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

@@ -1,12 +1,8 @@
 plugins {
-	id "eclipse"
 	id "java"
 	id "org.asciidoctor.jvm.convert" version "3.3.2"
-	id "org.springframework.boot" version "2.4.7"
 }
 
-apply plugin: 'io.spring.dependency-management'
-
 repositories {
 	mavenLocal()
 	maven { url 'https://repo.spring.io/milestone' }
@@ -21,31 +17,34 @@ targetCompatibility = 17
 
 ext {
 	snippetsDir = file('build/generated-snippets')
+	restdocsVersion = '3.0.0-SNAPSHOT'
 }
 
-ext['spring-restdocs.version'] = '3.0.0-SNAPSHOT'
-
 configurations {
 	asciidoctorExtensions
 }
 
 dependencies {
-	asciidoctorExtensions 'org.springframework.restdocs:spring-restdocs-asciidoctor'
+	asciidoctorExtensions "org.springframework.restdocs:spring-restdocs-asciidoctor:$restdocsVersion"
 
-	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'
+	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.hateoas:spring-hateoas:2.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.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'
+	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 {
@@ -58,12 +57,10 @@ asciidoctor {
 	dependsOn test
 }
 
-bootJar {
+jar {
 	dependsOn asciidoctor
 	from ("${asciidoctor.outputDir}/html5") {
 		into 'static/docs'
 	}
 }
 
-eclipseJdt.onlyIf { false }
-cleanEclipseJdt.onlyIf { false }

samples/rest-notes-spring-hateoas/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-spring-hateoas/src/main/java/com/example/notes/ExceptionSupressingErrorAttributes.java

@@ -1,41 +0,0 @@
-/*
- * Copyright 2014-2017 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.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;
-import org.springframework.web.context.request.WebRequest;
-
-@Component
-class ExceptionSupressingErrorAttributes extends DefaultErrorAttributes {
-
-	@Override
-	public Map<String, Object> getErrorAttributes(WebRequest webRequest,
-			ErrorAttributeOptions options) {
-		Map<String, Object> errorAttributes = super.getErrorAttributes(webRequest, options);
-		errorAttributes.remove("exception");
-		Object message = webRequest.getAttribute("jakarta.servlet.error.message", RequestAttributes.SCOPE_REQUEST);
-		if (message != null) {
-			errorAttributes.put("message", message);
-		}
-		return errorAttributes;
-	}
-}

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

@@ -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;
 
 @Entity
 public class Note {

samples/rest-notes-spring-hateoas/src/main/java/com/example/notes/RestNotesSpringHateoas.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.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.hateoas.config.EnableHypermediaSupport;
+import org.springframework.hateoas.config.EnableHypermediaSupport.HypermediaType;
+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
+@EnableHypermediaSupport(type = HypermediaType.HAL)
 class RestNotesSpringHateoas {
 
-	public static void main(String[] args) {
-		SpringApplication.run(RestNotesSpringHateoas.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-spring-hateoas/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;
 
 @Entity
 public class Tag {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2020 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.
@@ -49,23 +49,27 @@ 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.constraints.ConstraintDescriptions;
 import org.springframework.restdocs.mockmvc.RestDocumentationResultHandler;
 import org.springframework.restdocs.payload.FieldDescriptor;
 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.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 import org.springframework.web.context.WebApplicationContext;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+@Transactional
+@WebAppConfiguration
 @RunWith(SpringRunner.class)
-@SpringBootTest
+@ContextConfiguration(classes = RestNotesSpringHateoas.class)
 public class ApiDocumentation {
 
 	@Rule

samples/rest-notes-spring-hateoas/src/test/java/com/example/notes/GettingStartedDocumentation.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.
@@ -27,6 +27,7 @@ import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuild
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.preprocessRequest;
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.preprocessResponse;
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@@ -41,21 +42,25 @@ 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.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.MvcResult;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.context.WebApplicationContext;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.jayway.jsonpath.JsonPath;
 
+@Transactional
+@WebAppConfiguration
 @RunWith(SpringRunner.class)
-@SpringBootTest
+@ContextConfiguration(classes = RestNotesSpringHateoas.class)
 public class GettingStartedDocumentation {
 
 	@Rule
@@ -76,6 +81,7 @@ public class GettingStartedDocumentation {
 				.alwaysDo(document("{method-name}/{step}/",
 						preprocessRequest(prettyPrint()),
 						preprocessResponse(prettyPrint())))
+				.alwaysDo(print())
 				.build();
 	}
 

samples/rest-notes-spring-hateoas/src/test/java/com/example/notes/NullOrNotBlankTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2018 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.
@@ -26,7 +26,6 @@ import jakarta.validation.Validator;
 
 import org.junit.Test;
 
-
 public class NullOrNotBlankTests {
 
 	private final Validator validator = Validation.buildDefaultValidatorFactory().getValidator();