From 559357e211dab46fbbc638cb152bb447498c6982 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Tue, 3 Jul 2018 18:47:34 +0900 Subject: [PATCH 1/2] Remove redundant static modifier for enums Closes gh-526 --- .../org/springframework/restdocs/payload/JsonFieldPath.java | 2 +- .../springframework/restdocs/payload/JsonFieldProcessor.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-restdocs-core/src/main/java/org/springframework/restdocs/payload/JsonFieldPath.java b/spring-restdocs-core/src/main/java/org/springframework/restdocs/payload/JsonFieldPath.java index cafd161a..564ba8ff 100644 --- a/spring-restdocs-core/src/main/java/org/springframework/restdocs/payload/JsonFieldPath.java +++ b/spring-restdocs-core/src/main/java/org/springframework/restdocs/payload/JsonFieldPath.java @@ -127,7 +127,7 @@ final class JsonFieldPath { /** * The type of a field path. */ - static enum PathType { + enum PathType { /** * The path identifies a single item in the payload. diff --git a/spring-restdocs-core/src/main/java/org/springframework/restdocs/payload/JsonFieldProcessor.java b/spring-restdocs-core/src/main/java/org/springframework/restdocs/payload/JsonFieldProcessor.java index 2cc7eb63..9639bf75 100644 --- a/spring-restdocs-core/src/main/java/org/springframework/restdocs/payload/JsonFieldProcessor.java +++ b/spring-restdocs-core/src/main/java/org/springframework/restdocs/payload/JsonFieldProcessor.java @@ -195,7 +195,7 @@ final class JsonFieldProcessor { || this.matchType == MatchType.NULL; } - private static enum MatchType { + private enum MatchType { ABSENT, MIXED, NONE, NULL, NON_NULL; From cae53fdf3c9a3f949f1e680768f41949a4f83f44 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 16 Jul 2018 16:05:02 +0100 Subject: [PATCH 2/2] Polish "Remove redundant static modifier for enums" See gh-526 --- .../org/springframework/restdocs/payload/JsonFieldPath.java | 2 +- .../springframework/restdocs/payload/JsonFieldProcessor.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-restdocs-core/src/main/java/org/springframework/restdocs/payload/JsonFieldPath.java b/spring-restdocs-core/src/main/java/org/springframework/restdocs/payload/JsonFieldPath.java index 564ba8ff..c122c259 100644 --- a/spring-restdocs-core/src/main/java/org/springframework/restdocs/payload/JsonFieldPath.java +++ b/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. diff --git a/spring-restdocs-core/src/main/java/org/springframework/restdocs/payload/JsonFieldProcessor.java b/spring-restdocs-core/src/main/java/org/springframework/restdocs/payload/JsonFieldProcessor.java index 9639bf75..78b050ae 100644 --- a/spring-restdocs-core/src/main/java/org/springframework/restdocs/payload/JsonFieldProcessor.java +++ b/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.