Upgrade to Checkstyle 8.45.1

Closes gh-275

Author: wilkinsona

README.adoc

@@ -1,5 +1,5 @@
 :release-version: 0.0.28
-:checkstyle-version: 8.32
+:checkstyle-version: 8.45.1
 == Spring Java Format
 
 

pom.xml

@@ -38,7 +38,7 @@
 		<ant-contrib.version>1.0b3</ant-contrib.version>
 		<asm.version>5.2</asm.version>
 		<assertj.version>3.8.0</assertj.version>
-		<checkstyle.version>8.32</checkstyle.version>
+		<checkstyle.version>8.45.1</checkstyle.version>
 		<gradle.version>3.4</gradle.version>
 		<groovy.version>2.4.21</groovy.version>
 		<maven-core.version>3.5.0</maven-core.version>

spring-javaformat/spring-javaformat-checkstyle/src/main/java/io/spring/javaformat/checkstyle/SpringChecks.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 the original author or authors.
+ * Copyright 2017-2021 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.
@@ -38,7 +38,7 @@
 import com.puppycrawl.tools.checkstyle.api.ExternalResourceHolder;
 import com.puppycrawl.tools.checkstyle.api.FileSetCheck;
 import com.puppycrawl.tools.checkstyle.api.FileText;
-import com.puppycrawl.tools.checkstyle.api.LocalizedMessage;
+import com.puppycrawl.tools.checkstyle.api.Violation;
 import com.puppycrawl.tools.checkstyle.filters.SuppressFilterElement;
 
 import io.spring.javaformat.checkstyle.check.SpringHeaderCheck;
@@ -135,11 +135,11 @@ public void beginProcessing(String charset) {
 
 	@Override
 	protected void processFiltered(File file, FileText fileText) throws CheckstyleException {
-		SortedSet<LocalizedMessage> messages = new TreeSet<>();
+		SortedSet<Violation> violations = new TreeSet<>();
 		for (FileSetCheck check : this.checks) {
-			messages.addAll(check.process(file, fileText));
+			violations.addAll(check.process(file, fileText));
 		}
-		addMessages(messages);
+		addViolations(violations);
 	}
 
 	@Override

spring-javaformat/spring-javaformat-checkstyle/src/main/java/io/spring/javaformat/checkstyle/filter/CheckFilter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 the original author or authors.
+ * Copyright 2017-2021 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.
@@ -28,7 +28,7 @@
 import com.puppycrawl.tools.checkstyle.api.Configuration;
 import com.puppycrawl.tools.checkstyle.api.Context;
 import com.puppycrawl.tools.checkstyle.api.DetailAST;
-import com.puppycrawl.tools.checkstyle.api.LocalizedMessage;
+import com.puppycrawl.tools.checkstyle.api.Violation;
 
 /**
  * Base class for {@link AbstractCheck checks} that act as a filter for a single child.
@@ -100,14 +100,14 @@ public boolean isCommentNodesRequired() {
 	}
 
 	@Override
-	public SortedSet<LocalizedMessage> getMessages() {
-		return this.check.getMessages();
+	public SortedSet<Violation> getViolations() {
+		return this.check.getViolations();
 	}
 
 	@Override
 	public void beginTree(DetailAST rootAST) {
 		this.check.setFileContents(getFileContents());
-		this.check.clearMessages();
+		this.check.clearViolations();
 		this.check.beginTree(rootAST);
 	}
 

spring-javaformat/spring-javaformat-checkstyle/src/main/java/io/spring/javaformat/checkstyle/filter/RequiresOuterThisFilter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2021 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.
@@ -21,7 +21,7 @@
 
 import com.puppycrawl.tools.checkstyle.TreeWalkerAuditEvent;
 import com.puppycrawl.tools.checkstyle.TreeWalkerFilter;
-import com.puppycrawl.tools.checkstyle.api.LocalizedMessage;
+import com.puppycrawl.tools.checkstyle.api.Violation;
 
 /**
  * {@link TreeWalkerFilter} that can used to relax the {@code 'this.'} requirement when
@@ -35,9 +35,9 @@ public class RequiresOuterThisFilter implements TreeWalkerFilter {
 
 	@Override
 	public boolean accept(TreeWalkerAuditEvent event) {
-		LocalizedMessage message = event.getLocalizedMessage();
-		if ("require.this.variable".equals(message.getKey())) {
-			Object[] args = getArgs(message);
+		Violation violation = event.getViolation();
+		if ("require.this.variable".equals(violation.getKey())) {
+			Object[] args = getArgs(violation);
 			String prefex = (args.length > 1 ? Objects.toString(args[1]) : null);
 			if (prefex != null && prefex.length() > 0) {
 				return false;
@@ -46,12 +46,12 @@ public boolean accept(TreeWalkerAuditEvent event) {
 		return true;
 	}
 
-	private Object[] getArgs(LocalizedMessage message) {
+	private Object[] getArgs(Violation violation) {
 		if (ARGS_FIELD == null) {
 			throw new IllegalStateException("Unable to extract message args");
 		}
 		try {
-			return (Object[]) ARGS_FIELD.get(message);
+			return (Object[]) ARGS_FIELD.get(violation);
 		}
 		catch (Exception ex) {
 			return null;
@@ -60,7 +60,7 @@ private Object[] getArgs(LocalizedMessage message) {
 
 	private static Field getArgsField() {
 		try {
-			Field field = LocalizedMessage.class.getDeclaredField("args");
+			Field field = Violation.class.getDeclaredField("args");
 			field.setAccessible(true);
 			return field;
 		}

spring-javaformat/spring-javaformat-checkstyle/src/test/java/io/spring/javaformat/checkstyle/AssertionsAuditListener.java

@@ -27,8 +27,8 @@
 import com.puppycrawl.tools.checkstyle.Definitions;
 import com.puppycrawl.tools.checkstyle.api.AuditEvent;
 import com.puppycrawl.tools.checkstyle.api.AuditListener;
-import com.puppycrawl.tools.checkstyle.api.LocalizedMessage;
 import com.puppycrawl.tools.checkstyle.api.SeverityLevel;
+import com.puppycrawl.tools.checkstyle.api.Violation;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -110,8 +110,8 @@ private void recordLevel(AuditEvent event) {
 	}
 
 	private void recordLocalizedMessage(String message, String... args) {
-		recordMessage(new LocalizedMessage(0, Definitions.CHECKSTYLE_BUNDLE, message, args, null,
-				LocalizedMessage.class, null).getMessage());
+		recordMessage(new Violation(0, Definitions.CHECKSTYLE_BUNDLE, message, args, null,
+				Violation.class, null).getViolation());
 	}
 
 	private void recordMessage(String message) {

spring-javaformat/spring-javaformat-checkstyle/src/test/resources/source/SpringApplication.java

@@ -935,8 +935,8 @@ public void setMainApplicationClass(Class<?> mainApplicationClass) {
 	/**
 	 * Returns whether this {@link SpringApplication} is running within a web environment.
 	 * @return {@code true} if running within a web environment, otherwise {@code false}.
-	 * @see #setWebEnvironment(boolean)
 	 * @deprecated since 2.0.0 in favor of {@link #getWebApplicationType()}
+	 * @see #setWebEnvironment(boolean)
 	 */
 	@Deprecated
 	public boolean isWebEnvironment() {