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

Using consistent collection of non displayable fields to filter against. (#3585) #3668

Merged
merged 1 commit into from Mar 28, 2017

Conversation

Projects
None yet
2 participants
@dennisoelkers
Member

dennisoelkers commented Mar 28, 2017

This is a backport of #3585 to 2.2.

Before this change, the "source" field was suppressed from being
returned (and therefore) displayed in decorated results. This was caused
by some fields included in the RESERVED_FIELDS set, which were not
added back from the decorator processor before returning the list of fields included
in the search result.

This change could have extracted the method used in SearchResult.java
into a commonly used helper method used in both code points. This would
have involved a lot of casting/conversion between different
(ResultMessage/ResultMessageSummary) data types for each returned
message which is decorated, so the impact of deduplication would be
bigger than its benefits. Instead, I cleaned up and (hopefully) made the
sets of fields more expressive and easier to use.

Fixes #3584
(cherry picked from commit a724a27)

Using consistent collection of non displayable fields to filter again…
…st. (#3585)

Before this change, the "source" field was suppressed from being
returned (and therefore) displayed in decorated results. This was caused
by some fields included in the `RESERVED_FIELDS` set, which were not
added back from the decorator processor before returning the list of fields included
in the search result.

This change could have extracted the method used in `SearchResult.java`
into a commonly used helper method used in both code points. This would
have involved a lot of casting/conversion between different
(`ResultMessage`/`ResultMessageSummary`) data types for each returned
message which is decorated, so the impact of deduplication would be
bigger than its benefits. Instead, I cleaned up and (hopefully) made the
sets of fields more expressive and easier to use.

Fixes #3584
(cherry picked from commit a724a27)

@dennisoelkers dennisoelkers added this to the 2.2.3 milestone Mar 28, 2017

@joschi joschi self-assigned this Mar 28, 2017

@joschi

joschi approved these changes Mar 28, 2017

@joschi joschi merged commit 518cadc into 2.2 Mar 28, 2017

4 checks passed

ci-web-linter Jenkins build graylog-pr-linter-check 1477 has succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
licence/cla Contributor License Agreement is signed.
Details

@joschi joschi deleted the issue-3584-to-2.2 branch Mar 28, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment