diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBuilder.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBuilder.java
index 0fe180fcc4..38ee1717a5 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBuilder.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBuilder.java
@@ -89,7 +89,7 @@ public class LocalSessionFactoryBuilder extends Configuration {
 			new AnnotationTypeFilter(Embeddable.class, false),
 			new AnnotationTypeFilter(MappedSuperclass.class, false)};
 
-	private final TypeFilter CONVERTER_TYPE_FILTER = new AnnotationTypeFilter(Converter.class, false);
+	private static final TypeFilter CONVERTER_TYPE_FILTER = new AnnotationTypeFilter(Converter.class, false);
 
 
 	private final ResourcePatternResolver resourcePatternResolver;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ProducesRequestCondition.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ProducesRequestCondition.java
index 33fa2c7397..ccbef65eca 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ProducesRequestCondition.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ProducesRequestCondition.java
@@ -50,7 +50,7 @@ public final class ProducesRequestCondition extends AbstractRequestCondition<Pro
 	private final static ProducesRequestCondition PRE_FLIGHT_MATCH = new ProducesRequestCondition();
 
 
-	private final List<ProduceMediaTypeExpression> MEDIA_TYPE_ALL_LIST =
+	private final List<ProduceMediaTypeExpression> mediaTypeAllList =
 			Collections.singletonList(new ProduceMediaTypeExpression("*/*"));
 
 	private final List<ProduceMediaTypeExpression> expressions;
@@ -292,7 +292,7 @@ public final class ProducesRequestCondition extends AbstractRequestCondition<Pro
 	 * with a {@code MediaType_ALL} expression.
 	 */
 	private List<ProduceMediaTypeExpression> getExpressionsToCompare() {
-		return (this.expressions.isEmpty() ? MEDIA_TYPE_ALL_LIST : this.expressions);
+		return (this.expressions.isEmpty() ? mediaTypeAllList  : this.expressions);
 	}
 
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ProducesRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ProducesRequestCondition.java
index ecdfa8f9a9..9ccfbe6c47 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ProducesRequestCondition.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ProducesRequestCondition.java
@@ -53,7 +53,7 @@ public final class ProducesRequestCondition extends AbstractRequestCondition<Pro
 	private static final ProducesRequestCondition EMPTY_CONDITION = new ProducesRequestCondition();
 
 
-	private final List<ProduceMediaTypeExpression> MEDIA_TYPE_ALL_LIST =
+	private static final List<ProduceMediaTypeExpression> MEDIA_TYPE_ALL_LIST =
 			Collections.singletonList(new ProduceMediaTypeExpression("*/*"));
 
 	private final List<ProduceMediaTypeExpression> expressions;
@@ -315,7 +315,7 @@ public final class ProducesRequestCondition extends AbstractRequestCondition<Pro
 	/**
 	 * Parses and matches a single media type expression to a request's 'Accept' header.
 	 */
-	class ProduceMediaTypeExpression extends AbstractMediaTypeExpression {
+	static class ProduceMediaTypeExpression extends AbstractMediaTypeExpression {
 
 		ProduceMediaTypeExpression(MediaType mediaType, boolean negated) {
 			super(mediaType, negated);