Skip to content

Add support for @PostMapping("/path") to pub/sub topic subscriptions #583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dapr-bot merged 15 commits into from
Aug 21, 2021
Merged

Add support for @PostMapping("/path") to pub/sub topic subscriptions #583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
264b98c
Remove duplicate dependency
mthmulders Jul 25, 2021
b88683a
Transform into managed dependencies
mthmulders Jul 25, 2021
d7393ed
Remove old JUnit version from dependencies
mthmulders Jul 25, 2021
b45e125
Add tests for DaprBeanPostProcessor
mthmulders Jul 25, 2021
683394e
Also register PostMappings that use value
mthmulders Jul 25, 2021
90e213f
Modify existing pub/sub test to no use @PostMapping(path="...")
mthmulders Jul 28, 2021
75ca4ee
Remove added dependencies on AssertJ, Spring Test and Servlet API
mthmulders Jul 28, 2021
1628257
Remove test in favour of the sdk-tests one
mthmulders Jul 28, 2021
6fb0292
Merge branch 'master' into pubsub-binding-postmapping-value
artursouza Aug 10, 2021
8be5ae4
Merge branch 'master' into pubsub-binding-postmapping-value
artursouza Aug 14, 2021
12b2b6d
Merge branch 'master' into pubsub-binding-postmapping-value
artursouza Aug 18, 2021
4f959e6
Merge branch 'master' into pubsub-binding-postmapping-value
artursouza Aug 20, 2021
f4f660e
Merge branch 'master' into pubsub-binding-postmapping-value
artursouza Aug 20, 2021
d19ba10
Merge branch 'master' into pubsub-binding-postmapping-value
artursouza Aug 21, 2021
b2a1e22
Merge branch 'master' into pubsub-binding-postmapping-value
artursouza Aug 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions sdk-springboot/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,6 @@
<artifactId>dapr-sdk-actors</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
Expand All @@ -74,13 +69,11 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.5.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>5.2.10.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
4 changes: 3 additions & 1 deletion sdk-springboot/src/main/java/io/dapr/springboot/DaprBeanPostProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import java.util.Map;

/**
* Handles Dapr annotations in Springboot Controllers.
* Handles Dapr annotations in Spring Controllers.
*/
@Component
public class DaprBeanPostProcessor implements BeanPostProcessor {
Expand Down Expand Up @@ -77,6 +77,8 @@ private static void subscribeToTopics(Class clazz, EmbeddedValueResolver embedde

if (mapping != null && mapping.path() != null && mapping.path().length >= 1) {
route = mapping.path()[0];
} else if (mapping != null && mapping.value() != null && mapping.value().length >= 1) {
route = mapping.value()[0];
}

String topicName = embeddedValueResolver.resolveStringValue(topic.name());
Expand Down
2 changes: 1 addition & 1 deletion sdk-tests/src/test/java/io/dapr/it/pubsub/http/SubscriberController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public List<CloudEvent<?>> getMessagesByTopic(@PathVariable("topic") String topi
}

@Topic(name = "testingtopic", pubsubName = "messagebus")
@PostMapping(path = "/route1")
@PostMapping("/route1")
public Mono<Void> handleMessage(@RequestBody(required = false) CloudEvent envelope) {
return Mono.fromRunnable(() -> {
try {
Expand Down