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

Fix package tangles

Browse Source
This commit is contained in:
Andy Wilkinson
2015-07-28 16:16:46 +01:00
parent ccc241860a
commit 1175ca91e2
19 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
docs/src/test/java/com/example/Payload.java
View File

@@ -17,17 +17,16 @@
package com.example;
import static org.springframework.restdocs.RestDocumentation.document;
import static org.springframework.restdocs.Attributes.attributes;
import static org.springframework.restdocs.Attributes.key;
import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
import static org.springframework.restdocs.snippet.Attributes.attributes;
import static org.springframework.restdocs.snippet.Attributes.key;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import static org.springframework.restdocs.Attributes.key;
import org.springframework.http.MediaType;
import org.springframework.restdocs.Attributes;
import org.springframework.restdocs.payload.FieldType;
import org.springframework.restdocs.snippet.Attributes;
import org.springframework.test.web.servlet.MockMvc;
public class Payload {

1
spring-restdocs/src/main/java/org/springframework/restdocs/config/RestDocumentationConfigurer.java
View File

@@ -21,7 +21,6 @@ import java.util.List;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.restdocs.RestDocumentation;
import org.springframework.restdocs.snippet.RestDocumentationContextPlaceholderResolver;
import org.springframework.restdocs.snippet.StandardWriterResolver;
import org.springframework.restdocs.snippet.WriterResolver;
import org.springframework.restdocs.templates.StandardTemplateResourceResolver;

3
spring-restdocs/src/main/java/org/springframework/restdocs/snippet/RestDocumentationContextPlaceholderResolver.java → spring-restdocs/src/main/java/org/springframework/restdocs/config/RestDocumentationContextPlaceholderResolver.java
View File

@@ -14,12 +14,11 @@
* limitations under the License.
*/
package org.springframework.restdocs.snippet;
package org.springframework.restdocs.config;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.springframework.restdocs.config.RestDocumentationContext;
import org.springframework.util.PropertyPlaceholderHelper.PlaceholderResolver;
/**

2
spring-restdocs/src/main/java/org/springframework/restdocs/curl/CurlDocumentation.java
View File

@@ -24,8 +24,8 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import org.springframework.restdocs.snippet.DocumentableHttpServletRequest;
import org.springframework.restdocs.snippet.SnippetWritingResultHandler;
import org.springframework.restdocs.util.DocumentableHttpServletRequest;
import org.springframework.test.web.servlet.MvcResult;
import org.springframework.util.StringUtils;
import org.springframework.web.multipart.MultipartFile;

2
spring-restdocs/src/main/java/org/springframework/restdocs/http/HttpDocumentation.java
View File

@@ -28,8 +28,8 @@ import java.util.Map.Entry;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.restdocs.snippet.DocumentableHttpServletRequest;
import org.springframework.restdocs.snippet.SnippetWritingResultHandler;
import org.springframework.restdocs.util.DocumentableHttpServletRequest;
import org.springframework.test.web.servlet.MvcResult;
import org.springframework.util.StringUtils;
import org.springframework.web.multipart.MultipartFile;

2
spring-restdocs/src/main/java/org/springframework/restdocs/hypermedia/LinkDescriptor.java
View File

@@ -19,7 +19,7 @@ package org.springframework.restdocs.hypermedia;
import java.util.HashMap;
import java.util.Map;
import org.springframework.restdocs.AbstractDescriptor;
import org.springframework.restdocs.snippet.AbstractDescriptor;
/**
* A description of a link found in a hypermedia API

2
spring-restdocs/src/main/java/org/springframework/restdocs/payload/FieldDescriptor.java
View File

@@ -19,7 +19,7 @@ package org.springframework.restdocs.payload;
import java.util.HashMap;
import java.util.Map;
import org.springframework.restdocs.AbstractDescriptor;
import org.springframework.restdocs.snippet.AbstractDescriptor;
/**
* A description of a field found in a request or response payload

2
spring-restdocs/src/main/java/org/springframework/restdocs/request/ParameterDescriptor.java
View File

@@ -19,7 +19,7 @@ package org.springframework.restdocs.request;
import java.util.HashMap;
import java.util.Map;
import org.springframework.restdocs.AbstractDescriptor;
import org.springframework.restdocs.snippet.AbstractDescriptor;
/**
* A descriptor of a parameter in a query string

4
spring-restdocs/src/main/java/org/springframework/restdocs/AbstractDescriptor.java → spring-restdocs/src/main/java/org/springframework/restdocs/snippet/AbstractDescriptor.java
View File

@@ -1,9 +1,9 @@
package org.springframework.restdocs;
package org.springframework.restdocs.snippet;
import java.util.HashMap;
import java.util.Map;
import org.springframework.restdocs.Attributes.Attribute;
import org.springframework.restdocs.snippet.Attributes.Attribute;
/**
* Base class for descriptors. Provides the ability to associate arbitrary attributes with

2
spring-restdocs/src/main/java/org/springframework/restdocs/Attributes.java → spring-restdocs/src/main/java/org/springframework/restdocs/snippet/Attributes.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.restdocs;
package org.springframework.restdocs.snippet;
import java.util.HashMap;
import java.util.Map;

2
spring-restdocs/src/main/java/org/springframework/restdocs/util/DocumentableHttpServletRequest.java → spring-restdocs/src/main/java/org/springframework/restdocs/snippet/DocumentableHttpServletRequest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.restdocs.util;
package org.springframework.restdocs.snippet;
import static org.springframework.restdocs.util.IterableEnumeration.iterable;

4
spring-restdocs/src/test/java/org/springframework/restdocs/RestDocumentationIntegrationTests.java
View File

@@ -20,14 +20,14 @@ import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.springframework.restdocs.Attributes.attributes;
import static org.springframework.restdocs.Attributes.key;
import static org.springframework.restdocs.RestDocumentation.document;
import static org.springframework.restdocs.RestDocumentation.modifyResponseTo;
import static org.springframework.restdocs.response.ResponsePostProcessors.maskLinks;
import static org.springframework.restdocs.response.ResponsePostProcessors.prettyPrintContent;
import static org.springframework.restdocs.response.ResponsePostProcessors.removeHeaders;
import static org.springframework.restdocs.response.ResponsePostProcessors.replacePattern;
import static org.springframework.restdocs.snippet.Attributes.attributes;
import static org.springframework.restdocs.snippet.Attributes.key;
import static org.springframework.restdocs.test.SnippetMatchers.httpResponse;
import static org.springframework.restdocs.test.SnippetMatchers.snippet;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;

4
spring-restdocs/src/test/java/org/springframework/restdocs/curl/CurlDocumentationTests.java
View File

@@ -19,9 +19,9 @@ package org.springframework.restdocs.curl;
import static org.hamcrest.CoreMatchers.containsString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.springframework.restdocs.Attributes.attributes;
import static org.springframework.restdocs.Attributes.key;
import static org.springframework.restdocs.curl.CurlDocumentation.documentCurlRequest;
import static org.springframework.restdocs.snippet.Attributes.attributes;
import static org.springframework.restdocs.snippet.Attributes.key;
import static org.springframework.restdocs.test.SnippetMatchers.codeBlock;
import static org.springframework.restdocs.test.StubMvcResult.result;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.fileUpload;

4
spring-restdocs/src/test/java/org/springframework/restdocs/http/HttpDocumentationTests.java
View File

@@ -21,10 +21,10 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.springframework.http.HttpStatus.BAD_REQUEST;
import static org.springframework.http.HttpStatus.OK;
import static org.springframework.restdocs.Attributes.attributes;
import static org.springframework.restdocs.Attributes.key;
import static org.springframework.restdocs.http.HttpDocumentation.documentHttpRequest;
import static org.springframework.restdocs.http.HttpDocumentation.documentHttpResponse;
import static org.springframework.restdocs.snippet.Attributes.attributes;
import static org.springframework.restdocs.snippet.Attributes.key;
import static org.springframework.restdocs.test.SnippetMatchers.httpRequest;
import static org.springframework.restdocs.test.SnippetMatchers.httpResponse;
import static org.springframework.restdocs.test.StubMvcResult.result;

4
spring-restdocs/src/test/java/org/springframework/restdocs/hypermedia/HypermediaDocumentationTests.java
View File

@@ -20,9 +20,9 @@ import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.startsWith;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.springframework.restdocs.Attributes.attributes;
import static org.springframework.restdocs.Attributes.key;
import static org.springframework.restdocs.hypermedia.HypermediaDocumentation.documentLinks;
import static org.springframework.restdocs.snippet.Attributes.attributes;
import static org.springframework.restdocs.snippet.Attributes.key;
import static org.springframework.restdocs.test.SnippetMatchers.tableWithHeader;
import static org.springframework.restdocs.test.StubMvcResult.result;

4
spring-restdocs/src/test/java/org/springframework/restdocs/payload/PayloadDocumentationTests.java
View File

@@ -20,11 +20,11 @@ import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.startsWith;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.springframework.restdocs.Attributes.attributes;
import static org.springframework.restdocs.Attributes.key;
import static org.springframework.restdocs.payload.PayloadDocumentation.documentRequestFields;
import static org.springframework.restdocs.payload.PayloadDocumentation.documentResponseFields;
import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
import static org.springframework.restdocs.snippet.Attributes.attributes;
import static org.springframework.restdocs.snippet.Attributes.key;
import static org.springframework.restdocs.test.SnippetMatchers.tableWithHeader;
import static org.springframework.restdocs.test.StubMvcResult.result;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;

4
spring-restdocs/src/test/java/org/springframework/restdocs/request/RequestDocumentationTests.java
View File

@@ -20,10 +20,10 @@ import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.startsWith;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.springframework.restdocs.Attributes.attributes;
import static org.springframework.restdocs.Attributes.key;
import static org.springframework.restdocs.request.RequestDocumentation.documentQueryParameters;
import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName;
import static org.springframework.restdocs.snippet.Attributes.attributes;
import static org.springframework.restdocs.snippet.Attributes.key;
import static org.springframework.restdocs.test.RestDocumentationRequestBuilders.get;
import static org.springframework.restdocs.test.SnippetMatchers.tableWithHeader;
import static org.springframework.restdocs.test.StubMvcResult.result;

1
spring-restdocs/src/test/java/org/springframework/restdocs/snippet/RestDocumentationContextPlaceholderResolverTests.java
View File

@@ -9,6 +9,7 @@ import java.lang.reflect.Method;
import org.junit.Test;
import org.springframework.restdocs.config.RestDocumentationContext;
import org.springframework.restdocs.config.RestDocumentationContextPlaceholderResolver;
import org.springframework.test.context.TestContext;
import org.springframework.util.PropertyPlaceholderHelper.PlaceholderResolver;

2
spring-restdocs/src/test/java/org/springframework/restdocs/test/StubMvcResult.java
View File

@@ -20,7 +20,7 @@ import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockServletContext;
import org.springframework.restdocs.config.RestDocumentationContext;
import org.springframework.restdocs.snippet.RestDocumentationContextPlaceholderResolver;
import org.springframework.restdocs.config.RestDocumentationContextPlaceholderResolver;
import org.springframework.restdocs.snippet.StandardWriterResolver;
import org.springframework.restdocs.snippet.WriterResolver;
import org.springframework.restdocs.templates.StandardTemplateResourceResolver;