Note that the cache may be created at runtime if the native provider - * supports it. + *
Note that the cache may be lazily created at runtime if the + * native provider supports it. * @param name the cache identifier (must not be {@code null}) - * @return the associated cache, or {@code null} if such a cache does not - * exist or could be not created + * @return the associated cache, or {@code null} if such a cache + * does not exist or could be not created */ @Nullable Cache getCache(String name); diff --git a/spring-context/src/main/java/org/springframework/cache/support/AbstractCacheManager.java b/spring-context/src/main/java/org/springframework/cache/support/AbstractCacheManager.java index a767d476b2d..50ab5ccb317 100644 --- a/spring-context/src/main/java/org/springframework/cache/support/AbstractCacheManager.java +++ b/spring-context/src/main/java/org/springframework/cache/support/AbstractCacheManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 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. @@ -174,15 +174,15 @@ public abstract class AbstractCacheManager implements CacheManager, Initializing } /** - * Return a missing cache with the specified {@code name} or {@code null} if - * such cache does not exist or could not be created on the fly. - *
Some caches may be created at runtime if the native provider supports - * it. If a lookup by name does not yield any result, a subclass gets a chance - * to register such a cache at runtime. The returned cache will be automatically - * added to this instance. + * Return a missing cache with the specified {@code name}, or {@code null} if + * such a cache does not exist or could not be created on demand. + *
Caches may be lazily created at runtime if the native provider supports it. + * If a lookup by name does not yield any result, an {@code AbstractCacheManager} + * subclass gets a chance to register such a cache at runtime. The returned cache + * will be automatically added to this cache manager. * @param name the name of the cache to retrieve - * @return the missing cache or {@code null} if no such cache exists or could be - * created + * @return the missing cache, or {@code null} if no such cache exists or could be + * created on demand * @since 4.1 * @see #getCache(String) */ 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 fb17668689a..54f5ea88ed0 100644 --- a/spring-context/src/main/java/org/springframework/context/MessageSource.java +++ b/spring-context/src/main/java/org/springframework/context/MessageSource.java @@ -41,7 +41,7 @@ public interface MessageSource { /** * Try to resolve the message. Return default message if no message was found. - * @param code the code to lookup up, e.g. 'calculator.noRateSet'. + * @param code the message code to look up, e.g. 'calculator.noRateSet'. * MessageSource users are encouraged to base message names on qualified class * or package names, avoiding potential conflicts and ensuring maximum clarity. * @param args an array of arguments that will be filled in for params within @@ -59,7 +59,7 @@ 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, e.g. 'calculator.noRateSet'. + * @param code the message code to look up, e.g. 'calculator.noRateSet'. * MessageSource users are encouraged to base message names on qualified class * or package names, avoiding potential conflicts and ensuring maximum clarity. * @param args an array of arguments that will be filled in for params within diff --git a/spring-messaging/spring-messaging.gradle b/spring-messaging/spring-messaging.gradle index ab17d833597..7c5e6473c19 100644 --- a/spring-messaging/spring-messaging.gradle +++ b/spring-messaging/spring-messaging.gradle @@ -23,7 +23,7 @@ dependencies { testCompile("javax.inject:javax.inject-tck:1") testCompile("javax.servlet:javax.servlet-api:4.0.1") testCompile("javax.validation:validation-api:1.1.0.Final") - testCompile("com.thoughtworks.xstream:xstream:1.4.10") + testCompile("com.thoughtworks.xstream:xstream:1.4.11.1") testCompile("org.apache.activemq:activemq-broker:5.8.0") testCompile("org.apache.activemq:activemq-kahadb-store:5.8.0") { exclude group: "org.springframework", module: "spring-context" diff --git a/spring-oxm/spring-oxm.gradle b/spring-oxm/spring-oxm.gradle index a05c2360cfe..0ec272ea6db 100644 --- a/spring-oxm/spring-oxm.gradle +++ b/spring-oxm/spring-oxm.gradle @@ -59,7 +59,7 @@ dependencies { compile(project(":spring-core")) optional("javax.xml.bind:jaxb-api:2.3.1") optional("javax.activation:javax.activation-api:1.2.0") - optional("com.thoughtworks.xstream:xstream:1.4.10") { + optional("com.thoughtworks.xstream:xstream:1.4.11.1") { exclude group: "xpp3", module: "xpp3_min" exclude group: "xmlpull", module: "xmlpull" } diff --git a/spring-test/spring-test.gradle b/spring-test/spring-test.gradle index 8bac3ee1e9e..09261ca11a7 100644 --- a/spring-test/spring-test.gradle +++ b/spring-test/spring-test.gradle @@ -68,8 +68,8 @@ dependencies { testCompile("org.junit.platform:junit-platform-testkit") testCompile("org.junit.jupiter:junit-jupiter-params") testCompile("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}") - testCompile("com.thoughtworks.xstream:xstream:1.4.10") - testCompile("com.rometools:rome:1.12.0") + testCompile("com.thoughtworks.xstream:xstream:1.4.11.1") + testCompile("com.rometools:rome:1.12.1") testCompile("org.apache.tiles:tiles-api:${tiles3Version}") testCompile("org.apache.tiles:tiles-core:${tiles3Version}", withoutJclOverSlf4j) testCompile("org.apache.tiles:tiles-servlet:${tiles3Version}", withoutJclOverSlf4j) diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle index 4f1bce5688a..ea35ddd1e7c 100644 --- a/spring-web/spring-web.gradle +++ b/spring-web/spring-web.gradle @@ -58,7 +58,7 @@ dependencies { optional("com.google.code.gson:gson:2.8.5") optional("com.google.protobuf:protobuf-java-util:3.7.1") optional("com.googlecode.protobuf-java-format:protobuf-java-format:1.4") - optional("com.rometools:rome:1.12.0") + optional("com.rometools:rome:1.12.1") optional("com.caucho:hessian:4.0.51") optional("org.codehaus.groovy:groovy:${groovyVersion}") optional("org.jetbrains.kotlin:kotlin-reflect") diff --git a/spring-webmvc/spring-webmvc.gradle b/spring-webmvc/spring-webmvc.gradle index b6b6d499f60..4a93e510651 100644 --- a/spring-webmvc/spring-webmvc.gradle +++ b/spring-webmvc/spring-webmvc.gradle @@ -22,8 +22,8 @@ dependencies { optional("javax.el:javax.el-api:3.0.1-b04") optional("javax.xml.bind:jaxb-api:2.3.1") optional("org.webjars:webjars-locator-core:0.37") - optional("com.rometools:rome:1.12.0") - optional("com.github.librepdf:openpdf:1.2.17") + optional("com.rometools:rome:1.12.1") + optional("com.github.librepdf:openpdf:1.2.21") optional("org.apache.poi:poi-ooxml:4.1.0") optional("org.freemarker:freemarker:${freemarkerVersion}") optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")