From cc6e6490d228a590d9163fa5c56731fa704940c0 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 9 Oct 2017 13:59:29 +0200 Subject: [PATCH] Polishing --- .../client/HttpMessageConverterExtractor.java | 2 +- .../web/servlet/resource/HttpResource.java | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java b/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java index 9b40e9af6f..cb85889f5c 100644 --- a/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java +++ b/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java @@ -72,7 +72,7 @@ public class HttpMessageConverterExtractor implements ResponseExtractor { Assert.notNull(responseType, "'responseType' must not be null"); Assert.notEmpty(messageConverters, "'messageConverters' must not be empty"); this.responseType = responseType; - this.responseClass = (responseType instanceof Class) ? (Class) responseType : null; + this.responseClass = (responseType instanceof Class ? (Class) responseType : null); this.messageConverters = messageConverters; this.logger = logger; } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/HttpResource.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/HttpResource.java index f555f40970..3434d670d4 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/HttpResource.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/HttpResource.java @@ -1,3 +1,19 @@ +/* + * Copyright 2002-2017 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.web.servlet.resource; import org.springframework.core.io.Resource; @@ -18,4 +34,5 @@ public interface HttpResource extends Resource { * @return the HTTP response headers */ HttpHeaders getResponseHeaders(); + }