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

Upgrade Boot-based samples to Spring Boot 2.0.0.M6

Browse Source 
Closes gh-444
This commit is contained in:
Andy Wilkinson
2017-11-06 21:18:55 +00:00
parent 9c9a6f4489
commit a8169cce0b
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/rest-notes-slate/build.gradle
View File

@@ -3,7 +3,7 @@ buildscript {
maven { url 'https://repo.spring.io/milestone' }
}
dependencies {
classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.0.0.M1'
classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.0.0.M6'
}
}

2
samples/rest-notes-spring-data-rest/pom.xml
View File

@@ -11,7 +11,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.0.M1</version>
<version>2.0.0.M6</version>
<relativePath />
</parent>

2
samples/rest-notes-spring-hateoas/build.gradle
View File

@@ -3,7 +3,7 @@ buildscript {
maven { url 'https://repo.spring.io/milestone' }
}
dependencies {
classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.0.0.M1'
classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.0.0.M6'
}
}

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

@@ -18,19 +18,20 @@ package com.example.notes;
import java.util.Map;
import org.springframework.boot.autoconfigure.web.servlet.error.DefaultErrorAttributes;
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(RequestAttributes requestAttributes,
public Map<String, Object> getErrorAttributes(WebRequest webRequest,
boolean includeStackTrace) {
Map<String, Object> errorAttributes = super.getErrorAttributes(requestAttributes, includeStackTrace);
Map<String, Object> errorAttributes = super.getErrorAttributes(webRequest, includeStackTrace);
errorAttributes.remove("exception");
Object message = requestAttributes.getAttribute("javax.servlet.error.message", RequestAttributes.SCOPE_REQUEST);
Object message = webRequest.getAttribute("javax.servlet.error.message", RequestAttributes.SCOPE_REQUEST);
if (message != null) {
errorAttributes.put("message", message);
}

2
samples/testng/build.gradle
View File

@@ -3,7 +3,7 @@ buildscript {
maven { url 'https://repo.spring.io/milestone' }
}
dependencies {
classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.0.0.M1'
classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.0.0.M6'
}
}