diff --git a/spring-aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj b/spring-aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj index f34dbeb535..fe378642a7 100644 --- a/spring-aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj +++ b/spring-aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj @@ -19,6 +19,8 @@ package org.springframework.mock.staticmock; import java.util.Arrays; import java.util.LinkedList; +import org.aspectj.lang.annotation.SuppressAjWarnings; + import org.springframework.util.ObjectUtils; /** @@ -227,6 +229,7 @@ public abstract aspect AbstractMethodMockingControl percflow(mockStaticsTestMeth */ protected abstract pointcut methodToMock(); + @SuppressAjWarnings("adviceDidNotMatch") after() returning : mockStaticsTestMethod() { if (recording && (expectations.hasCalls())) { throw new IllegalStateException( @@ -236,6 +239,7 @@ public abstract aspect AbstractMethodMockingControl percflow(mockStaticsTestMeth verifyInternal(); } + @SuppressAjWarnings("adviceDidNotMatch") Object around() : methodToMock() && cflowbelow(mockStaticsTestMethod()) { if (recording) { expectations.expectCall(thisJoinPointStaticPart.toLongString(), thisJoinPoint.getArgs()); diff --git a/spring-aspects/src/main/java/org/springframework/orm/jpa/aspectj/JpaExceptionTranslatorAspect.aj b/spring-aspects/src/main/java/org/springframework/orm/jpa/aspectj/JpaExceptionTranslatorAspect.aj index 131c82beef..43ba3a2013 100644 --- a/spring-aspects/src/main/java/org/springframework/orm/jpa/aspectj/JpaExceptionTranslatorAspect.aj +++ b/spring-aspects/src/main/java/org/springframework/orm/jpa/aspectj/JpaExceptionTranslatorAspect.aj @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,6 +21,8 @@ import javax.persistence.EntityManagerFactory; import javax.persistence.EntityTransaction; import javax.persistence.Query; +import org.aspectj.lang.annotation.SuppressAjWarnings; + import org.springframework.dao.DataAccessException; import org.springframework.orm.jpa.EntityManagerFactoryUtils; @@ -29,6 +31,7 @@ public aspect JpaExceptionTranslatorAspect { call(* EntityManager.*(..)) || call(* EntityManagerFactory.*(..)) || call(* EntityTransaction.*(..)) || call(* Query.*(..)); + @SuppressAjWarnings("adviceDidNotMatch") after() throwing(RuntimeException re): entityManagerCall() { DataAccessException dex = EntityManagerFactoryUtils.convertJpaAccessExceptionIfPossible(re); if (dex != null) { diff --git a/spring-aspects/src/main/java/org/springframework/scheduling/aspectj/AbstractAsyncExecutionAspect.aj b/spring-aspects/src/main/java/org/springframework/scheduling/aspectj/AbstractAsyncExecutionAspect.aj index 1df256e59e..7b929bf85c 100644 --- a/spring-aspects/src/main/java/org/springframework/scheduling/aspectj/AbstractAsyncExecutionAspect.aj +++ b/spring-aspects/src/main/java/org/springframework/scheduling/aspectj/AbstractAsyncExecutionAspect.aj @@ -20,6 +20,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.Executor; import java.util.concurrent.Future; +import org.aspectj.lang.annotation.SuppressAjWarnings; import org.aspectj.lang.reflect.MethodSignature; import org.springframework.aop.interceptor.AsyncExecutionAspectSupport; @@ -58,6 +59,7 @@ public abstract aspect AbstractAsyncExecutionAspect extends AsyncExecutionAspect * @return {@link Future} if the original method returns {@code Future}; {@code null} * otherwise. */ + @SuppressAjWarnings("adviceDidNotMatch") Object around() : asyncMethod() { final MethodSignature methodSignature = (MethodSignature) thisJoinPointStaticPart.getSignature(); AsyncTaskExecutor executor = determineAsyncExecutor(methodSignature.getMethod());