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 | 2defb6555ea1bb0db84a04836674ce9b2fdcad7f.json | Fix broken Javadoc related to `<` and `>` | spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionTag.java | @@ -76,12 +76,12 @@ public class OptionTag extends AbstractHtmlElementBodyTag implements BodyTag {
/**
- * The 'value' attribute of the rendered HTML {@code <option>} tag.
+ * The 'value' attribute of the rendered HTML {@code <option>} tag.
*/
private Object value;
/**
- * The text body of the r... | true |
Other | spring-projects | spring-framework | e7073474740283761bb2e9f823d6fc9e9f22eb1d.json | Fix failing tests | spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java | @@ -644,7 +644,7 @@ private void assertContentDisposition(RequestResponseBodyMethodProcessor process
String header = servletResponse.getHeader("Content-Disposition");
if (expectContentDisposition) {
assertEquals("Expected 'Content-Disposition' header. Use case: '" + comment + "'",
- "attachment;filename=f... | true |
Other | spring-projects | spring-framework | e7073474740283761bb2e9f823d6fc9e9f22eb1d.json | Fix failing tests | spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java | @@ -1655,7 +1655,7 @@ public void initialize(GenericWebApplicationContext wac) {
assertEquals(200, response.getStatus());
assertEquals("text/html", response.getContentType());
- assertEquals("attachment;filename=f.txt", response.getHeader("Content-Disposition"));
+ assertEquals("inline;filename=f.txt", respon... | true |
Other | spring-projects | spring-framework | e7073474740283761bb2e9f823d6fc9e9f22eb1d.json | Fix failing tests | src/asciidoc/web-mvc.adoc | @@ -884,7 +884,7 @@ nor disabling the use of path extensions for content negotiation purposes alone
are effective at preventing RFD attacks.
For comprehensive protection against RFD, prior to rendering the response body
-Spring MVC adds a `Content-Disposition:attachment;filename=f.txt` header to
+Spring MVC adds a ... | true |
Other | spring-projects | spring-framework | 62af99a21c4599576cbdf93e51e0deb131bca4dd.json | Add containsKey to ServletResponseHttpHeaders
Issue: SPR-13668 | spring-web/src/main/java/org/springframework/http/server/ServletServerHttpResponse.java | @@ -137,6 +137,11 @@ private class ServletResponseHttpHeaders extends HttpHeaders {
private static final long serialVersionUID = 3410708522401046302L;
+ @Override
+ public boolean containsKey(Object key) {
+ return (super.containsKey(key) || (get(key) != null));
+ }
+
@Override
public String getFirst(... | true |
Other | spring-projects | spring-framework | 62af99a21c4599576cbdf93e51e0deb131bca4dd.json | Add containsKey to ServletResponseHttpHeaders
Issue: SPR-13668 | spring-web/src/test/java/org/springframework/http/server/ServletServerHttpResponseTests.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.... | true |
Other | spring-projects | spring-framework | e6b1f0a139293be2ea90da754218c7fd282f836a.json | Use constants when caching empty arrays
Reduce cache memory consumption by using a single constant for empty
arrays. | spring-core/src/main/java/org/springframework/util/ReflectionUtils.java | @@ -51,6 +51,10 @@ public abstract class ReflectionUtils {
*/
private static final String CGLIB_RENAMED_METHOD_PREFIX = "CGLIB$";
+ private static final Method[] NO_METHODS = {};
+
+ private static final Field[] NO_FIELDS = {};
+
/**
* Cache for {@link Class#getDeclaredMethods()} plus equivalent default met... | false |
Other | spring-projects | spring-framework | ac975df448eed9cad620b895f4999a10237df1f0.json | Fix javadoc ambiguity
Issue: SPR-13642 | spring-web/src/main/java/org/springframework/web/accept/ContentNegotiationManagerFactoryBean.java | @@ -40,29 +40,34 @@
*
* <table>
* <tr>
- * <td>{@link #setFavorPathExtension favorPathExtension}</td>
- * <td>{@link PathExtensionContentNegotiationStrategy}</td>
- * <td>Yes</td>
+ * <th>Property Setter</th>
+ * <th>Underlying Strategy</th>
+ * <th>Default Setting</th>
+ * </tr>
+ * <tr>
... | true |
Other | spring-projects | spring-framework | ac975df448eed9cad620b895f4999a10237df1f0.json | Fix javadoc ambiguity
Issue: SPR-13642 | spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ContentNegotiationConfigurer.java | @@ -36,29 +36,34 @@
*
* <table>
* <tr>
+ * <th>Configurer Property</th>
+ * <th>Underlying Strategy</th>
+ * <th>Default Setting</th>
+ * </tr>
+ * <tr>
* <td>{@link #favorPathExtension}</td>
- * <td>{@link PathExtensionContentNegotiationStrategy}</td>
- * <td>Yes</td>
+ * <td>{@link... | true |
Other | spring-projects | spring-framework | f0464e81761d2631902d512d67016967b9cd316a.json | Add section on RFD + whitelist yml/properties/csv
Issue: SPR-13643 | spring-web/src/main/java/org/springframework/web/accept/ContentNegotiationManagerFactoryBean.java | @@ -118,11 +118,15 @@ public void setFavorPathExtension(boolean favorPathExtension) {
}
/**
- * Add mappings from keys, extracted from a path extension or a query
+ * Add a mapping from a key, extracted from a path extension or a query
* parameter, to a MediaType. This is required in order for the parameter
... | true |
Other | spring-projects | spring-framework | f0464e81761d2631902d512d67016967b9cd316a.json | Add section on RFD + whitelist yml/properties/csv
Issue: SPR-13643 | spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ContentNegotiationConfigurer.java | @@ -109,9 +109,13 @@ public ContentNegotiationConfigurer favorPathExtension(boolean favorPathExtensio
/**
* Add a mapping from a key, extracted from a path extension or a query
* parameter, to a MediaType. This is required in order for the parameter
- * strategy to work. The path extension strategy will also t... | true |
Other | spring-projects | spring-framework | f0464e81761d2631902d512d67016967b9cd316a.json | Add section on RFD + whitelist yml/properties/csv
Issue: SPR-13643 | spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java | @@ -73,7 +73,9 @@ public abstract class AbstractMessageConverterMethodProcessor extends AbstractMe
/* Extensions associated with the built-in message converters */
private static final Set<String> WHITELISTED_EXTENSIONS = new HashSet<String>(Arrays.asList(
- "txt", "text", "json", "xml", "atom", "rss", "png", "... | true |
Other | spring-projects | spring-framework | f0464e81761d2631902d512d67016967b9cd316a.json | Add section on RFD + whitelist yml/properties/csv
Issue: SPR-13643 | src/asciidoc/web-mvc.adoc | @@ -846,21 +846,75 @@ configuration. For more information on placeholders, see the javadocs of the
[[mvc-ann-requestmapping-suffix-pattern-match]]
-==== Path Pattern Matching By Suffix
-By default Spring MVC automatically performs `".{asterisk}"` suffix pattern matching so
-that a controller mapped to `/person` is... | true |
Other | spring-projects | spring-framework | 1733d0111d1fb0b253b0085be9347d269548bac4.json | Add shortcuts for elements with no annotations
Improve the performance of the `getMergedAnnotationAttributes` and
`isAnnotated` methods in `AnnotatedElementUtils` by returning
immediately when the element had no annotations.
Issue: SPR-13621 | spring-core/src/main/java/org/springframework/core/annotation/AnnotatedElementUtils.java | @@ -201,6 +201,9 @@ public static boolean isAnnotated(AnnotatedElement element, final String annotat
Assert.notNull(element, "AnnotatedElement must not be null");
Assert.hasLength(annotationName, "annotationName must not be null or empty");
+ if (element.getAnnotations().length == 0) {
+ return false;
+ }
... | false |
Other | spring-projects | spring-framework | 1bc41bdf0f4f491259c2079de48a93ed1dfbe9eb.json | Expose JMS message listener container ids
Issue: SPR-13633 | spring-jms/src/main/java/org/springframework/jms/config/JmsListenerEndpointRegistry.java | @@ -19,6 +19,7 @@
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
+import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
@@ -68,12 +69,21 @@ public class JmsListenerEndpointRegistry implements DisposableBean, SmartL... | true |
Other | spring-projects | spring-framework | 1bc41bdf0f4f491259c2079de48a93ed1dfbe9eb.json | Expose JMS message listener container ids
Issue: SPR-13633 | spring-jms/src/test/java/org/springframework/jms/annotation/AbstractJmsAnnotationDrivenTests.java | @@ -169,6 +169,8 @@ public void testCustomConfiguration(ApplicationContext context) {
JmsListenerEndpointRegistry customRegistry =
context.getBean("customRegistry", JmsListenerEndpointRegistry.class);
+ assertEquals("Wrong number of containers in the registry", 2,
+ customRegistry.getListenerContainerIds(... | true |
Other | spring-projects | spring-framework | 1bc41bdf0f4f491259c2079de48a93ed1dfbe9eb.json | Expose JMS message listener container ids
Issue: SPR-13633 | spring-jms/src/test/java/org/springframework/jms/config/JmsListenerEndpointRegistrarTests.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -76,6 +76,7 @@ public void registerNullConta... | true |
Other | spring-projects | spring-framework | 9c66dfa7b5f610ddeb69b9dc10baa227fbddcbf1.json | Avoid stacktrace for invalid Origin header values
This commit adds support for origins with a trailing slash or a path,
in order to avoid printing a stacktrace in the logs when
WebUtils#isSameOrigin(HttpRequest) parses such invalid Origin header
value.
Issue: SPR-13478 | spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java | @@ -339,6 +339,7 @@ public static UriComponentsBuilder fromHttpRequest(HttpRequest request) {
/**
* Create an instance by parsing the "origin" header of an HTTP request.
+ * @see <a href="https://tools.ietf.org/html/rfc6454">RFC 6454</a>
*/
public static UriComponentsBuilder fromOriginHeader(String origin)... | true |
Other | spring-projects | spring-framework | 9c66dfa7b5f610ddeb69b9dc10baa227fbddcbf1.json | Avoid stacktrace for invalid Origin header values
This commit adds support for origins with a trailing slash or a path,
in order to avoid printing a stacktrace in the logs when
WebUtils#isSameOrigin(HttpRequest) parses such invalid Origin header
value.
Issue: SPR-13478 | spring-web/src/test/java/org/springframework/web/util/WebUtilsTests.java | @@ -132,6 +132,16 @@ public void isSameOrigin() {
assertFalse(checkSameOrigin("mydomain1.com", -1, "http://mydomain2.com"));
assertFalse(checkSameOrigin("mydomain1.com", -1, "https://mydomain1.com"));
assertFalse(checkSameOrigin("mydomain1.com", -1, "invalid-origin"));
+
+ // Handling of invalid origins as de... | true |
Other | spring-projects | spring-framework | 158028881575fb3f00f96579a04ca52857afa375.json | Improve error reporting in ScriptTemplateView
This commit introduces a new ScriptRenderException in order to:
- Print in the resulting error page the reason of the script failure
- Not print the whole stacktrace in the logs
The ScriptRenderException thrown in ScriptTemplateView#renderMergedOutputModel()
is wrapped ... | spring-webmvc/src/main/java/org/springframework/web/servlet/view/script/ScriptRenderException.java | @@ -0,0 +1,45 @@
+/*
+ * Copyright 2002-2015 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 | 158028881575fb3f00f96579a04ca52857afa375.json | Improve error reporting in ScriptTemplateView
This commit introduces a new ScriptRenderException in order to:
- Print in the resulting error page the reason of the script failure
- Not print the whole stacktrace in the logs
The ScriptRenderException thrown in ScriptTemplateView#renderMergedOutputModel()
is wrapped ... | spring-webmvc/src/main/java/org/springframework/web/servlet/view/script/ScriptTemplateView.java | @@ -29,6 +29,7 @@
import javax.script.Invocable;
import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager;
+import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -357,7 +358,7 @@ protected void renderMergedOutputMod... | true |
Other | spring-projects | spring-framework | f816cc6a516c324875fa409a33d288447c6996f7.json | Add CompletableFuture/Single/Promise support | spring-web-reactive/src/main/java/org/springframework/reactive/codec/decoder/JsonObjectDecoder.java | @@ -25,6 +25,7 @@
import io.netty.buffer.Unpooled;
import org.reactivestreams.Publisher;
import reactor.fn.Function;
+import reactor.rx.Promise;
import reactor.rx.Streams;
import rx.Observable;
@@ -90,7 +91,7 @@ public JsonObjectDecoder(int maxObjectLength, boolean streamArrayElements) {
@Override
public b... | true |
Other | spring-projects | spring-framework | f816cc6a516c324875fa409a33d288447c6996f7.json | Add CompletableFuture/Single/Promise support | spring-web-reactive/src/main/java/org/springframework/reactive/codec/encoder/JsonObjectEncoder.java | @@ -19,6 +19,7 @@
import java.nio.ByteBuffer;
import org.reactivestreams.Publisher;
+import reactor.rx.Promise;
import rx.Observable;
import rx.RxReactiveStreams;
@@ -44,7 +45,7 @@ public class JsonObjectEncoder implements MessageToByteEncoder<ByteBuffer> {
@Override
public boolean canEncode(ResolvableTyp... | true |
Other | spring-projects | spring-framework | f816cc6a516c324875fa409a33d288447c6996f7.json | Add CompletableFuture/Single/Promise support | spring-web-reactive/src/main/java/org/springframework/reactive/util/CompletableFutureUtils.java | @@ -0,0 +1,141 @@
+/*
+ * Copyright 2002-2015 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 | f816cc6a516c324875fa409a33d288447c6996f7.json | Add CompletableFuture/Single/Promise support | spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/RequestBodyArgumentResolver.java | @@ -21,18 +21,22 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.concurrent.CompletableFuture;
import org.reactivestreams.Publisher;
+import reactor.rx.Promise;
import reactor.rx.Stream;
import reactor.rx.Streams;
import rx.Observable;
import rx.RxReactive... | true |
Other | spring-projects | spring-framework | f816cc6a516c324875fa409a33d288447c6996f7.json | Add CompletableFuture/Single/Promise support | spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/ResponseBodyResultHandler.java | @@ -21,11 +21,15 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.concurrent.CompletableFuture;
import org.reactivestreams.Publisher;
+import reactor.rx.Promise;
+import reactor.rx.Stream;
import reactor.rx.Streams;
import rx.Observable;
import rx.RxReactive... | true |
Other | spring-projects | spring-framework | f816cc6a516c324875fa409a33d288447c6996f7.json | Add CompletableFuture/Single/Promise support | spring-web-reactive/src/test/java/org/springframework/reactive/util/CompletableFutureUtilsTests.java | @@ -0,0 +1,101 @@
+/*
+ * Copyright 2002-2015 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 | f816cc6a516c324875fa409a33d288447c6996f7.json | Add CompletableFuture/Single/Promise support | spring-web-reactive/src/test/java/org/springframework/reactive/web/dispatch/method/annotation/RequestMappingIntegrationTests.java | @@ -19,13 +19,17 @@
import java.net.URI;
import java.util.Arrays;
import java.util.List;
+import java.util.concurrent.CompletableFuture;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
import org.reactivestreams.Publisher;
+import reactor.rx.Promise;
+import reactor.rx.Promises;
import reac... | true |
Other | spring-projects | spring-framework | 0510329b54a265e7dc2e83be83235da7dcea4196.json | Support Undertow 1.3.0 in UndertowXhrTransport
As of Undertow 1.3.0, several APIs have been changed: replacing Xnio's
Pool/Pooled references to Undertow's new ByteBufferPool abstraction.
This move has been made, as part of
https://issues.jboss.org/browse/UNDERTOW-522, to prepare deprecations in
the Xnio API.
This com... | build.gradle | @@ -72,7 +72,7 @@ configure(allprojects) { project ->
ext.tiles3Version = "3.0.5"
ext.tomcatVersion = "8.0.26"
ext.tyrusVersion = "1.3.5" // constrained by WebLogic 12.1.3 support
- ext.undertowVersion = "1.2.12.Final"
+ ext.undertowVersion = "1.3.0.CR2"
ext.woodstoxVersion ... | true |
Other | spring-projects | spring-framework | 0510329b54a265e7dc2e83be83235da7dcea4196.json | Support Undertow 1.3.0 in UndertowXhrTransport
As of Undertow 1.3.0, several APIs have been changed: replacing Xnio's
Pool/Pooled references to Undertow's new ByteBufferPool abstraction.
This move has been made, as part of
https://issues.jboss.org/browse/UNDERTOW-522, to prepare deprecations in
the Xnio API.
This com... | spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/UndertowXhrTransport.java | @@ -18,6 +18,7 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.lang.reflect.Method;
import java.net.URI;
import java.nio.ByteBuffer;
import java.util.List;
@@ -30,16 +31,21 @@
import io.undertow.client.ClientRequest;
import io.undertow.client.ClientResponse;
import io.underto... | true |
Other | spring-projects | spring-framework | ffd9c62fc8b7cbeb5fbbc9a4fd487b1284a0b264.json | Translate IOException to HttpMessageNotReadableEx
Some converters (Jackson, Gson, Protobuf) already do this. It is now
also done in AbstractMessageConverterMethodArgumentResolver which
enforces a consistent behavior across controller method arguments.
Issue: SPR-12745 | spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java | @@ -179,47 +179,53 @@ protected <T> Object readWithMessageConverters(HttpInputMessage inputMessage, Me
}
HttpMethod httpMethod = ((HttpRequest) inputMessage).getMethod();
- inputMessage = new EmptyBodyCheckingHttpInputMessage(inputMessage);
Object body = NO_VALUE;
- for (HttpMessageConverter<?> converter... | false |
Other | spring-projects | spring-framework | 598fafd95743840bce6c7f929eaaf596fefe088b.json | Fix failing test | spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java | @@ -691,7 +691,7 @@ public void testViewControllersDefaultConfig() {
@Test
public void testContentNegotiationManager() throws Exception {
- loadBeanDefinitions("mvc-config-content-negotiation-manager.xml", 14);
+ loadBeanDefinitions("mvc-config-content-negotiation-manager.xml", 15);
RequestMappingHandlerMa... | false |
Other | spring-projects | spring-framework | f84a0c914a06e79208d5306927ec35a0a3a6e5df.json | Detect custom ContentNegotiationViewResolver
The <mvc:annotation-driven> element now adds an alias when a
ContentNegotiationManager bean is registered with a custom name.
This helps <mvc:view-resolvers> to more reliably find such a custom
ContentNegotiationManager.
Issue: SPR-13559 | spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -364,18 +364,22 @@ else if (javaxValidationP... | true |
Other | spring-projects | spring-framework | f84a0c914a06e79208d5306927ec35a0a3a6e5df.json | Detect custom ContentNegotiationViewResolver
The <mvc:annotation-driven> element now adds an alias when a
ContentNegotiationManager bean is registered with a custom name.
This helps <mvc:view-resolvers> to more reliably find such a custom
ContentNegotiationManager.
Issue: SPR-13559 | spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewResolversBeanDefinitionParser.java | @@ -192,9 +192,9 @@ private BeanDefinition createContentNegotiatingViewResolver(Element resolverElem
if (resolverElement.hasAttribute("use-not-acceptable")) {
values.add("useNotAcceptableStatusCode", resolverElement.getAttribute("use-not-acceptable"));
}
- String beanName = AnnotationDrivenBeanDefinitionPars... | true |
Other | spring-projects | spring-framework | f84a0c914a06e79208d5306927ec35a0a3a6e5df.json | Detect custom ContentNegotiationViewResolver
The <mvc:annotation-driven> element now adds an alias when a
ContentNegotiationManager bean is registered with a custom name.
This helps <mvc:view-resolvers> to more reliably find such a custom
ContentNegotiationManager.
Issue: SPR-13559 | spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java | @@ -119,6 +119,10 @@ public void setContentNegotiationManager(ContentNegotiationManager contentNegoti
this.contentNegotiationManager = contentNegotiationManager;
}
+ public ContentNegotiationManager getContentNegotiationManager() {
+ return this.contentNegotiationManager;
+ }
+
/**
* Indicate whether a {@l... | true |
Other | spring-projects | spring-framework | f84a0c914a06e79208d5306927ec35a0a3a6e5df.json | Detect custom ContentNegotiationViewResolver
The <mvc:annotation-driven> element now adds an alias when a
ContentNegotiationManager bean is registered with a custom name.
This helps <mvc:view-resolvers> to more reliably find such a custom
ContentNegotiationManager.
Issue: SPR-13559 | spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java | @@ -691,14 +691,23 @@ public void testViewControllersDefaultConfig() {
@Test
public void testContentNegotiationManager() throws Exception {
- loadBeanDefinitions("mvc-config-content-negotiation-manager.xml", 14);
+ loadBeanDefinitions("mvc-config-content-negotiation-manager.xml", 15);
RequestMappingHandler... | true |
Other | spring-projects | spring-framework | f84a0c914a06e79208d5306927ec35a0a3a6e5df.json | Detect custom ContentNegotiationViewResolver
The <mvc:annotation-driven> element now adds an alias when a
ContentNegotiationManager bean is registered with a custom name.
This helps <mvc:view-resolvers> to more reliably find such a custom
ContentNegotiationManager.
Issue: SPR-13559 | spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-content-negotiation-manager.xml | @@ -9,6 +9,10 @@
<mvc:annotation-driven content-negotiation-manager="contentNegotiationManager" />
+ <mvc:view-resolvers>
+ <mvc:content-negotiation/>
+ </mvc:view-resolvers>
+
<bean id="contentNegotiationManager" class="org.springframework.web.accept.ContentNegotiationManagerFactoryBean">
<property name="m... | true |
Other | spring-projects | spring-framework | bab3b6fd1c4946cdba59aca365aba1a7f4ca6033.json | Introduce HttpMessage hierarchy
This commit introduces "reactive" sub-interfaces of the HttpMessage
interface found in the Spring Framework. | spring-web-reactive/src/main/java/org/springframework/http/ReactiveHttpInputMessage.java | @@ -13,21 +13,26 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.reactive.web.http;
+
+package org.springframework.http;
import java.nio.ByteBuffer;
import org.reactivestreams.Publisher;
/**
- * Represent a server-s... | true |
Other | spring-projects | spring-framework | bab3b6fd1c4946cdba59aca365aba1a7f4ca6033.json | Introduce HttpMessage hierarchy
This commit introduces "reactive" sub-interfaces of the HttpMessage
interface found in the Spring Framework. | spring-web-reactive/src/main/java/org/springframework/http/ReactiveHttpOutputMessage.java | @@ -0,0 +1,41 @@
+/*
+ * Copyright 2002-2015 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 | bab3b6fd1c4946cdba59aca365aba1a7f4ca6033.json | Introduce HttpMessage hierarchy
This commit introduces "reactive" sub-interfaces of the HttpMessage
interface found in the Spring Framework. | spring-web-reactive/src/main/java/org/springframework/http/client/ReactiveClientHttpRequest.java | @@ -13,19 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.reactive.web.http;
-import java.net.URI;
+package org.springframework.http.client;
-import org.springframework.http.HttpMethod;
+import org.springframework... | true |
Other | spring-projects | spring-framework | bab3b6fd1c4946cdba59aca365aba1a7f4ca6033.json | Introduce HttpMessage hierarchy
This commit introduces "reactive" sub-interfaces of the HttpMessage
interface found in the Spring Framework. | spring-web-reactive/src/main/java/org/springframework/http/client/ReactiveClientHttpResponse.java | @@ -0,0 +1,59 @@
+/*
+ * Copyright 2002-2015 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 | bab3b6fd1c4946cdba59aca365aba1a7f4ca6033.json | Introduce HttpMessage hierarchy
This commit introduces "reactive" sub-interfaces of the HttpMessage
interface found in the Spring Framework. | spring-web-reactive/src/main/java/org/springframework/http/server/ReactiveServerHttpRequest.java | @@ -13,15 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.reactive.web.http;
-import org.springframework.http.HttpHeaders;
+package org.springframework.http.server;
+
+import org.springframework.http.HttpRequest;
+i... | true |
Other | spring-projects | spring-framework | bab3b6fd1c4946cdba59aca365aba1a7f4ca6033.json | Introduce HttpMessage hierarchy
This commit introduces "reactive" sub-interfaces of the HttpMessage
interface found in the Spring Framework. | spring-web-reactive/src/main/java/org/springframework/http/server/ReactiveServerHttpResponse.java | @@ -13,40 +13,32 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.reactive.web.http;
-import java.nio.ByteBuffer;
-
-import org.reactivestreams.Publisher;
+package org.springframework.http.server;
import org.springframew... | true |
Other | spring-projects | spring-framework | bab3b6fd1c4946cdba59aca365aba1a7f4ca6033.json | Introduce HttpMessage hierarchy
This commit introduces "reactive" sub-interfaces of the HttpMessage
interface found in the Spring Framework. | spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/DispatcherHandler.java | @@ -13,25 +13,27 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.springframework.reactive.web.dispatch;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
import org.apache.commons.logging.Log;
import org.ap... | true |
Other | spring-projects | spring-framework | bab3b6fd1c4946cdba59aca365aba1a7f4ca6033.json | Introduce HttpMessage hierarchy
This commit introduces "reactive" sub-interfaces of the HttpMessage
interface found in the Spring Framework. | spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/HandlerAdapter.java | @@ -13,10 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.springframework.reactive.web.dispatch;
-import org.springframework.reactive.web.http.ServerHttpRequest;
-import org.springframework.reactive.web.http.ServerHttpResponse;
+... | true |
Other | spring-projects | spring-framework | bab3b6fd1c4946cdba59aca365aba1a7f4ca6033.json | Introduce HttpMessage hierarchy
This commit introduces "reactive" sub-interfaces of the HttpMessage
interface found in the Spring Framework. | spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/HandlerMapping.java | @@ -13,15 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.springframework.reactive.web.dispatch;
-import org.springframework.reactive.web.http.ServerHttpRequest;
+import org.springframework.http.server.ReactiveServerHttpRequest;
... | true |
Other | spring-projects | spring-framework | bab3b6fd1c4946cdba59aca365aba1a7f4ca6033.json | Introduce HttpMessage hierarchy
This commit introduces "reactive" sub-interfaces of the HttpMessage
interface found in the Spring Framework. | spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/HandlerResultHandler.java | @@ -13,12 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.springframework.reactive.web.dispatch;
import org.reactivestreams.Publisher;
-import org.springframework.reactive.web.http.ServerHttpRequest;
-import org.springframewor... | true |
Other | spring-projects | spring-framework | bab3b6fd1c4946cdba59aca365aba1a7f4ca6033.json | Introduce HttpMessage hierarchy
This commit introduces "reactive" sub-interfaces of the HttpMessage
interface found in the Spring Framework. | spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/SimpleHandlerResultHandler.java | @@ -22,8 +22,8 @@
import reactor.Publishers;
import org.springframework.core.Ordered;
-import org.springframework.reactive.web.http.ServerHttpRequest;
-import org.springframework.reactive.web.http.ServerHttpResponse;
+import org.springframework.http.server.ReactiveServerHttpRequest;
+import org.springframework.http... | true |
Other | spring-projects | spring-framework | bab3b6fd1c4946cdba59aca365aba1a7f4ca6033.json | Introduce HttpMessage hierarchy
This commit introduces "reactive" sub-interfaces of the HttpMessage
interface found in the Spring Framework. | spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/handler/HttpHandlerAdapter.java | @@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.springframework.reactive.web.dispatch.handler;
import org.reactivestreams.Publisher;
+import org.springframework.http.server.ReactiveServerHttpRequest;
+import org.spri... | true |
Other | spring-projects | spring-framework | bab3b6fd1c4946cdba59aca365aba1a7f4ca6033.json | Introduce HttpMessage hierarchy
This commit introduces "reactive" sub-interfaces of the HttpMessage
interface found in the Spring Framework. | spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/handler/SimpleUrlHandlerMapping.java | @@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.springframework.reactive.web.dispatch.handler;
import java.util.HashMap;
import java.util.Map;
+import org.springframework.http.server.ReactiveServerHttpRequest;
impo... | true |
Other | spring-projects | spring-framework | bab3b6fd1c4946cdba59aca365aba1a7f4ca6033.json | Introduce HttpMessage hierarchy
This commit introduces "reactive" sub-interfaces of the HttpMessage
interface found in the Spring Framework. | spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/HandlerMethodArgumentResolver.java | @@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.reactive.web.dispatch.method;
+package org.springframework.reactive.web.dispatch.method;
import org.springframework.core.MethodParameter;
-import org.spri... | true |
Other | spring-projects | spring-framework | bab3b6fd1c4946cdba59aca365aba1a7f4ca6033.json | Introduce HttpMessage hierarchy
This commit introduces "reactive" sub-interfaces of the HttpMessage
interface found in the Spring Framework. | spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/InvocableHandlerMethod.java | @@ -26,7 +26,7 @@
import org.springframework.core.GenericTypeResolver;
import org.springframework.core.MethodParameter;
import org.springframework.core.ParameterNameDiscoverer;
-import org.springframework.reactive.web.http.ServerHttpRequest;
+import org.springframework.http.server.ReactiveServerHttpRequest;
import ... | true |
Other | spring-projects | spring-framework | bab3b6fd1c4946cdba59aca365aba1a7f4ca6033.json | Introduce HttpMessage hierarchy
This commit introduces "reactive" sub-interfaces of the HttpMessage
interface found in the Spring Framework. | spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/RequestBodyArgumentResolver.java | @@ -16,23 +16,35 @@
package org.springframework.reactive.web.dispatch.method.annotation;
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Ti... | true |
Other | spring-projects | spring-framework | bab3b6fd1c4946cdba59aca365aba1a7f4ca6033.json | Introduce HttpMessage hierarchy
This commit introduces "reactive" sub-interfaces of the HttpMessage
interface found in the Spring Framework. | spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/RequestMappingHandlerAdapter.java | @@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.springframework.reactive.web.dispatch.method.annotation;
import java.nio.ByteBuffer;
@@ -23,15 +24,15 @@
import org.springframework.beans.factory.InitializingBean;
import... | true |
Other | spring-projects | spring-framework | bab3b6fd1c4946cdba59aca365aba1a7f4ca6033.json | Introduce HttpMessage hierarchy
This commit introduces "reactive" sub-interfaces of the HttpMessage
interface found in the Spring Framework. | spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/RequestMappingHandlerMapping.java | @@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.springframework.reactive.web.dispatch.method.annotation;
import java.util.Arrays;
@@ -32,8 +33,8 @@
import org.springframework.context.ApplicationContextAware;
import org... | true |
Other | spring-projects | spring-framework | bab3b6fd1c4946cdba59aca365aba1a7f4ca6033.json | Introduce HttpMessage hierarchy
This commit introduces "reactive" sub-interfaces of the HttpMessage
interface found in the Spring Framework. | spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/RequestParamArgumentResolver.java | @@ -13,12 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.springframework.reactive.web.dispatch.method.annotation;
import org.springframework.core.MethodParameter;
+import org.springframework.http.server.ReactiveServerHttpRequ... | true |
Other | spring-projects | spring-framework | bab3b6fd1c4946cdba59aca365aba1a7f4ca6033.json | Introduce HttpMessage hierarchy
This commit introduces "reactive" sub-interfaces of the HttpMessage
interface found in the Spring Framework. | spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/ResponseBodyResultHandler.java | @@ -13,30 +13,40 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.springframework.reactive.web.dispatch.method.annotation;
+import java.lang.reflect.Type;
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+import java.util.A... | true |
Other | spring-projects | spring-framework | bab3b6fd1c4946cdba59aca365aba1a7f4ca6033.json | Introduce HttpMessage hierarchy
This commit introduces "reactive" sub-interfaces of the HttpMessage
interface found in the Spring Framework. | spring-web-reactive/src/main/java/org/springframework/reactive/web/http/HttpHandler.java | @@ -18,6 +18,8 @@
import org.reactivestreams.Publisher;
+import org.springframework.http.server.ReactiveServerHttpRequest;
+import org.springframework.http.server.ReactiveServerHttpResponse;
/**
* Interface for handlers that process HTTP requests and generate an HTTP response.
@@ -28,8 +30,8 @@
* @author Ar... | true |
Other | spring-projects | spring-framework | bab3b6fd1c4946cdba59aca365aba1a7f4ca6033.json | Introduce HttpMessage hierarchy
This commit introduces "reactive" sub-interfaces of the HttpMessage
interface found in the Spring Framework. | spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/ReactorServerHttpRequest.java | @@ -1,11 +1,11 @@
/*
- * Copyright (c) 2011-2015 Pivotal Software Inc, All Rights Reserved.
+ * Copyright 2002-2015 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 t... | true |
Other | spring-projects | spring-framework | bab3b6fd1c4946cdba59aca365aba1a7f4ca6033.json | Introduce HttpMessage hierarchy
This commit introduces "reactive" sub-interfaces of the HttpMessage
interface found in the Spring Framework. | spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/ReactorServerHttpResponse.java | @@ -1,11 +1,11 @@
/*
- * Copyright (c) 2011-2015 Pivotal Software Inc, All Rights Reserved.
+ * Copyright 2002-2015 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 t... | true |
Other | spring-projects | spring-framework | bab3b6fd1c4946cdba59aca365aba1a7f4ca6033.json | Introduce HttpMessage hierarchy
This commit introduces "reactive" sub-interfaces of the HttpMessage
interface found in the Spring Framework. | spring-web-reactive/src/main/java/org/springframework/reactive/web/http/rxnetty/RxNettyServerHttpRequest.java | @@ -13,28 +13,29 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.springframework.reactive.web.http.rxnetty;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.ByteBuffer;
+
import io.netty.buffer.ByteBuf;
impo... | true |
Other | spring-projects | spring-framework | bab3b6fd1c4946cdba59aca365aba1a7f4ca6033.json | Introduce HttpMessage hierarchy
This commit introduces "reactive" sub-interfaces of the HttpMessage
interface found in the Spring Framework. | spring-web-reactive/src/main/java/org/springframework/reactive/web/http/rxnetty/RxNettyServerHttpResponse.java | @@ -13,28 +13,33 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.springframework.reactive.web.http.rxnetty;
+import java.nio.ByteBuffer;
+
import io.netty.handler.codec.http.HttpResponseStatus;
import io.reactivex.netty.protocol.http.... | true |
Other | spring-projects | spring-framework | bab3b6fd1c4946cdba59aca365aba1a7f4ca6033.json | Introduce HttpMessage hierarchy
This commit introduces "reactive" sub-interfaces of the HttpMessage
interface found in the Spring Framework. | spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/ServletServerHttpRequest.java | @@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.springframework.reactive.web.http.servlet;
import java.net.URI;
@@ -21,23 +22,22 @@
import java.nio.charset.Charset;
import java.util.Enumeration;
import java.util.Map;
... | true |
Other | spring-projects | spring-framework | bab3b6fd1c4946cdba59aca365aba1a7f4ca6033.json | Introduce HttpMessage hierarchy
This commit introduces "reactive" sub-interfaces of the HttpMessage
interface found in the Spring Framework. | spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/ServletServerHttpResponse.java | @@ -13,26 +13,26 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.springframework.reactive.web.http.servlet;
import java.nio.ByteBuffer;
import java.util.List;
import java.util.Map;
-
import javax.servlet.http.HttpServletResponse;
... | true |
Other | spring-projects | spring-framework | bab3b6fd1c4946cdba59aca365aba1a7f4ca6033.json | Introduce HttpMessage hierarchy
This commit introduces "reactive" sub-interfaces of the HttpMessage
interface found in the Spring Framework. | spring-web-reactive/src/test/java/org/springframework/reactive/web/dispatch/handler/SimpleUrlHandlerMappingIntegrationTests.java | @@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.springframework.reactive.web.dispatch.handler;
import java.net.URI;
@@ -27,12 +28,12 @@
import org.springframework.http.RequestEntity;
import org.springframework.http.R... | true |
Other | spring-projects | spring-framework | bab3b6fd1c4946cdba59aca365aba1a7f4ca6033.json | Introduce HttpMessage hierarchy
This commit introduces "reactive" sub-interfaces of the HttpMessage
interface found in the Spring Framework. | spring-web-reactive/src/test/java/org/springframework/reactive/web/dispatch/method/annotation/RequestMappingHandlerMappingTests.java | @@ -20,20 +20,21 @@
import java.net.URISyntaxException;
import java.nio.ByteBuffer;
-import static org.junit.Assert.assertEquals;
import org.junit.Before;
import org.junit.Test;
import org.reactivestreams.Publisher;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
-imp... | true |
Other | spring-projects | spring-framework | bab3b6fd1c4946cdba59aca365aba1a7f4ca6033.json | Introduce HttpMessage hierarchy
This commit introduces "reactive" sub-interfaces of the HttpMessage
interface found in the Spring Framework. | spring-web-reactive/src/test/java/org/springframework/reactive/web/http/EchoHandler.java | @@ -18,13 +18,16 @@
import org.reactivestreams.Publisher;
+import org.springframework.http.server.ReactiveServerHttpRequest;
+import org.springframework.http.server.ReactiveServerHttpResponse;
+
/**
* @author Arjen Poutsma
*/
public class EchoHandler implements HttpHandler {
@Override
- public Publisher<... | true |
Other | spring-projects | spring-framework | bab3b6fd1c4946cdba59aca365aba1a7f4ca6033.json | Introduce HttpMessage hierarchy
This commit introduces "reactive" sub-interfaces of the HttpMessage
interface found in the Spring Framework. | spring-web-reactive/src/test/java/org/springframework/reactive/web/http/RandomHandler.java | @@ -27,6 +27,9 @@
import reactor.io.buffer.Buffer;
import reactor.rx.Streams;
+import org.springframework.http.server.ReactiveServerHttpRequest;
+import org.springframework.http.server.ReactiveServerHttpResponse;
+
import static org.junit.Assert.assertEquals;
/**
@@ -41,7 +44,7 @@ public class RandomHandler imp... | true |
Other | spring-projects | spring-framework | bab3b6fd1c4946cdba59aca365aba1a7f4ca6033.json | Introduce HttpMessage hierarchy
This commit introduces "reactive" sub-interfaces of the HttpMessage
interface found in the Spring Framework. | spring-web-reactive/src/test/java/org/springframework/reactive/web/http/XmlHandler.java | @@ -23,14 +23,16 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.reactivestreams.Publisher;
+import reactor.io.buffer.Buffer;
+import reactor.rx.Streams;
import org.springframework.http.MediaType;
+import org.springframework.http.server.ReactiveServerHttpRequest;... | true |
Other | spring-projects | spring-framework | adc50bbfb9e95e742c36ee3e99c1550e6638bcfa.json | Add handler method parameter and result converters
This commit introduces the following changes:
- Publisher -> Observable/Stream/etc. conversion is now managed
in a dedicated ConversionService instead of directly in
RequestBodyArgumentResolver and ResponseBodyResultHandler
- More isolated logic that decides... | spring-web-reactive/build.gradle | @@ -31,28 +31,28 @@ configurations.all {
}
dependencies {
- compile "org.springframework:spring-core:4.2.0.RELEASE"
- compile "org.springframework:spring-web:4.2.0.RELEASE"
+ compile "org.springframework:spring-core:4.2.2.RELEASE"
+ compile "org.springframework:spring-web:4.2.2.RELEASE"
compile "org.reactivestrea... | true |
Other | spring-projects | spring-framework | adc50bbfb9e95e742c36ee3e99c1550e6638bcfa.json | Add handler method parameter and result converters
This commit introduces the following changes:
- Publisher -> Observable/Stream/etc. conversion is now managed
in a dedicated ConversionService instead of directly in
RequestBodyArgumentResolver and ResponseBodyResultHandler
- More isolated logic that decides... | spring-web-reactive/src/main/java/org/springframework/core/convert/support/ReactiveStreamsToCompletableFutureConverter.java | @@ -0,0 +1,53 @@
+/*
+ * Copyright 2002-2015 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 | adc50bbfb9e95e742c36ee3e99c1550e6638bcfa.json | Add handler method parameter and result converters
This commit introduces the following changes:
- Publisher -> Observable/Stream/etc. conversion is now managed
in a dedicated ConversionService instead of directly in
RequestBodyArgumentResolver and ResponseBodyResultHandler
- More isolated logic that decides... | spring-web-reactive/src/main/java/org/springframework/core/convert/support/ReactiveStreamsToReactorConverter.java | @@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2011-2015 Pivotal Software Inc, All Rights Reserved.
+ *
+ * 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/license... | true |
Other | spring-projects | spring-framework | adc50bbfb9e95e742c36ee3e99c1550e6638bcfa.json | Add handler method parameter and result converters
This commit introduces the following changes:
- Publisher -> Observable/Stream/etc. conversion is now managed
in a dedicated ConversionService instead of directly in
RequestBodyArgumentResolver and ResponseBodyResultHandler
- More isolated logic that decides... | spring-web-reactive/src/main/java/org/springframework/core/convert/support/ReactiveStreamsToRxJava1Converter.java | @@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2011-2015 Pivotal Software Inc, All Rights Reserved.
+ *
+ * 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/license... | true |
Other | spring-projects | spring-framework | adc50bbfb9e95e742c36ee3e99c1550e6638bcfa.json | Add handler method parameter and result converters
This commit introduces the following changes:
- Publisher -> Observable/Stream/etc. conversion is now managed
in a dedicated ConversionService instead of directly in
RequestBodyArgumentResolver and ResponseBodyResultHandler
- More isolated logic that decides... | spring-web-reactive/src/main/java/org/springframework/reactive/codec/decoder/ByteBufferDecoder.java | @@ -0,0 +1,40 @@
+/*
+ * Copyright 2002-2015 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 | adc50bbfb9e95e742c36ee3e99c1550e6638bcfa.json | Add handler method parameter and result converters
This commit introduces the following changes:
- Publisher -> Observable/Stream/etc. conversion is now managed
in a dedicated ConversionService instead of directly in
RequestBodyArgumentResolver and ResponseBodyResultHandler
- More isolated logic that decides... | spring-web-reactive/src/main/java/org/springframework/reactive/codec/decoder/ByteToMessageDecoder.java | @@ -34,8 +34,7 @@
/**
* Indicate whether the given type and media type can be processed by this decoder.
- * @param type the (potentially generic) type to ultimately decode to.
- * Could be different from {@code T} type.
+ * @param type the stream element type to ultimately decode to.
* @param mediaType th... | true |
Other | spring-projects | spring-framework | adc50bbfb9e95e742c36ee3e99c1550e6638bcfa.json | Add handler method parameter and result converters
This commit introduces the following changes:
- Publisher -> Observable/Stream/etc. conversion is now managed
in a dedicated ConversionService instead of directly in
RequestBodyArgumentResolver and ResponseBodyResultHandler
- More isolated logic that decides... | spring-web-reactive/src/main/java/org/springframework/reactive/codec/decoder/JsonObjectDecoder.java | @@ -23,22 +23,18 @@
import org.springframework.core.ResolvableType;
import org.springframework.http.MediaType;
import org.springframework.reactive.codec.encoder.JsonObjectEncoder;
+
import reactor.Publishers;
import reactor.fn.Function;
-import reactor.rx.Promise;
-import rx.Observable;
import java.nio.ByteBuff... | true |
Other | spring-projects | spring-framework | adc50bbfb9e95e742c36ee3e99c1550e6638bcfa.json | Add handler method parameter and result converters
This commit introduces the following changes:
- Publisher -> Observable/Stream/etc. conversion is now managed
in a dedicated ConversionService instead of directly in
RequestBodyArgumentResolver and ResponseBodyResultHandler
- More isolated logic that decides... | spring-web-reactive/src/main/java/org/springframework/reactive/codec/decoder/StringDecoder.java | @@ -41,7 +41,8 @@ public class StringDecoder implements ByteToMessageDecoder<String> {
@Override
public boolean canDecode(ResolvableType type, MediaType mediaType, Object... hints) {
- return mediaType.isCompatibleWith(MediaType.TEXT_PLAIN);
+ return mediaType.isCompatibleWith(MediaType.TEXT_PLAIN)
+ && Stri... | true |
Other | spring-projects | spring-framework | adc50bbfb9e95e742c36ee3e99c1550e6638bcfa.json | Add handler method parameter and result converters
This commit introduces the following changes:
- Publisher -> Observable/Stream/etc. conversion is now managed
in a dedicated ConversionService instead of directly in
RequestBodyArgumentResolver and ResponseBodyResultHandler
- More isolated logic that decides... | spring-web-reactive/src/main/java/org/springframework/reactive/codec/encoder/ByteBufferEncoder.java | @@ -0,0 +1,41 @@
+/*
+ * Copyright 2002-2015 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 | adc50bbfb9e95e742c36ee3e99c1550e6638bcfa.json | Add handler method parameter and result converters
This commit introduces the following changes:
- Publisher -> Observable/Stream/etc. conversion is now managed
in a dedicated ConversionService instead of directly in
RequestBodyArgumentResolver and ResponseBodyResultHandler
- More isolated logic that decides... | spring-web-reactive/src/main/java/org/springframework/reactive/codec/encoder/JsonObjectEncoder.java | @@ -21,21 +21,17 @@
import org.springframework.core.ResolvableType;
import org.springframework.http.MediaType;
import org.springframework.reactive.codec.decoder.JsonObjectDecoder;
-import org.springframework.util.ClassUtils;
import reactor.core.subscriber.SubscriberBarrier;
-import reactor.io.buffer.Buffer;
-impo... | true |
Other | spring-projects | spring-framework | adc50bbfb9e95e742c36ee3e99c1550e6638bcfa.json | Add handler method parameter and result converters
This commit introduces the following changes:
- Publisher -> Observable/Stream/etc. conversion is now managed
in a dedicated ConversionService instead of directly in
RequestBodyArgumentResolver and ResponseBodyResultHandler
- More isolated logic that decides... | spring-web-reactive/src/main/java/org/springframework/reactive/codec/encoder/MessageToByteEncoder.java | @@ -34,8 +34,7 @@
/**
* Indicate whether the given type and media type can be processed by this encoder.
- * @param type the (potentially generic) type to ultimately encode from.
- * Could be different from {@code T} type.
+ * @param type the stream element type to encode.
* @param mediaType the media type... | true |
Other | spring-projects | spring-framework | adc50bbfb9e95e742c36ee3e99c1550e6638bcfa.json | Add handler method parameter and result converters
This commit introduces the following changes:
- Publisher -> Observable/Stream/etc. conversion is now managed
in a dedicated ConversionService instead of directly in
RequestBodyArgumentResolver and ResponseBodyResultHandler
- More isolated logic that decides... | spring-web-reactive/src/main/java/org/springframework/reactive/codec/encoder/StringEncoder.java | @@ -40,7 +40,8 @@ public class StringEncoder implements MessageToByteEncoder<String> {
@Override
public boolean canEncode(ResolvableType type, MediaType mediaType, Object... hints) {
- return mediaType.isCompatibleWith(MediaType.TEXT_PLAIN);
+ return mediaType.isCompatibleWith(MediaType.TEXT_PLAIN)
+ && Stri... | true |
Other | spring-projects | spring-framework | adc50bbfb9e95e742c36ee3e99c1550e6638bcfa.json | Add handler method parameter and result converters
This commit introduces the following changes:
- Publisher -> Observable/Stream/etc. conversion is now managed
in a dedicated ConversionService instead of directly in
RequestBodyArgumentResolver and ResponseBodyResultHandler
- More isolated logic that decides... | spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/DispatcherHandler.java | @@ -101,6 +101,7 @@ public Publisher<Void> handle(ServerHttpRequest request, ServerHttpResponse resp
if (handler == null) {
// No exception handling mechanism yet
response.setStatusCode(HttpStatus.NOT_FOUND);
+ response.writeHeaders();
return Publishers.empty();
}
| true |
Other | spring-projects | spring-framework | adc50bbfb9e95e742c36ee3e99c1550e6638bcfa.json | Add handler method parameter and result converters
This commit introduces the following changes:
- Publisher -> Observable/Stream/etc. conversion is now managed
in a dedicated ConversionService instead of directly in
RequestBodyArgumentResolver and ResponseBodyResultHandler
- More isolated logic that decides... | spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/SimpleHandlerResultHandler.java | @@ -16,6 +16,8 @@
package org.springframework.reactive.web.dispatch;
+import java.util.Arrays;
+
import org.reactivestreams.Publisher;
import reactor.Publishers;
@@ -45,6 +47,8 @@ public boolean supports(HandlerResult result) {
@Override
public Publisher<Void> handleResult(ServerHttpRequest request, Serv... | true |
Other | spring-projects | spring-framework | adc50bbfb9e95e742c36ee3e99c1550e6638bcfa.json | Add handler method parameter and result converters
This commit introduces the following changes:
- Publisher -> Observable/Stream/etc. conversion is now managed
in a dedicated ConversionService instead of directly in
RequestBodyArgumentResolver and ResponseBodyResultHandler
- More isolated logic that decides... | spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/DefaultConversionService.java | @@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2011-2015 Pivotal Software Inc, All Rights Reserved.
+ *
+ * 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/license... | true |
Other | spring-projects | spring-framework | adc50bbfb9e95e742c36ee3e99c1550e6638bcfa.json | Add handler method parameter and result converters
This commit introduces the following changes:
- Publisher -> Observable/Stream/etc. conversion is now managed
in a dedicated ConversionService instead of directly in
RequestBodyArgumentResolver and ResponseBodyResultHandler
- More isolated logic that decides... | spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/RequestBodyArgumentResolver.java | @@ -16,51 +16,46 @@
package org.springframework.reactive.web.dispatch.method.annotation;
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Ti... | true |
Other | spring-projects | spring-framework | adc50bbfb9e95e742c36ee3e99c1550e6638bcfa.json | Add handler method parameter and result converters
This commit introduces the following changes:
- Publisher -> Observable/Stream/etc. conversion is now managed
in a dedicated ConversionService instead of directly in
RequestBodyArgumentResolver and ResponseBodyResultHandler
- More isolated logic that decides... | spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/RequestMappingHandlerAdapter.java | @@ -15,11 +15,14 @@
*/
package org.springframework.reactive.web.dispatch.method.annotation;
+import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.springframework.beans.factory.InitializingBean;
+import org.springframework.reactive.codec.decoder.By... | true |
Other | spring-projects | spring-framework | adc50bbfb9e95e742c36ee3e99c1550e6638bcfa.json | Add handler method parameter and result converters
This commit introduces the following changes:
- Publisher -> Observable/Stream/etc. conversion is now managed
in a dedicated ConversionService instead of directly in
RequestBodyArgumentResolver and ResponseBodyResultHandler
- More isolated logic that decides... | spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/ResponseBodyResultHandler.java | @@ -18,9 +18,9 @@
import org.reactivestreams.Publisher;
import org.springframework.core.MethodParameter;
import org.springframework.core.Ordered;
-import org.springframework.core.ParameterizedTypeReference;
import org.springframework.core.ResolvableType;
import org.springframework.core.annotation.AnnotatedElementU... | true |
Other | spring-projects | spring-framework | adc50bbfb9e95e742c36ee3e99c1550e6638bcfa.json | Add handler method parameter and result converters
This commit introduces the following changes:
- Publisher -> Observable/Stream/etc. conversion is now managed
in a dedicated ConversionService instead of directly in
RequestBodyArgumentResolver and ResponseBodyResultHandler
- More isolated logic that decides... | spring-web-reactive/src/main/java/org/springframework/reactive/web/http/ServerHttpResponse.java | @@ -30,9 +30,18 @@ public interface ServerHttpResponse extends HttpMessage {
void setStatusCode(HttpStatus status);
+ /**
+ * Write the response headers. This method must be invoked to send responses without body.
+ * @return A {@code Publisher<Void>} used to signal the demand, and receive a notification
+ * w... | true |
Other | spring-projects | spring-framework | adc50bbfb9e95e742c36ee3e99c1550e6638bcfa.json | Add handler method parameter and result converters
This commit introduces the following changes:
- Publisher -> Observable/Stream/etc. conversion is now managed
in a dedicated ConversionService instead of directly in
RequestBodyArgumentResolver and ResponseBodyResultHandler
- More isolated logic that decides... | spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/ReactorServerHttpRequest.java | @@ -15,13 +15,13 @@
*/
package org.springframework.reactive.web.http.reactor;
-import org.reactivestreams.Publisher;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.reactive.web.http.ServerHttpRequest;
import org.springframework.util.Assert;
... | true |
Other | spring-projects | spring-framework | adc50bbfb9e95e742c36ee3e99c1550e6638bcfa.json | Add handler method parameter and result converters
This commit introduces the following changes:
- Publisher -> Observable/Stream/etc. conversion is now managed
in a dedicated ConversionService instead of directly in
RequestBodyArgumentResolver and ResponseBodyResultHandler
- More isolated logic that decides... | spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/ReactorServerHttpResponse.java | @@ -24,6 +24,7 @@
import reactor.io.buffer.Buffer;
import reactor.io.net.http.HttpChannel;
import reactor.io.net.http.model.Status;
+import reactor.rx.Stream;
import java.nio.ByteBuffer;
@@ -57,18 +58,28 @@ public HttpHeaders getHeaders() {
}
@Override
- public Publisher<Void> writeWith(Publisher<ByteBuff... | true |
Other | spring-projects | spring-framework | adc50bbfb9e95e742c36ee3e99c1550e6638bcfa.json | Add handler method parameter and result converters
This commit introduces the following changes:
- Publisher -> Observable/Stream/etc. conversion is now managed
in a dedicated ConversionService instead of directly in
RequestBodyArgumentResolver and ResponseBodyResultHandler
- More isolated logic that decides... | spring-web-reactive/src/main/java/org/springframework/reactive/web/http/rxnetty/RxNettyServerHttpResponse.java | @@ -23,6 +23,7 @@
import org.springframework.reactive.web.http.ServerHttpResponse;
import org.springframework.util.Assert;
+import reactor.Publishers;
import reactor.core.publisher.convert.RxJava1Converter;
import reactor.io.buffer.Buffer;
import rx.Observable;
@@ -59,24 +60,30 @@ public HttpHeaders getHeaders()... | true |
Other | spring-projects | spring-framework | adc50bbfb9e95e742c36ee3e99c1550e6638bcfa.json | Add handler method parameter and result converters
This commit introduces the following changes:
- Publisher -> Observable/Stream/etc. conversion is now managed
in a dedicated ConversionService instead of directly in
RequestBodyArgumentResolver and ResponseBodyResultHandler
- More isolated logic that decides... | spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/ServletServerHttpResponse.java | @@ -22,6 +22,7 @@
import javax.servlet.http.HttpServletResponse;
import org.reactivestreams.Publisher;
+import reactor.Publishers;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
@@ -61,13 +62,19 @@ public HttpHeaders getHeaders() {
return (this.headersWritten ? HttpH... | true |
Other | spring-projects | spring-framework | adc50bbfb9e95e742c36ee3e99c1550e6638bcfa.json | Add handler method parameter and result converters
This commit introduces the following changes:
- Publisher -> Observable/Stream/etc. conversion is now managed
in a dedicated ConversionService instead of directly in
RequestBodyArgumentResolver and ResponseBodyResultHandler
- More isolated logic that decides... | spring-web-reactive/src/main/resources/log4j.properties | @@ -2,6 +2,7 @@ log4j.rootCategory=WARN, stdout
log4j.logger.org.springframework.reactive=DEBUG
log4j.logger.org.springframework.web=DEBUG
+log4j.logger.reactor=INFO
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout | true |
Other | spring-projects | spring-framework | adc50bbfb9e95e742c36ee3e99c1550e6638bcfa.json | Add handler method parameter and result converters
This commit introduces the following changes:
- Publisher -> Observable/Stream/etc. conversion is now managed
in a dedicated ConversionService instead of directly in
RequestBodyArgumentResolver and ResponseBodyResultHandler
- More isolated logic that decides... | spring-web-reactive/src/test/java/org/springframework/reactive/codec/decoder/ByteBufferDecoderTests.java | @@ -0,0 +1,58 @@
+/*
+ * Copyright 2002-2015 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 | adc50bbfb9e95e742c36ee3e99c1550e6638bcfa.json | Add handler method parameter and result converters
This commit introduces the following changes:
- Publisher -> Observable/Stream/etc. conversion is now managed
in a dedicated ConversionService instead of directly in
RequestBodyArgumentResolver and ResponseBodyResultHandler
- More isolated logic that decides... | spring-web-reactive/src/test/java/org/springframework/reactive/codec/decoder/JsonObjectDecoderTests.java | @@ -31,9 +31,35 @@
*/
public class JsonObjectDecoderTests {
+ @Test
+ public void decodeSingleChunkToJsonObject() throws InterruptedException {
+ JsonObjectDecoder decoder = new JsonObjectDecoder();
+ Stream<ByteBuffer> source = Streams.just(Buffer.wrap("{\"foo\": \"foofoo\", \"bar\": \"barbar\"}").byteBuffer())... | true |
Other | spring-projects | spring-framework | adc50bbfb9e95e742c36ee3e99c1550e6638bcfa.json | Add handler method parameter and result converters
This commit introduces the following changes:
- Publisher -> Observable/Stream/etc. conversion is now managed
in a dedicated ConversionService instead of directly in
RequestBodyArgumentResolver and ResponseBodyResultHandler
- More isolated logic that decides... | spring-web-reactive/src/test/java/org/springframework/reactive/codec/decoder/StringDecoderTests.java | @@ -23,13 +23,13 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
+import org.reactivestreams.Publisher;
import reactor.io.buffer.Buffer;
import reactor.rx.Stream;
import reactor.rx.Streams;
import org.springframework.core.ResolvableType;
import ... | true |
Other | spring-projects | spring-framework | adc50bbfb9e95e742c36ee3e99c1550e6638bcfa.json | Add handler method parameter and result converters
This commit introduces the following changes:
- Publisher -> Observable/Stream/etc. conversion is now managed
in a dedicated ConversionService instead of directly in
RequestBodyArgumentResolver and ResponseBodyResultHandler
- More isolated logic that decides... | spring-web-reactive/src/test/java/org/springframework/reactive/codec/encoder/ByteBufferDecoderEncoder.java | @@ -0,0 +1,58 @@
+/*
+ * Copyright 2002-2015 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 | adc50bbfb9e95e742c36ee3e99c1550e6638bcfa.json | Add handler method parameter and result converters
This commit introduces the following changes:
- Publisher -> Observable/Stream/etc. conversion is now managed
in a dedicated ConversionService instead of directly in
RequestBodyArgumentResolver and ResponseBodyResultHandler
- More isolated logic that decides... | spring-web-reactive/src/test/java/org/springframework/reactive/codec/encoder/JsonObjectEncoderTests.java | @@ -32,9 +32,24 @@
public class JsonObjectEncoderTests {
@Test
- public void encodeToArray() throws InterruptedException {
+ public void encodeSingleElement() throws InterruptedException {
JsonObjectEncoder encoder = new JsonObjectEncoder();
- Stream<ByteBuffer> source = Streams.just(Buffer.wrap("{\"foo\": \"f... | true |
Other | spring-projects | spring-framework | adc50bbfb9e95e742c36ee3e99c1550e6638bcfa.json | Add handler method parameter and result converters
This commit introduces the following changes:
- Publisher -> Observable/Stream/etc. conversion is now managed
in a dedicated ConversionService instead of directly in
RequestBodyArgumentResolver and ResponseBodyResultHandler
- More isolated logic that decides... | spring-web-reactive/src/test/java/org/springframework/reactive/codec/encoder/StringEncoderTests.java | @@ -23,8 +23,10 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
+import org.reactivestreams.Publisher;
import reactor.rx.Streams;
+import org.springframework.core.ResolvableType;
import org.springframework.http.MediaType;
/**
@@ -36,8 +38,9 @@ p... | true |
Other | spring-projects | spring-framework | adc50bbfb9e95e742c36ee3e99c1550e6638bcfa.json | Add handler method parameter and result converters
This commit introduces the following changes:
- Publisher -> Observable/Stream/etc. conversion is now managed
in a dedicated ConversionService instead of directly in
RequestBodyArgumentResolver and ResponseBodyResultHandler
- More isolated logic that decides... | spring-web-reactive/src/test/java/org/springframework/reactive/web/dispatch/method/annotation/RequestMappingIntegrationTests.java | @@ -17,13 +17,20 @@
import java.net.URI;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import static org.junit.Assert.assertEquals;
+
import org.junit.Test;
import org.reactivestreams.Publisher;
+
+im... | true |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.