From 83300c4b277be594ce4fc78c5142b0c085e79263 Mon Sep 17 00:00:00 2001 From: igor-suhorukov Date: Thu, 1 Mar 2018 00:00:35 +0300 Subject: [PATCH] Polish: follow naming convention --- .../orm/hibernate5/LocalSessionFactoryBuilder.java | 2 +- .../reactive/result/condition/ProducesRequestCondition.java | 4 ++-- .../web/servlet/mvc/condition/ProducesRequestCondition.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) 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 MEDIA_TYPE_ALL_LIST = + private final List mediaTypeAllList = Collections.singletonList(new ProduceMediaTypeExpression("*/*")); private final List expressions; @@ -292,7 +292,7 @@ public final class ProducesRequestCondition extends AbstractRequestCondition 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 MEDIA_TYPE_ALL_LIST = + private static final List MEDIA_TYPE_ALL_LIST = Collections.singletonList(new ProduceMediaTypeExpression("*/*")); private final List expressions; @@ -315,7 +315,7 @@ public final class ProducesRequestCondition extends AbstractRequestCondition