require edu.umd.dawn for use of annotations

src/main/java/edu/umd/dawn/common/annotations/AspectBase.java

@@ -29,8 +29,4 @@ public class AspectBase<T extends Annotation> {
                 ((MethodSignature) jointPoint.getSignature()).getDeclaringType().getAnnotation(clazz);
     }
 
-    // protected T grabMethodArgument(ProceedingJoinPoint jointPoint, Class<T> clazz) {
-    //     return (T)
-    //             ((MethodSignature) jointPoint.getSignature()).getDeclaringType().getAnnotation(clazz);
-    // }
 }

src/main/java/edu/umd/dawn/common/annotations/DeprecatedAspect.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Component;
 @Log4j2
 public class DeprecatedAspect extends AspectBase<Deprecated> {
 
-    @Around("@annotation(Deprecated)")
+    @Around("@annotation(Deprecated) && within(edu.umd.dawn..**)")
     public Object run(ProceedingJoinPoint jointPoint) throws Exception, Throwable {
         Deprecated annotation = grabAnnotation(jointPoint, Deprecated.class);
         String descriptor = getFullDescriptor(jointPoint);

src/main/java/edu/umd/dawn/common/annotations/RoleRestrictionAspect.java

@@ -24,7 +24,7 @@ public class RoleRestrictionAspect extends AspectBase<RoleRestriction> {
     @Value("${config.local}")
     private boolean local = false;
 
-    @Around("@annotation(RoleRestriction)")
+    @Around("@annotation(RoleRestriction) && within(edu.umd.dawn..**)")
     public Object run(ProceedingJoinPoint jointPoint) throws Exception, Throwable {
         RoleRestriction annotation = grabAnnotation(jointPoint, RoleRestriction.class);
         if (!local) {

src/main/java/edu/umd/dawn/common/annotations/TraceableAspect.java

@@ -15,7 +15,7 @@ import org.springframework.stereotype.Component;
 @Component
 public class TraceableAspect extends AspectBase<Traceable> {
 
-    @Around("@annotation(Traceable)")
+    @Around("@annotation(Traceable) && within(edu.umd.dawn..**)")
     public Object run(ProceedingJoinPoint jointPoint) throws Exception, Throwable {
         Traceable traceable = grabAnnotation(jointPoint, Traceable.class);
 

src/main/java/edu/umd/dawn/common/annotations/UnfinishedAspect.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Component;
 @Log4j2
 public class UnfinishedAspect extends AspectBase<Unfinished> {
 
-    @Around("@annotation(Unfinished)")
+    @Around("@annotation(Unfinished) && within(edu.umd.dawn..**)")
     public Object run(ProceedingJoinPoint jointPoint) throws Exception, Throwable {
         Unfinished unfinished = grabAnnotation(jointPoint, Unfinished.class);