Merge branch '1.2.x'

Author: wilkinsona

spring-restdocs-core/src/main/java/org/springframework/restdocs/payload/JsonFieldPath.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-2018 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.
@@ -127,7 +127,7 @@ private static List<String> extractDotSeparatedSegments(String path) {
 	/**
 	 * The type of a field path.
 	 */
-	static enum PathType {
+	enum PathType {
 
 		/**
 		 * The path identifies a single item in the payload.

spring-restdocs-core/src/main/java/org/springframework/restdocs/payload/JsonFieldProcessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-2018 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.
@@ -180,7 +180,7 @@ boolean fieldFound() {
 					|| this.matchType == MatchType.NULL;
 		}
 
-		private static enum MatchType {
+		private enum MatchType {
 
 			ABSENT, MIXED, NONE, NULL, NON_NULL;