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 | d40c8cfc58298f3c5f0fea5870d0aed495ba3fb9.json | Fix broken Castor URLs in ref docs and mapping XML
Issue: SPR-10189 | spring-oxm/src/main/java/org/springframework/oxm/castor/package-info.java | @@ -1,7 +1,7 @@
/**
*
- * Package providing integration of <a href="http://www.castor.org/xml-mapping.html">Castor</a> within Springs O/X Mapping
+ * Package providing integration of <a href="http://castor.codehaus.org/xml-mapping.html">Castor</a> within Springs O/X Mapping
* support
*
*/ | true |
Other | spring-projects | spring-framework | d40c8cfc58298f3c5f0fea5870d0aed495ba3fb9.json | Fix broken Castor URLs in ref docs and mapping XML
Issue: SPR-10189 | spring-oxm/src/test/resources/org/springframework/oxm/castor/mapping.xml | @@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE mapping PUBLIC "-//EXOLAB/Castor Mapping DTD Version 1.0//EN" "http://castor.org/mapping.dtd">
+<!DOCTYPE mapping PUBLIC "-//EXOLAB/Castor Mapping DTD Version 1.0//EN" "http://castor.codehaus.org/mapping.dtd">
<mapping>
<description>Castor generated mapping file</... | true |
Other | spring-projects | spring-framework | d40c8cfc58298f3c5f0fea5870d0aed495ba3fb9.json | Fix broken Castor URLs in ref docs and mapping XML
Issue: SPR-10189 | src/reference/docbook/oxm.xml | @@ -438,7 +438,7 @@ public class Application {
though a mapping file can be used to have more control over the behavior of Castor.
</para>
<para>
- For more information on Castor, refer to the <link xl:href="http://castor.org/xml-framework.html">
+ For more informati... | true |
Other | spring-projects | spring-framework | 24cc33306def7aff4aa2c797cd4aea320a4f8523.json | Fix typo in reference documentation
Issue: SPR-10171 | src/reference/docbook/overview.xml | @@ -362,7 +362,7 @@ TR: OK. Added to diagram.--></para>
places:<itemizedlist>
<listitem>
<para>On the community download site <link
- xl:href="http://www.springsource.org/downloads/community">http://www.springsource.org/downloads/community</link>.
+ xl:href="http://w... | false |
Other | spring-projects | spring-framework | 5360bd899d68bf01ec916c429296735b34e172c3.json | Fix warnings and polish LocalSessionFactoryBuilder | org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBuilder.java | @@ -47,13 +47,14 @@
* adding {@link SpringSessionContext} as a default and providing convenient ways
* to specify a DataSource and an application class loader.
*
- * <p>This is designed for programmatic use, e.g. in <code>@Bean</code> factory methods.
+ * <p>This is designed for programmatic use, e.g. in {@code @... | false |
Other | spring-projects | spring-framework | 17ce06acec364959e491db65196a61e199bf3f5c.json | Update changelog re destroy method inference
Issue: SPR-8751 | build-spring-framework/resources/changelog.txt | @@ -11,6 +11,7 @@ Changes in version 3.1 RC1 (2011-10-11)
* support for load-time weaving on WebSphere 7 and 8
* updated JBossLoadTimeWeaver to automatically detect and support JBoss AS 7 as well
* added support for Hibernate 4.0 (HibernateJpaDialect as well as natively in orm.hibernate4)
+* added 'destroy method in... | false |
Other | spring-projects | spring-framework | 8cafb7ee13b68ce8f21b01c49d2feba7a818b1ed.json | Fix warnings in DisposableBeanAdapter | org.springframework.beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java | @@ -54,6 +54,7 @@
* @see org.springframework.beans.factory.config.DestructionAwareBeanPostProcessor
* @see AbstractBeanDefinition#getDestroyMethodName()
*/
+@SuppressWarnings("serial")
class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable {
private static final Log logger = LogFactory... | false |
Other | spring-projects | spring-framework | d09faabcb6b1629361d4e58dd957a1de83407078.json | Update changelog re @EnableAspectJAutoProxy
Issue: SPR-8138 | build-spring-framework/resources/changelog.txt | @@ -12,6 +12,7 @@ Changes in version 3.1 RC1 (2011-10-11)
* updated JBossLoadTimeWeaver to automatically detect and support JBoss AS 7 as well
* added support for Hibernate 4.0 (HibernateJpaDialect as well as natively in orm.hibernate4)
* prepared Spring's DataSource and RowSet adapters for forward compatibility wit... | false |
Other | spring-projects | spring-framework | 5377fae7f5c17c90aeca90d97b9d1d70fbc6a434.json | Remove duplicate Javadoc line from PathResource
Remove duplicate Javadoc comment from PathResource that was
accidentally introduced during the merge.
Issue: SPR-10608 | spring-core/src/main/java/org/springframework/core/io/PathResource.java | @@ -58,7 +58,6 @@ public PathResource(Path path) {
}
/**
- * Create a new PathResource from a Path handle.
* Create a new PathResource from a Path handle.
* <p>Note: Unlike {@link FileSystemResource}, when building relative resources
* via {@link #createRelative}, the relative path will be built <i>unde... | false |
Other | spring-projects | spring-framework | ecf8464d2fc5233d4a75de5a99cd871d07c82de1.json | Replace MaxPermSize use in build scripts
Since JDK 8 is required to build Spring framework 4, and permanent
generation is gone from Java 8, to eliminate warnings about no longer
available MaxPermSize switch, it should be removed or replaced with new
MaxMetaspaceSize switch.
This fix replaces old with new switch to li... | build.gradle | @@ -961,7 +961,7 @@ configure(rootProject) {
gradleVersion = "1.6"
doLast() {
- def gradleOpts = "-XX:MaxPermSize=1024m -Xmx1024m"
+ def gradleOpts = "-XX:MaxMetaspaceSize=1024m -Xmx1024m"
def gradleBatOpts = "$gradleOpts -XX:MaxHeapSize=256m"
File wrapperFile = file("gradlew")
wrapperFile.text ... | true |
Other | spring-projects | spring-framework | ecf8464d2fc5233d4a75de5a99cd871d07c82de1.json | Replace MaxPermSize use in build scripts
Since JDK 8 is required to build Spring framework 4, and permanent
generation is gone from Java 8, to eliminate warnings about no longer
available MaxPermSize switch, it should be removed or replaced with new
MaxMetaspaceSize switch.
This fix replaces old with new switch to li... | gradlew | @@ -7,7 +7,7 @@
##############################################################################
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-GRADLE_OPTS="-XX:MaxPermSize=1024m -Xmx1024m $GRADLE_OPTS"
+GRADLE_OPTS="-XX:MaxMetaspaceSize=1024m -Xmx1024m... | true |
Other | spring-projects | spring-framework | ecf8464d2fc5233d4a75de5a99cd871d07c82de1.json | Replace MaxPermSize use in build scripts
Since JDK 8 is required to build Spring framework 4, and permanent
generation is gone from Java 8, to eliminate warnings about no longer
available MaxPermSize switch, it should be removed or replaced with new
MaxMetaspaceSize switch.
This fix replaces old with new switch to li... | gradlew.bat | @@ -9,7 +9,7 @@
if "%OS%"=="Windows_NT" setlocal
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set GRADLE_OPTS=-XX:MaxPermSize=1024m -Xmx1024m -XX:MaxHeapSize=256m %GRADLE_OPTS%
+set GRADLE_OPTS=-XX:MaxMetaspaceSize=1024m -Xmx1024m -XX:MaxHeapS... | true |
Other | spring-projects | spring-framework | 69ef364ef9b874db3c88f7a3f84f6ab5182d22c7.json | Introduce messaging package
org.springframework.web.stomp is now
org.springframework.web.messaging.stomp
Also classes in the ~.stomp.server and ~.stomp.adapter packages have
been renamed. | spring-websocket/src/main/java/org/springframework/web/messaging/stomp/StompCommand.java | @@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.web.stomp;
+package org.springframework.web.messaging.stomp;
/** | true |
Other | spring-projects | spring-framework | 69ef364ef9b874db3c88f7a3f84f6ab5182d22c7.json | Introduce messaging package
org.springframework.web.stomp is now
org.springframework.web.messaging.stomp
Also classes in the ~.stomp.server and ~.stomp.adapter packages have
been renamed. | spring-websocket/src/main/java/org/springframework/web/messaging/stomp/StompException.java | @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.web.stomp;
+package org.springframework.web.messaging.stomp;
import org.springframework.core.NestedRuntimeException;
| true |
Other | spring-projects | spring-framework | 69ef364ef9b874db3c88f7a3f84f6ab5182d22c7.json | Introduce messaging package
org.springframework.web.stomp is now
org.springframework.web.messaging.stomp
Also classes in the ~.stomp.server and ~.stomp.adapter packages have
been renamed. | spring-websocket/src/main/java/org/springframework/web/messaging/stomp/StompHeaders.java | @@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.web.stomp;
+package org.springframework.web.messaging.stomp;
import java.io.Serializable;
import java.util.Collection; | true |
Other | spring-projects | spring-framework | 69ef364ef9b874db3c88f7a3f84f6ab5182d22c7.json | Introduce messaging package
org.springframework.web.stomp is now
org.springframework.web.messaging.stomp
Also classes in the ~.stomp.server and ~.stomp.adapter packages have
been renamed. | spring-websocket/src/main/java/org/springframework/web/messaging/stomp/StompMessage.java | @@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.web.stomp;
+package org.springframework.web.messaging.stomp;
import java.nio.charset.Charset;
| true |
Other | spring-projects | spring-framework | 69ef364ef9b874db3c88f7a3f84f6ab5182d22c7.json | Introduce messaging package
org.springframework.web.stomp is now
org.springframework.web.messaging.stomp
Also classes in the ~.stomp.server and ~.stomp.adapter packages have
been renamed. | spring-websocket/src/main/java/org/springframework/web/messaging/stomp/StompSession.java | @@ -13,13 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.web.stomp;
+package org.springframework.web.messaging.stomp;
import java.io.IOException;
/**
- *
* @author Rossen Stoyanchev
* @since 4.0
*/
@@ -... | true |
Other | spring-projects | spring-framework | 69ef364ef9b874db3c88f7a3f84f6ab5182d22c7.json | Introduce messaging package
org.springframework.web.stomp is now
org.springframework.web.messaging.stomp
Also classes in the ~.stomp.server and ~.stomp.adapter packages have
been renamed. | spring-websocket/src/main/java/org/springframework/web/messaging/stomp/adapter/StompMessageHandler.java | @@ -14,20 +14,18 @@
* limitations under the License.
*/
-package org.springframework.web.stomp.adapter;
+package org.springframework.web.messaging.stomp.adapter;
-import org.springframework.web.stomp.StompMessage;
-import org.springframework.web.stomp.StompSession;
+import org.springframework.web.messaging.stom... | true |
Other | spring-projects | spring-framework | 69ef364ef9b874db3c88f7a3f84f6ab5182d22c7.json | Introduce messaging package
org.springframework.web.stomp is now
org.springframework.web.messaging.stomp
Also classes in the ~.stomp.server and ~.stomp.adapter packages have
been renamed. | spring-websocket/src/main/java/org/springframework/web/messaging/stomp/adapter/StompWebSocketHandler.java | @@ -13,39 +13,38 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.web.stomp.adapter;
+package org.springframework.web.messaging.stomp.adapter;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import... | true |
Other | spring-projects | spring-framework | 69ef364ef9b874db3c88f7a3f84f6ab5182d22c7.json | Introduce messaging package
org.springframework.web.stomp is now
org.springframework.web.messaging.stomp
Also classes in the ~.stomp.server and ~.stomp.adapter packages have
been renamed. | spring-websocket/src/main/java/org/springframework/web/messaging/stomp/adapter/WebSocketStompSession.java | @@ -14,18 +14,20 @@
* limitations under the License.
*/
-package org.springframework.web.stomp.adapter;
+package org.springframework.web.messaging.stomp.adapter;
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
import org.springframework.util.Assert;
+import org.springframewo... | true |
Other | spring-projects | spring-framework | 69ef364ef9b874db3c88f7a3f84f6ab5182d22c7.json | Introduce messaging package
org.springframework.web.stomp is now
org.springframework.web.messaging.stomp
Also classes in the ~.stomp.server and ~.stomp.adapter packages have
been renamed. | spring-websocket/src/main/java/org/springframework/web/messaging/stomp/server/RelayStompService.java | @@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.web.stomp.server;
+package org.springframework.web.messaging.stomp.server;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
@@ -31,10 +31,10 @@
import org.apache.commons.logging.Log;
import org.apache.... | true |
Other | spring-projects | spring-framework | 69ef364ef9b874db3c88f7a3f84f6ab5182d22c7.json | Introduce messaging package
org.springframework.web.stomp is now
org.springframework.web.messaging.stomp
Also classes in the ~.stomp.server and ~.stomp.adapter packages have
been renamed. | spring-websocket/src/main/java/org/springframework/web/messaging/stomp/server/ServerStompMessageHandler.java | @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.web.stomp.server;
+package org.springframework.web.messaging.stomp.server;
import java.io.IOException;
import java.util.ArrayList;
@@ -25,12 +25,12 @@
impor... | true |
Other | spring-projects | spring-framework | 69ef364ef9b874db3c88f7a3f84f6ab5182d22c7.json | Introduce messaging package
org.springframework.web.stomp is now
org.springframework.web.messaging.stomp
Also classes in the ~.stomp.server and ~.stomp.adapter packages have
been renamed. | spring-websocket/src/main/java/org/springframework/web/messaging/stomp/server/SimpleStompService.java | @@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.web.stomp.server;
+package org.springframework.web.messaging.stomp.server;
import java.util.ArrayList;
import java.util.List;
@@ -23,9 +23,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFac... | true |
Other | spring-projects | spring-framework | 69ef364ef9b874db3c88f7a3f84f6ab5182d22c7.json | Introduce messaging package
org.springframework.web.stomp is now
org.springframework.web.messaging.stomp
Also classes in the ~.stomp.server and ~.stomp.adapter packages have
been renamed. | spring-websocket/src/main/java/org/springframework/web/messaging/stomp/support/StompMessageConverter.java | @@ -13,18 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.web.stomp.support;
+package org.springframework.web.messaging.stomp.support;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java... | true |
Other | spring-projects | spring-framework | 3c73a8fc4f2f4a5e6f1751d01c3ec6493f65eff1.json | Instruct contributors to branch from master | CONTRIBUTING.md | @@ -47,13 +47,11 @@ future pull requests as well, simply so that the Spring Framework team knows
immediately that this process is complete.
-## Create your branch from `3.2.x`
+## Create your branch from `master`
-If your pull request addresses a bug or improvement, please create your branch
-from Spring Framewo... | false |
Other | spring-projects | spring-framework | 00fea1f7155b9537b4a847cdae09274b6cf902ca.json | Fix minor typo in README.md | README.md | @@ -39,7 +39,7 @@ a cross-platform, self-contained bootstrap mechanism for the build.
[Git][] and [Early Access build of OpenJDK 1.8 build 88][JDK18 build 88]
> **Note:** Do not use the "lambda" edition of JDK b88 when building the
-ramework, as it still causes some errors. It should be fine, however, to
+framework... | false |
Other | spring-projects | spring-framework | d97f6cf5b8d1e3e18ace9d4b5a3e112c1f986b7b.json | Clarify instructions for building from source
Re-order subsections to make it clear that running a full
`./gradlew build` is not necessary just to import projects
into your IDE or to build and install jars to your .m2 cache. | README.md | @@ -42,14 +42,14 @@ a cross-platform, self-contained bootstrap mechanism for the build.
### check out sources
`git clone git://github.com/SpringSource/spring-framework.git`
-### compile and test, build all jars, distribution zips and docs
-`./gradlew build`
+### import sources into your IDE
+Run `./import-into-ecli... | false |
Other | spring-projects | spring-framework | 9ee292aaf79649a3ce86c184ec91cf0928fedac3.json | Release version 4.0.0.M1 | gradle.properties | @@ -1 +1 @@
-version=4.0.0.BUILD-SNAPSHOT
+version=4.0.0.M1 | false |
Other | spring-projects | spring-framework | 6fe50b502fa2a564692be3419d7f21d96b6c5f64.json | Enforce JDK version on CI server
Add a test to ensure that the CI server does not accidentally build
with the wrong JDK version.
Issue: SPR-10569 | spring-core/src/test/java/org/springframework/tests/BuildTests.java | @@ -0,0 +1,36 @@
+/*
+ * 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 | 6fe50b502fa2a564692be3419d7f21d96b6c5f64.json | Enforce JDK version on CI server
Add a test to ensure that the CI server does not accidentally build
with the wrong JDK version.
Issue: SPR-10569 | spring-core/src/test/java/org/springframework/tests/TestGroup.java | @@ -54,7 +54,12 @@ public enum TestGroup {
* Tests requiring the presence of jmxremote_optional.jar in jre/lib/ext in order to
* avoid "Unsupported protocol: jmxmp" errors.
*/
- JMXMP;
+ JMXMP,
+
+ /**
+ * Tests that should only be run on the continuous integration server.
+ */
+ CI;
/** | true |
Other | spring-projects | spring-framework | 6fe50b502fa2a564692be3419d7f21d96b6c5f64.json | Enforce JDK version on CI server
Add a test to ensure that the CI server does not accidentally build
with the wrong JDK version.
Issue: SPR-10569 | spring-core/src/test/java/org/springframework/tests/TestGroupTests.java | @@ -64,7 +64,7 @@ public void parseMissing() throws Exception {
thrown.expect(IllegalArgumentException.class);
thrown.expectMessage("Unable to find test group 'missing' when parsing " +
"testGroups value: 'performance, missing'. Available groups include: " +
- "[LONG_RUNNING,PERFORMANCE,JMXMP]");
+ "[L... | true |
Other | spring-projects | spring-framework | 87a9602f65c430f34ccc291676a890054ba3ddea.json | Fix bug in WebSocketClient implementations | spring-websocket/src/main/java/org/springframework/web/socket/TextMessage.java | @@ -16,8 +16,6 @@
package org.springframework.web.socket;
-import java.io.Reader;
-import java.io.StringReader;
/**
* A {@link WebSocketMessage} that contains a textual {@link String} payload.
@@ -46,13 +44,6 @@ public TextMessage(CharSequence payload, boolean isLast) {
super(payload.toString(), isLast);
... | true |
Other | spring-projects | spring-framework | 87a9602f65c430f34ccc291676a890054ba3ddea.json | Fix bug in WebSocketClient implementations | spring-websocket/src/main/java/org/springframework/web/socket/client/WebSocketConnectionManager.java | @@ -24,7 +24,6 @@
import org.springframework.util.CollectionUtils;
import org.springframework.web.socket.WebSocketHandler;
import org.springframework.web.socket.WebSocketSession;
-import org.springframework.web.socket.support.ExceptionWebSocketHandlerDecorator;
import org.springframework.web.socket.support.LoggingW... | true |
Other | spring-projects | spring-framework | 87a9602f65c430f34ccc291676a890054ba3ddea.json | Fix bug in WebSocketClient implementations | spring-websocket/src/main/java/org/springframework/web/socket/client/endpoint/StandardWebSocketClient.java | @@ -33,6 +33,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.http.HttpHeaders;
+import org.springframework.util.Assert;
import org.springframework.web.socket.WebSocketHandler;
import org.springframework.web.socket.WebSocketSession;
import org.sp... | true |
Other | spring-projects | spring-framework | 87a9602f65c430f34ccc291676a890054ba3ddea.json | Fix bug in WebSocketClient implementations | spring-websocket/src/main/java/org/springframework/web/socket/client/jetty/JettyWebSocketClient.java | @@ -22,6 +22,7 @@
import org.apache.commons.logging.LogFactory;
import org.springframework.context.SmartLifecycle;
import org.springframework.http.HttpHeaders;
+import org.springframework.util.Assert;
import org.springframework.web.socket.WebSocketHandler;
import org.springframework.web.socket.WebSocketSession;
i... | true |
Other | spring-projects | spring-framework | 87a9602f65c430f34ccc291676a890054ba3ddea.json | Fix bug in WebSocketClient implementations | spring-websocket/src/test/java/org/springframework/web/socket/client/WebSocketConnectionManagerTests.java | @@ -27,7 +27,6 @@
import org.springframework.web.socket.WebSocketHandler;
import org.springframework.web.socket.WebSocketSession;
import org.springframework.web.socket.adapter.WebSocketHandlerAdapter;
-import org.springframework.web.socket.support.ExceptionWebSocketHandlerDecorator;
import org.springframework.web.s... | true |
Other | spring-projects | spring-framework | 87a9602f65c430f34ccc291676a890054ba3ddea.json | Fix bug in WebSocketClient implementations | spring-websocket/src/test/java/org/springframework/web/socket/client/endpoint/StandardWebSocketClientTests.java | @@ -34,7 +34,6 @@
import org.springframework.web.socket.WebSocketSession;
import org.springframework.web.socket.adapter.StandardEndpointAdapter;
import org.springframework.web.socket.adapter.WebSocketHandlerAdapter;
-import org.springframework.web.socket.client.endpoint.StandardWebSocketClient;
import static org.... | true |
Other | spring-projects | spring-framework | fb4e34fce486315935a0292ac0dbe7e0b1497f7f.json | Add partial WebSocketMessage support | spring-websocket/src/main/java/org/springframework/web/socket/BinaryMessage.java | @@ -15,8 +15,6 @@
*/
package org.springframework.web.socket;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
import java.nio.ByteBuffer;
@@ -34,20 +32,36 @@ public final class BinaryMessage extends WebSocketMessage<ByteBuffer> {
/**
* Create a new {@link BinaryMessage} instance.
* @... | true |
Other | spring-projects | spring-framework | fb4e34fce486315935a0292ac0dbe7e0b1497f7f.json | Add partial WebSocketMessage support | spring-websocket/src/main/java/org/springframework/web/socket/TextMessage.java | @@ -27,12 +27,23 @@
*/
public final class TextMessage extends WebSocketMessage<String> {
+
/**
* Create a new {@link TextMessage} instance.
* @param payload the payload
+ * @param isLast whether this the last part of a message received or transmitted in parts
*/
public TextMessage(CharSequence payloa... | true |
Other | spring-projects | spring-framework | fb4e34fce486315935a0292ac0dbe7e0b1497f7f.json | Add partial WebSocketMessage support | spring-websocket/src/main/java/org/springframework/web/socket/WebSocketHandler.java | @@ -73,4 +73,9 @@ public interface WebSocketHandler {
*/
void afterConnectionClosed(WebSocketSession session, CloseStatus closeStatus) throws Exception;
+ /**
+ * Whether the WebSocketHandler handles messages in parts.
+ */
+ boolean supportsPartialMessages();
+
} | true |
Other | spring-projects | spring-framework | fb4e34fce486315935a0292ac0dbe7e0b1497f7f.json | Add partial WebSocketMessage support | spring-websocket/src/main/java/org/springframework/web/socket/WebSocketMessage.java | @@ -31,14 +31,17 @@
private final T payload;
+ private final boolean last;
+
/**
* Create a new {@link WebSocketMessage} instance with the given payload.
* @param payload a non-null payload
*/
- WebSocketMessage(T payload) {
+ WebSocketMessage(T payload, boolean isLast) {
Assert.notNull(payload, "... | true |
Other | spring-projects | spring-framework | fb4e34fce486315935a0292ac0dbe7e0b1497f7f.json | Add partial WebSocketMessage support | spring-websocket/src/main/java/org/springframework/web/socket/adapter/JettyWebSocketListenerAdapter.java | @@ -74,7 +74,7 @@ public void onWebSocketText(String payload) {
@Override
public void onWebSocketBinary(byte[] payload, int offset, int len) {
- BinaryMessage message = new BinaryMessage(payload, offset, len);
+ BinaryMessage message = new BinaryMessage(payload, offset, len, true);
try {
this.webSocketHa... | true |
Other | spring-projects | spring-framework | fb4e34fce486315935a0292ac0dbe7e0b1497f7f.json | Add partial WebSocketMessage support | spring-websocket/src/main/java/org/springframework/web/socket/adapter/StandardEndpointAdapter.java | @@ -61,30 +61,46 @@ public void onOpen(final javax.websocket.Session session, EndpointConfig config)
this.wsSession.initSession(session);
+ if (this.handler.supportsPartialMessages()) {
+ session.addMessageHandler(new MessageHandler.Partial<String>() {
+ @Override
+ public void onMessage(String message,... | true |
Other | spring-projects | spring-framework | fb4e34fce486315935a0292ac0dbe7e0b1497f7f.json | Add partial WebSocketMessage support | spring-websocket/src/main/java/org/springframework/web/socket/adapter/StandardWebSocketSessionAdapter.java | @@ -110,12 +110,12 @@ public boolean isOpen() {
@Override
protected void sendTextMessage(TextMessage message) throws IOException {
- this.session.getBasicRemote().sendText(message.getPayload());
+ this.session.getBasicRemote().sendText(message.getPayload(), message.isLast());
}
@Override
protected void ... | true |
Other | spring-projects | spring-framework | fb4e34fce486315935a0292ac0dbe7e0b1497f7f.json | Add partial WebSocketMessage support | spring-websocket/src/main/java/org/springframework/web/socket/adapter/WebSocketHandlerAdapter.java | @@ -38,15 +38,14 @@ public void afterConnectionEstablished(WebSocketSession session) throws Exceptio
}
@Override
- public final void handleMessage(WebSocketSession session, WebSocketMessage<?> message) throws Exception {
+ public void handleMessage(WebSocketSession session, WebSocketMessage<?> message) throws Exc... | true |
Other | spring-projects | spring-framework | fb4e34fce486315935a0292ac0dbe7e0b1497f7f.json | Add partial WebSocketMessage support | spring-websocket/src/main/java/org/springframework/web/socket/support/LoggingWebSocketHandlerDecorator.java | @@ -50,8 +50,8 @@ public void afterConnectionEstablished(WebSocketSession session) throws Exceptio
@Override
public void handleMessage(WebSocketSession session, WebSocketMessage<?> message) throws Exception {
- if (logger.isTraceEnabled()) {
- logger.trace("Received " + message + ", " + session);
+ if (logger... | true |
Other | spring-projects | spring-framework | fb4e34fce486315935a0292ac0dbe7e0b1497f7f.json | Add partial WebSocketMessage support | spring-websocket/src/main/java/org/springframework/web/socket/support/PerConnectionWebSocketHandler.java | @@ -57,9 +57,16 @@ public class PerConnectionWebSocketHandler implements WebSocketHandler, BeanFact
private final Map<WebSocketSession, WebSocketHandler> handlers =
new ConcurrentHashMap<WebSocketSession, WebSocketHandler>();
+ private final boolean supportsPartialMessages;
+
public PerConnectionWebSocketHa... | true |
Other | spring-projects | spring-framework | fb4e34fce486315935a0292ac0dbe7e0b1497f7f.json | Add partial WebSocketMessage support | spring-websocket/src/main/java/org/springframework/web/socket/support/WebSocketHandlerDecorator.java | @@ -62,6 +62,12 @@ public void afterConnectionClosed(WebSocketSession session, CloseStatus closeSta
this.delegate.afterConnectionClosed(session, closeStatus);
}
+ @Override
+ public boolean supportsPartialMessages() {
+ return this.delegate.supportsPartialMessages();
+ }
+
+
@Override
public String toString... | true |
Other | spring-projects | spring-framework | 81bce424cb0abac468ea5c5e1cfa6f8d071e48ba.json | Fix bug with deriving SockJS path | spring-websocket/src/main/java/org/springframework/web/socket/sockjs/AbstractSockJsService.java | @@ -82,9 +82,9 @@ public abstract class AbstractSockJsService implements SockJsService, SockJsConf
private final TaskScheduler taskScheduler;
- private final List<String> sockJsPrefixes = new ArrayList<String>();
+ private final List<String> validSockJsPrefixes = new ArrayList<String>();
- private final Set<Str... | true |
Other | spring-projects | spring-framework | 81bce424cb0abac468ea5c5e1cfa6f8d071e48ba.json | Fix bug with deriving SockJS path | spring-websocket/src/test/java/org/springframework/web/socket/sockjs/AbstractSockJsServiceTests.java | @@ -71,13 +71,20 @@ public void getSockJsPathForGreetingRequest() throws Exception {
public void getSockJsPathForInfoRequest() throws Exception {
handleRequest("GET", "/a/info", HttpStatus.OK);
+
assertTrue(this.servletResponse.getContentAsString().startsWith("{\"entropy\":"));
+ handleRequest("GET", "/a/s... | true |
Other | spring-projects | spring-framework | d23de282a668bbfc271575cff091d7c8c971fbf2.json | Reinstate removal of semicolon content
Commit 5b1165 was an attempt to leave semicolon content in the URL path
while ignoring it for request mapping purposes. However, it becomes
quite difficult to manage and semicolon content should not always be
ignored (sometimes a semicolon is used as a separator of multiple items... | spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java | @@ -157,6 +157,10 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
handlerMappingDef.getPropertyValues().add("order", 0);
handlerMappingDef.getPropertyValues().add("contentNegotiationManager", contentNegotiationManager);
String methodMappingName = parserContext.getReaderContext().... | true |
Other | spring-projects | spring-framework | d23de282a668bbfc271575cff091d7c8c971fbf2.json | Reinstate removal of semicolon content
Commit 5b1165 was an attempt to leave semicolon content in the URL path
while ignoring it for request mapping purposes. However, it becomes
quite difficult to manage and semicolon content should not always be
ignored (sometimes a semicolon is used as a separator of multiple items... | spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java | @@ -128,7 +128,7 @@ public void setUrlDecode(boolean urlDecode) {
/**
* Set if ";" (semicolon) content should be stripped from the request URI.
- * <p>The default value is {@code false}.
+ * <p>The default value is {@code true}.
* @see org.springframework.web.util.UrlPathHelper#setRemoveSemicolonContent(boo... | true |
Other | spring-projects | spring-framework | d23de282a668bbfc271575cff091d7c8c971fbf2.json | Reinstate removal of semicolon content
Commit 5b1165 was an attempt to leave semicolon content in the URL path
while ignoring it for request mapping purposes. However, it becomes
quite difficult to manage and semicolon content should not always be
ignored (sometimes a semicolon is used as a separator of multiple items... | spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java | @@ -25,6 +25,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -37,7 +38,6 @@
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.method.HandlerMethodSelector;
import... | true |
Other | spring-projects | spring-framework | d23de282a668bbfc271575cff091d7c8c971fbf2.json | Reinstate removal of semicolon content
Commit 5b1165 was an attempt to leave semicolon content in the URL path
while ignoring it for request mapping purposes. However, it becomes
quite difficult to manage and semicolon content should not always be
ignored (sometimes a semicolon is used as a separator of multiple items... | spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java | @@ -42,13 +42,6 @@
*/
public final class PatternsRequestCondition extends AbstractRequestCondition<PatternsRequestCondition> {
- private static UrlPathHelper pathHelperNoSemicolonContent;
-
- static {
- pathHelperNoSemicolonContent = new UrlPathHelper();
- pathHelperNoSemicolonContent.setRemoveSemicolonContent(t... | true |
Other | spring-projects | spring-framework | d23de282a668bbfc271575cff091d7c8c971fbf2.json | Reinstate removal of semicolon content
Commit 5b1165 was an attempt to leave semicolon content in the URL path
while ignoring it for request mapping purposes. However, it becomes
quite difficult to manage and semicolon content should not always be
ignored (sometimes a semicolon is used as a separator of multiple items... | spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.2.xsd | @@ -231,6 +231,17 @@
</xsd:appinfo>
</xsd:annotation>
</xsd:attribute>
+ <xsd:attribute name="enableMatrixVariables" type="xsd:boolean">
+ <xsd:annotation>
+ <xsd:documentation><![CDATA[
+ Matrix variables can appear in any path segment, each matrix variable separated with a ";" (semicolon).
+ F... | true |
Other | spring-projects | spring-framework | d23de282a668bbfc271575cff091d7c8c971fbf2.json | Reinstate removal of semicolon content
Commit 5b1165 was an attempt to leave semicolon content in the URL path
while ignoring it for request mapping purposes. However, it becomes
quite difficult to manage and semicolon content should not always be
ignored (sometimes a semicolon is used as a separator of multiple items... | spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-4.0.xsd | @@ -231,6 +231,17 @@
</xsd:appinfo>
</xsd:annotation>
</xsd:attribute>
+ <xsd:attribute name="enableMatrixVariables" type="xsd:boolean">
+ <xsd:annotation>
+ <xsd:documentation><![CDATA[
+ Matrix variables can appear in any path segment, each matrix variable separated with a ";" (semicolon).
+ F... | true |
Other | spring-projects | spring-framework | d23de282a668bbfc271575cff091d7c8c971fbf2.json | Reinstate removal of semicolon content
Commit 5b1165 was an attempt to leave semicolon content in the URL path
while ignoring it for request mapping purposes. However, it becomes
quite difficult to manage and semicolon content should not always be
ignored (sometimes a semicolon is used as a separator of multiple items... | spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java | @@ -16,20 +16,14 @@
package org.springframework.web.servlet.config;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.ju... | true |
Other | spring-projects | spring-framework | d23de282a668bbfc271575cff091d7c8c971fbf2.json | Reinstate removal of semicolon content
Commit 5b1165 was an attempt to leave semicolon content in the URL path
while ignoring it for request mapping purposes. However, it becomes
quite difficult to manage and semicolon content should not always be
ignored (sometimes a semicolon is used as a separator of multiple items... | spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/PatternsRequestConditionTests.java | @@ -16,18 +16,15 @@
package org.springframework.web.servlet.mvc.condition;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
import java.util.Arrays;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
... | true |
Other | spring-projects | spring-framework | d23de282a668bbfc271575cff091d7c8c971fbf2.json | Reinstate removal of semicolon content
Commit 5b1165 was an attempt to leave semicolon content in the URL path
while ignoring it for request mapping purposes. However, it becomes
quite difficult to manage and semicolon content should not always be
ignored (sometimes a semicolon is used as a separator of multiple items... | spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMappingTests.java | @@ -16,13 +16,6 @@
package org.springframework.web.servlet.mvc.method;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import stat... | true |
Other | spring-projects | spring-framework | d23de282a668bbfc271575cff091d7c8c971fbf2.json | Reinstate removal of semicolon content
Commit 5b1165 was an attempt to leave semicolon content in the URL path
while ignoring it for request mapping purposes. However, it becomes
quite difficult to manage and semicolon content should not always be
ignored (sometimes a semicolon is used as a separator of multiple items... | spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-custom-validator.xml | @@ -3,9 +3,10 @@
xmlns:mvc="http://www.springframework.org/schema/mvc"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/mvc http://www.sprin... | true |
Other | spring-projects | spring-framework | d23de282a668bbfc271575cff091d7c8c971fbf2.json | Reinstate removal of semicolon content
Commit 5b1165 was an attempt to leave semicolon content in the URL path
while ignoring it for request mapping purposes. However, it becomes
quite difficult to manage and semicolon content should not always be
ignored (sometimes a semicolon is used as a separator of multiple items... | src/reference/docbook/mvc.xml | @@ -1173,9 +1173,7 @@ public void findPet(
<para>Note that to enable the use of matrix variables, you must set the
<classname>removeSemicolonContent</classname> property of
<classname>RequestMappingHandlerMapping</classname> to <code>false</code>.
- By default it is set to <code>true</... | true |
Other | spring-projects | spring-framework | db596d23dea7a8f35b52581d92b00a18c3f45335.json | Fix deadlock issue in DeferredResult
Previously DeferredResult locked around the setting of the result
including handling up to the part of submitting a dispatch. This
can cause a deadlock if a timeout occurs at the same time since
the Tomcat timeout thread has its own locking that permits only
one thread to do timeou... | spring-web/src/main/java/org/springframework/web/context/request/async/DeferredResult.java | @@ -173,9 +173,9 @@ private boolean setResultInternal(Object result) {
return false;
}
this.result = result;
- if (this.resultHandler != null) {
- this.resultHandler.handleResult(this.result);
- }
+ }
+ if (this.resultHandler != null) {
+ this.resultHandler.handleResult(this.result);
}
ret... | false |
Other | spring-projects | spring-framework | 278a5924cb530f5b232e5af0f9ab04bd239600c8.json | Remove isLast flag from WebSocketMessage | spring-websocket/src/main/java/org/springframework/web/socket/BinaryMessage.java | @@ -31,53 +31,24 @@ public final class BinaryMessage extends WebSocketMessage<ByteBuffer> {
private byte[] bytes;
- private final boolean last;
-
-
- /**
- * Create a new {@link BinaryMessage} instance.
- * @param payload a non-null payload
- */
- public BinaryMessage(ByteBuffer payload) {
- this(payload, tru... | true |
Other | spring-projects | spring-framework | 278a5924cb530f5b232e5af0f9ab04bd239600c8.json | Remove isLast flag from WebSocketMessage | spring-websocket/src/main/java/org/springframework/web/socket/WebSocketHandler.java | @@ -72,9 +72,4 @@ public interface WebSocketHandler {
*/
void afterConnectionClosed(WebSocketSession session, CloseStatus closeStatus) throws Exception;
- /**
- * Whether this WebSocketHandler wishes to receive messages broken up in parts.
- */
- boolean isStreaming();
-
} | true |
Other | spring-projects | spring-framework | 278a5924cb530f5b232e5af0f9ab04bd239600c8.json | Remove isLast flag from WebSocketMessage | spring-websocket/src/main/java/org/springframework/web/socket/adapter/StandardEndpointAdapter.java | @@ -75,24 +75,12 @@ public void onMessage(String message) {
handleTextMessage(session, message);
}
});
-
- if (!this.handler.isStreaming()) {
- session.addMessageHandler(new MessageHandler.Whole<ByteBuffer>() {
- @Override
- public void onMessage(ByteBuffer message) {
- handleBinaryMessage(sess... | true |
Other | spring-projects | spring-framework | 278a5924cb530f5b232e5af0f9ab04bd239600c8.json | Remove isLast flag from WebSocketMessage | spring-websocket/src/main/java/org/springframework/web/socket/adapter/WebSocketHandlerAdapter.java | @@ -68,9 +68,4 @@ public void handleTransportError(WebSocketSession session, Throwable exception)
public void afterConnectionClosed(WebSocketSession session, CloseStatus status) throws Exception {
}
- @Override
- public boolean isStreaming() {
- return false;
- }
-
} | true |
Other | spring-projects | spring-framework | 278a5924cb530f5b232e5af0f9ab04bd239600c8.json | Remove isLast flag from WebSocketMessage | spring-websocket/src/main/java/org/springframework/web/socket/support/PerConnectionWebSocketHandler.java | @@ -57,22 +57,9 @@ public class PerConnectionWebSocketHandler implements WebSocketHandler, BeanFact
private final Map<WebSocketSession, WebSocketHandler> handlers =
new ConcurrentHashMap<WebSocketSession, WebSocketHandler>();
- private final boolean streaming;
-
public PerConnectionWebSocketHandler(Class<? ... | true |
Other | spring-projects | spring-framework | 278a5924cb530f5b232e5af0f9ab04bd239600c8.json | Remove isLast flag from WebSocketMessage | spring-websocket/src/main/java/org/springframework/web/socket/support/WebSocketHandlerDecorator.java | @@ -62,11 +62,6 @@ public void afterConnectionClosed(WebSocketSession session, CloseStatus closeSta
this.delegate.afterConnectionClosed(session, closeStatus);
}
- @Override
- public boolean isStreaming() {
- return this.delegate.isStreaming();
- }
-
@Override
public String toString() {
return getClass().... | true |
Other | spring-projects | spring-framework | 9ca03cf7724e74d20643299a79557d24ebaa6083.json | Upgrade spring-websocket to Jetty 9.0.3 | build.gradle | @@ -477,11 +477,11 @@ project("spring-websocket") {
}
optional("org.glassfish.tyrus:tyrus-websocket-core:1.0-SNAPSHOT")
optional("org.glassfish.tyrus:tyrus-container-servlet:1.0-SNAPSHOT")
- optional("org.eclipse.jetty:jetty-webapp:9.0.1.v20130408") {
+ optional("org.eclipse.jetty:jetty-webapp:9.0.3.v2013050... | false |
Other | spring-projects | spring-framework | 23737a4516a2e582b2010ea58cf10d25620035b1.json | Update the README to use JDK1.8 b88 | README.md | @@ -37,7 +37,7 @@ a cross-platform, self-contained bootstrap mechanism for the build.
### prerequisites
-[Git][] and the latest [Early Access build of OpenJDK 1.8][JDK18].
+[Git][] and [Early Access build of OpenJDK 1.8 build 88][JDK18 build 88].
### check out sources
`git clone git://github.com/SpringSource/s... | false |
Other | spring-projects | spring-framework | 94685481162a93666fc2f39b66223833a6bcb418.json | Add @Override to remaining source files
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/TargetSource.java | @@ -39,6 +39,7 @@ public interface TargetSource extends TargetClassAware {
* target class.
* @return the type of targets returned by this {@link TargetSource}
*/
+ @Override
Class<?> getTargetClass();
/** | true |
Other | spring-projects | spring-framework | 94685481162a93666fc2f39b66223833a6bcb418.json | Add @Override to remaining source files
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/TrueClassFilter.java | @@ -34,6 +34,7 @@ class TrueClassFilter implements ClassFilter, Serializable {
private TrueClassFilter() {
}
+ @Override
public boolean matches(Class clazz) {
return true;
} | true |
Other | spring-projects | spring-framework | 94685481162a93666fc2f39b66223833a6bcb418.json | Add @Override to remaining source files
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java | @@ -35,14 +35,17 @@ class TrueMethodMatcher implements MethodMatcher, Serializable {
private TrueMethodMatcher() {
}
+ @Override
public boolean isRuntime() {
return false;
}
+ @Override
public boolean matches(Method method, Class targetClass) {
return true;
}
+ @Override
public boolean matches... | true |
Other | spring-projects | spring-framework | 94685481162a93666fc2f39b66223833a6bcb418.json | Add @Override to remaining source files
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/TruePointcut.java | @@ -34,10 +34,12 @@ class TruePointcut implements Pointcut, Serializable {
private TruePointcut() {
}
+ @Override
public ClassFilter getClassFilter() {
return ClassFilter.TRUE;
}
+ @Override
public MethodMatcher getMethodMatcher() {
return MethodMatcher.TRUE;
} | true |
Other | spring-projects | spring-framework | 94685481162a93666fc2f39b66223833a6bcb418.json | Add @Override to remaining source files
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java | @@ -203,6 +203,7 @@ public final ClassLoader getAspectClassLoader() {
return this.aspectInstanceFactory.getAspectClassLoader();
}
+ @Override
public int getOrder() {
return this.aspectInstanceFactory.getOrder();
}
@@ -212,6 +213,7 @@ public void setAspectName(String name) {
this.aspectName = name;
}
... | true |
Other | spring-projects | spring-framework | 94685481162a93666fc2f39b66223833a6bcb418.json | Add @Override to remaining source files
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java | @@ -222,6 +222,7 @@ public void setThrowingName(String throwingName) {
* @param method the target {@link Method}
* @return the parameter names
*/
+ @Override
public String[] getParameterNames(Method method) {
this.argumentTypes = method.getParameterTypes();
this.numberOfRemainingUnboundArguments = this... | true |
Other | spring-projects | spring-framework | 94685481162a93666fc2f39b66223833a6bcb418.json | Add @Override to remaining source files
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterAdvice.java | @@ -37,6 +37,7 @@ public AspectJAfterAdvice(
super(aspectJBeforeAdviceMethod, pointcut, aif);
}
+ @Override
public Object invoke(MethodInvocation mi) throws Throwable {
try {
return mi.proceed();
@@ -46,10 +47,12 @@ public Object invoke(MethodInvocation mi) throws Throwable {
}
}
+ @Override
pu... | true |
Other | spring-projects | spring-framework | 94685481162a93666fc2f39b66223833a6bcb418.json | Add @Override to remaining source files
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterReturningAdvice.java | @@ -40,10 +40,12 @@ public AspectJAfterReturningAdvice(
super(aspectJBeforeAdviceMethod, pointcut, aif);
}
+ @Override
public boolean isBeforeAdvice() {
return false;
}
+ @Override
public boolean isAfterAdvice() {
return true;
}
@@ -53,6 +55,7 @@ public void setReturningName(String name) {
set... | true |
Other | spring-projects | spring-framework | 94685481162a93666fc2f39b66223833a6bcb418.json | Add @Override to remaining source files
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterThrowingAdvice.java | @@ -37,10 +37,12 @@ public AspectJAfterThrowingAdvice(
super(aspectJBeforeAdviceMethod, pointcut, aif);
}
+ @Override
public boolean isBeforeAdvice() {
return false;
}
+ @Override
public boolean isAfterAdvice() {
return true;
}
@@ -50,6 +52,7 @@ public void setThrowingName(String name) {
setTh... | true |
Other | spring-projects | spring-framework | 94685481162a93666fc2f39b66223833a6bcb418.json | Add @Override to remaining source files
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAroundAdvice.java | @@ -41,10 +41,12 @@ public AspectJAroundAdvice(
super(aspectJAroundAdviceMethod, pointcut, aif);
}
+ @Override
public boolean isBeforeAdvice() {
return false;
}
+ @Override
public boolean isAfterAdvice() {
return false;
}
@@ -55,6 +57,7 @@ protected boolean supportsProceedingJoinPoint() {
}
... | true |
Other | spring-projects | spring-framework | 94685481162a93666fc2f39b66223833a6bcb418.json | Add @Override to remaining source files
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java | @@ -155,16 +155,19 @@ public void setParameterTypes(Class[] types) {
this.pointcutParameterTypes = types;
}
+ @Override
public void setBeanFactory(BeanFactory beanFactory) {
this.beanFactory = beanFactory;
}
+ @Override
public ClassFilter getClassFilter() {
checkReadyToMatch();
return this;
... | true |
Other | spring-projects | spring-framework | 94685481162a93666fc2f39b66223833a6bcb418.json | Add @Override to remaining source files
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisor.java | @@ -31,6 +31,7 @@ public class AspectJExpressionPointcutAdvisor extends AbstractGenericPointcutAdv
private final AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut();
+ @Override
public Pointcut getPointcut() {
return this.pointcut;
} | true |
Other | spring-projects | spring-framework | 94685481162a93666fc2f39b66223833a6bcb418.json | Add @Override to remaining source files
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJMethodBeforeAdvice.java | @@ -35,14 +35,17 @@ public AspectJMethodBeforeAdvice(
super(aspectJBeforeAdviceMethod, pointcut, aif);
}
+ @Override
public void before(Method method, Object[] args, Object target) throws Throwable {
invokeAdviceMethod(getJoinPointMatch(), null, null);
}
+ @Override
public boolean isBeforeAdvice() {
... | true |
Other | spring-projects | spring-framework | 94685481162a93666fc2f39b66223833a6bcb418.json | Add @Override to remaining source files
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJPointcutAdvisor.java | @@ -56,18 +56,22 @@ public void setOrder(int order) {
}
+ @Override
public boolean isPerInstance() {
return true;
}
+ @Override
public Advice getAdvice() {
return this.advice;
}
+ @Override
public Pointcut getPointcut() {
return this.pointcut;
}
+ @Override
public int getOrder() {
... | true |
Other | spring-projects | spring-framework | 94685481162a93666fc2f39b66223833a6bcb418.json | Add @Override to remaining source files
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJWeaverMessageHandler.java | @@ -48,6 +48,7 @@ public class AspectJWeaverMessageHandler implements IMessageHandler {
private static final Log LOGGER = LogFactory.getLog("AspectJ Weaver");
+ @Override
public boolean handleMessage(IMessage message) throws AbortException {
Kind messageKind = message.getKind();
@@ -89,15 +90,18 @@ private... | true |
Other | spring-projects | spring-framework | 94685481162a93666fc2f39b66223833a6bcb418.json | Add @Override to remaining source files
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/aspectj/DeclareParentsAdvisor.java | @@ -77,6 +77,7 @@ private DeclareParentsAdvisor(Class interfaceType, String typePattern, Class imp
// Excludes methods implemented.
ClassFilter exclusion = new ClassFilter() {
+ @Override
public boolean matches(Class clazz) {
return !(introducedInterface.isAssignableFrom(clazz));
}
@@ -87,22 +88,... | true |
Other | spring-projects | spring-framework | 94685481162a93666fc2f39b66223833a6bcb418.json | Add @Override to remaining source files
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java | @@ -72,14 +72,17 @@ public MethodInvocationProceedingJoinPoint(ProxyMethodInvocation methodInvocatio
this.methodInvocation = methodInvocation;
}
+ @Override
public void set$AroundClosure(AroundClosure aroundClosure) {
throw new UnsupportedOperationException();
}
+ @Override
public Object proceed() thr... | true |
Other | spring-projects | spring-framework | 94685481162a93666fc2f39b66223833a6bcb418.json | Add @Override to remaining source files
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/aspectj/RuntimeTestWalker.java | @@ -106,35 +106,44 @@ private static class TestVisitorAdapter implements ITestVisitor {
protected static final int AT_TARGET_VAR = 4;
protected static final int AT_ANNOTATION_VAR = 8;
+ @Override
public void visit(And e) {
e.getLeft().accept(this);
e.getRight().accept(this);
}
+ @Override
p... | true |
Other | spring-projects | spring-framework | 94685481162a93666fc2f39b66223833a6bcb418.json | Add @Override to remaining source files
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/aspectj/SimpleAspectInstanceFactory.java | @@ -49,6 +49,7 @@ public final Class getAspectClass() {
}
+ @Override
public final Object getAspectInstance() {
try {
return this.aspectClass.newInstance();
@@ -61,6 +62,7 @@ public final Object getAspectInstance() {
}
}
+ @Override
public ClassLoader getAspectClassLoader() {
return this.aspe... | true |
Other | spring-projects | spring-framework | 94685481162a93666fc2f39b66223833a6bcb418.json | Add @Override to remaining source files
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/aspectj/SingletonAspectInstanceFactory.java | @@ -44,10 +44,12 @@ public SingletonAspectInstanceFactory(Object aspectInstance) {
}
+ @Override
public final Object getAspectInstance() {
return this.aspectInstance;
}
+ @Override
public ClassLoader getAspectClassLoader() {
return this.aspectInstance.getClass().getClassLoader();
}
@@ -60,6 +62,7 ... | true |
Other | spring-projects | spring-framework | 94685481162a93666fc2f39b66223833a6bcb418.json | Add @Override to remaining source files
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/aspectj/TypePatternClassFilter.java | @@ -93,6 +93,7 @@ public String getTypePattern() {
* @return whether the advice should apply to this candidate target class
* @throws IllegalStateException if no {@link #setTypePattern(String)} has been set
*/
+ @Override
public boolean matches(Class clazz) {
if (this.aspectJTypePatternMatcher == null) {
... | true |
Other | spring-projects | spring-framework | 94685481162a93666fc2f39b66223833a6bcb418.json | Add @Override to remaining source files
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java | @@ -111,6 +111,7 @@ protected AbstractAspectJAdvisorFactory() {
* is that aspects written in the code-style (AspectJ language) also have the annotation present
* when compiled by ajc with the -1.5 flag, yet they cannot be consumed by Spring AOP.
*/
+ @Override
public boolean isAspect(Class<?> clazz) {
ret... | true |
Other | spring-projects | spring-framework | 94685481162a93666fc2f39b66223833a6bcb418.json | Add @Override to remaining source files
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/BeanFactoryAspectInstanceFactory.java | @@ -72,10 +72,12 @@ public BeanFactoryAspectInstanceFactory(BeanFactory beanFactory, String name, Cl
}
+ @Override
public Object getAspectInstance() {
return this.beanFactory.getBean(this.name);
}
+ @Override
public ClassLoader getAspectClassLoader() {
if (this.beanFactory instanceof ConfigurableBea... | true |
Other | spring-projects | spring-framework | 94685481162a93666fc2f39b66223833a6bcb418.json | Add @Override to remaining source files
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java | @@ -97,6 +97,7 @@ public InstantiationModelAwarePointcutAdvisorImpl(AspectJAdvisorFactory af, Aspe
* The pointcut for Spring AOP to use. Actual behaviour of the pointcut will change
* depending on the state of the advice.
*/
+ @Override
public Pointcut getPointcut() {
return this.pointcut;
}
@@ -106,6 +... | true |
Other | spring-projects | spring-framework | 94685481162a93666fc2f39b66223833a6bcb418.json | Add @Override to remaining source files
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/LazySingletonAspectInstanceFactoryDecorator.java | @@ -42,6 +42,7 @@ public LazySingletonAspectInstanceFactoryDecorator(MetadataAwareAspectInstanceFa
}
+ @Override
public synchronized Object getAspectInstance() {
if (this.materialized == null) {
synchronized (this) {
@@ -57,14 +58,17 @@ public boolean isMaterialized() {
return (this.materialized != nu... | true |
Other | spring-projects | spring-framework | 94685481162a93666fc2f39b66223833a6bcb418.json | Add @Override to remaining source files
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.java | @@ -75,13 +75,15 @@ public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFacto
new InstanceComparator<Annotation>(
Around.class, Before.class, After.class, AfterReturning.class, AfterThrowing.class),
new Converter<Method, Annotation>() {
+ @Override
public Annotation con... | true |
Other | spring-projects | spring-framework | 94685481162a93666fc2f39b66223833a6bcb418.json | Add @Override to remaining source files
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/SimpleMetadataAwareAspectInstanceFactory.java | @@ -45,6 +45,7 @@ public SimpleMetadataAwareAspectInstanceFactory(Class aspectClass, String aspect
}
+ @Override
public final AspectMetadata getAspectMetadata() {
return this.metadata;
} | true |
Other | spring-projects | spring-framework | 94685481162a93666fc2f39b66223833a6bcb418.json | Add @Override to remaining source files
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/SingletonMetadataAwareAspectInstanceFactory.java | @@ -47,6 +47,7 @@ public SingletonMetadataAwareAspectInstanceFactory(Object aspectInstance, String
}
+ @Override
public final AspectMetadata getAspectMetadata() {
return this.metadata;
} | true |
Other | spring-projects | spring-framework | 94685481162a93666fc2f39b66223833a6bcb418.json | Add @Override to remaining source files
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java | @@ -126,11 +126,13 @@ public PartiallyComparableAdvisorHolder(Advisor advisor, Comparator<Advisor> com
this.comparator = comparator;
}
+ @Override
public int compareTo(Object obj) {
Advisor otherAdvisor = ((PartiallyComparableAdvisorHolder) obj).advisor;
return this.comparator.compare(this.advisor,... | true |
Other | spring-projects | spring-framework | 94685481162a93666fc2f39b66223833a6bcb418.json | Add @Override to remaining source files
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparator.java | @@ -75,6 +75,7 @@ public AspectJPrecedenceComparator(Comparator<? super Advisor> advisorComparator
}
+ @Override
public int compare(Object o1, Object o2) {
if (!(o1 instanceof Advisor && o2 instanceof Advisor)) {
throw new IllegalArgumentException( | true |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.