ScaCap · jmisur · Sep 15, 2016 · Sep 15, 2016
diff --git a/spring-auto-restdocs-core/pom.xml b/spring-auto-restdocs-core/pom.xml
@@ -118,7 +118,7 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <doclet>capital.scalable.jsondoclet.ExtractDocumentationAsJsonDoclet</doclet>
+                    <doclet>capital.scalable.restdocs.jsondoclet.ExtractDocumentationAsJsonDoclet</doclet>
                     <docletArtifact>
                         <groupId>capital.scalable</groupId>
                         <artifactId>spring-auto-restdocs-json-doclet</artifactId>

diff --git a/...e/restdocs/jackson/AutoDocumentation.java → .../scalable/restdocs/AutoDocumentation.java b/...e/restdocs/jackson/AutoDocumentation.java → .../scalable/restdocs/AutoDocumentation.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package capital.scalable.restdocs.jackson;
+package capital.scalable.restdocs;
 
-import capital.scalable.restdocs.jackson.misc.AuthorizationSnippet;
-import capital.scalable.restdocs.jackson.misc.DescriptionSnippet;
-import capital.scalable.restdocs.jackson.misc.MethodAndPathSnippet;
-import capital.scalable.restdocs.jackson.misc.SectionSnippet;
-import capital.scalable.restdocs.jackson.payload.JacksonRequestFieldSnippet;
-import capital.scalable.restdocs.jackson.payload.JacksonResponseFieldSnippet;
-import capital.scalable.restdocs.jackson.request.PathParametersSnippet;
-import capital.scalable.restdocs.jackson.request.RequestParametersSnippet;
+import capital.scalable.restdocs.misc.AuthorizationSnippet;
+import capital.scalable.restdocs.misc.DescriptionSnippet;
+import capital.scalable.restdocs.misc.MethodAndPathSnippet;
+import capital.scalable.restdocs.misc.SectionSnippet;
+import capital.scalable.restdocs.payload.JacksonRequestFieldSnippet;
+import capital.scalable.restdocs.payload.JacksonResponseFieldSnippet;
+import capital.scalable.restdocs.request.PathParametersSnippet;
+import capital.scalable.restdocs.request.RequestParametersSnippet;
 import org.springframework.restdocs.snippet.Snippet;
 
 public abstract class AutoDocumentation {

diff --git a/...ocs/jackson/OperationAttributeHelper.java → ...le/restdocs/OperationAttributeHelper.java b/...ocs/jackson/OperationAttributeHelper.java → ...le/restdocs/OperationAttributeHelper.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package capital.scalable.restdocs.jackson;
+package capital.scalable.restdocs;
 
 import static org.springframework.web.servlet.HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE;
 
 import java.util.Map;
 
-import capital.scalable.restdocs.jackson.constraints.ConstraintReader;
-import capital.scalable.restdocs.jackson.javadoc.JavadocReader;
-import capital.scalable.restdocs.jackson.misc.AuthorizationSnippet;
+import capital.scalable.restdocs.constraints.ConstraintReader;
+import capital.scalable.restdocs.javadoc.JavadocReader;
+import capital.scalable.restdocs.misc.AuthorizationSnippet;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.restdocs.RestDocumentationContext;

diff --git a/...onstraintAndGroupDescriptionResolver.java → ...onstraintAndGroupDescriptionResolver.java b/...onstraintAndGroupDescriptionResolver.java → ...onstraintAndGroupDescriptionResolver.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package capital.scalable.restdocs.jackson.constraints;
+package capital.scalable.restdocs.constraints;
 
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonMap;

diff --git a/...jackson/constraints/ConstraintReader.java → ...estdocs/constraints/ConstraintReader.java b/...jackson/constraints/ConstraintReader.java → ...estdocs/constraints/ConstraintReader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package capital.scalable.restdocs.jackson.constraints;
+package capital.scalable.restdocs.constraints;
 
 import java.util.List;
 

diff --git a/...son/constraints/ConstraintReaderImpl.java → ...ocs/constraints/ConstraintReaderImpl.java b/...son/constraints/ConstraintReaderImpl.java → ...ocs/constraints/ConstraintReaderImpl.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package capital.scalable.restdocs.jackson.constraints;
+package capital.scalable.restdocs.constraints;
 
-import static capital.scalable.restdocs.jackson.constraints.SkippableConstraintResolver
+import static capital.scalable.restdocs.constraints.SkippableConstraintResolver
         .MANDATORY_VALUE_ANNOTATIONS;
 import static org.apache.commons.lang3.ArrayUtils.contains;
 

diff --git a/...constraints/GroupDescriptionResolver.java → ...constraints/GroupDescriptionResolver.java b/...constraints/GroupDescriptionResolver.java → ...constraints/GroupDescriptionResolver.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package capital.scalable.restdocs.jackson.constraints;
+package capital.scalable.restdocs.constraints;
 
 import java.util.List;
 

diff --git a/...ints/HumanReadableConstraintResolver.java → ...ints/HumanReadableConstraintResolver.java b/...ints/HumanReadableConstraintResolver.java → ...ints/HumanReadableConstraintResolver.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package capital.scalable.restdocs.jackson.constraints;
+package capital.scalable.restdocs.constraints;
 
 import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.util.StringUtils.arrayToDelimitedString;

diff --git a/...straints/SkippableConstraintResolver.java → ...straints/SkippableConstraintResolver.java b/...straints/SkippableConstraintResolver.java → ...straints/SkippableConstraintResolver.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package capital.scalable.restdocs.jackson.constraints;
+package capital.scalable.restdocs.constraints;
 
 import javax.validation.constraints.NotNull;
 import java.util.ArrayList;

diff --git a/...ckson/FieldDocumentationArrayVisitor.java → ...ckson/FieldDocumentationArrayVisitor.java b/...ckson/FieldDocumentationArrayVisitor.java → ...ckson/FieldDocumentationArrayVisitor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package capital.scalable.restdocs.jackson.jackson;
+package capital.scalable.restdocs.jackson;
 
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.JsonMappingException;

diff --git a/.../jackson/FieldDocumentationGenerator.java → .../jackson/FieldDocumentationGenerator.java b/.../jackson/FieldDocumentationGenerator.java → .../jackson/FieldDocumentationGenerator.java
@@ -14,15 +14,13 @@
  * limitations under the License.
  */
 
-package capital.scalable.restdocs.jackson.jackson;
-
-import static capital.scalable.restdocs.jackson.jackson.FieldDocumentationVisitorWrapper.create;
+package capital.scalable.restdocs.jackson;
 
 import java.lang.reflect.Type;
 import java.util.List;
 
-import capital.scalable.restdocs.jackson.constraints.ConstraintReader;
-import capital.scalable.restdocs.jackson.javadoc.JavadocReader;
+import capital.scalable.restdocs.constraints.ConstraintReader;
+import capital.scalable.restdocs.javadoc.JavadocReader;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectWriter;
@@ -48,7 +46,8 @@ public List<FieldDescriptor> generateDocumentation(Type type, TypeFactory typeFa
     }
 
     public List<FieldDescriptor> generateDocumentation(JavaType type) throws JsonMappingException {
-        FieldDocumentationVisitorWrapper visitorWrapper = create(javadocReader, constraintReader);
+        FieldDocumentationVisitorWrapper visitorWrapper = FieldDocumentationVisitorWrapper.create(
+                javadocReader, constraintReader);
         writer.acceptJsonFormatVisitor(type, visitorWrapper);
         return visitorWrapper.getContext().getFields();
     }

diff --git a/...kson/FieldDocumentationObjectVisitor.java → ...kson/FieldDocumentationObjectVisitor.java b/...kson/FieldDocumentationObjectVisitor.java → ...kson/FieldDocumentationObjectVisitor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package capital.scalable.restdocs.jackson.jackson;
+package capital.scalable.restdocs.jackson;
 
 import static org.apache.commons.collections.IteratorUtils.toList;
 

diff --git a/...son/FieldDocumentationVisitorContext.java → ...son/FieldDocumentationVisitorContext.java b/...son/FieldDocumentationVisitorContext.java → ...son/FieldDocumentationVisitorContext.java
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package capital.scalable.restdocs.jackson.jackson;
+package capital.scalable.restdocs.jackson;
 
-import static capital.scalable.restdocs.jackson.constraints.ConstraintReader.CONSTRAINTS_ATTRIBUTE;
-import static capital.scalable.restdocs.jackson.constraints.ConstraintReader.OPTIONAL_ATTRIBUTE;
-import static capital.scalable.restdocs.jackson.util.FieldUtil.fromGetter;
-import static capital.scalable.restdocs.jackson.util.FieldUtil.isGetter;
+import static capital.scalable.restdocs.constraints.ConstraintReader.CONSTRAINTS_ATTRIBUTE;
+import static capital.scalable.restdocs.constraints.ConstraintReader.OPTIONAL_ATTRIBUTE;
+import static capital.scalable.restdocs.util.FieldUtil.fromGetter;
+import static capital.scalable.restdocs.util.FieldUtil.isGetter;
 import static org.apache.commons.lang3.StringUtils.isBlank;
 import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import capital.scalable.restdocs.jackson.constraints.ConstraintReader;
-import capital.scalable.restdocs.jackson.javadoc.JavadocReader;
+import capital.scalable.restdocs.constraints.ConstraintReader;
+import capital.scalable.restdocs.javadoc.JavadocReader;
 import org.springframework.restdocs.payload.FieldDescriptor;
 import org.springframework.restdocs.snippet.Attributes.Attribute;
 

diff --git a/...son/FieldDocumentationVisitorWrapper.java → ...son/FieldDocumentationVisitorWrapper.java b/...son/FieldDocumentationVisitorWrapper.java → ...son/FieldDocumentationVisitorWrapper.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package capital.scalable.restdocs.jackson.jackson;
+package capital.scalable.restdocs.jackson;
 
-import capital.scalable.restdocs.jackson.constraints.ConstraintReader;
-import capital.scalable.restdocs.jackson.javadoc.JavadocReader;
+import capital.scalable.restdocs.constraints.ConstraintReader;
+import capital.scalable.restdocs.javadoc.JavadocReader;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.SerializerProvider;

diff --git a/...cs/jackson/jackson/InternalFieldInfo.java → ...e/restdocs/jackson/InternalFieldInfo.java b/...cs/jackson/jackson/InternalFieldInfo.java → ...e/restdocs/jackson/InternalFieldInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package capital.scalable.restdocs.jackson.jackson;
+package capital.scalable.restdocs.jackson;
 
 import java.lang.annotation.Annotation;
 import java.util.List;

diff --git a/...ackson/jackson/JacksonResultHandlers.java → ...stdocs/jackson/JacksonResultHandlers.java b/...ackson/jackson/JacksonResultHandlers.java → ...stdocs/jackson/JacksonResultHandlers.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package capital.scalable.restdocs.jackson.jackson;
+package capital.scalable.restdocs.jackson;
 
-import static capital.scalable.restdocs.jackson.OperationAttributeHelper.initRequestPattern;
-import static capital.scalable.restdocs.jackson.OperationAttributeHelper.setConstraintReader;
-import static capital.scalable.restdocs.jackson.OperationAttributeHelper.setHandlerMethod;
-import static capital.scalable.restdocs.jackson.OperationAttributeHelper.setJavadocReader;
-import static capital.scalable.restdocs.jackson.OperationAttributeHelper.setObjectMapper;
+import static capital.scalable.restdocs.OperationAttributeHelper.initRequestPattern;
+import static capital.scalable.restdocs.OperationAttributeHelper.setConstraintReader;
+import static capital.scalable.restdocs.OperationAttributeHelper.setHandlerMethod;
+import static capital.scalable.restdocs.OperationAttributeHelper.setJavadocReader;
+import static capital.scalable.restdocs.OperationAttributeHelper.setObjectMapper;
 
-import capital.scalable.restdocs.jackson.constraints.ConstraintReaderImpl;
-import capital.scalable.restdocs.jackson.javadoc.JavadocReaderImpl;
+import capital.scalable.restdocs.constraints.ConstraintReaderImpl;
+import capital.scalable.restdocs.javadoc.JavadocReaderImpl;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.ResultHandler;

diff --git a/.../jackson/jackson/RestdocsNotExpanded.java → ...restdocs/jackson/RestdocsNotExpanded.java b/.../jackson/jackson/RestdocsNotExpanded.java → ...restdocs/jackson/RestdocsNotExpanded.java
@@ -1,4 +1,4 @@
-package capital.scalable.restdocs.jackson.jackson;
+package capital.scalable.restdocs.jackson;
 
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.ElementType.CONSTRUCTOR;

diff --git a/...estdocs/jackson/javadoc/ClassJavadoc.java → ...alable/restdocs/javadoc/ClassJavadoc.java b/...estdocs/jackson/javadoc/ClassJavadoc.java → ...alable/restdocs/javadoc/ClassJavadoc.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package capital.scalable.restdocs.jackson.javadoc;
+package capital.scalable.restdocs.javadoc;
 
 import static org.springframework.util.StringUtils.hasText;
 

diff --git a/...stdocs/jackson/javadoc/JavadocReader.java → ...lable/restdocs/javadoc/JavadocReader.java b/...stdocs/jackson/javadoc/JavadocReader.java → ...lable/restdocs/javadoc/JavadocReader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package capital.scalable.restdocs.jackson.javadoc;
+package capital.scalable.restdocs.javadoc;
 
 public interface JavadocReader {
     String resolveFieldComment(Class<?> javaBaseClass, String javaFieldName);

diff --git a/...cs/jackson/javadoc/JavadocReaderImpl.java → ...e/restdocs/javadoc/JavadocReaderImpl.java b/...cs/jackson/javadoc/JavadocReaderImpl.java → ...e/restdocs/javadoc/JavadocReaderImpl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package capital.scalable.restdocs.jackson.javadoc;
+package capital.scalable.restdocs.javadoc;
 
 import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.util.StringUtils.hasText;

diff --git a/...cs/jackson/misc/AuthorizationSnippet.java → ...e/restdocs/misc/AuthorizationSnippet.java b/...cs/jackson/misc/AuthorizationSnippet.java → ...e/restdocs/misc/AuthorizationSnippet.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package capital.scalable.restdocs.jackson.misc;
+package capital.scalable.restdocs.misc;
 
-import static capital.scalable.restdocs.jackson.OperationAttributeHelper.getAuthorization;
-import static capital.scalable.restdocs.jackson.OperationAttributeHelper.setAuthorization;
+import static capital.scalable.restdocs.OperationAttributeHelper.getAuthorization;
+import static capital.scalable.restdocs.OperationAttributeHelper.setAuthorization;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...docs/jackson/misc/DescriptionSnippet.java → ...ble/restdocs/misc/DescriptionSnippet.java b/...docs/jackson/misc/DescriptionSnippet.java → ...ble/restdocs/misc/DescriptionSnippet.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package capital.scalable.restdocs.jackson.misc;
+package capital.scalable.restdocs.misc;
 
-import static capital.scalable.restdocs.jackson.OperationAttributeHelper.getHandlerMethod;
-import static capital.scalable.restdocs.jackson.OperationAttributeHelper.getJavadocReader;
+import static capital.scalable.restdocs.OperationAttributeHelper.getHandlerMethod;
+import static capital.scalable.restdocs.OperationAttributeHelper.getJavadocReader;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...cs/jackson/misc/MethodAndPathSnippet.java → ...e/restdocs/misc/MethodAndPathSnippet.java b/...cs/jackson/misc/MethodAndPathSnippet.java → ...e/restdocs/misc/MethodAndPathSnippet.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package capital.scalable.restdocs.jackson.misc;
+package capital.scalable.restdocs.misc;
 
-import static capital.scalable.restdocs.jackson.OperationAttributeHelper.getRequestMethod;
-import static capital.scalable.restdocs.jackson.OperationAttributeHelper.getRequestPattern;
+import static capital.scalable.restdocs.OperationAttributeHelper.getRequestMethod;
+import static capital.scalable.restdocs.OperationAttributeHelper.getRequestPattern;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...restdocs/jackson/misc/SectionSnippet.java → ...calable/restdocs/misc/SectionSnippet.java b/...restdocs/jackson/misc/SectionSnippet.java → ...calable/restdocs/misc/SectionSnippet.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package capital.scalable.restdocs.jackson.misc;
+package capital.scalable.restdocs.misc;
 
-import static capital.scalable.restdocs.jackson.OperationAttributeHelper.getDocumentationContext;
-import static capital.scalable.restdocs.jackson.OperationAttributeHelper.getHandlerMethod;
+import static capital.scalable.restdocs.OperationAttributeHelper.getDocumentationContext;
+import static capital.scalable.restdocs.OperationAttributeHelper.getHandlerMethod;
 import static org.apache.commons.lang3.StringUtils.join;
 import static org.apache.commons.lang3.StringUtils.splitByCharacterTypeCamelCase;
 import static org.springframework.util.StringUtils.capitalize;

diff --git a/.../payload/AbstractJacksonFieldSnippet.java → .../payload/AbstractJacksonFieldSnippet.java b/.../payload/AbstractJacksonFieldSnippet.java → .../payload/AbstractJacksonFieldSnippet.java
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package capital.scalable.restdocs.jackson.payload;
+package capital.scalable.restdocs.payload;
 
-import static capital.scalable.restdocs.jackson.OperationAttributeHelper.getConstraintReader;
-import static capital.scalable.restdocs.jackson.OperationAttributeHelper.getJavadocReader;
-import static capital.scalable.restdocs.jackson.OperationAttributeHelper.getObjectMapper;
+import static capital.scalable.restdocs.OperationAttributeHelper.getConstraintReader;
+import static capital.scalable.restdocs.OperationAttributeHelper.getJavadocReader;
+import static capital.scalable.restdocs.OperationAttributeHelper.getObjectMapper;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import capital.scalable.restdocs.jackson.constraints.ConstraintReader;
-import capital.scalable.restdocs.jackson.jackson.FieldDocumentationGenerator;
-import capital.scalable.restdocs.jackson.javadoc.JavadocReader;
-import capital.scalable.restdocs.jackson.snippet.StandardTableSnippet;
+import capital.scalable.restdocs.constraints.ConstraintReader;
+import capital.scalable.restdocs.jackson.FieldDocumentationGenerator;
+import capital.scalable.restdocs.javadoc.JavadocReader;
+import capital.scalable.restdocs.snippet.StandardTableSnippet;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.core.MethodParameter;

diff --git a/...load/JacksonFieldProcessingException.java → ...load/JacksonFieldProcessingException.java b/...load/JacksonFieldProcessingException.java → ...load/JacksonFieldProcessingException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package capital.scalable.restdocs.jackson.payload;
+package capital.scalable.restdocs.payload;
 
 public class JacksonFieldProcessingException extends RuntimeException {
 

diff --git a/...n/payload/JacksonRequestFieldSnippet.java → ...s/payload/JacksonRequestFieldSnippet.java b/...n/payload/JacksonRequestFieldSnippet.java → ...s/payload/JacksonRequestFieldSnippet.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package capital.scalable.restdocs.jackson.payload;
+package capital.scalable.restdocs.payload;
 
 import java.lang.reflect.GenericArrayType;
 import java.lang.reflect.Type;

diff --git a/.../payload/JacksonResponseFieldSnippet.java → .../payload/JacksonResponseFieldSnippet.java b/.../payload/JacksonResponseFieldSnippet.java → .../payload/JacksonResponseFieldSnippet.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package capital.scalable.restdocs.jackson.payload;
+package capital.scalable.restdocs.payload;
 
 import java.lang.reflect.GenericArrayType;
 import java.lang.reflect.Type;