Updated the PipelineModel to return a SinkModel for sinks #1802
Conversation
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
…des fields for conditional routing. Signed-off-by: David Venable <[email protected]>
sbayer55
suggested changes
Sep 27, 2022
| @@ -144,6 +146,11 @@ void deserialize_PipelinesDataFlowModel_with_route() throws IOException { | |||
| assertThat(pipelineModel.getSinks().size(), equalTo(1)); | |||
| assertThat(pipelineModel.getSinks().get(0), notNullValue()); | |||
| assertThat(pipelineModel.getSinks().get(0).getPluginName(), equalTo("testSink")); | |||
| assertThat(pipelineModel.getSinks().get(0).getRoutes(), notNullValue()); | |||
| assertAll( | |||
| @@ -116,6 +117,11 @@ private static PluginSetting getPluginSettingFromPluginModel(final PluginModel p | |||
| return new PluginSetting(pluginModel.getPluginName(), settingsMap == null ? new HashMap<>() : settingsMap); | |||
| } | |||
|
|
|||
| private static RoutedPluginSetting getRoutedPluginSettingFromSinkModel(final SinkModel sinkModel) { | |||
| final Map<String, Object> settingsMap = sinkModel.getPluginSettings(); | |||
| return new RoutedPluginSetting(sinkModel.getPluginName(), settingsMap == null ? new HashMap<>() : settingsMap, sinkModel.getRoutes()); | |||
There was a problem hiding this comment.
nit: The inline operator argument could be moved to its own line.
Another alternative is Optional
public static String bar(final String arg) {
return arg;
}
public static void main(String[] args) {
final var foo = Optional.ofNullable(bar(args[0]));
System.out.println(foo.orElse("default"));
}
| @Test | ||
| void testSinksWithRoutes() { | ||
| final List<Collection<String>> orderedSinkRoutes = new ArrayList<>(); | ||
| for (SinkModel sink : sinks) { |
Signed-off-by: David Venable <[email protected]>
Codecov Report
@@ Coverage Diff @@
## main #1802 +/- ##
============================================
- Coverage 93.96% 93.94% -0.03%
- Complexity 1457 1478 +21
============================================
Files 188 189 +1
Lines 4275 4326 +51
Branches 347 354 +7
============================================
+ Hits 4017 4064 +47
- Misses 177 179 +2
- Partials 81 83 +2
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
sbayer55
approved these changes
Sep 27, 2022
oeyh
approved these changes
Sep 28, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
The primary goal of this PR is to build up the changes that propagate routes from the
PipelineModelfrom the API level to thePipelineConfigurationin data-prepper-core. This is accomplished mainly through two changes.PipelineModelto returnSinkModelfor the sinks. This is an API change.RoutedPluginSettingswithin data-prepper-core to support propagation of this information.Issues Resolved
Contributes toward #1337 .
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.