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 | 0524a82c09689fab901e4718058f8c68f132d52a.json | Update unprocessableEntity to allow body
Issue: SPR-12515 | spring-web/src/test/java/org/springframework/http/ResponseEntityTests.java | @@ -122,11 +122,11 @@ public void notFound() throws URISyntaxException {
@Test
public void unprocessableEntity() throws URISyntaxException {
- ResponseEntity<Void> responseEntity = ResponseEntity.unprocessableEntity().build();
+ ResponseEntity<String> responseEntity = ResponseEntity.unprocessableEntity().body("... | true |
Other | spring-projects | spring-framework | b796c1e87eea10bb6ddd7dc5c3b6b1befa3806a7.json | Synchronize message sending
Issue: SPR-12516 | spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractHttpSockJsSession.java | @@ -70,7 +70,7 @@ public abstract class AbstractHttpSockJsSession extends AbstractSockJsSession {
private final Object responseLock = new Object();
- private volatile boolean requestInitialized;
+ private volatile boolean readyToSend;
private final Queue<String> messageCache;
@@ -195,18 +195,24 @@ public vo... | true |
Other | spring-projects | spring-framework | b796c1e87eea10bb6ddd7dc5c3b6b1befa3806a7.json | Synchronize message sending
Issue: SPR-12516 | spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/StreamingSockJsSession.java | @@ -49,7 +49,7 @@ protected boolean isStreaming() {
@Override
protected void flushCache() throws SockJsTransportFailureException {
- do {
+ while (!getMessageCache().isEmpty()) {
String message = getMessageCache().poll();
SockJsMessageCodec messageCodec = getSockJsServiceConfig().getMessageCodec();
... | true |
Other | spring-projects | spring-framework | b796c1e87eea10bb6ddd7dc5c3b6b1befa3806a7.json | Synchronize message sending
Issue: SPR-12516 | spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/HttpSendingTransportHandlerTests.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.
@@ -76,7 +76,7 @@ public void handleRequestXhr(... | true |
Other | spring-projects | spring-framework | b796c1e87eea10bb6ddd7dc5c3b6b1befa3806a7.json | Synchronize message sending
Issue: SPR-12516 | spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/session/HttpSockJsSessionTests.java | @@ -82,7 +82,7 @@ public void handleInitialRequest() throws Exception {
this.session.handleInitialRequest(this.request, this.response, this.frameFormat);
assertEquals("hhh\no", this.servletResponse.getContentAsString());
- assertFalse(this.servletRequest.isAsyncStarted());
+ assertTrue(this.servletRequest.isA... | true |
Other | spring-projects | spring-framework | 2fccf3ff4409a641c20947e8fca90308f7236c64.json | Add support for autowiring Jackson handlers
This commit introduces the SpringHandlerInstantiator
class, a Jackson HandlerInstantiator that allows to autowire
Jackson handlers (JsonSerializer, JsonDeserializer, KeyDeserializer,
TypeResolverBuilder and TypeIdResolver) if needed.
SpringHandlerInstantiator is automatical... | spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java | @@ -31,16 +31,20 @@
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.KeyDeserializer;
import com.fasterxml.jackson.databind.MapperFeature;
import com.fas... | true |
Other | spring-projects | spring-framework | 2fccf3ff4409a641c20947e8fca90308f7236c64.json | Add support for autowiring Jackson handlers
This commit introduces the SpringHandlerInstantiator
class, a Jackson HandlerInstantiator that allows to autowire
Jackson handlers (JsonSerializer, JsonDeserializer, KeyDeserializer,
TypeResolverBuilder and TypeIdResolver) if needed.
SpringHandlerInstantiator is automatical... | spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java | @@ -26,16 +26,20 @@
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.KeyDeserializer;
import com.fasterxml.jackson.databind.MapperFeature;
import com.fas... | true |
Other | spring-projects | spring-framework | 2fccf3ff4409a641c20947e8fca90308f7236c64.json | Add support for autowiring Jackson handlers
This commit introduces the SpringHandlerInstantiator
class, a Jackson HandlerInstantiator that allows to autowire
Jackson handlers (JsonSerializer, JsonDeserializer, KeyDeserializer,
TypeResolverBuilder and TypeIdResolver) if needed.
SpringHandlerInstantiator is automatical... | spring-web/src/main/java/org/springframework/http/converter/json/SpringHandlerInstantiator.java | @@ -0,0 +1,88 @@
+/*
+ * 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 | 2fccf3ff4409a641c20947e8fca90308f7236c64.json | Add support for autowiring Jackson handlers
This commit introduces the SpringHandlerInstantiator
class, a Jackson HandlerInstantiator that allows to autowire
Jackson handlers (JsonSerializer, JsonDeserializer, KeyDeserializer,
TypeResolverBuilder and TypeIdResolver) if needed.
SpringHandlerInstantiator is automatical... | spring-web/src/test/java/org/springframework/http/converter/json/SpringHandlerInstantiatorTests.java | @@ -0,0 +1,272 @@
+/*
+ * 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 | 2fccf3ff4409a641c20947e8fca90308f7236c64.json | Add support for autowiring Jackson handlers
This commit introduces the SpringHandlerInstantiator
class, a Jackson HandlerInstantiator that allows to autowire
Jackson handlers (JsonSerializer, JsonDeserializer, KeyDeserializer,
TypeResolverBuilder and TypeIdResolver) if needed.
SpringHandlerInstantiator is automatical... | spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java | @@ -29,6 +29,7 @@
import org.springframework.beans.factory.config.RuntimeBeanReference;
import org.springframework.beans.factory.parsing.BeanComponentDefinition;
import org.springframework.beans.factory.parsing.CompositeComponentDefinition;
+import org.springframework.beans.factory.support.GenericBeanDefinition;
im... | true |
Other | spring-projects | spring-framework | 2fccf3ff4409a641c20947e8fca90308f7236c64.json | Add support for autowiring Jackson handlers
This commit introduces the SpringHandlerInstantiator
class, a Jackson HandlerInstantiator that allows to autowire
Jackson handlers (JsonSerializer, JsonDeserializer, KeyDeserializer,
TypeResolverBuilder and TypeIdResolver) if needed.
SpringHandlerInstantiator is automatical... | spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java | @@ -25,6 +25,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.xml.transform.Source;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.BeanFactoryUtils;
import org.springframework.beans.factory.BeanInitializat... | true |
Other | spring-projects | spring-framework | 2fccf3ff4409a641c20947e8fca90308f7236c64.json | Add support for autowiring Jackson handlers
This commit introduces the SpringHandlerInstantiator
class, a Jackson HandlerInstantiator that allows to autowire
Jackson handlers (JsonSerializer, JsonDeserializer, KeyDeserializer,
TypeResolverBuilder and TypeIdResolver) if needed.
SpringHandlerInstantiator is automatical... | spring-websocket/src/main/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParser.java | @@ -21,7 +21,8 @@
import java.util.List;
import java.util.Map;
-import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
+import org.springframework.beans.factory.support.GenericBeanDefinition;
+import org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean;
import org.springfram... | true |
Other | spring-projects | spring-framework | 2fccf3ff4409a641c20947e8fca90308f7236c64.json | Add support for autowiring Jackson handlers
This commit introduces the SpringHandlerInstantiator
class, a Jackson HandlerInstantiator that allows to autowire
Jackson handlers (JsonSerializer, JsonDeserializer, KeyDeserializer,
TypeResolverBuilder and TypeIdResolver) if needed.
SpringHandlerInstantiator is automatical... | spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurationSupport.java | @@ -138,7 +138,8 @@ public WebSocketMessageBrokerStats webSocketMessageBrokerStats() {
protected MappingJackson2MessageConverter createJacksonConverter() {
MappingJackson2MessageConverter messageConverter = super.createJacksonConverter();
// Use Jackson builder in order to have JSR-310 and Joda-Time modules reg... | true |
Other | spring-projects | spring-framework | 061b2463070e4a2150012d47e5a650bc5ef851ca.json | Add @AjSuppressWarnings on static mocks
Issue: SPR-12447 | spring-aspects/src/main/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControl.aj | @@ -17,6 +17,7 @@
package org.springframework.mock.staticmock;
import org.aspectj.lang.annotation.RequiredTypes;
+import org.aspectj.lang.annotation.SuppressAjWarnings;
/**
* Annotation-based aspect to use in test builds to enable mocking of static methods
@@ -112,8 +113,10 @@ public aspect AnnotationDrivenSta... | false |
Other | spring-projects | spring-framework | 87f1512e8867a884615d79ab52bf1283f7c573e1.json | Add protected YamlProcessor.getFlattenedMap method
Add a protected getFlattenedMap method to the YamlProcessor that
subclasses can use to flatten a source Map so that it has the same
entries as the Properties, but retains order.
Issue: SPR-12499 | spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java | @@ -212,7 +212,7 @@ private Map<String, Object> asMap(Object object) {
private boolean process(Map<String, Object> map, MatchCallback callback) {
Properties properties = new Properties();
- assignProperties(properties, map, null);
+ properties.putAll(getFlattenedMap(map));
if (this.documentMatchers.isEmpt... | true |
Other | spring-projects | spring-framework | 87f1512e8867a884615d79ab52bf1283f7c573e1.json | Add protected YamlProcessor.getFlattenedMap method
Add a protected getFlattenedMap method to the YamlProcessor that
subclasses can use to flatten a source Map so that it has the same
entries as the Properties, but retains order.
Issue: SPR-12499 | spring-beans/src/test/java/org/springframework/beans/factory/config/YamlProcessorTests.java | @@ -15,6 +15,7 @@
*/
package org.springframework.beans.factory.config;
+import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Properties;
@@ -23,7 +24,6 @@
import org.junit.rules.ExpectedException;
import org.yaml.snakeyaml.parser.ParserException;
import org.yaml.snakeyaml.scanner.ScannerEx... | true |
Other | spring-projects | spring-framework | 7aa5e65235b8d1676d093bf300865d0a969140cc.json | Add info on intercepting static resource requests
Issue: SPR-10655 | spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurer.java | @@ -134,6 +134,13 @@ public interface WebMvcConfigurer {
* Add Spring MVC lifecycle interceptors for pre- and post-processing of
* controller method invocations. Interceptors can be registered to apply
* to all requests or be limited to a subset of URL patterns.
+ * <p><strong>Note</strong> that interceptors ... | true |
Other | spring-projects | spring-framework | 7aa5e65235b8d1676d093bf300865d0a969140cc.json | Add info on intercepting static resource requests
Issue: SPR-10655 | spring-webmvc/src/main/java/org/springframework/web/servlet/handler/MappedInterceptor.java | @@ -21,8 +21,16 @@
import org.springframework.web.servlet.HandlerInterceptor;
/**
- * Holds information about a HandlerInterceptor mapped to a path into the application.
- * Provides a method to match a request path to the mapped path patterns.
+ * Contains a {@link HandlerInterceptor} along with include (and optio... | true |
Other | spring-projects | spring-framework | 7aa5e65235b8d1676d093bf300865d0a969140cc.json | Add info on intercepting static resource requests
Issue: SPR-10655 | spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-4.1.xsd | @@ -563,7 +563,7 @@
Interceptors allow requests to be pre/post processed before/after handling.
Each inteceptor must implement the org.springframework.web.servlet.HandlerInterceptor or
org.springframework.web.context.request.WebRequestInterceptor interface.
- The interceptors in this set are automatically configu... | true |
Other | spring-projects | spring-framework | ed4cd9947fb254ae3d9d9446bcfa3897210ba19d.json | Add private method to remove duplication | spring-messaging/src/main/java/org/springframework/messaging/simp/broker/SimpleBrokerMessageHandler.java | @@ -148,15 +148,11 @@ protected void handleMessageInternal(Message<?> message) {
}
if (SimpMessageType.MESSAGE.equals(messageType)) {
- if (logger.isDebugEnabled()) {
- logger.debug("Processing " + accessor.getShortLogMessage(message.getPayload()));
- }
+ logMessage(message);
sendMessageToSubscribe... | false |
Other | spring-projects | spring-framework | dc5b5ca8ee09c890352f89b2dae58bc0132d6545.json | Check the user of a SockJS request
Issue: SPR-12497 | spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/TransportHandlingSockJsService.java | @@ -17,6 +17,8 @@
package org.springframework.web.socket.sockjs.transport;
import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.security.Principal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -245,6 +247,15 @@ else if (transportType.supportsCors())... | true |
Other | spring-projects | spring-framework | dc5b5ca8ee09c890352f89b2dae58bc0132d6545.json | Check the user of a SockJS request
Issue: SPR-12497 | spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsServiceTests.java | @@ -29,6 +29,7 @@
import org.springframework.scheduling.TaskScheduler;
import org.springframework.web.socket.AbstractHttpRequestTests;
import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.handler.TestPrincipal;
import org.springframework.web.socket.server.HandshakeHandler;
... | true |
Other | spring-projects | spring-framework | 7c7fdb07363791fb3c72f4946839f4c166196ebe.json | Add support for DeferredImportSelector
Add DeferredImportSelector interface that can be used to select imports
after all @Configuration beans have been processed. | spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java | @@ -25,26 +25,32 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.Stack;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factor... | true |
Other | spring-projects | spring-framework | 7c7fdb07363791fb3c72f4946839f4c166196ebe.json | Add support for DeferredImportSelector
Add DeferredImportSelector interface that can be used to select imports
after all @Configuration beans have been processed. | spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java | @@ -276,20 +276,7 @@ public void processConfigBeanDefinitions(BeanDefinitionRegistry registry) {
ConfigurationClassParser parser = new ConfigurationClassParser(
this.metadataReaderFactory, this.problemReporter, this.environment,
this.resourceLoader, this.componentScanBeanNameGenerator, registry);
- for (B... | true |
Other | spring-projects | spring-framework | 7c7fdb07363791fb3c72f4946839f4c166196ebe.json | Add support for DeferredImportSelector
Add DeferredImportSelector interface that can be used to select imports
after all @Configuration beans have been processed. | spring-context/src/main/java/org/springframework/context/annotation/DeferredImportSelector.java | @@ -0,0 +1,33 @@
+/*
+ * Copyright 2002-2013 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 | 7c7fdb07363791fb3c72f4946839f4c166196ebe.json | Add support for DeferredImportSelector
Add DeferredImportSelector interface that can be used to select imports
after all @Configuration beans have been processed. | spring-context/src/main/java/org/springframework/context/annotation/ImportSelector.java | @@ -32,8 +32,14 @@
* <li>{@link org.springframework.context.ResourceLoaderAware ResourceLoaderAware}</li>
* </ul>
*
+ * <p>ImportSelectors are usually processed in the same way as regular {@code @Import}
+ * annotations, however, it is also possible to defer selection of imports until all
+ * {@code @Configuratio... | true |
Other | spring-projects | spring-framework | 7c7fdb07363791fb3c72f4946839f4c166196ebe.json | Add support for DeferredImportSelector
Add DeferredImportSelector interface that can be used to select imports
after all @Configuration beans have been processed. | spring-context/src/test/java/org/springframework/context/annotation/ImportSelectorTests.java | @@ -0,0 +1,146 @@
+/*
+ * Copyright 2002-2013 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 | 8e445f3a211395d43895f747d04158ff7f9c0913.json | Extend AnnotationMetadata and MethodMetadata
Update AnnotationMetadata and MethodMetadata to extend from a new
AnnotatedTypeMetadata base interface containing the methods that are
common to both. Also introduce new getAllAnnotationAttributes methods
providing MultiValueMap access to both annotation and meta-annotation... | spring-core/src/main/java/org/springframework/core/type/AnnotatedElementUtils.java | @@ -0,0 +1,160 @@
+/*
+ * Copyright 2002-2013 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 | 8e445f3a211395d43895f747d04158ff7f9c0913.json | Extend AnnotationMetadata and MethodMetadata
Update AnnotationMetadata and MethodMetadata to extend from a new
AnnotatedTypeMetadata base interface containing the methods that are
common to both. Also introduce new getAllAnnotationAttributes methods
providing MultiValueMap access to both annotation and meta-annotation... | spring-core/src/main/java/org/springframework/core/type/AnnotatedTypeMetadata.java | @@ -0,0 +1,97 @@
+/*
+ * Copyright 2002-2013 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 | 8e445f3a211395d43895f747d04158ff7f9c0913.json | Extend AnnotationMetadata and MethodMetadata
Update AnnotationMetadata and MethodMetadata to extend from a new
AnnotatedTypeMetadata base interface containing the methods that are
common to both. Also introduce new getAllAnnotationAttributes methods
providing MultiValueMap access to both annotation and meta-annotation... | spring-core/src/main/java/org/springframework/core/type/AnnotationMetadata.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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,7 +16,6 @@
package org.springframewor... | true |
Other | spring-projects | spring-framework | 8e445f3a211395d43895f747d04158ff7f9c0913.json | Extend AnnotationMetadata and MethodMetadata
Update AnnotationMetadata and MethodMetadata to extend from a new
AnnotatedTypeMetadata base interface containing the methods that are
common to both. Also introduce new getAllAnnotationAttributes methods
providing MultiValueMap access to both annotation and meta-annotation... | spring-core/src/main/java/org/springframework/core/type/MethodMetadata.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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,20 +16,20 @@
package org.springframew... | true |
Other | spring-projects | spring-framework | 8e445f3a211395d43895f747d04158ff7f9c0913.json | Extend AnnotationMetadata and MethodMetadata
Update AnnotationMetadata and MethodMetadata to extend from a new
AnnotatedTypeMetadata base interface containing the methods that are
common to both. Also introduce new getAllAnnotationAttributes methods
providing MultiValueMap access to both annotation and meta-annotation... | spring-core/src/main/java/org/springframework/core/type/StandardAnnotationMetadata.java | @@ -23,7 +23,7 @@
import java.util.Set;
import org.springframework.core.annotation.AnnotationAttributes;
-import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.util.MultiValueMap;
/**
* {@link AnnotationMetadata} implementation that uses standard reflection
@@ -32,6 +32,7 @@
... | true |
Other | spring-projects | spring-framework | 8e445f3a211395d43895f747d04158ff7f9c0913.json | Extend AnnotationMetadata and MethodMetadata
Update AnnotationMetadata and MethodMetadata to extend from a new
AnnotatedTypeMetadata base interface containing the methods that are
common to both. Also introduce new getAllAnnotationAttributes methods
providing MultiValueMap access to both annotation and meta-annotation... | spring-core/src/main/java/org/springframework/core/type/StandardMethodMetadata.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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,13 +16,12 @@
package org.springframew... | true |
Other | spring-projects | spring-framework | 8e445f3a211395d43895f747d04158ff7f9c0913.json | Extend AnnotationMetadata and MethodMetadata
Update AnnotationMetadata and MethodMetadata to extend from a new
AnnotatedTypeMetadata base interface containing the methods that are
common to both. Also introduce new getAllAnnotationAttributes methods
providing MultiValueMap access to both annotation and meta-annotation... | spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationAttributesReadingVisitor.java | @@ -34,13 +34,14 @@
import org.springframework.asm.Type;
import org.springframework.core.annotation.AnnotationAttributes;
import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.util.MultiValueMap;
import org.springframework.util.ObjectUtils;
import org.springframework.util.Reflecti... | true |
Other | spring-projects | spring-framework | 8e445f3a211395d43895f747d04158ff7f9c0913.json | Extend AnnotationMetadata and MethodMetadata
Update AnnotationMetadata and MethodMetadata to extend from a new
AnnotatedTypeMetadata base interface containing the methods that are
common to both. Also introduce new getAllAnnotationAttributes methods
providing MultiValueMap access to both annotation and meta-annotation... | spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitor.java | @@ -41,6 +41,7 @@
* @author Juergen Hoeller
* @author Mark Fisher
* @author Costin Leau
+ * @author Phillip Webb
* @since 2.5
*/
public class AnnotationMetadataReadingVisitor extends ClassMetadataReadingVisitor implements AnnotationMetadata {
@@ -51,7 +52,7 @@ public class AnnotationMetadataReadingVisitor ex... | true |
Other | spring-projects | spring-framework | 8e445f3a211395d43895f747d04158ff7f9c0913.json | Extend AnnotationMetadata and MethodMetadata
Update AnnotationMetadata and MethodMetadata to extend from a new
AnnotatedTypeMetadata base interface containing the methods that are
common to both. Also introduce new getAllAnnotationAttributes methods
providing MultiValueMap access to both annotation and meta-annotation... | spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationReadingVisitorUtils.java | @@ -0,0 +1,92 @@
+/*
+ * Copyright 2002-2013 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 | 8e445f3a211395d43895f747d04158ff7f9c0913.json | Extend AnnotationMetadata and MethodMetadata
Update AnnotationMetadata and MethodMetadata to extend from a new
AnnotatedTypeMetadata base interface containing the methods that are
common to both. Also introduce new getAllAnnotationAttributes methods
providing MultiValueMap access to both annotation and meta-annotation... | spring-core/src/main/java/org/springframework/core/type/classreading/MethodMetadataReadingVisitor.java | @@ -16,7 +16,7 @@
package org.springframework.core.type.classreading;
-import java.util.LinkedHashMap;
+import java.util.List;
import java.util.Map;
import org.springframework.asm.AnnotationVisitor;
@@ -26,6 +26,7 @@
import org.springframework.asm.Type;
import org.springframework.core.annotation.AnnotationAt... | true |
Other | spring-projects | spring-framework | 8e445f3a211395d43895f747d04158ff7f9c0913.json | Extend AnnotationMetadata and MethodMetadata
Update AnnotationMetadata and MethodMetadata to extend from a new
AnnotatedTypeMetadata base interface containing the methods that are
common to both. Also introduce new getAllAnnotationAttributes methods
providing MultiValueMap access to both annotation and meta-annotation... | spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java | @@ -18,7 +18,9 @@
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import static ... | true |
Other | spring-projects | spring-framework | eb1776e79df3c1b7916bf11a61bdc33ba6889d38.json | Allow access to applied property sources
Add PropertySourcesPlaceholderConfigurer.getAppliedPropertySources() to
allow access to the PropertySources that were actually applied.
Issue: SPR-10545 | spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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,7 @@
import org.springframework.c... | true |
Other | spring-projects | spring-framework | eb1776e79df3c1b7916bf11a61bdc33ba6889d38.json | Allow access to applied property sources
Add PropertySourcesPlaceholderConfigurer.getAppliedPropertySources() to
allow access to the PropertySources that were actually applied.
Issue: SPR-10545 | spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java | @@ -16,28 +16,26 @@
package org.springframework.context.support;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-import static org.springframework.beans.factory.support.Be... | true |
Other | spring-projects | spring-framework | 13e460827e69b29385b3c5837ed6f4171c15f248.json | Fix external Javadoc references. | build.gradle | @@ -79,7 +79,6 @@ configure(allprojects) { project ->
}
ext.javadocLinks = [
- "http://docs.oracle.com/javase/6/docs/api/",
"http://docs.oracle.com/javaee/6/api/",
"http://docs.oracle.com/cd/E13222_01/wls/docs90/javadocs/", // CommonJ
"http://pic.dhe.ibm.com/infocenter/wasinfo/v7r0/topic/com.ibm.websphe... | false |
Other | spring-projects | spring-framework | e9a2e688cbc6321ed40b2b468501642877080681.json | Allow late binding ServletContextAwareProcessor
Update ServletContextAwareProcessor to allow subclasses to support late
binding of the ServletConfig and/or ServletContext. Allows for the
post-processor to be registered before the servlet environment has been
initialized.
Issue: SPR-10381 | spring-web/src/main/java/org/springframework/web/context/support/ServletContextAwareProcessor.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -33,6 +33,7 @@
* underlying bean factory. ... | false |
Other | spring-projects | spring-framework | 71f6da673abec4c805eb8232a2c8e07837b7f0a7.json | Consider @Import classes as lite @Configuration
Allow classes that are annotated with @Import to be considered as 'lite'
@Configuration candidates. Allows the AnnotationConfigApplicationContext
to directly register @Import beans even if they are not @Components.
Issue: SPR-10533 | spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassUtils.java | @@ -101,9 +101,12 @@ public static boolean isFullConfigurationCandidate(AnnotationMetadata metadata)
}
public static boolean isLiteConfigurationCandidate(AnnotationMetadata metadata) {
- return !metadata.isInterface() && // not an interface or an annotation
- (metadata.isAnnotated(Component.class.getName()) |... | true |
Other | spring-projects | spring-framework | 71f6da673abec4c805eb8232a2c8e07837b7f0a7.json | Consider @Import classes as lite @Configuration
Allow classes that are annotated with @Import to be considered as 'lite'
@Configuration candidates. Allows the AnnotationConfigApplicationContext
to directly register @Import beans even if they are not @Components.
Issue: SPR-10533 | spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportAnnotationDetectionTests.java | @@ -25,12 +25,15 @@
import java.lang.annotation.Target;
import org.junit.Test;
+import org.springframework.stereotype.Service;
import org.springframework.tests.sample.beans.TestBean;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Be... | true |
Other | spring-projects | spring-framework | f05d0885ef4076b6430f144ddb8e47627e5eee80.json | Add AnnotationConfigApplicationContext constructor
Add AnnotationConfigApplicationContext constructor allow use of a
custom DefaultListableBeanFactory.
Issue: SPR-10529 | spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigApplicationContext.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
package org.springframework.... | false |
Other | spring-projects | spring-framework | a22bb43c0c1cf5f90d935aef700dc3447b1bff50.json | Include cglib repack in core | build.gradle | @@ -201,6 +201,7 @@ project("spring-core") {
cglib("cglib:cglib:${cglibVersion}@jar")
jarjar("com.googlecode.jarjar:jarjar:1.3")
+ compile(files(cglibRepackJar))
compile("commons-logging:commons-logging:1.1.1")
optional("org.aspectj:aspectjweaver:${aspectjVersion}")
optional("net.sf.jopt-simple:jopt-s... | false |
Other | spring-projects | spring-framework | 84e42447931a7204352b50ccfafe871a556a87c2.json | Use source 1.7 until eclipse supports JDK 8
Specifically set the source level in generated eclipse projects to 1.7
rather than 1.8. Allows the current eclipse milestone (4.3 M6) in
combination with JDK 8.0 to be used for Spring 4.0 development. | gradle/ide.gradle | @@ -5,6 +5,12 @@ import org.gradle.plugins.ide.eclipse.model.SourceFolder
apply plugin: "propdeps-eclipse"
apply plugin: "propdeps-idea"
+// Until eclipse fully supports Java 8 use 1.7 source level
+eclipse.jdt {
+ sourceCompatibility = 1.7
+ targetCompatibility = 1.7
+}
+
// Replace classpath entries with project... | false |
Other | spring-projects | spring-framework | 7845ebc428e9705a3a4404fff47e434effd5465f.json | Add SockJS path detection | spring-web/src/main/java/org/springframework/http/server/AsyncServerHttpRequest.java | @@ -16,6 +16,7 @@
package org.springframework.http.server;
+
/**
* TODO..
*/ | true |
Other | spring-projects | spring-framework | 7845ebc428e9705a3a4404fff47e434effd5465f.json | Add SockJS path detection | spring-web/src/main/java/org/springframework/http/server/AsyncServletServerHttpRequest.java | @@ -100,18 +100,14 @@ public void startAsync() {
}
}
- public void dispatch() {
- Assert.notNull(this.asyncContext, "Cannot dispatch without an AsyncContext");
- this.asyncContext.dispatch();
- }
-
public void completeAsync() {
Assert.notNull(this.asyncContext, "Cannot dispatch without an AsyncContext");
... | true |
Other | spring-projects | spring-framework | 7845ebc428e9705a3a4404fff47e434effd5465f.json | Add SockJS path detection | spring-websocket/src/main/java/org/springframework/web/socket/client/endpoint/StandardWebSocketClient.java | @@ -75,17 +75,9 @@ public WebSocketSession doHandshake(WebSocketHandler webSocketHandler, String ur
public WebSocketSession doHandshake(WebSocketHandler webSocketHandler,
final HttpHeaders httpHeaders, URI uri) throws WebSocketConnectFailureException {
- return doHandshake(webSocketHandler, httpHeaders, UriCom... | true |
Other | spring-projects | spring-framework | 7845ebc428e9705a3a4404fff47e434effd5465f.json | Add SockJS path detection | spring-websocket/src/main/java/org/springframework/web/socket/client/jetty/JettyWebSocketClient.java | @@ -133,19 +133,11 @@ public WebSocketSession doHandshake(WebSocketHandler webSocketHandler, String ur
public WebSocketSession doHandshake(WebSocketHandler webSocketHandler, HttpHeaders headers, URI uri)
throws WebSocketConnectFailureException {
- return doHandshake(webSocketHandler, headers, UriComponentsBuil... | true |
Other | spring-projects | spring-framework | 7845ebc428e9705a3a4404fff47e434effd5465f.json | Add SockJS path detection | spring-websocket/src/main/java/org/springframework/web/socket/server/DefaultHandshakeHandler.java | @@ -149,7 +149,7 @@ public final boolean doHandshake(ServerHttpRequest request, ServerHttpResponse r
protected void handleInvalidUpgradeHeader(ServerHttpRequest request, ServerHttpResponse response) throws IOException {
logger.debug("Invalid Upgrade header " + request.getHeaders().getUpgrade());
response.setSta... | true |
Other | spring-projects | spring-framework | 7845ebc428e9705a3a4404fff47e434effd5465f.json | Add SockJS path detection | spring-websocket/src/main/java/org/springframework/web/socket/server/endpoint/package-info.java | @@ -20,9 +20,7 @@
* {@link org.springframework.web.socket.server.endpoint.EndpointExporter} for
* registering type-based endpoints,
* {@link org.springframework.web.socket.server.endpoint.SpringConfigurator} for
- * instantiating annotated endpoints through Spring, and
- * {@link org.springframework.websocket.ser... | true |
Other | spring-projects | spring-framework | 7845ebc428e9705a3a4404fff47e434effd5465f.json | Add SockJS path detection | spring-websocket/src/main/java/org/springframework/web/socket/sockjs/AbstractServerSockJsSession.java | @@ -83,7 +83,6 @@ public final synchronized void closeInternal(CloseStatus status) throws IOExcept
disconnect(status);
}
- // TODO: close status/reason
protected abstract void disconnect(CloseStatus status) throws IOException;
/**
@@ -104,12 +103,14 @@ protected void writeFrame(SockJsFrame frame) throws IO... | true |
Other | spring-projects | spring-framework | 7845ebc428e9705a3a4404fff47e434effd5465f.json | Add SockJS path detection | spring-websocket/src/main/java/org/springframework/web/socket/sockjs/AbstractSockJsService.java | @@ -17,11 +17,16 @@
import java.io.IOException;
import java.nio.charset.Charset;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Random;
+import java.util.... | true |
Other | spring-projects | spring-framework | 7845ebc428e9705a3a4404fff47e434effd5465f.json | Add SockJS path detection | spring-websocket/src/main/java/org/springframework/web/socket/sockjs/AbstractSockJsSession.java | @@ -217,15 +217,15 @@ protected void connectionClosedInternal(CloseStatus status) {
* <p>Performs cleanup and notifies the {@link SockJsHandler}.
*/
public final void close() throws IOException {
- close(CloseStatus.NORMAL);
+ close(new CloseStatus(3000, "Go away!"));
}
/**
* {@inheritDoc}
* <p>Pe... | true |
Other | spring-projects | spring-framework | 7845ebc428e9705a3a4404fff47e434effd5465f.json | Add SockJS path detection | spring-websocket/src/main/java/org/springframework/web/socket/sockjs/SockJsFrame.java | @@ -78,6 +78,30 @@ public byte[] getContentBytes() {
return this.content.getBytes(Charset.forName("UTF-8"));
}
+ public static String escapeCharacters(char[] chars) {
+ StringBuilder result = new StringBuilder();
+ for (char ch : chars) {
+ if (isSockJsEscapeCharacter(ch)) {
+ result.append('\\').append('... | true |
Other | spring-projects | spring-framework | 7845ebc428e9705a3a4404fff47e434effd5465f.json | Add SockJS path detection | spring-websocket/src/main/java/org/springframework/web/socket/sockjs/SockJsService.java | @@ -23,13 +23,14 @@
import org.springframework.web.socket.WebSocketHandler;
/**
+ *
* @author Rossen Stoyanchev
* @since 4.0
*/
public interface SockJsService {
- void handleRequest(ServerHttpRequest request, ServerHttpResponse response,
- String sockJsPath, WebSocketHandler webSocketHandler) throws IO... | true |
Other | spring-projects | spring-framework | 7845ebc428e9705a3a4404fff47e434effd5465f.json | Add SockJS path detection | spring-websocket/src/main/java/org/springframework/web/socket/sockjs/TransportType.java | @@ -17,7 +17,9 @@
package org.springframework.web.socket.sockjs;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import org.springframework.http.HttpMethod;
@@ -50,13 +52,22 @@ public enum TransportType {
private final List<String> headerHints;
+ private... | true |
Other | spring-projects | spring-framework | 7845ebc428e9705a3a4404fff47e434effd5465f.json | Add SockJS path detection | spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/DefaultSockJsService.java | @@ -177,7 +177,7 @@ protected void handleTransportRequest(ServerHttpRequest request, ServerHttpRespo
if (!supportedMethod.equals(request.getMethod())) {
if (HttpMethod.OPTIONS.equals(request.getMethod()) && transportType.supportsCors()) {
response.setStatusCode(HttpStatus.NO_CONTENT);
- addCorsHeaders(re... | true |
Other | spring-projects | spring-framework | 7845ebc428e9705a3a4404fff47e434effd5465f.json | Add SockJS path detection | spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/SockJsHttpRequestHandler.java | @@ -32,38 +32,24 @@
import org.springframework.web.socket.sockjs.SockJsService;
import org.springframework.web.socket.support.ExceptionWebSocketHandlerDecorator;
import org.springframework.web.socket.support.LoggingWebSocketHandlerDecorator;
-import org.springframework.web.util.NestedServletException;
-import org.sp... | true |
Other | spring-projects | spring-framework | 7845ebc428e9705a3a4404fff47e434effd5465f.json | Add SockJS path detection | spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/AbstractHttpReceivingTransportHandler.java | @@ -28,6 +28,7 @@
import org.springframework.http.server.ServerHttpResponse;
import org.springframework.web.socket.WebSocketHandler;
import org.springframework.web.socket.sockjs.AbstractSockJsSession;
+import org.springframework.web.socket.sockjs.SockJsFrame;
import org.springframework.web.socket.sockjs.SockJsRunti... | true |
Other | spring-projects | spring-framework | 7845ebc428e9705a3a4404fff47e434effd5465f.json | Add SockJS path detection | spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/AbstractHttpServerSockJsSession.java | @@ -157,12 +157,13 @@ protected void disconnect(CloseStatus status) {
protected synchronized void resetRequest() {
updateLastActiveTime();
- if (isActive()) {
+ if (isActive() && this.asyncRequest.isAsyncStarted()) {
try {
+ logger.debug("Completing async request");
this.asyncRequest.completeAsync(... | true |
Other | spring-projects | spring-framework | 7845ebc428e9705a3a4404fff47e434effd5465f.json | Add SockJS path detection | spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/StreamingServerSockJsSession.java | @@ -41,7 +41,11 @@ public synchronized void setInitialRequest(ServerHttpRequest request, ServerHttp
FrameFormat frameFormat) throws TransportErrorException {
super.setInitialRequest(request, response, frameFormat);
- super.setLongPollingRequest(request, response, frameFormat);
+
+ // the WebSocketHandler del... | true |
Other | spring-projects | spring-framework | 7845ebc428e9705a3a4404fff47e434effd5465f.json | Add SockJS path detection | spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/WebSocketServerSockJsSession.java | @@ -62,7 +62,7 @@ public void initWebSocketSession(WebSocketSession session) throws Exception {
@Override
public boolean isActive() {
- return this.webSocketSession.isOpen();
+ return ((this.webSocketSession != null) && this.webSocketSession.isOpen());
}
public void handleMessage(TextMessage message, WebS... | true |
Other | spring-projects | spring-framework | 7845ebc428e9705a3a4404fff47e434effd5465f.json | Add SockJS path detection | spring-websocket/src/test/java/org/springframework/web/socket/AbstractHttpRequestTests.java | @@ -0,0 +1,61 @@
+/*
+ * Copyright 2002-2013 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 | 7845ebc428e9705a3a4404fff47e434effd5465f.json | Add SockJS path detection | spring-websocket/src/test/java/org/springframework/web/socket/sockjs/AbstractSockJsServiceTests.java | @@ -0,0 +1,145 @@
+/*
+ * Copyright 2002-2013 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 | 7845ebc428e9705a3a4404fff47e434effd5465f.json | Add SockJS path detection | spring-websocket/src/test/java/org/springframework/web/socket/sockjs/StubSockJsConfig.java | @@ -0,0 +1,59 @@
+/*
+ * Copyright 2002-2013 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 | 7845ebc428e9705a3a4404fff47e434effd5465f.json | Add SockJS path detection | spring-websocket/src/test/java/org/springframework/web/socket/sockjs/StubTaskScheduler.java | @@ -0,0 +1,87 @@
+/*
+ * Copyright 2002-2013 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 | 7845ebc428e9705a3a4404fff47e434effd5465f.json | Add SockJS path detection | spring-websocket/src/test/java/org/springframework/web/socket/sockjs/TransportTypeTests.java | @@ -0,0 +1,42 @@
+/*
+ * Copyright 2002-2013 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 | 7845ebc428e9705a3a4404fff47e434effd5465f.json | Add SockJS path detection | spring-websocket/src/test/java/org/springframework/web/socket/sockjs/support/DefaultSockJsServiceTests.java | @@ -18,11 +18,13 @@
import java.util.Map;
+import org.junit.Before;
import org.junit.Test;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
+import org.springframework.web.socket.AbstractHttpRequestTests;
+import org.springframework.web.socket.adapter.TextWebSocketHandlerAdapter;
+import... | true |
Other | spring-projects | spring-framework | 7845ebc428e9705a3a4404fff47e434effd5465f.json | Add SockJS path detection | spring-websocket/src/test/resources/log4j.xml | @@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration PUBLIC "-//APACHE//DTD LOG4J 1.2//EN" "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+ <!-- Appenders -->
+ <appender name="console" class="org.apache.log4j.ConsoleAppender">
+ <param name="Tar... | true |
Other | spring-projects | spring-framework | 2a7935a9132e7b8cd0efcd81b1a250527306c9b2.json | Add WebSocketSession attributes + initialization
In addition to adding the attributes, there is now mechanism for
initializing WebSocketSession instances from attributes of the
handshake request. | spring-web/src/main/java/org/springframework/http/server/ServerHttpRequest.java | @@ -16,6 +16,8 @@
package org.springframework.http.server;
+import java.security.Principal;
+
import org.springframework.http.HttpInputMessage;
import org.springframework.http.HttpRequest;
import org.springframework.util.MultiValueMap;
@@ -33,4 +35,21 @@ public interface ServerHttpRequest extends HttpRequest, H... | true |
Other | spring-projects | spring-framework | 2a7935a9132e7b8cd0efcd81b1a250527306c9b2.json | Add WebSocketSession attributes + initialization
In addition to adding the attributes, there is now mechanism for
initializing WebSocketSession instances from attributes of the
handshake request. | spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java | @@ -26,6 +26,7 @@
import java.net.URISyntaxException;
import java.net.URLEncoder;
import java.nio.charset.Charset;
+import java.security.Principal;
import java.util.Arrays;
import java.util.Enumeration;
import java.util.HashMap;
@@ -131,6 +132,21 @@ public HttpHeaders getHeaders() {
return this.headers;
}
... | true |
Other | spring-projects | spring-framework | 2a7935a9132e7b8cd0efcd81b1a250527306c9b2.json | Add WebSocketSession attributes + initialization
In addition to adding the attributes, there is now mechanism for
initializing WebSocketSession instances from attributes of the
handshake request. | spring-websocket/src/main/java/org/springframework/sockjs/AbstractSockJsSession.java | @@ -18,14 +18,15 @@
import java.io.IOException;
import java.net.URI;
+import java.security.Principal;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.util.Assert;
import org.springframework.websocket.CloseStatus;
import org.springframework.webso... | true |
Other | spring-projects | spring-framework | 2a7935a9132e7b8cd0efcd81b1a250527306c9b2.json | Add WebSocketSession attributes + initialization
In addition to adding the attributes, there is now mechanism for
initializing WebSocketSession instances from attributes of the
handshake request. | spring-websocket/src/main/java/org/springframework/sockjs/SockJsSessionFactory.java | @@ -17,7 +17,6 @@
package org.springframework.sockjs;
import org.springframework.websocket.WebSocketHandler;
-import org.springframework.websocket.WebSocketSession;
/**
* A factory for creating a SockJS session.
@@ -26,14 +25,14 @@
* @author Rossen Stoyanchev
* @since 4.0
*/
-public interface SockJsSessi... | true |
Other | spring-projects | spring-framework | 2a7935a9132e7b8cd0efcd81b1a250527306c9b2.json | Add WebSocketSession attributes + initialization
In addition to adding the attributes, there is now mechanism for
initializing WebSocketSession instances from attributes of the
handshake request. | spring-websocket/src/main/java/org/springframework/sockjs/server/AbstractSockJsService.java | @@ -51,7 +51,7 @@ public abstract class AbstractSockJsService implements SockJsService, SockJsConf
private static final int ONE_YEAR = 365 * 24 * 60 * 60;
- private String name = getClass().getSimpleName() + "@" + ObjectUtils.getIdentityHexString(this);
+ private String name = "SockJS Service " + ObjectUtils.getI... | true |
Other | spring-projects | spring-framework | 2a7935a9132e7b8cd0efcd81b1a250527306c9b2.json | Add WebSocketSession attributes + initialization
In addition to adding the attributes, there is now mechanism for
initializing WebSocketSession instances from attributes of the
handshake request. | spring-websocket/src/main/java/org/springframework/sockjs/server/TransportType.java | @@ -68,15 +68,15 @@ public HttpMethod getHttpMethod() {
return this.httpMethod;
}
- public boolean setsNoCacheHeader() {
+ public boolean setsNoCache() {
return this.headerHints.contains("no_cache");
}
public boolean supportsCors() {
return this.headerHints.contains("cors");
}
- public boolean se... | true |
Other | spring-projects | spring-framework | 2a7935a9132e7b8cd0efcd81b1a250527306c9b2.json | Add WebSocketSession attributes + initialization
In addition to adding the attributes, there is now mechanism for
initializing WebSocketSession instances from attributes of the
handshake request. | spring-websocket/src/main/java/org/springframework/sockjs/server/support/DefaultSockJsService.java | @@ -54,6 +54,7 @@
import org.springframework.websocket.WebSocketHandler;
import org.springframework.websocket.server.DefaultHandshakeHandler;
import org.springframework.websocket.server.HandshakeHandler;
+import org.springframework.websocket.server.support.ServerWebSocketSessionInitializer;
/**
@@ -69,6 +70,8 @... | true |
Other | spring-projects | spring-framework | 2a7935a9132e7b8cd0efcd81b1a250527306c9b2.json | Add WebSocketSession attributes + initialization
In addition to adding the attributes, there is now mechanism for
initializing WebSocketSession instances from attributes of the
handshake request. | spring-websocket/src/main/java/org/springframework/sockjs/server/transport/AbstractHttpSendingTransportHandler.java | @@ -39,7 +39,7 @@
* @since 4.0
*/
public abstract class AbstractHttpSendingTransportHandler
- implements ConfigurableTransportHandler, SockJsSessionFactory<AbstractSockJsSession> {
+ implements ConfigurableTransportHandler, SockJsSessionFactory {
protected final Log logger = LogFactory.getLog(this.getClass()... | true |
Other | spring-projects | spring-framework | 2a7935a9132e7b8cd0efcd81b1a250527306c9b2.json | Add WebSocketSession attributes + initialization
In addition to adding the attributes, there is now mechanism for
initializing WebSocketSession instances from attributes of the
handshake request. | spring-websocket/src/main/java/org/springframework/sockjs/server/transport/SockJsWebSocketHandler.java | @@ -16,22 +16,16 @@
package org.springframework.sockjs.server.transport;
-import java.io.IOException;
import java.util.concurrent.atomic.AtomicInteger;
-import org.springframework.sockjs.server.AbstractServerSockJsSession;
import org.springframework.sockjs.server.SockJsConfiguration;
-import org.springframewor... | true |
Other | spring-projects | spring-framework | 2a7935a9132e7b8cd0efcd81b1a250527306c9b2.json | Add WebSocketSession attributes + initialization
In addition to adding the attributes, there is now mechanism for
initializing WebSocketSession instances from attributes of the
handshake request. | spring-websocket/src/main/java/org/springframework/sockjs/server/transport/WebSocketServerSockJsSession.java | @@ -0,0 +1,107 @@
+/*
+ * Copyright 2002-2013 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 | 2a7935a9132e7b8cd0efcd81b1a250527306c9b2.json | Add WebSocketSession attributes + initialization
In addition to adding the attributes, there is now mechanism for
initializing WebSocketSession instances from attributes of the
handshake request. | spring-websocket/src/main/java/org/springframework/sockjs/server/transport/WebSocketTransportHandler.java | @@ -21,6 +21,7 @@
import org.springframework.http.server.ServerHttpRequest;
import org.springframework.http.server.ServerHttpResponse;
import org.springframework.sockjs.AbstractSockJsSession;
+import org.springframework.sockjs.SockJsSessionFactory;
import org.springframework.sockjs.server.ConfigurableTransportHandl... | true |
Other | spring-projects | spring-framework | 2a7935a9132e7b8cd0efcd81b1a250527306c9b2.json | Add WebSocketSession attributes + initialization
In addition to adding the attributes, there is now mechanism for
initializing WebSocketSession instances from attributes of the
handshake request. | spring-websocket/src/main/java/org/springframework/websocket/WebSocketSession.java | @@ -17,7 +17,9 @@
package org.springframework.websocket;
import java.io.IOException;
+import java.net.InetSocketAddress;
import java.net.URI;
+import java.security.Principal;
/**
* Allows sending messages over a WebSocket connection as well as closing it.
@@ -33,19 +35,36 @@ public interface WebSocketSession ... | true |
Other | spring-projects | spring-framework | 2a7935a9132e7b8cd0efcd81b1a250527306c9b2.json | Add WebSocketSession attributes + initialization
In addition to adding the attributes, there is now mechanism for
initializing WebSocketSession instances from attributes of the
handshake request. | spring-websocket/src/main/java/org/springframework/websocket/adapter/AbstractWebSocketSesssionAdapter.java | @@ -1,5 +1,4 @@
/*
- * Copyright 2002-2013 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.
@@ -34,11 +33,13 @@
* @author Rossen Stoyanchev
* @since 4.0
*/
-public abstract class AbstractWe... | true |
Other | spring-projects | spring-framework | 2a7935a9132e7b8cd0efcd81b1a250527306c9b2.json | Add WebSocketSession attributes + initialization
In addition to adding the attributes, there is now mechanism for
initializing WebSocketSession instances from attributes of the
handshake request. | spring-websocket/src/main/java/org/springframework/websocket/adapter/ConfigurableWebSocketSession.java | @@ -0,0 +1,39 @@
+/*
+ * Copyright 2002-2013 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 | 2a7935a9132e7b8cd0efcd81b1a250527306c9b2.json | Add WebSocketSession attributes + initialization
In addition to adding the attributes, there is now mechanism for
initializing WebSocketSession instances from attributes of the
handshake request. | spring-websocket/src/main/java/org/springframework/websocket/adapter/JettyWebSocketListenerAdapter.java | @@ -25,7 +25,6 @@
import org.springframework.websocket.CloseStatus;
import org.springframework.websocket.TextMessage;
import org.springframework.websocket.WebSocketHandler;
-import org.springframework.websocket.WebSocketSession;
import org.springframework.websocket.support.ExceptionWebSocketHandlerDecorator;
/**... | true |
Other | spring-projects | spring-framework | 2a7935a9132e7b8cd0efcd81b1a250527306c9b2.json | Add WebSocketSession attributes + initialization
In addition to adding the attributes, there is now mechanism for
initializing WebSocketSession instances from attributes of the
handshake request. | spring-websocket/src/main/java/org/springframework/websocket/adapter/JettyWebSocketSessionAdapter.java | @@ -17,9 +17,12 @@
package org.springframework.websocket.adapter;
import java.io.IOException;
+import java.net.InetSocketAddress;
import java.net.URI;
+import java.security.Principal;
import org.eclipse.jetty.websocket.api.Session;
+import org.springframework.util.Assert;
import org.springframework.util.Object... | true |
Other | spring-projects | spring-framework | 2a7935a9132e7b8cd0efcd81b1a250527306c9b2.json | Add WebSocketSession attributes + initialization
In addition to adding the attributes, there is now mechanism for
initializing WebSocketSession instances from attributes of the
handshake request. | spring-websocket/src/main/java/org/springframework/websocket/adapter/StandardEndpointAdapter.java | @@ -30,12 +30,11 @@
import org.springframework.websocket.CloseStatus;
import org.springframework.websocket.TextMessage;
import org.springframework.websocket.WebSocketHandler;
-import org.springframework.websocket.WebSocketSession;
import org.springframework.websocket.support.ExceptionWebSocketHandlerDecorator;
... | true |
Other | spring-projects | spring-framework | 2a7935a9132e7b8cd0efcd81b1a250527306c9b2.json | Add WebSocketSession attributes + initialization
In addition to adding the attributes, there is now mechanism for
initializing WebSocketSession instances from attributes of the
handshake request. | spring-websocket/src/main/java/org/springframework/websocket/adapter/StandardWebSocketSessionAdapter.java | @@ -18,6 +18,7 @@
import java.io.IOException;
import java.net.URI;
+import java.security.Principal;
import javax.websocket.CloseReason;
import javax.websocket.CloseReason.CloseCodes;
@@ -35,35 +36,76 @@
* @author Rossen Stoyanchev
* @since 4.0
*/
-public class StandardWebSocketSessionAdapter extends Abstr... | true |
Other | spring-projects | spring-framework | 2a7935a9132e7b8cd0efcd81b1a250527306c9b2.json | Add WebSocketSession attributes + initialization
In addition to adding the attributes, there is now mechanism for
initializing WebSocketSession instances from attributes of the
handshake request. | spring-websocket/src/main/java/org/springframework/websocket/client/endpoint/StandardWebSocketClient.java | @@ -28,12 +28,12 @@
import javax.websocket.ContainerProvider;
import javax.websocket.Endpoint;
import javax.websocket.HandshakeResponse;
-import javax.websocket.Session;
import javax.websocket.WebSocketContainer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.sp... | true |
Other | spring-projects | spring-framework | 2a7935a9132e7b8cd0efcd81b1a250527306c9b2.json | Add WebSocketSession attributes + initialization
In addition to adding the attributes, there is now mechanism for
initializing WebSocketSession instances from attributes of the
handshake request. | spring-websocket/src/main/java/org/springframework/websocket/client/jetty/JettyWebSocketClient.java | @@ -17,13 +17,12 @@
package org.springframework.websocket.client.jetty;
import java.net.URI;
-import java.util.concurrent.Future;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.eclipse.jetty.websocket.api.Session;
import org.springframework.context.SmartLifecyc... | true |
Other | spring-projects | spring-framework | 2a7935a9132e7b8cd0efcd81b1a250527306c9b2.json | Add WebSocketSession attributes + initialization
In addition to adding the attributes, there is now mechanism for
initializing WebSocketSession instances from attributes of the
handshake request. | spring-websocket/src/main/java/org/springframework/websocket/server/support/AbstractEndpointUpgradeStrategy.java | @@ -26,6 +26,8 @@
import org.springframework.http.server.ServerHttpResponse;
import org.springframework.websocket.WebSocketHandler;
import org.springframework.websocket.adapter.StandardEndpointAdapter;
+import org.springframework.websocket.adapter.StandardWebSocketSessionAdapter;
+import org.springframework.websocke... | true |
Other | spring-projects | spring-framework | 2a7935a9132e7b8cd0efcd81b1a250527306c9b2.json | Add WebSocketSession attributes + initialization
In addition to adding the attributes, there is now mechanism for
initializing WebSocketSession instances from attributes of the
handshake request. | spring-websocket/src/main/java/org/springframework/websocket/server/support/JettyRequestUpgradeStrategy.java | @@ -34,6 +34,7 @@
import org.springframework.util.Assert;
import org.springframework.websocket.WebSocketHandler;
import org.springframework.websocket.adapter.JettyWebSocketListenerAdapter;
+import org.springframework.websocket.adapter.JettyWebSocketSessionAdapter;
import org.springframework.websocket.server.Handsha... | true |
Other | spring-projects | spring-framework | 2a7935a9132e7b8cd0efcd81b1a250527306c9b2.json | Add WebSocketSession attributes + initialization
In addition to adding the attributes, there is now mechanism for
initializing WebSocketSession instances from attributes of the
handshake request. | spring-websocket/src/main/java/org/springframework/websocket/server/support/ServerWebSocketSessionInitializer.java | @@ -0,0 +1,38 @@
+/*
+ * Copyright 2002-2013 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 | 2a7935a9132e7b8cd0efcd81b1a250527306c9b2.json | Add WebSocketSession attributes + initialization
In addition to adding the attributes, there is now mechanism for
initializing WebSocketSession instances from attributes of the
handshake request. | spring-websocket/src/main/java/org/springframework/websocket/support/LoggingWebSocketHandlerDecorator.java | @@ -41,7 +41,7 @@ public LoggingWebSocketHandlerDecorator(WebSocketHandler delegate) {
@Override
public void afterConnectionEstablished(WebSocketSession session) throws Exception {
if (logger.isDebugEnabled()) {
- logger.debug("Connection established, " + session + ", uri=" + session.getURI());
+ logger.debu... | true |
Other | spring-projects | spring-framework | 166ca7a5a3254c6d63551ad286a9e55375276e85.json | Update exception handling
Allow WebSocketHandler methods to raise an exception.
By default we install ExceptionWebSocketHandlerDecorator, which logs
unhandled exceptions and closes the session. That decorator can be
extended or replaced.
Any exceptions that remain unhandled still (i.e. no exception handling
decorato... | spring-websocket/src/main/java/org/springframework/sockjs/AbstractSockJsSession.java | @@ -118,7 +118,7 @@ protected void updateLastActiveTime() {
this.timeLastActive = System.currentTimeMillis();
}
- public void delegateConnectionEstablished() {
+ public void delegateConnectionEstablished() throws Exception {
this.state = State.OPEN;
this.handler.afterConnectionEstablished(this);
}
@@ -12... | true |
Other | spring-projects | spring-framework | 166ca7a5a3254c6d63551ad286a9e55375276e85.json | Update exception handling
Allow WebSocketHandler methods to raise an exception.
By default we install ExceptionWebSocketHandlerDecorator, which logs
unhandled exceptions and closes the session. That decorator can be
extended or replaced.
Any exceptions that remain unhandled still (i.e. no exception handling
decorato... | spring-websocket/src/main/java/org/springframework/sockjs/server/AbstractServerSockJsSession.java | @@ -111,7 +111,7 @@ protected void writeFrame(SockJsFrame frame) throws IOException {
catch (Throwable ex) {
logger.warn("Terminating connection due to failure to send message: " + ex.getMessage());
close();
- throw new NestedSockJsRuntimeException("Failed to write " + frame, ex);
+ throw new SockJsRunti... | true |
Other | spring-projects | spring-framework | 166ca7a5a3254c6d63551ad286a9e55375276e85.json | Update exception handling
Allow WebSocketHandler methods to raise an exception.
By default we install ExceptionWebSocketHandlerDecorator, which logs
unhandled exceptions and closes the session. That decorator can be
extended or replaced.
Any exceptions that remain unhandled still (i.e. no exception handling
decorato... | spring-websocket/src/main/java/org/springframework/sockjs/server/SockJsRuntimeException.java | @@ -24,13 +24,13 @@
* @since 4.0
*/
@SuppressWarnings("serial")
-public class NestedSockJsRuntimeException extends NestedRuntimeException {
+public class SockJsRuntimeException extends NestedRuntimeException {
- public NestedSockJsRuntimeException(String msg) {
+ public SockJsRuntimeException(String msg) {
su... | true |
Other | spring-projects | spring-framework | 166ca7a5a3254c6d63551ad286a9e55375276e85.json | Update exception handling
Allow WebSocketHandler methods to raise an exception.
By default we install ExceptionWebSocketHandlerDecorator, which logs
unhandled exceptions and closes the session. That decorator can be
extended or replaced.
Any exceptions that remain unhandled still (i.e. no exception handling
decorato... | spring-websocket/src/main/java/org/springframework/sockjs/server/transport/AbstractHttpReceivingTransportHandler.java | @@ -27,9 +27,11 @@
import org.springframework.http.server.ServerHttpRequest;
import org.springframework.http.server.ServerHttpResponse;
import org.springframework.sockjs.AbstractSockJsSession;
+import org.springframework.sockjs.server.SockJsRuntimeException;
import org.springframework.sockjs.server.TransportErrorEx... | true |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.