forked from dapr/java-sdk
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adding pubsub routing support (dapr#631)
* Adding pubsub routing support Signed-off-by: Artur Souza <[email protected]> * remove deprecated classes (dapr#704) * remove deprecated classes Signed-off-by: Mukundan Sundararajan <[email protected]> * remove builder class ref in ITs Signed-off-by: Mukundan Sundararajan <[email protected]> * fix setter in IT Signed-off-by: Mukundan Sundararajan <[email protected]> Signed-off-by: Artur Souza <[email protected]> * Address PR comments. Signed-off-by: Artur Souza <[email protected]> Co-authored-by: Mukundan Sundararajan <[email protected]> Co-authored-by: Artur Souza <[email protected]> Signed-off-by: naah69 <[email protected]>
- Loading branch information
Showing
17 changed files
with
523 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
122 changes: 122 additions & 0 deletions
122
sdk-springboot/src/main/java/io/dapr/springboot/DaprSubscriptionBuilder.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| /* | ||
| * Copyright 2022 The Dapr Authors | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package io.dapr.springboot; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Collections; | ||
| import java.util.Comparator; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| class DaprSubscriptionBuilder { | ||
| private final String pubsubName; | ||
| private final String topic; | ||
| private final List<TopicRule> rules; | ||
| private String defaultPath; | ||
| private Map<String, String> metadata; | ||
|
|
||
| /** | ||
| * Create a subscription topic. | ||
| * @param pubsubName The pubsub name to subscribe to. | ||
| * @param topic The topic to subscribe to. | ||
| */ | ||
| DaprSubscriptionBuilder(String pubsubName, String topic) { | ||
| this.pubsubName = pubsubName; | ||
| this.topic = topic; | ||
| this.rules = new ArrayList<>(); | ||
| this.defaultPath = null; | ||
| this.metadata = Collections.emptyMap(); | ||
| } | ||
|
|
||
| /** | ||
| * Sets the default path for the subscription. | ||
| * @param path The default path. | ||
| * @return this instance. | ||
| */ | ||
| DaprSubscriptionBuilder setDefaultPath(String path) { | ||
| if (defaultPath != null) { | ||
| throw new RuntimeException( | ||
| String.format( | ||
| "a default route is already set for topic %s on pubsub %s", | ||
| this.topic, this.pubsubName)); | ||
| } | ||
| defaultPath = path; | ||
| return this; | ||
| } | ||
|
|
||
| /** | ||
| * Adds a rule to the subscription. | ||
| * @param path The path to route to. | ||
| * @param match The CEL expression the event must match. | ||
| * @param priority The priority of the rule. | ||
| * @return this instance. | ||
| */ | ||
| public DaprSubscriptionBuilder addRule(String path, String match, int priority) { | ||
| if (rules.stream().anyMatch(e -> e.getPriority() == priority)) { | ||
| throw new RuntimeException( | ||
| String.format( | ||
| "a rule priority of %d is already used for topic %s on pubsub %s", | ||
| priority, this.topic, this.pubsubName)); | ||
| } | ||
| rules.add(new TopicRule(path, match, priority)); | ||
| return this; | ||
| } | ||
|
|
||
| /** | ||
| * Sets the metadata for the subscription. | ||
| * @param metadata The metadata. | ||
| * @return this instance. | ||
| */ | ||
| public DaprSubscriptionBuilder setMetadata(Map<String, String> metadata) { | ||
| this.metadata = metadata; | ||
| return this; | ||
| } | ||
|
|
||
| /** | ||
| * Builds the DaprTopicSubscription that is returned by the application to Dapr. | ||
| * @return The DaprTopicSubscription. | ||
| */ | ||
| public DaprTopicSubscription build() { | ||
| String route = null; | ||
| DaprTopicRoutes routes = null; | ||
|
|
||
| if (!rules.isEmpty()) { | ||
| Collections.sort(rules, Comparator.comparingInt(TopicRule::getPriority)); | ||
| List<DaprTopicRule> topicRules = rules.stream() | ||
| .map(e -> new DaprTopicRule(e.match, e.path)).collect(Collectors.toList()); | ||
| routes = new DaprTopicRoutes(topicRules, defaultPath); | ||
| } else { | ||
| route = defaultPath; | ||
| } | ||
|
|
||
| return new DaprTopicSubscription(this.pubsubName, this.topic, route, routes, metadata); | ||
| } | ||
|
|
||
| private static class TopicRule { | ||
| private final String path; | ||
| private final String match; | ||
| private final int priority; | ||
|
|
||
| public TopicRule(String path, String match, int priority) { | ||
| this.path = path; | ||
| this.match = match; | ||
| this.priority = priority; | ||
| } | ||
|
|
||
| public int getPriority() { | ||
| return priority; | ||
| } | ||
| } | ||
| } |
51 changes: 51 additions & 0 deletions
51
sdk-springboot/src/main/java/io/dapr/springboot/DaprTopicKey.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| /* | ||
| * Copyright 2022 The Dapr Authors | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package io.dapr.springboot; | ||
|
|
||
| import java.util.Objects; | ||
|
|
||
| class DaprTopicKey { | ||
| private final String pubsubName; | ||
| private final String topic; | ||
|
|
||
| DaprTopicKey(String pubsubName, String topic) { | ||
| this.pubsubName = pubsubName; | ||
| this.topic = topic; | ||
| } | ||
|
|
||
| public String getPubsubName() { | ||
| return pubsubName; | ||
| } | ||
|
|
||
| public String getTopic() { | ||
| return topic; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) { | ||
| return true; | ||
| } | ||
| if (o == null || getClass() != o.getClass()) { | ||
| return false; | ||
| } | ||
| DaprTopicKey that = (DaprTopicKey) o; | ||
| return pubsubName.equals(that.pubsubName) && topic.equals(that.topic); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hash(pubsubName, topic); | ||
| } | ||
| } |
38 changes: 38 additions & 0 deletions
38
sdk-springboot/src/main/java/io/dapr/springboot/DaprTopicRoutes.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| /* | ||
| * Copyright 2022 The Dapr Authors | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package io.dapr.springboot; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Optional; | ||
|
|
||
| class DaprTopicRoutes { | ||
| private final List<DaprTopicRule> rules; | ||
| @JsonProperty("default") | ||
| private final String defaultRoute; | ||
|
|
||
| DaprTopicRoutes(List<DaprTopicRule> rules, String defaultRoute) { | ||
| this.rules = rules; | ||
| this.defaultRoute = defaultRoute; | ||
| } | ||
|
|
||
| public List<DaprTopicRule> getRules() { | ||
| return rules; | ||
| } | ||
|
|
||
| public String getDefaultRoute() { | ||
| return defaultRoute; | ||
| } | ||
| } |
Oops, something went wrong.