[Connector API] Change UpdateConnectorFiltering API to have better defaults #108612
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
efegurkan
added
:EnterpriseSearch/Application
|
Pinging @elastic/ent-search-eng (Team:Enterprise Search) |
efegurkan
force-pushed
the
update-connector-filtering-api-for-better-defaults
branch
from
c7845b0
to
39dbd9a
Compare
jedrazb
reviewed
May 15, 2024
| .findFirst(); | ||
|
|
||
| List<FilteringRule> sortedRules = rules.stream() | ||
| .filter(rule -> rule.equalsExceptForTimestampsAndOrder(getDefaultFilteringRule(null, 0)) == false) |
There was a problem hiding this comment.
maybe let's create another method isDefaultFilteringRule, it might be confusing why we do this:
rule.equalsExceptForTimestampsAndOrder(getDefaultFilteringRule(null, 0))
...t-search/src/main/java/org/elasticsearch/xpack/application/connector/ConnectorFiltering.java
Show resolved
Hide resolved
| @@ -196,9 +196,22 @@ private static FilteringValidation getRandomFilteringValidationError() { | |||
| .build(); | |||
| } | |||
|
|
|||
| public static FilteringRule getDefaultFilteringRule(Instant currentTimestamp, Integer order) { | |||
There was a problem hiding this comment.
This is accessed from within non test code, so maybe let's move it to ConnetorFiltering.java file?
Also we call it a lot with getDefaultFilteringRule(null, 0) so we can use method overloading or add WithOrder explicitly at the end of the method name:
public static FilteringRule getDefaultFilteringRuleWithOrder(Integer order) {
getDefaultFilteringRule(null, order)
}
.../src/test/java/org/elasticsearch/xpack/application/connector/ConnectorIndexServiceTests.java
Show resolved
Hide resolved
...lRestTest/resources/rest-api-spec/test/entsearch/connector/60_connector_update_filtering.yml
Show resolved
Hide resolved
|
Hi @efegurkan, I've created a changelog YAML for you. |
This changes validation behaviour for rules to have better defaults instead of throwing. The following cases changed to not throw: - When "rules" is an empty array, instead of throwing we attach a default rule - When "rules" have items but doesn't have default rule, we append a default rule. - Rules array will be ordered and default will be moved as the last
efegurkan
force-pushed
the
update-connector-filtering-api-for-better-defaults
branch
from
c33e50a
to
0dcdccb
Compare
|
Hi @efegurkan, I've created a changelog YAML for you. |
jedrazb
approved these changes
May 16, 2024
nicktindall
pushed a commit
to nicktindall/elasticsearch
that referenced
this pull request
May 17, 2024
…faults (elastic#108612) * Change UpdateConnectorFiltering API to have better defaults This changes validation behaviour for rules to have better defaults instead of throwing. The following cases changed to not throw: - When "rules" is an empty array, instead of throwing we attach a default rule - When "rules" have items but doesn't have default rule, we append a default rule. - Rules array will be ordered and default will be moved as the last * Update docs/changelog/108612.yaml
parkertimmins
pushed a commit
to parkertimmins/elasticsearch
that referenced
this pull request
May 17, 2024
…faults (elastic#108612) * Change UpdateConnectorFiltering API to have better defaults This changes validation behaviour for rules to have better defaults instead of throwing. The following cases changed to not throw: - When "rules" is an empty array, instead of throwing we attach a default rule - When "rules" have items but doesn't have default rule, we append a default rule. - Rules array will be ordered and default will be moved as the last * Update docs/changelog/108612.yaml
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.
This changes validation behaviour for rules to have better defaults instead of throwing. The following cases changed to not throw: