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 | 634d1c03a3d4b55b44c23c0b240a786331f12659.json | Introduce @EnabledIf support for JUnit Jupiter
This commit picks up where SPR-14614 left off by introducing a new
@EnabledIf annotation to serve as a logical companion to @DisabledIf.
In addition, this commit extracts common logic from DisabledIfCondition
into a new AbstractExpressionEvaluatingCondition base class wh... | spring-test/src/test/java/org/springframework/test/context/junit/jupiter/DisabledIfConditionTestCase.java | @@ -34,7 +34,6 @@
import static org.hamcrest.CoreMatchers.endsWith;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.startsWith;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.a... | true |
Other | spring-projects | spring-framework | 634d1c03a3d4b55b44c23c0b240a786331f12659.json | Introduce @EnabledIf support for JUnit Jupiter
This commit picks up where SPR-14614 left off by introducing a new
@EnabledIf annotation to serve as a logical companion to @DisabledIf.
In addition, this commit extracts common logic from DisabledIfCondition
into a new AbstractExpressionEvaluatingCondition base class wh... | spring-test/src/test/java/org/springframework/test/context/junit/jupiter/DisabledIfTestCase.java | @@ -46,73 +46,73 @@ class DisabledIfOnMethodTestCase {
@Test
@DisabledIf("true")
- void disabledByStringTrue() {
+ void disabledIfWithStringTrue() {
fail("This test must be disabled");
}
@Test
@DisabledIf(" true ")
- void disabledByStringTrueWithSurroundingWhitespace() {
+ void disabledIf... | true |
Other | spring-projects | spring-framework | 634d1c03a3d4b55b44c23c0b240a786331f12659.json | Introduce @EnabledIf support for JUnit Jupiter
This commit picks up where SPR-14614 left off by introducing a new
@EnabledIf annotation to serve as a logical companion to @DisabledIf.
In addition, this commit extracts common logic from DisabledIfCondition
into a new AbstractExpressionEvaluatingCondition base class wh... | spring-test/src/test/java/org/springframework/test/context/junit/jupiter/EnabledIfTestCase.java | @@ -0,0 +1,154 @@
+/*
+ * 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 | 634d1c03a3d4b55b44c23c0b240a786331f12659.json | Introduce @EnabledIf support for JUnit Jupiter
This commit picks up where SPR-14614 left off by introducing a new
@EnabledIf annotation to serve as a logical companion to @DisabledIf.
In addition, this commit extracts common logic from DisabledIfCondition
into a new AbstractExpressionEvaluatingCondition base class wh... | spring-test/src/test/java/org/springframework/test/context/junit/jupiter/EnabledOnMac.java | @@ -0,0 +1,38 @@
+/*
+ * 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 | 436486b8a1cab5a37a415c7560ee6dea8014bf9b.json | Relax ServletContext check for resource handling
This is a follow-up on commit 3b95e0b relaxing the expectation that a
ServletContext is present. Instead we check defensively and fall back
on PathExtensionContentNegotiationStrategy which can use JAF.
Issue: SPR-14577 | spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java | @@ -22,7 +22,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
@@ -32,6 +31,7 @@
import org.apache.commons.logging.LogFactory;... | true |
Other | spring-projects | spring-framework | 436486b8a1cab5a37a415c7560ee6dea8014bf9b.json | Relax ServletContext check for resource handling
This is a follow-up on commit 3b95e0b relaxing the expectation that a
ServletContext is present. Instead we check defensively and fall back
on PathExtensionContentNegotiationStrategy which can use JAF.
Issue: SPR-14577 | spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java | @@ -79,6 +79,8 @@ public void mapPathToLocation() throws Exception {
request.setAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "/testStylesheet.css");
ResourceHttpRequestHandler handler = getHandler("/resources/**");
+ handler.afterPropertiesSet();
+ handler.afterSingletonsInstantiated();
... | true |
Other | spring-projects | spring-framework | 436486b8a1cab5a37a415c7560ee6dea8014bf9b.json | Relax ServletContext check for resource handling
This is a follow-up on commit 3b95e0b relaxing the expectation that a
ServletContext is present. Instead we check defensively and fall back
on PathExtensionContentNegotiationStrategy which can use JAF.
Issue: SPR-14577 | spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java | @@ -81,6 +81,7 @@ public void setUp() throws Exception {
this.handler.setCacheSeconds(3600);
this.handler.setServletContext(new TestServletContext());
this.handler.afterPropertiesSet();
+ this.handler.afterSingletonsInstantiated();
this.request = new MockHttpServletRequest("GET", "");
this.response = ... | true |
Other | spring-projects | spring-framework | e8530c917e3f267ce82df0050d3f914552ac6145.json | Add Smile and CBOR Jackson data formats support
This commit adds Smile and CBOR Jackson HttpMessageConverters
and make it possible to create Smile and CBOR ObjectMapper via
Jackson2ObjectMapperBuilder, which now allows to specify any
custom JsonFactory.
Like with JSON and XML Jackson support, the relevant
HttpMessage... | build.gradle | @@ -733,6 +733,8 @@ project("spring-web") {
optional("com.squareup.okhttp3:okhttp:${okhttp3Version}")
optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson2Version}")
+ optional("com.fasterxml.jackson.dataformat:j... | true |
Other | spring-projects | spring-framework | e8530c917e3f267ce82df0050d3f914552ac6145.json | Add Smile and CBOR Jackson data formats support
This commit adds Smile and CBOR Jackson HttpMessageConverters
and make it possible to create Smile and CBOR ObjectMapper via
Jackson2ObjectMapperBuilder, which now allows to specify any
custom JsonFactory.
Like with JSON and XML Jackson support, the relevant
HttpMessage... | spring-web/src/main/java/org/springframework/http/converter/cbor/MappingJackson2CborHttpMessageConverter.java | @@ -0,0 +1,74 @@
+/*
+ * 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 | e8530c917e3f267ce82df0050d3f914552ac6145.json | Add Smile and CBOR Jackson data formats support
This commit adds Smile and CBOR Jackson HttpMessageConverters
and make it possible to create Smile and CBOR ObjectMapper via
Jackson2ObjectMapperBuilder, which now allows to specify any
custom JsonFactory.
Like with JSON and XML Jackson support, the relevant
HttpMessage... | spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java | @@ -31,6 +31,7 @@
import com.fasterxml.jackson.annotation.JsonFilter;
import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.Annotatio... | true |
Other | spring-projects | spring-framework | e8530c917e3f267ce82df0050d3f914552ac6145.json | Add Smile and CBOR Jackson data formats support
This commit adds Smile and CBOR Jackson HttpMessageConverters
and make it possible to create Smile and CBOR ObjectMapper via
Jackson2ObjectMapperBuilder, which now allows to specify any
custom JsonFactory.
Like with JSON and XML Jackson support, the relevant
HttpMessage... | spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java | @@ -25,6 +25,7 @@
import com.fasterxml.jackson.annotation.JsonFilter;
import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.databind.AnnotationIntrospector;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterx... | true |
Other | spring-projects | spring-framework | e8530c917e3f267ce82df0050d3f914552ac6145.json | Add Smile and CBOR Jackson data formats support
This commit adds Smile and CBOR Jackson HttpMessageConverters
and make it possible to create Smile and CBOR ObjectMapper via
Jackson2ObjectMapperBuilder, which now allows to specify any
custom JsonFactory.
Like with JSON and XML Jackson support, the relevant
HttpMessage... | spring-web/src/main/java/org/springframework/http/converter/smile/MappingJackson2SmileHttpMessageConverter.java | @@ -0,0 +1,74 @@
+/*
+ * 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 | e8530c917e3f267ce82df0050d3f914552ac6145.json | Add Smile and CBOR Jackson data formats support
This commit adds Smile and CBOR Jackson HttpMessageConverters
and make it possible to create Smile and CBOR ObjectMapper via
Jackson2ObjectMapperBuilder, which now allows to specify any
custom JsonFactory.
Like with JSON and XML Jackson support, the relevant
HttpMessage... | spring-web/src/main/java/org/springframework/http/converter/support/AllEncompassingFormHttpMessageConverter.java | @@ -19,6 +19,7 @@
import org.springframework.http.converter.FormHttpMessageConverter;
import org.springframework.http.converter.json.GsonHttpMessageConverter;
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.http.converter.smile.MappingJackson2SmileHttpM... | true |
Other | spring-projects | spring-framework | e8530c917e3f267ce82df0050d3f914552ac6145.json | Add Smile and CBOR Jackson data formats support
This commit adds Smile and CBOR Jackson HttpMessageConverters
and make it possible to create Smile and CBOR ObjectMapper via
Jackson2ObjectMapperBuilder, which now allows to specify any
custom JsonFactory.
Like with JSON and XML Jackson support, the relevant
HttpMessage... | spring-web/src/main/java/org/springframework/web/client/RestTemplate.java | @@ -40,10 +40,12 @@
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.converter.ResourceHttpMessageConverter;
import org.springframework.http.converter.StringHttpMessageConverter;
+import org.springframework.http.converter.cbor.MappingJackson2CborHttpMessageConverter;
i... | true |
Other | spring-projects | spring-framework | e8530c917e3f267ce82df0050d3f914552ac6145.json | Add Smile and CBOR Jackson data formats support
This commit adds Smile and CBOR Jackson HttpMessageConverters
and make it possible to create Smile and CBOR ObjectMapper via
Jackson2ObjectMapperBuilder, which now allows to specify any
custom JsonFactory.
Like with JSON and XML Jackson support, the relevant
HttpMessage... | spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java | @@ -63,6 +63,8 @@
import com.fasterxml.jackson.databind.ser.std.ClassSerializer;
import com.fasterxml.jackson.databind.ser.std.NumberSerializer;
import com.fasterxml.jackson.databind.type.SimpleType;
+import com.fasterxml.jackson.dataformat.cbor.CBORFactory;
+import com.fasterxml.jackson.dataformat.smile.SmileFactor... | true |
Other | spring-projects | spring-framework | e8530c917e3f267ce82df0050d3f914552ac6145.json | Add Smile and CBOR Jackson data formats support
This commit adds Smile and CBOR Jackson HttpMessageConverters
and make it possible to create Smile and CBOR ObjectMapper via
Jackson2ObjectMapperBuilder, which now allows to specify any
custom JsonFactory.
Like with JSON and XML Jackson support, the relevant
HttpMessage... | spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java | @@ -28,6 +28,7 @@
import java.util.Map;
import java.util.TimeZone;
+import com.fasterxml.jackson.dataformat.smile.SmileFactory;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
@@ -391,6 +392,16 @@ public void setCreateXmlMapper() {
assertEquals(XmlMapper.class, this.factory.getObjectType())... | true |
Other | spring-projects | spring-framework | e8530c917e3f267ce82df0050d3f914552ac6145.json | Add Smile and CBOR Jackson data formats support
This commit adds Smile and CBOR Jackson HttpMessageConverters
and make it possible to create Smile and CBOR ObjectMapper via
Jackson2ObjectMapperBuilder, which now allows to specify any
custom JsonFactory.
Like with JSON and XML Jackson support, the relevant
HttpMessage... | spring-web/src/test/java/org/springframework/http/converter/smile/MappingJackson2SmileHttpMessageConverterTests.java | @@ -0,0 +1,161 @@
+/*
+ * 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 | e8530c917e3f267ce82df0050d3f914552ac6145.json | Add Smile and CBOR Jackson data formats support
This commit adds Smile and CBOR Jackson HttpMessageConverters
and make it possible to create Smile and CBOR ObjectMapper via
Jackson2ObjectMapperBuilder, which now allows to specify any
custom JsonFactory.
Like with JSON and XML Jackson support, the relevant
HttpMessage... | spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java | @@ -19,6 +19,8 @@
import java.util.List;
import java.util.Properties;
+import com.fasterxml.jackson.dataformat.cbor.CBORFactory;
+import com.fasterxml.jackson.dataformat.smile.SmileFactory;
import org.w3c.dom.Element;
import org.springframework.beans.factory.FactoryBean;
@@ -43,11 +45,13 @@
import org.springfr... | true |
Other | spring-projects | spring-framework | e8530c917e3f267ce82df0050d3f914552ac6145.json | Add Smile and CBOR Jackson data formats support
This commit adds Smile and CBOR Jackson HttpMessageConverters
and make it possible to create Smile and CBOR ObjectMapper via
Jackson2ObjectMapperBuilder, which now allows to specify any
custom JsonFactory.
Like with JSON and XML Jackson support, the relevant
HttpMessage... | spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java | @@ -44,11 +44,13 @@
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.converter.ResourceHttpMessageConverter;
import org.springframework.http.converter.StringHttpMessageConverter;
+import org.springframework.http.converter.cbor.MappingJackson2CborHttpMessageConverter;
i... | true |
Other | spring-projects | spring-framework | e8530c917e3f267ce82df0050d3f914552ac6145.json | Add Smile and CBOR Jackson data formats support
This commit adds Smile and CBOR Jackson HttpMessageConverters
and make it possible to create Smile and CBOR ObjectMapper via
Jackson2ObjectMapperBuilder, which now allows to specify any
custom JsonFactory.
Like with JSON and XML Jackson support, the relevant
HttpMessage... | spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java | @@ -175,7 +175,7 @@ public void requestMappingHandlerAdapter() throws Exception {
ApplicationContext context = initContext(WebConfig.class);
RequestMappingHandlerAdapter adapter = context.getBean(RequestMappingHandlerAdapter.class);
List<HttpMessageConverter<?>> converters = adapter.getMessageConverters();
- ... | true |
Other | spring-projects | spring-framework | e8530c917e3f267ce82df0050d3f914552ac6145.json | Add Smile and CBOR Jackson data formats support
This commit adds Smile and CBOR Jackson HttpMessageConverters
and make it possible to create Smile and CBOR ObjectMapper via
Jackson2ObjectMapperBuilder, which now allows to specify any
custom JsonFactory.
Like with JSON and XML Jackson support, the relevant
HttpMessage... | src/asciidoc/web-mvc.adoc | @@ -4829,6 +4829,12 @@ is present on the classpath.
.. `MappingJackson2XmlHttpMessageConverter` converts to/from XML -- added if
https://github.com/FasterXML/jackson-dataformat-xml[Jackson 2 XML extension] is present
on the classpath.
+.. `MappingJackson2SmileHttpMessageConverter` converts to/from Smile (binary JSON... | true |
Other | spring-projects | spring-framework | b6220cc19d3cb924f8a62c77977732ea5e8340dc.json | Trim expressions supplied to @DisabledIf
Prior to this commit, the DisabledIfCondition did not trim whitespace
from expressions configured via @DisabledIf. Consequently, results such
as " true " would evaluate to "false".
This commit fixes this problem by trimming all expressions configured
via @DisabledIf.
Issue:... | spring-test/src/main/java/org/springframework/test/context/junit/jupiter/DisabledIfCondition.java | @@ -82,9 +82,11 @@ private ConditionEvaluationResult evaluateDisabledIf(ExtensionContext extensionC
Optional<DisabledIf> disabledIf = findMergedAnnotation(element, DisabledIf.class);
Assert.state(disabledIf.isPresent(), () -> "@DisabledIf must be present on " + element);
- String expression = disabledIf.map(Di... | true |
Other | spring-projects | spring-framework | b6220cc19d3cb924f8a62c77977732ea5e8340dc.json | Trim expressions supplied to @DisabledIf
Prior to this commit, the DisabledIfCondition did not trim whitespace
from expressions configured via @DisabledIf. Consequently, results such
as " true " would evaluate to "false".
This commit fixes this problem by trimming all expressions configured
via @DisabledIf.
Issue:... | spring-test/src/test/java/org/springframework/test/context/junit/jupiter/DisabledIfTestCase.java | @@ -50,6 +50,12 @@ void disabledByStringTrue() {
fail("This test must be disabled");
}
+ @Test
+ @DisabledIf(" true ")
+ void disabledByStringTrueWithSurroundingWhitespace() {
+ fail("This test must be disabled");
+ }
+
@Test
@DisabledIf("TrUe")
void disabledByStringTrueIgnoreCase() {
@@ -62... | true |
Other | spring-projects | spring-framework | d6d05e8ca04b43abcd4d78004dd509517489abf4.json | Remove trailing whitespace in Java source code | spring-context/src/test/java/org/springframework/context/expression/FactoryBeanAccessTests.java | @@ -57,7 +57,7 @@ public void factoryBeanAccess() { // SPR9511
catch (BeanIsNotAFactoryException binafe) {
// success
}
-
+
// No such bean
try {
expr = new SpelExpressionParser().parseRaw("@truck"); | true |
Other | spring-projects | spring-framework | d6d05e8ca04b43abcd4d78004dd509517489abf4.json | Remove trailing whitespace in Java source code | spring-context/src/test/java/org/springframework/context/expression/MapAccessorTests.java | @@ -37,34 +37,34 @@ public class MapAccessorTests {
@Test
public void mapAccessorCompilable() {
Map<String, Object> testMap = getSimpleTestMap();
- StandardEvaluationContext sec = new StandardEvaluationContext();
+ StandardEvaluationContext sec = new StandardEvaluationContext();
sec.addPropertyAccessor(new... | true |
Other | spring-projects | spring-framework | d6d05e8ca04b43abcd4d78004dd509517489abf4.json | Remove trailing whitespace in Java source code | spring-core/src/main/java/org/springframework/core/convert/support/DefaultConversionService.java | @@ -129,7 +129,7 @@ private static void addScalarConverters(ConverterRegistry converterRegistry) {
converterRegistry.addConverterFactory(new StringToEnumConverterFactory());
converterRegistry.addConverter(new EnumToStringConverter((ConversionService) converterRegistry));
-
+
converterRegistry.addConverter... | true |
Other | spring-projects | spring-framework | d6d05e8ca04b43abcd4d78004dd509517489abf4.json | Remove trailing whitespace in Java source code | spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionServiceTests.java | @@ -244,22 +244,22 @@ public void testStringToEnumEmptyString() {
public void testEnumToString() {
assertEquals("BAR", conversionService.convert(Foo.BAR, String.class));
}
-
+
@Test
public void testIntegerToEnum() throws Exception {
assertEquals(Foo.BAR, conversionService.convert(0, Foo.class));
}
-
+... | true |
Other | spring-projects | spring-framework | d6d05e8ca04b43abcd4d78004dd509517489abf4.json | Remove trailing whitespace in Java source code | spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java | @@ -248,7 +248,7 @@ public void operatorInstanceOf_SPR14250() throws Exception {
assertEquals(false,expression.getValue());
assertCanCompile(expression);
assertEquals(false,expression.getValue());
-
+
// double slot left operand - should get boxed, return false
expression = parse("3.0d instanceof T(In... | true |
Other | spring-projects | spring-framework | d6d05e8ca04b43abcd4d78004dd509517489abf4.json | Remove trailing whitespace in Java source code | spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java | @@ -1964,7 +1964,7 @@ public void AccessingFactoryBean_spr9511() {
assertEquals("custard", expr.getValue(context));
expr = new SpelExpressionParser().parseRaw("&foo");
assertEquals("foo factory",expr.getValue(context));
-
+
try {
expr = new SpelExpressionParser().parseRaw("&@foo");
fail("Illegal sy... | true |
Other | spring-projects | spring-framework | d6d05e8ca04b43abcd4d78004dd509517489abf4.json | Remove trailing whitespace in Java source code | spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTestNGTests.java | @@ -72,7 +72,7 @@ public static Object[][] testData() {
{ AlwaysFailingAfterTestExecutionTestCase.class.getSimpleName(), 1, 0, 1, 0 },
{ AlwaysFailingAfterTestMethodTestCase.class.getSimpleName(), 1, 1, 0, 1 },
{ FailingBeforeTransactionTestCase.class.getSimpleName(), 1, 0, 0, 1 },
- { FailingAfterTransac... | true |
Other | spring-projects | spring-framework | d6d05e8ca04b43abcd4d78004dd509517489abf4.json | Remove trailing whitespace in Java source code | spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ExpressionValueMethodArgumentResolver.java | @@ -36,7 +36,7 @@
*/
public class ExpressionValueMethodArgumentResolver extends AbstractNamedValueMethodArgumentResolver {
-
+
/**
* @param beanFactory a bean factory to use for resolving ${...}
* placeholder and #{...} SpEL expressions in default values; | true |
Other | spring-projects | spring-framework | d6d05e8ca04b43abcd4d78004dd509517489abf4.json | Remove trailing whitespace in Java source code | spring-web-reactive/src/test/java/org/springframework/web/reactive/accept/CompositeContentTypeResolverBuilderTests.java | @@ -192,5 +192,5 @@ private ServerWebExchange createExchange(String path) throws URISyntaxException
WebSessionManager sessionManager = new MockWebSessionManager();
return new DefaultServerWebExchange(request, new MockServerHttpResponse(), sessionManager);
}
-
+
} | true |
Other | spring-projects | spring-framework | d6d05e8ca04b43abcd4d78004dd509517489abf4.json | Remove trailing whitespace in Java source code | spring-web-reactive/src/test/java/org/springframework/web/reactive/accept/MappingContentTypeResolverTests.java | @@ -98,7 +98,7 @@ public void resolveMediaTypesHandleNoMatch() throws Exception {
assertEquals("application/xml", mediaTypes.get(0).toString());
}
-
+
private static class TestMappingContentTypeResolver extends AbstractMappingContentTypeResolver {
private final String key; | true |
Other | spring-projects | spring-framework | d6d05e8ca04b43abcd4d78004dd509517489abf4.json | Remove trailing whitespace in Java source code | spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMappingTests.java | @@ -129,7 +129,7 @@ private ServerWebExchange createExchange(String path) throws URISyntaxException
@Configuration
static class WebConfig {
-
+
@Bean @SuppressWarnings("unused")
public SimpleUrlHandlerMapping handlerMapping() {
SimpleUrlHandlerMapping hm = new SimpleUrlHandlerMapping(); | true |
Other | spring-projects | spring-framework | d6d05e8ca04b43abcd4d78004dd509517489abf4.json | Remove trailing whitespace in Java source code | spring-web-reactive/src/test/java/org/springframework/web/reactive/result/condition/HeadersRequestConditionTests.java | @@ -57,7 +57,7 @@ public void headerEquals() {
public void headerPresent() throws Exception {
ServerWebExchange exchange = createExchange("Accept", "");
HeadersRequestCondition condition = new HeadersRequestCondition("accept");
-
+
assertNotNull(condition.getMatchingCondition(exchange));
}
| true |
Other | spring-projects | spring-framework | d6d05e8ca04b43abcd4d78004dd509517489abf4.json | Remove trailing whitespace in Java source code | spring-web/src/main/java/org/springframework/http/server/reactive/RxNettyServerHttpResponse.java | @@ -124,7 +124,7 @@ protected void writeCookies() {
We should revisit this code once
https://github.com/ReactiveX/RxNetty/issues/194 has been fixed.
-
+
@Override
public Mono<Void> writeWith(File file, long position, long count) { | true |
Other | spring-projects | spring-framework | d6d05e8ca04b43abcd4d78004dd509517489abf4.json | Remove trailing whitespace in Java source code | spring-web/src/test/java/org/springframework/http/codec/json/Jackson2JsonEncoderTests.java | @@ -102,7 +102,7 @@ public void jsonView() throws Exception {
.assertValuesWith(stringConsumer("{\"withView1\":\"with\"}"));
}
-
+
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
private static class ParentClass {
} | true |
Other | spring-projects | spring-framework | 9d21abcd37a3a6f7626418b67b529e6c1d0b1aa9.json | Introduce dedicated tests for DisabledIfCondition
This commit introduces tests for DisabledIfCondition that verify actual
condition evaluation results and exception handling; whereas, the
existing tests in DisabledIfTestCase only test the "happy paths" and
standard cases.
Issue: SPR-14614 | spring-test/src/test/java/org/springframework/test/context/junit/jupiter/DisabledIfConditionTestCase.java | @@ -0,0 +1,177 @@
+/*
+ * 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 | 9d21abcd37a3a6f7626418b67b529e6c1d0b1aa9.json | Introduce dedicated tests for DisabledIfCondition
This commit introduces tests for DisabledIfCondition that verify actual
condition evaluation results and exception handling; whereas, the
existing tests in DisabledIfTestCase only test the "happy paths" and
standard cases.
Issue: SPR-14614 | spring-test/src/test/java/org/springframework/test/context/junit/jupiter/DisabledIfTestCase.java | @@ -33,6 +33,7 @@
* @author Tadaya Tsuyukubo
* @author Sam Brannen
* @since 5.0
+ * @see DisabledIfConditionTestCase
* @see DisabledIf
* @see SpringExtension
*/ | true |
Other | spring-projects | spring-framework | 54d6f250e2c496a4c6ce82392418a962eca40991.json | Disallow empty expression in @DisabledIf
This commit ensures that a user provides a non-empty expression in
declarations of @DisabledIf.
Issue: SPR-14614 | spring-test/src/main/java/org/springframework/test/context/junit/jupiter/DisabledIfCondition.java | @@ -82,7 +82,9 @@ private ConditionEvaluationResult evaluateDisabledIf(ExtensionContext extensionC
Optional<DisabledIf> disabledIf = findMergedAnnotation(element, DisabledIf.class);
Assert.state(disabledIf.isPresent(), () -> "@DisabledIf must be present on " + element);
- String expression = disabledIf.get().e... | false |
Other | spring-projects | spring-framework | 899ebd8ee2e7acdc6bc0296d0c0db332cc4b43a5.json | Avoid collection lookups in StompCommand
Issue: SPR-14636 | spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompCommand.java | @@ -16,79 +16,76 @@
package org.springframework.messaging.simp.stomp;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
import org.springframework.messaging.simp.SimpMessageType;
/**
* Represents a STOMP command.
*
* @author Rossen Stoyanchev
+ * ... | true |
Other | spring-projects | spring-framework | 899ebd8ee2e7acdc6bc0296d0c0db332cc4b43a5.json | Avoid collection lookups in StompCommand
Issue: SPR-14636 | spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompCommandTests.java | @@ -0,0 +1,100 @@
+/*
+ * 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 | c03f6c6d8518cf3cccbe3648304d356d0833e9d1.json | Introduce @DisabledIf annotation for JUnit 5
This commit introduces @DisabledIf annotation that takes SpEL as a
condition. The condition is evaluated at run time whether to disable
JUnit 5 (Jupiter) test method/class.
Issue: SPR-14614 | spring-test/src/main/java/org/springframework/test/context/junit/jupiter/DisabledIf.java | @@ -0,0 +1,58 @@
+/*
+ * 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 | c03f6c6d8518cf3cccbe3648304d356d0833e9d1.json | Introduce @DisabledIf annotation for JUnit 5
This commit introduces @DisabledIf annotation that takes SpEL as a
condition. The condition is evaluated at run time whether to disable
JUnit 5 (Jupiter) test method/class.
Issue: SPR-14614 | spring-test/src/main/java/org/springframework/test/context/junit/jupiter/SpringExtension.java | @@ -16,28 +16,39 @@
package org.springframework.test.context.junit.jupiter;
+import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Constructor;
import java.lang.reflect.Executable;
import java.lang.reflect.Method;
import java.lang.reflect.Parameter;
+import java.util.Optional;
+import org.apach... | true |
Other | spring-projects | spring-framework | c03f6c6d8518cf3cccbe3648304d356d0833e9d1.json | Introduce @DisabledIf annotation for JUnit 5
This commit introduces @DisabledIf annotation that takes SpEL as a
condition. The condition is evaluated at run time whether to disable
JUnit 5 (Jupiter) test method/class.
Issue: SPR-14614 | spring-test/src/test/java/org/springframework/test/context/junit/jupiter/DisabledIfTestCase.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 | f2faf84f317fa01d7316cb77c8405c30570085cf.json | Add RFC5987 support for HTTP header field params
This commit adds support for HTTP header field parameters encoding, as
described in RFC5987.
Note that the default implementation still relies on US-ASCII encoding,
as the latest rfc7230 Section 3.2.4 says that:
> Newly defined header fields SHOULD limit their field va... | spring-core/src/main/java/org/springframework/util/StringUtils.java | @@ -16,6 +16,8 @@
package org.springframework.util;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -50,6 +52,7 @@
* @author Rick Evans
* @author Arjen Poutsma
* @author Sam Brannen
+ * @autho... | true |
Other | spring-projects | spring-framework | f2faf84f317fa01d7316cb77c8405c30570085cf.json | Add RFC5987 support for HTTP header field params
This commit adds support for HTTP header field parameters encoding, as
described in RFC5987.
Note that the default implementation still relies on US-ASCII encoding,
as the latest rfc7230 Section 3.2.4 says that:
> Newly defined header fields SHOULD limit their field va... | spring-core/src/test/java/org/springframework/util/StringUtilsTests.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,6 +16,7 @@
package org.springframewor... | true |
Other | spring-projects | spring-framework | f2faf84f317fa01d7316cb77c8405c30570085cf.json | Add RFC5987 support for HTTP header field params
This commit adds support for HTTP header field parameters encoding, as
described in RFC5987.
Note that the default implementation still relies on US-ASCII encoding,
as the latest rfc7230 Section 3.2.4 says that:
> Newly defined header fields SHOULD limit their field va... | spring-web/src/main/java/org/springframework/http/HttpHeaders.java | @@ -19,6 +19,7 @@
import java.io.Serializable;
import java.net.URI;
import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -672,12 +673,32 @@ public List<String> getConnection() {
* @param fi... | true |
Other | spring-projects | spring-framework | f2faf84f317fa01d7316cb77c8405c30570085cf.json | Add RFC5987 support for HTTP header field params
This commit adds support for HTTP header field parameters encoding, as
described in RFC5987.
Note that the default implementation still relies on US-ASCII encoding,
as the latest rfc7230 Section 3.2.4 says that:
> Newly defined header fields SHOULD limit their field va... | spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java | @@ -321,6 +321,11 @@ public void contentDisposition() {
headers.setContentDispositionFormData("name", "filename");
assertEquals("Invalid Content-Disposition header", "form-data; name=\"name\"; filename=\"filename\"",
headers.getFirst("Content-Disposition"));
+
+ headers.setContentDispositionFormData("name",... | true |
Other | spring-projects | spring-framework | 5a0a88c039dedaea184d85207facc710971396b2.json | Fix typo in reference manual regarding JSR 330 | src/asciidoc/testing.adoc | @@ -2769,7 +2769,7 @@ application context that you configured with `@ContextConfiguration`. You may us
injection, field injection, or both, depending on which annotations you choose and
whether you place them on setter methods or fields. For consistency with the annotation
support introduced in Spring 2.5 and 3.0, y... | false |
Other | spring-projects | spring-framework | d554229981381979d63c3228ae0195a376fa3b18.json | Fix incomplete log message
Commit 48236b from 2014 introduced a logging improvement to avoid
logging each removed session per line and instead log one line at
the end with all removed sessions ids. However that list of removed
session ids wasn't populated. This commit fixes that.
Issue: SPR-14111 | spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/TransportHandlingSockJsService.java | @@ -359,14 +359,15 @@ private void scheduleSessionTask() {
if (this.sessionCleanupTask != null) {
return;
}
- final List<String> removedSessionIds = new ArrayList<String>();
this.sessionCleanupTask = getTaskScheduler().scheduleAtFixedRate(new Runnable() {
@Override
public void run() {
+ ... | false |
Other | spring-projects | spring-framework | 996c1cc0a6112e542ca184c8fe6ffb680b630a40.json | Fix Auto-Startup for @JmsListener
Ignore container's auto-startup once the context is refreshed.
Issue: SPR-14015 | spring-jms/src/main/java/org/springframework/jms/config/JmsListenerEndpointRegistry.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.
@@ -26,10 +26,15 @@
import org.apache.commons.... | true |
Other | spring-projects | spring-framework | 996c1cc0a6112e542ca184c8fe6ffb680b630a40.json | Fix Auto-Startup for @JmsListener
Ignore container's auto-startup once the context is refreshed.
Issue: SPR-14015 | spring-jms/src/test/java/org/springframework/jms/annotation/EnableJmsTests.java | @@ -109,6 +109,31 @@ public void defaultContainerFactory() {
testDefaultContainerFactoryConfiguration(context);
}
+ @Test
+ public void containerAreStartedByDefault() {
+ ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(
+ EnableJmsDefaultContainerFactoryConfig.class, DefaultBe... | true |
Other | spring-projects | spring-framework | 996c1cc0a6112e542ca184c8fe6ffb680b630a40.json | Fix Auto-Startup for @JmsListener
Ignore container's auto-startup once the context is refreshed.
Issue: SPR-14015 | spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerTestFactory.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.
@@ -26,9 +26,15 @@
*/
public class JmsListen... | true |
Other | spring-projects | spring-framework | 996c1cc0a6112e542ca184c8fe6ffb680b630a40.json | Fix Auto-Startup for @JmsListener
Ignore container's auto-startup once the context is refreshed.
Issue: SPR-14015 | spring-jms/src/test/java/org/springframework/jms/config/MessageListenerTestContainer.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.
@@ -31,6 +31,8 @@
private final JmsListener... | true |
Other | spring-projects | spring-framework | 9e79b344ca02c7dd04d59f5c7567e29947b79c22.json | Implement review feedback.
Remove empty string optimization. Simplify test to use only Mono/Flux/TestSubscriber instead of mixing with RxJava. | spring-web-reactive/src/main/java/org/springframework/core/codec/support/StringDecoder.java | @@ -45,7 +45,6 @@
public class StringDecoder extends AbstractDecoder<String> {
public static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;
- public static final String EMPTY = "";
private final boolean reduceToSingleBuffer;
@@ -85,11 +84,6 @@ public Flux<String> decode(Publisher<DataBuffer> inputSt... | true |
Other | spring-projects | spring-framework | 9e79b344ca02c7dd04d59f5c7567e29947b79c22.json | Implement review feedback.
Remove empty string optimization. Simplify test to use only Mono/Flux/TestSubscriber instead of mixing with RxJava. | spring-web-reactive/src/test/java/org/springframework/core/codec/support/StringDecoderTests.java | @@ -95,12 +95,11 @@ public void decodeSingle() throws InterruptedException {
@Test
public void decodeEmpty() throws InterruptedException {
- Flux<DataBuffer> source = Flux.just(stringBuffer(""));
- Single<String> single = RxJava1SingleConverter.from(this.decoder.decode(source,
- ResolvableType.forClassWithGe... | true |
Other | spring-projects | spring-framework | f35ec5353a8205acb0f7e396314749c5e0731617.json | Add support for OkHttp3
OkHttp3 introduces a new package and API that is incompatible with
previous versions. This commit adds a new
OkHttp3ClientHttpRequestFactory and supporting classes. | build.gradle | @@ -64,6 +64,7 @@ configure(allprojects) { project ->
ext.jtaVersion = "1.2"
ext.junitVersion = "4.12"
ext.nettyVersion = "4.0.34.Final"
+ ext.okhttp3Version = "3.2.0"
ext.okhttpVersion = "2.7.5"
ext.openjpaVersion = "2.4.1"
ext.poiVersion = "3.14"
@... | true |
Other | spring-projects | spring-framework | f35ec5353a8205acb0f7e396314749c5e0731617.json | Add support for OkHttp3
OkHttp3 introduces a new package and API that is incompatible with
previous versions. This commit adds a new
OkHttp3ClientHttpRequestFactory and supporting classes. | spring-web/src/main/java/org/springframework/http/client/OkHttp3AsyncClientHttpRequest.java | @@ -0,0 +1,102 @@
+/*
+ * 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 | f35ec5353a8205acb0f7e396314749c5e0731617.json | Add support for OkHttp3
OkHttp3 introduces a new package and API that is incompatible with
previous versions. This commit adds a new
OkHttp3ClientHttpRequestFactory and supporting classes. | spring-web/src/main/java/org/springframework/http/client/OkHttp3ClientHttpRequest.java | @@ -0,0 +1,71 @@
+/*
+ * 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 | f35ec5353a8205acb0f7e396314749c5e0731617.json | Add support for OkHttp3
OkHttp3 introduces a new package and API that is incompatible with
previous versions. This commit adds a new
OkHttp3ClientHttpRequestFactory and supporting classes. | spring-web/src/main/java/org/springframework/http/client/OkHttp3ClientHttpRequestFactory.java | @@ -0,0 +1,155 @@
+/*
+ * 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 | f35ec5353a8205acb0f7e396314749c5e0731617.json | Add support for OkHttp3
OkHttp3 introduces a new package and API that is incompatible with
previous versions. This commit adds a new
OkHttp3ClientHttpRequestFactory and supporting classes. | spring-web/src/main/java/org/springframework/http/client/OkHttp3ClientHttpResponse.java | @@ -0,0 +1,82 @@
+/*
+ * 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 | f35ec5353a8205acb0f7e396314749c5e0731617.json | Add support for OkHttp3
OkHttp3 introduces a new package and API that is incompatible with
previous versions. This commit adds a new
OkHttp3ClientHttpRequestFactory and supporting classes. | spring-web/src/main/java/org/springframework/http/client/OkHttpAsyncClientHttpRequest.java | @@ -31,13 +31,14 @@
import org.springframework.util.concurrent.SettableListenableFuture;
/**
- * {@link AsyncClientHttpRequest} implementation that uses OkHttp to execute requests.
+ * {@link AsyncClientHttpRequest} implementation that uses OkHttp 2.x to execute requests.
*
* <p>Created via the {@link OkHttpCli... | true |
Other | spring-projects | spring-framework | f35ec5353a8205acb0f7e396314749c5e0731617.json | Add support for OkHttp3
OkHttp3 introduces a new package and API that is incompatible with
previous versions. This commit adds a new
OkHttp3ClientHttpRequestFactory and supporting classes. | spring-web/src/main/java/org/springframework/http/client/OkHttpClientHttpRequest.java | @@ -26,13 +26,14 @@
import org.springframework.http.HttpMethod;
/**
- * {@link ClientHttpRequest} implementation that uses OkHttp to execute requests.
+ * {@link ClientHttpRequest} implementation that uses OkHttp 2.x to execute requests.
*
* <p>Created via the {@link OkHttpClientHttpRequestFactory}.
*
* @au... | true |
Other | spring-projects | spring-framework | f35ec5353a8205acb0f7e396314749c5e0731617.json | Add support for OkHttp3
OkHttp3 introduces a new package and API that is incompatible with
previous versions. This commit adds a new
OkHttp3ClientHttpRequestFactory and supporting classes. | spring-web/src/main/java/org/springframework/http/client/OkHttpClientHttpRequestFactory.java | @@ -36,11 +36,12 @@
/**
* {@link ClientHttpRequestFactory} implementation that uses
- * <a href="http://square.github.io/okhttp/">OkHttp</a> to create requests.
+ * <a href="http://square.github.io/okhttp/">OkHttp</a> 2.x to create requests.
*
* @author Luciano Leggieri
* @author Arjen Poutsma
* @since 4.2... | true |
Other | spring-projects | spring-framework | f35ec5353a8205acb0f7e396314749c5e0731617.json | Add support for OkHttp3
OkHttp3 introduces a new package and API that is incompatible with
previous versions. This commit adds a new
OkHttp3ClientHttpRequestFactory and supporting classes. | spring-web/src/main/java/org/springframework/http/client/OkHttpClientHttpResponse.java | @@ -25,11 +25,12 @@
import org.springframework.util.Assert;
/**
- * {@link ClientHttpResponse} implementation based on OkHttp.
+ * {@link ClientHttpResponse} implementation based on OkHttp 2.x.
*
* @author Luciano Leggieri
* @author Arjen Poutsma
* @since 4.2
+ * @see org.springframework.http.client.OkHttp3... | true |
Other | spring-projects | spring-framework | f35ec5353a8205acb0f7e396314749c5e0731617.json | Add support for OkHttp3
OkHttp3 introduces a new package and API that is incompatible with
previous versions. This commit adds a new
OkHttp3ClientHttpRequestFactory and supporting classes. | spring-web/src/test/java/org/springframework/http/client/OkHttp3AsyncClientHttpRequestFactoryTests.java | @@ -0,0 +1,40 @@
+/*
+ * 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 | f35ec5353a8205acb0f7e396314749c5e0731617.json | Add support for OkHttp3
OkHttp3 introduces a new package and API that is incompatible with
previous versions. This commit adds a new
OkHttp3ClientHttpRequestFactory and supporting classes. | spring-web/src/test/java/org/springframework/http/client/OkHttp3ClientHttpRequestFactoryTests.java | @@ -0,0 +1,40 @@
+/*
+ * 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 | eec22f5072011259bee02cd23cd6d0692f1cb187.json | Avoid duplicate flush when closing outputstream
Prior to this commit, the `HttpInvokerServiceExporter` would close
its `ObjectOutputStream`, which itself issues duplicate flushes on the
underlying `OutputStream`. Duplicate flushes can lead to multiple,
separate TCP packets where those should be gathered writes.
This ... | spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerServiceExporter.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2012 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,6 +16,7 @@
package org.springframewor... | false |
Other | spring-projects | spring-framework | 4742aa0bfeaa96737baa407029fbddfd6bc16087.json | Test @JmsListener as a merged composed annotation
Issue: SPR-13973 | spring-jms/src/test/java/org/springframework/jms/annotation/EnableJmsTests.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,10 +16,14 @@
package org.springframew... | false |
Other | spring-projects | spring-framework | 862d10c1283152bd29e96ee63f11aef6bdf5c27c.json | Support new default values in WebDataBinder
Prior to this commit, binding a `@ModelAttribute` object as a Controller
handler paramater would instantiate the object and set all its
properties, fetching data from the request. When no data is available,
the WebDataBinder tries to bind default "empty" values:
* Boolean.FA... | spring-web/src/main/java/org/springframework/web/bind/WebDataBinder.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2013 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,11 +17,13 @@
package org.springframewor... | true |
Other | spring-projects | spring-framework | 862d10c1283152bd29e96ee63f11aef6bdf5c27c.json | Support new default values in WebDataBinder
Prior to this commit, binding a `@ModelAttribute` object as a Controller
handler paramater would instantiate the object and set all its
properties, fetching data from the request. When no data is available,
the WebDataBinder tries to bind default "empty" values:
* Boolean.FA... | spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.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,10 +16,15 @@
package org.springframew... | true |
Other | spring-projects | spring-framework | fc839331a7bd2064ed9bb215b5f5ff5259f05f21.json | Refine TestPropertySourceUtils for direct use
Update methods in TestPropertySourceUtils to accept var-args and allow
addInlinedProperties to be called more than once.
Issue: SPR-14088 | spring-test/src/main/java/org/springframework/test/context/support/TestPropertySourceUtils.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.
@@ -27,7 +27,6 @@
import org.apache.commons.... | true |
Other | spring-projects | spring-framework | fc839331a7bd2064ed9bb215b5f5ff5259f05f21.json | Refine TestPropertySourceUtils for direct use
Update methods in TestPropertySourceUtils to accept var-args and allow
addInlinedProperties to be called more than once.
Issue: SPR-14088 | spring-test/src/test/java/org/springframework/test/context/support/TestPropertySourceUtilsTests.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.
@@ -140,7 +140,7 @@ public void addInlinedPrope... | true |
Other | spring-projects | spring-framework | 065b7968a3c4a4c39e182a6c94c4804ce27860e8.json | Add defaultUriVariables property to RestTemplate
Issue: SPR-14147 | spring-web/src/main/java/org/springframework/web/client/AsyncRestTemplate.java | @@ -44,6 +44,7 @@
import org.springframework.util.Assert;
import org.springframework.util.concurrent.ListenableFuture;
import org.springframework.util.concurrent.ListenableFutureAdapter;
+import org.springframework.web.util.DefaultUriTemplateHandler;
import org.springframework.web.util.UriTemplateHandler;
/**
@@... | true |
Other | spring-projects | spring-framework | 065b7968a3c4a4c39e182a6c94c4804ce27860e8.json | Add defaultUriVariables property to RestTemplate
Issue: SPR-14147 | spring-web/src/main/java/org/springframework/web/client/RestTemplate.java | @@ -236,6 +236,25 @@ public ResponseErrorHandler getErrorHandler() {
return this.errorHandler;
}
+ /**
+ * Configure default URI variable values. This is a shortcut for:
+ * <pre class="code">
+ *
+ * DefaultUriTemplateHandler handler = new DefaultUriTemplateHandler();
+ * handler.setDefaultUriVariables(...... | true |
Other | spring-projects | spring-framework | 065b7968a3c4a4c39e182a6c94c4804ce27860e8.json | Add defaultUriVariables property to RestTemplate
Issue: SPR-14147 | spring-web/src/main/java/org/springframework/web/util/DefaultUriTemplateHandler.java | @@ -19,6 +19,7 @@
import java.io.UnsupportedEncodingException;
import java.net.URI;
import java.net.URISyntaxException;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -41,6 +42,7 @@ public class DefaultUriTemplateHandler implements UriTemplateHandler {
... | true |
Other | spring-projects | spring-framework | 065b7968a3c4a4c39e182a6c94c4804ce27860e8.json | Add defaultUriVariables property to RestTemplate
Issue: SPR-14147 | spring-web/src/test/java/org/springframework/web/util/DefaultUriTemplateHandlerTests.java | @@ -49,6 +49,22 @@ public void baseUrlWithPath() throws Exception {
assertEquals("http://localhost:8080/context/myapiresource", actual.toString());
}
+ @Test // SPR-14147
+ public void defaultUriVariables() throws Exception {
+ Map<String, String> defaultVars = new HashMap<>(2);
+ defaultVars.put("host", "api.... | true |
Other | spring-projects | spring-framework | 52c9b3b2353e2f8bfb2c6f277b5f059d688a8bfc.json | Introduce ResourceEncoder and ResourceDecoder
This commit introduces the ResourceEncoder and ResourceDecoder, and uses
these in ResourceHttpMessageConverter as a non-zero-copy fallback
method. | spring-web-reactive/src/main/java/org/springframework/core/codec/support/ResourceDecoder.java | @@ -0,0 +1,77 @@
+/*
+ * 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 | 52c9b3b2353e2f8bfb2c6f277b5f059d688a8bfc.json | Introduce ResourceEncoder and ResourceDecoder
This commit introduces the ResourceEncoder and ResourceDecoder, and uses
these in ResourceHttpMessageConverter as a non-zero-copy fallback
method. | spring-web-reactive/src/main/java/org/springframework/core/codec/support/ResourceEncoder.java | @@ -0,0 +1,78 @@
+/*
+ * 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 | 52c9b3b2353e2f8bfb2c6f277b5f059d688a8bfc.json | Introduce ResourceEncoder and ResourceDecoder
This commit introduces the ResourceEncoder and ResourceDecoder, and uses
these in ResourceHttpMessageConverter as a non-zero-copy fallback
method. | spring-web-reactive/src/main/java/org/springframework/core/codec/support/StringEncoder.java | @@ -45,7 +45,7 @@ public StringEncoder() {
@Override
public boolean canEncode(ResolvableType type, MimeType mimeType, Object... hints) {
Class<?> clazz = type.getRawClass();
- return (super.canEncode(type, mimeType, hints) && String.class.isAssignableFrom(clazz));
+ return (super.canEncode(type, mimeType, hint... | true |
Other | spring-projects | spring-framework | 52c9b3b2353e2f8bfb2c6f277b5f059d688a8bfc.json | Introduce ResourceEncoder and ResourceDecoder
This commit introduces the ResourceEncoder and ResourceDecoder, and uses
these in ResourceHttpMessageConverter as a non-zero-copy fallback
method. | spring-web-reactive/src/main/java/org/springframework/core/io/support/ResourceUtils2.java | @@ -0,0 +1,59 @@
+/*
+ * 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 | 52c9b3b2353e2f8bfb2c6f277b5f059d688a8bfc.json | Introduce ResourceEncoder and ResourceDecoder
This commit introduces the ResourceEncoder and ResourceDecoder, and uses
these in ResourceHttpMessageConverter as a non-zero-copy fallback
method. | spring-web-reactive/src/main/java/org/springframework/http/converter/reactive/CodecHttpMessageConverter.java | @@ -29,12 +29,16 @@
import org.springframework.core.codec.Encoder;
import org.springframework.core.io.buffer.DataBuffer;
import org.springframework.core.io.buffer.DataBufferAllocator;
+import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.http.ReactiveHt... | true |
Other | spring-projects | spring-framework | 52c9b3b2353e2f8bfb2c6f277b5f059d688a8bfc.json | Introduce ResourceEncoder and ResourceDecoder
This commit introduces the ResourceEncoder and ResourceDecoder, and uses
these in ResourceHttpMessageConverter as a non-zero-copy fallback
method. | spring-web-reactive/src/main/java/org/springframework/http/converter/reactive/ResourceHttpMessageConverter.java | @@ -18,117 +18,53 @@
import java.io.File;
import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.util.Collections;
-import java.util.List;
import java.util.Optional;
import org.reactivestreams.Publisher;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mon... | true |
Other | spring-projects | spring-framework | 52c9b3b2353e2f8bfb2c6f277b5f059d688a8bfc.json | Introduce ResourceEncoder and ResourceDecoder
This commit introduces the ResourceEncoder and ResourceDecoder, and uses
these in ResourceHttpMessageConverter as a non-zero-copy fallback
method. | spring-web-reactive/src/test/java/org/springframework/core/codec/support/ResourceDecoderTests.java | @@ -0,0 +1,80 @@
+/*
+ * 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 | 52c9b3b2353e2f8bfb2c6f277b5f059d688a8bfc.json | Introduce ResourceEncoder and ResourceDecoder
This commit introduces the ResourceEncoder and ResourceDecoder, and uses
these in ResourceHttpMessageConverter as a non-zero-copy fallback
method. | spring-web-reactive/src/test/java/org/springframework/core/codec/support/ResourceEncoderTests.java | @@ -0,0 +1,71 @@
+/*
+ * 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 | 8ca5b830b1699608e8afefef16b1668359fdd2fe.json | Remove dependency on WebUtils | spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/RequestMappingInfoHandlerMapping.java | @@ -27,6 +27,7 @@
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
+import java.util.StringTokenizer;
import java.util.stream.Collectors;
import org.springframework.http.HttpHeaders;
@@ -35,7 +36,9 @@
import org.springframework.http.MediaType;
import org.springframework.http.server.react... | true |
Other | spring-projects | spring-framework | 8ca5b830b1699608e8afefef16b1668359fdd2fe.json | Remove dependency on WebUtils | spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMapping.java | @@ -25,12 +25,9 @@
import org.springframework.stereotype.Controller;
import org.springframework.util.Assert;
import org.springframework.util.StringValueResolver;
-import org.springframework.web.accept.ContentNegotiationManager;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframewo... | true |
Other | spring-projects | spring-framework | 6b7360fed1741bd9f7208f993f1df0036e2137d6.json | Apply new ResponseStatusException hierarchy
This commit replaces use of the existing ServletException-based
exceptions with the new ones from ~.web.server. | spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerNotFoundException.java | @@ -1,30 +0,0 @@
-/*
- * 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 | 6b7360fed1741bd9f7208f993f1df0036e2137d6.json | Apply new ResponseStatusException hierarchy
This commit replaces use of the existing ServletException-based
exceptions with the new ones from ~.web.server. | spring-web-reactive/src/main/java/org/springframework/web/reactive/accept/AbstractMappingContentTypeResolver.java | @@ -29,7 +29,7 @@
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.util.StringUtils;
-import org.springframework.web.HttpMediaTypeNotAcceptableException;
+import org.springframework.web.server.NotAcceptableStatusException;
import org.spri... | true |
Other | spring-projects | spring-framework | 6b7360fed1741bd9f7208f993f1df0036e2137d6.json | Apply new ResponseStatusException hierarchy
This commit replaces use of the existing ServletException-based
exceptions with the new ones from ~.web.server. | spring-web-reactive/src/main/java/org/springframework/web/reactive/accept/CompositeContentTypeResolver.java | @@ -23,7 +23,7 @@
import org.springframework.http.MediaType;
import org.springframework.util.Assert;
-import org.springframework.web.HttpMediaTypeNotAcceptableException;
+import org.springframework.web.server.NotAcceptableStatusException;
import org.springframework.web.server.ServerWebExchange;
/**
@@ -71,7 +71... | true |
Other | spring-projects | spring-framework | 6b7360fed1741bd9f7208f993f1df0036e2137d6.json | Apply new ResponseStatusException hierarchy
This commit replaces use of the existing ServletException-based
exceptions with the new ones from ~.web.server. | spring-web-reactive/src/main/java/org/springframework/web/reactive/accept/ContentTypeResolver.java | @@ -18,7 +18,7 @@
import java.util.List;
import org.springframework.http.MediaType;
-import org.springframework.web.HttpMediaTypeNotAcceptableException;
+import org.springframework.web.server.NotAcceptableStatusException;
import org.springframework.web.server.ServerWebExchange;
/**
@@ -34,9 +34,8 @@ public inte... | true |
Other | spring-projects | spring-framework | 6b7360fed1741bd9f7208f993f1df0036e2137d6.json | Apply new ResponseStatusException hierarchy
This commit replaces use of the existing ServletException-based
exceptions with the new ones from ~.web.server. | spring-web-reactive/src/main/java/org/springframework/web/reactive/accept/HeaderContentTypeResolver.java | @@ -19,7 +19,7 @@
import org.springframework.http.InvalidMediaTypeException;
import org.springframework.http.MediaType;
-import org.springframework.web.HttpMediaTypeNotAcceptableException;
+import org.springframework.web.server.NotAcceptableStatusException;
import org.springframework.web.server.ServerWebExchange;
... | true |
Other | spring-projects | spring-framework | 6b7360fed1741bd9f7208f993f1df0036e2137d6.json | Apply new ResponseStatusException hierarchy
This commit replaces use of the existing ServletException-based
exceptions with the new ones from ~.web.server. | spring-web-reactive/src/main/java/org/springframework/web/reactive/accept/ParameterContentTypeResolver.java | @@ -23,7 +23,7 @@
import org.springframework.http.MediaType;
import org.springframework.util.Assert;
-import org.springframework.web.HttpMediaTypeNotAcceptableException;
+import org.springframework.web.server.NotAcceptableStatusException;
import org.springframework.web.server.ServerWebExchange;
/**
@@ -75,8 +75... | true |
Other | spring-projects | spring-framework | 6b7360fed1741bd9f7208f993f1df0036e2137d6.json | Apply new ResponseStatusException hierarchy
This commit replaces use of the existing ServletException-based
exceptions with the new ones from ~.web.server. | spring-web-reactive/src/main/java/org/springframework/web/reactive/accept/PathExtensionContentTypeResolver.java | @@ -31,8 +31,7 @@
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.StringUtils;
-import org.springframework.web.HttpMediaTypeNotAcceptableException;
-import org.springframework.web.accept.PathExtensionContentNegotiationStrategy;
+import org.springfra... | true |
Other | spring-projects | spring-framework | 6b7360fed1741bd9f7208f993f1df0036e2137d6.json | Apply new ResponseStatusException hierarchy
This commit replaces use of the existing ServletException-based
exceptions with the new ones from ~.web.server. | spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/AbstractMediaTypeExpression.java | @@ -20,9 +20,10 @@
import org.apache.commons.logging.LogFactory;
import org.springframework.http.MediaType;
-import org.springframework.web.HttpMediaTypeException;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.server.NotAcceptableStatusException;
import org.springf... | true |
Other | spring-projects | spring-framework | 6b7360fed1741bd9f7208f993f1df0036e2137d6.json | Apply new ResponseStatusException hierarchy
This commit replaces use of the existing ServletException-based
exceptions with the new ones from ~.web.server. | spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/ConsumesRequestCondition.java | @@ -26,9 +26,9 @@
import org.springframework.http.InvalidMediaTypeException;
import org.springframework.http.MediaType;
-import org.springframework.web.HttpMediaTypeNotSupportedException;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.server.ServerWebExchange;
+impor... | true |
Other | spring-projects | spring-framework | 6b7360fed1741bd9f7208f993f1df0036e2137d6.json | Apply new ResponseStatusException hierarchy
This commit replaces use of the existing ServletException-based
exceptions with the new ones from ~.web.server. | spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/ProducesRequestCondition.java | @@ -25,12 +25,12 @@
import java.util.Set;
import org.springframework.http.MediaType;
-import org.springframework.web.HttpMediaTypeNotAcceptableException;
import org.springframework.web.accept.ContentNegotiationManager;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.... | true |
Other | spring-projects | spring-framework | 6b7360fed1741bd9f7208f993f1df0036e2137d6.json | Apply new ResponseStatusException hierarchy
This commit replaces use of the existing ServletException-based
exceptions with the new ones from ~.web.server. | spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/RequestMappingInfoHandlerMapping.java | @@ -36,16 +36,16 @@
import org.springframework.http.server.reactive.ServerHttpRequest;
import org.springframework.util.CollectionUtils;
import org.springframework.util.MultiValueMap;
-import org.springframework.web.HttpMediaTypeNotAcceptableException;
-import org.springframework.web.HttpMediaTypeNotSupportedExceptio... | true |
Other | spring-projects | spring-framework | 6b7360fed1741bd9f7208f993f1df0036e2137d6.json | Apply new ResponseStatusException hierarchy
This commit replaces use of the existing ServletException-based
exceptions with the new ones from ~.web.server. | spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandler.java | @@ -42,11 +42,11 @@
import org.springframework.http.server.reactive.ServerHttpResponse;
import org.springframework.util.Assert;
import org.springframework.util.MimeType;
-import org.springframework.web.HttpMediaTypeNotAcceptableException;
import org.springframework.web.bind.annotation.ResponseBody;
import org.spri... | true |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.