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 | 7469159bf1ddbb0eac292388883fa1904f98d4f0.json | Add MessageSendingOperations for JMS
This commit adds a JMS implementation of MessageSendingOperations,
allowing to send JMS messages using Spring's standard Messaging
abstraction.
MessagingMessageConverter is a standard JMS's MessageConverter that
can convert Spring's Message to JMS message and vice versa. Existing
... | spring-messaging/src/main/java/org/springframework/messaging/core/MessageSendingOperations.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 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.
@@ -66,7 +66,7 @@
* Convert the given Object... | true |
Other | spring-projects | spring-framework | 7469159bf1ddbb0eac292388883fa1904f98d4f0.json | Add MessageSendingOperations for JMS
This commit adds a JMS implementation of MessageSendingOperations,
allowing to send JMS messages using Spring's standard Messaging
abstraction.
MessagingMessageConverter is a standard JMS's MessageConverter that
can convert Spring's Message to JMS message and vice versa. Existing
... | src/asciidoc/index.adoc | @@ -40428,6 +40428,10 @@ clear, the `JmsTemplate` is stateful, in that it maintains a reference to a
`ConnectionFactory`, but this state is __not__ conversational state.
====
+As of Spring Framework 4.1, `JmsMessagingTemplate` is built on top of `JmsTemplate`
+and provides an integration with the messaging abstract... | true |
Other | spring-projects | spring-framework | be0b69cbf1377e3fa8d8abc94f24274f4d0945b2.json | Add support for Jackson serialization views
Spring MVC now supports Jackon's serialization views for rendering
different subsets of the same POJO from different controller
methods (e.g. detailed page vs summary view).
Issue: SPR-7156 | spring-web/src/main/java/org/springframework/http/converter/MethodParameterHttpMessageConverter.java | @@ -0,0 +1,62 @@
+/*
+ * Copyright 2002-2014 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 | be0b69cbf1377e3fa8d8abc94f24274f4d0945b2.json | Add support for Jackson serialization views
Spring MVC now supports Jackon's serialization views for rendering
different subsets of the same POJO from different controller
methods (e.g. detailed page vs summary view).
Issue: SPR-7156 | spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java | @@ -244,6 +244,13 @@ public void setAutoDetectGettersSetters(boolean autoDetectGettersSetters) {
this.features.put(MapperFeature.AUTO_DETECT_SETTERS, autoDetectGettersSetters);
}
+ /**
+ * Shortcut for {@link MapperFeature#DEFAULT_VIEW_INCLUSION} option.
+ */
+ public void setDefaultViewInclusion(boolean defau... | true |
Other | spring-projects | spring-framework | be0b69cbf1377e3fa8d8abc94f24274f4d0945b2.json | Add support for Jackson serialization views
Spring MVC now supports Jackon's serialization views for rendering
different subsets of the same POJO from different controller
methods (e.g. detailed page vs summary view).
Issue: SPR-7156 | spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java | @@ -21,6 +21,7 @@
import java.nio.charset.Charset;
import java.util.concurrent.atomic.AtomicReference;
+import com.fasterxml.jackson.annotation.JsonView;
import com.fasterxml.jackson.core.JsonEncoding;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonProcessingException;
@@ ... | true |
Other | spring-projects | spring-framework | be0b69cbf1377e3fa8d8abc94f24274f4d0945b2.json | Add support for Jackson serialization views
Spring MVC now supports Jackon's serialization views for rendering
different subsets of the same POJO from different controller
methods (e.g. detailed page vs summary view).
Issue: SPR-7156 | spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonValueHolder.java | @@ -0,0 +1,60 @@
+/*
+ * Copyright 2002-2014 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 | be0b69cbf1377e3fa8d8abc94f24274f4d0945b2.json | Add support for Jackson serialization views
Spring MVC now supports Jackon's serialization views for rendering
different subsets of the same POJO from different controller
methods (e.g. detailed page vs summary view).
Issue: SPR-7156 | spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java | @@ -90,6 +90,7 @@ public void testUnknownFeature() {
public void testBooleanSetters() {
this.factory.setAutoDetectFields(false);
this.factory.setAutoDetectGettersSetters(false);
+ this.factory.setDefaultViewInclusion(false);
this.factory.setFailOnEmptyBeans(false);
this.factory.setIndentOutput(true);
... | true |
Other | spring-projects | spring-framework | be0b69cbf1377e3fa8d8abc94f24274f4d0945b2.json | Add support for Jackson serialization views
Spring MVC now supports Jackon's serialization views for rendering
different subsets of the same POJO from different controller
methods (e.g. detailed page vs summary view).
Issue: SPR-7156 | spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java | @@ -24,6 +24,7 @@
import java.util.List;
import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonView;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.Test;
@@ -237,6 +238,22 @@ public void prefixJsonCustom() throws Exception {
as... | true |
Other | spring-projects | spring-framework | be0b69cbf1377e3fa8d8abc94f24274f4d0945b2.json | Add support for Jackson serialization views
Spring MVC now supports Jackon's serialization views for rendering
different subsets of the same POJO from different controller
methods (e.g. detailed page vs summary view).
Issue: SPR-7156 | spring-web/src/test/java/org/springframework/web/client/AbstractJettyServerTestCase.java | @@ -56,7 +56,8 @@ public class AbstractJettyServerTestCase {
protected static String baseUrl;
- protected static MediaType contentType;
+ protected static MediaType textContentType;
+ protected static MediaType jsonContentType;
private static Server jettyServer;
@@ -67,14 +68,19 @@ public static void startJ... | true |
Other | spring-projects | spring-framework | be0b69cbf1377e3fa8d8abc94f24274f4d0945b2.json | Add support for Jackson serialization views
Spring MVC now supports Jackon's serialization views for rendering
different subsets of the same POJO from different controller
methods (e.g. detailed page vs summary view).
Issue: SPR-7156 | spring-web/src/test/java/org/springframework/web/client/AsyncRestTemplateIntegrationTests.java | @@ -63,7 +63,7 @@ public void getEntity() throws ExecutionException, InterruptedException {
ResponseEntity<String> entity = futureEntity.get();
assertEquals("Invalid content", helloWorld, entity.getBody());
assertFalse("No headers", entity.getHeaders().isEmpty());
- assertEquals("Invalid content-type", conten... | true |
Other | spring-projects | spring-framework | be0b69cbf1377e3fa8d8abc94f24274f4d0945b2.json | Add support for Jackson serialization views
Spring MVC now supports Jackon's serialization views for rendering
different subsets of the same POJO from different controller
methods (e.g. detailed page vs summary view).
Issue: SPR-7156 | spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java | @@ -23,6 +23,7 @@
import java.util.EnumSet;
import java.util.Set;
+import com.fasterxml.jackson.annotation.JsonView;
import org.junit.Before;
import org.junit.Test;
@@ -35,6 +36,7 @@
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.http.cli... | true |
Other | spring-projects | spring-framework | be0b69cbf1377e3fa8d8abc94f24274f4d0945b2.json | Add support for Jackson serialization views
Spring MVC now supports Jackon's serialization views for rendering
different subsets of the same POJO from different controller
methods (e.g. detailed page vs summary view).
Issue: SPR-7156 | spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java | @@ -29,6 +29,7 @@
import org.springframework.http.HttpOutputMessage;
import org.springframework.http.MediaType;
import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.MethodParameterHttpMessageConverter;
import org.springframework.http.server.ServletServerHttpRequ... | true |
Other | spring-projects | spring-framework | be0b69cbf1377e3fa8d8abc94f24274f4d0945b2.json | Add support for Jackson serialization views
Spring MVC now supports Jackon's serialization views for rendering
different subsets of the same POJO from different controller
methods (e.g. detailed page vs summary view).
Issue: SPR-7156 | spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java | @@ -26,6 +26,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.fasterxml.jackson.annotation.JsonView;
import com.fasterxml.jackson.core.JsonEncoding;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.ObjectMapper;
@@... | true |
Other | spring-projects | spring-framework | be0b69cbf1377e3fa8d8abc94f24274f4d0945b2.json | Add support for Jackson serialization views
Spring MVC now supports Jackon's serialization views for rendering
different subsets of the same POJO from different controller
methods (e.g. detailed page vs summary view).
Issue: SPR-7156 | spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java | @@ -21,6 +21,7 @@
import java.util.ArrayList;
import java.util.List;
+import com.fasterxml.jackson.annotation.JsonView;
import org.junit.Before;
import org.junit.Test;
@@ -47,6 +48,8 @@
import org.springframework.web.context.request.ServletWebRequest;
import org.springframework.web.method.HandlerMethod;
impo... | true |
Other | spring-projects | spring-framework | be0b69cbf1377e3fa8d8abc94f24274f4d0945b2.json | Add support for Jackson serialization views
Spring MVC now supports Jackon's serialization views for rendering
different subsets of the same POJO from different controller
methods (e.g. detailed page vs summary view).
Issue: SPR-7156 | spring-webmvc/src/test/java/org/springframework/web/servlet/view/ViewResolverTests.java | @@ -132,12 +132,12 @@ private void doTestUrlBasedViewResolverWithoutPrefixes(UrlBasedViewResolver vr)
View view = vr.resolveViewName("example1", Locale.getDefault());
assertEquals("Correct view class", JstlView.class, view.getClass());
assertEquals("Correct URL", "example1", ((InternalResourceView) view).getUr... | true |
Other | spring-projects | spring-framework | be0b69cbf1377e3fa8d8abc94f24274f4d0945b2.json | Add support for Jackson serialization views
Spring MVC now supports Jackon's serialization views for rendering
different subsets of the same POJO from different controller
methods (e.g. detailed page vs summary view).
Issue: SPR-7156 | spring-webmvc/src/test/java/org/springframework/web/servlet/view/json/MappingJackson2JsonViewTests.java | @@ -23,6 +23,7 @@
import java.util.Map;
import java.util.Set;
+import com.fasterxml.jackson.annotation.JsonView;
import org.junit.Before;
import org.junit.Test;
import org.mozilla.javascript.Context;
@@ -274,21 +275,43 @@ public void filterTwoKeyModel() throws Exception {
assertSame(bean2, ((Map) actual).get(... | true |
Other | spring-projects | spring-framework | be0b69cbf1377e3fa8d8abc94f24274f4d0945b2.json | Add support for Jackson serialization views
Spring MVC now supports Jackon's serialization views for rendering
different subsets of the same POJO from different controller
methods (e.g. detailed page vs summary view).
Issue: SPR-7156 | src/asciidoc/index.adoc | @@ -29853,6 +29853,76 @@ Check out the
{javadoc-baseurl}/org/springframework/web/bind/annotation/ControllerAdvice.html[`@ControllerAdvice`
documentation] for more details.
+[[mvc-ann-jsonview]]
+===== Jackson Serialization View Support
+
+It can sometimes be useful to filter contextually the object that will be ser... | true |
Other | spring-projects | spring-framework | 8614df8bd44a8c972247da421800e1f7d1d67fcd.json | Add error code for SAP Hana
This commit adds a SQLErrorCodes instance for SAP DB, based on a
contribution from Andrew Clemons
Mostly based on SAP Hana SPS 07 with a few additional codes that are
only present is previous versions:
* -813 - Cannot connect to host somehost:30115 [Connection refused]
* -709 - Unknown ho... | spring-jdbc/src/main/resources/org/springframework/jdbc/support/sql-error-codes.xml | @@ -248,4 +248,44 @@
</property>
</bean>
+ <!-- http://help.sap.com/saphelp_hanaplatform/helpdata/en/20/a78d3275191014b41bae7c4a46d835/content.htm -->
+ <bean id="Hana" class="org.springframework.jdbc.support.SQLErrorCodes">
+ <property name="databaseProductName">
+ <value>SAP DB</value>
+ </property>
+ <pr... | true |
Other | spring-projects | spring-framework | 8614df8bd44a8c972247da421800e1f7d1d67fcd.json | Add error code for SAP Hana
This commit adds a SQLErrorCodes instance for SAP DB, based on a
contribution from Andrew Clemons
Mostly based on SAP Hana SPS 07 with a few additional codes that are
only present is previous versions:
* -813 - Cannot connect to host somehost:30115 [Connection refused]
* -709 - Unknown ho... | spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 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.
@@ -36,6 +36,7 @@
*
* @author Rod Johnson
... | true |
Other | spring-projects | spring-framework | 6560aed1c85eef68faeb0356c34e12035a2826bf.json | Avoid JMSException in listener execution
This commit avoids throwing JMSException from the listener execution
as this is not allowed per spec. Our SessionAwareMessageListener
gives a callback that can throw JMSException and we have "abused" it
so far.
Typical message processing goes in those 3 steps:
* Unmarshall the... | spring-jms/src/main/java/org/springframework/jms/listener/adapter/AbstractAdaptableMessageListener.java | @@ -221,14 +221,19 @@ protected void handleListenerException(Throwable ex) {
* @param message the JMS {@code Message}
* @return the content of the message, to be passed into the
* listener method as argument
- * @throws JMSException if thrown by JMS API methods
+ * @throws MessageConversionException if the m... | true |
Other | spring-projects | spring-framework | 6560aed1c85eef68faeb0356c34e12035a2826bf.json | Avoid JMSException in listener execution
This commit avoids throwing JMSException from the listener execution
as this is not allowed per spec. Our SessionAwareMessageListener
gives a callback that can throw JMSException and we have "abused" it
so far.
Typical message processing goes in those 3 steps:
* Unmarshall the... | spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapter.java | @@ -60,31 +60,21 @@ public void setHandlerMethod(InvocableHandlerMethod handlerMethod) {
@Override
public void onMessage(javax.jms.Message jmsMessage, Session session) throws JMSException {
- try {
- Message<?> message = toMessagingMessage(jmsMessage);
- if (logger.isDebugEnabled()) {
- logger.debug("Proc... | true |
Other | spring-projects | spring-framework | 6560aed1c85eef68faeb0356c34e12035a2826bf.json | Avoid JMSException in listener execution
This commit avoids throwing JMSException from the listener execution
as this is not allowed per spec. Our SessionAwareMessageListener
gives a callback that can throw JMSException and we have "abused" it
so far.
Typical message processing goes in those 3 steps:
* Unmarshall the... | spring-jms/src/main/java/org/springframework/jms/listener/adapter/ReplyFailureException.java | @@ -0,0 +1,33 @@
+/*
+ * Copyright 2002-2014 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 | 6560aed1c85eef68faeb0356c34e12035a2826bf.json | Avoid JMSException in listener execution
This commit avoids throwing JMSException from the listener execution
as this is not allowed per spec. Our SessionAwareMessageListener
gives a callback that can throw JMSException and we have "abused" it
so far.
Typical message processing goes in those 3 steps:
* Unmarshall the... | spring-jms/src/test/java/org/springframework/jms/config/MethodJmsListenerEndpointTests.java | @@ -46,6 +46,7 @@
import org.springframework.jms.listener.DefaultMessageListenerContainer;
import org.springframework.jms.listener.MessageListenerContainer;
import org.springframework.jms.listener.SimpleMessageListenerContainer;
+import org.springframework.jms.listener.adapter.ReplyFailureException;
import org.spri... | true |
Other | spring-projects | spring-framework | 6560aed1c85eef68faeb0356c34e12035a2826bf.json | Avoid JMSException in listener execution
This commit avoids throwing JMSException from the listener execution
as this is not allowed per spec. Our SessionAwareMessageListener
gives a callback that can throw JMSException and we have "abused" it
so far.
Typical message processing goes in those 3 steps:
* Unmarshall the... | spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java | @@ -306,8 +306,10 @@ protected Object extractMessage(Message message) {
};
try {
adapter.onMessage(sentTextMessage, session);
- fail("expected InvalidDestinationException");
- } catch(InvalidDestinationException ex) { /* expected */ }
+ fail("expected CouldNotSendReplyException with InvalidDestinationExc... | true |
Other | spring-projects | spring-framework | 6560aed1c85eef68faeb0356c34e12035a2826bf.json | Avoid JMSException in listener execution
This commit avoids throwing JMSException from the listener execution
as this is not allowed per spec. Our SessionAwareMessageListener
gives a callback that can throw JMSException and we have "abused" it
so far.
Typical message processing goes in those 3 steps:
* Unmarshall the... | spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapterTests.java | @@ -34,6 +34,7 @@
import org.springframework.jms.config.DefaultJmsHandlerMethodFactory;
import org.springframework.jms.support.converter.JmsHeaders;
import org.springframework.messaging.Message;
+import org.springframework.messaging.converter.MessageConversionException;
import org.springframework.messaging.support.... | true |
Other | spring-projects | spring-framework | a072b3f20dba0f9b32b5a3936114b3a9c1aef839.json | Fix RestTemplate documentation for gzip encoding
Prior to this commit, RestTemplate's documentation advised to a
DecompressingHttpClient decorator along with Apache's HttpClient in
order to support gzipped responses.
Since this is now deprecated as of Apache HttpClient 4.3+, this commits
update the documentation with... | src/asciidoc/index.adoc | @@ -39694,15 +39694,15 @@ the `RestTemplate` as follows:
[TIP]
====
-Apache HttpClient supports gzip encoding via the `DecompressingHttpClient`. To use it,
+Apache HttpClient supports gzip encoding. To use it,
construct a `HttpComponentsClientHttpRequestFactory` like so:
[source,java,indent=0]
[subs="verbatim,... | false |
Other | spring-projects | spring-framework | eb65a37f4b690ba26b04cc8ba2be0a74ea402bca.json | Provide builder for ResponseEntity
This commit introduces a ResponseEntityBuilder, which allows for
building of a ResponseEntity through a fluent API.
Issue: SPR-11752 | spring-web/src/main/java/org/springframework/http/ResponseEntityBuilder.java | @@ -0,0 +1,286 @@
+/*
+ * Copyright 2002-2014 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 | eb65a37f4b690ba26b04cc8ba2be0a74ea402bca.json | Provide builder for ResponseEntity
This commit introduces a ResponseEntityBuilder, which allows for
building of a ResponseEntity through a fluent API.
Issue: SPR-11752 | spring-web/src/test/java/org/springframework/http/ResponseEntityBuilderTests.java | @@ -0,0 +1,133 @@
+/*
+ * Copyright 2002-2014 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 | 2c4cbb617e96c7f400abe6bf136df120320ea8a0.json | Add WebSocket scope
This change adds support for a custom "websocket" scope.
WebSocket-scoped beans may be injected into controllers with message
handling methods as well as channel interceptor registered on the
"inboundClientChannel".
Issue: SPR-11305 | spring-messaging/src/main/java/org/springframework/messaging/simp/SimpAttributes.java | @@ -0,0 +1,209 @@
+/*
+ * Copyright 2002-2014 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 | 2c4cbb617e96c7f400abe6bf136df120320ea8a0.json | Add WebSocket scope
This change adds support for a custom "websocket" scope.
WebSocket-scoped beans may be injected into controllers with message
handling methods as well as channel interceptor registered on the
"inboundClientChannel".
Issue: SPR-11305 | spring-messaging/src/main/java/org/springframework/messaging/simp/SimpAttributesContextHolder.java | @@ -0,0 +1,92 @@
+/*
+ * Copyright 2002-2014 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 | 2c4cbb617e96c7f400abe6bf136df120320ea8a0.json | Add WebSocket scope
This change adds support for a custom "websocket" scope.
WebSocket-scoped beans may be injected into controllers with message
handling methods as well as channel interceptor registered on the
"inboundClientChannel".
Issue: SPR-11305 | spring-messaging/src/main/java/org/springframework/messaging/simp/SimpSessionScope.java | @@ -0,0 +1,81 @@
+/*
+ * Copyright 2002-2014 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 | 2c4cbb617e96c7f400abe6bf136df120320ea8a0.json | Add WebSocket scope
This change adds support for a custom "websocket" scope.
WebSocket-scoped beans may be injected into controllers with message
handling methods as well as channel interceptor registered on the
"inboundClientChannel".
Issue: SPR-11305 | spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandler.java | @@ -52,6 +52,8 @@
import org.springframework.messaging.handler.invocation.AbstractMethodMessageHandler;
import org.springframework.messaging.handler.invocation.HandlerMethodArgumentResolver;
import org.springframework.messaging.handler.invocation.HandlerMethodReturnValueHandler;
+import org.springframework.messaging... | true |
Other | spring-projects | spring-framework | 2c4cbb617e96c7f400abe6bf136df120320ea8a0.json | Add WebSocket scope
This change adds support for a custom "websocket" scope.
WebSocket-scoped beans may be injected into controllers with message
handling methods as well as channel interceptor registered on the
"inboundClientChannel".
Issue: SPR-11305 | spring-messaging/src/test/java/org/springframework/messaging/simp/SimpAttributesContextHolderTests.java | @@ -0,0 +1,132 @@
+/*
+ * Copyright 2002-2014 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 | 2c4cbb617e96c7f400abe6bf136df120320ea8a0.json | Add WebSocket scope
This change adds support for a custom "websocket" scope.
WebSocket-scoped beans may be injected into controllers with message
handling methods as well as channel interceptor registered on the
"inboundClientChannel".
Issue: SPR-11305 | spring-messaging/src/test/java/org/springframework/messaging/simp/SimpAttributesTests.java | @@ -0,0 +1,138 @@
+/*
+ * Copyright 2002-2014 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 | 2c4cbb617e96c7f400abe6bf136df120320ea8a0.json | Add WebSocket scope
This change adds support for a custom "websocket" scope.
WebSocket-scoped beans may be injected into controllers with message
handling methods as well as channel interceptor registered on the
"inboundClientChannel".
Issue: SPR-11305 | spring-messaging/src/test/java/org/springframework/messaging/simp/SimpSessionScopeTests.java | @@ -0,0 +1,105 @@
+/*
+ * Copyright 2002-2014 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 | 2c4cbb617e96c7f400abe6bf136df120320ea8a0.json | Add WebSocket scope
This change adds support for a custom "websocket" scope.
WebSocket-scoped beans may be injected into controllers with message
handling methods as well as channel interceptor registered on the
"inboundClientChannel".
Issue: SPR-11305 | spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandlerTests.java | @@ -18,6 +18,7 @@
import java.util.LinkedHashMap;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import org.junit.Before;
import org.junit.Test;
@@ -28,6 +29,8 @@
import org.springframework.messaging.SubscribableChannel;
import org.springframework.messaging.handler.annotation.*;
import... | true |
Other | spring-projects | spring-framework | 2c4cbb617e96c7f400abe6bf136df120320ea8a0.json | Add WebSocket scope
This change adds support for a custom "websocket" scope.
WebSocket-scoped beans may be injected into controllers with message
handling methods as well as channel interceptor registered on the
"inboundClientChannel".
Issue: SPR-11305 | spring-messaging/src/test/java/org/springframework/messaging/simp/config/MessageBrokerConfigurationTests.java | @@ -20,6 +20,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
import org.hamcrest.Matchers;
import org.junit.Before;
@@ -141,6 +142,7 @@ public void clientOutboundChannelUsedByAnnotatedMethod() {
StompHeaderAccessor headers = StompH... | true |
Other | spring-projects | spring-framework | 2c4cbb617e96c7f400abe6bf136df120320ea8a0.json | Add WebSocket scope
This change adds support for a custom "websocket" scope.
WebSocket-scoped beans may be injected into controllers with message
handling methods as well as channel interceptor registered on the
"inboundClientChannel".
Issue: SPR-11305 | spring-websocket/src/main/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParser.java | @@ -17,8 +17,12 @@
package org.springframework.web.socket.config;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
+import java.util.Map;
+import org.springframework.beans.factory.config.CustomScopeConfigurer;
+import org.springframework.messaging.simp.SimpSessionScope;
import org.... | true |
Other | spring-projects | spring-framework | 2c4cbb617e96c7f400abe6bf136df120320ea8a0.json | Add WebSocket scope
This change adds support for a custom "websocket" scope.
WebSocket-scoped beans may be injected into controllers with message
handling methods as well as channel interceptor registered on the
"inboundClientChannel".
Issue: SPR-11305 | spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/EnableWebSocket.java | @@ -58,6 +58,6 @@
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
@Documented
-@Import(DelegatingWebSocketConfiguration.class)
+@Import({DelegatingWebSocketConfiguration.class, WebSocketScopeConfiguration.class})
public @interface EnableWebSocket {
} | true |
Other | spring-projects | spring-framework | 2c4cbb617e96c7f400abe6bf136df120320ea8a0.json | Add WebSocket scope
This change adds support for a custom "websocket" scope.
WebSocket-scoped beans may be injected into controllers with message
handling methods as well as channel interceptor registered on the
"inboundClientChannel".
Issue: SPR-11305 | spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurationSupport.java | @@ -16,14 +16,18 @@
package org.springframework.web.socket.config.annotation;
+import org.springframework.beans.factory.config.CustomScopeConfigurer;
import org.springframework.context.annotation.Bean;
+import org.springframework.messaging.simp.SimpSessionScope;
import org.springframework.messaging.simp.config.A... | true |
Other | spring-projects | spring-framework | 2c4cbb617e96c7f400abe6bf136df120320ea8a0.json | Add WebSocket scope
This change adds support for a custom "websocket" scope.
WebSocket-scoped beans may be injected into controllers with message
handling methods as well as channel interceptor registered on the
"inboundClientChannel".
Issue: SPR-11305 | spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketScopeConfiguration.java | @@ -0,0 +1,39 @@
+/*
+ * Copyright 2002-2014 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 | 2c4cbb617e96c7f400abe6bf136df120320ea8a0.json | Add WebSocket scope
This change adds support for a custom "websocket" scope.
WebSocket-scoped beans may be injected into controllers with message
handling methods as well as channel interceptor registered on the
"inboundClientChannel".
Issue: SPR-11305 | spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java | @@ -33,6 +33,8 @@
import org.springframework.context.ApplicationEventPublisherAware;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
+import org.springframework.messaging.simp.SimpAttributes;
+import org.springframework.messaging.simp.SimpAttributesContextHolder;
i... | true |
Other | spring-projects | spring-framework | 2c4cbb617e96c7f400abe6bf136df120320ea8a0.json | Add WebSocket scope
This change adds support for a custom "websocket" scope.
WebSocket-scoped beans may be injected into controllers with message
handling methods as well as channel interceptor registered on the
"inboundClientChannel".
Issue: SPR-11305 | spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java | @@ -26,6 +26,7 @@
import org.springframework.beans.DirectFieldAccessor;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.beans.factory.config.CustomScopeConfigurer;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.c... | true |
Other | spring-projects | spring-framework | 2c4cbb617e96c7f400abe6bf136df120320ea8a0.json | Add WebSocket scope
This change adds support for a custom "websocket" scope.
WebSocket-scoped beans may be injected into controllers with message
handling methods as well as channel interceptor registered on the
"inboundClientChannel".
Issue: SPR-11305 | spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolHandlerTests.java | @@ -31,6 +31,8 @@
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
+import org.springframework.messaging.simp.SimpAttributes;
+import org.springframework.messaging.simp.SimpAttributesContextHolder;
import... | true |
Other | spring-projects | spring-framework | 2c4cbb617e96c7f400abe6bf136df120320ea8a0.json | Add WebSocket scope
This change adds support for a custom "websocket" scope.
WebSocket-scoped beans may be injected into controllers with message
handling methods as well as channel interceptor registered on the
"inboundClientChannel".
Issue: SPR-11305 | spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompWebSocketIntegrationTests.java | @@ -34,6 +34,8 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Scope;
+import org.springframework.context.annotation.ScopedProxyMode;
import... | true |
Other | spring-projects | spring-framework | 2c4cbb617e96c7f400abe6bf136df120320ea8a0.json | Add WebSocket scope
This change adds support for a custom "websocket" scope.
WebSocket-scoped beans may be injected into controllers with message
handling methods as well as channel interceptor registered on the
"inboundClientChannel".
Issue: SPR-11305 | src/asciidoc/index.adoc | @@ -38140,7 +38140,7 @@ the message being handled through the `@SendToUser` annotation:
[subs="verbatim,quotes"]
----
@Controller
-public class MyController {
+public class PortfolioController {
@MessageMapping("/trade")
@SendToUser("/queue/position-updates")
@@ -38270,6 +38270,77 @@ implement their own ... | true |
Other | spring-projects | spring-framework | 89fc3c02572dbe2bb3f8678a43fb37166f376515.json | Add BackOffExecution to isolate state
This commit separates the BackOff configuration from an actual
execution. BackOffExecution now contains all the state of a
particular execution and BackOff is only meant to start (i.e.
create) a new execution.
The method "reset" has been removed as its no longer necessary:
... | spring-core/src/main/java/org/springframework/util/BackOff.java | @@ -17,16 +17,19 @@
package org.springframework.util;
/**
- * Indicate the rate at which an operation should be retried.
+ * Provide a {@link BackOffExecution} that indicates the rate at which
+ * an operation should be retried.
*
* <p>Users of this interface are expected to use it like this:
*
* <pre class... | true |
Other | spring-projects | spring-framework | 89fc3c02572dbe2bb3f8678a43fb37166f376515.json | Add BackOffExecution to isolate state
This commit separates the BackOff configuration from an actual
execution. BackOffExecution now contains all the state of a
particular execution and BackOff is only meant to start (i.e.
create) a new execution.
The method "reset" has been removed as its no longer necessary:
... | spring-core/src/main/java/org/springframework/util/BackOffExecution.java | @@ -0,0 +1,43 @@
+/*
+ * Copyright 2002-2014 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 | 89fc3c02572dbe2bb3f8678a43fb37166f376515.json | Add BackOffExecution to isolate state
This commit separates the BackOff configuration from an actual
execution. BackOffExecution now contains all the state of a
particular execution and BackOff is only meant to start (i.e.
create) a new execution.
The method "reset" has been removed as its no longer necessary:
... | spring-core/src/main/java/org/springframework/util/ExponentialBackOff.java | @@ -44,7 +44,8 @@
*
* Note that the default max elapsed time is {@link Long#MAX_VALUE}. Use
* {@link #setMaxElapsedTime(long)} to limit the maximum number of time
- * that an instance should accumulate before returning {@link BackOff#STOP}.
+ * that an instance should accumulate before returning
+ * {@link BackOf... | true |
Other | spring-projects | spring-framework | 89fc3c02572dbe2bb3f8678a43fb37166f376515.json | Add BackOffExecution to isolate state
This commit separates the BackOff configuration from an actual
execution. BackOffExecution now contains all the state of a
particular execution and BackOff is only meant to start (i.e.
create) a new execution.
The method "reset" has been removed as its no longer necessary:
... | spring-core/src/main/java/org/springframework/util/FixedBackOff.java | @@ -39,7 +39,6 @@ public class FixedBackOff implements BackOff {
private long maxAttempts = UNLIMITED_ATTEMPTS;
- private long currentAttempts = 0;
/**
* Create an instance with an interval of {@value #DEFAULT_INTERVAL}
@@ -87,31 +86,38 @@ public long getMaxAttempts() {
}
@Override
- public long next... | true |
Other | spring-projects | spring-framework | 89fc3c02572dbe2bb3f8678a43fb37166f376515.json | Add BackOffExecution to isolate state
This commit separates the BackOff configuration from an actual
execution. BackOffExecution now contains all the state of a
particular execution and BackOff is only meant to start (i.e.
create) a new execution.
The method "reset" has been removed as its no longer necessary:
... | spring-core/src/test/java/org/springframework/util/ExponentialBackOffTests.java | @@ -34,64 +34,73 @@ public class ExponentialBackOffTests {
@Test
public void defaultInstance() {
ExponentialBackOff backOff = new ExponentialBackOff();
- assertEquals(2000l, backOff.nextBackOff());
- assertEquals(3000l, backOff.nextBackOff());
- assertEquals(4500l, backOff.nextBackOff());
+ BackOffExecution ... | true |
Other | spring-projects | spring-framework | 89fc3c02572dbe2bb3f8678a43fb37166f376515.json | Add BackOffExecution to isolate state
This commit separates the BackOff configuration from an actual
execution. BackOffExecution now contains all the state of a
particular execution and BackOff is only meant to start (i.e.
create) a new execution.
The method "reset" has been removed as its no longer necessary:
... | spring-core/src/test/java/org/springframework/util/FixedBackOffTests.java | @@ -28,57 +28,62 @@ public class FixedBackOffTests {
@Test
public void defaultInstance() {
FixedBackOff backOff = new FixedBackOff();
+ BackOffExecution execution = backOff.start();
for (int i = 0; i < 100; i++) {
- assertEquals(FixedBackOff.DEFAULT_INTERVAL, backOff.nextBackOff());
+ assertEquals(FixedB... | true |
Other | spring-projects | spring-framework | 89fc3c02572dbe2bb3f8678a43fb37166f376515.json | Add BackOffExecution to isolate state
This commit separates the BackOff configuration from an actual
execution. BackOffExecution now contains all the state of a
particular execution and BackOff is only meant to start (i.e.
create) a new execution.
The method "reset" has been removed as its no longer necessary:
... | spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java | @@ -35,6 +35,7 @@
import org.springframework.scheduling.SchedulingTaskExecutor;
import org.springframework.util.Assert;
import org.springframework.util.BackOff;
+import org.springframework.util.BackOffExecution;
import org.springframework.util.ClassUtils;
import org.springframework.util.FixedBackOff;
@@ -221,8 +... | true |
Other | spring-projects | spring-framework | 89fc3c02572dbe2bb3f8678a43fb37166f376515.json | Add BackOffExecution to isolate state
This commit separates the BackOff configuration from an actual
execution. BackOffExecution now contains all the state of a
particular execution and BackOff is only meant to start (i.e.
create) a new execution.
The method "reset" has been removed as its no longer necessary:
... | spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-4.1.xsd | @@ -322,7 +322,7 @@
<xsd:annotation>
<xsd:documentation><![CDATA[
Specify the BackOff instance to use to compute the interval between recovery
- attempts. If the BackOff implementation returns "BackOff#STOP", the listener
+ attempts. If the BackOff implementation returns "BackOffExecution#STOP", the lis... | true |
Other | spring-projects | spring-framework | 89fc3c02572dbe2bb3f8678a43fb37166f376515.json | Add BackOffExecution to isolate state
This commit separates the BackOff configuration from an actual
execution. BackOffExecution now contains all the state of a
particular execution and BackOff is only meant to start (i.e.
create) a new execution.
The method "reset" has been removed as its no longer necessary:
... | spring-jms/src/test/java/org/springframework/jms/listener/DefaultMessageListenerContainerTests.java | @@ -29,6 +29,7 @@
import org.mockito.stubbing.Answer;
import org.springframework.util.BackOff;
+import org.springframework.util.BackOffExecution;
/**
*
@@ -39,7 +40,9 @@ public class DefaultMessageListenerContainerTests {
@Test
public void applyBackOff() {
BackOff mock = mock(BackOff.class);
- given(mo... | true |
Other | spring-projects | spring-framework | 89fc3c02572dbe2bb3f8678a43fb37166f376515.json | Add BackOffExecution to isolate state
This commit separates the BackOff configuration from an actual
execution. BackOffExecution now contains all the state of a
particular execution and BackOff is only meant to start (i.e.
create) a new execution.
The method "reset" has been removed as its no longer necessary:
... | src/asciidoc/index.adoc | @@ -41433,10 +41433,10 @@ choices and message redelivery scenarios.
| back-off
| Specify the `BackOff` instance to use to compute the interval between recovery
- attempts. If the `BackOff` implementation returns `BackOff#STOP`, the listener
- container will not further attempt to recover. The `recovery-interval v... | true |
Other | spring-projects | spring-framework | 580e52372f61e67d1fd627f544189646dcc18f48.json | Add support of YAML
This commit migrates the YAML support available in Spring Boot to
the core framework. YAML documents can be loaded either as a
properties object or as a map.
Issue: SPR-9897 | build.gradle | @@ -26,6 +26,7 @@ configure(allprojects) { project ->
ext.jodaVersion = "2.3"
ext.junitVersion = "4.11"
ext.slf4jVersion = "1.7.7"
+ ext.snakeYamlVersion = "1.13"
ext.tiles2Version = "2.2.2"
ext.tiles3Version = "3.0.3"
ext.tomcatVersion = "8.0.5"
@@ -321,6 +... | true |
Other | spring-projects | spring-framework | 580e52372f61e67d1fd627f544189646dcc18f48.json | Add support of YAML
This commit migrates the YAML support available in Spring Boot to
the core framework. YAML documents can be loaded either as a
properties object or as a map.
Issue: SPR-9897 | spring-beans/src/main/java/org/springframework/beans/factory/config/YamlMapFactoryBean.java | @@ -0,0 +1,143 @@
+/*
+ * Copyright 2002-2014 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 | 580e52372f61e67d1fd627f544189646dcc18f48.json | Add support of YAML
This commit migrates the YAML support available in Spring Boot to
the core framework. YAML documents can be loaded either as a
properties object or as a map.
Issue: SPR-9897 | spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java | @@ -0,0 +1,356 @@
+/*
+ * Copyright 2002-2014 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 | 580e52372f61e67d1fd627f544189646dcc18f48.json | Add support of YAML
This commit migrates the YAML support available in Spring Boot to
the core framework. YAML documents can be loaded either as a
properties object or as a map.
Issue: SPR-9897 | spring-beans/src/main/java/org/springframework/beans/factory/config/YamlPropertiesFactoryBean.java | @@ -0,0 +1,132 @@
+/*
+ * Copyright 2002-2014 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 | 580e52372f61e67d1fd627f544189646dcc18f48.json | Add support of YAML
This commit migrates the YAML support available in Spring Boot to
the core framework. YAML documents can be loaded either as a
properties object or as a map.
Issue: SPR-9897 | spring-beans/src/test/java/org/springframework/beans/factory/config/YamlMapFactoryBeanTests.java | @@ -0,0 +1,108 @@
+/*
+ * Copyright 2002-2014 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 | 580e52372f61e67d1fd627f544189646dcc18f48.json | Add support of YAML
This commit migrates the YAML support available in Spring Boot to
the core framework. YAML documents can be loaded either as a
properties object or as a map.
Issue: SPR-9897 | spring-beans/src/test/java/org/springframework/beans/factory/config/YamlProcessorTests.java | @@ -0,0 +1,139 @@
+/*
+ * Copyright 2002-2014 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 | 580e52372f61e67d1fd627f544189646dcc18f48.json | Add support of YAML
This commit migrates the YAML support available in Spring Boot to
the core framework. YAML documents can be loaded either as a
properties object or as a map.
Issue: SPR-9897 | spring-beans/src/test/java/org/springframework/beans/factory/config/YamlPropertiesFactoryBeanTests.java | @@ -0,0 +1,245 @@
+/*
+ * Copyright 2002-2014 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 | 9d479feadded560b1d9a2c485730984ff5dcbfdb.json | Add naming strategy for @MVC request mappings.
This change adds a strategy for assigning a default name to an
@RequestMapping controller method. The @RequestMapping annotation
itself now has a name attribute allowing the explicit assignment
of a mapping name.
This is mainly intended for use in EL expressions in views... | spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMapping.java | @@ -266,6 +266,18 @@
@Mapping
public @interface RequestMapping {
+
+ /**
+ * Assign a name to this mapping.
+ * <p><b>Supported at the method and also at type level!</b>
+ * When used on both levels, a combined name is derived by
+ * concatenation with "#" as separator.
+ *
+ * @see org.springframework.web.se... | true |
Other | spring-projects | spring-framework | 9d479feadded560b1d9a2c485730984ff5dcbfdb.json | Add naming strategy for @MVC request mappings.
This change adds a strategy for assigning a default name to an
@RequestMapping controller method. The @RequestMapping annotation
itself now has a name attribute allowing the explicit assignment
of a mapping name.
This is mainly intended for use in EL expressions in views... | spring-web/src/main/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolver.java | @@ -256,34 +256,45 @@ protected void handleMissingValue(String paramName, MethodParameter parameter) t
}
@Override
- public void contributeMethodArgument(MethodParameter parameter, Object value,
+ public void contributeMethodArgument(MethodParameter param, Object value,
UriComponentsBuilder builder, Map<Strin... | true |
Other | spring-projects | spring-framework | 9d479feadded560b1d9a2c485730984ff5dcbfdb.json | Add naming strategy for @MVC request mappings.
This change adds a strategy for assigning a default name to an
@RequestMapping controller method. The @RequestMapping annotation
itself now has a name attribute allowing the explicit assignment
of a mapping name.
This is mainly intended for use in EL expressions in views... | spring-web/src/main/java/org/springframework/web/method/support/CompositeUriComponentsContributor.java | @@ -38,7 +38,7 @@
*/
public class CompositeUriComponentsContributor implements UriComponentsContributor {
- private final List<UriComponentsContributor> contributors = new LinkedList<UriComponentsContributor>();
+ private final List<Object> contributors = new LinkedList<Object>();
private final ConversionServi... | true |
Other | spring-projects | spring-framework | 9d479feadded560b1d9a2c485730984ff5dcbfdb.json | Add naming strategy for @MVC request mappings.
This change adds a strategy for assigning a default name to an
@RequestMapping controller method. The @RequestMapping annotation
itself now has a name attribute allowing the explicit assignment
of a mapping name.
This is mainly intended for use in EL expressions in views... | spring-web/src/test/java/org/springframework/web/method/support/CompositeUriComponentsContributorTests.java | @@ -0,0 +1,64 @@
+/*
+ * Copyright 2002-2014 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 | 9d479feadded560b1d9a2c485730984ff5dcbfdb.json | Add naming strategy for @MVC request mappings.
This change adds a strategy for assigning a default name to an
@RequestMapping controller method. The @RequestMapping annotation
itself now has a name attribute allowing the explicit assignment
of a mapping name.
This is mainly intended for use in EL expressions in views... | spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java | @@ -71,10 +71,15 @@
private boolean detectHandlerMethodsInAncestorContexts = false;
+ private HandlerMethodMappingNamingStrategy<T> namingStrategy;
+
+
private final Map<T, HandlerMethod> handlerMethods = new LinkedHashMap<T, HandlerMethod>();
private final MultiValueMap<String, T> urlMap = new LinkedMultiV... | true |
Other | spring-projects | spring-framework | 9d479feadded560b1d9a2c485730984ff5dcbfdb.json | Add naming strategy for @MVC request mappings.
This change adds a strategy for assigning a default name to an
@RequestMapping controller method. The @RequestMapping annotation
itself now has a name attribute allowing the explicit assignment
of a mapping name.
This is mainly intended for use in EL expressions in views... | spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerMethodMappingNamingStrategy.java | @@ -0,0 +1,41 @@
+/*
+ * Copyright 2002-2014 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 | 9d479feadded560b1d9a2c485730984ff5dcbfdb.json | Add naming strategy for @MVC request mappings.
This change adds a strategy for assigning a default name to an
@RequestMapping controller method. The @RequestMapping annotation
itself now has a name attribute allowing the explicit assignment
of a mapping name.
This is mainly intended for use in EL expressions in views... | spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java | @@ -18,6 +18,7 @@
import javax.servlet.http.HttpServletRequest;
+import org.springframework.util.StringUtils;
import org.springframework.web.servlet.mvc.condition.ConsumesRequestCondition;
import org.springframework.web.servlet.mvc.condition.HeadersRequestCondition;
import org.springframework.web.servlet.mvc.co... | true |
Other | spring-projects | spring-framework | 9d479feadded560b1d9a2c485730984ff5dcbfdb.json | Add naming strategy for @MVC request mappings.
This change adds a strategy for assigning a default name to an
@RequestMapping controller method. The @RequestMapping annotation
itself now has a name attribute allowing the explicit assignment
of a mapping name.
This is mainly intended for use in EL expressions in views... | spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java | @@ -55,6 +55,11 @@
*/
public abstract class RequestMappingInfoHandlerMapping extends AbstractHandlerMethodMapping<RequestMappingInfo> {
+
+ protected RequestMappingInfoHandlerMapping() {
+ setHandlerMethodMappingNamingStrategy(new RequestMappingInfoHandlerMethodMappingNamingStrategy());
+ }
+
/**
* Get the U... | true |
Other | spring-projects | spring-framework | 9d479feadded560b1d9a2c485730984ff5dcbfdb.json | Add naming strategy for @MVC request mappings.
This change adds a strategy for assigning a default name to an
@RequestMapping controller method. The @RequestMapping annotation
itself now has a name attribute allowing the explicit assignment
of a mapping name.
This is mainly intended for use in EL expressions in views... | spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMethodMappingNamingStrategy.java | @@ -0,0 +1,60 @@
+/*
+ * Copyright 2002-2014 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 | 9d479feadded560b1d9a2c485730984ff5dcbfdb.json | Add naming strategy for @MVC request mappings.
This change adds a strategy for assigning a default name to an
@RequestMapping controller method. The @RequestMapping annotation
itself now has a name attribute allowing the explicit assignment
of a mapping name.
This is mainly intended for use in EL expressions in views... | spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java | @@ -19,6 +19,7 @@
import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
@@ -29,6 +30,7 @@
import org.springframework.aop.framework.ProxyFactory;
import org.springframework.aop.target.EmptyT... | true |
Other | spring-projects | spring-framework | 9d479feadded560b1d9a2c485730984ff5dcbfdb.json | Add naming strategy for @MVC request mappings.
This change adds a strategy for assigning a default name to an
@RequestMapping controller method. The @RequestMapping annotation
itself now has a name attribute allowing the explicit assignment
of a mapping name.
This is mainly intended for use in EL expressions in views... | spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMethodArgumentResolver.java | @@ -123,21 +123,32 @@ protected void handleResolvedValue(Object arg, String name, MethodParameter para
}
@Override
- public void contributeMethodArgument(MethodParameter parameter, Object value,
- UriComponentsBuilder builder, Map<String, Object> uriVariables, ConversionService conversionService) {
+ public voi... | true |
Other | spring-projects | spring-framework | 9d479feadded560b1d9a2c485730984ff5dcbfdb.json | Add naming strategy for @MVC request mappings.
This change adds a strategy for assigning a default name to an
@RequestMapping controller method. The @RequestMapping annotation
itself now has a name attribute allowing the explicit assignment
of a mapping name.
This is mainly intended for use in EL expressions in views... | spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java | @@ -234,6 +234,7 @@ protected RequestCondition<?> getCustomMethodCondition(Method method) {
protected RequestMappingInfo createRequestMappingInfo(RequestMapping annotation, RequestCondition<?> customCondition) {
String[] patterns = resolveEmbeddedValuesInPatterns(annotation.value());
return new RequestMappingIn... | true |
Other | spring-projects | spring-framework | 9d479feadded560b1d9a2c485730984ff5dcbfdb.json | Add naming strategy for @MVC request mappings.
This change adds a strategy for assigning a default name to an
@RequestMapping controller method. The @RequestMapping annotation
itself now has a name attribute allowing the explicit assignment
of a mapping name.
This is mainly intended for use in EL expressions in views... | spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java | @@ -47,6 +47,7 @@
import org.springframework.web.servlet.LocaleContextResolver;
import org.springframework.web.servlet.LocaleResolver;
import org.springframework.web.servlet.ThemeResolver;
+import org.springframework.web.servlet.mvc.method.annotation.MvcUriComponentsBuilder;
import org.springframework.web.util.Html... | true |
Other | spring-projects | spring-framework | 9d479feadded560b1d9a2c485730984ff5dcbfdb.json | Add naming strategy for @MVC request mappings.
This change adds a strategy for assigning a default name to an
@RequestMapping controller method. The @RequestMapping annotation
itself now has a name attribute allowing the explicit assignment
of a mapping name.
This is mainly intended for use in EL expressions in views... | spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMethodMappingNamingStrategyTests.java | @@ -0,0 +1,72 @@
+/*
+ * Copyright 2002-2014 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 | db5d651057c86462c9ed145ce8346efc59d6c477.json | Exclude Jackson from Jasper Reports dependencies | build.gradle | @@ -578,7 +578,11 @@ project("spring-context-support") {
optional("org.apache.velocity:velocity:1.7")
optional("org.freemarker:freemarker:2.3.20")
optional("com.lowagie:itext:2.1.7")
- optional("net.sf.jasperreports:jasperreports:$jasperReportsVersion")
+ optional("net.sf.jasperreports:jasperreports:$jasperR... | false |
Other | spring-projects | spring-framework | 658f7f58dfd5299757a16aa16133b576555d2a75.json | Add missing @since tag | spring-context/src/main/java/org/springframework/cache/interceptor/BaseCacheResolver.java | @@ -31,6 +31,7 @@
* invocation context.
*
* @author Stephane Nicoll
+ * @since 4.1
*/
public abstract class BaseCacheResolver implements CacheResolver, InitializingBean {
| true |
Other | spring-projects | spring-framework | 658f7f58dfd5299757a16aa16133b576555d2a75.json | Add missing @since tag | spring-context/src/main/java/org/springframework/cache/interceptor/CacheOperation.java | @@ -27,6 +27,7 @@
*
* @author Costin Leau
* @author Stephane Nicoll
+ * @since 3.1
*/
public abstract class CacheOperation implements BasicCacheOperation {
| true |
Other | spring-projects | spring-framework | 658f7f58dfd5299757a16aa16133b576555d2a75.json | Add missing @since tag | spring-context/src/main/java/org/springframework/cache/interceptor/CacheProxyFactoryBean.java | @@ -35,6 +35,7 @@
* of the Spring reference documentation for more information.
*
* @author Costin Leau
+ * @since 3.1
* @see org.springframework.aop.framework.ProxyFactoryBean
* @see CacheInterceptor
*/ | true |
Other | spring-projects | spring-framework | 658f7f58dfd5299757a16aa16133b576555d2a75.json | Add missing @since tag | spring-context/src/main/java/org/springframework/cache/interceptor/NameMatchCacheOperationSource.java | @@ -32,6 +32,7 @@
* by registered name.
*
* @author Costin Leau
+ * @since 3.1
*/
@SuppressWarnings("serial")
public class NameMatchCacheOperationSource implements CacheOperationSource, Serializable { | true |
Other | spring-projects | spring-framework | 658f7f58dfd5299757a16aa16133b576555d2a75.json | Add missing @since tag | spring-context/src/main/java/org/springframework/cache/interceptor/NamedCacheResolver.java | @@ -28,6 +28,7 @@
* collection of name(s) against a given {@link CacheManager}.
*
* @author Stephane Nicoll
+ * @since 4.1
*/
public class NamedCacheResolver extends BaseCacheResolver {
| true |
Other | spring-projects | spring-framework | ae30a60d0306b621cd6f2caab08a2efbb86ed25d.json | Relax websocket xsd attr types for ${} style props
Issue: SPR-11624 | spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket-4.0.xsd | @@ -148,7 +148,7 @@
]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>
- <xsd:attribute name="stream-bytes-limit" type="xsd:long">
+ <xsd:attribute name="stream-bytes-limit" type="xsd:string">
<xsd:annotation>
<xsd:documentation ... | false |
Other | spring-projects | spring-framework | 5a1b7c6ce7f9ad22197d9dba16f71e29e04a001c.json | Update IDEA guidelines
* propdeps-plugin is now in version 0.0.6
* Using IntelliJ 13.1 | import-into-idea.md | @@ -1,21 +1,21 @@
-The following has been tested against Intellij IDEA 12.0
+The following has been tested against Intellij IDEA 13.1
## Steps
_Within your locally cloned spring-framework working directory:_
-1. Generate IDEA metadata with `./gradlew :spring-oxm:compileTestJava cleanIdea idea`
-2. Import into I... | false |
Other | spring-projects | spring-framework | 9598a1e2ef3467187eec928248df536ed8410c2a.json | Update @SendToUser and related code
Issue: SPR-11506 | spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/SendToUser.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 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,33 +26,37 @@
import org.springframework... | true |
Other | spring-projects | spring-framework | 9598a1e2ef3467187eec928248df536ed8410c2a.json | Update @SendToUser and related code
Issue: SPR-11506 | spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandler.java | @@ -16,9 +16,6 @@
package org.springframework.messaging.simp.annotation.support;
-import java.lang.annotation.Annotation;
-import java.security.Principal;
-
import org.springframework.core.MethodParameter;
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.messaging.Message;
... | true |
Other | spring-projects | spring-framework | 9598a1e2ef3467187eec928248df536ed8410c2a.json | Update @SendToUser and related code
Issue: SPR-11506 | spring-messaging/src/main/java/org/springframework/messaging/simp/user/DefaultUserDestinationResolver.java | @@ -123,6 +123,7 @@ private DestinationInfo parseUserDestination(Message<?> message) {
SimpMessageType messageType = SimpMessageHeaderAccessor.getMessageType(headers);
String destination = SimpMessageHeaderAccessor.getDestination(headers);
Principal principal = SimpMessageHeaderAccessor.getUser(headers);
+ St... | true |
Other | spring-projects | spring-framework | 9598a1e2ef3467187eec928248df536ed8410c2a.json | Update @SendToUser and related code
Issue: SPR-11506 | spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandlerTests.java | @@ -102,14 +102,14 @@ public void setup() throws Exception {
method = this.getClass().getDeclaredMethod("handleAndSendToUser");
this.sendToUserReturnType = new MethodParameter(method, -1);
-
+
method = this.getClass().getDeclaredMethod("handleAndSendToUserSingleSession");
this.sendToUserSingleSessionRet... | true |
Other | spring-projects | spring-framework | 088b80f4c5673e13ab6f59840e45725f491a4960.json | Add singleSession attribute to @SendToUser
Added the ability to send a message only to one user session. Given a
user has two tabs open and the client sends a message to the server
from tab 1, it is now possible to send a reply message to only 1 tab
instead of the default mode of targetting all known user sessions.
I... | spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/SendToUser.java | @@ -48,4 +48,11 @@
*/
String[] value() default {};
+ /**
+ * A flag indicating whether the message is to be sent to a particular user session.
+ *
+ */
+ boolean singleSession() default false;
+
+
} | true |
Other | spring-projects | spring-framework | 088b80f4c5673e13ab6f59840e45725f491a4960.json | Add singleSession attribute to @SendToUser
Added the ability to send a message only to one user session. Given a
user has two tabs open and the client sends a message to the server
from tab 1, it is now possible to send a reply message to only 1 tab
instead of the default mode of targetting all known user sessions.
I... | spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandler.java | @@ -148,7 +148,12 @@ public void handleReturnValue(Object returnValue, MethodParameter returnType, Me
String user = getUserName(message, headers);
String[] destinations = getTargetDestinations(sendToUser, message, this.defaultUserDestinationPrefix);
for (String destination : destinations) {
- this.messag... | true |
Other | spring-projects | spring-framework | 088b80f4c5673e13ab6f59840e45725f491a4960.json | Add singleSession attribute to @SendToUser
Added the ability to send a message only to one user session. Given a
user has two tabs open and the client sends a message to the server
from tab 1, it is now possible to send a reply message to only 1 tab
instead of the default mode of targetting all known user sessions.
I... | spring-messaging/src/main/java/org/springframework/messaging/simp/user/DefaultUserDestinationResolver.java | @@ -158,7 +158,12 @@ else if (SimpMessageType.MESSAGE.equals(messageType)) {
subscribeDestination = this.destinationPrefix.substring(0, startIndex-1) + destinationWithoutPrefix;
user = destination.substring(startIndex, endIndex);
user = StringUtils.replace(user, "%2F", "/");
- sessionIds = this.userSessio... | true |
Other | spring-projects | spring-framework | 088b80f4c5673e13ab6f59840e45725f491a4960.json | Add singleSession attribute to @SendToUser
Added the ability to send a message only to one user session. Given a
user has two tabs open and the client sends a message to the server
from tab 1, it is now possible to send a reply message to only 1 tab
instead of the default mode of targetting all known user sessions.
I... | spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandlerTests.java | @@ -74,7 +74,9 @@ public class SendToMethodReturnValueHandlerTests {
private MethodParameter sendToReturnType;
private MethodParameter sendToDefaultDestReturnType;
private MethodParameter sendToUserReturnType;
+ private MethodParameter sendToUserSingleSessionReturnType;
private MethodParameter sendToUserDefault... | true |
Other | spring-projects | spring-framework | 088b80f4c5673e13ab6f59840e45725f491a4960.json | Add singleSession attribute to @SendToUser
Added the ability to send a message only to one user session. Given a
user has two tabs open and the client sends a message to the server
from tab 1, it is now possible to send a reply message to only 1 tab
instead of the default mode of targetting all known user sessions.
I... | spring-messaging/src/test/java/org/springframework/messaging/simp/user/DefaultUserDestinationResolverTests.java | @@ -109,7 +109,7 @@ public void handleMessageEncodedUserName() {
String userName = "http://joe.openid.example.org/";
this.registry.registerSessionId(userName, "openid123");
String destination = "/user/" + StringUtils.replace(userName, "/", "%2F") + "/queue/foo";
- Message<?> message = createMessage(SimpMessag... | true |
Other | spring-projects | spring-framework | 241682c11734fcba50500fe5f61291405efb7d91.json | Update author list in reference manual | src/asciidoc/index.adoc | @@ -1,5 +1,6 @@
= Spring Framework Reference Documentation
-Rod Johnson; Juergen Hoeller; Keith Donald; Colin Sampaleanu; Rob Harrop; Thomas Risberg; Alef Arendsen; Darren Davison; Dmitriy Kopylenko; Mark Pollack; Thierry Templier; Erwin Vervaet; Portia Tung; Ben Hale; Adrian Colyer; John Lewis; Costin Leau; Mark Fish... | false |
Other | spring-projects | spring-framework | b364599278b4ef13348641d7cbb433d654bf4e5e.json | Update links to Spring JIRA server | CONTRIBUTING.md | @@ -305,7 +305,7 @@ against the branch used to submit your pull request. In other words, you do not
need to issue a new pull request when asked to make changes.
[help documentation]: http://help.github.com/send-pull-requests
-[JIRA issue tracker]: https://jira.springsource.org/browse/SPR
+[JIRA issue tracker]: http... | true |
Other | spring-projects | spring-framework | b364599278b4ef13348641d7cbb433d654bf4e5e.json | Update links to Spring JIRA server | README.md | @@ -82,7 +82,7 @@ The Spring Framework is released under version 2.0 of the [Apache License][].
[spring-mvc tag]: http://stackoverflow.com/questions/tagged/spring-mvc
[Stack Overflow]: http://stackoverflow.com/faq
[Commercial support]: http://spring.io/services
-[Spring Framework JIRA]: http://jira.springsource.org/... | true |
Other | spring-projects | spring-framework | b364599278b4ef13348641d7cbb433d654bf4e5e.json | Update links to Spring JIRA server | spring-beans/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java | @@ -50,7 +50,7 @@ public void rootBeanDefinition() {
/**
* @since 3.2.8
- * @see <a href="https://jira.springsource.org/browse/SPR-11420">SPR-11420</a>
+ * @see <a href="https://jira.spring.io/browse/SPR-11420">SPR-11420</a>
*/
@Test
public void rootBeanDefinitionAndMethodOverridesWithDifferentOverloade... | true |
Other | spring-projects | spring-framework | b364599278b4ef13348641d7cbb433d654bf4e5e.json | Update links to Spring JIRA server | spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java | @@ -1240,8 +1240,8 @@ public void recursiveImport() {
/**
* @since 3.2.8 and 4.0.2
- * @see <a href="https://jira.springsource.org/browse/SPR-10785">SPR-10785</a> and <a
- * href="https://jira.springsource.org/browse/SPR-11420">SPR-11420</a>
+ * @see <a href="https://jira.spring.io/browse/SPR-10785">SPR-... | true |
Other | spring-projects | spring-framework | b364599278b4ef13348641d7cbb433d654bf4e5e.json | Update links to Spring JIRA server | spring-context/src/test/java/org/springframework/context/annotation/AnnotationBeanNameGeneratorTests.java | @@ -108,7 +108,7 @@ public void generateBeanNameFromMetaComponentWithNonStringValue() {
/**
* @since 4.0.1
- * @see https://jira.springsource.org/browse/SPR-11360
+ * @see https://jira.spring.io/browse/SPR-11360
*/
@Test
public void generateBeanNameFromComposedControllerAnnotationWithoutName() {
@@ -121... | true |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.