Skip to content

Commit

Permalink
Merge pull request #936 from snicoll
Browse files Browse the repository at this point in the history
* gh-936:
  Revert "Fix compatibility problems with Spring Framework 6.2"

Closes gh-936
  • Loading branch information
wilkinsona committed Jul 18, 2024
2 parents cf451c9 + 737e6ea commit 8de30c4
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 56 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2014-2024 the original author or authors.
* Copyright 2014-2023 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.
Expand Down Expand Up @@ -51,8 +51,8 @@ private RestDocumentationRequestBuilders() {
* @return the builder for the GET request
*/
public static MockHttpServletRequestBuilder get(String urlTemplate, Object... urlVariables) {
return (MockHttpServletRequestBuilder) configureUrlTemplateRequestAttribute(
MockMvcRequestBuilders.get(urlTemplate, urlVariables), urlTemplate);
return MockMvcRequestBuilders.get(urlTemplate, urlVariables)
.requestAttr(RestDocumentationGenerator.ATTRIBUTE_NAME_URL_TEMPLATE, urlTemplate);
}

/**
Expand All @@ -72,8 +72,8 @@ public static MockHttpServletRequestBuilder get(URI uri) {
* @return the builder for the POST request
*/
public static MockHttpServletRequestBuilder post(String urlTemplate, Object... urlVariables) {
return (MockHttpServletRequestBuilder) configureUrlTemplateRequestAttribute(
MockMvcRequestBuilders.post(urlTemplate, urlVariables), urlTemplate);
return MockMvcRequestBuilders.post(urlTemplate, urlVariables)
.requestAttr(RestDocumentationGenerator.ATTRIBUTE_NAME_URL_TEMPLATE, urlTemplate);
}

/**
Expand All @@ -93,8 +93,8 @@ public static MockHttpServletRequestBuilder post(URI uri) {
* @return the builder for the PUT request
*/
public static MockHttpServletRequestBuilder put(String urlTemplate, Object... urlVariables) {
return (MockHttpServletRequestBuilder) configureUrlTemplateRequestAttribute(
MockMvcRequestBuilders.put(urlTemplate, urlVariables), urlTemplate);
return MockMvcRequestBuilders.put(urlTemplate, urlVariables)
.requestAttr(RestDocumentationGenerator.ATTRIBUTE_NAME_URL_TEMPLATE, urlTemplate);
}

/**
Expand All @@ -114,8 +114,8 @@ public static MockHttpServletRequestBuilder put(URI uri) {
* @return the builder for the PATCH request
*/
public static MockHttpServletRequestBuilder patch(String urlTemplate, Object... urlVariables) {
return (MockHttpServletRequestBuilder) configureUrlTemplateRequestAttribute(
MockMvcRequestBuilders.patch(urlTemplate, urlVariables), urlTemplate);
return MockMvcRequestBuilders.patch(urlTemplate, urlVariables)
.requestAttr(RestDocumentationGenerator.ATTRIBUTE_NAME_URL_TEMPLATE, urlTemplate);
}

/**
Expand All @@ -135,8 +135,8 @@ public static MockHttpServletRequestBuilder patch(URI uri) {
* @return the builder for the DELETE request
*/
public static MockHttpServletRequestBuilder delete(String urlTemplate, Object... urlVariables) {
return (MockHttpServletRequestBuilder) configureUrlTemplateRequestAttribute(
MockMvcRequestBuilders.delete(urlTemplate, urlVariables), urlTemplate);
return MockMvcRequestBuilders.delete(urlTemplate, urlVariables)
.requestAttr(RestDocumentationGenerator.ATTRIBUTE_NAME_URL_TEMPLATE, urlTemplate);
}

/**
Expand All @@ -156,8 +156,8 @@ public static MockHttpServletRequestBuilder delete(URI uri) {
* @return the builder for the OPTIONS request
*/
public static MockHttpServletRequestBuilder options(String urlTemplate, Object... urlVariables) {
return (MockHttpServletRequestBuilder) configureUrlTemplateRequestAttribute(
MockMvcRequestBuilders.options(urlTemplate, urlVariables), urlTemplate);
return MockMvcRequestBuilders.options(urlTemplate, urlVariables)
.requestAttr(RestDocumentationGenerator.ATTRIBUTE_NAME_URL_TEMPLATE, urlTemplate);
}

/**
Expand All @@ -177,8 +177,8 @@ public static MockHttpServletRequestBuilder options(URI uri) {
* @return the builder for the HEAD request
*/
public static MockHttpServletRequestBuilder head(String urlTemplate, Object... urlVariables) {
return (MockHttpServletRequestBuilder) configureUrlTemplateRequestAttribute(
MockMvcRequestBuilders.head(urlTemplate, urlVariables), urlTemplate);
return MockMvcRequestBuilders.head(urlTemplate, urlVariables)
.requestAttr(RestDocumentationGenerator.ATTRIBUTE_NAME_URL_TEMPLATE, urlTemplate);
}

/**
Expand All @@ -200,8 +200,8 @@ public static MockHttpServletRequestBuilder head(URI uri) {
*/
public static MockHttpServletRequestBuilder request(HttpMethod httpMethod, String urlTemplate,
Object... urlVariables) {
return (MockHttpServletRequestBuilder) configureUrlTemplateRequestAttribute(
MockMvcRequestBuilders.request(httpMethod, urlTemplate, urlVariables), urlTemplate);
return MockMvcRequestBuilders.request(httpMethod, urlTemplate, urlVariables)
.requestAttr(RestDocumentationGenerator.ATTRIBUTE_NAME_URL_TEMPLATE, urlTemplate);
}

/**
Expand All @@ -224,8 +224,8 @@ public static MockHttpServletRequestBuilder request(HttpMethod httpMethod, URI u
* @since 2.0.6
*/
public static MockMultipartHttpServletRequestBuilder multipart(String urlTemplate, Object... urlVariables) {
return (MockMultipartHttpServletRequestBuilder) configureUrlTemplateRequestAttribute(
MockMvcRequestBuilders.multipart(urlTemplate, urlVariables), urlTemplate);
return (MockMultipartHttpServletRequestBuilder) MockMvcRequestBuilders.multipart(urlTemplate, urlVariables)
.requestAttr(RestDocumentationGenerator.ATTRIBUTE_NAME_URL_TEMPLATE, urlTemplate);
}

/**
Expand All @@ -238,15 +238,4 @@ public static MockMultipartHttpServletRequestBuilder multipart(URI uri) {
return MockMvcRequestBuilders.multipart(uri);
}

private static Object configureUrlTemplateRequestAttribute(Object builder, String urlTemplate) {
try {
return builder.getClass()
.getMethod("requestAttr", String.class, Object.class)
.invoke(builder, RestDocumentationGenerator.ATTRIBUTE_NAME_URL_TEMPLATE, urlTemplate);
}
catch (Exception ex) {
throw new RuntimeException(ex);
}
}

}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2014-2024 the original author or authors.
* Copyright 2014-2023 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.
Expand Down Expand Up @@ -34,7 +34,6 @@
import org.springframework.restdocs.operation.OperationRequestPart;
import org.springframework.restdocs.operation.RequestCookie;
import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
import org.springframework.test.web.servlet.request.MockMultipartHttpServletRequestBuilder;
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;

import static org.assertj.core.api.Assertions.assertThat;
Expand Down Expand Up @@ -237,8 +236,4 @@ private OperationRequest createOperationRequest(MockHttpServletRequestBuilder bu
return this.factory.convert(builder.buildRequest(new MockServletContext()));
}

private OperationRequest createOperationRequest(MockMultipartHttpServletRequestBuilder builder) {
return this.factory.convert(builder.buildRequest(new MockServletContext()));
}

}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2014-2024 the original author or authors.
* Copyright 2014-2023 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.
Expand All @@ -26,7 +26,6 @@
import org.springframework.mock.web.MockServletContext;
import org.springframework.restdocs.generate.RestDocumentationGenerator;
import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
import org.springframework.test.web.servlet.request.MockMultipartHttpServletRequestBuilder;

import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.delete;
Expand Down Expand Up @@ -141,15 +140,6 @@ public void multipartUri() {

private void assertTemplate(MockHttpServletRequestBuilder builder, HttpMethod httpMethod) {
MockHttpServletRequest request = builder.buildRequest(this.servletContext);
assertTemplate(httpMethod, request);
}

private void assertTemplate(MockMultipartHttpServletRequestBuilder builder, HttpMethod httpMethod) {
MockHttpServletRequest request = builder.buildRequest(this.servletContext);
assertTemplate(httpMethod, request);
}

private void assertTemplate(HttpMethod httpMethod, MockHttpServletRequest request) {
assertThat((String) request.getAttribute(RestDocumentationGenerator.ATTRIBUTE_NAME_URL_TEMPLATE))
.isEqualTo("/{template}");
assertThat(request.getRequestURI()).isEqualTo("/t");
Expand All @@ -158,15 +148,6 @@ private void assertTemplate(HttpMethod httpMethod, MockHttpServletRequest reques

private void assertUri(MockHttpServletRequestBuilder builder, HttpMethod httpMethod) {
MockHttpServletRequest request = builder.buildRequest(this.servletContext);
assertUri(httpMethod, request);
}

private void assertUri(MockMultipartHttpServletRequestBuilder builder, HttpMethod httpMethod) {
MockHttpServletRequest request = builder.buildRequest(this.servletContext);
assertUri(httpMethod, request);
}

private void assertUri(HttpMethod httpMethod, MockHttpServletRequest request) {
assertThat(request.getRequestURI()).isEqualTo("/uri");
assertThat(request.getMethod()).isEqualTo(httpMethod.name());
}
Expand Down

0 comments on commit 8de30c4

Please sign in to comment.