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.

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

[incubator-kie-drools-6243] Property reactivity doesn't react to supe… #6251

Merged
merged 1 commit into from
Feb 19, 2025
+180 −1
Merged

[incubator-kie-drools-6243] Property reactivity doesn't react to supe… #6251

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion drools-core/src/main/java/org/drools/core/common/PhreakPropagationContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ public PropagationContext adaptModificationMaskForObjectType(ObjectType type, Re
Class<?> classType = classObjectType.getClassType();
String pkgName = classType.getPackage().getName();

if (classType == modifiedClass || "java.lang".equals(pkgName) || !(classType.isInterface() || modifiedClass.isInterface())) {
if (classType == modifiedClass || "java.lang".equals(pkgName)) {
Copy link
Contributor Author

@tkobayas tkobayas Feb 12, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

The condition !(classType.isInterface() || modifiedClass.isInterface()) allows the mask adaptation only for cases where Interface is involved. This was introduced by 6d2840d

But I think it's fine to allow for cases where both are classes. So this is the only change for this fix.

WDYT? @mariofusco

if (typeBit) {
modificationMask = modificationMask.set(PropertySpecificUtil.TRAITABLE_BIT);
}
Expand Down
179 changes: 179 additions & 0 deletions ...er-integration/src/test/java/org/drools/mvel/integrationtests/PropertyReactivityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1931,4 +1931,183 @@ public void testComment(KieBaseTestConfiguration kieBaseTestConfiguration) {

assertThat(ksession.fireAllRules()).isEqualTo(2);
}

public static class MyPerson {

private String name;
private int age;
private String address;

public String getName() {
return name;
}

public void setName(String name) {
this.name = name;
}

public int getAge() {
return age;
}

public void setAge(int age) {
this.age = age;
}

public String getAddress() {
return address;
}

public void setAddress(String address) {
this.address = address;
}
}

public static class MyWorker extends MyPerson {

@Override
public String getAddress() {
return super.getAddress();
}
}

@ParameterizedTest(name = "KieBase type={0}")
@MethodSource("parameters")
@Timeout(10000)
void getterOverrideSuperToSub(KieBaseTestConfiguration kieBaseTestConfiguration) {
final String drl =
"package rules.basic.common;\n" +
"import " + MyPerson.class.getCanonicalName() + ";\n" +
"import " + MyWorker.class.getCanonicalName() + ";\n" +
"rule R1\n" +
"salience 1\n" +
"when\n" +
" $fact : MyPerson( address == null )\n" +
"then\n" +
" modify($fact) {\n" +
" setAddress(\"ROME\")\n" +
" }\n" +
"end\n" +
"rule R2\n" +
"when\n" +
" $fact : MyWorker( $address: address != null )\n" +
"then\n" +
" modify($fact) {\n" +
" setName(\"PIPPO\")\n" +
" }\n" +
"end\n";

KieBase kbase = KieBaseUtil.getKieBaseFromKieModuleFromDrl("test", kieBaseTestConfiguration, drl);
KieSession ksession = kbase.newKieSession();
MyWorker myWorker = new MyWorker();
ksession.insert(myWorker);
ksession.fireAllRules();
assertThat(myWorker.getName()).isEqualTo("PIPPO");
}

@ParameterizedTest(name = "KieBase type={0}")
@MethodSource("parameters")
@Timeout(10000)
void getterOverrideSubToSuper(KieBaseTestConfiguration kieBaseTestConfiguration) {
final String drl =
"package rules.basic.common;\n" +
"import " + MyPerson.class.getCanonicalName() + ";\n" +
"import " + MyWorker.class.getCanonicalName() + ";\n" +
"rule R1\n" +
"salience 1\n" +
"when\n" +
" $fact : MyWorker( address == null )\n" +
"then\n" +
" modify($fact) {\n" +
" setAddress(\"ROME\")\n" +
" }\n" +
"end\n" +
"rule R2\n" +
"when\n" +
" $fact : MyPerson( $address: address != null )\n" +
"then\n" +
" modify($fact) {\n" +
" setName(\"PIPPO\")\n" +
" }\n" +
"end\n";

KieBase kbase = KieBaseUtil.getKieBaseFromKieModuleFromDrl("test", kieBaseTestConfiguration, drl);
KieSession ksession = kbase.newKieSession();
MyWorker myWorker = new MyWorker();
ksession.insert(myWorker);
ksession.fireAllRules();
assertThat(myWorker.getName()).isEqualTo("PIPPO");
}

@ParameterizedTest(name = "KieBase type={0}")
@MethodSource("parameters")
@Timeout(10000)
void getterOverrideSuperToSubBeta(KieBaseTestConfiguration kieBaseTestConfiguration) {
final String drl =
"package rules.basic.common;\n" +
"import " + MyPerson.class.getCanonicalName() + ";\n" +
"import " + MyWorker.class.getCanonicalName() + ";\n" +
"rule R1\n" +
"salience 1\n" +
"when\n" +
" $fact : MyPerson( address == null )\n" +
"then\n" +
" modify($fact) {\n" +
" setAddress(\"ROME\")\n" +
" }\n" +
"end\n" +
"rule R2\n" +
"when\n" +
" $checkAddress: String()\n" +
" $fact : MyWorker( $address: address == $checkAddress )\n" +
"then\n" +
" modify($fact) {\n" +
" setName(\"PIPPO\")\n" +
" }\n" +
"end\n";

KieBase kbase = KieBaseUtil.getKieBaseFromKieModuleFromDrl("test", kieBaseTestConfiguration, drl);
KieSession ksession = kbase.newKieSession();
MyWorker myWorker = new MyWorker();
ksession.insert(myWorker);
ksession.insert("ROME");
ksession.fireAllRules();
assertThat(myWorker.getName()).isEqualTo("PIPPO");
}

@ParameterizedTest(name = "KieBase type={0}")
@MethodSource("parameters")
@Timeout(10000)
void getterOverrideSubToSuperBeta(KieBaseTestConfiguration kieBaseTestConfiguration) {
final String drl =
"package rules.basic.common;\n" +
"import " + MyPerson.class.getCanonicalName() + ";\n" +
"import " + MyWorker.class.getCanonicalName() + ";\n" +
"rule R1\n" +
"salience 1\n" +
"when\n" +
" $fact : MyWorker( address == null )\n" +
"then\n" +
" modify($fact) {\n" +
" setAddress(\"ROME\")\n" +
" }\n" +
"end\n" +
"rule R2\n" +
"when\n" +
" $checkAddress: String()\n" +
" $fact : MyPerson( $address: address == $checkAddress )\n" +
"then\n" +
" modify($fact) {\n" +
" setName(\"PIPPO\")\n" +
" }\n" +
"end\n";

KieBase kbase = KieBaseUtil.getKieBaseFromKieModuleFromDrl("test", kieBaseTestConfiguration, drl);
KieSession ksession = kbase.newKieSession();
MyWorker myWorker = new MyWorker();
ksession.insert(myWorker);
ksession.insert("ROME");
ksession.fireAllRules();
assertThat(myWorker.getName()).isEqualTo("PIPPO");
}
}
Loading