Spring cloud stream functional bindings preview #828

jsokolowskii · 2022-12-05T08:52:44Z

This PR fixes Activiti/Activiti#4196 replacing the deprecated annotations from spring-cloud-stream with the new functional one provided by spring-cloud-function.

The annotation @StreamListener and @EnableBindings has been replaced with custom annotations defined in Activiti-Cloud#910:

@FunctionalBinding
@ConditionalFunctionalBinding
@ConnectorBinding

erdemedeiros

LGTM!

This reverts commit 9b257de.

This reverts commit f2872b4.

This reverts commit 60f270c.

igdianov · 2023-01-25T19:18:20Z

...tor/starter/src/main/java/org/activiti/cloud/examples/connectors/ConnectorConfiguration.java

+    @Bean(INTERNAL_CHANNEL_PREFIX + ExampleConnectorChannels.EXAMPLE_CONNECTOR_CONSUMER)
+    @Override
+    public SubscribableChannel exampleConnectorConsumer() {
+        return MessageChannels.publishSubscribe(ExampleConnectorChannels.EXAMPLE_CONNECTOR_CONSUMER).get();
+    }
+
+    @Bean(INTERNAL_CHANNEL_PREFIX + HeadersConnectorChannels.HEADERS_CONNECTOR_CONSUMER)
+    @Override
+    public SubscribableChannel headersConnectorConsumer() {
+        return MessageChannels.publishSubscribe(HeadersConnectorChannels.HEADERS_CONNECTOR_CONSUMER).get();
+    }
+
+    @Bean(INTERNAL_CHANNEL_PREFIX + MoviesDescriptionConnectorChannels.MOVIES_DESCRIPTION_CONSUMER)
+    @Override
+    public SubscribableChannel moviesDescriptionConsumer() {
+        return MessageChannels.publishSubscribe(MoviesDescriptionConnectorChannels.MOVIES_DESCRIPTION_CONSUMER).get();
+    }
+
+    @Bean(INTERNAL_CHANNEL_PREFIX + MultiInstanceConnector.Channels.CHANNEL)
+    @Override
+    public SubscribableChannel miCloudConnectorInput() {
+        return MessageChannels.publishSubscribe(MultiInstanceConnector.Channels.CHANNEL).get();
+    }
+
+    @Bean(INTERNAL_CHANNEL_PREFIX + TestBpmnErrorConnector.Channels.CHANNEL)
+    @Override
+    public SubscribableChannel testBpmnErrorConnectorInput() {
+        return MessageChannels.publishSubscribe(TestBpmnErrorConnector.Channels.CHANNEL).get();
+    }
+
+    @Bean(INTERNAL_CHANNEL_PREFIX + TestErrorConnector.Channels.CHANNEL)
+    @Override
+    public SubscribableChannel testErrorConnectorInput() {
+        return MessageChannels.publishSubscribe(TestErrorConnector.Channels.CHANNEL).get();
+    }
+
+    @Bean(INTERNAL_CHANNEL_PREFIX + RestConnector.Channels.POST)
+    @Override
+    public SubscribableChannel restConnectorPost() {
+        return MessageChannels.publishSubscribe(RestConnector.Channels.POST).get();
+    }


Let's refactor this code using functional channel bindings.

igdianov · 2023-01-25T19:21:38Z

...tor/starter/src/main/java/org/activiti/cloud/examples/connectors/MultiInstanceConnector.java

@@ -56,7 +55,12 @@ public MultiInstanceConnector(
        this.connectorProperties = connectorProperties;
    }

-    @StreamListener(value = Channels.CHANNEL)
+    @Override
+    public Void apply(IntegrationRequest event) {


The apply method can be implemented directly.

igdianov · 2023-01-25T19:21:46Z

...ud-connector/starter/src/main/java/org/activiti/cloud/examples/connectors/RestConnector.java

@@ -48,7 +46,12 @@ public RestConnector(IntegrationResultSender integrationResultSender, ConnectorP
        this.connectorProperties = connectorProperties;
    }

-    @StreamListener(Channels.POST)
+    @Override
+    public Void apply(IntegrationRequest event) {


The apply method can be implemented directly.

igdianov · 2023-01-25T19:21:55Z

...tor/starter/src/main/java/org/activiti/cloud/examples/connectors/TestBpmnErrorConnector.java

        SubscribableChannel testBpmnErrorConnectorInput();
    }

-    @StreamListener(value = Channels.CHANNEL)
+    @Override
+    public Void apply(IntegrationRequest event) {


The apply method can be implemented directly.

igdianov · 2023-01-25T19:22:26Z

...nnector/starter/src/main/java/org/activiti/cloud/examples/connectors/TestErrorConnector.java

-    @StreamListener(value = Channels.CHANNEL)
-    public void handle(IntegrationRequest integrationRequest) throws InterruptedException {
+    @Override
+    public Void apply(IntegrationRequest event) {


The apply method can be implemented directly.

igdianov · 2023-01-25T21:00:26Z

...connector/starter/src/main/java/org/activiti/cloud/examples/connectors/ExampleConnector.java

+    public Void apply(IntegrationRequest event) {
+        performTask(event);
+        return null;
+    }
+
+    public void performTask(IntegrationRequest event) {


The apply method can be implemented directly or via separate Connector function bean that uses ExampleConnector consumer as a delegate.

igdianov · 2023-01-25T21:03:15Z

...connector/starter/src/main/java/org/activiti/cloud/examples/connectors/ExampleConnector.java

-@Component
-@EnableBinding(ExampleConnectorChannels.class)
-public class ExampleConnector {
+@ConnectorBinding(input = ExampleConnectorChannels.EXAMPLE_CONNECTOR_CONSUMER, condition = "", outputHeader = "")


Why do you need to reset outputHeader attribute?

jsokolowskii · 2023-01-31T08:00:20Z

The changes were merged in PR #875

jsokolowskii force-pushed the aae-11278-functional-bindings-dev-jsokolowski-ldigiuseppe-preview branch from 77d0da9 to 76347aa Compare December 5, 2022 11:18

LorenzoDiGiuseppe added do-not-merge WIP and removed do-not-merge labels Dec 7, 2022

LorenzoDiGiuseppe closed this Dec 13, 2022

LorenzoDiGiuseppe reopened this Dec 13, 2022

LorenzoDiGiuseppe closed this Dec 13, 2022

LorenzoDiGiuseppe reopened this Dec 13, 2022

LorenzoDiGiuseppe force-pushed the aae-11278-functional-bindings-dev-jsokolowski-ldigiuseppe-preview branch 2 times, most recently from 0df5f5d to 2cf79a5 Compare December 20, 2022 11:25

LorenzoDiGiuseppe force-pushed the aae-11278-functional-bindings-dev-jsokolowski-ldigiuseppe-preview branch from 14ef2b0 to 008aedd Compare December 22, 2022 14:24

jsokolowskii force-pushed the aae-11278-functional-bindings-dev-jsokolowski-ldigiuseppe-preview branch from 012c0df to 2b11be4 Compare January 2, 2023 14:02

LorenzoDiGiuseppe added ready-for-review and removed WIP labels Jan 3, 2023

LorenzoDiGiuseppe marked this pull request as ready for review January 3, 2023 09:17

LorenzoDiGiuseppe requested review from igdianov and erdemedeiros January 3, 2023 10:05

LorenzoDiGiuseppe changed the title ~~[AAE-11278] Spring cloud stream functional bindings preview~~ Spring cloud stream functional bindings preview Jan 3, 2023

jsokolowskii added the breaking-change label Jan 4, 2023

LorenzoDiGiuseppe force-pushed the aae-11278-functional-bindings-dev-jsokolowski-ldigiuseppe-preview branch from e6d5e44 to f91a867 Compare January 5, 2023 15:54

erdemedeiros added the do-not-merge label Jan 6, 2023

erdemedeiros approved these changes Jan 6, 2023

View reviewed changes

jsokolowskii added the next-version label Jan 11, 2023

LorenzoDiGiuseppe force-pushed the aae-11278-functional-bindings-dev-jsokolowski-ldigiuseppe-preview branch 2 times, most recently from 25f28de to d3ee169 Compare January 24, 2023 08:53

jsokolowskii force-pushed the aae-11278-functional-bindings-dev-jsokolowski-ldigiuseppe-preview branch from 6baaf04 to a48f09d Compare January 25, 2023 14:30

jsokolowskii removed the next-version label Jan 25, 2023

jsokolowskii added 3 commits January 25, 2023 16:23

use preview version

6b8c205

test-support library removed

0bce81e

new activiti-cloud preview version

03c43dc

LorenzoDiGiuseppe and others added 26 commits January 25, 2023 16:23

prettier fix

d6e58fd

removed empty line

2771b22

prettier fix

2008c32

prettier fix

079fea7

fix method

c3e5940

update preview version

63e2104

migrated new RestConnector

3f046d8

prettier

76a6a95

AAE-11278 update activiti-cloud snapshot preview version

2b58bf1

AAE-11278 use @ConnectorBinding

410e23b

AAE-11278 fix imports

cab9263

Revert "AAE-11278 fix imports"

f9357e8

This reverts commit 9b257de.

AAE-11278 fix imports

d31c574

updated preview version

08a248c

Revert "AAE-11278 fix imports"

e1f5404

This reverts commit f2872b4.

Revert "AAE-11278 use @ConnectorBinding"

95ef063

This reverts commit 60f270c.

preview update

9b437b3

Improve test assertions

e1ceec9

AAE-11278 new preview version

fc8db99

AAE-11278 new preview version

7943c1f

change connector bindings

11a85e2

preview upgrade

44e7985

preview update

d5c7b99

preview upgrade

40b1bad

fix version

2d65c85

new preview version

8d71a23

jsokolowskii force-pushed the aae-11278-functional-bindings-dev-jsokolowski-ldigiuseppe-preview branch from a48f09d to 8d71a23 Compare January 25, 2023 15:24

igdianov suggested changes Jan 25, 2023

View reviewed changes

jsokolowskii closed this Jan 31, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Spring cloud stream functional bindings preview #828

Spring cloud stream functional bindings preview #828

jsokolowskii commented Dec 5, 2022 •

edited by LorenzoDiGiuseppe

Loading

erdemedeiros left a comment

igdianov Jan 25, 2023

igdianov Jan 25, 2023

igdianov Jan 25, 2023

igdianov Jan 25, 2023

igdianov Jan 25, 2023

igdianov Jan 25, 2023

igdianov Jan 25, 2023

jsokolowskii commented Jan 31, 2023

Spring cloud stream functional bindings preview #828

Spring cloud stream functional bindings preview #828

Conversation

jsokolowskii commented Dec 5, 2022 • edited by LorenzoDiGiuseppe Loading

erdemedeiros left a comment

Choose a reason for hiding this comment

igdianov Jan 25, 2023

Choose a reason for hiding this comment

igdianov Jan 25, 2023

Choose a reason for hiding this comment

igdianov Jan 25, 2023

Choose a reason for hiding this comment

igdianov Jan 25, 2023

Choose a reason for hiding this comment

igdianov Jan 25, 2023

Choose a reason for hiding this comment

igdianov Jan 25, 2023

Choose a reason for hiding this comment

igdianov Jan 25, 2023

Choose a reason for hiding this comment

jsokolowskii commented Jan 31, 2023

jsokolowskii commented Dec 5, 2022 •

edited by LorenzoDiGiuseppe

Loading