diff --git a/spring-context/src/main/java/org/springframework/context/MessageSource.java b/spring-context/src/main/java/org/springframework/context/MessageSource.java index 13f1530b31..1a4d0b40ef 100644 --- a/spring-context/src/main/java/org/springframework/context/MessageSource.java +++ b/spring-context/src/main/java/org/springframework/context/MessageSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * 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. @@ -42,11 +42,11 @@ public interface MessageSource { * @param code the code to lookup up, such as 'calculator.noRateSet'. Users of * this class are encouraged to base message names on the relevant fully * qualified class name, thus avoiding conflict and ensuring maximum clarity. - * @param args array of arguments that will be filled in for params within + * @param args an array of arguments that will be filled in for params within * the message (params look like "{0}", "{1,date}", "{2,time}" within a message), * or {@code null} if none. - * @param defaultMessage String to return if the lookup fails - * @param locale the Locale in which to do the lookup + * @param defaultMessage a default message to return if the lookup fails + * @param locale the locale in which to do the lookup * @return the resolved message if the lookup was successful; * otherwise the default message passed as a parameter * @see java.text.MessageFormat @@ -56,10 +56,10 @@ public interface MessageSource { /** * Try to resolve the message. Treat as an error if the message can't be found. * @param code the code to lookup up, such as 'calculator.noRateSet' - * @param args Array of arguments that will be filled in for params within + * @param args an array of arguments that will be filled in for params within * the message (params look like "{0}", "{1,date}", "{2,time}" within a message), * or {@code null} if none. - * @param locale the Locale in which to do the lookup + * @param locale the locale in which to do the lookup * @return the resolved message * @throws NoSuchMessageException if the message wasn't found * @see java.text.MessageFormat @@ -71,9 +71,9 @@ public interface MessageSource { * {@code MessageSourceResolvable} argument that was passed in. *

NOTE: We must throw a {@code NoSuchMessageException} on this method * since at the time of calling this method we aren't able to determine if the - * {@code defaultMessage} property of the resolvable is null or not. - * @param resolvable value object storing attributes required to properly resolve a message - * @param locale the Locale in which to do the lookup + * {@code defaultMessage} property of the resolvable is {@code null} or not. + * @param resolvable the value object storing attributes required to resolve a message + * @param locale the locale in which to do the lookup * @return the resolved message * @throws NoSuchMessageException if the message wasn't found * @see java.text.MessageFormat diff --git a/spring-context/src/main/java/org/springframework/context/support/MessageSourceSupport.java b/spring-context/src/main/java/org/springframework/context/support/MessageSourceSupport.java index d863add687..d74a220795 100644 --- a/spring-context/src/main/java/org/springframework/context/support/MessageSourceSupport.java +++ b/spring-context/src/main/java/org/springframework/context/support/MessageSourceSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * 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. @@ -57,8 +57,8 @@ public abstract class MessageSourceSupport { /** - * Set whether to always apply the MessageFormat rules, parsing even - * messages without arguments. + * Set whether to always apply the {@code MessageFormat} rules, + * parsing even messages without arguments. *

Default is "false": Messages without arguments are by default * returned as-is, without parsing them through MessageFormat. * Set this to "true" to enforce MessageFormat for all messages, @@ -112,7 +112,7 @@ public abstract class MessageSourceSupport { * @return the formatted message (with resolved arguments) */ protected String formatMessage(String msg, Object[] args, Locale locale) { - if (msg == null || (!this.alwaysUseMessageFormat && ObjectUtils.isEmpty(args))) { + if (msg == null || (!isAlwaysUseMessageFormat() && ObjectUtils.isEmpty(args))) { return msg; } MessageFormat messageFormat = null; @@ -130,12 +130,12 @@ public abstract class MessageSourceSupport { messageFormat = createMessageFormat(msg, locale); } catch (IllegalArgumentException ex) { - // invalid message format - probably not intended for formatting, - // rather using a message structure with no arguments involved - if (this.alwaysUseMessageFormat) { + // Invalid message format - probably not intended for formatting, + // rather using a message structure with no arguments involved... + if (isAlwaysUseMessageFormat()) { throw ex; } - // silently proceed with raw message if format not enforced + // Silently proceed with raw message if format not enforced... messageFormat = INVALID_MESSAGE_FORMAT; } messageFormatsPerLocale.put(locale, messageFormat); diff --git a/spring-core/src/main/java/org/springframework/core/CollectionFactory.java b/spring-core/src/main/java/org/springframework/core/CollectionFactory.java index 50c3f0e8ad..ccade7eddf 100644 --- a/spring-core/src/main/java/org/springframework/core/CollectionFactory.java +++ b/spring-core/src/main/java/org/springframework/core/CollectionFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * 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. @@ -53,9 +53,9 @@ import org.springframework.util.MultiValueMap; */ public abstract class CollectionFactory { - private static final Set> approximableCollectionTypes = new HashSet>(11); + private static final Set> approximableCollectionTypes = new HashSet>(); - private static final Set> approximableMapTypes = new HashSet>(7); + private static final Set> approximableMapTypes = new HashSet>(); static {