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 | 65fb26f847a2249792fa8024c04980fc7a49cd5c.json | Move spring-build-junit into spring-core
Move code from spring-build-junit into spring-core/src/test along with
several other test utility classes. This commit removes the temporary
spring-build-junit project introduced in commit
b083bbdec720d3f5b1c7f065dfe8ccb7a7f3b201. | spring-core/src/test/java/org/springframework/tests/TestGroupTests.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.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.build.junit;
+package org.springframework.tests;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
@@ -32,7 +32,7 @@
*
* @author Phillip Webb
*/
-public class TestGroupTest {
+public class TestGroupTests {
@Rule
public ExpectedException thrown = ExpectedException.none(); | true |
Other | spring-projects | spring-framework | 65fb26f847a2249792fa8024c04980fc7a49cd5c.json | Move spring-build-junit into spring-core
Move code from spring-build-junit into spring-core/src/test along with
several other test utility classes. This commit removes the temporary
spring-build-junit project introduced in commit
b083bbdec720d3f5b1c7f065dfe8ccb7a7f3b201. | spring-core/src/test/java/org/springframework/tests/package-info.java | @@ -0,0 +1,22 @@
+/*
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Shared utilities that are used internally throughout the test suite but are not
+ * published. This package should not be confused with {@code org.springframework.test}
+ * which contains published code from the 'spring-test' module.
+ */
+package org.springframework.tests; | true |
Other | spring-projects | spring-framework | 65fb26f847a2249792fa8024c04980fc7a49cd5c.json | Move spring-build-junit into spring-core
Move code from spring-build-junit into spring-core/src/test along with
several other test utility classes. This commit removes the temporary
spring-build-junit project introduced in commit
b083bbdec720d3f5b1c7f065dfe8ccb7a7f3b201. | spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java | @@ -31,10 +31,10 @@
import org.junit.Test;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
-import org.springframework.build.test.mockito.MockitoUtils;
-import org.springframework.build.test.mockito.MockitoUtils.InvocationArgumentsAdapter;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
+import org.springframework.tests.MockitoUtils;
+import org.springframework.tests.MockitoUtils.InvocationArgumentsAdapter;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource; | true |
Other | spring-projects | spring-framework | 65fb26f847a2249792fa8024c04980fc7a49cd5c.json | Move spring-build-junit into spring-core
Move code from spring-build-junit into spring-core/src/test along with
several other test utility classes. This commit removes the temporary
spring-build-junit project introduced in commit
b083bbdec720d3f5b1c7f065dfe8ccb7a7f3b201. | spring-expression/src/test/java/org/springframework/expression/spel/PerformanceTests.java | @@ -20,8 +20,8 @@
import org.junit.Test;
-import org.springframework.build.junit.Assume;
-import org.springframework.build.junit.TestGroup;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
import org.springframework.expression.EvaluationContext;
import org.springframework.expression.Expression;
import org.springframework.expression.ExpressionParser; | true |
Other | spring-projects | spring-framework | 65fb26f847a2249792fa8024c04980fc7a49cd5c.json | Move spring-build-junit into spring-core
Move code from spring-build-junit into spring-core/src/test along with
several other test utility classes. This commit removes the temporary
spring-build-junit project introduced in commit
b083bbdec720d3f5b1c7f065dfe8ccb7a7f3b201. | spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java | @@ -34,7 +34,7 @@
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import static org.springframework.build.test.hamcrest.Matchers.exceptionCause;
+import static org.springframework.tests.Matchers.exceptionCause;
import java.sql.CallableStatement;
import java.sql.Connection; | true |
Other | spring-projects | spring-framework | 65fb26f847a2249792fa8024c04980fc7a49cd5c.json | Move spring-build-junit into spring-core
Move code from spring-build-junit into spring-core/src/test along with
several other test utility classes. This commit removes the temporary
spring-build-junit project introduced in commit
b083bbdec720d3f5b1c7f065dfe8ccb7a7f3b201. | spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java | @@ -22,7 +22,7 @@
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
-import static org.springframework.build.test.hamcrest.Matchers.exceptionCause;
+import static org.springframework.tests.Matchers.exceptionCause;
import java.sql.CallableStatement;
import java.sql.Connection; | true |
Other | spring-projects | spring-framework | 65fb26f847a2249792fa8024c04980fc7a49cd5c.json | Move spring-build-junit into spring-core
Move code from spring-build-junit into spring-core/src/test along with
several other test utility classes. This commit removes the temporary
spring-build-junit project introduced in commit
b083bbdec720d3f5b1c7f065dfe8ccb7a7f3b201. | spring-web/src/test/java/org/springframework/web/bind/ServletRequestUtilsTests.java | @@ -19,9 +19,9 @@
import static org.junit.Assert.*;
import org.junit.Test;
-import org.springframework.build.junit.Assume;
-import org.springframework.build.junit.TestGroup;
import org.springframework.mock.web.test.MockHttpServletRequest;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
import org.springframework.util.StopWatch;
/** | true |
Other | spring-projects | spring-framework | 65fb26f847a2249792fa8024c04980fc7a49cd5c.json | Move spring-build-junit into spring-core
Move code from spring-build-junit into spring-core/src/test along with
several other test utility classes. This commit removes the temporary
spring-build-junit project introduced in commit
b083bbdec720d3f5b1c7f065dfe8ccb7a7f3b201. | spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestUtilsTests.java | @@ -19,8 +19,8 @@
import junit.framework.TestCase;
import org.junit.Test;
-import org.springframework.build.junit.Assume;
-import org.springframework.build.junit.TestGroup;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
import org.springframework.mock.web.portlet.MockPortletRequest;
import org.springframework.util.StopWatch;
| true |
Other | spring-projects | spring-framework | 65fb26f847a2249792fa8024c04980fc7a49cd5c.json | Move spring-build-junit into spring-core
Move code from spring-build-junit into spring-core/src/test along with
several other test utility classes. This commit removes the temporary
spring-build-junit project introduced in commit
b083bbdec720d3f5b1c7f065dfe8ccb7a7f3b201. | src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java | @@ -23,14 +23,14 @@
import org.springframework.aop.support.AopUtils;
import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.build.junit.Assume;
-import org.springframework.build.junit.TestGroup;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
import org.springframework.dao.support.PersistenceExceptionTranslator;
import org.springframework.stereotype.Repository;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
import org.springframework.transaction.CallCountingTransactionManager;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.annotation.EnableTransactionManagement; | true |
Other | spring-projects | spring-framework | db2b00a2a5c05d398b3d08071163e8fbeea25baf.json | Relocate MergePlugin package
Relocate the MergePlugin from org.springframework.build.gradle.merge
to org.springframework.build.gradle. | buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy | @@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.build.gradle.merge
+package org.springframework.build.gradle
import org.gradle.api.*
import org.gradle.api.artifacts.Configuration | true |
Other | spring-projects | spring-framework | db2b00a2a5c05d398b3d08071163e8fbeea25baf.json | Relocate MergePlugin package
Relocate the MergePlugin from org.springframework.build.gradle.merge
to org.springframework.build.gradle. | buildSrc/src/main/resources/META-INF/gradle-plugins/merge.properties | @@ -1 +1 @@
-implementation-class=org.springframework.build.gradle.merge.MergePlugin
+implementation-class=org.springframework.build.gradle.MergePlugin | true |
Other | spring-projects | spring-framework | 290aa5d64730e485fc9930e9a2509d14b05fad67.json | Develop a gradle plugin to add test dependencies
Develop a gradle plugin to automatically update testCompile dependencies
to include the test source sets of project dependencies.
Allows the gradle build to more closely mirror the way that tests run
inside eclipse. | build.gradle | @@ -28,6 +28,7 @@ configure(allprojects) {
apply plugin: "java"
apply plugin: "propdeps-eclipse"
apply plugin: "propdeps-idea"
+ apply plugin: "test-source-set-dependencies"
apply from: "${gradleScriptDir}/ide.gradle"
group = "org.springframework" | true |
Other | spring-projects | spring-framework | 290aa5d64730e485fc9930e9a2509d14b05fad67.json | Develop a gradle plugin to add test dependencies
Develop a gradle plugin to automatically update testCompile dependencies
to include the test source sets of project dependencies.
Allows the gradle build to more closely mirror the way that tests run
inside eclipse. | buildSrc/src/main/groovy/org/springframework/build/gradle/TestSourceSetDependenciesPlugin.groovy | @@ -0,0 +1,51 @@
+/*
+ * Copyright 2002-2012 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.build.gradle
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.artifacts.Configuration;
+import org.gradle.api.artifacts.ProjectDependency;
+
+
+/**
+ * Gradle plugin that automatically updates testCompile dependencies to include
+ * the test source sets of project dependencies.
+ *
+ * @author Phillip Webb
+ */
+class TestSourceSetDependenciesPlugin implements Plugin<Project> {
+
+ @Override
+ public void apply(Project project) {
+ project.afterEvaluate {
+ Set<ProjectDependency> projectDependencies = new LinkedHashSet<>()
+ for(def configurationName in ["compile", "optional", "provided"]) {
+ Configuration configuration = project.getConfigurations().findByName(configurationName)
+ if(configuration) {
+ projectDependencies.addAll(
+ configuration.dependencies.findAll { it instanceof ProjectDependency }
+ )
+ }
+ }
+ projectDependencies.each {
+ project.dependencies.add("testCompile", it.dependencyProject.sourceSets.test.output)
+ }
+ }
+ }
+
+} | true |
Other | spring-projects | spring-framework | 290aa5d64730e485fc9930e9a2509d14b05fad67.json | Develop a gradle plugin to add test dependencies
Develop a gradle plugin to automatically update testCompile dependencies
to include the test source sets of project dependencies.
Allows the gradle build to more closely mirror the way that tests run
inside eclipse. | buildSrc/src/main/resources/META-INF/gradle-plugins/test-source-set-dependencies.properties | @@ -0,0 +1 @@
+implementation-class=org.springframework.build.gradle.TestSourceSetDependenciesPlugin | true |
Other | spring-projects | spring-framework | 57d68b070e2bd060befefe0ecc1a6aad9c581acd.json | Expose Gradle buildSrc for IDE support
Create 'spring-build-src' Gradle module that exposes the buildSrc
folder as an IDE project. | build.gradle | @@ -171,6 +171,18 @@ configure(allprojects - project(":spring-build-junit")) {
test.systemProperties.put("testGroups", properties.get("testGroups"))
}
+project("spring-build-src") {
+ description = "Exposes gradle buildSrc for IDE support"
+ apply plugin: "groovy"
+
+ dependencies {
+ compile gradleApi()
+ groovy localGroovy()
+ }
+
+ configurations.archives.artifacts.clear()
+}
+
project("spring-build-junit") {
description = "Build-time JUnit dependencies and utilities"
| true |
Other | spring-projects | spring-framework | 57d68b070e2bd060befefe0ecc1a6aad9c581acd.json | Expose Gradle buildSrc for IDE support
Create 'spring-build-src' Gradle module that exposes the buildSrc
folder as an IDE project. | settings.gradle | @@ -23,3 +23,7 @@ include "spring-webmvc"
include "spring-webmvc-portlet"
include "spring-webmvc-tiles3"
include "spring-build-junit"
+
+// Exposes gradle buildSrc for IDE support
+include "buildSrc"
+rootProject.children.find{ it.name == "buildSrc" }.name = "spring-build-src" | true |
Other | spring-projects | spring-framework | 7a19fd575045333b970e645f6db8a15302484038.json | Fix regression in static setter method support
The intention of ExtendedBeanInfo, introduced with SPR-8079 in
v3.1.0.M2, was to support dependency injection against non-void
returning write methods. However, it also inadvertently introduced
support for injection against static setter methods.
When use of ExtendedBeanInfo was made optional with SPR-9723 in
v3.2.0.M2, ExtendedBeanInfo continued to support static write methods,
but its new BeanInfoFactory-based approach to testing whether or not
a given bean class contains candidate write methods was written in a
fashion exclusive of static methods, and this thereby introduced a
regression - a regression in an otherwise undocumented and unintended
feature, but a regression nevertheless.
The reporting of SPR-10115 proves that at least one user has come to
depend on this behavior allowing injection against static write
methods, and so this commit fixes the regression by ensuring that the
candidacy test includes standard and non-void setter methods having a
static modifier.
Issue: SPR-10115, SPR-9723, SPR-8079 | spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java | @@ -41,8 +41,8 @@
/**
* Decorator for a standard {@link BeanInfo} object, e.g. as created by
- * {@link Introspector#getBeanInfo(Class)}, designed to discover and register non-void
- * returning setter methods. For example:
+ * {@link Introspector#getBeanInfo(Class)}, designed to discover and register static
+ * and/or non-void returning setter methods. For example:
* <pre>{@code
* public class Bean {
* private Foo foo;
@@ -102,37 +102,40 @@ public ExtendedBeanInfo(BeanInfo delegate) throws IntrospectionException {
new SimpleNonIndexedPropertyDescriptor(pd));
}
- for (Method method : findNonVoidWriteMethods(delegate.getMethodDescriptors())) {
- handleNonVoidWriteMethod(method);
+ for (Method method : findCandidateWriteMethods(delegate.getMethodDescriptors())) {
+ handleCandidateWriteMethod(method);
}
}
- private List<Method> findNonVoidWriteMethods(MethodDescriptor[] methodDescriptors) {
+ private List<Method> findCandidateWriteMethods(MethodDescriptor[] methodDescriptors) {
List<Method> matches = new ArrayList<Method>();
for (MethodDescriptor methodDescriptor : methodDescriptors) {
Method method = methodDescriptor.getMethod();
- if (isNonVoidWriteMethod(method)) {
+ if (isCandidateWriteMethod(method)) {
matches.add(method);
}
}
return matches;
}
- public static boolean isNonVoidWriteMethod(Method method) {
+ public static boolean isCandidateWriteMethod(Method method) {
String methodName = method.getName();
Class<?>[] parameterTypes = method.getParameterTypes();
int nParams = parameterTypes.length;
if (methodName.length() > 3 && methodName.startsWith("set") &&
Modifier.isPublic(method.getModifiers()) &&
- !void.class.isAssignableFrom(method.getReturnType()) &&
+ (
+ !void.class.isAssignableFrom(method.getReturnType()) ||
+ Modifier.isStatic(method.getModifiers())
+ ) &&
(nParams == 1 || (nParams == 2 && parameterTypes[0].equals(int.class)))) {
return true;
}
return false;
}
- private void handleNonVoidWriteMethod(Method method) throws IntrospectionException {
+ private void handleCandidateWriteMethod(Method method) throws IntrospectionException {
int nParams = method.getParameterTypes().length;
String propertyName = propertyNameFor(method);
Class<?> propertyType = method.getParameterTypes()[nParams-1]; | true |
Other | spring-projects | spring-framework | 7a19fd575045333b970e645f6db8a15302484038.json | Fix regression in static setter method support
The intention of ExtendedBeanInfo, introduced with SPR-8079 in
v3.1.0.M2, was to support dependency injection against non-void
returning write methods. However, it also inadvertently introduced
support for injection against static setter methods.
When use of ExtendedBeanInfo was made optional with SPR-9723 in
v3.2.0.M2, ExtendedBeanInfo continued to support static write methods,
but its new BeanInfoFactory-based approach to testing whether or not
a given bean class contains candidate write methods was written in a
fashion exclusive of static methods, and this thereby introduced a
regression - a regression in an otherwise undocumented and unintended
feature, but a regression nevertheless.
The reporting of SPR-10115 proves that at least one user has come to
depend on this behavior allowing injection against static write
methods, and so this commit fixes the regression by ensuring that the
candidacy test includes standard and non-void setter methods having a
static modifier.
Issue: SPR-10115, SPR-9723, SPR-8079 | spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfoFactory.java | @@ -51,7 +51,7 @@ public BeanInfo getBeanInfo(Class<?> beanClass) throws IntrospectionException {
*/
private boolean supports(Class<?> beanClass) {
for (Method method : beanClass.getMethods()) {
- if (ExtendedBeanInfo.isNonVoidWriteMethod(method)) {
+ if (ExtendedBeanInfo.isCandidateWriteMethod(method)) {
return true;
}
} | true |
Other | spring-projects | spring-framework | 7a19fd575045333b970e645f6db8a15302484038.json | Fix regression in static setter method support
The intention of ExtendedBeanInfo, introduced with SPR-8079 in
v3.1.0.M2, was to support dependency injection against non-void
returning write methods. However, it also inadvertently introduced
support for injection against static setter methods.
When use of ExtendedBeanInfo was made optional with SPR-9723 in
v3.2.0.M2, ExtendedBeanInfo continued to support static write methods,
but its new BeanInfoFactory-based approach to testing whether or not
a given bean class contains candidate write methods was written in a
fashion exclusive of static methods, and this thereby introduced a
regression - a regression in an otherwise undocumented and unintended
feature, but a regression nevertheless.
The reporting of SPR-10115 proves that at least one user has come to
depend on this behavior allowing injection against static write
methods, and so this commit fixes the regression by ensuring that the
candidacy test includes standard and non-void setter methods having a
static modifier.
Issue: SPR-10115, SPR-9723, SPR-8079 | spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java | @@ -1550,6 +1550,24 @@ public void testWildcardedGenericEnum() {
assertEquals(TestEnum.TEST_VALUE, consumer.getEnumValue());
}
+ @Test
+ public void cornerSpr10115() {
+ Spr10115Bean foo = new Spr10115Bean();
+ BeanWrapperImpl bwi = new BeanWrapperImpl();
+ bwi.setWrappedInstance(foo);
+ bwi.setPropertyValue("prop1", "val1");
+ assertEquals("val1", Spr10115Bean.prop1);
+ }
+
+
+ static class Spr10115Bean {
+ private static String prop1;
+
+ public static void setProp1(String prop1) {
+ Spr10115Bean.prop1 = prop1;
+ }
+ }
+
private static class Foo {
| true |
Other | spring-projects | spring-framework | 7a19fd575045333b970e645f6db8a15302484038.json | Fix regression in static setter method support
The intention of ExtendedBeanInfo, introduced with SPR-8079 in
v3.1.0.M2, was to support dependency injection against non-void
returning write methods. However, it also inadvertently introduced
support for injection against static setter methods.
When use of ExtendedBeanInfo was made optional with SPR-9723 in
v3.2.0.M2, ExtendedBeanInfo continued to support static write methods,
but its new BeanInfoFactory-based approach to testing whether or not
a given bean class contains candidate write methods was written in a
fashion exclusive of static methods, and this thereby introduced a
regression - a regression in an otherwise undocumented and unintended
feature, but a regression nevertheless.
The reporting of SPR-10115 proves that at least one user has come to
depend on this behavior allowing injection against static write
methods, and so this commit fixes the regression by ensuring that the
candidacy test includes standard and non-void setter methods having a
static modifier.
Issue: SPR-10115, SPR-9723, SPR-8079 | spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java | @@ -946,4 +946,28 @@ public void setAddress(int index, String addr) { }
assertThat(hasIndexedWriteMethodForProperty(bi, "address"), is(true));
}
}
+
+ @Test
+ public void shouldSupportStaticWriteMethod() throws IntrospectionException {
+ {
+ BeanInfo bi = Introspector.getBeanInfo(WithStaticWriteMethod.class);
+ assertThat(hasReadMethodForProperty(bi, "prop1"), is(false));
+ assertThat(hasWriteMethodForProperty(bi, "prop1"), is(false));
+ assertThat(hasIndexedReadMethodForProperty(bi, "prop1"), is(false));
+ assertThat(hasIndexedWriteMethodForProperty(bi, "prop1"), is(false));
+ }
+ {
+ BeanInfo bi = new ExtendedBeanInfo(Introspector.getBeanInfo(WithStaticWriteMethod.class));
+ assertThat(hasReadMethodForProperty(bi, "prop1"), is(false));
+ assertThat(hasWriteMethodForProperty(bi, "prop1"), is(true));
+ assertThat(hasIndexedReadMethodForProperty(bi, "prop1"), is(false));
+ assertThat(hasIndexedWriteMethodForProperty(bi, "prop1"), is(false));
+ }
+ }
+
+ static class WithStaticWriteMethod {
+ @SuppressWarnings("unused")
+ public static void setProp1(String prop1) {
+ }
+ }
} | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
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 | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
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 | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
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(Method method, Class targetClass, Object[] args) {
// Should never be invoked as isRuntime returns false.
throw new UnsupportedOperationException(); | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
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 | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
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;
}
+ @Override
public String getAspectName() {
return this.aspectName;
}
@@ -223,6 +225,7 @@ public void setDeclarationOrder(int order) {
this.declarationOrder = order;
}
+ @Override
public int getDeclarationOrder() {
return this.declarationOrder;
}
@@ -678,6 +681,7 @@ public AdviceExcludingMethodMatcher(Method adviceMethod) {
this.adviceMethod = adviceMethod;
}
+ @Override
public boolean matches(Method method, Class targetClass) {
return !this.adviceMethod.equals(method);
} | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
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.argumentTypes.length;
@@ -309,6 +310,7 @@ public String[] getParameterNames(Method method) {
* @throws UnsupportedOperationException if
* {@link #setRaiseExceptions(boolean) raiseExceptions} has been set to {@code true}
*/
+ @Override
public String[] getParameterNames(Constructor ctor) {
if (this.raiseExceptions) {
throw new UnsupportedOperationException("An advice method can never be a constructor"); | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
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
public boolean isBeforeAdvice() {
return false;
}
+ @Override
public boolean isAfterAdvice() {
return true;
} | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
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) {
setReturningNameNoCheck(name);
}
+ @Override
public void afterReturning(Object returnValue, Method method, Object[] args, Object target) throws Throwable {
if (shouldInvokeOnReturnValueOf(method, returnValue)) {
invokeAdviceMethod(getJoinPointMatch(), returnValue, null); | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
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) {
setThrowingNameNoCheck(name);
}
+ @Override
public Object invoke(MethodInvocation mi) throws Throwable {
try {
return mi.proceed(); | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
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() {
}
+ @Override
public Object invoke(MethodInvocation mi) throws Throwable {
if (!(mi instanceof ProxyMethodInvocation)) {
throw new IllegalStateException("MethodInvocation is not a Spring ProxyMethodInvocation: " + mi); | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
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;
}
+ @Override
public MethodMatcher getMethodMatcher() {
checkReadyToMatch();
return this;
@@ -244,6 +247,7 @@ public PointcutExpression getPointcutExpression() {
return this.pointcutExpression;
}
+ @Override
public boolean matches(Class targetClass) {
checkReadyToMatch();
try {
@@ -267,6 +271,7 @@ public boolean matches(Class targetClass) {
}
}
+ @Override
public boolean matches(Method method, Class targetClass, boolean beanHasIntroductions) {
checkReadyToMatch();
Method targetMethod = AopUtils.getMostSpecificMethod(method, targetClass);
@@ -287,15 +292,18 @@ else if (shadowMatch.neverMatches()) {
}
}
+ @Override
public boolean matches(Method method, Class targetClass) {
return matches(method, targetClass, false);
}
+ @Override
public boolean isRuntime() {
checkReadyToMatch();
return this.pointcutExpression.mayNeedDynamicTest();
}
+ @Override
public boolean matches(Method method, Class targetClass, Object[] args) {
checkReadyToMatch();
ShadowMatch shadowMatch = getShadowMatch(AopUtils.getMostSpecificMethod(method, targetClass), method);
@@ -506,10 +514,12 @@ private class BeanNamePointcutDesignatorHandler implements PointcutDesignatorHan
private static final String BEAN_DESIGNATOR_NAME = "bean";
+ @Override
public String getDesignatorName() {
return BEAN_DESIGNATOR_NAME;
}
+ @Override
public ContextBasedMatcher parse(String expression) {
return new BeanNameContextMatcher(expression);
}
@@ -531,22 +541,27 @@ public BeanNameContextMatcher(String expression) {
this.expressionPattern = new NamePattern(expression);
}
+ @Override
public boolean couldMatchJoinPointsInType(Class someClass) {
return (contextMatch(someClass) == FuzzyBoolean.YES);
}
+ @Override
public boolean couldMatchJoinPointsInType(Class someClass, MatchingContext context) {
return (contextMatch(someClass) == FuzzyBoolean.YES);
}
+ @Override
public boolean matchesDynamically(MatchingContext context) {
return true;
}
+ @Override
public FuzzyBoolean matchesStatically(MatchingContext context) {
return contextMatch(null);
}
+ @Override
public boolean mayNeedDynamicTest() {
return false;
}
@@ -611,18 +626,22 @@ public DefensiveShadowMatch(ShadowMatch primary, ShadowMatch other) {
this.other = other;
}
+ @Override
public boolean alwaysMatches() {
return primary.alwaysMatches();
}
+ @Override
public boolean maybeMatches() {
return primary.maybeMatches();
}
+ @Override
public boolean neverMatches() {
return primary.neverMatches();
}
+ @Override
public JoinPointMatch matchesJoinPoint(Object thisObject,
Object targetObject, Object[] args) {
try {
@@ -632,6 +651,7 @@ public JoinPointMatch matchesJoinPoint(Object thisObject,
}
}
+ @Override
public void setMatchingContext(MatchingContext aMatchContext) {
primary.setMatchingContext(aMatchContext);
other.setMatchingContext(aMatchContext); | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
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 | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
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() {
return true;
}
+ @Override
public boolean isAfterAdvice() {
return false;
} | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
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() {
if (this.order != null) {
return this.order; | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
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();
@@ -93,15 +94,18 @@ private String makeMessageFor(IMessage aMessage) {
return AJ_ID + aMessage.getMessage();
}
+ @Override
public boolean isIgnoring(Kind messageKind) {
// We want to see everything, and allow configuration of log levels dynamically.
return false;
}
+ @Override
public void dontIgnore(Kind messageKind) {
// We weren't ignoring anything anyway...
}
+ @Override
public void ignore(Kind kind) {
// We weren't ignoring anything anyway...
} | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
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,27 @@ public boolean matches(Class clazz) {
}
+ @Override
public ClassFilter getClassFilter() {
return this.typePatternClassFilter;
}
+ @Override
public void validateInterfaces() throws IllegalArgumentException {
// Do nothing
}
+ @Override
public boolean isPerInstance() {
return true;
}
+ @Override
public Advice getAdvice() {
return this.advice;
}
+ @Override
public Class[] getInterfaces() {
return new Class[] {this.introducedInterface};
} | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
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() throws Throwable {
return this.methodInvocation.invocableClone().proceed();
}
+ @Override
public Object proceed(Object[] arguments) throws Throwable {
Assert.notNull(arguments, "Argument array passed to proceed cannot be null");
if (arguments.length != this.methodInvocation.getArguments().length) {
@@ -94,17 +97,20 @@ public Object proceed(Object[] arguments) throws Throwable {
/**
* Returns the Spring AOP proxy. Cannot be {@code null}.
*/
+ @Override
public Object getThis() {
return this.methodInvocation.getProxy();
}
/**
* Returns the Spring AOP target. May be {@code null} if there is no target.
*/
+ @Override
public Object getTarget() {
return this.methodInvocation.getThis();
}
+ @Override
public Object[] getArgs() {
if (this.defensiveCopyOfArgs == null) {
Object[] argsSource = this.methodInvocation.getArguments();
@@ -114,37 +120,44 @@ public Object[] getArgs() {
return this.defensiveCopyOfArgs;
}
+ @Override
public Signature getSignature() {
if (this.signature == null) {
this.signature = new MethodSignatureImpl();
}
return signature;
}
+ @Override
public SourceLocation getSourceLocation() {
if (this.sourceLocation == null) {
this.sourceLocation = new SourceLocationImpl();
}
return this.sourceLocation;
}
+ @Override
public String getKind() {
return ProceedingJoinPoint.METHOD_EXECUTION;
}
+ @Override
public int getId() {
// TODO: It's just an adapter but returning 0 might still have side effects...
return 0;
}
+ @Override
public JoinPoint.StaticPart getStaticPart() {
return this;
}
+ @Override
public String toShortString() {
return "execution(" + getSignature().toShortString() + ")";
}
+ @Override
public String toLongString() {
return "execution(" + getSignature().toLongString() + ")";
}
@@ -161,49 +174,60 @@ private class MethodSignatureImpl implements MethodSignature {
private volatile String[] parameterNames;
+ @Override
public String getName() {
return methodInvocation.getMethod().getName();
}
+ @Override
public int getModifiers() {
return methodInvocation.getMethod().getModifiers();
}
+ @Override
public Class getDeclaringType() {
return methodInvocation.getMethod().getDeclaringClass();
}
+ @Override
public String getDeclaringTypeName() {
return methodInvocation.getMethod().getDeclaringClass().getName();
}
+ @Override
public Class getReturnType() {
return methodInvocation.getMethod().getReturnType();
}
+ @Override
public Method getMethod() {
return methodInvocation.getMethod();
}
+ @Override
public Class[] getParameterTypes() {
return methodInvocation.getMethod().getParameterTypes();
}
+ @Override
public String[] getParameterNames() {
if (this.parameterNames == null) {
this.parameterNames = (new LocalVariableTableParameterNameDiscoverer()).getParameterNames(getMethod());
}
return this.parameterNames;
}
+ @Override
public Class[] getExceptionTypes() {
return methodInvocation.getMethod().getExceptionTypes();
}
+ @Override
public String toShortString() {
return toString(false, false, false, false);
}
+ @Override
public String toLongString() {
return toString(true, true, true, true);
}
@@ -267,21 +291,25 @@ private void appendType(StringBuilder sb, Class<?> type, boolean useLongTypeName
*/
private class SourceLocationImpl implements SourceLocation {
+ @Override
public Class getWithinType() {
if (methodInvocation.getThis() == null) {
throw new UnsupportedOperationException("No source location joinpoint available: target is null");
}
return methodInvocation.getThis().getClass();
}
+ @Override
public String getFileName() {
throw new UnsupportedOperationException();
}
+ @Override
public int getLine() {
throw new UnsupportedOperationException();
}
+ @Override
public int getColumn() {
throw new UnsupportedOperationException();
} | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
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
public void visit(Or e) {
e.getLeft().accept(this);
e.getRight().accept(this);
}
+ @Override
public void visit(Not e) {
e.getBody().accept(this);
}
+ @Override
public void visit(Instanceof i) {
}
+ @Override
public void visit(Literal literal) {
}
+ @Override
public void visit(Call call) {
}
+ @Override
public void visit(FieldGetCall fieldGetCall) {
}
+ @Override
public void visit(HasAnnotation hasAnnotation) {
}
+ @Override
public void visit(MatchingContextBasedTest matchingContextTest) {
}
| true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
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.aspectClass.getClassLoader();
}
@@ -73,6 +75,7 @@ public ClassLoader getAspectClassLoader() {
* @see org.springframework.core.Ordered
* @see #getOrderForAspectClass
*/
+ @Override
public int getOrder() {
return getOrderForAspectClass(this.aspectClass);
} | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
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 @@ public ClassLoader getAspectClassLoader() {
* @see org.springframework.core.Ordered
* @see #getOrderForAspectClass
*/
+ @Override
public int getOrder() {
if (this.aspectInstance instanceof Ordered) {
return ((Ordered) this.aspectInstance).getOrder(); | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
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) {
throw new IllegalStateException("No 'typePattern' has been set via ctor/setter."); | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
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) {
return (hasAspectAnnotation(clazz) && !compiledByAjc(clazz));
}
@@ -135,6 +136,7 @@ private boolean compiledByAjc(Class<?> clazz) {
return false;
}
+ @Override
public void validate(Class<?> aspectClass) throws AopConfigException {
// If the parent has the annotation and isn't abstract it's an error
if (aspectClass.getSuperclass().getAnnotation(Aspect.class) != null &&
@@ -309,6 +311,7 @@ public String toString() {
*/
private static class AspectJAnnotationParameterNameDiscoverer implements ParameterNameDiscoverer {
+ @Override
public String[] getParameterNames(Method method) {
if (method.getParameterTypes().length == 0) {
return new String[0];
@@ -330,6 +333,7 @@ public String[] getParameterNames(Method method) {
}
}
+ @Override
public String[] getParameterNames(Constructor ctor) {
throw new UnsupportedOperationException("Spring AOP cannot handle constructor advice");
} | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
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 ConfigurableBeanFactory) {
return ((ConfigurableBeanFactory) this.beanFactory).getBeanClassLoader();
@@ -85,6 +87,7 @@ public ClassLoader getAspectClassLoader() {
}
}
+ @Override
public AspectMetadata getAspectMetadata() {
return this.aspectMetadata;
}
@@ -99,6 +102,7 @@ public AspectMetadata getAspectMetadata() {
* @see org.springframework.core.Ordered
* @see org.springframework.core.annotation.Order
*/
+ @Override
public int getOrder() {
Class<?> type = this.beanFactory.getType(this.name);
if (type != null) { | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java | @@ -97,6 +97,7 @@ public InstantiationModelAwarePointcutAdvisorImpl(AspectJAdvisorFactory af, Asp
* 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 +107,7 @@ public Pointcut getPointcut() {
* are much richer. In AspectJ terminology, all a return of {@code true}
* means here is that the aspect is not a SINGLETON.
*/
+ @Override
public boolean isPerInstance() {
return (getAspectMetadata().getAjType().getPerClause().getKind() != PerClauseKind.SINGLETON);
}
@@ -120,17 +122,20 @@ public AspectMetadata getAspectMetadata() {
/**
* Lazily instantiate advice if necessary.
*/
+ @Override
public synchronized Advice getAdvice() {
if (this.instantiatedAdvice == null) {
this.instantiatedAdvice = instantiateAdvice(this.declaredPointcut);
}
return this.instantiatedAdvice;
}
+ @Override
public boolean isLazy() {
return this.lazy;
}
+ @Override
public synchronized boolean isAdviceInstantiated() {
return (this.instantiatedAdvice != null);
}
@@ -149,25 +154,30 @@ public AspectJExpressionPointcut getDeclaredPointcut() {
return this.declaredPointcut;
}
+ @Override
public int getOrder() {
return this.aspectInstanceFactory.getOrder();
}
+ @Override
public String getAspectName() {
return this.aspectName;
}
+ @Override
public int getDeclarationOrder() {
return this.declarationOrder;
}
+ @Override
public boolean isBeforeAdvice() {
if (this.isBeforeAdvice == null) {
determineAdviceType();
}
return this.isBeforeAdvice;
}
+ @Override
public boolean isAfterAdvice() {
if (this.isAfterAdvice == null) {
determineAdviceType();
@@ -245,6 +255,7 @@ public boolean matches(Method method, Class targetClass) {
this.preInstantiationPointcut.getMethodMatcher().matches(method, targetClass);
}
+ @Override
public boolean matches(Method method, Class targetClass, Object[] args) {
// This can match only on declared pointcut.
return (isAspectMaterialized() && this.declaredPointcut.matches(method, targetClass)); | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
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 != null);
}
+ @Override
public ClassLoader getAspectClassLoader() {
return this.maaif.getAspectClassLoader();
}
+ @Override
public AspectMetadata getAspectMetadata() {
return this.maaif.getAspectMetadata();
}
+ @Override
public int getOrder() {
return this.maaif.getOrder();
} | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
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 convert(Method method) {
AspectJAnnotation<?> annotation = AbstractAspectJAdvisorFactory.findAspectJAnnotationOnMethod(method);
return annotation == null ? null : annotation.getAnnotation();
}
}));
comparator.addComparator(new ConvertingComparator<Method, String>(
new Converter<Method, String>() {
+ @Override
public String convert(Method method) {
return method.getName();
}
@@ -90,6 +92,7 @@ public String convert(Method method) {
}
+ @Override
public List<Advisor> getAdvisors(MetadataAwareAspectInstanceFactory maaif) {
final Class<?> aspectClass = maaif.getAspectMetadata().getAspectClass();
final String aspectName = maaif.getAspectMetadata().getAspectName();
@@ -128,6 +131,7 @@ public List<Advisor> getAdvisors(MetadataAwareAspectInstanceFactory maaif) {
private List<Method> getAdvisorMethods(Class<?> aspectClass) {
final List<Method> methods = new LinkedList<Method>();
ReflectionUtils.doWithMethods(aspectClass, new ReflectionUtils.MethodCallback() {
+ @Override
public void doWith(Method method) throws IllegalArgumentException {
// Exclude pointcuts
if (AnnotationUtils.getAnnotation(method, Pointcut.class) == null) {
@@ -164,6 +168,7 @@ private Advisor getDeclareParentsAdvisor(Field introductionField) {
}
+ @Override
public Advisor getAdvisor(Method candidateAdviceMethod, MetadataAwareAspectInstanceFactory aif,
int declarationOrderInAspect, String aspectName) {
@@ -191,6 +196,7 @@ private AspectJExpressionPointcut getPointcut(Method candidateAdviceMethod, Clas
}
+ @Override
public Advice getAdvice(Method candidateAdviceMethod, AspectJExpressionPointcut ajexp,
MetadataAwareAspectInstanceFactory aif, int declarationOrderInAspect, String aspectName) {
@@ -272,6 +278,7 @@ protected static class SyntheticInstantiationAdvisor extends DefaultPointcutAdvi
public SyntheticInstantiationAdvisor(final MetadataAwareAspectInstanceFactory aif) {
super(aif.getAspectMetadata().getPerClausePointcut(), new MethodBeforeAdvice() {
+ @Override
public void before(Method method, Object[] args, Object target) {
// Simply instantiate the aspect
aif.getAspectInstance(); | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
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 | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
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 | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java | @@ -131,11 +131,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, otherAdvisor);
}
+ @Override
public int fallbackCompareTo(Object obj) {
return 0;
} | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparator.java | @@ -76,6 +76,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 |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDecorator.java | @@ -58,6 +58,7 @@
*/
public abstract class AbstractInterceptorDrivenBeanDefinitionDecorator implements BeanDefinitionDecorator {
+ @Override
public final BeanDefinitionHolder decorate(Node node, BeanDefinitionHolder definitionHolder, ParserContext parserContext) {
BeanDefinitionRegistry registry = parserContext.getRegistry();
| true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/config/AdvisorComponentDefinition.java | @@ -91,6 +91,7 @@ private String buildDescription(BeanReference adviceReference, BeanReference poi
}
+ @Override
public String getName() {
return this.advisorBeanName;
}
@@ -110,6 +111,7 @@ public BeanReference[] getBeanReferences() {
return this.beanReferences;
}
+ @Override
public Object getSource() {
return this.advisorDefinition.getSource();
} | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/config/AopNamespaceHandler.java | @@ -59,6 +59,7 @@ public class AopNamespaceHandler extends NamespaceHandlerSupport {
* '{@code config}', '{@code spring-configured}', '{@code aspectj-autoproxy}'
* and '{@code scoped-proxy}' tags.
*/
+ @Override
public void init() {
// In 2.0 XSD as well as in 2.1 XSD.
registerBeanDefinitionParser("config", new ConfigBeanDefinitionParser()); | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/config/AspectJAutoProxyBeanDefinitionParser.java | @@ -37,6 +37,7 @@
*/
class AspectJAutoProxyBeanDefinitionParser implements BeanDefinitionParser {
+ @Override
public BeanDefinition parse(Element element, ParserContext parserContext) {
AopNamespaceUtils.registerAspectJAnnotationAutoProxyCreatorIfNecessary(parserContext, element);
extendBeanDefinition(element, parserContext); | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java | @@ -95,6 +95,7 @@ class ConfigBeanDefinitionParser implements BeanDefinitionParser {
private ParseState parseState = new ParseState();
+ @Override
public BeanDefinition parse(Element element, ParserContext parserContext) {
CompositeComponentDefinition compositeDef =
new CompositeComponentDefinition(element.getTagName(), parserContext.extractSource(element)); | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/config/MethodLocatingFactoryBean.java | @@ -57,6 +57,7 @@ public void setMethodName(String methodName) {
this.methodName = methodName;
}
+ @Override
public void setBeanFactory(BeanFactory beanFactory) {
if (!StringUtils.hasText(this.targetBeanName)) {
throw new IllegalArgumentException("Property 'targetBeanName' is required");
@@ -78,14 +79,17 @@ public void setBeanFactory(BeanFactory beanFactory) {
}
+ @Override
public Method getObject() throws Exception {
return this.method;
}
+ @Override
public Class<Method> getObjectType() {
return Method.class;
}
+ @Override
public boolean isSingleton() {
return true;
} | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/config/PointcutComponentDefinition.java | @@ -46,6 +46,7 @@ public PointcutComponentDefinition(String pointcutBeanName, BeanDefinition point
}
+ @Override
public String getName() {
return this.pointcutBeanName;
}
@@ -60,6 +61,7 @@ public BeanDefinition[] getBeanDefinitions() {
return new BeanDefinition[] {this.pointcutDefinition};
}
+ @Override
public Object getSource() {
return this.pointcutDefinition.getSource();
} | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/config/ScopedProxyBeanDefinitionDecorator.java | @@ -39,6 +39,7 @@ class ScopedProxyBeanDefinitionDecorator implements BeanDefinitionDecorator {
private static final String PROXY_TARGET_CLASS = "proxy-target-class";
+ @Override
public BeanDefinitionHolder decorate(Node node, BeanDefinitionHolder definition, ParserContext parserContext) {
boolean proxyTargetClass = true;
if (node instanceof Element) { | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/config/SimpleBeanFactoryAwareAspectInstanceFactory.java | @@ -47,6 +47,7 @@ public void setAspectBeanName(String aspectBeanName) {
this.aspectBeanName = aspectBeanName;
}
+ @Override
public void setBeanFactory(BeanFactory beanFactory) {
this.beanFactory = beanFactory;
if (!StringUtils.hasText(this.aspectBeanName)) {
@@ -59,10 +60,12 @@ public void setBeanFactory(BeanFactory beanFactory) {
* Look up the aspect bean from the {@link BeanFactory} and returns it.
* @see #setAspectBeanName
*/
+ @Override
public Object getAspectInstance() {
return this.beanFactory.getBean(this.aspectBeanName);
}
+ @Override
public ClassLoader getAspectClassLoader() {
if (this.beanFactory instanceof ConfigurableBeanFactory) {
return ((ConfigurableBeanFactory) this.beanFactory).getBeanClassLoader();
@@ -72,6 +75,7 @@ public ClassLoader getAspectClassLoader() {
}
}
+ @Override
public int getOrder() {
if (this.beanFactory.isSingleton(this.aspectBeanName) &&
this.beanFactory.isTypeMatch(this.aspectBeanName, Ordered.class)) { | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/config/SpringConfiguredBeanDefinitionParser.java | @@ -50,6 +50,7 @@ class SpringConfiguredBeanDefinitionParser implements BeanDefinitionParser {
"org.springframework.beans.factory.aspectj.AnnotationBeanConfigurerAspect";
+ @Override
public BeanDefinition parse(Element element, ParserContext parserContext) {
if (!parserContext.getRegistry().containsBeanDefinition(BEAN_CONFIGURER_ASPECT_BEAN_NAME)) {
RootBeanDefinition def = new RootBeanDefinition(); | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/framework/AbstractAdvisingBeanPostProcessor.java | @@ -50,6 +50,7 @@ public abstract class AbstractAdvisingBeanPostProcessor extends ProxyConfig
private final Map<String, Boolean> eligibleBeans = new ConcurrentHashMap<String, Boolean>(64);
+ @Override
public void setBeanClassLoader(ClassLoader beanClassLoader) {
this.beanClassLoader = beanClassLoader;
}
@@ -58,15 +59,18 @@ public void setOrder(int order) {
this.order = order;
}
+ @Override
public int getOrder() {
return this.order;
}
+ @Override
public Object postProcessBeforeInitialization(Object bean, String beanName) {
return bean;
}
+ @Override
public Object postProcessAfterInitialization(Object bean, String beanName) {
if (bean instanceof AopInfrastructureBean) {
// Ignore AOP infrastructure such as scoped proxies. | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/framework/AbstractSingletonProxyFactoryBean.java | @@ -122,13 +122,15 @@ public void setProxyClassLoader(ClassLoader classLoader) {
this.proxyClassLoader = classLoader;
}
+ @Override
public void setBeanClassLoader(ClassLoader classLoader) {
if (this.proxyClassLoader == null) {
this.proxyClassLoader = classLoader;
}
}
+ @Override
public void afterPropertiesSet() {
if (this.target == null) {
throw new IllegalArgumentException("Property 'target' is required");
@@ -190,13 +192,15 @@ protected TargetSource createTargetSource(Object target) {
}
+ @Override
public Object getObject() {
if (this.proxy == null) {
throw new FactoryBeanNotInitializedException();
}
return this.proxy;
}
+ @Override
public Class<?> getObjectType() {
if (this.proxy != null) {
return this.proxy.getClass();
@@ -213,6 +217,7 @@ public Class<?> getObjectType() {
return null;
}
+ @Override
public final boolean isSingleton() {
return true;
} | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java | @@ -137,10 +137,12 @@ public void setTarget(Object target) {
setTargetSource(new SingletonTargetSource(target));
}
+ @Override
public void setTargetSource(TargetSource targetSource) {
this.targetSource = (targetSource != null ? targetSource : EMPTY_TARGET_SOURCE);
}
+ @Override
public TargetSource getTargetSource() {
return this.targetSource;
}
@@ -162,14 +164,17 @@ public void setTargetClass(Class targetClass) {
this.targetSource = EmptyTargetSource.forClass(targetClass);
}
+ @Override
public Class<?> getTargetClass() {
return this.targetSource.getTargetClass();
}
+ @Override
public void setPreFiltered(boolean preFiltered) {
this.preFiltered = preFiltered;
}
+ @Override
public boolean isPreFiltered() {
return this.preFiltered;
}
@@ -228,10 +233,12 @@ public boolean removeInterface(Class intf) {
return this.interfaces.remove(intf);
}
+ @Override
public Class[] getProxiedInterfaces() {
return this.interfaces.toArray(new Class[this.interfaces.size()]);
}
+ @Override
public boolean isInterfaceProxied(Class intf) {
for (Class proxyIntf : this.interfaces) {
if (intf.isAssignableFrom(proxyIntf)) {
@@ -242,22 +249,26 @@ public boolean isInterfaceProxied(Class intf) {
}
+ @Override
public final Advisor[] getAdvisors() {
return this.advisorArray;
}
+ @Override
public void addAdvisor(Advisor advisor) {
int pos = this.advisors.size();
addAdvisor(pos, advisor);
}
+ @Override
public void addAdvisor(int pos, Advisor advisor) throws AopConfigException {
if (advisor instanceof IntroductionAdvisor) {
validateIntroductionAdvisor((IntroductionAdvisor) advisor);
}
addAdvisorInternal(pos, advisor);
}
+ @Override
public boolean removeAdvisor(Advisor advisor) {
int index = indexOf(advisor);
if (index == -1) {
@@ -269,6 +280,7 @@ public boolean removeAdvisor(Advisor advisor) {
}
}
+ @Override
public void removeAdvisor(int index) throws AopConfigException {
if (isFrozen()) {
throw new AopConfigException("Cannot remove Advisor: Configuration is frozen.");
@@ -292,11 +304,13 @@ public void removeAdvisor(int index) throws AopConfigException {
adviceChanged();
}
+ @Override
public int indexOf(Advisor advisor) {
Assert.notNull(advisor, "Advisor must not be null");
return this.advisors.indexOf(advisor);
}
+ @Override
public boolean replaceAdvisor(Advisor a, Advisor b) throws AopConfigException {
Assert.notNull(a, "Advisor a must not be null");
Assert.notNull(b, "Advisor b must not be null");
@@ -388,6 +402,7 @@ protected final List<Advisor> getAdvisorsInternal() {
}
+ @Override
public void addAdvice(Advice advice) throws AopConfigException {
int pos = this.advisors.size();
addAdvice(pos, advice);
@@ -396,6 +411,7 @@ public void addAdvice(Advice advice) throws AopConfigException {
/**
* Cannot add introductions this way unless the advice implements IntroductionInfo.
*/
+ @Override
public void addAdvice(int pos, Advice advice) throws AopConfigException {
Assert.notNull(advice, "Advice must not be null");
if (advice instanceof IntroductionInfo) {
@@ -412,6 +428,7 @@ else if (advice instanceof DynamicIntroductionAdvice) {
}
}
+ @Override
public boolean removeAdvice(Advice advice) throws AopConfigException {
int index = indexOf(advice);
if (index == -1) {
@@ -423,6 +440,7 @@ public boolean removeAdvice(Advice advice) throws AopConfigException {
}
}
+ @Override
public int indexOf(Advice advice) {
Assert.notNull(advice, "Advice must not be null");
for (int i = 0; i < this.advisors.size(); i++) {
@@ -554,6 +572,7 @@ private void readObject(ObjectInputStream ois) throws IOException, ClassNotFound
}
+ @Override
public String toProxyConfigString() {
return toString();
} | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java | @@ -146,10 +146,12 @@ public void setConstructorArguments(Object[] constructorArgs, Class<?>[] constru
}
+ @Override
public Object getProxy() {
return getProxy(null);
}
+ @Override
public Object getProxy(ClassLoader classLoader) {
if (logger.isDebugEnabled()) {
logger.debug("Creating CGLIB proxy: target source is " + this.advised.getTargetSource());
@@ -386,6 +388,7 @@ public StaticUnadvisedInterceptor(Object target) {
this.target = target;
}
+ @Override
public Object intercept(Object proxy, Method method, Object[] args, MethodProxy methodProxy) throws Throwable {
Object retVal = methodProxy.invoke(this.target, args);
return processReturnType(proxy, this.target, method, retVal);
@@ -405,6 +408,7 @@ public StaticUnadvisedExposedInterceptor(Object target) {
this.target = target;
}
+ @Override
public Object intercept(Object proxy, Method method, Object[] args, MethodProxy methodProxy) throws Throwable {
Object oldProxy = null;
try {
@@ -432,6 +436,7 @@ public DynamicUnadvisedInterceptor(TargetSource targetSource) {
this.targetSource = targetSource;
}
+ @Override
public Object intercept(Object proxy, Method method, Object[] args, MethodProxy methodProxy) throws Throwable {
Object target = this.targetSource.getTarget();
try {
@@ -456,6 +461,7 @@ public DynamicUnadvisedExposedInterceptor(TargetSource targetSource) {
this.targetSource = targetSource;
}
+ @Override
public Object intercept(Object proxy, Method method, Object[] args, MethodProxy methodProxy) throws Throwable {
Object oldProxy = null;
Object target = this.targetSource.getTarget();
@@ -485,6 +491,7 @@ public StaticDispatcher(Object target) {
this.target = target;
}
+ @Override
public Object loadObject() {
return this.target;
}
@@ -502,6 +509,7 @@ public AdvisedDispatcher(AdvisedSupport advised) {
this.advised = advised;
}
+ @Override
public Object loadObject() throws Exception {
return this.advised;
}
@@ -520,6 +528,7 @@ public EqualsInterceptor(AdvisedSupport advised) {
this.advised = advised;
}
+ @Override
public Object intercept(Object proxy, Method method, Object[] args, MethodProxy methodProxy) {
Object other = args[0];
if (proxy == other) {
@@ -552,6 +561,7 @@ public HashCodeInterceptor(AdvisedSupport advised) {
this.advised = advised;
}
+ @Override
public Object intercept(Object proxy, Method method, Object[] args, MethodProxy methodProxy) {
return CglibAopProxy.class.hashCode() * 13 + this.advised.getTargetSource().hashCode();
}
@@ -575,6 +585,7 @@ public FixedChainStaticTargetInterceptor(List<Object> adviceChain, Object target
this.targetClass = targetClass;
}
+ @Override
public Object intercept(Object proxy, Method method, Object[] args, MethodProxy methodProxy) throws Throwable {
MethodInvocation invocation = new CglibMethodInvocation(proxy, this.target, method, args,
this.targetClass, this.adviceChain, methodProxy);
@@ -598,6 +609,7 @@ public DynamicAdvisedInterceptor(AdvisedSupport advised) {
this.advised = advised;
}
+ @Override
public Object intercept(Object proxy, Method method, Object[] args, MethodProxy methodProxy) throws Throwable {
Object oldProxy = null;
boolean setProxyContext = false;
@@ -754,6 +766,7 @@ public ProxyCallbackFilter(AdvisedSupport advised, Map<String, Integer> fixedInt
* DynamicUnadvisedInterceptor already considers this.</dd>
* </dl>
*/
+ @Override
public int accept(Method method) {
if (AopUtils.isFinalizeMethod(method)) {
logger.debug("Found finalize() method - using NO_OVERRIDE"); | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/framework/DefaultAdvisorChainFactory.java | @@ -46,6 +46,7 @@
@SuppressWarnings("serial")
public class DefaultAdvisorChainFactory implements AdvisorChainFactory, Serializable {
+ @Override
public List<Object> getInterceptorsAndDynamicInterceptionAdvice(
Advised config, Method method, Class targetClass) {
| true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/framework/DefaultAopProxyFactory.java | @@ -49,6 +49,7 @@
public class DefaultAopProxyFactory implements AopProxyFactory, Serializable {
+ @Override
public AopProxy createAopProxy(AdvisedSupport config) throws AopConfigException {
if (config.isOptimize() || config.isProxyTargetClass() || hasNoUserSuppliedProxyInterfaces(config)) {
Class targetClass = config.getTargetClass(); | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/framework/JdkDynamicAopProxy.java | @@ -106,10 +106,12 @@ public JdkDynamicAopProxy(AdvisedSupport config) throws AopConfigException {
}
+ @Override
public Object getProxy() {
return getProxy(ClassUtils.getDefaultClassLoader());
}
+ @Override
public Object getProxy(ClassLoader classLoader) {
if (logger.isDebugEnabled()) {
logger.debug("Creating JDK dynamic proxy: target source is " + this.advised.getTargetSource());
@@ -147,6 +149,7 @@ private void findDefinedEqualsAndHashCodeMethods(Class[] proxiedInterfaces) {
* <p>Callers will see exactly the exception thrown by the target,
* unless a hook method throws an exception.
*/
+ @Override
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
MethodInvocation invocation;
Object oldProxy = null; | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java | @@ -218,12 +218,14 @@ public void setProxyClassLoader(ClassLoader classLoader) {
this.classLoaderConfigured = (classLoader != null);
}
+ @Override
public void setBeanClassLoader(ClassLoader classLoader) {
if (!this.classLoaderConfigured) {
this.proxyClassLoader = classLoader;
}
}
+ @Override
public void setBeanFactory(BeanFactory beanFactory) {
this.beanFactory = beanFactory;
checkInterceptorNames();
@@ -237,6 +239,7 @@ public void setBeanFactory(BeanFactory beanFactory) {
* {@code getObject()} for a proxy.
* @return a fresh AOP proxy reflecting the current state of this factory
*/
+ @Override
public Object getObject() throws BeansException {
initializeAdvisorChain();
if (isSingleton()) {
@@ -257,6 +260,7 @@ public Object getObject() throws BeansException {
* a single one), the target bean type, or the TargetSource's target class.
* @see org.springframework.aop.TargetSource#getTargetClass
*/
+ @Override
public Class<?> getObjectType() {
synchronized (this) {
if (this.singletonInstance != null) {
@@ -278,6 +282,7 @@ else if (this.targetName != null && this.beanFactory != null) {
}
}
+ @Override
public boolean isSingleton() {
return this.singleton;
}
@@ -638,10 +643,12 @@ public String getBeanName() {
return beanName;
}
+ @Override
public Advice getAdvice() {
throw new UnsupportedOperationException("Cannot invoke methods: " + this.message);
}
+ @Override
public boolean isPerInstance() {
throw new UnsupportedOperationException("Cannot invoke methods: " + this.message);
} | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java | @@ -114,14 +114,17 @@ protected ReflectiveMethodInvocation(
}
+ @Override
public final Object getProxy() {
return this.proxy;
}
+ @Override
public final Object getThis() {
return this.target;
}
+ @Override
public final AccessibleObject getStaticPart() {
return this.method;
}
@@ -131,19 +134,23 @@ public final AccessibleObject getStaticPart() {
* May or may not correspond with a method invoked on an underlying
* implementation of that interface.
*/
+ @Override
public final Method getMethod() {
return this.method;
}
+ @Override
public final Object[] getArguments() {
return (this.arguments != null ? this.arguments : new Object[0]);
}
+ @Override
public void setArguments(Object[] arguments) {
this.arguments = arguments;
}
+ @Override
public Object proceed() throws Throwable {
// We start with an index of -1 and increment early.
if (this.currentInterceptorIndex == this.interceptorsAndDynamicMethodMatchers.size() - 1) {
@@ -192,6 +199,7 @@ protected Object invokeJoinpoint() throws Throwable {
* current interceptor index.
* @see java.lang.Object#clone()
*/
+ @Override
public MethodInvocation invocableClone() {
Object[] cloneArguments = null;
if (this.arguments != null) {
@@ -210,6 +218,7 @@ public MethodInvocation invocableClone() {
* current interceptor index.
* @see java.lang.Object#clone()
*/
+ @Override
public MethodInvocation invocableClone(Object[] arguments) {
// Force initialization of the user attributes Map,
// for having a shared Map reference in the clone.
@@ -230,6 +239,7 @@ public MethodInvocation invocableClone(Object[] arguments) {
}
+ @Override
public void setUserAttribute(String key, Object value) {
if (value != null) {
if (this.userAttributes == null) {
@@ -244,6 +254,7 @@ public void setUserAttribute(String key, Object value) {
}
}
+ @Override
public Object getUserAttribute(String key) {
return (this.userAttributes != null ? this.userAttributes.get(key) : null);
} | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationManager.java | @@ -48,10 +48,12 @@ public void setAdvisorAdapterRegistry(AdvisorAdapterRegistry advisorAdapterRegis
}
+ @Override
public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
return bean;
}
+ @Override
public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
if (bean instanceof AdvisorAdapter){
this.advisorAdapterRegistry.registerAdvisorAdapter((AdvisorAdapter) bean); | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceAdapter.java | @@ -34,10 +34,12 @@
@SuppressWarnings("serial")
class AfterReturningAdviceAdapter implements AdvisorAdapter, Serializable {
+ @Override
public boolean supportsAdvice(Advice advice) {
return (advice instanceof AfterReturningAdvice);
}
+ @Override
public MethodInterceptor getInterceptor(Advisor advisor) {
AfterReturningAdvice advice = (AfterReturningAdvice) advisor.getAdvice();
return new AfterReturningAdviceInterceptor(advice); | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceInterceptor.java | @@ -47,6 +47,7 @@ public AfterReturningAdviceInterceptor(AfterReturningAdvice advice) {
this.advice = advice;
}
+ @Override
public Object invoke(MethodInvocation mi) throws Throwable {
Object retVal = mi.proceed();
this.advice.afterReturning(retVal, mi.getMethod(), mi.getArguments(), mi.getThis()); | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/framework/adapter/DefaultAdvisorAdapterRegistry.java | @@ -53,6 +53,7 @@ public DefaultAdvisorAdapterRegistry() {
}
+ @Override
public Advisor wrap(Object adviceObject) throws UnknownAdviceTypeException {
if (adviceObject instanceof Advisor) {
return (Advisor) adviceObject;
@@ -74,6 +75,7 @@ public Advisor wrap(Object adviceObject) throws UnknownAdviceTypeException {
throw new UnknownAdviceTypeException(advice);
}
+ @Override
public MethodInterceptor[] getInterceptors(Advisor advisor) throws UnknownAdviceTypeException {
List<MethodInterceptor> interceptors = new ArrayList<MethodInterceptor>(3);
Advice advice = advisor.getAdvice();
@@ -91,6 +93,7 @@ public MethodInterceptor[] getInterceptors(Advisor advisor) throws UnknownAdvice
return interceptors.toArray(new MethodInterceptor[interceptors.size()]);
}
+ @Override
public void registerAdvisorAdapter(AdvisorAdapter adapter) {
this.adapters.add(adapter);
} | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceAdapter.java | @@ -34,10 +34,12 @@
@SuppressWarnings("serial")
class MethodBeforeAdviceAdapter implements AdvisorAdapter, Serializable {
+ @Override
public boolean supportsAdvice(Advice advice) {
return (advice instanceof MethodBeforeAdvice);
}
+ @Override
public MethodInterceptor getInterceptor(Advisor advisor) {
MethodBeforeAdvice advice = (MethodBeforeAdvice) advisor.getAdvice();
return new MethodBeforeAdviceInterceptor(advice); | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceInterceptor.java | @@ -46,6 +46,7 @@ public MethodBeforeAdviceInterceptor(MethodBeforeAdvice advice) {
this.advice = advice;
}
+ @Override
public Object invoke(MethodInvocation mi) throws Throwable {
this.advice.before(mi.getMethod(), mi.getArguments(), mi.getThis() );
return mi.proceed(); | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceAdapter.java | @@ -34,10 +34,12 @@
@SuppressWarnings("serial")
class ThrowsAdviceAdapter implements AdvisorAdapter, Serializable {
+ @Override
public boolean supportsAdvice(Advice advice) {
return (advice instanceof ThrowsAdvice);
}
+ @Override
public MethodInterceptor getInterceptor(Advisor advisor) {
return new ThrowsAdviceInterceptor(advisor.getAdvice());
} | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptor.java | @@ -119,6 +119,7 @@ private Method getExceptionHandler(Throwable exception) {
return handler;
}
+ @Override
public Object invoke(MethodInvocation mi) throws Throwable {
try {
return mi.proceed(); | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.java | @@ -155,6 +155,7 @@ public final void setOrder(int order) {
this.order = order;
}
+ @Override
public final int getOrder() {
return this.order;
}
@@ -232,12 +233,14 @@ public void setProxyClassLoader(ClassLoader classLoader) {
this.classLoaderConfigured = (classLoader != null);
}
+ @Override
public void setBeanClassLoader(ClassLoader classLoader) {
if (!this.classLoaderConfigured) {
this.proxyClassLoader = classLoader;
}
}
+ @Override
public void setBeanFactory(BeanFactory beanFactory) {
this.beanFactory = beanFactory;
}
@@ -251,21 +254,25 @@ protected BeanFactory getBeanFactory() {
}
+ @Override
public Class<?> predictBeanType(Class<?> beanClass, String beanName) {
Object cacheKey = getCacheKey(beanClass, beanName);
return this.proxyTypes.get(cacheKey);
}
+ @Override
public Constructor<?>[] determineCandidateConstructors(Class<?> beanClass, String beanName) throws BeansException {
return null;
}
+ @Override
public Object getEarlyBeanReference(Object bean, String beanName) throws BeansException {
Object cacheKey = getCacheKey(bean.getClass(), beanName);
this.earlyProxyReferences.put(cacheKey, Boolean.TRUE);
return wrapIfNecessary(bean, beanName, cacheKey);
}
+ @Override
public Object postProcessBeforeInstantiation(Class<?> beanClass, String beanName) throws BeansException {
Object cacheKey = getCacheKey(beanClass, beanName);
@@ -296,16 +303,19 @@ public Object postProcessBeforeInstantiation(Class<?> beanClass, String beanName
return null;
}
+ @Override
public boolean postProcessAfterInstantiation(Object bean, String beanName) {
return true;
}
+ @Override
public PropertyValues postProcessPropertyValues(
PropertyValues pvs, PropertyDescriptor[] pds, Object bean, String beanName) {
return pvs;
}
+ @Override
public Object postProcessBeforeInitialization(Object bean, String beanName) {
return bean;
}
@@ -315,6 +325,7 @@ public Object postProcessBeforeInitialization(Object bean, String beanName) {
* identified as one to proxy by the subclass.
* @see #getAdvicesAndAdvisorsForBean
*/
+ @Override
public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
if (bean != null) {
Object cacheKey = getCacheKey(bean.getClass(), beanName); | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/DefaultAdvisorAutoProxyCreator.java | @@ -79,6 +79,7 @@ public String getAdvisorBeanNamePrefix() {
return this.advisorBeanNamePrefix;
}
+ @Override
public void setBeanName(String name) {
// If no infrastructure bean name prefix has been set, override it.
if (this.advisorBeanNamePrefix == null) { | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java | @@ -66,6 +66,7 @@
new HashMap<String, DefaultListableBeanFactory>();
+ @Override
public final void setBeanFactory(BeanFactory beanFactory) {
if (!(beanFactory instanceof ConfigurableBeanFactory)) {
throw new IllegalStateException("Cannot do auto-TargetSource creation with a BeanFactory " +
@@ -86,6 +87,7 @@ protected final BeanFactory getBeanFactory() {
// Implementation of the TargetSourceCreator interface
//---------------------------------------------------------------------
+ @Override
public final TargetSource getTargetSource(Class<?> beanClass, String beanName) {
AbstractBeanFactoryBasedTargetSource targetSource =
createBeanFactoryBasedTargetSource(beanClass, beanName);
@@ -159,6 +161,7 @@ protected DefaultListableBeanFactory buildInternalBeanFactory(ConfigurableBeanFa
* Destroys the internal BeanFactory on shutdown of the TargetSourceCreator.
* @see #getInternalBeanFactoryForBean
*/
+ @Override
public void destroy() {
synchronized (this.internalBeanFactories) {
for (DefaultListableBeanFactory bf : this.internalBeanFactories.values()) { | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java | @@ -105,6 +105,7 @@ public void setHideProxyClassNames(boolean hideProxyClassNames) {
* to the {@code invokeUnderTrace} method for handling.
* @see #invokeUnderTrace(org.aopalliance.intercept.MethodInvocation, org.apache.commons.logging.Log)
*/
+ @Override
public Object invoke(MethodInvocation invocation) throws Throwable {
Log logger = getLoggerForInvocation(invocation);
if (isInterceptorEnabled(invocation, logger)) { | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java | @@ -80,6 +80,7 @@ public void setExecutor(Executor defaultExecutor) {
/**
* Set the {@link BeanFactory} to be used when looking up executors by qualifier.
*/
+ @Override
public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
this.beanFactory = beanFactory;
} | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionInterceptor.java | @@ -75,9 +75,11 @@ public AsyncExecutionInterceptor(Executor executor) {
* @return {@link Future} if the original method returns {@code Future}; {@code null}
* otherwise.
*/
+ @Override
public Object invoke(final MethodInvocation invocation) throws Throwable {
Future<?> result = this.determineAsyncExecutor(invocation.getMethod()).submit(
new Callable<Object>() {
+ @Override
public Object call() throws Exception {
try {
Object result = invocation.proceed();
@@ -113,6 +115,7 @@ protected String getExecutorQualifier(Method method) {
return null;
}
+ @Override
public int getOrder() {
return Ordered.HIGHEST_PRECEDENCE;
} | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptor.java | @@ -47,6 +47,7 @@ public ConcurrencyThrottleInterceptor() {
setConcurrencyLimit(1);
}
+ @Override
public Object invoke(MethodInvocation methodInvocation) throws Throwable {
beforeAccess();
try { | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java | @@ -109,6 +109,7 @@ public ExposeBeanNameInterceptor(String beanName) {
this.beanName = beanName;
}
+ @Override
public Object invoke(MethodInvocation mi) throws Throwable {
if (!(mi instanceof ProxyMethodInvocation)) {
throw new IllegalStateException("MethodInvocation is not a Spring ProxyMethodInvocation: " + mi);
@@ -142,6 +143,7 @@ public Object invoke(MethodInvocation mi) throws Throwable {
return super.invoke(mi);
}
+ @Override
public String getBeanName() {
return this.beanName;
} | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeInvocationInterceptor.java | @@ -84,6 +84,7 @@ public static MethodInvocation currentInvocation() throws IllegalStateException
private ExposeInvocationInterceptor() {
}
+ @Override
public Object invoke(MethodInvocation mi) throws Throwable {
MethodInvocation oldInvocation = invocation.get();
invocation.set(mi);
@@ -95,6 +96,7 @@ public Object invoke(MethodInvocation mi) throws Throwable {
}
}
+ @Override
public int getOrder() {
return Ordered.HIGHEST_PRECEDENCE + 1;
} | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/scope/DefaultScopedObject.java | @@ -55,10 +55,12 @@ public DefaultScopedObject(ConfigurableBeanFactory beanFactory, String targetBea
}
+ @Override
public Object getTargetObject() {
return this.beanFactory.getBean(this.targetBeanName);
}
+ @Override
public void removeFromScope() {
this.beanFactory.destroyScopedBean(this.targetBeanName);
} | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyFactoryBean.java | @@ -78,6 +78,7 @@ public void setTargetBeanName(String targetBeanName) {
this.scopedTargetSource.setTargetBeanName(targetBeanName);
}
+ @Override
public void setBeanFactory(BeanFactory beanFactory) {
if (!(beanFactory instanceof ConfigurableBeanFactory)) {
throw new IllegalStateException("Not running in a ConfigurableBeanFactory: " + beanFactory);
@@ -111,13 +112,15 @@ public void setBeanFactory(BeanFactory beanFactory) {
}
+ @Override
public Object getObject() {
if (this.proxy == null) {
throw new FactoryBeanNotInitializedException();
}
return this.proxy;
}
+ @Override
public Class<?> getObjectType() {
if (this.proxy != null) {
return this.proxy.getClass();
@@ -128,6 +131,7 @@ public Class<?> getObjectType() {
return null;
}
+ @Override
public boolean isSingleton() {
return true;
} | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/support/AbstractBeanFactoryPointcutAdvisor.java | @@ -69,6 +69,7 @@ public String getAdviceBeanName() {
return this.adviceBeanName;
}
+ @Override
public void setBeanFactory(BeanFactory beanFactory) {
this.beanFactory = beanFactory;
}
@@ -79,6 +80,7 @@ public void setAdvice(Advice advice) {
}
}
+ @Override
public Advice getAdvice() {
synchronized (this.adviceMonitor) {
if (this.advice == null && this.adviceBeanName != null) { | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/support/AbstractExpressionPointcut.java | @@ -83,6 +83,7 @@ protected void onSetExpression(String expression) throws IllegalArgumentExceptio
/**
* Return this pointcut's expression.
*/
+ @Override
public String getExpression() {
return this.expression;
} | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/support/AbstractGenericPointcutAdvisor.java | @@ -39,6 +39,7 @@ public void setAdvice(Advice advice) {
this.advice = advice;
}
+ @Override
public Advice getAdvice() {
return this.advice;
} | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java | @@ -44,6 +44,7 @@ public void setOrder(int order) {
this.order = order;
}
+ @Override
public int getOrder() {
if (this.order != null) {
return this.order;
@@ -55,6 +56,7 @@ public int getOrder() {
return Ordered.LOWEST_PRECEDENCE;
}
+ @Override
public boolean isPerInstance() {
return true;
} | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/support/AbstractRegexpMethodPointcut.java | @@ -124,6 +124,7 @@ public String[] getExcludedPatterns() {
* of the target class as well as against the method's declaring class,
* plus the name of the method.
*/
+ @Override
public boolean matches(Method method, Class targetClass) {
return ((targetClass != null && matchesPattern(targetClass.getName() + "." + method.getName())) ||
matchesPattern(method.getDeclaringClass().getName() + "." + method.getName())); | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/support/ClassFilters.java | @@ -96,6 +96,7 @@ public UnionClassFilter(ClassFilter[] filters) {
this.filters = filters;
}
+ @Override
public boolean matches(Class clazz) {
for (int i = 0; i < this.filters.length; i++) {
if (this.filters[i].matches(clazz)) {
@@ -130,6 +131,7 @@ public IntersectionClassFilter(ClassFilter[] filters) {
this.filters = filters;
}
+ @Override
public boolean matches(Class clazz) {
for (int i = 0; i < this.filters.length; i++) {
if (!this.filters[i].matches(clazz)) { | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/support/ComposablePointcut.java | @@ -170,10 +170,12 @@ public ComposablePointcut intersection(Pointcut other) {
}
+ @Override
public ClassFilter getClassFilter() {
return this.classFilter;
}
+ @Override
public MethodMatcher getMethodMatcher() {
return this.methodMatcher;
} | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java | @@ -71,6 +71,7 @@ public ControlFlowPointcut(Class clazz, String methodName) {
/**
* Subclasses can override this for greater filtering (and performance).
*/
+ @Override
public boolean matches(Class clazz) {
return true;
}
@@ -79,14 +80,17 @@ public boolean matches(Class clazz) {
* Subclasses can override this if it's possible to filter out
* some candidate classes.
*/
+ @Override
public boolean matches(Method method, Class targetClass) {
return true;
}
+ @Override
public boolean isRuntime() {
return true;
}
+ @Override
public boolean matches(Method method, Class targetClass, Object[] args) {
++this.evaluations;
ControlFlow cflow = ControlFlowFactory.createControlFlow();
@@ -101,10 +105,12 @@ public int getEvaluations() {
}
+ @Override
public ClassFilter getClassFilter() {
return this;
}
+ @Override
public MethodMatcher getMethodMatcher() {
return this;
} | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/support/DefaultBeanFactoryPointcutAdvisor.java | @@ -47,6 +47,7 @@ public void setPointcut(Pointcut pointcut) {
this.pointcut = (pointcut != null ? pointcut : Pointcut.TRUE);
}
+ @Override
public Pointcut getPointcut() {
return this.pointcut;
} | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java | @@ -102,10 +102,12 @@ public void addInterface(Class intf) {
this.interfaces.add(intf);
}
+ @Override
public Class[] getInterfaces() {
return this.interfaces.toArray(new Class[this.interfaces.size()]);
}
+ @Override
public void validateInterfaces() throws IllegalArgumentException {
for (Class ifc : this.interfaces) {
if (this.advice instanceof DynamicIntroductionAdvice &&
@@ -121,23 +123,28 @@ public void setOrder(int order) {
this.order = order;
}
+ @Override
public int getOrder() {
return this.order;
}
+ @Override
public Advice getAdvice() {
return this.advice;
}
+ @Override
public boolean isPerInstance() {
return true;
}
+ @Override
public ClassFilter getClassFilter() {
return this;
}
+ @Override
public boolean matches(Class clazz) {
return true;
} | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/support/DefaultPointcutAdvisor.java | @@ -77,6 +77,7 @@ public void setPointcut(Pointcut pointcut) {
this.pointcut = (pointcut != null ? pointcut : Pointcut.TRUE);
}
+ @Override
public Pointcut getPointcut() {
return this.pointcut;
} | true |
Other | spring-projects | spring-framework | 3b40ce76bf751d788f57064bb692ceb8804a58af.json | Add @Override annotations to main sources
Issue: SPR-10130 | spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java | @@ -83,6 +83,7 @@ public DelegatePerTargetObjectIntroductionInterceptor(Class defaultImplType, Cla
* behaviour in around advice. However, subclasses should invoke this
* method, which handles introduced interfaces and forwarding to the target.
*/
+ @Override
public Object invoke(MethodInvocation mi) throws Throwable {
if (isMethodOnIntroducedInterface(mi)) {
Object delegate = getIntroductionDelegateFor(mi.getThis()); | true |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.