diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/UnsatisfiedDependencyException.java b/spring-beans/src/main/java/org/springframework/beans/factory/UnsatisfiedDependencyException.java index f539e701807..9ec35a7e631 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/UnsatisfiedDependencyException.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/UnsatisfiedDependencyException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2016 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. @@ -56,7 +56,7 @@ public class UnsatisfiedDependencyException extends BeanCreationException { public UnsatisfiedDependencyException( String resourceDescription, String beanName, String propertyName, BeansException ex) { - this(resourceDescription, beanName, propertyName, (ex != null ? ": " + ex.getMessage() : "")); + this(resourceDescription, beanName, propertyName, (ex != null ? ex.getMessage() : "")); initCause(ex); } @@ -88,7 +88,7 @@ public class UnsatisfiedDependencyException extends BeanCreationException { public UnsatisfiedDependencyException( String resourceDescription, String beanName, int ctorArgIndex, Class ctorArgType, BeansException ex) { - this(resourceDescription, beanName, ctorArgIndex, ctorArgType, (ex != null ? ": " + ex.getMessage() : "")); + this(resourceDescription, beanName, ctorArgIndex, ctorArgType, (ex != null ? ex.getMessage() : "")); initCause(ex); } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java index fd38f364ccd..88642eb493e 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2016 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. @@ -196,6 +196,7 @@ public class DependencyDescriptor implements Serializable { * Optionally set the concrete class that contains this dependency. * This may differ from the class that declares the parameter/field in that * it may be a subclass thereof, potentially substituting type variables. + * @since 4.0 */ public void setContainingClass(Class containingClass) { this.containingClass = containingClass; @@ -206,6 +207,7 @@ public class DependencyDescriptor implements Serializable { /** * Build a ResolvableType object for the wrapped parameter/field. + * @since 4.0 */ public ResolvableType getResolvableType() { return (this.field != null ? ResolvableType.forField(this.field, this.nestingLevel, this.containingClass) : @@ -217,6 +219,7 @@ public class DependencyDescriptor implements Serializable { *

This is {@code false} by default but may be overridden to return {@code true} in order * to suggest to a {@link org.springframework.beans.factory.support.AutowireCandidateResolver} * that a fallback match is acceptable as well. + * @since 4.0 */ public boolean fallbackMatchAllowed() { return false; @@ -224,6 +227,7 @@ public class DependencyDescriptor implements Serializable { /** * Return a variant of this descriptor that is intended for a fallback match. + * @since 4.0 * @see #fallbackMatchAllowed() */ public DependencyDescriptor forFallbackMatch() { diff --git a/spring-context-support/src/main/java/org/springframework/cache/caffeine/CaffeineCache.java b/spring-context-support/src/main/java/org/springframework/cache/caffeine/CaffeineCache.java index 6789470966d..64cfcd61b39 100644 --- a/spring-context-support/src/main/java/org/springframework/cache/caffeine/CaffeineCache.java +++ b/spring-context-support/src/main/java/org/springframework/cache/caffeine/CaffeineCache.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2016 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. @@ -64,6 +64,7 @@ public class CaffeineCache extends AbstractValueAdaptingCache { */ public CaffeineCache(String name, com.github.benmanes.caffeine.cache.Cache cache, boolean allowNullValues) { + super(allowNullValues); Assert.notNull(name, "Name must not be null"); Assert.notNull(cache, "Cache must not be null"); @@ -142,6 +143,7 @@ public class CaffeineCache extends AbstractValueAdaptingCache { } } + private class LoadFunction implements Function { private final Callable valueLoader; diff --git a/spring-context/src/main/java/org/springframework/cache/Cache.java b/spring-context/src/main/java/org/springframework/cache/Cache.java index 07352fb69fc..1dbc4f4ffd1 100644 --- a/spring-context/src/main/java/org/springframework/cache/Cache.java +++ b/spring-context/src/main/java/org/springframework/cache/Cache.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2016 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. @@ -164,15 +164,13 @@ public interface Cache { private final Object key; public ValueRetrievalException(Object key, Callable loader, Throwable ex) { - super(String.format("Value for key '%s' could not " + - "be loaded using '%s'", key, loader), ex); + super(String.format("Value for key '%s' could not " + "be loaded using '%s'", key, loader), ex); this.key = key; } public Object getKey() { return this.key; } - } } diff --git a/spring-web/src/main/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverter.java index c0c1daa2738..797732eff05 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2016 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. @@ -55,7 +55,7 @@ public class MarshallingHttpMessageConverter extends AbstractXmlHttpMessageConve /** * Construct a new {@code MarshallingHttpMessageConverter} with no {@link Marshaller} or * {@link Unmarshaller} set. The Marshaller and Unmarshaller must be set after construction - * by invoking {@link #setMarshaller(Marshaller)} and {@link #setUnmarshaller(Unmarshaller)} . + * by invoking {@link #setMarshaller(Marshaller)} and {@link #setUnmarshaller(Unmarshaller)}. */ public MarshallingHttpMessageConverter() { } @@ -104,14 +104,15 @@ public class MarshallingHttpMessageConverter extends AbstractXmlHttpMessageConve this.unmarshaller = unmarshaller; } + @Override public boolean canRead(Class clazz, MediaType mediaType) { - return canRead(mediaType) && (this.unmarshaller != null) && this.unmarshaller.supports(clazz); + return (canRead(mediaType) && this.unmarshaller != null && this.unmarshaller.supports(clazz)); } @Override public boolean canWrite(Class clazz, MediaType mediaType) { - return canWrite(mediaType) && (this.marshaller != null) && this.marshaller.supports(clazz); + return (canWrite(mediaType) && this.marshaller != null && this.marshaller.supports(clazz)); } @Override diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java index 99386e074ae..e6657082f1d 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2016 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. @@ -516,7 +516,6 @@ public abstract class AbstractHandlerMethodMapping extends AbstractHandlerMap this.readWriteLock.readLock().unlock(); } - public void register(T mapping, Object handler, Method method) { this.readWriteLock.writeLock().lock(); try { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.java index 718fdf7de23..ac547dbed79 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.java @@ -27,7 +27,6 @@ import java.util.Comparator; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; - import javax.servlet.http.HttpServletRequest; import org.springframework.core.io.AbstractResource; @@ -225,6 +224,7 @@ public class VersionResourceResolver extends AbstractResourceResolver { return null; } + private class FileNameVersionedResource extends AbstractResource implements VersionedResource { private final Resource original; @@ -300,7 +300,6 @@ public class VersionResourceResolver extends AbstractResourceResolver { public String getVersion() { return this.version; } - } } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionedResource.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionedResource.java index 8960a54ef6f..c780df8c891 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionedResource.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionedResource.java @@ -19,8 +19,8 @@ package org.springframework.web.servlet.resource; import org.springframework.core.io.Resource; /** - * Interface for a resource descriptor that describes its version - * with a version string that can be derived from its content and/or metadata. + * Interface for a resource descriptor that describes its version with a + * version string that can be derived from its content and/or metadata. * * @author Brian Clozel * @since 4.2.5 @@ -29,4 +29,5 @@ import org.springframework.core.io.Resource; public interface VersionedResource extends Resource { String getVersion(); + }