Feat/add options to amqp annotation (#980)

* feat(amqp): add userId and bcc to AmqpAsyncOperationBinding * chore(gh): update test reports configuration in pipeline * refactor: Replace EmbeddedValueResolverAware with SpringValueResolver by using the StringValueResolverProxy bean
springwolf · Sep 15, 2024 · 8826905 · 8826905
1 parent 336a6c5
commit 8826905
Show file tree

Hide file tree

Showing 87 changed files with 544 additions and 415 deletions.
diff --git a/.github/workflows/springwolf-core.yml b/.github/workflows/springwolf-core.yml
@@ -42,6 +42,7 @@ jobs:
         if: success() || failure()
         with:
           check_name: test-core
+          require_tests: true
           report_paths: '**/build/test-results/test/TEST-*.xml'
 
       - name: Publish package

diff --git a/.github/workflows/springwolf-plugins.yml b/.github/workflows/springwolf-plugins.yml
@@ -62,7 +62,7 @@ jobs:
         uses: mikepenz/action-junit-report@v4
         if: success() || failure()
         with:
-          check_name: test-${{ matrix.plugin }}-junit
+          check_name: test-plugin-${{ matrix.plugin }}-junit
           require_tests: true
           report_paths: '**/build/test-results/test/TEST-*.xml'
 
@@ -73,7 +73,7 @@ jobs:
       - uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: test-${{ matrix.plugin }}-playwright
+          name: test-plugin-${{ matrix.plugin }}-playwright
           path: springwolf-examples/e2e/playwright-report/
           retention-days: 14
 

diff --git a/.github/workflows/springwolf-ui.yml b/.github/workflows/springwolf-ui.yml
@@ -44,6 +44,7 @@ jobs:
         if: success() || failure()
         with:
           check_name: test-ui-jest
+          require_tests: true
           report_paths: '**/build/test-results/test/*.xml'
 
       - name: Build

diff --git a/springwolf-add-ons/springwolf-generic-binding/build.gradle b/springwolf-add-ons/springwolf-generic-binding/build.gradle
@@ -21,7 +21,9 @@ dependencies {
 
     testImplementation "org.assertj:assertj-core:${assertjCoreVersion}"
     testImplementation "org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}"
-    testImplementation("org.junit.jupiter:junit-jupiter-params:${junitJupiterVersion}")
+    testImplementation "org.junit.jupiter:junit-jupiter-params:${junitJupiterVersion}"
+    testImplementation "org.mockito:mockito-core:${mockitoCoreVersion}"
+
     testRuntimeOnly "org.junit.jupiter:junit-jupiter:${junitJupiterVersion}"
 }
 

diff --git a/...s/generic_binding/annotation/configuration/SpringwolfGenericBindingAutoConfiguration.java b/...s/generic_binding/annotation/configuration/SpringwolfGenericBindingAutoConfiguration.java
@@ -6,13 +6,15 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.Order;
+import org.springframework.util.StringValueResolver;
 
 @Configuration
 public class SpringwolfGenericBindingAutoConfiguration {
 
     @Bean
     @Order(value = BindingProcessorPriority.GENERIC_BINDING)
-    public AsyncGenericOperationBindingProcessor asyncGenericOperationBindingProcessor() {
-        return new AsyncGenericOperationBindingProcessor();
+    public AsyncGenericOperationBindingProcessor asyncGenericOperationBindingProcessor(
+            StringValueResolver stringValueResolver) {
+        return new AsyncGenericOperationBindingProcessor(stringValueResolver);
     }
 }
diff --git a/...lf/addons/generic_binding/annotation/processor/AsyncGenericOperationBindingProcessor.java b/...lf/addons/generic_binding/annotation/processor/AsyncGenericOperationBindingProcessor.java
@@ -5,13 +5,18 @@
 import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
 import io.github.springwolf.core.asyncapi.scanners.bindings.operations.AbstractOperationBindingProcessor;
 import io.github.springwolf.core.asyncapi.scanners.bindings.operations.ProcessedOperationBinding;
+import org.springframework.util.StringValueResolver;
 
 import java.util.HashMap;
 import java.util.Map;
 
 public class AsyncGenericOperationBindingProcessor
         extends AbstractOperationBindingProcessor<AsyncGenericOperationBinding> {
 
+    public AsyncGenericOperationBindingProcessor(StringValueResolver stringValueResolver) {
+        super(stringValueResolver);
+    }
+
     @Override
     protected ProcessedOperationBinding mapToOperationBinding(AsyncGenericOperationBinding bindingAnnotation) {
         Map<String, Object> bindingData = PropertiesUtil.toMap(bindingAnnotation.fields());

diff --git a/...ddons/generic_binding/annotation/processor/AsyncGenericOperationBindingProcessorTest.java b/...ddons/generic_binding/annotation/processor/AsyncGenericOperationBindingProcessorTest.java
@@ -7,16 +7,20 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
+import org.springframework.util.StringValueResolver;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
 
 class AsyncGenericOperationBindingProcessorTest {
 
-    private final AsyncGenericOperationBindingProcessor processor = new AsyncGenericOperationBindingProcessor();
+    private final StringValueResolver stringValueResolver = mock(StringValueResolver.class);
+    private final AsyncGenericOperationBindingProcessor processor =
+            new AsyncGenericOperationBindingProcessor(stringValueResolver);
 
     @Test
     void testClassWithoutAnnotation() {

diff --git a/springwolf-bindings/springwolf-amqp-binding/build.gradle b/springwolf-bindings/springwolf-amqp-binding/build.gradle
@@ -14,8 +14,12 @@ dependencies {
     implementation "org.springframework:spring-core"
     implementation "org.springframework.boot:spring-boot-autoconfigure"
 
+    compileOnly "org.projectlombok:lombok:${lombokVersion}"
+    annotationProcessor "org.projectlombok:lombok:${lombokVersion}"
+
     testImplementation "org.assertj:assertj-core:${assertjCoreVersion}"
     testImplementation "org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}"
+    testImplementation "org.mockito:mockito-core:${mockitoCoreVersion}"
 
     testRuntimeOnly "org.junit.jupiter:junit-jupiter:${junitJupiterVersion}"
 }

diff --git a/...c/main/java/io/github/springwolf/bindings/amqp/annotations/AmqpAsyncOperationBinding.java b/...c/main/java/io/github/springwolf/bindings/amqp/annotations/AmqpAsyncOperationBinding.java
@@ -23,6 +23,8 @@
 
     int expiration() default 0;
 
+    String userId() default "";
+
     String[] cc() default {};
 
     int priority() default 0;
@@ -31,6 +33,8 @@
 
     boolean mandatory() default false;
 
+    String[] bcc() default {};
+
     boolean timestamp() default false;
 
     boolean ack() default false;

diff --git a/...github/springwolf/bindings/amqp/configuration/SpringwolfAmqpBindingAutoConfiguration.java b/...github/springwolf/bindings/amqp/configuration/SpringwolfAmqpBindingAutoConfiguration.java
@@ -10,6 +10,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.core.annotation.Order;
+import org.springframework.util.StringValueResolver;
 
 /**
  * Autoconfiguration for the springwolf Amqp Binding.
@@ -21,8 +22,8 @@ public class SpringwolfAmqpBindingAutoConfiguration {
     @Bean
     @Order(value = BindingProcessorPriority.PROTOCOL_BINDING)
     @ConditionalOnMissingBean
-    public AmqpOperationBindingProcessor amqpOperationBindingProcessor() {
-        return new AmqpOperationBindingProcessor();
+    public AmqpOperationBindingProcessor amqpOperationBindingProcessor(StringValueResolver stringValueResolver) {
+        return new AmqpOperationBindingProcessor(stringValueResolver);
     }
 
     @Bean

diff --git a/...ava/io/github/springwolf/bindings/amqp/scanners/messages/AmqpMessageBindingProcessor.java b/...ava/io/github/springwolf/bindings/amqp/scanners/messages/AmqpMessageBindingProcessor.java
@@ -5,21 +5,12 @@
 import io.github.springwolf.bindings.amqp.annotations.AmqpAsyncOperationBinding;
 import io.github.springwolf.core.asyncapi.scanners.bindings.messages.MessageBindingProcessor;
 import io.github.springwolf.core.asyncapi.scanners.bindings.messages.ProcessedMessageBinding;
-import org.springframework.context.EmbeddedValueResolverAware;
-import org.springframework.util.StringValueResolver;
 
 import java.lang.reflect.AnnotatedElement;
 import java.util.Arrays;
 import java.util.Optional;
 
-public class AmqpMessageBindingProcessor implements MessageBindingProcessor, EmbeddedValueResolverAware {
-    private StringValueResolver resolver;
-
-    @Override
-    public void setEmbeddedValueResolver(StringValueResolver resolver) {
-        this.resolver = resolver;
-    }
-
+public class AmqpMessageBindingProcessor implements MessageBindingProcessor {
     @Override
     public Optional<ProcessedMessageBinding> process(AnnotatedElement annotatedElement) {
         return Arrays.stream(annotatedElement.getAnnotations())

diff --git a/...io/github/springwolf/bindings/amqp/scanners/operations/AmqpOperationBindingProcessor.java b/...io/github/springwolf/bindings/amqp/scanners/operations/AmqpOperationBindingProcessor.java
@@ -5,20 +5,29 @@
 import io.github.springwolf.bindings.amqp.annotations.AmqpAsyncOperationBinding;
 import io.github.springwolf.core.asyncapi.scanners.bindings.operations.AbstractOperationBindingProcessor;
 import io.github.springwolf.core.asyncapi.scanners.bindings.operations.ProcessedOperationBinding;
+import org.springframework.util.StringValueResolver;
 
 import java.util.Arrays;
 
 public class AmqpOperationBindingProcessor extends AbstractOperationBindingProcessor<AmqpAsyncOperationBinding> {
+    public AmqpOperationBindingProcessor(StringValueResolver stringValueResolver) {
+        super(stringValueResolver);
+    }
+
     @Override
     protected ProcessedOperationBinding mapToOperationBinding(AmqpAsyncOperationBinding bindingAnnotation) {
         AMQPOperationBinding amqpOperationBinding = AMQPOperationBinding.builder()
                 .expiration(bindingAnnotation.expiration())
+                .userId(resolveOrNull(bindingAnnotation.userId()))
                 .cc(Arrays.stream(bindingAnnotation.cc())
                         .map(this::resolveOrNull)
                         .toList())
                 .priority(bindingAnnotation.priority())
                 .deliveryMode(bindingAnnotation.deliveryMode())
                 .mandatory(bindingAnnotation.mandatory())
+                .bcc(Arrays.stream(bindingAnnotation.bcc())
+                        .map(this::resolveOrNull)
+                        .toList())
                 .timestamp(bindingAnnotation.timestamp())
                 .ack(bindingAnnotation.ack())
                 .build();

diff --git a/...ithub/springwolf/bindings/amqp/scanners/operations/AmqpOperationBindingProcessorTest.java b/...ithub/springwolf/bindings/amqp/scanners/operations/AmqpOperationBindingProcessorTest.java
@@ -4,35 +4,91 @@
 import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPOperationBinding;
 import io.github.springwolf.bindings.amqp.annotations.AmqpAsyncOperationBinding;
 import io.github.springwolf.core.asyncapi.scanners.bindings.operations.ProcessedOperationBinding;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
+import org.springframework.util.StringValueResolver;
 
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
 
 class AmqpOperationBindingProcessorTest {
-    private final AmqpOperationBindingProcessor processor = new AmqpOperationBindingProcessor();
-
-    @Test
-    void mapToOperationBindingTest() throws NoSuchMethodException {
-        AmqpAsyncOperationBinding annotation = AmqpOperationBindingProcessorTest.class
-                .getMethod("methodWithAnnotation")
-                .getAnnotation(AmqpAsyncOperationBinding.class);
-
-        ProcessedOperationBinding binding = processor.mapToOperationBinding(annotation);
-
-        assertThat(binding.getType()).isEqualTo("amqp");
-        assertThat(binding.getBinding())
-                .isEqualTo(AMQPOperationBinding.builder()
-                        .cc(List.of())
-                        .priority(0)
-                        .deliveryMode(1)
-                        .mandatory(false)
-                        .timestamp(false)
-                        .ack(false)
-                        .build());
+    private final StringValueResolver stringValueResolver = mock(StringValueResolver.class);
+    private final AmqpOperationBindingProcessor processor = new AmqpOperationBindingProcessor(stringValueResolver);
+
+    @BeforeEach
+    void setUp() {
+        doAnswer(invocation -> invocation.getArgument(0))
+                .when(stringValueResolver)
+                .resolveStringValue(anyString());
+    }
+
+    @Nested
+    class EmptyAnnotation {
+        @Test
+        void mapToOperationBindingTest() throws NoSuchMethodException {
+            AmqpAsyncOperationBinding annotation = EmptyAnnotation.class
+                    .getMethod("methodWithAnnotation")
+                    .getAnnotation(AmqpAsyncOperationBinding.class);
+
+            ProcessedOperationBinding binding = processor.mapToOperationBinding(annotation);
+
+            assertThat(binding.getType()).isEqualTo("amqp");
+            assertThat(binding.getBinding())
+                    .isEqualTo(AMQPOperationBinding.builder()
+                            .cc(List.of())
+                            .bcc(List.of())
+                            .priority(0)
+                            .deliveryMode(1)
+                            .mandatory(false)
+                            .timestamp(false)
+                            .ack(false)
+                            .build());
+        }
+
+        @AmqpAsyncOperationBinding
+        public void methodWithAnnotation() {}
     }
 
-    @AmqpAsyncOperationBinding
-    public void methodWithAnnotation() {}
+    @Nested
+    class AllFieldsSetInAnnotation {
+        @Test
+        void mapToOperationBindingTest() throws NoSuchMethodException {
+            AmqpAsyncOperationBinding annotation = AllFieldsSetInAnnotation.class
+                    .getMethod("methodWithAnnotation")
+                    .getAnnotation(AmqpAsyncOperationBinding.class);
+
+            ProcessedOperationBinding binding = processor.mapToOperationBinding(annotation);
+
+            assertThat(binding.getType()).isEqualTo("amqp");
+            assertThat(binding.getBinding())
+                    .isEqualTo(AMQPOperationBinding.builder()
+                            .expiration(1)
+                            .userId("userId")
+                            .cc(List.of("cc1", "cc2"))
+                            .priority(2)
+                            .deliveryMode(3)
+                            .mandatory(true)
+                            .bcc(List.of("bcc1", "bcc2"))
+                            .timestamp(true)
+                            .ack(true)
+                            .build());
+        }
+
+        @AmqpAsyncOperationBinding(
+                expiration = 1,
+                userId = "userId",
+                cc = {"cc1", "cc2"},
+                priority = 2,
+                deliveryMode = 3,
+                mandatory = true,
+                bcc = {"bcc1", "bcc2"},
+                timestamp = true,
+                ack = true)
+        public void methodWithAnnotation() {}
+    }
 }
diff --git a/springwolf-bindings/springwolf-googlepubsub-binding/build.gradle b/springwolf-bindings/springwolf-googlepubsub-binding/build.gradle
@@ -16,6 +16,9 @@ dependencies {
 
     implementation "org.apache.commons:commons-lang3:${commonsLang3Version}"
 
+    compileOnly "org.projectlombok:lombok:${lombokVersion}"
+    annotationProcessor "org.projectlombok:lombok:${lombokVersion}"
+
     testImplementation "org.assertj:assertj-core:${assertjCoreVersion}"
     testImplementation "org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}"
 

diff --git a/...ringwolf/bindings/googlepubsub/scanners/channels/GooglePubSubChannelBindingProcessor.java b/...ringwolf/bindings/googlepubsub/scanners/channels/GooglePubSubChannelBindingProcessor.java
@@ -8,21 +8,12 @@
 import io.github.springwolf.core.asyncapi.scanners.bindings.channels.ChannelBindingProcessor;
 import io.github.springwolf.core.asyncapi.scanners.bindings.channels.ProcessedChannelBinding;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.context.EmbeddedValueResolverAware;
-import org.springframework.util.StringValueResolver;
 
 import java.lang.reflect.AnnotatedElement;
 import java.util.Arrays;
 import java.util.Optional;
 
-public class GooglePubSubChannelBindingProcessor implements ChannelBindingProcessor, EmbeddedValueResolverAware {
-    private StringValueResolver resolver;
-
-    @Override
-    public void setEmbeddedValueResolver(StringValueResolver resolver) {
-        this.resolver = resolver;
-    }
-
+public class GooglePubSubChannelBindingProcessor implements ChannelBindingProcessor {
     @Override
     public Optional<ProcessedChannelBinding> process(AnnotatedElement annotatedElement) {
         return Arrays.stream(annotatedElement.getAnnotations())

diff --git a/...ringwolf/bindings/googlepubsub/scanners/messages/GooglePubSubMessageBindingProcessor.java b/...ringwolf/bindings/googlepubsub/scanners/messages/GooglePubSubMessageBindingProcessor.java
@@ -7,20 +7,12 @@
 import io.github.springwolf.core.asyncapi.scanners.bindings.messages.MessageBindingProcessor;
 import io.github.springwolf.core.asyncapi.scanners.bindings.messages.ProcessedMessageBinding;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.context.EmbeddedValueResolverAware;
-import org.springframework.util.StringValueResolver;
 
 import java.lang.reflect.AnnotatedElement;
 import java.util.Arrays;
 import java.util.Optional;
 
-public class GooglePubSubMessageBindingProcessor implements MessageBindingProcessor, EmbeddedValueResolverAware {
-    private StringValueResolver resolver;
-
-    @Override
-    public void setEmbeddedValueResolver(StringValueResolver resolver) {
-        this.resolver = resolver;
-    }
+public class GooglePubSubMessageBindingProcessor implements MessageBindingProcessor {
 
     @Override
     public Optional<ProcessedMessageBinding> process(AnnotatedElement annotatedElement) {

diff --git a/springwolf-bindings/springwolf-jms-binding/build.gradle b/springwolf-bindings/springwolf-jms-binding/build.gradle
@@ -14,8 +14,12 @@ dependencies {
     implementation "org.springframework:spring-core"
     implementation "org.springframework.boot:spring-boot-autoconfigure"
 
+    compileOnly "org.projectlombok:lombok:${lombokVersion}"
+    annotationProcessor "org.projectlombok:lombok:${lombokVersion}"
+
     testImplementation "org.assertj:assertj-core:${assertjCoreVersion}"
     testImplementation "org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}"
+    testImplementation "org.mockito:mockito-core:${mockitoCoreVersion}"
 
     testRuntimeOnly "org.junit.jupiter:junit-jupiter:${junitJupiterVersion}"
 }