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 | bc8e525e604c5d56a7ef522a06c82821b4393916.json | Add shared instance of ReactiveAdapterRegistry
Issue: SPR-16218 | spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java | @@ -152,7 +152,7 @@ public class RequestMappingHandlerAdapter extends AbstractHandlerMethodAdapter
private DeferredResultProcessingInterceptor[] deferredResultInterceptors = new DeferredResultProcessingInterceptor[0];
- private ReactiveAdapterRegistry reactiveRegistry = new ReactiveAdapterRegistry();
+ private Re... | true |
Other | spring-projects | spring-framework | bc8e525e604c5d56a7ef522a06c82821b4393916.json | Add shared instance of ReactiveAdapterRegistry
Issue: SPR-16218 | spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ReactiveTypeHandlerTests.java | @@ -80,7 +80,7 @@ public void setup() throws Exception {
ContentNegotiationManagerFactoryBean factoryBean = new ContentNegotiationManagerFactoryBean();
factoryBean.afterPropertiesSet();
ContentNegotiationManager manager = factoryBean.getObject();
- this.handler = new ReactiveTypeHandler(new ReactiveAdapterReg... | true |
Other | spring-projects | spring-framework | ce895d7a84a851426a11548de3b942458540a413.json | Add mention of shortcut methods in BodyInserters | spring-webflux/src/main/java/org/springframework/web/reactive/function/BodyInserters.java | @@ -75,6 +75,11 @@ public static <T> BodyInserter<T, ReactiveHttpOutputMessage> empty() {
/**
* Return a {@code BodyInserter} that writes the given single object.
+ * <p>Note also that
+ * {@link org.springframework.web.reactive.function.client.WebClient WebClient} and
+ * {@link org.springframework.web.react... | false |
Other | spring-projects | spring-framework | 0fbfa643856b07eb0d952905e527765fbd5c274f.json | UndertowServerHttpRequest: suspend reading when no demand
- When there is no demand for reading, the implementation
should suspend reading otherwise useless events will be
send by Undertow to the registered read listener.
- There is not need to wait for an event for reading/writing after calling
resumeReads/resumeWrit... | spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerReadPublisher.java | @@ -113,6 +113,12 @@ public final void onError(Throwable t) {
@Nullable
protected abstract T read() throws IOException;
+ /**
+ * Suspend reading. Defaults to no-op.
+ */
+ protected void suspendReading() {
+ }
+
/**
* Read and publish data from the input. Continue till there is no more
@@ -256,6 +262,7 ... | true |
Other | spring-projects | spring-framework | 0fbfa643856b07eb0d952905e527765fbd5c274f.json | UndertowServerHttpRequest: suspend reading when no demand
- When there is no demand for reading, the implementation
should suspend reading otherwise useless events will be
send by Undertow to the registered read listener.
- There is not need to wait for an event for reading/writing after calling
resumeReads/resumeWrit... | spring-web/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpRequest.java | @@ -152,7 +152,28 @@ private void registerListeners(HttpServerExchange exchange) {
protected void checkOnDataAvailable() {
// TODO: The onDataAvailable() call below can cause a StackOverflowError
// since this method is being called from onDataAvailable() itself.
- onDataAvailable();
+ if (isReadPossible... | true |
Other | spring-projects | spring-framework | 0fbfa643856b07eb0d952905e527765fbd5c274f.json | UndertowServerHttpRequest: suspend reading when no demand
- When there is no demand for reading, the implementation
should suspend reading otherwise useless events will be
send by Undertow to the registered read listener.
- There is not need to wait for an event for reading/writing after calling
resumeReads/resumeWrit... | spring-web/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpResponse.java | @@ -152,12 +152,10 @@ private boolean isWritePossible() {
if (this.responseChannel == null) {
this.responseChannel = this.exchange.getResponseChannel();
}
- if (this.responseChannel.isWriteResumed()) {
- return true;
- } else {
+ if (!this.responseChannel.isWriteResumed()) {
this.responseChannel.resu... | true |
Other | spring-projects | spring-framework | c530745015d5c7031cfcb6f633f3f459ed97935d.json | Fix JsonView + HttpEntity Reactive handling
This commit adds
AbstractMessageReaderArgumentResolver#readBody and
AbstractMessageWriterResultHandler#writeBody variants
which allow to pass the actual MethodParameter in order
to perform proper annotation-based hint resolution with
nested generics, for example with HttpEnt... | spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageReaderArgumentResolver.java | @@ -62,6 +62,7 @@
* failure results in an {@link ServerWebInputException}.
*
* @author Rossen Stoyanchev
+ * @author Sebastien Deleuze
* @since 5.0
*/
public abstract class AbstractMessageReaderArgumentResolver extends HandlerMethodArgumentResolverSupport {
@@ -109,10 +110,37 @@ public List<HttpMessageReader... | true |
Other | spring-projects | spring-framework | c530745015d5c7031cfcb6f633f3f459ed97935d.json | Fix JsonView + HttpEntity Reactive handling
This commit adds
AbstractMessageReaderArgumentResolver#readBody and
AbstractMessageWriterResultHandler#writeBody variants
which allow to pass the actual MethodParameter in order
to perform proper annotation-based hint resolution with
nested generics, for example with HttpEnt... | spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageWriterResultHandler.java | @@ -43,6 +43,7 @@
* to the response with {@link HttpMessageWriter}.
*
* @author Rossen Stoyanchev
+ * @author Sebastien Deleuze
* @since 5.0
*/
public abstract class AbstractMessageWriterResultHandler extends HandlerResultHandlerSupport {
@@ -86,9 +87,36 @@ public List<HttpMessageWriter<?>> getMessageWriters... | true |
Other | spring-projects | spring-framework | c530745015d5c7031cfcb6f633f3f459ed97935d.json | Fix JsonView + HttpEntity Reactive handling
This commit adds
AbstractMessageReaderArgumentResolver#readBody and
AbstractMessageWriterResultHandler#writeBody variants
which allow to pass the actual MethodParameter in order
to perform proper annotation-based hint resolution with
nested generics, for example with HttpEnt... | spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/HttpEntityArgumentResolver.java | @@ -58,7 +58,7 @@ public Mono<Object> resolveArgument(
MethodParameter parameter, BindingContext bindingContext, ServerWebExchange exchange) {
Class<?> entityType = parameter.getParameterType();
- return readBody(parameter.nested(), false, bindingContext, exchange)
+ return readBody(parameter.nested(), param... | true |
Other | spring-projects | spring-framework | c530745015d5c7031cfcb6f633f3f459ed97935d.json | Fix JsonView + HttpEntity Reactive handling
This commit adds
AbstractMessageReaderArgumentResolver#readBody and
AbstractMessageWriterResultHandler#writeBody variants
which allow to pass the actual MethodParameter in order
to perform proper annotation-based hint resolution with
nested generics, for example with HttpEnt... | spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandler.java | @@ -114,15 +114,16 @@ public Mono<Void> handleResult(ServerWebExchange exchange, HandlerResult result)
Mono<?> returnValueMono;
MethodParameter bodyParameter;
ReactiveAdapter adapter = getAdapter(result);
+ MethodParameter actualParameter = result.getReturnTypeSource();
if (adapter != null) {
Assert.... | true |
Other | spring-projects | spring-framework | c530745015d5c7031cfcb6f633f3f459ed97935d.json | Fix JsonView + HttpEntity Reactive handling
This commit adds
AbstractMessageReaderArgumentResolver#readBody and
AbstractMessageWriterResultHandler#writeBody variants
which allow to pass the actual MethodParameter in order
to perform proper annotation-based hint resolution with
nested generics, for example with HttpEnt... | spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/JacksonHintsIntegrationTests.java | @@ -28,7 +28,9 @@
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpEntity;
import org.springframework.http.MediaType;
+impor... | true |
Other | spring-projects | spring-framework | 8e21023f2875f64538e060d298684789354b3ba9.json | Update docs on ClientResponse
Issue: SPR-16200 | spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientResponse.java | @@ -38,10 +38,14 @@
* {@link ExchangeFunction}. Provides access to the response status and headers,
* and also methods to consume the response body.
*
- * <p><strong>NOTE:</strong> When given access to a {@link ClientResponse} you
- * must always use the response body or entity methods to ensure resources are
- *... | true |
Other | spring-projects | spring-framework | 8e21023f2875f64538e060d298684789354b3ba9.json | Update docs on ClientResponse
Issue: SPR-16200 | spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java | @@ -483,10 +483,9 @@ interface Builder {
* .exchange()
* .flatMapMany(response -> response.bodyToFlux(Person.class));
* </pre>
- * <p><strong>NOTE:</strong> You must always use of the body or entity
- * methods on {@link ClientResponse} to ensure resources are released and
- * avoid potential ... | true |
Other | spring-projects | spring-framework | 8e21023f2875f64538e060d298684789354b3ba9.json | Update docs on ClientResponse
Issue: SPR-16200 | src/docs/asciidoc/web/webflux-webclient.adoc | @@ -99,10 +99,11 @@ Note that unlike `retrieve()`, with `exchange()` there are no automatic error si
[CAUTION]
====
-When using `exchange()` you must always use any of the body or entity methods of
+When using `exchange()` you must always use any of the body or toEntity methods of
`ClientResponse` to ensure resour... | true |
Other | spring-projects | spring-framework | 19a9bc4747028e68d0fc9ce71c302488cfbfa978.json | Remove unnecessary assertion
Issue: SPR-16201 | spring-web/src/main/java/org/springframework/web/server/session/InMemoryWebSessionStore.java | @@ -46,7 +46,6 @@ public class InMemoryWebSessionStore implements WebSessionStore {
/** Minimum period between expiration checks */
private static final Duration EXPIRATION_CHECK_PERIOD = Duration.ofSeconds(60);
-
private static final IdGenerator idGenerator = new JdkIdGenerator();
@@ -210,11 +209,7 @@ publ... | false |
Other | spring-projects | spring-framework | 6e05a5881e404b8a1ab7eac049d82d0faeb7eb10.json | Update WebClient Javadoc
Issue: SPR-16197 | spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java | @@ -40,20 +40,25 @@
import org.springframework.web.reactive.function.BodyInserter;
import org.springframework.web.util.UriBuilder;
import org.springframework.web.util.UriBuilderFactory;
+import org.springframework.web.reactive.function.BodyInserters;
/**
- * The main entry point for initiating web requests on the... | false |
Other | spring-projects | spring-framework | 37b32d38bcb8a5e28ef17104ae8113c33b59a5df.json | Use synchonous API for synchonous OkHttp requests
This commit changes the OkHttpClientHttpRequestFactory to use the
synchronous OkHttp API for non-async requests, as opposed to
synchronizing the async API (which it used to do).
Issue: SPR-13942 | spring-web/src/main/java/org/springframework/http/client/OkHttpAsyncClientHttpRequest.java | @@ -0,0 +1,104 @@
+/*
+ * Copyright 2002-2016 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 | 37b32d38bcb8a5e28ef17104ae8113c33b59a5df.json | Use synchonous API for synchonous OkHttp requests
This commit changes the OkHttpClientHttpRequestFactory to use the
synchronous OkHttp API for non-async requests, as opposed to
synchronizing the async API (which it used to do).
Issue: SPR-13942 | spring-web/src/main/java/org/springframework/http/client/OkHttpClientHttpRequest.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,24 +18,12 @@
import java.io.IOExcepti... | true |
Other | spring-projects | spring-framework | 37b32d38bcb8a5e28ef17104ae8113c33b59a5df.json | Use synchonous API for synchonous OkHttp requests
This commit changes the OkHttpClientHttpRequestFactory to use the
synchronous OkHttp API for non-async requests, as opposed to
synchronizing the async API (which it used to do).
Issue: SPR-13942 | spring-web/src/main/java/org/springframework/http/client/OkHttpClientHttpRequestFactory.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,14 +16,22 @@
package org.springframew... | true |
Other | spring-projects | spring-framework | 8cb35197efecb9b7f4c7549cb13fd7fe5c0c0d36.json | Remove duplicate method from reference docs
Closes gh-681
Issue: SPR-13940 | src/asciidoc/data-access.adoc | @@ -2918,10 +2918,6 @@ query methods, one for an `int` and one that queries for a `String`.
public String getName() {
return this.jdbcTemplate.queryForObject("select name from mytable", String.class);
}
-
- public void setDataSource(DataSource dataSource) {
- this.dataSource = dataSource;
- }
}
----
| false |
Other | spring-projects | spring-framework | d53c04b4dfb08f8ac63d1c479f52a80f20942e0a.json | Add option to extend exception resolvers
Issue: SPR-13931 | spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java | @@ -713,6 +713,14 @@ protected final List<HttpMessageConverter<?>> getMessageConverters() {
protected void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
}
+ /**
+ * Override this method to extend or modify the list of converters after it
+ * has been configured. This may be useful for e... | true |
Other | spring-projects | spring-framework | d53c04b4dfb08f8ac63d1c479f52a80f20942e0a.json | Add option to extend exception resolvers
Issue: SPR-13931 | spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurer.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -130,6 +130,16 @@ public interface WebMvcCon... | true |
Other | spring-projects | spring-framework | d53c04b4dfb08f8ac63d1c479f52a80f20942e0a.json | Add option to extend exception resolvers
Issue: SPR-13931 | spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurerAdapter.java | @@ -116,6 +116,14 @@ public void addReturnValueHandlers(List<HandlerMethodReturnValueHandler> returnV
public void configureHandlerExceptionResolvers(List<HandlerExceptionResolver> exceptionResolvers) {
}
+ /**
+ * {@inheritDoc}
+ * <p>This implementation is empty.
+ */
+ @Override
+ public void extendHandlerEx... | true |
Other | spring-projects | spring-framework | d53c04b4dfb08f8ac63d1c479f52a80f20942e0a.json | Add option to extend exception resolvers
Issue: SPR-13931 | spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurerComposite.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
import org.springframework.w... | true |
Other | spring-projects | spring-framework | d53c04b4dfb08f8ac63d1c479f52a80f20942e0a.json | Add option to extend exception resolvers
Issue: SPR-13931 | spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -70,6 +70,7 @@
import org.springframework.w... | true |
Other | spring-projects | spring-framework | c45ad3022b1e7d6574b79a734d19355be0d1b596.json | Add "hosts" property to RedirectView
Issue: SPR-13693 | spring-webmvc/src/main/java/org/springframework/web/servlet/view/RedirectView.java | @@ -104,6 +104,8 @@ public class RedirectView extends AbstractUrlBasedView implements SmartView {
private boolean propagateQueryParams = false;
+ private String[] hosts;
+
/**
* Constructor for use as a bean.
@@ -252,6 +254,27 @@ public boolean isPropagateQueryProperties() {
return this.propagateQueryPa... | true |
Other | spring-projects | spring-framework | c45ad3022b1e7d6574b79a734d19355be0d1b596.json | Add "hosts" property to RedirectView
Issue: SPR-13693 | spring-webmvc/src/main/java/org/springframework/web/servlet/view/UrlBasedViewResolver.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
import java.util.Locale;
im... | true |
Other | spring-projects | spring-framework | c45ad3022b1e7d6574b79a734d19355be0d1b596.json | Add "hosts" property to RedirectView
Issue: SPR-13693 | spring-webmvc/src/test/java/org/springframework/web/servlet/view/RedirectViewTests.java | @@ -43,6 +43,7 @@
import org.springframework.web.util.WebUtils;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.BDDMockito.given;
import static org.mockito.BDDMockito.mock;
@@ -205,6 +206,24 @@ public v... | true |
Other | spring-projects | spring-framework | 0ab3f6092ca444e0bdfcb0a39aae6371c93641db.json | Fix failing tests
Issue: SPR-13913 | spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java | @@ -90,7 +90,7 @@ public void addInterceptorsWithUrlPatterns() {
this.registry.addInterceptor(this.interceptor1).addPathPatterns("/path1/**").excludePathPatterns("/path1/secret");
this.registry.addInterceptor(this.interceptor2).addPathPatterns("/path2");
- assertEquals(Arrays.asList(this.interceptor1), getInte... | true |
Other | spring-projects | spring-framework | 0ab3f6092ca444e0bdfcb0a39aae6371c93641db.json | Fix failing tests
Issue: SPR-13913 | spring-webmvc/src/test/java/org/springframework/web/servlet/resource/VersionResourceResolverTests.java | @@ -176,10 +176,10 @@ public void shouldConfigureFixedPrefixAutomatically() throws Exception {
this.resolver.addFixedVersionStrategy("fixedversion", "/js/**", "/css/**", "/fixedversion/css/**");
assertThat(this.resolver.getStrategyMap().size(), is(4));
- assertThat(this.resolver.getStrategyForPath("/js/somethi... | true |
Other | spring-projects | spring-framework | cdfcc23b6f1424f04e8273b3aa69fe185fb73dde.json | Reduce log level for @ExceptionHandler failure
Issue: SPR-13932 | spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java | @@ -367,8 +367,8 @@ protected ModelAndView doResolveHandlerMethodException(HttpServletRequest reques
exceptionHandlerMethod.invokeAndHandle(webRequest, mavContainer, exception, handlerMethod);
}
catch (Exception invocationEx) {
- if (logger.isErrorEnabled()) {
- logger.error("Failed to invoke @ExceptionH... | false |
Other | spring-projects | spring-framework | 971ca6beb8be8a12cc3e9197f5b46d78ad89f3c6.json | Add HTML rendering integration test | spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingIntegrationTests.java | @@ -20,6 +20,7 @@
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import java.util.concurrent.CompletableFuture;
@@ -38,6 +39,7 @@
import org.springframework.context.annotation.Configuration;
import org.springframework.core.... | false |
Other | spring-projects | spring-framework | b7b423a0033f22de8ce49c09fcb39e81eaecc94c.json | Remove Stream#toBlockingQueue use | spring-web-reactive/src/main/java/org/springframework/core/io/buffer/support/DataBufferPublisherInputStream.java | @@ -18,12 +18,12 @@
import java.io.IOException;
import java.io.InputStream;
-import java.util.concurrent.BlockingQueue;
+import java.util.Iterator;
import java.util.concurrent.atomic.AtomicBoolean;
import org.reactivestreams.Publisher;
import org.reactivestreams.Subscription;
-import reactor.rx.Stream;
+import... | false |
Other | spring-projects | spring-framework | e4539d9f4003bee0f3cd31dd70b87a32ffb95884.json | Add protected method for required RequestBody | spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessor.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -146,14 +146,18 @@ protected <T> Object read... | false |
Other | spring-projects | spring-framework | 677a321571e25449962befe876f543ce576ea3ca.json | Support primary TxMgrs and DataSources in the TCF
Prior to this commit, the transaction manager and data source look-up
algorithms in the Spring TestContext Framework were not capable of
retrieving 'primary' beans of those types, even though 'primary' beans
are supported in production as well as for injecting dependen... | spring-test/src/main/java/org/springframework/test/context/transaction/TestContextTransactionUtils.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
package org.springframework.... | true |
Other | spring-projects | spring-framework | 677a321571e25449962befe876f543ce576ea3ca.json | Support primary TxMgrs and DataSources in the TCF
Prior to this commit, the transaction manager and data source look-up
algorithms in the Spring TestContext Framework were not capable of
retrieving 'primary' beans of those types, even though 'primary' beans
are supported in production as well as for injecting dependen... | spring-test/src/test/java/org/springframework/test/context/jdbc/PrimaryDataSourceTests.java | @@ -0,0 +1,89 @@
+/*
+ * Copyright 2002-2016 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 | 677a321571e25449962befe876f543ce576ea3ca.json | Support primary TxMgrs and DataSources in the TCF
Prior to this commit, the transaction manager and data source look-up
algorithms in the Spring TestContext Framework were not capable of
retrieving 'primary' beans of those types, even though 'primary' beans
are supported in production as well as for injecting dependen... | spring-test/src/test/java/org/springframework/test/context/transaction/PrimaryTransactionManagerTests.java | @@ -0,0 +1,122 @@
+/*
+ * Copyright 2002-2016 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 | 7ab92cfccfc160c4a3e65963bc91166d39f84ed9.json | Add WebResponseExtractor impl for RxJava1
This commit adds `RxJava1WebResponseExtractors`, a static factory of
`WebResponseExtractor`s that are based on the RxJava1 composition API.
All extracted types are based on the `Single` and `Observable` types. | spring-web-reactive/src/main/java/org/springframework/web/client/reactive/RxJava1WebResponseExtractors.java | @@ -0,0 +1,131 @@
+/*
+ * Copyright 2002-2016 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
+... | false |
Other | spring-projects | spring-framework | 69ce33e1eef6e03bbd647b8c930b3b0138a5e4e0.json | Add WebClient and its WebResponseExtractor API
This commit adds the `WebClient`, which relies on several parts of our
infrastructure:
* a `ClientHttpRequestFactory` to drive the underlying client library
* a `HttpRequestBuilder` builder API to create the client request
* a `WebResponseExtractor` to extract the "low-le... | spring-web-reactive/build.gradle | @@ -102,14 +102,15 @@ dependencies {
testCompile "org.springframework:spring-test:${springVersion}"
testCompile "org.slf4j:slf4j-jcl:1.7.12"
testCompile "org.slf4j:jul-to-slf4j:1.7.12"
- testCompile("log4j:log4j:1.2.16")
+ testCompile "log4j:log4j:1.2.16"
testCompile("org.mockito:mockito-core:1.10.19") {
exc... | true |
Other | spring-projects | spring-framework | 69ce33e1eef6e03bbd647b8c930b3b0138a5e4e0.json | Add WebClient and its WebResponseExtractor API
This commit adds the `WebClient`, which relies on several parts of our
infrastructure:
* a `ClientHttpRequestFactory` to drive the underlying client library
* a `HttpRequestBuilder` builder API to create the client request
* a `WebResponseExtractor` to extract the "low-le... | spring-web-reactive/src/main/java/org/springframework/web/client/reactive/DefaultWebResponse.java | @@ -0,0 +1,52 @@
+/*
+ * Copyright 2002-2016 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 | 69ce33e1eef6e03bbd647b8c930b3b0138a5e4e0.json | Add WebClient and its WebResponseExtractor API
This commit adds the `WebClient`, which relies on several parts of our
infrastructure:
* a `ClientHttpRequestFactory` to drive the underlying client library
* a `HttpRequestBuilder` builder API to create the client request
* a `WebResponseExtractor` to extract the "low-le... | spring-web-reactive/src/main/java/org/springframework/web/client/reactive/WebClient.java | @@ -0,0 +1,139 @@
+/*
+ * Copyright 2002-2016 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 | 69ce33e1eef6e03bbd647b8c930b3b0138a5e4e0.json | Add WebClient and its WebResponseExtractor API
This commit adds the `WebClient`, which relies on several parts of our
infrastructure:
* a `ClientHttpRequestFactory` to drive the underlying client library
* a `HttpRequestBuilder` builder API to create the client request
* a `WebResponseExtractor` to extract the "low-le... | spring-web-reactive/src/main/java/org/springframework/web/client/reactive/WebResponse.java | @@ -0,0 +1,44 @@
+/*
+ * Copyright 2002-2016 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 | 69ce33e1eef6e03bbd647b8c930b3b0138a5e4e0.json | Add WebClient and its WebResponseExtractor API
This commit adds the `WebClient`, which relies on several parts of our
infrastructure:
* a `ClientHttpRequestFactory` to drive the underlying client library
* a `HttpRequestBuilder` builder API to create the client request
* a `WebResponseExtractor` to extract the "low-le... | spring-web-reactive/src/main/java/org/springframework/web/client/reactive/WebResponseActions.java | @@ -0,0 +1,49 @@
+/*
+ * Copyright 2002-2016 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 | 69ce33e1eef6e03bbd647b8c930b3b0138a5e4e0.json | Add WebClient and its WebResponseExtractor API
This commit adds the `WebClient`, which relies on several parts of our
infrastructure:
* a `ClientHttpRequestFactory` to drive the underlying client library
* a `HttpRequestBuilder` builder API to create the client request
* a `WebResponseExtractor` to extract the "low-le... | spring-web-reactive/src/main/java/org/springframework/web/client/reactive/WebResponseExtractor.java | @@ -0,0 +1,31 @@
+/*
+ * Copyright 2002-2016 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 | 69ce33e1eef6e03bbd647b8c930b3b0138a5e4e0.json | Add WebClient and its WebResponseExtractor API
This commit adds the `WebClient`, which relies on several parts of our
infrastructure:
* a `ClientHttpRequestFactory` to drive the underlying client library
* a `HttpRequestBuilder` builder API to create the client request
* a `WebResponseExtractor` to extract the "low-le... | spring-web-reactive/src/main/java/org/springframework/web/client/reactive/WebResponseExtractors.java | @@ -0,0 +1,123 @@
+/*
+ * Copyright 2002-2016 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 | 69ce33e1eef6e03bbd647b8c930b3b0138a5e4e0.json | Add WebClient and its WebResponseExtractor API
This commit adds the `WebClient`, which relies on several parts of our
infrastructure:
* a `ClientHttpRequestFactory` to drive the underlying client library
* a `HttpRequestBuilder` builder API to create the client request
* a `WebResponseExtractor` to extract the "low-le... | spring-web-reactive/src/test/java/org/springframework/web/client/reactive/WebClientIntegrationTests.java | @@ -0,0 +1,249 @@
+/*
+ * Copyright 2002-2016 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 | a6469baa4f84de1b9da0131db981e2f42b09969d.json | Add HttpRequestBuilder default implementation
This commit adds a `DefaultHttpRequestBuilder` and its companion static
builders in `HttpRequestBuilders`. This allows to build client requests
with a friendly builder API, inspired by Spring's MockMvc API. | spring-web-reactive/src/main/java/org/springframework/web/client/reactive/DefaultHttpRequestBuilder.java | @@ -0,0 +1,167 @@
+/*
+ * Copyright 2002-2016 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 | a6469baa4f84de1b9da0131db981e2f42b09969d.json | Add HttpRequestBuilder default implementation
This commit adds a `DefaultHttpRequestBuilder` and its companion static
builders in `HttpRequestBuilders`. This allows to build client requests
with a friendly builder API, inspired by Spring's MockMvc API. | spring-web-reactive/src/main/java/org/springframework/web/client/reactive/HttpRequestBuilder.java | @@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.web.client;
+package org.springframework.web.client.reactive;
import org.springframework.http.client.reactive.ClientHttpRequest;
import org.springframework.http.client.reactive.ClientHttpRequestFactory; | true |
Other | spring-projects | spring-framework | a6469baa4f84de1b9da0131db981e2f42b09969d.json | Add HttpRequestBuilder default implementation
This commit adds a `DefaultHttpRequestBuilder` and its companion static
builders in `HttpRequestBuilders`. This allows to build client requests
with a friendly builder API, inspired by Spring's MockMvc API. | spring-web-reactive/src/main/java/org/springframework/web/client/reactive/HttpRequestBuilders.java | @@ -0,0 +1,110 @@
+/*
+ * Copyright 2002-2016 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 | 0983d302c7f85daa067586449dc861f20e01f89b.json | Add base contracts for the Web client
This commit adds the base contracts for the Web client.
The "Reactive" prefixes of the previously commited contracts has been
removed to match the server ones.
Both the `ClientHttpRequest` and the `ServerHttpResponse` extend
`ReactiveHttpOutputMessage`, which now has a `beforeCom... | spring-web-reactive/src/main/java/org/springframework/http/ReactiveHttpOutputMessage.java | @@ -16,6 +16,8 @@
package org.springframework.http;
+import java.util.function.Supplier;
+
import org.reactivestreams.Publisher;
import reactor.core.publisher.Mono;
@@ -31,6 +33,12 @@
*/
public interface ReactiveHttpOutputMessage extends HttpMessage {
+ /**
+ * Register an action to be applied just befor... | true |
Other | spring-projects | spring-framework | 0983d302c7f85daa067586449dc861f20e01f89b.json | Add base contracts for the Web client
This commit adds the base contracts for the Web client.
The "Reactive" prefixes of the previously commited contracts has been
removed to match the server ones.
Both the `ClientHttpRequest` and the `ServerHttpResponse` extend
`ReactiveHttpOutputMessage`, which now has a `beforeCom... | spring-web-reactive/src/main/java/org/springframework/http/client/package-info.java | @@ -1,5 +0,0 @@
-/**
- * Core package of the client-side web support.
- * Provides a {@code RestTemplate} class and various callback interfaces.
- */
-package org.springframework.http.client; | true |
Other | spring-projects | spring-framework | 0983d302c7f85daa067586449dc861f20e01f89b.json | Add base contracts for the Web client
This commit adds the base contracts for the Web client.
The "Reactive" prefixes of the previously commited contracts has been
removed to match the server ones.
Both the `ClientHttpRequest` and the `ServerHttpResponse` extend
`ReactiveHttpOutputMessage`, which now has a `beforeCom... | spring-web-reactive/src/main/java/org/springframework/http/client/reactive/ClientHttpRequest.java | @@ -0,0 +1,54 @@
+/*
+ * Copyright 2002-2016 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 | 0983d302c7f85daa067586449dc861f20e01f89b.json | Add base contracts for the Web client
This commit adds the base contracts for the Web client.
The "Reactive" prefixes of the previously commited contracts has been
removed to match the server ones.
Both the `ClientHttpRequest` and the `ServerHttpResponse` extend
`ReactiveHttpOutputMessage`, which now has a `beforeCom... | spring-web-reactive/src/main/java/org/springframework/http/client/reactive/ClientHttpRequestFactory.java | @@ -0,0 +1,39 @@
+/*
+ * Copyright 2002-2016 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 | 0983d302c7f85daa067586449dc861f20e01f89b.json | Add base contracts for the Web client
This commit adds the base contracts for the Web client.
The "Reactive" prefixes of the previously commited contracts has been
removed to match the server ones.
Both the `ClientHttpRequest` and the `ServerHttpResponse` extend
`ReactiveHttpOutputMessage`, which now has a `beforeCom... | spring-web-reactive/src/main/java/org/springframework/http/client/reactive/ClientHttpResponse.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,34 +14,21 @@
* limitations under the L... | true |
Other | spring-projects | spring-framework | 0983d302c7f85daa067586449dc861f20e01f89b.json | Add base contracts for the Web client
This commit adds the base contracts for the Web client.
The "Reactive" prefixes of the previously commited contracts has been
removed to match the server ones.
Both the `ClientHttpRequest` and the `ServerHttpResponse` extend
`ReactiveHttpOutputMessage`, which now has a `beforeCom... | spring-web-reactive/src/main/java/org/springframework/http/client/reactive/package-info.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,16 +14,10 @@
* limitations under the L... | true |
Other | spring-projects | spring-framework | 0983d302c7f85daa067586449dc861f20e01f89b.json | Add base contracts for the Web client
This commit adds the base contracts for the Web client.
The "Reactive" prefixes of the previously commited contracts has been
removed to match the server ones.
Both the `ClientHttpRequest` and the `ServerHttpResponse` extend
`ReactiveHttpOutputMessage`, which now has a `beforeCom... | spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ServerHttpRequest.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
import org.springframework.h... | true |
Other | spring-projects | spring-framework | 0983d302c7f85daa067586449dc861f20e01f89b.json | Add base contracts for the Web client
This commit adds the base contracts for the Web client.
The "Reactive" prefixes of the previously commited contracts has been
removed to match the server ones.
Both the `ClientHttpRequest` and the `ServerHttpResponse` extend
`ReactiveHttpOutputMessage`, which now has a `beforeCom... | spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ServerHttpResponse.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,16 +16,13 @@
package org.springframew... | true |
Other | spring-projects | spring-framework | 0983d302c7f85daa067586449dc861f20e01f89b.json | Add base contracts for the Web client
This commit adds the base contracts for the Web client.
The "Reactive" prefixes of the previously commited contracts has been
removed to match the server ones.
Both the `ClientHttpRequest` and the `ServerHttpResponse` extend
`ReactiveHttpOutputMessage`, which now has a `beforeCom... | spring-web-reactive/src/main/java/org/springframework/web/client/HttpRequestBuilder.java | @@ -0,0 +1,34 @@
+/*
+ * Copyright 2002-2016 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 | d6648a06c955849a798f9eed73c12cb819486cc7.json | Add Code of Conduct | CODE_OF_CONDUCT.adoc | @@ -0,0 +1,44 @@
+= Contributor Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of fostering an open
+and welcoming community, we pledge to respect all people who contribute through reporting
+issues, posting feature requests, updating documentation, submitting pull requests or
+... | true |
Other | spring-projects | spring-framework | d6648a06c955849a798f9eed73c12cb819486cc7.json | Add Code of Conduct | CONTRIBUTING.md | @@ -6,6 +6,10 @@ to expect from the Spring team when evaluating your submission._
_Please refer back to this document as a checklist before issuing any pull
request; this will save time for everyone!_
+## Code of Conduct
+This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDUCT.adoc).
+By ... | true |
Other | spring-projects | spring-framework | d6648a06c955849a798f9eed73c12cb819486cc7.json | Add Code of Conduct | README.md | @@ -10,6 +10,10 @@ The framework also serves as the foundation for [Spring Integration][], [Spring
and the rest of the Spring [family of projects][]. Browse the repositories under
the [Spring organization][] on GitHub for a full list.
+## Code of Conduct
+This project adheres to the Contributor Covenant [code of co... | true |
Other | spring-projects | spring-framework | 08a08725be865a620373e36ceec0820e36f1fd83.json | Allow plugging in custom RequestExpectationManager
The MockRestServiceServer builder now has an option to plug in a
custom RequestExpectationManager.
Issue: SPR-11365 | spring-test/src/main/java/org/springframework/test/web/client/AbstractRequestExpectationManager.java | @@ -24,11 +24,11 @@
import org.springframework.util.Assert;
/**
- * Base class for {@code RequestExpectationManager} implementations.
- * Creates and contains expectations and stores actual requests.
+ * Base class for {@code RequestExpectationManager} implementations responsible
+ * for storing expectations and re... | true |
Other | spring-projects | spring-framework | 08a08725be865a620373e36ceec0820e36f1fd83.json | Allow plugging in custom RequestExpectationManager
The MockRestServiceServer builder now has an option to plug in a
custom RequestExpectationManager.
Issue: SPR-11365 | spring-test/src/main/java/org/springframework/test/web/client/DefaultRequestExpectation.java | @@ -25,21 +25,20 @@
import org.springframework.util.Assert;
/**
- * Default implementation of {@code ResponseActions} that is also a composite
- * {@code RequestMatcher}, invoking all request matchers it contains, as well as
- * a {@code ResponseCreator} delegating to the response creator it contains.
+ * Default i... | true |
Other | spring-projects | spring-framework | 08a08725be865a620373e36ceec0820e36f1fd83.json | Allow plugging in custom RequestExpectationManager
The MockRestServiceServer builder now has an option to plug in a
custom RequestExpectationManager.
Issue: SPR-11365 | spring-test/src/main/java/org/springframework/test/web/client/MockRestServiceServer.java | @@ -200,10 +200,19 @@ public static MockRestServiceServer createServer(RestGatewaySupport restGateway)
public interface MockRestServiceServerBuilder {
/**
- * When this option is set, requests can be executed in any order, i.e.
- * not matching the order in which expected requests are declared.
+ * Allow e... | true |
Other | spring-projects | spring-framework | 08a08725be865a620373e36ceec0820e36f1fd83.json | Allow plugging in custom RequestExpectationManager
The MockRestServiceServer builder now has an option to plug in a
custom RequestExpectationManager.
Issue: SPR-11365 | spring-test/src/main/java/org/springframework/test/web/client/RequestExpectation.java | @@ -16,12 +16,16 @@
package org.springframework.test.web.client;
/**
- * A contract that combines {@code RequestMatcher} with {@code ResponseCreator}
- * to define an expected request and a response to use for it.
+ * An extension of {@code ResponseActions} that also implements
+ * {@code RequestMatcher} and {@code... | true |
Other | spring-projects | spring-framework | 08a08725be865a620373e36ceec0820e36f1fd83.json | Allow plugging in custom RequestExpectationManager
The MockRestServiceServer builder now has an option to plug in a
custom RequestExpectationManager.
Issue: SPR-11365 | spring-test/src/main/java/org/springframework/test/web/client/SimpleRequestExpectationManager.java | @@ -24,8 +24,8 @@
import org.springframework.http.client.ClientHttpResponse;
/**
- * {@code RequestExpectationManager} that expects requests to follow the order
- * in which expected requests were declared.
+ * Simple {@code RequestExpectationManager} that matches requests to expectations
+ * sequentially, i.e. in ... | true |
Other | spring-projects | spring-framework | 08a08725be865a620373e36ceec0820e36f1fd83.json | Allow plugging in custom RequestExpectationManager
The MockRestServiceServer builder now has an option to plug in a
custom RequestExpectationManager.
Issue: SPR-11365 | spring-test/src/main/java/org/springframework/test/web/client/UnorderedRequestExpectationManager.java | @@ -25,9 +25,8 @@
import org.springframework.http.client.ClientHttpResponse;
/**
- * {@code RequestExpectationManager} that tries to match actual requests to
- * expected requests regardless of the order in which expected requests were
- * declared.
+ * {@code RequestExpectationManager} that matches requests to exp... | true |
Other | spring-projects | spring-framework | 08a08725be865a620373e36ceec0820e36f1fd83.json | Allow plugging in custom RequestExpectationManager
The MockRestServiceServer builder now has an option to plug in a
custom RequestExpectationManager.
Issue: SPR-11365 | spring-test/src/test/java/org/springframework/test/web/client/SimpleRequestExpectationManagerTests.java | @@ -34,7 +34,7 @@
* Unit tests for {@link AbstractRequestExpectationManager}.
* @author Rossen Stoyanchev
*/
-public class OrderedRequestExpectationManagerTests {
+public class SimpleRequestExpectationManagerTests {
private SimpleRequestExpectationManager manager = new SimpleRequestExpectationManager();
@@ ... | true |
Other | spring-projects | spring-framework | a56c69c9ca410b2a04d946a1199fe1dc10b89f5b.json | Introduce MockRestServiceServer builder
MockRestServiceServer now provides static methods for builder-style
creation of MockRestServiceServer. This includes an option ignore
the order of declaration expected requests.
Issue: SPR-11365 | spring-test/src/main/java/org/springframework/test/web/client/AbstractRequestExpectationManager.java | @@ -48,12 +48,10 @@ public AbstractRequestExpectationManager(List<RequestExpectation> expectations)
}
- @Override
public List<RequestExpectation> getExpectations() {
return this.expectations;
}
- @Override
public List<ClientHttpRequest> getRequests() {
return this.requests;
} | true |
Other | spring-projects | spring-framework | a56c69c9ca410b2a04d946a1199fe1dc10b89f5b.json | Introduce MockRestServiceServer builder
MockRestServiceServer now provides static methods for builder-style
creation of MockRestServiceServer. This includes an option ignore
the order of declaration expected requests.
Issue: SPR-11365 | spring-test/src/main/java/org/springframework/test/web/client/MockRestServiceServer.java | @@ -18,7 +18,6 @@
import java.io.IOException;
import java.net.URI;
-import java.util.List;
import org.springframework.http.HttpMethod;
import org.springframework.http.client.AsyncClientHttpRequest;
@@ -96,90 +95,171 @@
*/
public class MockRestServiceServer {
- private RequestExpectationManager expectationM... | true |
Other | spring-projects | spring-framework | a56c69c9ca410b2a04d946a1199fe1dc10b89f5b.json | Introduce MockRestServiceServer builder
MockRestServiceServer now provides static methods for builder-style
creation of MockRestServiceServer. This includes an option ignore
the order of declaration expected requests.
Issue: SPR-11365 | spring-test/src/main/java/org/springframework/test/web/client/RequestExpectationManager.java | @@ -16,7 +16,6 @@
package org.springframework.test.web.client;
import java.io.IOException;
-import java.util.List;
import org.springframework.http.client.ClientHttpRequest;
import org.springframework.http.client.ClientHttpResponse;
@@ -31,16 +30,6 @@
*/
public interface RequestExpectationManager {
- /**
- ... | true |
Other | spring-projects | spring-framework | a56c69c9ca410b2a04d946a1199fe1dc10b89f5b.json | Introduce MockRestServiceServer builder
MockRestServiceServer now provides static methods for builder-style
creation of MockRestServiceServer. This includes an option ignore
the order of declaration expected requests.
Issue: SPR-11365 | spring-test/src/main/java/org/springframework/test/web/client/SimpleRequestExpectationManager.java | @@ -30,7 +30,7 @@
* @author Rossen Stoyanchev
* @since 4.3
*/
-public class OrderedRequestExpectationManager extends AbstractRequestExpectationManager {
+public class SimpleRequestExpectationManager extends AbstractRequestExpectationManager {
private Iterator<RequestExpectation> iterator;
| true |
Other | spring-projects | spring-framework | a56c69c9ca410b2a04d946a1199fe1dc10b89f5b.json | Introduce MockRestServiceServer builder
MockRestServiceServer now provides static methods for builder-style
creation of MockRestServiceServer. This includes an option ignore
the order of declaration expected requests.
Issue: SPR-11365 | spring-test/src/test/java/org/springframework/test/web/client/OrderedRequestExpectationManagerTests.java | @@ -36,7 +36,7 @@
*/
public class OrderedRequestExpectationManagerTests {
- private OrderedRequestExpectationManager manager = new OrderedRequestExpectationManager();
+ private SimpleRequestExpectationManager manager = new SimpleRequestExpectationManager();
@Test | true |
Other | spring-projects | spring-framework | d8a05592e23944dd542e28fbe0a913130b99d0b1.json | Allow package private classes in spring.factories
Update SpringFactoriesLoader so that package private classes can be
used.
Issue: SPR-13969 | spring-core/src/main/java/org/springframework/core/io/support/SpringFactoriesLoader.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
package org.springframework.... | true |
Other | spring-projects | spring-framework | d8a05592e23944dd542e28fbe0a913130b99d0b1.json | Allow package private classes in spring.factories
Update SpringFactoriesLoader so that package private classes can be
used.
Issue: SPR-13969 | spring-core/src/test/java/org/springframework/core/io/support/DummyPackagePrivateFactory.java | @@ -0,0 +1,26 @@
+/*
+ * Copyright 2002-2016 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 | d8a05592e23944dd542e28fbe0a913130b99d0b1.json | Allow package private classes in spring.factories
Update SpringFactoriesLoader so that package private classes can be
used.
Issue: SPR-13969 | spring-core/src/test/java/org/springframework/core/io/support/SpringFactoriesLoaderTests.java | @@ -0,0 +1,56 @@
+/*
+ * Copyright 2002-2016 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 | d8a05592e23944dd542e28fbe0a913130b99d0b1.json | Allow package private classes in spring.factories
Update SpringFactoriesLoader so that package private classes can be
used.
Issue: SPR-13969 | spring-core/src/test/resources/META-INF/spring.factories | @@ -0,0 +1,9 @@
+org.springframework.core.io.support.DummyFactory=\
+org.springframework.core.io.support.MyDummyFactory2,\
+org.springframework.core.io.support.MyDummyFactory1
+
+java.lang.String=\
+org.springframework.core.io.support.MyDummyFactory1
+
+org.springframework.core.io.support.DummyPackagePrivateFactory=\
+... | true |
Other | spring-projects | spring-framework | d8a05592e23944dd542e28fbe0a913130b99d0b1.json | Allow package private classes in spring.factories
Update SpringFactoriesLoader so that package private classes can be
used.
Issue: SPR-13969 | spring-core/src/test/resources/org/springframework/core/io/support/springFactoriesLoaderTests.properties | @@ -1,2 +0,0 @@
-org.springframework.core.io.support.DummyFactory=org.springframework.core.io.support.MyDummyFactory2,org.springframework.core.io.support.MyDummyFactory1
-java.lang.String=org.springframework.core.io.support.MyDummyFactory1
\ No newline at end of file | true |
Other | spring-projects | spring-framework | f33578ef0f20af90a41c2daddedcb7ba1b96c278.json | Fix failing test and warings
The test failure was caused by the previous commit. The Message
resolver now supports payload conversion so it can raise a
MessageConversionException, not MethodArgumentTypeMismatchException. | spring-jms/src/test/java/org/springframework/jms/config/MethodJmsListenerEndpointTests.java | @@ -57,14 +57,18 @@
import org.springframework.messaging.handler.annotation.Payload;
import org.springframework.messaging.handler.annotation.SendTo;
import org.springframework.messaging.handler.annotation.support.DefaultMessageHandlerMethodFactory;
-import org.springframework.messaging.handler.annotation.support.Met... | false |
Other | spring-projects | spring-framework | c4117885bd61835159da14fb7fc9e3e28e1ddd31.json | Refine AntPathMatcher optimizations
Refine the optimizations made in 6f55ab69 in order to restore binary
compatibility and resolve a regression.
Tests of the form pathMatcher.match("/foo/bar/**", "/foo/bar") should
return true as this was the behavior in Spring 4.2.
Issue: SPR-13913 | spring-core/src/main/java/org/springframework/util/AntPathMatcher.java | @@ -74,6 +74,8 @@ public class AntPathMatcher implements PathMatcher {
private static final Pattern VARIABLE_PATTERN = Pattern.compile("\\{[^/]+?\\}");
+ private static final char[] WILDCARD_CHARS = { '*', '?', '{' };
+
private String pathSeparator;
@@ -85,7 +87,7 @@ public class AntPathMatcher implements P... | true |
Other | spring-projects | spring-framework | c4117885bd61835159da14fb7fc9e3e28e1ddd31.json | Refine AntPathMatcher optimizations
Refine the optimizations made in 6f55ab69 in order to restore binary
compatibility and resolve a regression.
Tests of the form pathMatcher.match("/foo/bar/**", "/foo/bar") should
return true as this was the behavior in Spring 4.2.
Issue: SPR-13913 | spring-core/src/test/java/org/springframework/util/AntPathMatcherTests.java | @@ -128,6 +128,8 @@ public void match() {
assertFalse(pathMatcher.match("/x/x/**/bla", "/x/x/x/"));
+ assertTrue(pathMatcher.match("/foo/bar/**", "/foo/bar")) ;
+
assertTrue(pathMatcher.match("", ""));
assertTrue(pathMatcher.match("/{bla}.*", "/testing.html")); | true |
Other | spring-projects | spring-framework | 08eb623c41d0ba8276d4131330271ea0f49c7879.json | Fix regression introduced in 4.3 snapshot
Commit ccd17d introduced a regression where a custom HTTP method
would no longer match for an empty @RequestMapping condition.
The previous behavior should now be restored. Effectively
RequestMethodRequestCondition as before will now match to any HTTP
method (even unknown/cus... | spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestCondition.java | @@ -94,25 +94,26 @@ public RequestMethodsRequestCondition combine(RequestMethodsRequestCondition oth
* Check if any of the HTTP request methods match the given request and
* return an instance that contains the matching HTTP request method only.
* @param request the current request
- * @return the same instan... | true |
Other | spring-projects | spring-framework | 08eb623c41d0ba8276d4131330271ea0f49c7879.json | Fix regression introduced in 4.3 snapshot
Commit ccd17d introduced a regression where a custom HTTP method
would no longer match for an empty @RequestMapping condition.
The previous behavior should now be restored. Effectively
RequestMethodRequestCondition as before will now match to any HTTP
method (even unknown/cus... | spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestConditionTests.java | @@ -82,12 +82,13 @@ public void methodHeadNoMatch() throws Exception {
}
@Test
- public void noDeclaredMethodsMatchesAllMethodsExceptOptions() {
+ public void emptyMatchesAnythingExceptHttpOptions() {
RequestCondition condition = new RequestMethodsRequestCondition();
assertNotNull(condition.getMatchingCon... | true |
Other | spring-projects | spring-framework | 1c2ac49f2ac32ab0ee589bfc165046c14aa782c7.json | Add weak ETag support in ShallowEtagHeaderFilter
This commit adds weak ETag support in ShallowEtagHeaderFilter.
This improves the behavior of the filter in tow ways:
* weak ETags in request headers such as `W/"0badc0ffee"` will be
compared with a "weak comparison" (matching both weak and strong ETags
of the same valu... | spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java | @@ -19,6 +19,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintWriter;
+
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream;
@@ -60,11 +61,28 @@ public class ShallowEtagHeaderFilter extends OncePerRequestFilter {
pri... | true |
Other | spring-projects | spring-framework | 1c2ac49f2ac32ab0ee589bfc165046c14aa782c7.json | Add weak ETag support in ShallowEtagHeaderFilter
This commit adds weak ETag support in ShallowEtagHeaderFilter.
This improves the behavior of the filter in tow ways:
* weak ETags in request headers such as `W/"0badc0ffee"` will be
compared with a "weak comparison" (matching both weak and strong ETags
of the same valu... | spring-web/src/test/java/org/springframework/web/filter/ShallowEtagHeaderFilterTests.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -73,6 +73,26 @@ public void filterNoMatch() ... | true |
Other | spring-projects | spring-framework | 1c2ac49f2ac32ab0ee589bfc165046c14aa782c7.json | Add weak ETag support in ShallowEtagHeaderFilter
This commit adds weak ETag support in ShallowEtagHeaderFilter.
This improves the behavior of the filter in tow ways:
* weak ETags in request headers such as `W/"0badc0ffee"` will be
compared with a "weak comparison" (matching both weak and strong ETags
of the same valu... | src/asciidoc/web-mvc.adoc | @@ -4302,7 +4302,6 @@ responsible for this, along with conditional headers such as `'Last-Modified'` a
The `'Cache-Control'` HTTP response header advises private caches (e.g. browsers) and
public caches (e.g. proxies) on how they can cache HTTP responses for further reuse.
-mvc-config-static-resources
An http://en... | true |
Other | spring-projects | spring-framework | ac3847bf4a52438fc90aa4dc61ff25a8fac31685.json | Clarify Javadoc for CacheControl.noCache,noStore
This change makes clear that this is the intent of the CacheControl API
not to provide a way to configure both "no-cache" and "no-store"
directives for the "Cache-Control" header.
Issue: SPR-13780 | spring-web/src/main/java/org/springframework/http/CacheControl.java | @@ -114,7 +114,7 @@ public static CacheControl maxAge(long maxAge, TimeUnit unit) {
* clients sending conditional requests (with "ETag", "If-Modified-Since" headers) and the server responding
* with "304 - Not Modified" status.
* <p>In order to disable caching and minimize requests/responses exchanges, the {@l... | false |
Other | spring-projects | spring-framework | c73e52412acd7cb50c229d5c273760843bc97188.json | Decrease allocation rate for CacheOperation | spring-context/src/main/java/org/springframework/cache/annotation/SpringCacheAnnotationParser.java | @@ -98,56 +98,59 @@ private <T extends Annotation> Collection<CacheOperation> lazyInit(Collection<Ca
}
CacheableOperation parseCacheableAnnotation(AnnotatedElement ae, DefaultCacheConfig defaultConfig, Cacheable cacheable) {
- CacheableOperation op = new CacheableOperation();
-
- op.setCacheNames(cacheable.cach... | true |
Other | spring-projects | spring-framework | c73e52412acd7cb50c229d5c273760843bc97188.json | Decrease allocation rate for CacheOperation | spring-context/src/main/java/org/springframework/cache/config/CacheAdviceParser.java | @@ -107,7 +107,7 @@ private RootBeanDefinition parseDefinitionSource(Element definition, ParserConte
String name = prop.merge(opElement, parserContext.getReaderContext());
TypedStringValue nameHolder = new TypedStringValue(name);
nameHolder.setSource(parserContext.extractSource(opElement));
- CacheableOpe... | true |
Other | spring-projects | spring-framework | c73e52412acd7cb50c229d5c273760843bc97188.json | Decrease allocation rate for CacheOperation | spring-context/src/main/java/org/springframework/cache/interceptor/CacheEvictOperation.java | @@ -24,34 +24,49 @@
*/
public class CacheEvictOperation extends CacheOperation {
- private boolean cacheWide = false;
+ private final boolean cacheWide;
- private boolean beforeInvocation = false;
+ private final boolean beforeInvocation;
+ public boolean isCacheWide() {
+ return this.cacheWide... | true |
Other | spring-projects | spring-framework | c73e52412acd7cb50c229d5c273760843bc97188.json | Decrease allocation rate for CacheOperation | spring-context/src/main/java/org/springframework/cache/interceptor/CacheOperation.java | @@ -31,137 +31,197 @@
*/
public abstract class CacheOperation implements BasicOperation {
- private String name = "";
+ private final String name;
- private Set<String> cacheNames = Collections.emptySet();
-
- private String key = "";
+ private final Set<String> cacheNames;
- private String keyGenerator ... | true |
Other | spring-projects | spring-framework | c73e52412acd7cb50c229d5c273760843bc97188.json | Decrease allocation rate for CacheOperation | spring-context/src/main/java/org/springframework/cache/interceptor/CachePutOperation.java | @@ -25,23 +25,36 @@
*/
public class CachePutOperation extends CacheOperation {
- private String unless;
+ private final String unless;
+ public CachePutOperation(CachePutOperation.Builder b) {
+ super(b);
+ this.unless = b.unless;
+ }
public String getUnless() {
return this.unless;
... | true |
Other | spring-projects | spring-framework | c73e52412acd7cb50c229d5c273760843bc97188.json | Decrease allocation rate for CacheOperation | spring-context/src/main/java/org/springframework/cache/interceptor/CacheableOperation.java | @@ -25,36 +25,53 @@
*/
public class CacheableOperation extends CacheOperation {
- private String unless;
+ private final String unless;
- private boolean sync;
+ private boolean sync;
+ public CacheableOperation(CacheableOperation.Builder b) {
+ super(b);
+ this.unless = b.unless;
+ ... | true |
Other | spring-projects | spring-framework | 9204fdc371df0f4efc2e3bd17a5fc2839cc845e9.json | fix timer issues
sync reactor-core | spring-web-reactive/src/main/java/org/springframework/http/server/reactive/UndertowHttpHandlerAdapter.java | @@ -131,7 +131,7 @@ public RequestBodyPublisher(HttpServerExchange exchange,
@Override
public void subscribe(Subscriber<? super DataBuffer> subscriber) {
if (subscriber == null) {
- throw Exceptions.spec_2_13_exception();
+ throw Exceptions.argumentIsNullException();
}
if (this.subscriber != nul... | true |
Other | spring-projects | spring-framework | 9204fdc371df0f4efc2e3bd17a5fc2839cc845e9.json | fix timer issues
sync reactor-core | spring-web-reactive/src/test/java/org/springframework/http/server/reactive/AsyncIntegrationTests.java | @@ -27,6 +27,7 @@
import reactor.core.publisher.Mono;
import reactor.core.publisher.ProcessorGroup;
import reactor.core.publisher.Processors;
+import reactor.core.timer.Timer;
import reactor.rx.Stream;
import org.springframework.core.io.buffer.DataBufferAllocator; | true |
Other | spring-projects | spring-framework | 468f083ab08328e6f0eb26a1ac4b5b3455b5b2fc.json | Use proper syntax highlighting for XML examples | src/asciidoc/core-beans.adoc | @@ -1719,7 +1719,7 @@ then nested `constructor-arg` elements.
Let's review the examples from <<beans-constructor-injection>> with the `c:` namespace:
-[source,java,indent=0]
+[source,xml,indent=0]
[subs="verbatim,quotes"]
----
<beans xmlns="http://www.springframework.org/schema/beans"
@@ -1753,7 +1753,7 @@ For... | false |
Other | spring-projects | spring-framework | ee9c5833f51d2c70a2f36e3d6252ce8af2b2ae88.json | Update our tests to use TestSubscriber | spring-web-reactive/src/test/java/org/springframework/core/codec/support/ByteBufferDecoderTests.java | @@ -17,8 +17,6 @@
package org.springframework.core.codec.support;
import java.nio.ByteBuffer;
-import java.util.List;
-import java.util.stream.StreamSupport;
import org.junit.Test;
import org.reactivestreams.Publisher;
@@ -28,8 +26,8 @@
import org.springframework.core.io.buffer.DataBuffer;
import org.springfr... | true |
Other | spring-projects | spring-framework | ee9c5833f51d2c70a2f36e3d6252ce8af2b2ae88.json | Update our tests to use TestSubscriber | spring-web-reactive/src/test/java/org/springframework/core/codec/support/ByteBufferEncoderTests.java | @@ -18,8 +18,6 @@
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.stream.StreamSupport;
import org.junit.Before;
import org.junit.Test;
@@ -30,8 +28,8 @@
import org.springframework.core.io.buffer.DataBuffer;
import org.springframework.http.MediaT... | true |
Other | spring-projects | spring-framework | ee9c5833f51d2c70a2f36e3d6252ce8af2b2ae88.json | Update our tests to use TestSubscriber | spring-web-reactive/src/test/java/org/springframework/core/codec/support/JacksonJsonDecoderTests.java | @@ -16,18 +16,15 @@
package org.springframework.core.codec.support;
-import java.util.List;
-import java.util.stream.StreamSupport;
-
import org.junit.Test;
import reactor.core.publisher.Flux;
import org.springframework.core.ResolvableType;
import org.springframework.core.io.buffer.DataBuffer;
import org.sp... | true |
Other | spring-projects | spring-framework | ee9c5833f51d2c70a2f36e3d6252ce8af2b2ae88.json | Update our tests to use TestSubscriber | spring-web-reactive/src/test/java/org/springframework/core/codec/support/JacksonJsonEncoderTests.java | @@ -17,17 +17,15 @@
package org.springframework.core.codec.support;
import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.stream.StreamSupport;
import org.junit.Before;
import org.junit.Test;
import reactor.core.publisher.Flux;
import org.springframework.http.MediaType;
-impo... | true |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.