Skip to content
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.

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

NPE bug fixes in the DefaultLogstashPluginAttributesMapper #574

Merged
merged 2 commits into from
Nov 12, 2021

Conversation

dlvenable
Copy link
Member

@dlvenable dlvenable commented Nov 12, 2021

Description

Corrected some null issues from the refactoring.

Issues Resolved

Part of #568

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff

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.


final Map<String, Object> pluginSettings = new LinkedHashMap<>();

if(logstashAttributesMappings.getAdditionalAttributes() != null) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it be feasible and nicer to have logstashAttributesMappings.getAdditionalAttributes() already return a non-null value? If it returns an empty map in this case, it would be great.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yea, I'd like that.
The underlying cause is that the model is being deserialized from YAML. So, we will need to make the model return an empty list instead of null when it is not set. But, this should be possible.

asifsmohammed
asifsmohammed previously approved these changes Nov 12, 2021
@codecov-commenter
Copy link

Codecov Report

Merging #574 (003e68a) into main (e04a40f) will increase coverage by 0.00%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##               main     #574   +/-   ##
=========================================
  Coverage     92.28%   92.29%           
  Complexity      569      569           
=========================================
  Files            71       71           
  Lines          1725     1727    +2     
  Branches        144      144           
=========================================
+ Hits           1592     1594    +2     
  Misses          102      102           
  Partials         31       31           
Impacted Files Coverage Δ
...gins/certificate/file/FileCertificateProvider.java 100.00% <0.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e04a40f...003e68a. Read the comment docs.

Copy link
Collaborator

@asifsmohammed asifsmohammed left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@dlvenable dlvenable merged commit 08f17ab into opensearch-project:main Nov 12, 2021
@dlvenable dlvenable deleted the mappings-fixes-568 branch November 12, 2021 19:19
chenqi0805 added a commit to chenqi0805/data-prepper that referenced this pull request Nov 12, 2021
* main:
  Fixes the main branch from a renaming that happened when two related PRs were merged around the same time. (opensearch-project#583)
  Grpc Basic auth for Otel trace Source (opensearch-project#570)
  Fixed a NullPointerException which LogstashVisitor was throwing for attributes without a value. (opensearch-project#582)
  Update PipelineModel to fix serialization (opensearch-project#577)
  Log analytics getting started (opensearch-project#573)
  Support maps which are not present in the YAML, which Jackson appears to be treating differently from explicit nulls. opensearch-project#568 (opensearch-project#579)
  Add support for codeowners to repo (opensearch-project#578)
  Added logstash mapper which maps logstash configuration to pipeline m… (opensearch-project#575)
  Document OpenSearch Sink configuration parameters number_of_shards and number_of_replicas. (opensearch-project#562)
  Added instructions to build and run the Docker image locally. (opensearch-project#564)
  NPE bug fixes in the DefaultLogstashPluginAttributesMapper (opensearch-project#574)
  switch Path.of to Paths.get (opensearch-project#566)
  Fix PrepperState javadoc (opensearch-project#567)

Signed-off-by: qchea <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants