Skip to content
This repository was archived by the owner on Dec 15, 2021. It is now read-only.

Commit e6a4e9e

Browse files
rstoyanchevrstoyanchev
committed
Merge pull request #75 from makhomed/master
Add repro project for SPR-11760
2 parents 007f473 + 2561c23 commit e6a4e9e

File tree

12 files changed

+906
-0
lines changed

12 files changed

+906
-0
lines changed

‎SPR-11760/pom.xml

Lines changed: 226 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,226 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>org.springframework.issues</groupId>
5+
<artifactId>SPR-11760</artifactId>
6+
<version>1.0-SNAPSHOT</version>
7+
<packaging>war</packaging>
8+
9+
<name>SPR-11760</name>
10+
<description>Spring MVC Issue SPR-11760 Reproduction Project</description>
11+
12+
<properties>
13+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
14+
<java.version>1.7</java.version>
15+
<spring.version>4.0.4.RELEASE</spring.version>
16+
<idea-annotations.version>12.0</idea-annotations.version>
17+
<jackson.version>2.3.3</jackson.version>
18+
<slf4j.version>1.7.7</slf4j.version>
19+
<logback.version>1.1.2</logback.version>
20+
21+
<jetty.version>9.1.2.v20140210</jetty.version>
22+
<cargo.container.id>tomcat7x</cargo.container.id>
23+
<cargo.container.url>
24+
http://www.eu.apache.org/dist/tomcat/tomcat-7/v7.0.52/bin/apache-tomcat-7.0.52.zip
25+
</cargo.container.url>
26+
</properties>
27+
28+
<dependencies>
29+
<!-- Spring Framework -->
30+
<dependency>
31+
<groupId>org.springframework</groupId>
32+
<artifactId>spring-context</artifactId>
33+
<version>${spring.version}</version>
34+
<exclusions>
35+
<!-- Exclude Commons Logging in favor of SLF4J -->
36+
<exclusion>
37+
<groupId>commons-logging</groupId>
38+
<artifactId>commons-logging</artifactId>
39+
</exclusion>
40+
</exclusions>
41+
</dependency>
42+
<dependency>
43+
<groupId>org.springframework</groupId>
44+
<artifactId>spring-webmvc</artifactId>
45+
<version>${spring.version}</version>
46+
</dependency>
47+
<!-- Logging -->
48+
<dependency>
49+
<groupId>org.slf4j</groupId>
50+
<artifactId>slf4j-api</artifactId>
51+
<version>${slf4j.version}</version>
52+
</dependency>
53+
<dependency>
54+
<groupId>org.slf4j</groupId>
55+
<artifactId>jcl-over-slf4j</artifactId>
56+
<version>${slf4j.version}</version>
57+
</dependency>
58+
<dependency>
59+
<groupId>ch.qos.logback</groupId>
60+
<artifactId>logback-classic</artifactId>
61+
<version>${logback.version}</version>
62+
</dependency>
63+
<dependency>
64+
<groupId>ch.qos.logback</groupId>
65+
<artifactId>logback-core</artifactId>
66+
<version>${logback.version}</version>
67+
</dependency>
68+
<!-- Servlet API -->
69+
<dependency>
70+
<groupId>javax.servlet</groupId>
71+
<artifactId>javax.servlet-api</artifactId>
72+
<version>3.0.1</version>
73+
<scope>provided</scope>
74+
</dependency>
75+
<!-- Jackson JSON Processor -->
76+
<dependency>
77+
<groupId>com.fasterxml.jackson.core</groupId>
78+
<artifactId>jackson-databind</artifactId>
79+
<version>${jackson.version}</version>
80+
</dependency>
81+
<!-- IDEA annotations -->
82+
<dependency>
83+
<groupId>com.intellij</groupId>
84+
<artifactId>annotations</artifactId>
85+
<version>${idea-annotations.version}</version>
86+
<scope>provided</scope>
87+
</dependency>
88+
<!-- JUnit -->
89+
<dependency>
90+
<groupId>junit</groupId>
91+
<artifactId>junit</artifactId>
92+
<version>4.11</version>
93+
<scope>test</scope>
94+
</dependency>
95+
<!-- Spring test -->
96+
<dependency>
97+
<groupId>org.springframework</groupId>
98+
<artifactId>spring-test</artifactId>
99+
<version>${spring.version}</version>
100+
<scope>test</scope>
101+
</dependency>
102+
</dependencies>
103+
104+
<build>
105+
<finalName>${project.name}</finalName>
106+
<defaultGoal>clean test</defaultGoal>
107+
<plugins>
108+
<plugin>
109+
<groupId>org.apache.maven.plugins</groupId>
110+
<artifactId>maven-compiler-plugin</artifactId>
111+
<version>2.5.1</version>
112+
<configuration>
113+
<source>${java.version}</source>
114+
<target>${java.version}</target>
115+
</configuration>
116+
</plugin>
117+
<plugin>
118+
<groupId>org.apache.maven.plugins</groupId>
119+
<artifactId>maven-dependency-plugin</artifactId>
120+
<version>2.8</version>
121+
<executions>
122+
<execution>
123+
<id>install</id>
124+
<phase>install</phase>
125+
<goals>
126+
<goal>sources</goal>
127+
</goals>
128+
</execution>
129+
</executions>
130+
</plugin>
131+
<plugin>
132+
<groupId>org.apache.maven.plugins</groupId>
133+
<artifactId>maven-eclipse-plugin</artifactId>
134+
<version>2.8</version>
135+
<configuration>
136+
<downloadSources>true</downloadSources>
137+
<downloadJavadocs>false</downloadJavadocs>
138+
<wtpversion>2.0</wtpversion>
139+
</configuration>
140+
</plugin>
141+
<plugin>
142+
<groupId>org.apache.maven.plugins</groupId>
143+
<artifactId>maven-surefire-plugin</artifactId>
144+
<version>2.12.4</version>
145+
<configuration>
146+
<includes>
147+
<include>**/*Tests.java</include>
148+
<include>**/*Test.java</include>
149+
</includes>
150+
<excludes>
151+
<exclude>**/*Abstract*.java</exclude>
152+
</excludes>
153+
</configuration>
154+
</plugin>
155+
<plugin>
156+
<groupId>org.eclipse.jetty</groupId>
157+
<artifactId>jetty-maven-plugin</artifactId>
158+
<version>${jetty.version}</version>
159+
</plugin>
160+
<plugin>
161+
<groupId>org.codehaus.cargo</groupId>
162+
<artifactId>cargo-maven2-plugin</artifactId>
163+
<version>1.4.7</version>
164+
<configuration>
165+
<configuration>
166+
<properties>
167+
<cargo.servlet.port>8080</cargo.servlet.port>
168+
<cargo.tomcat.ajp.port>1099</cargo.tomcat.ajp.port>
169+
<cargo.rmi.port>1099</cargo.rmi.port>
170+
<cargo.logging>medium</cargo.logging>
171+
<cargo.jvmargs>-Xms96m -Xmx512m -Djava.awt.headless=true</cargo.jvmargs>
172+
</properties>
173+
</configuration>
174+
<container>
175+
<containerId>${cargo.container.id}</containerId>
176+
<zipUrlInstaller>
177+
<url>${cargo.container.url}</url>
178+
</zipUrlInstaller>
179+
</container>
180+
</configuration>
181+
</plugin>
182+
</plugins>
183+
</build>
184+
185+
<profiles>
186+
<profile>
187+
<id>tomcat8</id>
188+
<properties>
189+
<cargo.container.id>tomcat8x</cargo.container.id>
190+
<cargo.container.url>
191+
http://www.eu.apache.org/dist/tomcat/tomcat-8/v8.0.3/bin/apache-tomcat-8.0.3.zip
192+
</cargo.container.url>
193+
</properties>
194+
</profile>
195+
<profile>
196+
<id>jetty8</id>
197+
<build>
198+
<plugins>
199+
<plugin>
200+
<groupId>org.codehaus.cargo</groupId>
201+
<artifactId>cargo-maven2-plugin</artifactId>
202+
<configuration>
203+
<container>
204+
<containerId>jetty8x</containerId>
205+
<type>embedded</type>
206+
</container>
207+
</configuration>
208+
</plugin>
209+
</plugins>
210+
</build>
211+
</profile>
212+
</profiles>
213+
214+
<repositories>
215+
<repository>
216+
<id>spring-maven-snapshot</id>
217+
<name>Springframework Maven Snapshot Repository</name>
218+
<url>http://repo.spring.io/snapshot</url>
219+
<snapshots>
220+
<enabled>true</enabled>
221+
</snapshots>
222+
</repository>
223+
</repositories>
224+
225+
</project>
226+

‎SPR-11760/src/main/java/org/springframework/issues/controller/GateController.java

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package org.springframework.issues.controller;
2+
3+
import org.slf4j.Logger;
4+
import org.slf4j.LoggerFactory;
5+
import org.springframework.http.HttpHeaders;
6+
import org.springframework.http.HttpStatus;
7+
import org.springframework.http.ResponseEntity;
8+
import org.springframework.stereotype.Controller;
9+
import org.springframework.web.bind.annotation.RequestMapping;
10+
11+
import javax.servlet.http.HttpServletRequest;
12+
13+
@Controller
14+
public class GateController {
15+
16+
private static final Logger logger = LoggerFactory.getLogger(GateController.class);
17+
private static final String X_HTTP_STATUS_OVERRIDE = "X-HTTP-Status-Override";
18+
19+
// ...
20+
21+
@RequestMapping
22+
public ResponseEntity<String> invalidRequestUriHandler(HttpServletRequest request) {
23+
IllegalArgumentException ex = new IllegalArgumentException(request.getRequestURI());
24+
logger.info("", ex);
25+
HttpHeaders httpHeaders = new HttpHeaders();
26+
httpHeaders.set(X_HTTP_STATUS_OVERRIDE, "230");
27+
return new ResponseEntity<>("", httpHeaders, HttpStatus.INTERNAL_SERVER_ERROR);
28+
}
29+
}

‎SPR-11760/src/main/java/org/springframework/issues/filter/HttpDump.java

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
package org.springframework.issues.filter;
2+
3+
import org.springframework.http.HttpHeaders;
4+
5+
public class HttpDump {
6+
7+
private long processingTime;
8+
private String requestMethod;
9+
private String requestUri;
10+
private HttpHeaders requestHeaders;
11+
private String requestBody;
12+
private int responseStatus;
13+
private HttpHeaders responseHeaders;
14+
private String responseBody;
15+
16+
public long getProcessingTime() {
17+
return processingTime;
18+
}
19+
20+
public void setProcessingTime(long processingTime) {
21+
this.processingTime = processingTime;
22+
}
23+
24+
public String getRequestMethod() {
25+
return requestMethod;
26+
}
27+
28+
public void setRequestMethod(String requestMethod) {
29+
this.requestMethod = requestMethod;
30+
}
31+
32+
public String getRequestUri() {
33+
return requestUri;
34+
}
35+
36+
public void setRequestUri(String requestUri) {
37+
this.requestUri = requestUri;
38+
}
39+
40+
public HttpHeaders getRequestHeaders() {
41+
return requestHeaders;
42+
}
43+
44+
public void setRequestHeaders(HttpHeaders requestHeaders) {
45+
this.requestHeaders = requestHeaders;
46+
}
47+
48+
public String getRequestBody() {
49+
return requestBody;
50+
}
51+
52+
public void setRequestBody(String requestBody) {
53+
this.requestBody = requestBody;
54+
}
55+
56+
public int getResponseStatus() {
57+
return responseStatus;
58+
}
59+
60+
public void setResponseStatus(int responseStatus) {
61+
this.responseStatus = responseStatus;
62+
}
63+
64+
public HttpHeaders getResponseHeaders() {
65+
return responseHeaders;
66+
}
67+
68+
public void setResponseHeaders(HttpHeaders responseHeaders) {
69+
this.responseHeaders = responseHeaders;
70+
}
71+
72+
public String getResponseBody() {
73+
return responseBody;
74+
}
75+
76+
public void setResponseBody(String responseBody) {
77+
this.responseBody = responseBody;
78+
}
79+
}

‎SPR-11760/src/main/java/org/springframework/issues/filter/HttpDumperFilter.java

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
package org.springframework.issues.filter;
2+
3+
import com.fasterxml.jackson.databind.ObjectMapper;
4+
import com.fasterxml.jackson.databind.ObjectWriter;
5+
import org.slf4j.Logger;
6+
import org.slf4j.LoggerFactory;
7+
import org.springframework.web.filter.OncePerRequestFilter;
8+
9+
import javax.servlet.FilterChain;
10+
import javax.servlet.ServletException;
11+
import javax.servlet.http.HttpServletRequest;
12+
import javax.servlet.http.HttpServletResponse;
13+
import java.io.IOException;
14+
15+
public class HttpDumperFilter extends OncePerRequestFilter {
16+
17+
private static final Logger logger = LoggerFactory.getLogger(HttpDumperFilter.class);
18+
private static final Logger dumper = LoggerFactory.getLogger("http.dumper");
19+
private final ObjectWriter objectWriter = new ObjectMapper().writer();
20+
21+
@Override
22+
protected void doFilterInternal(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, FilterChain filterChain) throws ServletException, IOException {
23+
try {
24+
long processingStarted = System.currentTimeMillis();
25+
HttpRequestWrapper request = new HttpRequestWrapper(httpServletRequest);
26+
HttpResponseWrapper response = new HttpResponseWrapper(httpServletResponse);
27+
filterChain.doFilter(request, response);
28+
response.flushContent();
29+
long processingTime = System.currentTimeMillis() - processingStarted;
30+
HttpDump httpDump = getDump(request, response, processingTime);
31+
dumper.info("{}", objectWriter.writeValueAsString(httpDump));
32+
} catch (Exception ex) {
33+
logger.error("", ex);
34+
throw ex;
35+
}
36+
}
37+
38+
private HttpDump getDump(HttpRequestWrapper request, HttpResponseWrapper response, long processingTime) throws IOException {
39+
HttpDump httpDump = new HttpDump();
40+
httpDump.setProcessingTime(processingTime);
41+
httpDump.setRequestUri(request.getRequestURI());
42+
httpDump.setRequestMethod(request.getMethod());
43+
httpDump.setRequestHeaders(request.getRequestHeaders());
44+
httpDump.setRequestBody(request.getRequestBody());
45+
httpDump.setResponseStatus(response.getStatus());
46+
httpDump.setResponseHeaders(response.getResponseHeaders());
47+
httpDump.setResponseBody(response.getResponseBody());
48+
return httpDump;
49+
}
50+
}

0 commit comments

Comments
 (0)