-
Notifications
You must be signed in to change notification settings - Fork 618
Add symbolic value type, resolver registry, and the in operator to the rule management component
#8198
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
Open
kaviska
wants to merge
5
commits into
wso2:master
Choose a base branch
from
kaviska:rule-mgt
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Add symbolic value type, resolver registry, and the in operator to the rule management component
#8198
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
188e815
Add symbolic value type support to rule management component
kaviska 5de1bc5
Add rule metadata configuration for symbolic OS version fields
kaviska ca3593e
Address review comments and add symbolic evaluation tests
kaviska 7a2ef2f
Rename evaluateInForNumber parameter to a generic name
kaviska bf08b62
Clean up RuleBuilder: remove unused resolveValue overload and simplif…
kaviska File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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
37 changes: 37 additions & 0 deletions
37
...ain/java/org/wso2/carbon/identity/rule/evaluation/api/resolver/SymbolicValueResolver.java
This file contains hidden or 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,37 @@ | ||
| /* | ||
| * Copyright (c) 2026, WSO2 LLC. (http://www.wso2.com). | ||
| * | ||
| * WSO2 LLC. licenses this file to you 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 org.wso2.carbon.identity.rule.evaluation.api.resolver; | ||
|
|
||
| import org.wso2.carbon.identity.rule.management.api.model.Value; | ||
|
|
||
| /** | ||
| * Resolves a symbolic field value to a concrete {@link Value} at rule evaluation time. | ||
| * Implementations are registered per field name via {@link SymbolicValueResolverRegistry}. | ||
| */ | ||
| public interface SymbolicValueResolver { | ||
|
|
||
| /** | ||
| * Resolves the given symbolic string to a concrete Value. | ||
| * The returned Value must have type NUMBER or LIST. | ||
| * | ||
| * @param symbolicValue Symbolic token or comma-separated list of tokens to resolve. | ||
| * @return Resolved Value with type NUMBER or LIST. | ||
| */ | ||
| Value resolve(String symbolicValue); | ||
| } |
78 changes: 78 additions & 0 deletions
78
.../org/wso2/carbon/identity/rule/evaluation/api/resolver/SymbolicValueResolverRegistry.java
This file contains hidden or 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,78 @@ | ||
| /* | ||
| * Copyright (c) 2026, WSO2 LLC. (http://www.wso2.com). | ||
| * | ||
| * WSO2 LLC. licenses this file to you 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 org.wso2.carbon.identity.rule.evaluation.api.resolver; | ||
|
|
||
| import java.util.Map; | ||
| import java.util.concurrent.ConcurrentHashMap; | ||
|
|
||
| /** | ||
| * Singleton registry for {@link SymbolicValueResolver} instances, keyed by field name. | ||
| * Bundles register resolvers on OSGi bundle activation and deregister on deactivation. | ||
| */ | ||
| public class SymbolicValueResolverRegistry { | ||
|
|
||
| private static final SymbolicValueResolverRegistry INSTANCE = new SymbolicValueResolverRegistry(); | ||
| private final Map<String, SymbolicValueResolver> resolvers = new ConcurrentHashMap<>(); | ||
|
|
||
| private SymbolicValueResolverRegistry() { | ||
|
|
||
| } | ||
|
|
||
| /** | ||
| * Returns the singleton instance of this registry. | ||
| * | ||
| * @return Singleton SymbolicValueResolverRegistry. | ||
| */ | ||
| public static SymbolicValueResolverRegistry getInstance() { | ||
|
|
||
| return INSTANCE; | ||
| } | ||
|
|
||
| /** | ||
| * Registers a resolver for the given field name. | ||
| * | ||
| * @param fieldName Field name to associate the resolver with. | ||
| * @param resolver Resolver implementation. | ||
| */ | ||
| public void register(String fieldName, SymbolicValueResolver resolver) { | ||
|
|
||
| resolvers.put(fieldName, resolver); | ||
| } | ||
|
|
||
| /** | ||
| * Removes the resolver registered for the given field name. | ||
| * | ||
| * @param fieldName Field name whose resolver should be removed. | ||
| */ | ||
| public void deregister(String fieldName) { | ||
|
|
||
| resolvers.remove(fieldName); | ||
| } | ||
|
|
||
| /** | ||
| * Returns the resolver for the given field name, or null if none is registered. | ||
| * | ||
| * @param fieldName Field name. | ||
| * @return Registered resolver, or null if not found. | ||
| */ | ||
| public SymbolicValueResolver getResolver(String fieldName) { | ||
|
|
||
| return resolvers.get(fieldName); | ||
| } | ||
| } |
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.