diff --git a/spring-web/src/main/java/org/springframework/web/accept/FixedContentNegotiationStrategy.java b/spring-web/src/main/java/org/springframework/web/accept/FixedContentNegotiationStrategy.java index 3b2073f715..529fd3c372 100644 --- a/spring-web/src/main/java/org/springframework/web/accept/FixedContentNegotiationStrategy.java +++ b/spring-web/src/main/java/org/springframework/web/accept/FixedContentNegotiationStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2019 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. @@ -19,9 +19,6 @@ package org.springframework.web.accept; import java.util.Collections; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import org.springframework.http.MediaType; import org.springframework.util.Assert; import org.springframework.web.context.request.NativeWebRequest; @@ -34,8 +31,6 @@ import org.springframework.web.context.request.NativeWebRequest; */ public class FixedContentNegotiationStrategy implements ContentNegotiationStrategy { - private static final Log logger = LogFactory.getLog(FixedContentNegotiationStrategy.class); - private final List contentTypes; diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/ModelFactory.java b/spring-web/src/main/java/org/springframework/web/method/annotation/ModelFactory.java index 5c83393b29..399d48029e 100644 --- a/spring-web/src/main/java/org/springframework/web/method/annotation/ModelFactory.java +++ b/spring-web/src/main/java/org/springframework/web/method/annotation/ModelFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2019 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. @@ -24,9 +24,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import org.springframework.beans.BeanUtils; import org.springframework.core.Conventions; import org.springframework.core.GenericTypeResolver; @@ -61,8 +58,6 @@ import org.springframework.web.method.support.ModelAndViewContainer; */ public final class ModelFactory { - private static final Log logger = LogFactory.getLog(ModelFactory.class); - private final List modelMethods = new ArrayList<>(); private final WebDataBinderFactory dataBinderFactory; @@ -304,16 +299,6 @@ public final class ModelFactory { return true; } - public List getUnresolvedDependencies(ModelAndViewContainer mavContainer) { - List result = new ArrayList<>(this.dependencies.size()); - for (String name : this.dependencies) { - if (!mavContainer.containsAttribute(name)) { - result.add(name); - } - } - return result; - } - @Override public String toString() { return this.handlerMethod.getMethod().toGenericString();