Merge pull request #1715 from igor-suhorukov:master

* pr/1715:
  Polish

spring-beans/src/main/java/org/springframework/beans/factory/ObjectFactory.java

@@ -17,7 +17,6 @@
 package org.springframework.beans.factory;
 
 import org.springframework.beans.BeansException;
-import org.springframework.lang.Nullable;
 
 /**
  * Defines a factory which can return an Object instance

spring-context/src/main/java/org/springframework/context/support/SimpleThreadScope.java

@@ -26,7 +26,6 @@ import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.beans.factory.config.Scope;
 import org.springframework.core.NamedThreadLocal;
 import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
 
 /**
  * A simple thread-backed {@link Scope} implementation.

spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java

@@ -16,7 +16,6 @@
 
 package org.springframework.web.util;
 
-import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.nio.charset.UnsupportedCharsetException;
 import java.util.LinkedHashMap;

spring-webflux/src/main/java/org/springframework/web/reactive/handler/AbstractUrlHandlerMapping.java

@@ -17,7 +17,6 @@
 package org.springframework.web.reactive.handler;
 
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.LinkedHashMap;
 import java.util.Map;
 

spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/CompositeRequestCondition.java

@@ -21,7 +21,6 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.server.ServerWebExchange;