root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Polishing

This commit is contained in:
Juergen Hoeller 2016-01-13 12:52:05 +01:00
parent e14c2de1d2
commit 773d175681
8 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-beans/src/main/java/org/springframework/beans/factory/UnsatisfiedDependencyException.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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( public UnsatisfiedDependencyException(
String resourceDescription, String beanName, String propertyName, BeansException ex) { 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); initCause(ex);
} }
@ -88,7 +88,7 @@ public class UnsatisfiedDependencyException extends BeanCreationException {
public UnsatisfiedDependencyException( public UnsatisfiedDependencyException(
String resourceDescription, String beanName, int ctorArgIndex, Class<?> ctorArgType, BeansException ex) { 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); initCause(ex);
} }

6
spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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. * Optionally set the concrete class that contains this dependency.
* This may differ from the class that declares the parameter/field in that * This may differ from the class that declares the parameter/field in that
* it may be a subclass thereof, potentially substituting type variables. * it may be a subclass thereof, potentially substituting type variables.
* @since 4.0
*/ */
public void setContainingClass(Class<?> containingClass) { public void setContainingClass(Class<?> containingClass) {
this.containingClass = containingClass; this.containingClass = containingClass;
@ -206,6 +207,7 @@ public class DependencyDescriptor implements Serializable {
/** /**
* Build a ResolvableType object for the wrapped parameter/field. * Build a ResolvableType object for the wrapped parameter/field.
* @since 4.0
*/ */
public ResolvableType getResolvableType() { public ResolvableType getResolvableType() {
return (this.field != null ? ResolvableType.forField(this.field, this.nestingLevel, this.containingClass) : return (this.field != null ? ResolvableType.forField(this.field, this.nestingLevel, this.containingClass) :
@ -217,6 +219,7 @@ public class DependencyDescriptor implements Serializable {
* <p>This is {@code false} by default but may be overridden to return {@code true} in order * <p>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} * to suggest to a {@link org.springframework.beans.factory.support.AutowireCandidateResolver}
* that a fallback match is acceptable as well. * that a fallback match is acceptable as well.
* @since 4.0
*/ */
public boolean fallbackMatchAllowed() { public boolean fallbackMatchAllowed() {
return false; return false;
@ -224,6 +227,7 @@ public class DependencyDescriptor implements Serializable {
/** /**
* Return a variant of this descriptor that is intended for a fallback match. * Return a variant of this descriptor that is intended for a fallback match.
* @since 4.0
* @see #fallbackMatchAllowed() * @see #fallbackMatchAllowed()
*/ */
public DependencyDescriptor forFallbackMatch() { public DependencyDescriptor forFallbackMatch() {

4
spring-context-support/src/main/java/org/springframework/cache/caffeine/CaffeineCache.java vendored
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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<Object, Object> cache, public CaffeineCache(String name, com.github.benmanes.caffeine.cache.Cache<Object, Object> cache,
boolean allowNullValues) { boolean allowNullValues) {
super(allowNullValues); super(allowNullValues);
Assert.notNull(name, "Name must not be null"); Assert.notNull(name, "Name must not be null");
Assert.notNull(cache, "Cache 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<Object, Object> { private class LoadFunction implements Function<Object, Object> {
private final Callable<?> valueLoader; private final Callable<?> valueLoader;

6
spring-context/src/main/java/org/springframework/cache/Cache.java vendored
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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; private final Object key;
public ValueRetrievalException(Object key, Callable<?> loader, Throwable ex) { public ValueRetrievalException(Object key, Callable<?> loader, Throwable ex) {
super(String.format("Value for key '%s' could not " + super(String.format("Value for key '%s' could not " + "be loaded using '%s'", key, loader), ex);
"be loaded using '%s'", key, loader), ex);
this.key = key; this.key = key;
} }
public Object getKey() { public Object getKey() {
return this.key; return this.key;
} }
} }
} }

7
spring-web/src/main/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverter.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -104,14 +104,15 @@ public class MarshallingHttpMessageConverter extends AbstractXmlHttpMessageConve
this.unmarshaller = unmarshaller; this.unmarshaller = unmarshaller;
} }
@Override @Override
public boolean canRead(Class<?> clazz, MediaType mediaType) { 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 @Override
public boolean canWrite(Class<?> clazz, MediaType mediaType) { 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 @Override

3
spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -516,7 +516,6 @@ public abstract class AbstractHandlerMethodMapping<T> extends AbstractHandlerMap
this.readWriteLock.readLock().unlock(); this.readWriteLock.readLock().unlock();
} }
public void register(T mapping, Object handler, Method method) { public void register(T mapping, Object handler, Method method) {
this.readWriteLock.writeLock().lock(); this.readWriteLock.writeLock().lock();
try { try {

3
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.java
View File

@ -27,7 +27,6 @@ import java.util.Comparator;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import org.springframework.core.io.AbstractResource; import org.springframework.core.io.AbstractResource;
@ -225,6 +224,7 @@ public class VersionResourceResolver extends AbstractResourceResolver {
return null; return null;
} }
private class FileNameVersionedResource extends AbstractResource implements VersionedResource { private class FileNameVersionedResource extends AbstractResource implements VersionedResource {
private final Resource original; private final Resource original;
@ -300,7 +300,6 @@ public class VersionResourceResolver extends AbstractResourceResolver {
public String getVersion() { public String getVersion() {
return this.version; return this.version;
} }
} }
} }

5
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionedResource.java
View File

@ -19,8 +19,8 @@ package org.springframework.web.servlet.resource;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
/** /**
* Interface for a resource descriptor that describes its version * Interface for a resource descriptor that describes its version with a
* with a version string that can be derived from its content and/or metadata. * version string that can be derived from its content and/or metadata.
* *
* @author Brian Clozel * @author Brian Clozel
* @since 4.2.5 * @since 4.2.5
@ -29,4 +29,5 @@ import org.springframework.core.io.Resource;
public interface VersionedResource extends Resource { public interface VersionedResource extends Resource {
String getVersion(); String getVersion();
} }