Revert "Backport fix AspectJ pointcut syntax"

jonatan-ivanov · jonatan-ivanov · commit faeebde9c2aa · 2024-07-08T17:31:41.000-07:00
This reverts commit b1dd400.
diff --git a/micrometer-core/src/main/java/io/micrometer/core/aop/CountedAspect.java b/micrometer-core/src/main/java/io/micrometer/core/aop/CountedAspect.java
@@ -167,7 +167,7 @@ public CountedAspect(MeterRegistry registry, Function<ProceedingJoinPoint, Itera
         this.shouldSkip = shouldSkip;
     }
 
-    @Around("@within(io.micrometer.core.annotation.Counted) && !@annotation(io.micrometer.core.annotation.Counted)")
+    @Around("@within(io.micrometer.core.annotation.Counted) and not @annotation(io.micrometer.core.annotation.Counted)")
     @Nullable
     public Object countedClass(ProceedingJoinPoint pjp) throws Throwable {
         if (shouldSkip.test(pjp)) {
diff --git a/micrometer-core/src/main/java/io/micrometer/core/aop/TimedAspect.java b/micrometer-core/src/main/java/io/micrometer/core/aop/TimedAspect.java
@@ -161,7 +161,7 @@ public TimedAspect(MeterRegistry registry, Function<ProceedingJoinPoint, Iterabl
         this.shouldSkip = shouldSkip;
     }
 
-    @Around("@within(io.micrometer.core.annotation.Timed) && !@annotation(io.micrometer.core.annotation.Timed)")
+    @Around("@within(io.micrometer.core.annotation.Timed) and not @annotation(io.micrometer.core.annotation.Timed)")
     @Nullable
     public Object timedClass(ProceedingJoinPoint pjp) throws Throwable {
         if (shouldSkip.test(pjp)) {
diff --git a/micrometer-observation/src/main/java/io/micrometer/observation/aop/ObservedAspect.java b/micrometer-observation/src/main/java/io/micrometer/observation/aop/ObservedAspect.java
@@ -105,7 +105,7 @@ public ObservedAspect(ObservationRegistry registry,
         this.shouldSkip = shouldSkip;
     }
 
-    @Around("@within(io.micrometer.observation.annotation.Observed) && !@annotation(io.micrometer.observation.annotation.Observed)")
+    @Around("@within(io.micrometer.observation.annotation.Observed) and not @annotation(io.micrometer.observation.annotation.Observed)")
     @Nullable
     public Object observeClass(ProceedingJoinPoint pjp) throws Throwable {
         if (shouldSkip.test(pjp)) {

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ public CountedAspect(MeterRegistry registry, Function<ProceedingJoinPoint, Itera`
`167`	`167`	`this.shouldSkip = shouldSkip;`
`168`	`168`	`}`
`169`	`169`
`170`		`- @Around("@within(io.micrometer.core.annotation.Counted) && !@annotation(io.micrometer.core.annotation.Counted)")`
	`170`	`+ @Around("@within(io.micrometer.core.annotation.Counted) and not @annotation(io.micrometer.core.annotation.Counted)")`
`171`	`171`	`@Nullable`
`172`	`172`	`public Object countedClass(ProceedingJoinPoint pjp) throws Throwable {`
`173`	`173`	`if (shouldSkip.test(pjp)) {`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ public TimedAspect(MeterRegistry registry, Function<ProceedingJoinPoint, Iterabl`
`161`	`161`	`this.shouldSkip = shouldSkip;`
`162`	`162`	`}`
`163`	`163`
`164`		`- @Around("@within(io.micrometer.core.annotation.Timed) && !@annotation(io.micrometer.core.annotation.Timed)")`
	`164`	`+ @Around("@within(io.micrometer.core.annotation.Timed) and not @annotation(io.micrometer.core.annotation.Timed)")`
`165`	`165`	`@Nullable`
`166`	`166`	`public Object timedClass(ProceedingJoinPoint pjp) throws Throwable {`
`167`	`167`	`if (shouldSkip.test(pjp)) {`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public ObservedAspect(ObservationRegistry registry,`
`105`	`105`	`this.shouldSkip = shouldSkip;`
`106`	`106`	`}`
`107`	`107`
`108`		`- @Around("@within(io.micrometer.observation.annotation.Observed) && !@annotation(io.micrometer.observation.annotation.Observed)")`
	`108`	`+ @Around("@within(io.micrometer.observation.annotation.Observed) and not @annotation(io.micrometer.observation.annotation.Observed)")`
`109`	`109`	`@Nullable`
`110`	`110`	`public Object observeClass(ProceedingJoinPoint pjp) throws Throwable {`
`111`	`111`	`if (shouldSkip.test(pjp)) {`