From 3c8eb441a8070afc0449d709242439f85c7c518c Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 3 Dec 2019 17:05:53 -0800 Subject: [PATCH] Improve missing header message See gh-103 --- .../io/spring/javaformat/checkstyle/check/messages.properties | 1 + .../src/test/resources/check/HeaderDate.txt | 4 +++- .../src/test/resources/check/HeaderMismatch.txt | 4 +++- .../src/test/resources/check/HeaderTooLong.txt | 4 +++- .../src/test/resources/check/HeaderTooShort.txt | 4 +++- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/spring-javaformat/spring-javaformat-checkstyle/src/main/resources/io/spring/javaformat/checkstyle/check/messages.properties b/spring-javaformat/spring-javaformat-checkstyle/src/main/resources/io/spring/javaformat/checkstyle/check/messages.properties index 25ba99e1..a4f9f9aa 100644 --- a/spring-javaformat/spring-javaformat-checkstyle/src/main/resources/io/spring/javaformat/checkstyle/check/messages.properties +++ b/spring-javaformat/spring-javaformat-checkstyle/src/main/resources/io/spring/javaformat/checkstyle/check/messages.properties @@ -1,5 +1,6 @@ catch.singleLetter=Single letter catch variable (use "ex" instead). header.unexpected=Unexpected header. +header.mismatch=Line does not match expected header line of ''{0}''. javadoc.badCase=Javadoc element descriptions should not start with an uppercase letter. javadoc.missingSince=Missing Javadoc @since tag. javadoc.publicSince=Javadoc @since tag should not be used on private classes. diff --git a/spring-javaformat/spring-javaformat-checkstyle/src/test/resources/check/HeaderDate.txt b/spring-javaformat/spring-javaformat-checkstyle/src/test/resources/check/HeaderDate.txt index cb61a4b8..3d109568 100644 --- a/spring-javaformat/spring-javaformat-checkstyle/src/test/resources/check/HeaderDate.txt +++ b/spring-javaformat/spring-javaformat-checkstyle/src/test/resources/check/HeaderDate.txt @@ -1 +1,3 @@ -+HeaderDate.java:2: header.mismatch [SpringHeader] ++HeaderDate.java:2 ++Line does not match expected header ++[SpringHeader] diff --git a/spring-javaformat/spring-javaformat-checkstyle/src/test/resources/check/HeaderMismatch.txt b/spring-javaformat/spring-javaformat-checkstyle/src/test/resources/check/HeaderMismatch.txt index 49868389..186d6aed 100644 --- a/spring-javaformat/spring-javaformat-checkstyle/src/test/resources/check/HeaderMismatch.txt +++ b/spring-javaformat/spring-javaformat-checkstyle/src/test/resources/check/HeaderMismatch.txt @@ -1 +1,3 @@ -+HeaderMismatch.java:5: header.mismatch [SpringHeader] \ No newline at end of file ++HeaderMismatch.java:5 ++Line does not match expected header ++[SpringHeader] diff --git a/spring-javaformat/spring-javaformat-checkstyle/src/test/resources/check/HeaderTooLong.txt b/spring-javaformat/spring-javaformat-checkstyle/src/test/resources/check/HeaderTooLong.txt index 1c85c9e3..02c7a81b 100644 --- a/spring-javaformat/spring-javaformat-checkstyle/src/test/resources/check/HeaderTooLong.txt +++ b/spring-javaformat/spring-javaformat-checkstyle/src/test/resources/check/HeaderTooLong.txt @@ -1 +1,3 @@ -+HeaderTooLong.java:15: header.mismatch [SpringHeader] ++HeaderTooLong.java:15: ++Line does not match expected header ++[SpringHeader] diff --git a/spring-javaformat/spring-javaformat-checkstyle/src/test/resources/check/HeaderTooShort.txt b/spring-javaformat/spring-javaformat-checkstyle/src/test/resources/check/HeaderTooShort.txt index 856886e8..4c47c177 100644 --- a/spring-javaformat/spring-javaformat-checkstyle/src/test/resources/check/HeaderTooShort.txt +++ b/spring-javaformat/spring-javaformat-checkstyle/src/test/resources/check/HeaderTooShort.txt @@ -1 +1,3 @@ -+HeaderTooShort.java:14: header.mismatch [SpringHeader] ++HeaderTooShort.java:14 ++Line does not match expected header ++[SpringHeader]