From ab96bb54280544fb060ecad6d80bf39617b28dc7 Mon Sep 17 00:00:00 2001 From: igor-suhorukov Date: Thu, 29 Mar 2018 23:53:40 +0300 Subject: [PATCH] Remove redundant check --- .../web/reactive/result/view/AbstractView.java | 4 +--- .../web/reactive/result/view/ViewResolverSupport.java | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/AbstractView.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/AbstractView.java index 516c1e06a3..4cda6ab082 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/AbstractView.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/AbstractView.java @@ -86,9 +86,7 @@ public abstract class AbstractView implements View, ApplicationContextAware { public void setSupportedMediaTypes(@Nullable List supportedMediaTypes) { Assert.notEmpty(supportedMediaTypes, "MediaType List must not be empty"); this.mediaTypes.clear(); - if (supportedMediaTypes != null) { - this.mediaTypes.addAll(supportedMediaTypes); - } + this.mediaTypes.addAll(supportedMediaTypes); } /** diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/ViewResolverSupport.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/ViewResolverSupport.java index e8ed8636a1..637303983d 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/ViewResolverSupport.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/ViewResolverSupport.java @@ -57,9 +57,7 @@ public abstract class ViewResolverSupport implements Ordered { public void setSupportedMediaTypes(@Nullable List supportedMediaTypes) { Assert.notEmpty(supportedMediaTypes, "MediaType List must not be empty"); this.mediaTypes.clear(); - if (supportedMediaTypes != null) { - this.mediaTypes.addAll(supportedMediaTypes); - } + this.mediaTypes.addAll(supportedMediaTypes); } /** -- GitLab