language stringclasses 1
value | owner stringlengths 2 15 | repo stringlengths 2 21 | sha stringlengths 45 45 | message stringlengths 7 36.3k | path stringlengths 1 199 | patch stringlengths 15 102k | is_multipart bool 2
classes |
|---|---|---|---|---|---|---|---|
Other | spring-projects | spring-framework | 38cf91922c0423fa8ffd541e9cc7f1d2cae87529.json | Fix intermittent test failure in AsyncTests | spring-test-mvc/src/main/java/org/springframework/test/web/servlet/TestDispatcherServlet.java | @@ -66,19 +66,21 @@ protected void service(HttpServletRequest request, HttpServletResponse response)
super.service(request, response);
}
- private CountDownLatch registerAsyncInterceptors(HttpServletRequest request) {
+ private CountDownLatch registerAsyncInterceptors(final HttpServletRequest servletRequest) {
... | true |
Other | spring-projects | spring-framework | 93c01e071098bb2e07e127c3b091d89ce73de983.json | Fix timezone issue in DateTimeFormatterFactory
The DateTimeFormatterFactory introduced in SPR-7121 supports a timeZone
property; however, this property is currently not properly supported.
This commit addresses this issue by ensuring that the timeZone properly
is honored.
Issue: SPR-9953 | spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeFormatterFactory.java | @@ -33,6 +33,7 @@
* or {@link #setStyle(String) style} (considered in that order).
*
* @author Phillip Webb
+ * @author Sam Brannen
* @see #getDateTimeFormatter()
* @see #getDateTimeFormatter(DateTimeFormatter)
* @since 3.2
@@ -100,7 +101,7 @@ public DateTimeFormatter getDateTimeFormatter() {
public DateT... | true |
Other | spring-projects | spring-framework | 93c01e071098bb2e07e127c3b091d89ce73de983.json | Fix timezone issue in DateTimeFormatterFactory
The DateTimeFormatterFactory introduced in SPR-7121 supports a timeZone
property; however, this property is currently not properly supported.
This commit addresses this issue by ensuring that the timeZone properly
is honored.
Issue: SPR-9953 | spring-context/src/test/java/org/springframework/format/datetime/joda/DateTimeFormatterFactoryTests.java | @@ -16,16 +16,14 @@
package org.springframework.format.datetime.joda;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.nullValue;
-import static org.hamcrest.Matchers.sameInstance;
+import static org.hamcrest.Matchers.*;
import static org.... | true |
Other | spring-projects | spring-framework | b3e3a37441473dab2121694afd38d2fb7fe9b681.json | Release version 3.2.0.RC1 | gradle.properties | @@ -1 +1 @@
-version=3.2.0.BUILD-SNAPSHOT
+version=3.2.0.RC1 | false |
Other | spring-projects | spring-framework | 856fb2ccacf6a1c98526671eb75cf697aa205e81.json | Move JRuby dependency below Joda
JRuby includes a copy of joda classes with the same package names.
This commit changes the order of the loaded jars to load the original
joda classes first. | build.gradle | @@ -262,12 +262,12 @@ project('spring-context') {
}
compile("org.beanshell:bsh:2.0b4", optional)
compile("org.codehaus.groovy:groovy-all:1.6.3", optional)
- compile("org.jruby:jruby:1.4.0", optional)
compile("org.hibernate:hibernate-validator:4.2.0.Final") { dep ->
... | false |
Other | spring-projects | spring-framework | 3aa9ac15a1e0a36ff15b94e18bf75e4034a643f4.json | Update cache to support concurrent reads
Change the cache implementation from a synchronized weak hash map to
a concurrent implementation.
Issue: SPR-8701 | spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java | @@ -16,25 +16,22 @@
package org.springframework.core;
-import java.lang.ref.Reference;
-import java.lang.ref.WeakReference;
import java.lang.reflect.Array;
import java.lang.reflect.GenericArrayType;
import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
im... | false |
Other | spring-projects | spring-framework | de38c033e4f2196a481f88329703e32730bf1ab7.json | Make hamcrest dependency optional in spring-test
Users of Spring MVC Test will need to list a hamcrest dependency --
either hamcrest-library or hamcrest-all.
Issue: SPR-9940 | build.gradle | @@ -557,7 +557,8 @@ project('spring-test-mvc') {
compile project(":spring-webmvc")
compile project(":spring-test").sourceSets.main.output
compile("org.apache.tomcat:tomcat-servlet-api:7.0.8", provided)
- compile "org.hamcrest:hamcrest-library:1.3"
+ compile("org.hamcrest:hamcres... | false |
Other | spring-projects | spring-framework | c0baea58c0a14ea34d53f3823704892154b7803e.json | Fix issue with generic @RequestBody arguments
The original commit c9b7b1 ensured the ability to read parameterized
type @RequestBody arguments via GenericHttpMessageConverter (e.g.
application/json and List<String>). However, it also affected the
ability to read @RequestBody arguments that happen are parameterized
but... | spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java | @@ -17,6 +17,9 @@
package org.springframework.web.servlet.mvc.method.annotation;
import java.io.IOException;
+import java.lang.reflect.Array;
+import java.lang.reflect.GenericArrayType;
+import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Collec... | true |
Other | spring-projects | spring-framework | c0baea58c0a14ea34d53f3823704892154b7803e.json | Fix issue with generic @RequestBody arguments
The original commit c9b7b1 ensured the ability to read parameterized
type @RequestBody arguments via GenericHttpMessageConverter (e.g.
application/json and List<String>). However, it also affected the
ability to read @RequestBody arguments that happen are parameterized
but... | spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessor.java | @@ -17,8 +17,6 @@
package org.springframework.web.servlet.mvc.method.annotation;
import java.io.IOException;
-import java.lang.reflect.Array;
-import java.lang.reflect.GenericArrayType;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.List;
@@ -89,23 +87,11 @@ private T... | true |
Other | spring-projects | spring-framework | c0baea58c0a14ea34d53f3823704892154b7803e.json | Fix issue with generic @RequestBody arguments
The original commit c9b7b1 ensured the ability to read parameterized
type @RequestBody arguments via GenericHttpMessageConverter (e.g.
application/json and List<String>). However, it also affected the
ability to read @RequestBody arguments that happen are parameterized
but... | spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorMockTests.java | @@ -190,30 +190,35 @@ private void testResolveArgumentWithValidation(SimpleBean simpleBean) throws IOE
}
@Test(expected = HttpMediaTypeNotSupportedException.class)
- public void resolveArgumentNotReadable() throws Exception {
+ public void resolveArgumentCannotRead() throws Exception {
MediaType contentType = ... | true |
Other | spring-projects | spring-framework | c0baea58c0a14ea34d53f3823704892154b7803e.json | Fix issue with generic @RequestBody arguments
The original commit c9b7b1 ensured the ability to read parameterized
type @RequestBody arguments via GenericHttpMessageConverter (e.g.
application/json and List<String>). However, it also affected the
ability to read @RequestBody arguments that happen are parameterized
but... | spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java | @@ -21,17 +21,21 @@
import java.lang.reflect.Method;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import org.junit.Before;
import org.junit.Test;
import org.springframework.core.MethodParameter;
+import org.springframework.http.MediaType;
import org.springframework.http.co... | true |
Other | spring-projects | spring-framework | 742d5f6f3830f8a021ef7f1da3e6bf6e92036633.json | Restore GRADLE_OPTS from wrappers
Run the updated build script to generate gradlew and gradlew.bat files
that have correct GRADLE_OPTS. | gradle/wrapper/gradle-wrapper.properties | @@ -1,4 +1,4 @@
-#Sun Oct 28 11:46:52 PDT 2012
+#Wed Oct 31 17:27:34 PDT 2012
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME | true |
Other | spring-projects | spring-framework | 742d5f6f3830f8a021ef7f1da3e6bf6e92036633.json | Restore GRADLE_OPTS from wrappers
Run the updated build script to generate gradlew and gradlew.bat files
that have correct GRADLE_OPTS. | gradlew | @@ -7,6 +7,7 @@
##############################################################################
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+GRADLE_OPTS="-XX:MaxPermSize=1024m -Xmx1024m -XX:MaxHeapSize=256m $GRADLE_OPTS"
DEFAULT_JVM_OPTS=""
APP_N... | true |
Other | spring-projects | spring-framework | 742d5f6f3830f8a021ef7f1da3e6bf6e92036633.json | Restore GRADLE_OPTS from wrappers
Run the updated build script to generate gradlew and gradlew.bat files
that have correct GRADLE_OPTS. | gradlew.bat | @@ -9,6 +9,7 @@
if "%OS%"=="Windows_NT" setlocal
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set GRADLE_OPTS=-XX:MaxPermSize=1024m -Xmx1024m -XX:MaxHeapSize=256m %GRADLE_OPTS%
set DEFAULT_JVM_OPTS=
set DIRNAME=%~dp0
| true |
Other | spring-projects | spring-framework | 23b091b786f18ceb477e1113fefe503c89471737.json | Remove need to manually set wrapper GRADLE_OPTS
Replace the wrapper task with a variant that automatically adds the
appropriate GRADLE_OPTS to the shell and bat files. | build.gradle | @@ -805,3 +805,12 @@ configure(rootProject) {
}
}
+def defaultWrapper = tasks["wrapper"]
+task wrapper(overwrite: true, dependsOn: defaultWrapper) << {
+ def gradleOpts = "-XX:MaxPermSize=1024m -Xmx1024m -XX:MaxHeapSize=256m"
+ File wrapperFile = file('gradlew')
+ wrapperFile.text = wrapperFile.text.re... | false |
Other | spring-projects | spring-framework | 00220ebab0593fc9a4e4f0cbbf5632947a77799a.json | Fix typo in changelog | src/dist/changelog.txt | @@ -43,7 +43,7 @@ Changes in version 3.2 RC1 (2012-11-02)
* the Jackson message converters now include "application/*+json" in supported media types (SPR-7905)
* DispatcherPortlet uses a forward for rendering a view as resource response (SPR-9876)
* prevent duplicate @Import processing and ImportBeanDefinitionRegist... | false |
Other | spring-projects | spring-framework | 8bb19f05ea99a12ee63e03f28412d8929ed4f581.json | Fix typos in Javadoc | spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java | @@ -534,7 +534,7 @@ protected void checkNameUniqueness(String beanName, List<String> aliases, Elemen
/**
* Parse the bean definition itself, without regard to name or aliases. May return
- * <code>null</code> if problems occured during the parse of the bean definition.
+ * <code>null</code> if problems occurre... | true |
Other | spring-projects | spring-framework | 8bb19f05ea99a12ee63e03f28412d8929ed4f581.json | Fix typos in Javadoc | spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurer.java | @@ -30,7 +30,7 @@
/**
* Configures a request handler for serving static resources by forwarding the request to the Servlet container's
- * "default" Servlet. This is indended to be used when the Spring MVC {@link DispatcherServlet} is mapped to "/"
+ * "default" Servlet. This is intended to be used when the Sprin... | true |
Other | spring-projects | spring-framework | 6d8b37d8bbce8c6e6cb4890291469c80742132f7.json | Prevent duplicate @Import processing
Refactor ConfigurationClassParser to recursively find values from
all @Import annotations, combining them into a single unique set.
This change prevents ImportBeanDefinitionRegistrars from being
invoked twice.
Issue: SPR-9925 | spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java | @@ -17,14 +17,13 @@
package org.springframework.context.annotation;
import java.io.IOException;
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
+import java.util.HashSet;
import j... | true |
Other | spring-projects | spring-framework | 6d8b37d8bbce8c6e6cb4890291469c80742132f7.json | Prevent duplicate @Import processing
Refactor ConfigurationClassParser to recursively find values from
all @Import annotations, combining them into a single unique set.
This change prevents ImportBeanDefinitionRegistrars from being
invoked twice.
Issue: SPR-9925 | spring-context/src/test/java/org/springframework/context/annotation/ImportAwareTests.java | @@ -25,10 +25,14 @@
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
+import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanPostProcessor;
+i... | true |
Other | spring-projects | spring-framework | 4036ffc4d4f62626208dccc63ffdefc112d4ed1c.json | Improve #toString for AnnotationAttributes
Improve the #toString method for AnnotationAttributes to print array
values as a comma-separated list. This change is primarily to provide
better variable inspection when debugging code within an IDE. | spring-core/src/main/java/org/springframework/core/annotation/AnnotationAttributes.java | @@ -18,10 +18,12 @@
import static java.lang.String.format;
+import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
/**
* {@link LinkedHashMap} subclass representing annotation attribute key/val... | false |
Other | spring-projects | spring-framework | 7d177ecfd4cf7c7dd148a6ccba887b259831dd77.json | Update Servlet 3.0 dependency in webmvc pom | org.springframework.web.servlet/pom.xml | @@ -56,9 +56,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>3.0</version>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
+ <version>7.0.8</version>
<scope>provide... | false |
Other | spring-projects | spring-framework | 711b84ab06372e45d5be0e2788652367e82c7985.json | Update .core pom with jopt dependency
Issue: SPR-8482 | org.springframework.core/pom.xml | @@ -39,6 +39,13 @@
<scope>compile</scope>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>net.sf.jopt-simple</groupId>
+ <artifactId>jopt-simple</artifactId>
+ <version>3.0</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupI... | false |
Other | spring-projects | spring-framework | 4acb0fa284ce4a6f474ba22c9b215b716d260456.json | introduced ForkJoinPoolFactoryBean for Java 7 (alternative: add new jsr166.jar to Java 6) | org.springframework.context/.classpath | @@ -30,6 +30,7 @@
<classpathentry kind="var" path="IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.8.RELEASE/com.springsource.org.aspectj.weaver-1.6.8.RELEASE.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.beanshell/com.springsource.bsh/2.0.0.b4/com.springsource.bsh-2.0.0.b4.jar"/>
<classpath... | true |
Other | spring-projects | spring-framework | 4acb0fa284ce4a6f474ba22c9b215b716d260456.json | introduced ForkJoinPoolFactoryBean for Java 7 (alternative: add new jsr166.jar to Java 6) | org.springframework.context/context.iml | @@ -102,6 +102,28 @@
</SOURCES>
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$IVY_CACHE$/org.codehaus.jsr166-mirror/com.springsource.jsr166/1.7.0/com.springsource.jsr166-1.7.0.jar!/" />
+ </CLASSES>
+... | true |
Other | spring-projects | spring-framework | 4acb0fa284ce4a6f474ba22c9b215b716d260456.json | introduced ForkJoinPoolFactoryBean for Java 7 (alternative: add new jsr166.jar to Java 6) | org.springframework.context/ivy.xml | @@ -50,6 +50,7 @@
<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="optional, aspectj->compile"/>
<dependency org="org.beanshell" name="com.springsource.bsh" rev="2.0.0.b4" conf="optional, beanshell->compile"/>
<dependency org="org.codehaus.groovy" name="co... | true |
Other | spring-projects | spring-framework | 4acb0fa284ce4a6f474ba22c9b215b716d260456.json | introduced ForkJoinPoolFactoryBean for Java 7 (alternative: add new jsr166.jar to Java 6) | org.springframework.context/src/main/java/org/springframework/scheduling/concurrent/ForkJoinPoolFactoryBean.java | @@ -0,0 +1,108 @@
+/*
+ * Copyright 2002-2011 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/LICENS... | true |
Other | spring-projects | spring-framework | 3ead3cf8592a6eaf84511a26cda303b250f80db7.json | Improve wording of scoped-proxy example in ref doc
Issue: SPR-8591 | spring-framework-reference/src/beans-scopes.xml | @@ -405,7 +405,7 @@
<lineannotation><!-- an HTTP <interfacename>Session</interfacename>-scoped bean exposed as a proxy --></lineannotation>
<bean id="userPreferences" class="com.foo.UserPreferences" <emphasis role="bold">scope="session"</emphasis>>
- <lineannotation><!-- this next element ... | false |
Other | spring-projects | spring-framework | 47f45ff7435cc9be7a2ad0fbfe6e65312f348599.json | SPR-8585: add generic composite filter | org.springframework.web/src/main/java/org/springframework/web/filter/CompositeFilter.java | @@ -0,0 +1,108 @@
+/*
+ * Copyright 2002-2011 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
+... | true |
Other | spring-projects | spring-framework | 47f45ff7435cc9be7a2ad0fbfe6e65312f348599.json | SPR-8585: add generic composite filter | org.springframework.web/src/test/java/org/springframework/web/filter/CompositeFilterTests.java | @@ -0,0 +1,87 @@
+/*
+ * Copyright 2004, 2005 Acegi Technology Pty Limited
+ * Copyright 2006-2011 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
+ *
... | true |
Other | spring-projects | spring-framework | 0c0ab97a84b8c99a259d8f316f6a16dcbe151ead.json | Switch servlet dependency to a public one | org.springframework.web/pom.xml | @@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://m... | false |
Other | spring-projects | spring-framework | 11597c906dce28820ab323ac62f5a61f5ee9397f.json | Fix typo in reference documentation
Issue: SPR-8579 | spring-framework-reference/src/beans-dependencies.xml | @@ -366,7 +366,7 @@ public class ExampleBean {
set, and the relevant lifecycle methods (such as a <link
linkend="beans-factory-lifecycle-initializingbean">configured init
method</link> or the <link
- linkend="beans-factory-lifecycle-initializingbean">IntializingBean
+ linkend="b... | false |
Other | spring-projects | spring-framework | 6404440cbf216111b4643e6cf5667b7e64fef9b5.json | Fix typo in SmartLifecycle Javadoc
Issue: SPR-8570 | org.springframework.context/src/main/java/org/springframework/context/SmartLifecycle.java | @@ -73,7 +73,7 @@ public interface SmartLifecycle extends Lifecycle, Phased {
* the SmartLifecycle component does indeed stop.
* <p>The {@code LifecycleProcessor} will call <i>only</i> this variant of the
* {@code stop} method; i.e. {@link Lifecycle#stop()} will not be called for
- * {@link SmartLifecycle} im... | false |
Other | spring-projects | spring-framework | 18d8876dc8330ac816473aad1139b94be53c1794.json | Update RouterFunctionExtensions documentation | spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/server/RouterFunctionExtensions.kt | @@ -22,29 +22,25 @@ import org.springframework.http.MediaType
import reactor.core.publisher.Mono
/**
- * Provide a routing DSL for [RouterFunctions] and [RouterFunction] in order to be able to
- * write idiomatic Kotlin code as below:
+ * Provide a [RouterFunction] Kotlin DSL in order to be able to write idiomatic ... | false |
Other | spring-projects | spring-framework | bf6e7d0c26199d65d840a081cba4d20ada78dcc5.json | Update copyright header
Closes gh-1382 | spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceInterceptor.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. | false |
Other | spring-projects | spring-framework | 9a9166622eb08e5445ae64daea7ada56fd735d41.json | Fix ForwardedHeaderFilter getRequestURL()
Previously ForwardedHeaderFilter would return the same StringBuffer for every invocation. This
meant that users that modified the StringBuffer changed the state of the HttpServletRequest.
This commit ensures that a new StringBuffer is always returned for ForwardedHeaderFilter... | spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java | @@ -118,7 +118,7 @@ private static class ForwardedHeaderRequestWrapper extends HttpServletRequestWra
private final String requestUri;
- private final StringBuffer requestUrl;
+ private final String requestUrl;
private final Map<String, List<String>> headers;
@@ -137,8 +137,8 @@ public ForwardedHeaderReq... | true |
Other | spring-projects | spring-framework | 9a9166622eb08e5445ae64daea7ada56fd735d41.json | Fix ForwardedHeaderFilter getRequestURL()
Previously ForwardedHeaderFilter would return the same StringBuffer for every invocation. This
meant that users that modified the StringBuffer changed the state of the HttpServletRequest.
This commit ensures that a new StringBuffer is always returned for ForwardedHeaderFilter... | spring-web/src/test/java/org/springframework/web/filter/ForwardedHeaderFilterTests.java | @@ -204,6 +204,16 @@ public void requestUriWithForwardedPrefixTrailingSlash() throws Exception {
HttpServletRequest actual = filterAndGetWrappedRequest();
assertEquals("http://localhost/prefix/mvc-showcase", actual.getRequestURL().toString());
}
+
+ @Test
+ public void requestURLNewStringBuffer() throws Except... | true |
Other | spring-projects | spring-framework | b245918574024f4f0e576d984d3b336905d920e1.json | Fix compiler warning | spring-webflux/src/main/java/org/springframework/web/reactive/result/view/HttpMessageWriterView.java | @@ -117,12 +117,7 @@ public final Set<String> getModelKeys() {
@SuppressWarnings("unchecked")
public Mono<Void> render(Map<String, ?> model, MediaType contentType, ServerWebExchange exchange) {
return getObjectToRender(model)
- .map(value -> {
- Publisher stream = Mono.justOrEmpty(value);
- Resolvable... | false |
Other | spring-projects | spring-framework | 68cc57549a56480b723b6112e1bee0de114eeda1.json | Restore correct order of terminated flag check | spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ReactiveTypeHandler.java | @@ -274,7 +274,10 @@ public void run() {
this.elementRef.lazySet(null);
return;
}
-
+
+ // Check terminal signal before processing element..
+ boolean isTerminated = this.terminated;
+
Object element = this.elementRef.get();
if (element != null) {
this.elementRef.lazySet(null);
@@ -29... | false |
Other | spring-projects | spring-framework | c7c480610cae60434ffe8f6d496d04157f5e57f6.json | Polish doc changes | src/docs/asciidoc/web/web-mvc.adoc | @@ -2544,14 +2544,15 @@ Reactor 3, RxJava 2, and RxJava 1. Note that for RxJava 1 you will need to add
https://github.com/ReactiveX/RxJavaReactiveStreams["io.reactivex:rxjava-reactive-streams"]
to the classpath.
-A common assumption with reactive libraries is not block the processing thread.
+A common assumption wi... | false |
Other | spring-projects | spring-framework | ae2306326edfbb8485e2b9a785189ab78cbc80a2.json | Add RxJava1 Reactive Streams adapters check | spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java | @@ -28,6 +28,7 @@
import reactor.core.publisher.Mono;
import rx.RxReactiveStreams;
+import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import static org.springframework.core.ReactiveTypeDescriptor.*;
@@ -52,7 +53,7 @@ public class ReactiveAdapterRegistry {
private static final... | false |
Other | spring-projects | spring-framework | 279c56a385d9fae56a82531e4bfeed118880a80a.json | Fix typo in JavaDoc | spring-context/src/main/java/org/springframework/format/annotation/DateTimeFormat.java | @@ -26,7 +26,7 @@
* Declares that a field should be formatted as a date time.
*
* <p>Supports formatting by style pattern, ISO date time pattern, or custom format pattern string.
- * Can be applied to {@code java.util.Date}, {@code java.util.Calendar}, {@code java.long.Long},
+ * Can be applied to {@code java.uti... | false |
Other | spring-projects | spring-framework | 37f9c8675804d4282bed9d2d1fb9da9761aee86a.json | Fix failing tests due to last commit | spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java | @@ -123,7 +123,7 @@ public ReactiveAdapter getAdapter(Class<?> reactiveType, Object source) {
Object sourceToUse = (source instanceof Optional ? ((Optional<?>) source).orElse(null) : source);
Class<?> clazz = (sourceToUse != null ? sourceToUse.getClass() : reactiveType);
- if (reactiveType == null) {
+ if (cl... | false |
Other | spring-projects | spring-framework | 272f14513215150dbc104fdb4b67c0e07cb28370.json | Clarify Lifecycle#stop documentation
Issue: SPR-8570 | org.springframework.context/src/main/java/org/springframework/context/SmartLifecycle.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2011 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.
@@ -17,7 +17,7 @@
package org.springframework.... | false |
Other | spring-projects | spring-framework | 30f363bbc9b55e51e8576033cf91dc3f43bc7260.json | copy css and js resources as well | spring-framework.ipr | @@ -219,6 +219,8 @@
<entry name="*.jpeg" />
<entry name="*.jpg" />
<entry name="*.html" />
+ <entry name="*.css" />
+ <entry name="*.js" />
<entry name="*.dtd" />
<entry name="*.xsd" />
<entry name="*.tld" />
| false |
Other | spring-projects | spring-framework | f800a026cbbcdd9b2ada349126e67eb71e0d77b1.json | Fix typo in MVC docs | spring-framework-reference/src/mvc.xml | @@ -29,7 +29,7 @@
<para>Some methods in the core classes of Spring Web MVC are marked
<literal>final</literal>. As a developer you cannot override these
methods to supply your own behavior. This has not been done arbitrarily,
- but specifically with this principal in mind.</para>
+ but sp... | false |
Other | spring-projects | spring-framework | 10be0ef9e763d368a24a7ac466da50a2224c5d41.json | Clarify BeanFactory#containsBean Javadoc
Previously, #containsBean Javadoc advertised that a true return value
indicates that a call to #getBean for the same name would succeed.
This is actually not the case, and has never been. The semantics
of #containsBean have always been to indicate whether a bean definition
wi... | org.springframework.beans/src/main/java/org/springframework/beans/factory/BeanFactory.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2011 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.
@@ -181,12 +181,19 @@ public interface BeanFact... | true |
Other | spring-projects | spring-framework | 10be0ef9e763d368a24a7ac466da50a2224c5d41.json | Clarify BeanFactory#containsBean Javadoc
Previously, #containsBean Javadoc advertised that a true return value
indicates that a call to #getBean for the same name would succeed.
This is actually not the case, and has never been. The semantics
of #containsBean have always been to indicate whether a bean definition
wi... | org.springframework.beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java | @@ -16,14 +16,17 @@
package org.springframework.beans.factory;
+import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
import static org.jun... | true |
Other | spring-projects | spring-framework | 49b38190eeaf3861b2f0784044270b9c899ecf14.json | Fix typo in cache abstraction reference doc
Issue: SPR-8670 | spring-framework-reference/src/cache.xml | @@ -76,7 +76,7 @@ public Book findBook(ISBN isbn) {...}]]></programlisting>
is checked to see whether the invocation has been already executed and does not have to be repeated. While in most cases, only one cache is declared, the annotation allows multiple
names to be specified so that more then one cache are be... | false |
Other | spring-projects | spring-framework | 8759b20e4601d3a3e24301e2c6502038c95b9816.json | Include javax.jdo 3.x in spring-orm template.mf
Prior to this change, spring-orm/template.mf was exclusive of javax.jdo
3.0.0. Now, after local testing against the newly-released jdo-api 3.0
jar, the template has been updated to allow for use in OSGi containers.
Note that actually updating build dependency descriptors... | org.springframework.orm/template.mf | @@ -9,7 +9,7 @@ Import-Package:
org.eclipse.persistence.expressions;version="[1.0.0, 3.0.0)";resolution:=optional
Import-Template:
com.ibatis.*;version="[2.3.0, 3.0.0)";resolution:=optional,
- javax.jdo.*;version="[2.0.0, 3.0.0)";resolution:=optional,
+ javax.jdo.*;version="[2.0.0, 4.0.0)";resolution:=optional,
... | false |
Other | spring-projects | spring-framework | 2e5f3559d3bd2f9166d3a6cde7fc4c402bc0b802.json | Fix handling of @EnableLoadTimeWeaving AUTODETECT
Issue: SPR-8643 | org.springframework.context/src/main/java/org/springframework/context/annotation/LoadTimeWeavingConfiguration.java | @@ -84,7 +84,7 @@ public LoadTimeWeaver loadTimeWeaver() {
// AJ weaving is disabled -> do nothing
break;
case AUTODETECT:
- if (this.beanClassLoader.getResource(ASPECTJ_AOP_XML_RESOURCE) != null) {
+ if (this.beanClassLoader.getResource(ASPECTJ_AOP_XML_RESOURCE) == null) {
// No aop.xml prese... | true |
Other | spring-projects | spring-framework | 2e5f3559d3bd2f9166d3a6cde7fc4c402bc0b802.json | Fix handling of @EnableLoadTimeWeaving AUTODETECT
Issue: SPR-8643 | org.springframework.context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java | @@ -16,10 +16,17 @@
package org.springframework.context.annotation;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.isA;
+import static org.easymock.EasyMock.replay;
+
+import java.lang.instrument.ClassFileTransformer;
+
im... | true |
Other | spring-projects | spring-framework | 4e522c0cc36f5d506d01e1906c70f1151bddf1b7.json | Fix Javadoc error in JdbcOperations
Issue: SPR-8664 | org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java | @@ -35,7 +35,7 @@
* As an alternative to a mock objects approach to testing data access code,
* consider the powerful integration testing support provided in the
* <code>org.springframework.test</code> package, shipped in
- * <code>spring-mock.jar</code>.
+ * <code>spring-test.jar</code>.
*
* @author Rod John... | false |
Other | spring-projects | spring-framework | 818467b9e5afa37080ae5851fbb5e7a23037b7fd.json | Consolidate Environment tests | org.springframework.core/src/test/java/org/springframework/core/env/DefaultEnvironmentTests.java | @@ -1,35 +0,0 @@
-/*
- * Copyright 2002-2011 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
- ... | true |
Other | spring-projects | spring-framework | 818467b9e5afa37080ae5851fbb5e7a23037b7fd.json | Consolidate Environment tests | org.springframework.core/src/test/java/org/springframework/core/env/EnvironmentTests.java | @@ -61,6 +61,15 @@ public class EnvironmentTests {
private ConfigurableEnvironment environment = new DefaultEnvironment();
+ @Test
+ public void propertySourceOrder() {
+ ConfigurableEnvironment env = new DefaultEnvironment();
+ MutablePropertySources sources = env.getPropertySources();
+ assertThat(sources.pr... | true |
Other | spring-projects | spring-framework | 6fcea8b99da45f287149796ef2598f0d71758793.json | Remove ConfigurationClassParser from public API
Issue: SPR-8200 | org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java | @@ -197,9 +197,7 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
*/
private void processConfigurationClasses(BeanDefinitionRegistry registry) {
ConfigurationClassBeanDefinitionReader reader = getConfigurationClassBeanDefinitionReader(registry);
- ConfigurationClassParser pars... | false |
Other | spring-projects | spring-framework | 8dfcae535e19b0c80dabf8fdbad81fbcd8ba8246.json | revise cache API
+ update failing test | org.springframework.context/src/test/java/org/springframework/cache/vendor/AbstractNativeCacheTest.java | @@ -63,7 +63,7 @@ public void testCachePut() throws Exception {
assertNull(cache.get(key));
cache.put(key, value);
- assertEquals(value, cache.get(key));
+ assertEquals(value, cache.get(key).get());
}
@Test
| false |
Other | spring-projects | spring-framework | 0eb40e1e5e0d49638faba605dde992bebb933c26.json | revise cache API
+ update failing test | org.springframework.context/src/main/java/org/springframework/cache/ehcache/EhCacheCache.java | @@ -21,7 +21,7 @@
import net.sf.ehcache.Status;
import org.springframework.cache.Cache;
-import org.springframework.cache.interceptor.DefaultValue;
+import org.springframework.cache.interceptor.DefaultValueWrapper;
import org.springframework.util.Assert;
/**
@@ -60,7 +60,7 @@ public void clear() {
... | true |
Other | spring-projects | spring-framework | 0eb40e1e5e0d49638faba605dde992bebb933c26.json | revise cache API
+ update failing test | org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java | @@ -185,11 +185,11 @@ protected Object execute(Callable<Object> invocation, Object target, Method meth
for (Iterator<Cache<?, ?>> iterator = caches.iterator(); iterator.hasNext() && !cacheHit;) {
Cache cache = iterator.next();
- Cache.ValueWrapper<Object> value = cache.get(key);
+ Cache.Val... | true |
Other | spring-projects | spring-framework | 0eb40e1e5e0d49638faba605dde992bebb933c26.json | revise cache API
+ update failing test | org.springframework.context/src/main/java/org/springframework/cache/interceptor/DefaultValueWrapper.java | @@ -23,11 +23,11 @@
*
* @author Costin Leau
*/
-public class DefaultValue<V> implements ValueWrapper<V> {
+public class DefaultValueWrapper<V> implements ValueWrapper<V> {
private final V value;
- public DefaultValue(V value) {
+ public DefaultValueWrapper(V value) {
this.value = value;
}
... | true |
Other | spring-projects | spring-framework | 0eb40e1e5e0d49638faba605dde992bebb933c26.json | revise cache API
+ update failing test | org.springframework.context/src/main/java/org/springframework/cache/support/AbstractDelegatingCache.java | @@ -20,7 +20,7 @@
import java.util.Map;
import org.springframework.cache.Cache;
-import org.springframework.cache.interceptor.DefaultValue;
+import org.springframework.cache.interceptor.DefaultValueWrapper;
import org.springframework.util.Assert;
/**
@@ -76,7 +76,8 @@ public void clear() {
}
pub... | true |
Other | spring-projects | spring-framework | 0eb40e1e5e0d49638faba605dde992bebb933c26.json | revise cache API
+ update failing test | org.springframework.context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheConfig.xml | @@ -9,7 +9,7 @@
<bean id="apc" class="org.springframework.aop.framework.autoproxy.InfrastructureAdvisorAutoProxyCreator"/>
- <bean id="annotationSource" class="org.springframework.cache.annotation.AnnotationCacheDefinitionSource"/>
+ <bean id="annotationSource" class="org.springframework.cache.annotation.Anno... | true |
Other | spring-projects | spring-framework | dea1fc933fa467e8c33f0aa0bc7e4c61a01ba3d7.json | revise cache API
+ update failing AJ test | org.springframework.aspects/src/test/java/org/springframework/cache/config/annotation-cache-aspectj.xml | @@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd">
- <bean id="annotationSource" class="org.springframewo... | false |
Other | spring-projects | spring-framework | 861e4817559dfb956512775665c8f0c9da9c99c1.json | revise cache API
+ update failing test | org.springframework.context/src/test/java/org/springframework/cache/config/AbstractAnnotationTest.java | @@ -135,7 +135,7 @@ public void testMethodName(CacheableService service, String keyName)
assertSame(r1, service.name(key));
Cache<Object, Object> cache = cm.getCache("default");
// assert the method name is used
- assertTrue(cache.containsKey(keyName));
+ assertNotNull(cache.get(keyName));
}
pub... | false |
Other | spring-projects | spring-framework | 3699a037a55ed4fbe43d66ecc73876f2378e3507.json | revise cache API
+ add missing files (remember to check "show unversioned files") | org.springframework.context/src/main/java/org/springframework/cache/annotation/AnnotationCacheOperationSource.java | @@ -0,0 +1,123 @@
+/*
+ * Copyright 2010-2011 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/LICENS... | true |
Other | spring-projects | spring-framework | 3699a037a55ed4fbe43d66ecc73876f2378e3507.json | revise cache API
+ add missing files (remember to check "show unversioned files") | org.springframework.context/src/main/java/org/springframework/cache/interceptor/AbstractFallbackCacheOperationSource.java | @@ -0,0 +1,218 @@
+/*
+ * Copyright 2010-2011 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/LICENS... | true |
Other | spring-projects | spring-framework | 3699a037a55ed4fbe43d66ecc73876f2378e3507.json | revise cache API
+ add missing files (remember to check "show unversioned files") | org.springframework.context/src/main/java/org/springframework/cache/interceptor/BeanFactoryCacheOperationSourceAdvisor.java | @@ -0,0 +1,62 @@
+/*
+ * Copyright 2010-2011 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... | true |
Other | spring-projects | spring-framework | 3699a037a55ed4fbe43d66ecc73876f2378e3507.json | revise cache API
+ add missing files (remember to check "show unversioned files") | org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheEvictOperation.java | @@ -0,0 +1,43 @@
+/*
+ * Copyright 2010-2011 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... | true |
Other | spring-projects | spring-framework | 3699a037a55ed4fbe43d66ecc73876f2378e3507.json | revise cache API
+ add missing files (remember to check "show unversioned files") | org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheOperation.java | @@ -0,0 +1,128 @@
+/*
+ * Copyright 2010-2011 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/LICENS... | true |
Other | spring-projects | spring-framework | 3699a037a55ed4fbe43d66ecc73876f2378e3507.json | revise cache API
+ add missing files (remember to check "show unversioned files") | org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheOperationSource.java | @@ -0,0 +1,41 @@
+/*
+ * Copyright 2010-2011 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... | true |
Other | spring-projects | spring-framework | 3699a037a55ed4fbe43d66ecc73876f2378e3507.json | revise cache API
+ add missing files (remember to check "show unversioned files") | org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheOperationSourcePointcut.java | @@ -0,0 +1,68 @@
+/*
+ * Copyright 2010-2011 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... | true |
Other | spring-projects | spring-framework | 3699a037a55ed4fbe43d66ecc73876f2378e3507.json | revise cache API
+ add missing files (remember to check "show unversioned files") | org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheUpdateOperation.java | @@ -0,0 +1,26 @@
+/*
+ * Copyright 2010-2011 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... | true |
Other | spring-projects | spring-framework | 3699a037a55ed4fbe43d66ecc73876f2378e3507.json | revise cache API
+ add missing files (remember to check "show unversioned files") | org.springframework.context/src/main/java/org/springframework/cache/interceptor/CompositeCacheOperationSource.java | @@ -0,0 +1,63 @@
+/*
+ * Copyright 2010-2011 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... | true |
Other | spring-projects | spring-framework | 3699a037a55ed4fbe43d66ecc73876f2378e3507.json | revise cache API
+ add missing files (remember to check "show unversioned files") | org.springframework.context/src/main/java/org/springframework/cache/interceptor/DefaultValue.java | @@ -0,0 +1,37 @@
+/*
+ * Copyright 2011 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
... | true |
Other | spring-projects | spring-framework | 0b917e3f9ced6449fdc47a5fcae2105e94212c28.json | revise cache API
- eliminate unneeded methods
+ introduced value wrapper (name still to be decided) to avoid cache race conditions
+ improved name consistency | org.springframework.aspects/src/main/java/org/springframework/cache/aspectj/AbstractCacheAspect.aj | @@ -22,7 +22,7 @@ import java.util.concurrent.Callable;
import org.aspectj.lang.annotation.SuppressAjWarnings;
import org.aspectj.lang.reflect.MethodSignature;
import org.springframework.cache.interceptor.CacheAspectSupport;
-import org.springframework.cache.interceptor.CacheDefinitionSource;
+import org.springf... | true |
Other | spring-projects | spring-framework | 0b917e3f9ced6449fdc47a5fcae2105e94212c28.json | revise cache API
- eliminate unneeded methods
+ introduced value wrapper (name still to be decided) to avoid cache race conditions
+ improved name consistency | org.springframework.aspects/src/main/java/org/springframework/cache/aspectj/AnnotationCacheAspect.aj | @@ -16,7 +16,7 @@
package org.springframework.cache.aspectj;
-import org.springframework.cache.annotation.AnnotationCacheDefinitionSource;
+import org.springframework.cache.annotation.AnnotationCacheOperationSource;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.an... | true |
Other | spring-projects | spring-framework | 0b917e3f9ced6449fdc47a5fcae2105e94212c28.json | revise cache API
- eliminate unneeded methods
+ introduced value wrapper (name still to be decided) to avoid cache race conditions
+ improved name consistency | org.springframework.context/src/main/java/org/springframework/cache/Cache.java | @@ -28,6 +28,18 @@
*/
public interface Cache<K, V> {
+ /**
+ * A (wrapper) object representing a cache value.
+ */
+ interface ValueWrapper<V> {
+ /**
+ * Returns the actual value in the cache.
+ *
+ * @return cache value
+ */
+ V get();
+ }
+
/**
* Returns the cache name.
* ... | true |
Other | spring-projects | spring-framework | 0b917e3f9ced6449fdc47a5fcae2105e94212c28.json | revise cache API
- eliminate unneeded methods
+ introduced value wrapper (name still to be decided) to avoid cache race conditions
+ improved name consistency | org.springframework.context/src/main/java/org/springframework/cache/annotation/AnnotationCacheDefinitionSource.java | @@ -1,125 +0,0 @@
-/*
- * Copyright 2010-2011 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/LICENS... | true |
Other | spring-projects | spring-framework | 0b917e3f9ced6449fdc47a5fcae2105e94212c28.json | revise cache API
- eliminate unneeded methods
+ introduced value wrapper (name still to be decided) to avoid cache race conditions
+ improved name consistency | org.springframework.context/src/main/java/org/springframework/cache/annotation/CacheAnnotationParser.java | @@ -18,7 +18,7 @@
import java.lang.reflect.AnnotatedElement;
-import org.springframework.cache.interceptor.CacheDefinition;
+import org.springframework.cache.interceptor.CacheOperation;
/**
@@ -38,9 +38,9 @@ public interface CacheAnnotationParser {
* metadata attribute class. Returns <code>null</co... | true |
Other | spring-projects | spring-framework | 0b917e3f9ced6449fdc47a5fcae2105e94212c28.json | revise cache API
- eliminate unneeded methods
+ introduced value wrapper (name still to be decided) to avoid cache race conditions
+ improved name consistency | org.springframework.context/src/main/java/org/springframework/cache/annotation/SpringCachingAnnotationParser.java | @@ -20,11 +20,9 @@
import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement;
-import org.springframework.cache.interceptor.CacheDefinition;
-import org.springframework.cache.interceptor.CacheInvalidateDefinition;
-import org.springframework.cache.interceptor.CacheUpdateDefinition;
-im... | true |
Other | spring-projects | spring-framework | 0b917e3f9ced6449fdc47a5fcae2105e94212c28.json | revise cache API
- eliminate unneeded methods
+ introduced value wrapper (name still to be decided) to avoid cache race conditions
+ improved name consistency | org.springframework.context/src/main/java/org/springframework/cache/concurrent/ConcurrentCache.java | @@ -54,52 +54,4 @@ public String getName() {
public ConcurrentMap<K, V> getNativeCache() {
return store;
}
-
- @SuppressWarnings("unchecked")
- public V putIfAbsent(K key, V value) {
- if (getAllowNullValues()) {
- if (value == null) {
- ConcurrentMap raw = store;
- return filterNull((V) raw.pu... | true |
Other | spring-projects | spring-framework | 0b917e3f9ced6449fdc47a5fcae2105e94212c28.json | revise cache API
- eliminate unneeded methods
+ introduced value wrapper (name still to be decided) to avoid cache race conditions
+ improved name consistency | org.springframework.context/src/main/java/org/springframework/cache/config/AnnotationDrivenCacheBeanDefinitionParser.java | @@ -16,9 +16,7 @@
package org.springframework.cache.config;
-import static org.springframework.context.annotation.AnnotationConfigUtils.CACHE_ADVISOR_BEAN_NAME;
-import static org.springframework.context.annotation.AnnotationConfigUtils.CACHE_ASPECT_BEAN_NAME;
-import static org.springframework.context.annota... | true |
Other | spring-projects | spring-framework | 0b917e3f9ced6449fdc47a5fcae2105e94212c28.json | revise cache API
- eliminate unneeded methods
+ introduced value wrapper (name still to be decided) to avoid cache race conditions
+ improved name consistency | org.springframework.context/src/main/java/org/springframework/cache/ehcache/EhCacheCache.java | @@ -21,6 +21,7 @@
import net.sf.ehcache.Status;
import org.springframework.cache.Cache;
+import org.springframework.cache.interceptor.DefaultValue;
import org.springframework.util.Assert;
/**
@@ -57,77 +58,16 @@ public void clear() {
cache.removeAll();
}
- public boolean containsKey(Object key)... | true |
Other | spring-projects | spring-framework | 0b917e3f9ced6449fdc47a5fcae2105e94212c28.json | revise cache API
- eliminate unneeded methods
+ introduced value wrapper (name still to be decided) to avoid cache race conditions
+ improved name consistency | org.springframework.context/src/main/java/org/springframework/cache/interceptor/AbstractCacheDefinition.java | @@ -1,128 +0,0 @@
-/*
- * Copyright 2010-2011 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/LICENS... | true |
Other | spring-projects | spring-framework | 0b917e3f9ced6449fdc47a5fcae2105e94212c28.json | revise cache API
- eliminate unneeded methods
+ introduced value wrapper (name still to be decided) to avoid cache race conditions
+ improved name consistency | org.springframework.context/src/main/java/org/springframework/cache/interceptor/AbstractFallbackCacheDefinitionSource.java | @@ -1,218 +0,0 @@
-/*
- * Copyright 2010-2011 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/LICENS... | true |
Other | spring-projects | spring-framework | 0b917e3f9ced6449fdc47a5fcae2105e94212c28.json | revise cache API
- eliminate unneeded methods
+ introduced value wrapper (name still to be decided) to avoid cache race conditions
+ improved name consistency | org.springframework.context/src/main/java/org/springframework/cache/interceptor/BeanFactoryCacheDefinitionSourceAdvisor.java | @@ -1,62 +0,0 @@
-/*
- * Copyright 2010-2011 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... | true |
Other | spring-projects | spring-framework | 0b917e3f9ced6449fdc47a5fcae2105e94212c28.json | revise cache API
- eliminate unneeded methods
+ introduced value wrapper (name still to be decided) to avoid cache race conditions
+ improved name consistency | org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java | @@ -64,7 +64,7 @@ public abstract class CacheAspectSupport implements InitializingBean {
private CacheManager cacheManager;
- private CacheDefinitionSource cacheDefinitionSource;
+ private CacheOperationSource cacheDefinitionSource;
private final ExpressionEvaluator evaluator = new ExpressionEvaluator()... | true |
Other | spring-projects | spring-framework | 0b917e3f9ced6449fdc47a5fcae2105e94212c28.json | revise cache API
- eliminate unneeded methods
+ introduced value wrapper (name still to be decided) to avoid cache race conditions
+ improved name consistency | org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheDefinition.java | @@ -1,58 +0,0 @@
-/*
- * Copyright 2010-2011 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... | true |
Other | spring-projects | spring-framework | 0b917e3f9ced6449fdc47a5fcae2105e94212c28.json | revise cache API
- eliminate unneeded methods
+ introduced value wrapper (name still to be decided) to avoid cache race conditions
+ improved name consistency | org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheDefinitionSource.java | @@ -1,41 +0,0 @@
-/*
- * Copyright 2010-2011 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... | true |
Other | spring-projects | spring-framework | 0b917e3f9ced6449fdc47a5fcae2105e94212c28.json | revise cache API
- eliminate unneeded methods
+ introduced value wrapper (name still to be decided) to avoid cache race conditions
+ improved name consistency | org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheDefinitionSourcePointcut.java | @@ -1,68 +0,0 @@
-/*
- * Copyright 2010-2011 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... | true |
Other | spring-projects | spring-framework | 0b917e3f9ced6449fdc47a5fcae2105e94212c28.json | revise cache API
- eliminate unneeded methods
+ introduced value wrapper (name still to be decided) to avoid cache race conditions
+ improved name consistency | org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheInvalidateDefinition.java | @@ -1,33 +0,0 @@
-/*
- * Copyright 2010-2011 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... | true |
Other | spring-projects | spring-framework | 0b917e3f9ced6449fdc47a5fcae2105e94212c28.json | revise cache API
- eliminate unneeded methods
+ introduced value wrapper (name still to be decided) to avoid cache race conditions
+ improved name consistency | org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheProxyFactoryBean.java | @@ -49,7 +49,7 @@ protected Object createMainInterceptor() {
*
* @param cacheDefinitionSources cache definition sources
*/
- public void setCacheDefinitionSources(CacheDefinitionSource... cacheDefinitionSources) {
+ public void setCacheDefinitionSources(CacheOperationSource... cacheDefinitionSources) {
... | true |
Other | spring-projects | spring-framework | 0b917e3f9ced6449fdc47a5fcae2105e94212c28.json | revise cache API
- eliminate unneeded methods
+ introduced value wrapper (name still to be decided) to avoid cache race conditions
+ improved name consistency | org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheUpdateDefinition.java | @@ -1,32 +0,0 @@
-/*
- * Copyright 2010-2011 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... | true |
Other | spring-projects | spring-framework | 0b917e3f9ced6449fdc47a5fcae2105e94212c28.json | revise cache API
- eliminate unneeded methods
+ introduced value wrapper (name still to be decided) to avoid cache race conditions
+ improved name consistency | org.springframework.context/src/main/java/org/springframework/cache/interceptor/CompositeCacheDefinitionSource.java | @@ -1,63 +0,0 @@
-/*
- * Copyright 2010-2011 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... | true |
Other | spring-projects | spring-framework | 0b917e3f9ced6449fdc47a5fcae2105e94212c28.json | revise cache API
- eliminate unneeded methods
+ introduced value wrapper (name still to be decided) to avoid cache race conditions
+ improved name consistency | org.springframework.context/src/main/java/org/springframework/cache/interceptor/DefaultCacheInvalidateDefinition.java | @@ -1,44 +0,0 @@
-/*
- * Copyright 2010-2011 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... | true |
Other | spring-projects | spring-framework | 0b917e3f9ced6449fdc47a5fcae2105e94212c28.json | revise cache API
- eliminate unneeded methods
+ introduced value wrapper (name still to be decided) to avoid cache race conditions
+ improved name consistency | org.springframework.context/src/main/java/org/springframework/cache/interceptor/DefaultCacheUpdateDefinition.java | @@ -1,27 +0,0 @@
-/*
- * Copyright 2010-2011 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... | true |
Other | spring-projects | spring-framework | 0b917e3f9ced6449fdc47a5fcae2105e94212c28.json | revise cache API
- eliminate unneeded methods
+ introduced value wrapper (name still to be decided) to avoid cache race conditions
+ improved name consistency | org.springframework.context/src/main/java/org/springframework/cache/support/AbstractDelegatingCache.java | @@ -20,14 +20,16 @@
import java.util.Map;
import org.springframework.cache.Cache;
+import org.springframework.cache.interceptor.DefaultValue;
import org.springframework.util.Assert;
/**
* Abstract base class delegating most of the {@link Map}-like methods
* to the underlying cache.
*
- * <b>Not... | true |
Other | spring-projects | spring-framework | 0b917e3f9ced6449fdc47a5fcae2105e94212c28.json | revise cache API
- eliminate unneeded methods
+ introduced value wrapper (name still to be decided) to avoid cache race conditions
+ improved name consistency | org.springframework.context/src/test/java/org/springframework/cache/ehcache/EhCacheCacheTest.java | @@ -54,11 +54,9 @@ public void testExpiredElements() throws Exception {
brancusi.setTimeToLive(3);
nativeCache.put(brancusi);
- assertTrue(cache.containsKey(key));
- assertEquals(value, cache.get(key));
+ assertEquals(value, cache.get(key).get());
// wait for the entry to expire
Thread.sleep(5 *... | true |
Other | spring-projects | spring-framework | 0b917e3f9ced6449fdc47a5fcae2105e94212c28.json | revise cache API
- eliminate unneeded methods
+ introduced value wrapper (name still to be decided) to avoid cache race conditions
+ improved name consistency | org.springframework.context/src/test/java/org/springframework/cache/vendor/AbstractNativeCacheTest.java | @@ -58,7 +58,6 @@ public void testNativeCache() throws Exception {
@Test
public void testCachePut() throws Exception {
-
Object key = "enescu";
Object value = "george";
@@ -74,8 +73,6 @@ public void testCacheRemove() throws Exception {
assertNull(cache.get(key));
cache.put(key, value);
-... | true |
Other | spring-projects | spring-framework | 2afeb08e3c387715374c81a82074bae4235b5082.json | Fix @Autowired+@PostConstruct+@Configuration issue
A subtle issue existed with the way we relied on isCurrentlyInCreation
to determine whether a @Bean method is being called by the container
or by user code. This worked in most cases, but in the particular
scenario laid out by SPR-8080, this approach was no longer su... | org.springframework.beans/src/main/java/org/springframework/beans/factory/config/ConfigurableBeanFactory.java | @@ -320,6 +320,15 @@ public interface ConfigurableBeanFactory extends HierarchicalBeanFactory, Single
*/
boolean isFactoryBean(String name) throws NoSuchBeanDefinitionException;
+ /**
+ * Explicitly control in-creation status of the specified bean. For
+ * container internal use only.
+ * @param beanName the ... | true |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.