From 557dbba58567cf838dbdc6ef565a8828c8540ac5 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 28 May 2024 18:45:05 +0200 Subject: [PATCH 1/2] Remove superfluous addToClassHierarchy call for Enum types Closes gh-32906 --- .../core/convert/support/GenericConversionService.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java b/spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java index 0075400dfa..a662918b64 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java +++ b/spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2023 the original author or authors. + * Copyright 2002-2024 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. @@ -561,9 +561,8 @@ public class GenericConversionService implements ConfigurableConversionService { } if (Enum.class.isAssignableFrom(type)) { - addToClassHierarchy(hierarchy.size(), Enum.class, array, hierarchy, visited); addToClassHierarchy(hierarchy.size(), Enum.class, false, hierarchy, visited); - addInterfacesToClassHierarchy(Enum.class, array, hierarchy, visited); + addInterfacesToClassHierarchy(Enum.class, false, hierarchy, visited); } addToClassHierarchy(hierarchy.size(), Object.class, array, hierarchy, visited); From 8c6a7799be87ad1b1af24caa3976ce99d9c873d8 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 28 May 2024 18:46:22 +0200 Subject: [PATCH 2/2] Upgrade to Checkstyle 10.17 --- .../java/org/springframework/build/CheckstyleConventions.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java b/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java index f8474a5cca..948219ac80 100644 --- a/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java +++ b/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java @@ -50,7 +50,7 @@ public class CheckstyleConventions { project.getPlugins().apply(CheckstylePlugin.class); project.getTasks().withType(Checkstyle.class).forEach(checkstyle -> checkstyle.getMaxHeapSize().set("1g")); CheckstyleExtension checkstyle = project.getExtensions().getByType(CheckstyleExtension.class); - checkstyle.setToolVersion("10.16.0"); + checkstyle.setToolVersion("10.17.0"); checkstyle.getConfigDirectory().set(project.getRootProject().file("src/checkstyle")); String version = SpringJavaFormatPlugin.class.getPackage().getImplementationVersion(); DependencySet checkstyleDependencies = project.getConfigurations().getByName("checkstyle").getDependencies();