Skip to content

fix ShouldDisableSimpleOr test on v3_beta_26 #479

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.

Sign up for GitHub

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
mlisakhere wants to merge 1 commit into
base: v3_types
Choose a base branch
from
Open

fix ShouldDisableSimpleOr test on v3_beta_26 #479

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 25 additions & 9 deletions ...ib-handlers/src/jvmMain/java/com/here/naksha/lib/handlers/util/PropertyOperationUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;

import com.here.naksha.lib.core.lambdas.F1;
Expand Down Expand Up @@ -63,18 +64,33 @@ private static void disablePropertyInPropertyQueryTree(
@NotNull IPropertyQuery current, @Nullable IPropertyQuery parent, F1<Boolean, PQuery> removalCondition, Set<PQuery> disabledProperties
) {
switch (current) {
case PAnd pAnd -> pAnd.forEach(andChild -> disablePropertyInPropertyQueryTree(andChild, pAnd, removalCondition, disabledProperties));
case POr pOr -> pOr.forEach(orChild -> disablePropertyInPropertyQueryTree(orChild, pOr, removalCondition, disabledProperties));
case PNot pNot -> disablePropertyInPropertyQueryTree(pNot.getQuery(), pNot, removalCondition, disabledProperties);
case PAnd pAnd -> {
for (var andChild : pAnd) {
disablePropertyInPropertyQueryTree(andChild, pAnd, removalCondition, disabledProperties);
}
}
case POr pOr -> {
for (var orChild : pOr) {
disablePropertyInPropertyQueryTree(orChild, pOr, removalCondition, disabledProperties);
}
}
case PNot pNot -> {
disablePropertyInPropertyQueryTree(pNot.getQuery(), pNot, removalCondition, disabledProperties);

}
case PQuery currentyPQuery when removalCondition.call(currentyPQuery) -> {
if (parent instanceof PAnd pAndParent) {
pAndParent.remove(current);
pAndParent.add(PTrue.INSTANCE);
disabledProperties.add(currentyPQuery);
int idx = pAndParent.indexOf(current);
if (idx >= 0) {
pAndParent.set(idx, PTrue.INSTANCE);
disabledProperties.add(currentyPQuery);
}
} else if (parent instanceof POr pOrParent) {
pOrParent.remove(current);
pOrParent.add(PTrue.INSTANCE);
disabledProperties.add(currentyPQuery);
int idx = pOrParent.indexOf(current);
if (idx >= 0) {
pOrParent.set(idx, PTrue.INSTANCE);
disabledProperties.add(currentyPQuery);
}
} else if (parent instanceof PNot pNotParent) {
pNotParent.setQuery(PFalse.INSTANCE);
disabledProperties.add(currentyPQuery);
Expand Down
Loading