From 28a6c9081a1194937f1f5c45150790919abbadf7 Mon Sep 17 00:00:00 2001 From: memojja Date: Wed, 3 Nov 2021 10:35:32 +0300 Subject: [PATCH] updated deprecated annotations --- Jdempotent-core/pom.xml | 2 +- ...otentIgnore.java => JdempotentIgnore.java} | 3 +-- ...oad.java => JdempotentRequestPayload.java} | 3 +-- ...tResource.java => JdempotentResource.java} | 3 +-- .../core/aspect/IdempotentAspect.java | 12 ++++----- .../aspect/core/IdempotentTestPayload.java | 4 +-- .../aspect/core/TestIdempotentResource.java | 26 +++++++++---------- .../aspect/withaspect/IdempotentAspectIT.java | 8 +++--- .../aspect/withaspect/IdempotentAspectUT.java | 8 +++--- .../pom.xml | 4 +-- Jdempotent-spring-boot-redis-starter/pom.xml | 4 +-- examples/jdempotent-couchbase-example/pom.xml | 2 +- examples/jdempotent-redis-example/pom.xml | 2 +- .../demo/controller/MailController.java | 4 +-- pom.xml | 2 +- 15 files changed, 42 insertions(+), 45 deletions(-) rename Jdempotent-core/src/main/java/com/trendyol/jdempotent/core/annotation/{IdempotentIgnore.java => JdempotentIgnore.java} (87%) rename Jdempotent-core/src/main/java/com/trendyol/jdempotent/core/annotation/{IdempotentRequestPayload.java => JdempotentRequestPayload.java} (86%) rename Jdempotent-core/src/main/java/com/trendyol/jdempotent/core/annotation/{IdempotentResource.java => JdempotentResource.java} (92%) diff --git a/Jdempotent-core/pom.xml b/Jdempotent-core/pom.xml index d2b314d..b274bf6 100644 --- a/Jdempotent-core/pom.xml +++ b/Jdempotent-core/pom.xml @@ -6,7 +6,7 @@ 4.0.0 com.trendyol Jdempotent-core - 1.0.9 + 1.0.10 Jdempotent-core jar https://github.com/Trendyol/Jdempotent/tree/master/Jdempotent-core diff --git a/Jdempotent-core/src/main/java/com/trendyol/jdempotent/core/annotation/IdempotentIgnore.java b/Jdempotent-core/src/main/java/com/trendyol/jdempotent/core/annotation/JdempotentIgnore.java similarity index 87% rename from Jdempotent-core/src/main/java/com/trendyol/jdempotent/core/annotation/IdempotentIgnore.java rename to Jdempotent-core/src/main/java/com/trendyol/jdempotent/core/annotation/JdempotentIgnore.java index 03f70b0..b0f98b9 100644 --- a/Jdempotent-core/src/main/java/com/trendyol/jdempotent/core/annotation/IdempotentIgnore.java +++ b/Jdempotent-core/src/main/java/com/trendyol/jdempotent/core/annotation/JdempotentIgnore.java @@ -10,8 +10,7 @@ * That annotation needs to ignore annotation field * */ -@Deprecated @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) -public @interface IdempotentIgnore { +public @interface JdempotentIgnore { } diff --git a/Jdempotent-core/src/main/java/com/trendyol/jdempotent/core/annotation/IdempotentRequestPayload.java b/Jdempotent-core/src/main/java/com/trendyol/jdempotent/core/annotation/JdempotentRequestPayload.java similarity index 86% rename from Jdempotent-core/src/main/java/com/trendyol/jdempotent/core/annotation/IdempotentRequestPayload.java rename to Jdempotent-core/src/main/java/com/trendyol/jdempotent/core/annotation/JdempotentRequestPayload.java index 8bdd693..cc95982 100644 --- a/Jdempotent-core/src/main/java/com/trendyol/jdempotent/core/annotation/IdempotentRequestPayload.java +++ b/Jdempotent-core/src/main/java/com/trendyol/jdempotent/core/annotation/JdempotentRequestPayload.java @@ -9,8 +9,7 @@ * Add to the methods arguments that represents the idempotent request payload. * */ -@Deprecated @Target(ElementType.PARAMETER) @Retention(RetentionPolicy.RUNTIME) -public @interface IdempotentRequestPayload { +public @interface JdempotentRequestPayload { } \ No newline at end of file diff --git a/Jdempotent-core/src/main/java/com/trendyol/jdempotent/core/annotation/IdempotentResource.java b/Jdempotent-core/src/main/java/com/trendyol/jdempotent/core/annotation/JdempotentResource.java similarity index 92% rename from Jdempotent-core/src/main/java/com/trendyol/jdempotent/core/annotation/IdempotentResource.java rename to Jdempotent-core/src/main/java/com/trendyol/jdempotent/core/annotation/JdempotentResource.java index ebdfe64..2a55675 100644 --- a/Jdempotent-core/src/main/java/com/trendyol/jdempotent/core/annotation/IdempotentResource.java +++ b/Jdempotent-core/src/main/java/com/trendyol/jdempotent/core/annotation/JdempotentResource.java @@ -8,9 +8,8 @@ * Add to the methods that need to be idempotent. * */ -@Deprecated @Retention(RetentionPolicy.RUNTIME) -public @interface IdempotentResource { +public @interface JdempotentResource { /** * Prefix value to make hash value more collider diff --git a/Jdempotent-core/src/main/java/com/trendyol/jdempotent/core/aspect/IdempotentAspect.java b/Jdempotent-core/src/main/java/com/trendyol/jdempotent/core/aspect/IdempotentAspect.java index 6bc6006..ac77e1a 100644 --- a/Jdempotent-core/src/main/java/com/trendyol/jdempotent/core/aspect/IdempotentAspect.java +++ b/Jdempotent-core/src/main/java/com/trendyol/jdempotent/core/aspect/IdempotentAspect.java @@ -116,14 +116,14 @@ public IdempotentAspect(IdempotentRepository idempotentRepository, ErrorConditio * @return * @throws Throwable */ - @Around("@annotation(com.trendyol.jdempotent.core.annotation.IdempotentResource)") + @Around("@annotation(com.trendyol.jdempotent.core.annotation.JdempotentResource)") public Object execute(ProceedingJoinPoint pjp) throws Throwable { String classAndMethodName = generateLogPrefixForIncomingEvent(pjp); IdempotentRequestWrapper requestObject = findIdempotentRequestArg(pjp); - String listenerName = ((MethodSignature) pjp.getSignature()).getMethod().getAnnotation(IdempotentResource.class).cachePrefix(); + String listenerName = ((MethodSignature) pjp.getSignature()).getMethod().getAnnotation(JdempotentResource.class).cachePrefix(); IdempotencyKey idempotencyKey = keyGenerator.generateIdempotentKey(requestObject, listenerName, stringBuilders.get(), messageDigests.get()); - Long customTtl = ((MethodSignature) pjp.getSignature()).getMethod().getAnnotation(IdempotentResource.class).ttl(); - TimeUnit timeUnit = ((MethodSignature) pjp.getSignature()).getMethod().getAnnotation(IdempotentResource.class).ttlTimeUnit(); + Long customTtl = ((MethodSignature) pjp.getSignature()).getMethod().getAnnotation(JdempotentResource.class).ttl(); + TimeUnit timeUnit = ((MethodSignature) pjp.getSignature()).getMethod().getAnnotation(JdempotentResource.class).ttlTimeUnit(); logger.debug(classAndMethodName + "starting for {}", requestObject); @@ -209,7 +209,7 @@ public IdempotentRequestWrapper findIdempotentRequestArg(ProceedingJoinPoint pjp Annotation[][] annotations = method.getParameterAnnotations(); for (int i = 0; i < args.length; i++) { for (Annotation annotation : annotations[i]) { - if (annotation instanceof IdempotentRequestPayload) { + if (annotation instanceof JdempotentRequestPayload) { return new IdempotentRequestWrapper(getIdempotentNonIgnorableWrapper(args[i])); } } @@ -259,7 +259,7 @@ public IdempotentIgnorableWrapper getIdempotentNonIgnorableWrapper(Object args) wrapper.getNonIgnoredFields().put(declaredField.getName(), declaredField.get(args)); } else { for (Annotation annotation : declaredField.getDeclaredAnnotations()) { - if (!(annotation instanceof IdempotentIgnore)) { + if (!(annotation instanceof JdempotentIgnore)) { wrapper.getNonIgnoredFields().put(declaredField.getName(), declaredField.get(args)); } } diff --git a/Jdempotent-core/src/test/java/aspect/core/IdempotentTestPayload.java b/Jdempotent-core/src/test/java/aspect/core/IdempotentTestPayload.java index e5af480..6bd9553 100644 --- a/Jdempotent-core/src/test/java/aspect/core/IdempotentTestPayload.java +++ b/Jdempotent-core/src/test/java/aspect/core/IdempotentTestPayload.java @@ -1,10 +1,10 @@ package aspect.core; -import com.trendyol.jdempotent.core.annotation.IdempotentIgnore; +import com.trendyol.jdempotent.core.annotation.JdempotentIgnore; public class IdempotentTestPayload { private String name; - @IdempotentIgnore + @JdempotentIgnore private Long age; public IdempotentTestPayload() { diff --git a/Jdempotent-core/src/test/java/aspect/core/TestIdempotentResource.java b/Jdempotent-core/src/test/java/aspect/core/TestIdempotentResource.java index d5656e5..3daa33e 100644 --- a/Jdempotent-core/src/test/java/aspect/core/TestIdempotentResource.java +++ b/Jdempotent-core/src/test/java/aspect/core/TestIdempotentResource.java @@ -1,43 +1,43 @@ package aspect.core; -import com.trendyol.jdempotent.core.annotation.IdempotentRequestPayload; -import com.trendyol.jdempotent.core.annotation.IdempotentResource; +import com.trendyol.jdempotent.core.annotation.JdempotentRequestPayload; +import com.trendyol.jdempotent.core.annotation.JdempotentResource; import org.springframework.stereotype.Component; @Component public class TestIdempotentResource { - @IdempotentResource + @JdempotentResource public void idempotentMethod(IdempotentTestPayload testObject) { } - @IdempotentResource(cachePrefix = "TestIdempotentResource") + @JdempotentResource(cachePrefix = "TestIdempotentResource") public void idempotentMethodThrowingARuntimeException(IdempotentTestPayload testObject) { throw new TestException(); } - @IdempotentResource(cachePrefix = "TestIdempotentResource") - public void idempotentMethodWithThreeParameter(@IdempotentRequestPayload IdempotentTestPayload testObject, IdempotentTestPayload anotherObject, IdempotentTestPayload anotherObject2) { + @JdempotentResource(cachePrefix = "TestIdempotentResource") + public void idempotentMethodWithThreeParameter(@JdempotentRequestPayload IdempotentTestPayload testObject, IdempotentTestPayload anotherObject, IdempotentTestPayload anotherObject2) { } - @IdempotentResource(cachePrefix = "TestIdempotentResource") - public void idempotentMethodWithThreeParamaterAndMultipleIdempotentRequestPayloadAnnotation(IdempotentTestPayload testObject, @IdempotentRequestPayload IdempotentTestPayload anotherObject, @IdempotentRequestPayload Object anotherObject2) { + @JdempotentResource(cachePrefix = "TestIdempotentResource") + public void idempotentMethodWithThreeParamaterAndMultipleJdempotentRequestPayloadAnnotation(IdempotentTestPayload testObject, @JdempotentRequestPayload IdempotentTestPayload anotherObject, @JdempotentRequestPayload Object anotherObject2) { } - @IdempotentResource(cachePrefix = "TestIdempotentResource") + @JdempotentResource(cachePrefix = "TestIdempotentResource") public void idempotentMethodWithZeroParamater() { } - @IdempotentResource(cachePrefix = "TestIdempotentResource") + @JdempotentResource(cachePrefix = "TestIdempotentResource") public void methodWithTwoParamater(IdempotentTestPayload testObject, IdempotentTestPayload anotherObject) { } - @IdempotentResource + @JdempotentResource public IdempotentTestPayload idempotentMethodReturnArg(IdempotentTestPayload testObject) { return testObject; } - @IdempotentResource - public String idempotencyKeyAsString(@IdempotentRequestPayload String idempotencyKey) { + @JdempotentResource + public String idempotencyKeyAsString(@JdempotentRequestPayload String idempotencyKey) { return idempotencyKey; } } \ No newline at end of file diff --git a/Jdempotent-core/src/test/java/aspect/withaspect/IdempotentAspectIT.java b/Jdempotent-core/src/test/java/aspect/withaspect/IdempotentAspectIT.java index 145f285..449e52e 100644 --- a/Jdempotent-core/src/test/java/aspect/withaspect/IdempotentAspectIT.java +++ b/Jdempotent-core/src/test/java/aspect/withaspect/IdempotentAspectIT.java @@ -3,7 +3,7 @@ import aspect.core.IdempotentTestPayload; import aspect.core.TestException; import aspect.core.TestIdempotentResource; -import com.trendyol.jdempotent.core.annotation.IdempotentResource; +import com.trendyol.jdempotent.core.annotation.JdempotentResource; import com.trendyol.jdempotent.core.constant.CryptographyAlgorithm; import com.trendyol.jdempotent.core.datasource.InMemoryIdempotentRepository; import com.trendyol.jdempotent.core.generator.DefaultKeyGenerator; @@ -40,12 +40,12 @@ public class IdempotentAspectIT { @Test public void given_aop_context_then_run_with_aop_context() { - IdempotentResource idempotentResource = TestIdempotentResource.class.getDeclaredMethods()[0].getAnnotation(IdempotentResource.class); + JdempotentResource jdempotentResource = TestIdempotentResource.class.getDeclaredMethods()[0].getAnnotation(JdempotentResource.class); assertNotEquals(testIdempotentResource.getClass(), TestIdempotentResource.class); assertTrue(AopUtils.isAopProxy(testIdempotentResource)); assertTrue(AopUtils.isCglibProxy(testIdempotentResource)); - assertNotNull(idempotentResource); + assertNotNull(jdempotentResource); assertEquals(AopProxyUtils.ultimateTargetClass(testIdempotentResource), TestIdempotentResource.class); assertEquals(AopTestUtils.getTargetObject(testIdempotentResource).getClass(), TestIdempotentResource.class); @@ -114,7 +114,7 @@ public void given_new_multiple_payloads_with_multiple_annotations_when_trigger_a IdempotencyKey idempotencyKey = defaultKeyGenerator.generateIdempotentKey(new IdempotentRequestWrapper(wrapper), "TestIdempotentResource", new StringBuilder(), MessageDigest.getInstance(CryptographyAlgorithm.MD5.value())); //when - testIdempotentResource.idempotentMethodWithThreeParamaterAndMultipleIdempotentRequestPayloadAnnotation(test, test1, test2); + testIdempotentResource.idempotentMethodWithThreeParamaterAndMultipleJdempotentRequestPayloadAnnotation(test, test1, test2); //then assertTrue(idempotentRepository.contains(idempotencyKey)); diff --git a/Jdempotent-core/src/test/java/aspect/withaspect/IdempotentAspectUT.java b/Jdempotent-core/src/test/java/aspect/withaspect/IdempotentAspectUT.java index 615f857..cb3b1b5 100644 --- a/Jdempotent-core/src/test/java/aspect/withaspect/IdempotentAspectUT.java +++ b/Jdempotent-core/src/test/java/aspect/withaspect/IdempotentAspectUT.java @@ -2,7 +2,7 @@ import aspect.core.IdempotentTestPayload; import aspect.core.TestIdempotentResource; -import com.trendyol.jdempotent.core.annotation.IdempotentResource; +import com.trendyol.jdempotent.core.annotation.JdempotentResource; import com.trendyol.jdempotent.core.aspect.IdempotentAspect; import com.trendyol.jdempotent.core.callback.ErrorConditionalCallback; import com.trendyol.jdempotent.core.datasource.IdempotentRepository; @@ -73,7 +73,7 @@ public void given_actual_payload_when_key_in_repository_and_method_has_one_arg_t ProceedingJoinPoint joinPoint = mock(ProceedingJoinPoint.class); MethodSignature signature = mock(MethodSignature.class); Method method = TestIdempotentResource.class.getMethod("idempotentMethod", IdempotentTestPayload.class); - IdempotentResource idempotentResource = mock(IdempotentResource.class); + JdempotentResource jdempotentResource = mock(JdempotentResource.class); IdempotentTestPayload payload = new IdempotentTestPayload("payload"); TestIdempotentResource testIdempotentResource = mock(TestIdempotentResource.class); @@ -103,7 +103,7 @@ public void given_actual_payload_when_key_in_repository_and_method_has_one_arg_t ProceedingJoinPoint joinPoint = mock(ProceedingJoinPoint.class); MethodSignature signature = mock(MethodSignature.class); Method method = TestIdempotentResource.class.getMethod("idempotentMethodThrowingARuntimeException", IdempotentTestPayload.class); - IdempotentResource idempotentResource = mock(IdempotentResource.class); + JdempotentResource jdempotentResource = mock(JdempotentResource.class); IdempotentTestPayload payload = new IdempotentTestPayload("payload"); TestIdempotentResource testIdempotentResource = mock(TestIdempotentResource.class); @@ -135,7 +135,7 @@ public void not_given_a_payload_then_return_exception() throws Throwable { ProceedingJoinPoint joinPoint = mock(ProceedingJoinPoint.class); MethodSignature signature = mock(MethodSignature.class); Method method = TestIdempotentResource.class.getMethod("idempotentMethodWithZeroParamater"); - IdempotentResource idempotentResource = mock(IdempotentResource.class); + JdempotentResource jdempotentResource = mock(JdempotentResource.class); IdempotentTestPayload payload = new IdempotentTestPayload("payload"); TestIdempotentResource testIdempotentResource = mock(TestIdempotentResource.class); diff --git a/Jdempotent-spring-boot-couchbase-starter/pom.xml b/Jdempotent-spring-boot-couchbase-starter/pom.xml index 52615f9..234674c 100644 --- a/Jdempotent-spring-boot-couchbase-starter/pom.xml +++ b/Jdempotent-spring-boot-couchbase-starter/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.trendyol Jdempotent-spring-boot-couchbase-starter - 1.0.9 + 1.0.10 Jdempotent-spring-boot-couchbase-starter jar https://github.com/Trendyol/Jdempotent/tree/master/Jdempotent-spring-boot-couchbase-starter @@ -54,7 +54,7 @@ com.trendyol Jdempotent-core - 1.0.9 + 1.0.10 org.aspectj diff --git a/Jdempotent-spring-boot-redis-starter/pom.xml b/Jdempotent-spring-boot-redis-starter/pom.xml index 38bcd6c..079626e 100644 --- a/Jdempotent-spring-boot-redis-starter/pom.xml +++ b/Jdempotent-spring-boot-redis-starter/pom.xml @@ -6,7 +6,7 @@ 4.0.0 com.trendyol Jdempotent-spring-boot-redis-starter - 1.0.9 + 1.0.10 Jdempotent-spring-boot-redis-starter jar https://github.com/Trendyol/Jdempotent/tree/master/Jdempotent-spring-boot-redis-starter @@ -54,7 +54,7 @@ com.trendyol Jdempotent-core - 1.0.9 + 1.0.10 redis.clients diff --git a/examples/jdempotent-couchbase-example/pom.xml b/examples/jdempotent-couchbase-example/pom.xml index fa37b6d..e857bd4 100644 --- a/examples/jdempotent-couchbase-example/pom.xml +++ b/examples/jdempotent-couchbase-example/pom.xml @@ -59,7 +59,7 @@ com.trendyol Jdempotent-spring-boot-couchbase-starter - 1.0.9 + 1.0.10 diff --git a/examples/jdempotent-redis-example/pom.xml b/examples/jdempotent-redis-example/pom.xml index 3cd4dfa..b09cb19 100644 --- a/examples/jdempotent-redis-example/pom.xml +++ b/examples/jdempotent-redis-example/pom.xml @@ -59,7 +59,7 @@ com.trendyol Jdempotent-spring-boot-redis-starter - 1.0.9 + 1.0.10 diff --git a/examples/jdempotent-redis-example/src/main/java/com/jdempotent/example/demo/controller/MailController.java b/examples/jdempotent-redis-example/src/main/java/com/jdempotent/example/demo/controller/MailController.java index 0742fe1..dcac298 100644 --- a/examples/jdempotent-redis-example/src/main/java/com/jdempotent/example/demo/controller/MailController.java +++ b/examples/jdempotent-redis-example/src/main/java/com/jdempotent/example/demo/controller/MailController.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import com.trendyol.jdempotent.core.annotation.IdempotentRequestPayload; +import com.trendyol.jdempotent.core.annotation.JdempotentRequestPayload; import javax.mail.MessagingException; import java.util.concurrent.TimeUnit; import org.springframework.web.bind.annotation.RequestHeader; @@ -47,7 +47,7 @@ public ResponseEntity sendEmail(@RequestBody SendEmailRequest @PostMapping("/send-email-header") @IdempotentResource(cachePrefix = "MailController.sendEmail") - public ResponseEntity sendEmail(@IdempotentRequestPayload @RequestHeader("x-idempotency-key") String idempotencyKey, @RequestBody SendEmailRequest request) { + public ResponseEntity sendEmail(@JdempotentRequestPayload @RequestHeader("x-idempotency-key") String idempotencyKey, @RequestBody SendEmailRequest request) { if (StringUtils.isEmpty(request.getEmail())) { throw new InvalidEmailAddressException(); } diff --git a/pom.xml b/pom.xml index f9d4263..6782819 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.trendyol jdempotent pom - 1.0.9 + 1.0.10 Jdempotent https://github.com/Trendyol/Jdempotent Jdempotent