From 66b81a1c9c22b7320c0add2e6782ed6a02fac2f9 Mon Sep 17 00:00:00 2001 From: mariofusco Date: Tue, 11 Dec 2012 20:03:23 +0100 Subject: [PATCH] Kie API refactor --- .../drools/factmodel/traits/TraitTest.java | 38 ++-- .../integrationtests/AccumulateTest.java | 14 +- .../drools/integrationtests/CepEspTest.java | 30 +-- .../DeclarativeAgendaTest.java | 8 +- .../integrationtests/DynamicRulesTest.java | 28 +-- .../drools/integrationtests/ExtendsTest.java | 30 +-- .../integrationtests/FirstOrderLogicTest.java | 4 +- .../org/drools/integrationtests/MiscTest.java | 35 ++-- .../drools/integrationtests/MiscTest2.java | 8 +- .../integrationtests/MultithreadTest.java | 2 +- .../PseudoClockEventsTest.java | 12 +- .../integrationtests/SerializationHelper.java | 2 +- .../drools/integrationtests/StreamsTest.java | 12 +- .../TruthMaintenanceTest.java | 10 +- .../marshalling/MarshallingTest.java | 18 +- .../sequential/SequentialTest.java | 12 +- .../org/drools/lang/api/DescrBuilderTest.java | 2 +- .../org/kie/builder/WireListenerTest.java | 6 +- .../drools/base/DefaultKnowledgeHelper.java | 2 +- .../CommandBasedStatefulKnowledgeSession.java | 2 +- .../runtime/GetKnowledgeBaseCommand.java | 3 +- .../org/drools/common/ActivationIterator.java | 2 +- ...tImpl.java => ObjectDeletedEventImpl.java} | 8 +- .../org/drools/impl/KnowledgeBaseImpl.java | 2 +- .../impl/StatefulKnowledgeSessionImpl.java | 24 +-- .../drools/reteoo/ReteooStatefulSession.java | 2 +- .../event/WorkingMemoryEventSupportTest.java | 8 +- .../event/rule/AgendaEventSupportTest.java | 8 +- .../rule/WorkingMemoryEventSupportTest.java | 15 +- .../examples/manners/ReteooMannersTest.java | 14 +- .../java/org/drools/reteoo/ReteDumper.java | 3 +- .../Chapter-ApiReference/Section-Running.xml | 4 +- .../drools/examples/DroolsExamplesApp.java | 20 +- .../java/org/drools/examples/pacman/Cell.java | 41 ---- .../drools/examples/pacman/CellContents.java | 45 ----- .../org/drools/examples/pacman/CellType.java | 24 --- .../org/drools/examples/pacman/Character.java | 44 ----- .../org/drools/examples/pacman/Direction.java | 114 ----------- .../drools/examples/pacman/DirectionDiff.java | 69 ------- .../drools/examples/pacman/DirectionEnum.java | 21 -- .../org/drools/examples/pacman/Location.java | 56 ------ .../org/drools/examples/pacman/Monster.java | 23 --- .../org/drools/examples/pacman/PacMan.java | 23 --- .../drools/examples/pacman/PacmanExample.java | 183 ------------------ .../org/drools/examples/pacman/PacmanGui.java | 146 -------------- .../pacman/ScheduledLocationUpdate.java | 74 ------- .../org/drools/examples/pacman/Score.java | 31 --- .../java/org/drools/examples/pacman/Tick.java | 34 ---- .../org/drools/examples/sudoku/Sudoku.java | 4 +- .../java/org/drools/games/pong/PongMain.java | 8 +- .../persistence/SessionMarshallingHelper.java | 2 +- .../processinstance/JPAWorkItemManager.java | 4 +- .../jta/TransactionTestCommand.java | 2 +- 53 files changed, 192 insertions(+), 1144 deletions(-) rename drools-core/src/main/java/org/drools/event/rule/impl/{ObjectRetractedEventImpl.java => ObjectDeletedEventImpl.java} (84%) delete mode 100644 drools-examples/src/main/java/org/drools/examples/pacman/Cell.java delete mode 100644 drools-examples/src/main/java/org/drools/examples/pacman/CellContents.java delete mode 100644 drools-examples/src/main/java/org/drools/examples/pacman/CellType.java delete mode 100644 drools-examples/src/main/java/org/drools/examples/pacman/Character.java delete mode 100644 drools-examples/src/main/java/org/drools/examples/pacman/Direction.java delete mode 100644 drools-examples/src/main/java/org/drools/examples/pacman/DirectionDiff.java delete mode 100644 drools-examples/src/main/java/org/drools/examples/pacman/DirectionEnum.java delete mode 100644 drools-examples/src/main/java/org/drools/examples/pacman/Location.java delete mode 100644 drools-examples/src/main/java/org/drools/examples/pacman/Monster.java delete mode 100644 drools-examples/src/main/java/org/drools/examples/pacman/PacMan.java delete mode 100644 drools-examples/src/main/java/org/drools/examples/pacman/PacmanExample.java delete mode 100644 drools-examples/src/main/java/org/drools/examples/pacman/PacmanGui.java delete mode 100644 drools-examples/src/main/java/org/drools/examples/pacman/ScheduledLocationUpdate.java delete mode 100644 drools-examples/src/main/java/org/drools/examples/pacman/Score.java delete mode 100644 drools-examples/src/main/java/org/drools/examples/pacman/Tick.java diff --git a/drools-compiler/src/test/java/org/drools/factmodel/traits/TraitTest.java b/drools-compiler/src/test/java/org/drools/factmodel/traits/TraitTest.java index 577e9927688..c744ec31360 100644 --- a/drools-compiler/src/test/java/org/drools/factmodel/traits/TraitTest.java +++ b/drools-compiler/src/test/java/org/drools/factmodel/traits/TraitTest.java @@ -214,7 +214,7 @@ public void traitShed( TraitFactory.VirtualPropertyMode mode ) { String source = "org/drools/factmodel/traits/testTraitShed.drl"; StatefulKnowledgeSession ks = getSession( source ); - TraitFactory.setMode( mode, ks.getKnowledgeBase() ); + TraitFactory.setMode( mode, ks.getKieBase() ); List info = new ArrayList(); @@ -271,7 +271,7 @@ public void traitDon( TraitFactory.VirtualPropertyMode mode ) { String source = "org/drools/factmodel/traits/testTraitDon.drl"; StatefulKnowledgeSession ks = getSession( source ); - TraitFactory.setMode( mode, ks.getKnowledgeBase() ); + TraitFactory.setMode( mode, ks.getKieBase() ); List info = new ArrayList(); ks.setGlobal( "list", @@ -307,7 +307,7 @@ public void mixin( TraitFactory.VirtualPropertyMode mode ) { String source = "org/drools/factmodel/traits/testTraitMixin.drl"; StatefulKnowledgeSession ks = getSession( source ); - TraitFactory.setMode( mode, ks.getKnowledgeBase() ); + TraitFactory.setMode( mode, ks.getKieBase() ); List info = new ArrayList(); ks.setGlobal( "list", @@ -339,7 +339,7 @@ public void traitMethodsWithObjects( TraitFactory.VirtualPropertyMode mode ) { String source = "org/drools/factmodel/traits/testTraitWrapping.drl"; StatefulKnowledgeSession ks = getSession( source ); - TraitFactory.setMode( mode, ks.getKnowledgeBase() ); + TraitFactory.setMode( mode, ks.getKieBase() ); List errors = new ArrayList(); ks.setGlobal( "list", @@ -373,7 +373,7 @@ public void traitMethodsWithPrimitives( TraitFactory.VirtualPropertyMode mode ) String source = "org/drools/factmodel/traits/testTraitWrappingPrimitives.drl"; StatefulKnowledgeSession ks = getSession( source ); - TraitFactory.setMode( mode, ks.getKnowledgeBase() ); + TraitFactory.setMode( mode, ks.getKieBase() ); List errors = new ArrayList(); ks.setGlobal( "list", @@ -1125,7 +1125,7 @@ public void isA( TraitFactory.VirtualPropertyMode mode ) { String source = "org/drools/factmodel/traits/testTraitIsA.drl"; StatefulKnowledgeSession ks = getSession( source ); - TraitFactory.setMode( mode, ks.getKnowledgeBase() ); + TraitFactory.setMode( mode, ks.getKieBase() ); List info = new ArrayList(); ks.setGlobal( "list", @@ -1166,7 +1166,7 @@ public void overrideType( TraitFactory.VirtualPropertyMode mode ) { String source = "org/drools/factmodel/traits/testTraitOverride.drl"; StatefulKnowledgeSession ks = getSession( source ); - TraitFactory.setMode( mode, ks.getKnowledgeBase() ); + TraitFactory.setMode( mode, ks.getKieBase() ); List info = new ArrayList(); ks.setGlobal( "list", @@ -1202,7 +1202,7 @@ public void traitLegacy( TraitFactory.VirtualPropertyMode mode ) { String source = "org/drools/factmodel/traits/testTraitLegacyTrait.drl"; StatefulKnowledgeSession ks = getSession( source ); - TraitFactory.setMode( mode, ks.getKnowledgeBase() ); + TraitFactory.setMode( mode, ks.getKieBase() ); List info = new ArrayList(); @@ -1250,7 +1250,7 @@ public void traitCollections( TraitFactory.VirtualPropertyMode mode ) { String source = "org/drools/factmodel/traits/testTraitCollections.drl"; StatefulKnowledgeSession ks = getSession( source ); - TraitFactory.setMode( mode, ks.getKnowledgeBase() ); + TraitFactory.setMode( mode, ks.getKieBase() ); List info = new ArrayList(); @@ -1294,7 +1294,7 @@ public void traitCore( TraitFactory.VirtualPropertyMode mode ) { String source = "org/drools/factmodel/traits/testTraitLegacyCore.drl"; StatefulKnowledgeSession ks = getSession( source ); - TraitFactory.setMode( mode, ks.getKnowledgeBase() ); + TraitFactory.setMode( mode, ks.getKieBase() ); List info = new ArrayList(); ks.setGlobal( "list", @@ -1338,7 +1338,7 @@ public void traitWithEquality( TraitFactory.VirtualPropertyMode mode ) { String source = "org/drools/factmodel/traits/testTraitWithEquality.drl"; StatefulKnowledgeSession ks = getSession( source ); - TraitFactory.setMode( mode, ks.getKnowledgeBase() ); + TraitFactory.setMode( mode, ks.getKieBase() ); List info = new ArrayList(); ks.setGlobal( "list", @@ -1373,7 +1373,7 @@ public void traitDeclared( TraitFactory.VirtualPropertyMode mode ) { List untrueTraits = new ArrayList(); StatefulKnowledgeSession ks = getSession( "org/drools/factmodel/traits/testDeclaredFactTrait.drl" ); - TraitFactory.setMode( mode, ks.getKnowledgeBase() ); + TraitFactory.setMode( mode, ks.getKieBase() ); ks.setGlobal( "trueTraits", trueTraits ); @@ -1411,7 +1411,7 @@ public void traitPojo( TraitFactory.VirtualPropertyMode mode ) { List untrueTraits = new ArrayList(); StatefulKnowledgeSession session = getSession( "org/drools/factmodel/traits/testPojoFactTrait.drl" ); - TraitFactory.setMode( mode, session.getKnowledgeBase() ); + TraitFactory.setMode( mode, session.getKieBase() ); session.setGlobal( "trueTraits", trueTraits ); @@ -1446,7 +1446,7 @@ public void testPojoMap() { public void isAOperator( TraitFactory.VirtualPropertyMode mode ) { String source = "org/drools/factmodel/traits/testTraitIsA2.drl"; StatefulKnowledgeSession ksession = getSession( source ); - TraitFactory.setMode( mode, ksession.getKnowledgeBase() ); + TraitFactory.setMode( mode, ksession.getKieBase() ); AgendaEventListener ael = mock( AgendaEventListener.class ); @@ -1459,7 +1459,7 @@ public void isAOperator( TraitFactory.VirtualPropertyMode mode ) { ArgumentCaptor cap = ArgumentCaptor.forClass( AfterMatchFiredEvent.class ); verify( ael, - times( 3 ) ).afterActivationFired( cap.capture() ); + times( 3 ) ).afterMatchFired(cap.capture()); List values = cap.getAllValues(); @@ -1529,7 +1529,7 @@ protected void manyTraits( TraitFactory.VirtualPropertyMode mode ) { " list.add(\"OK\");\n" + " end"; StatefulKnowledgeSession ksession = getSessionFromString( source ); - TraitFactory.setMode( mode, ksession.getKnowledgeBase() ); + TraitFactory.setMode( mode, ksession.getKieBase() ); List list = new ArrayList(); @@ -1564,7 +1564,7 @@ public void testManyTraitsMap() { public void traitManyTimes( TraitFactory.VirtualPropertyMode mode ) { StatefulKnowledgeSession ksession = getSession( "org/drools/factmodel/traits/testTraitDonMultiple.drl" ); - TraitFactory.setMode( mode, ksession.getKnowledgeBase() ); + TraitFactory.setMode( mode, ksession.getKieBase() ); List list = new ArrayList(); @@ -1806,7 +1806,7 @@ public void aliasing( TraitFactory.VirtualPropertyMode mode ) { "end"; StatefulKnowledgeSession ksession = getSessionFromString( drl ); - TraitFactory.setMode( mode, ksession.getKnowledgeBase() ); + TraitFactory.setMode( mode, ksession.getKieBase() ); List list = new ArrayList(); ksession.setGlobal( "list", list ); @@ -1881,7 +1881,7 @@ public void traitLogicalRemoval( TraitFactory.VirtualPropertyMode mode ) { StatefulKnowledgeSession ksession = getSessionFromString(drl); - TraitFactory.setMode( mode, ksession.getKnowledgeBase() ); + TraitFactory.setMode( mode, ksession.getKieBase() ); List list = new ArrayList(); ksession.setGlobal( "list", list ); diff --git a/drools-compiler/src/test/java/org/drools/integrationtests/AccumulateTest.java b/drools-compiler/src/test/java/org/drools/integrationtests/AccumulateTest.java index 77df4f3e381..601c8fab492 100644 --- a/drools-compiler/src/test/java/org/drools/integrationtests/AccumulateTest.java +++ b/drools-compiler/src/test/java/org/drools/integrationtests/AccumulateTest.java @@ -1578,7 +1578,7 @@ public void execTestAccumulateMultipleFunctions( String fileName ) throws Except ksession.fireAllRules(); ArgumentCaptor cap = ArgumentCaptor.forClass( AfterMatchFiredEvent.class ); - Mockito.verify( ael ).afterActivationFired( cap.capture() ); + Mockito.verify( ael ).afterMatchFired(cap.capture()); Match activation = cap.getValue().getMatch(); assertThat( ((Number) activation.getDeclarationValue( "$sum" )).intValue(), @@ -1596,7 +1596,7 @@ public void execTestAccumulateMultipleFunctions( String fileName ) throws Except cheese[index] ); ksession.fireAllRules(); - Mockito.verify( ael ).afterActivationFired( cap.capture() ); + Mockito.verify( ael ).afterMatchFired(cap.capture()); activation = cap.getValue().getMatch(); assertThat( ((Number) activation.getDeclarationValue( "$sum" )).intValue(), @@ -1613,7 +1613,7 @@ public void execTestAccumulateMultipleFunctions( String fileName ) throws Except bob ); ksession.fireAllRules(); - Mockito.verify( ael ).afterActivationFired( cap.capture() ); + Mockito.verify( ael ).afterMatchFired(cap.capture()); activation = cap.getValue().getMatch(); assertThat( ((Number) activation.getDeclarationValue( "$sum" )).intValue(), @@ -1628,7 +1628,7 @@ public void execTestAccumulateMultipleFunctions( String fileName ) throws Except ksession.retract( cheeseHandles[3] ); ksession.fireAllRules(); - Mockito.verify( ael ).afterActivationFired( cap.capture() ); + Mockito.verify( ael ).afterMatchFired(cap.capture()); activation = cap.getValue().getMatch(); assertThat( ((Number) activation.getDeclarationValue( "$sum" )).intValue(), @@ -1671,7 +1671,7 @@ public void execTestAccumulateMultipleFunctionsConstraint( String fileName ) thr ksession.fireAllRules(); ArgumentCaptor cap = ArgumentCaptor.forClass( AfterMatchFiredEvent.class ); - Mockito.verify( ael ).afterActivationFired( cap.capture() ); + Mockito.verify( ael ).afterMatchFired(cap.capture()); Match activation = cap.getValue().getMatch(); assertThat( ((Number) activation.getDeclarationValue( "$sum" )).intValue(), @@ -1689,7 +1689,7 @@ public void execTestAccumulateMultipleFunctionsConstraint( String fileName ) thr cheese[index] ); ksession.fireAllRules(); - Mockito.verify( ael, Mockito.never() ).afterActivationFired( Mockito.any(AfterMatchFiredEvent.class) ); + Mockito.verify( ael, Mockito.never() ).afterMatchFired(Mockito.any(AfterMatchFiredEvent.class)); Mockito.reset( ael ); // ---------------- 3rd scenario @@ -1698,7 +1698,7 @@ public void execTestAccumulateMultipleFunctionsConstraint( String fileName ) thr bob ); ksession.fireAllRules(); - Mockito.verify( ael ).afterActivationFired( cap.capture() ); + Mockito.verify( ael ).afterMatchFired(cap.capture()); activation = cap.getValue().getMatch(); assertThat( ((Number) activation.getDeclarationValue( "$sum" )).intValue(), diff --git a/drools-compiler/src/test/java/org/drools/integrationtests/CepEspTest.java b/drools-compiler/src/test/java/org/drools/integrationtests/CepEspTest.java index 313d1c32075..5fb2296d3ac 100644 --- a/drools-compiler/src/test/java/org/drools/integrationtests/CepEspTest.java +++ b/drools-compiler/src/test/java/org/drools/integrationtests/CepEspTest.java @@ -741,13 +741,13 @@ public void testBeforeOperator() throws Exception { ksession.insert( tick8 ); ArgumentCaptor arg = ArgumentCaptor.forClass( MatchCreatedEvent.class ); - verify( ael ).activationCreated( arg.capture() ); + verify( ael ).matchCreated(arg.capture()); assertThat( arg.getValue().getMatch().getRule().getName(), is( "before" ) ); ksession.fireAllRules(); - verify( ael ).afterActivationFired( any( AfterMatchFiredEvent.class ) ); + verify( ael ).afterMatchFired(any(AfterMatchFiredEvent.class)); } @Test @@ -828,7 +828,7 @@ public void testMetByOperator() throws Exception { ksession.insert( tick8 ); ArgumentCaptor arg = ArgumentCaptor.forClass( MatchCreatedEvent.class ); - verify( ael ).activationCreated( arg.capture() ); + verify( ael ).matchCreated(arg.capture()); Match activation = arg.getValue().getMatch(); assertThat( activation.getRule().getName(), is( "metby" ) ); @@ -836,7 +836,7 @@ public void testMetByOperator() throws Exception { ksession.fireAllRules(); ArgumentCaptor aaf = ArgumentCaptor.forClass( AfterMatchFiredEvent.class ); - verify( ael ).afterActivationFired( aaf.capture() ); + verify( ael ).afterMatchFired(aaf.capture()); assertThat( (InternalFactHandle) aaf.getValue().getMatch().getFactHandles().toArray()[0], is( fh2 ) ); } @@ -1756,7 +1756,7 @@ public void testStreamModeNoSerialization() throws IOException, ArgumentCaptor aafe1 = ArgumentCaptor.forClass( AfterMatchFiredEvent.class ); verify( ael1, - times( 1 ) ).afterActivationFired( aafe1.capture() ); + times( 1 ) ).afterMatchFired(aafe1.capture()); List events1 = aafe1.getAllValues(); assertThat( events1.get( 0 ).getMatch().getDeclarationValue( "$avg" ), is( (Object) 10 ) ); @@ -1765,14 +1765,14 @@ public void testStreamModeNoSerialization() throws IOException, 20 ) ); ksession1.fireAllRules(); verify( ael1, - times( 2 ) ).afterActivationFired( aafe1.capture() ); + times( 2 ) ).afterMatchFired(aafe1.capture()); assertThat( events1.get( 1 ).getMatch().getDeclarationValue( "$avg" ), is( (Object) 15 ) ); ksession1.insert( new Sensor( 30, 30 ) ); ksession1.fireAllRules(); verify( ael1, - times( 3 ) ).afterActivationFired( aafe1.capture() ); + times( 3 ) ).afterMatchFired(aafe1.capture()); assertThat( events1.get( 2 ).getMatch().getDeclarationValue( "$avg" ), is( (Object) 25 ) ); @@ -1787,7 +1787,7 @@ public void testStreamModeNoSerialization() throws IOException, 10 ) ); ksession2.fireAllRules(); verify( ael2, - times( 1 ) ).afterActivationFired( aafe2.capture() ); + times( 1 ) ).afterMatchFired(aafe2.capture()); List events2 = aafe2.getAllValues(); assertThat( events2.get( 0 ).getMatch().getDeclarationValue( "$avg" ), is( (Object) 10 ) ); @@ -1796,7 +1796,7 @@ public void testStreamModeNoSerialization() throws IOException, 20 ) ); ksession2.fireAllRules(); verify( ael2, - times( 2 ) ).afterActivationFired( aafe2.capture() ); + times( 2 ) ).afterMatchFired(aafe2.capture()); assertThat( events2.get( 1 ).getMatch().getDeclarationValue( "$avg" ), is( (Object) 15 ) ); @@ -1804,7 +1804,7 @@ public void testStreamModeNoSerialization() throws IOException, 30 ) ); ksession2.fireAllRules(); verify( ael2, - times( 3 ) ).afterActivationFired( aafe2.capture() ); + times( 3 ) ).afterMatchFired(aafe2.capture()); assertThat( events2.get( 2 ).getMatch().getDeclarationValue( "$avg" ), is( (Object) 25 ) ); ksession2.dispose(); @@ -1853,7 +1853,7 @@ public void testIdentityAssertBehaviorOnEntryPoints() throws IOException, ksession.fireAllRules(); // must have fired 3 times, one for each event identity verify( ael1, - times( 3 ) ).afterActivationFired( any( AfterMatchFiredEvent.class ) ); + times( 3 ) ).afterMatchFired(any(AfterMatchFiredEvent.class)); ksession.dispose(); } @@ -1899,7 +1899,7 @@ public void testEqualityAssertBehaviorOnEntryPoints() throws IOException, ksession1.fireAllRules(); // must have fired 2 times, one for each event equality verify( ael1, - times( 2 ) ).afterActivationFired( any( AfterMatchFiredEvent.class ) ); + times( 2 ) ).afterMatchFired(any(AfterMatchFiredEvent.class)); ksession1.dispose(); } @@ -2082,7 +2082,7 @@ public void testMultipleSlidingWindows() throws IOException, ArgumentCaptor captor = ArgumentCaptor.forClass( AfterMatchFiredEvent.class ); verify( ael, - times( 7 ) ).afterActivationFired( captor.capture() ); + times( 7 ) ).afterMatchFired(captor.capture()); List values = captor.getAllValues(); // first rule @@ -2282,7 +2282,7 @@ public void testSalienceWithEventsPseudoClock() throws IOException, ArgumentCaptor captor = ArgumentCaptor.forClass( AfterMatchFiredEvent.class ); verify( ael, - times( 4 ) ).afterActivationFired( captor.capture() ); + times( 4 ) ).afterMatchFired(captor.capture()); List aafe = captor.getAllValues(); Assert.assertThat( aafe.get( 0 ).getMatch().getRule().getName(), @@ -2357,7 +2357,7 @@ public void testSalienceWithEventsRealtimeClock() throws IOException, ArgumentCaptor captor = ArgumentCaptor.forClass( AfterMatchFiredEvent.class ); verify( ael, - times( 4 ) ).afterActivationFired( captor.capture() ); + times( 4 ) ).afterMatchFired(captor.capture()); List aafe = captor.getAllValues(); Assert.assertThat( aafe.get( 0 ).getMatch().getRule().getName(), diff --git a/drools-compiler/src/test/java/org/drools/integrationtests/DeclarativeAgendaTest.java b/drools-compiler/src/test/java/org/drools/integrationtests/DeclarativeAgendaTest.java index 756782dc5de..682de42cad9 100644 --- a/drools-compiler/src/test/java/org/drools/integrationtests/DeclarativeAgendaTest.java +++ b/drools-compiler/src/test/java/org/drools/integrationtests/DeclarativeAgendaTest.java @@ -642,7 +642,7 @@ public void testCancelActivation() { ksession.addEventListener( new AgendaEventListener() { - public void beforeActivationFired(BeforeMatchFiredEvent event) { + public void beforeMatchFired(BeforeMatchFiredEvent event) { } public void agendaGroupPushed(AgendaGroupPushedEvent event) { @@ -651,10 +651,10 @@ public void agendaGroupPushed(AgendaGroupPushedEvent event) { public void agendaGroupPopped(AgendaGroupPoppedEvent event) { } - public void afterActivationFired(AfterMatchFiredEvent event) { + public void afterMatchFired(AfterMatchFiredEvent event) { } - public void activationCreated(MatchCreatedEvent event) { + public void matchCreated(MatchCreatedEvent event) { } public void beforeRuleFlowGroupActivated(RuleFlowGroupActivatedEvent event) { @@ -669,7 +669,7 @@ public void beforeRuleFlowGroupDeactivated(RuleFlowGroupDeactivatedEvent event) public void afterRuleFlowGroupDeactivated(RuleFlowGroupDeactivatedEvent event) { } - public void activationCancelled(MatchCancelledEvent event) { + public void matchCancelled(MatchCancelledEvent event) { cancelled.add( event ); } } ); diff --git a/drools-compiler/src/test/java/org/drools/integrationtests/DynamicRulesTest.java b/drools-compiler/src/test/java/org/drools/integrationtests/DynamicRulesTest.java index a67c1cf7882..8f03739f689 100644 --- a/drools-compiler/src/test/java/org/drools/integrationtests/DynamicRulesTest.java +++ b/drools-compiler/src/test/java/org/drools/integrationtests/DynamicRulesTest.java @@ -199,27 +199,27 @@ public void testDynamicRuleRemovals() throws Exception { 5 ); workingMemory.insert( cheddar ); - verify( ael, times( 15 ) ).activationCreated( any( MatchCreatedEvent.class ) ); - verify( ael, never() ).activationCancelled( any( MatchCancelledEvent.class ) ); + verify( ael, times( 15 ) ).matchCreated(any(MatchCreatedEvent.class)); + verify( ael, never() ).matchCancelled(any(MatchCancelledEvent.class)); kbase.removeRule( "org.drools.test", "Who likes Stilton" ); - verify( ael, times( 3 ) ).activationCancelled( any( MatchCancelledEvent.class ) ); + verify( ael, times( 3 ) ).matchCancelled(any(MatchCancelledEvent.class)); kbase.removeRule( "org.drools.test", "like cheese" ); - verify( ael, times( 7 ) ).activationCancelled( any( MatchCancelledEvent.class ) ); + verify( ael, times( 7 ) ).matchCancelled(any(MatchCancelledEvent.class)); final Cheese muzzarela = new Cheese( "muzzarela", 5 ); workingMemory.insert( muzzarela ); - verify( ael, times( 16 ) ).activationCreated( any( MatchCreatedEvent.class ) ); + verify( ael, times( 16 ) ).matchCreated(any(MatchCreatedEvent.class)); kbase.removeKnowledgePackage( "org.drools.test" ); - verify( ael, times( 16 ) ).activationCancelled( any( MatchCancelledEvent.class ) ); + verify( ael, times( 16 ) ).matchCancelled(any(MatchCancelledEvent.class)); kbase = SerializationHelper.serializeObject( kbase ); } @@ -334,7 +334,7 @@ public void testRemovePackage() throws Exception { "genericvalue" ) ); session.fireAllRules(); - KnowledgeBase ruleBaseWM = session.getKnowledgeBase(); + KnowledgeBase ruleBaseWM = session.getKieBase(); ruleBaseWM.removeKnowledgePackage( packageName ); kpkgs = SerializationHelper.serializeObject( loadKnowledgePackages( "test_RemovePackage.drl" ) ); @@ -834,7 +834,7 @@ public void testRemovePackageSubNetwork() throws Exception { ((List) results.get( 0 )).size() ); results.clear(); - KnowledgeBase ruleBaseWM = workingMemory.getKnowledgeBase(); + KnowledgeBase ruleBaseWM = workingMemory.getKieBase(); ruleBaseWM.removeKnowledgePackage( packageName ); Collection kpkgs = loadKnowledgePackages( "test_DynamicRulesWithSubnetwork.drl" ); @@ -1053,17 +1053,17 @@ public void testDynamicRuleRemovalsSubNetworkAndNot() throws Exception { // pattern does not match, so do not activate ksession.insert( new Person( "toni" ) ); verify( alistener, - never() ).activationCreated( any( org.kie.event.rule.MatchCreatedEvent.class ) ); + never() ).matchCreated(any(org.kie.event.rule.MatchCreatedEvent.class)); // pattern matches, so create activation ksession.insert( new Person( "bob" ) ); verify( alistener, - times( 1 ) ).activationCreated( any( org.kie.event.rule.MatchCreatedEvent.class ) ); + times( 1 ) ).matchCreated(any(org.kie.event.rule.MatchCreatedEvent.class)); // already active, so no new activation should be created ksession.insert( new Person( "mark" ) ); verify( alistener, - times( 1 ) ).activationCreated( any( org.kie.event.rule.MatchCreatedEvent.class ) ); + times( 1 ) ).matchCreated(any(org.kie.event.rule.MatchCreatedEvent.class)); kbase.removeKnowledgePackage( "org.drools" ); @@ -1080,7 +1080,7 @@ public void testDynamicRuleRemovalsSubNetworkAndNot() throws Exception { // rule should be reactivated, since data is still in the session verify( alistener, - times( 2 ) ).activationCreated( any( org.kie.event.rule.MatchCreatedEvent.class ) ); + times( 2 ) ).matchCreated(any(org.kie.event.rule.MatchCreatedEvent.class)); } @@ -1142,7 +1142,7 @@ public void testJBRULES_2206() { addDrlToKBase( kbase, "test_JBRULES_2206_1.drl" ); // two matching rules were added, so 2 activations should have been created - verify( ael, times( 2 ) ).activationCreated( any( MatchCreatedEvent.class ) ); + verify( ael, times( 2 ) ).matchCreated(any(MatchCreatedEvent.class)); int fireCount = session.fireAllRules(); // both should have fired assertEquals( 2, fireCount ); @@ -1150,7 +1150,7 @@ public void testJBRULES_2206() { addDrlToKBase( kbase, "test_JBRULES_2206_2.drl" ); // one rule was overridden and should activate - verify( ael, times( 3 ) ).activationCreated( any( MatchCreatedEvent.class ) ); + verify( ael, times( 3 ) ).matchCreated(any(MatchCreatedEvent.class)); fireCount = session.fireAllRules(); // that rule should fire again assertEquals( 1, fireCount ); diff --git a/drools-compiler/src/test/java/org/drools/integrationtests/ExtendsTest.java b/drools-compiler/src/test/java/org/drools/integrationtests/ExtendsTest.java index 89e077a0c5b..ec9019be10f 100644 --- a/drools-compiler/src/test/java/org/drools/integrationtests/ExtendsTest.java +++ b/drools-compiler/src/test/java/org/drools/integrationtests/ExtendsTest.java @@ -79,8 +79,8 @@ public void testExtends() throws Exception { //Test Base Fact Type StatefulKnowledgeSession ksession = genSession("test_Extends.drl"); - FactType person = ksession.getKnowledgeBase().getFactType("defaultpkg","Person"); - FactType eqPair = ksession.getKnowledgeBase().getFactType("defaultpkg","EqualityPair"); + FactType person = ksession.getKieBase().getFactType("defaultpkg","Person"); + FactType eqPair = ksession.getKieBase().getFactType("defaultpkg","EqualityPair"); Object p = person.newInstance(); assertNotNull(p); @@ -100,7 +100,7 @@ public void testExtends() throws Exception { public void testGeneratedMethods() throws Exception { StatefulKnowledgeSession ksession = genSession("test_Extends.drl"); - FactType student = ksession.getKnowledgeBase().getFactType("defaultpkg","Student"); + FactType student = ksession.getKieBase().getFactType("defaultpkg","Student"); Constructor constructor = student.getFactClass().getConstructor(String.class,int.class,String.class); assertNotNull(constructor); @@ -146,7 +146,7 @@ public void testGeneratedMethods() throws Exception { @Test public void testDeepExt() throws Exception { StatefulKnowledgeSession ksession = genSession("test_Extends.drl"); - FactType LTstudent = ksession.getKnowledgeBase().getFactType("defaultpkg","LongTermStudent"); + FactType LTstudent = ksession.getKieBase().getFactType("defaultpkg","LongTermStudent"); Constructor constructor = LTstudent.getFactClass().getConstructor(String.class,int.class,String.class,String.class,int.class); assertNotNull(constructor); @@ -172,7 +172,7 @@ public void testIllegalExtendsLegacy() throws Exception { public void testExtendsLegacy() throws Exception { StatefulKnowledgeSession ksession = genSession("test_ExtLegacy.drl",0); - FactType leg = ksession.getKnowledgeBase().getFactType("org.drools","BetterLegacy"); + FactType leg = ksession.getKieBase().getFactType("org.drools","BetterLegacy"); assertNotNull(leg); Object b = leg.newInstance(); @@ -195,15 +195,15 @@ public void testExtendsLegacy() throws Exception { public void testExtendsAcrossFiles() throws Exception { StatefulKnowledgeSession ksession = genSession(new String[] {"test_Ext1.drl","test_Ext2.drl","test_Ext3.drl","test_Ext4.drl"} ,0); - FactType person = ksession.getKnowledgeBase().getFactType("org.drools.compiler.test","Person"); + FactType person = ksession.getKieBase().getFactType("org.drools.compiler.test","Person"); assertNotNull(person); - FactType student = ksession.getKnowledgeBase().getFactType("org.drools.compiler.test","Student"); + FactType student = ksession.getKieBase().getFactType("org.drools.compiler.test","Student"); assertNotNull(student); - FactType worker = ksession.getKnowledgeBase().getFactType("org.drools.compiler.anothertest","Worker"); + FactType worker = ksession.getKieBase().getFactType("org.drools.compiler.anothertest","Worker"); assertNotNull(worker); - FactType ltss = ksession.getKnowledgeBase().getFactType("defaultpkg","SubLTStudent"); + FactType ltss = ksession.getKieBase().getFactType("defaultpkg","SubLTStudent"); assertNotNull(ltss); Constructor ctor = worker.getFactClass().getConstructor(String.class,int.class,String.class, double.class, int.class); @@ -222,7 +222,7 @@ public void testExtendsAcrossFiles() throws Exception { public void testFieldInit() throws Exception { StatefulKnowledgeSession ksession = genSession("test_ExtFieldInit.drl"); - FactType test = ksession.getKnowledgeBase().getFactType("org.drools.compiler", "MyBean3"); + FactType test = ksession.getKieBase().getFactType("org.drools.compiler", "MyBean3"); Object x = test.newInstance(); assertNotNull(x); @@ -251,7 +251,7 @@ public void testFieldInit() throws Exception { public void testBoxedFieldInit() throws Exception { StatefulKnowledgeSession ksession = genSession("test_ExtFieldInit.drl"); - FactType test = ksession.getKnowledgeBase().getFactType("org.drools.compiler","MyBoxBean"); + FactType test = ksession.getKieBase().getFactType("org.drools.compiler","MyBoxBean"); Object x = test.newInstance(); assertNotNull(x); @@ -275,7 +275,7 @@ public void testBoxedFieldInit() throws Exception { public void testExpressionFieldInit() throws Exception { StatefulKnowledgeSession ksession = genSession("test_ExtFieldInit.drl"); - FactType test = ksession.getKnowledgeBase().getFactType("org.drools.compiler","MyBoxExpressionBean"); + FactType test = ksession.getKieBase().getFactType("org.drools.compiler","MyBoxExpressionBean"); Object x = test.newInstance(); assertNotNull(x); @@ -296,7 +296,7 @@ public void testExpressionFieldInit() throws Exception { - FactType test2 = ksession.getKnowledgeBase().getFactType("org.drools.compiler","MySimpleExpressionBean"); + FactType test2 = ksession.getKieBase().getFactType("org.drools.compiler","MySimpleExpressionBean"); x = test2.newInstance(); assertNotNull(x); @@ -396,8 +396,8 @@ public void testRedefineDefaults() throws Exception { //Test Base Fact Type StatefulKnowledgeSession ksession = genSession("test_Extends.drl"); - FactType person = ksession.getKnowledgeBase().getFactType("defaultpkg","Person"); - FactType student = ksession.getKnowledgeBase().getFactType("defaultpkg","Student"); + FactType person = ksession.getKieBase().getFactType("defaultpkg","Person"); + FactType student = ksession.getKieBase().getFactType("defaultpkg","Student"); Object p = person.newInstance(); Object s = student.newInstance(); diff --git a/drools-compiler/src/test/java/org/drools/integrationtests/FirstOrderLogicTest.java b/drools-compiler/src/test/java/org/drools/integrationtests/FirstOrderLogicTest.java index 41c08703ea7..c91f2c34d0b 100644 --- a/drools-compiler/src/test/java/org/drools/integrationtests/FirstOrderLogicTest.java +++ b/drools-compiler/src/test/java/org/drools/integrationtests/FirstOrderLogicTest.java @@ -1029,7 +1029,7 @@ public void testOrWithVariableResolution() throws Exception { ksession.fireAllRules(); verify( al, - times( 6 ) ).afterActivationFired( any( AfterMatchFiredEvent.class ) ); + times( 6 ) ).afterMatchFired(any(AfterMatchFiredEvent.class)); } // JBRULES-2526 @@ -1057,7 +1057,7 @@ public void testOrWithVariableResolution2() throws Exception { ksession.fireAllRules(); verify( al, - times( 8 ) ).afterActivationFired( any( AfterMatchFiredEvent.class ) ); + times( 8 ) ).afterMatchFired(any(AfterMatchFiredEvent.class)); } @Test diff --git a/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java b/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java index a276ce6789f..1a29cea4a0b 100644 --- a/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java +++ b/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java @@ -144,6 +144,7 @@ import org.kie.definition.KnowledgePackage; import org.kie.definition.rule.Rule; import org.kie.definition.type.FactType; +import org.kie.event.rule.ObjectDeletedEvent; import org.kie.io.ResourceFactory; import org.kie.io.ResourceType; import org.kie.marshalling.ObjectMarshallingStrategy; @@ -3110,8 +3111,8 @@ public void testEventModel() throws Exception { ouc.getValue().getFactHandle() ); wm.retract( stiltonHandle ); - ArgumentCaptor orc = ArgumentCaptor.forClass( org.kie.event.rule.ObjectRetractedEvent.class ); - verify( wmel ).objectRetracted( orc.capture() ); + ArgumentCaptor orc = ArgumentCaptor.forClass( ObjectDeletedEvent.class ); + verify( wmel ).objectDeleted(orc.capture()); assertSame( stiltonHandle, orc.getValue().getFactHandle() ); @@ -3821,7 +3822,7 @@ public void testMapNullConstraint() throws Exception { ArgumentCaptor arg = ArgumentCaptor.forClass( org.kie.event.rule.AfterMatchFiredEvent.class ); verify( ael, - times( 4 ) ).afterActivationFired( arg.capture() ); + times( 4 ) ).afterMatchFired(arg.capture()); org.kie.event.rule.AfterMatchFiredEvent aaf = arg.getAllValues().get( 0 ); assertThat( aaf.getMatch().getRule().getName(), is( "1. home != null" ) ); @@ -6595,10 +6596,10 @@ public void testMVELConsequenceWithoutSemiColon1() throws Exception { fired ); // capture the arguments and check that the retracts happened - ArgumentCaptor retracts = ArgumentCaptor.forClass( org.kie.event.rule.ObjectRetractedEvent.class ); + ArgumentCaptor retracts = ArgumentCaptor.forClass( ObjectDeletedEvent.class ); verify( wml, - times( 2 ) ).objectRetracted( retracts.capture() ); - List values = retracts.getAllValues(); + times( 2 ) ).objectDeleted(retracts.capture()); + List values = retracts.getAllValues(); assertThat( values.get( 0 ).getFactHandle(), is( personFH ) ); assertThat( values.get( 1 ).getFactHandle(), @@ -6702,7 +6703,7 @@ public void testRuleChainingWithLogicalInserts() throws Exception { // capture the arguments and check that the rules fired in the proper sequence ArgumentCaptor actvs = ArgumentCaptor.forClass( org.kie.event.rule.AfterMatchFiredEvent.class ); verify( ael, - times( 3 ) ).afterActivationFired( actvs.capture() ); + times( 3 ) ).afterMatchFired(actvs.capture()); List values = actvs.getAllValues(); assertThat( values.get( 0 ).getMatch().getRule().getName(), is( "init" ) ); @@ -6712,11 +6713,11 @@ public void testRuleChainingWithLogicalInserts() throws Exception { is( "r2" ) ); verify( ael, - never() ).activationCancelled( any( org.kie.event.rule.MatchCancelledEvent.class ) ); + never() ).matchCancelled(any(org.kie.event.rule.MatchCancelledEvent.class)); verify( wml, times( 2 ) ).objectInserted( any( org.kie.event.rule.ObjectInsertedEvent.class ) ); verify( wml, - never() ).objectRetracted( any( org.kie.event.rule.ObjectRetractedEvent.class ) ); + never() ).objectDeleted(any(ObjectDeletedEvent.class)); } @Test @@ -7337,7 +7338,7 @@ public void testAgendaFilter1() { rules ); ArgumentCaptor arg = ArgumentCaptor.forClass( org.kie.event.rule.AfterMatchFiredEvent.class ); - verify( ael ).afterActivationFired( arg.capture() ); + verify( ael ).afterMatchFired(arg.capture()); assertThat( arg.getValue().getMatch().getRule().getName(), is( "Bbb" ) ); } @@ -7361,7 +7362,7 @@ public void testAgendaFilter2() { rules ); ArgumentCaptor arg = ArgumentCaptor.forClass( org.kie.event.rule.AfterMatchFiredEvent.class ); - verify( ael ).afterActivationFired( arg.capture() ); + verify( ael ).afterMatchFired(arg.capture()); assertThat( arg.getValue().getMatch().getRule().getName(), is( "Aaa" ) ); } @@ -7385,7 +7386,7 @@ public void testAgendaFilter3() { rules ); ArgumentCaptor arg = ArgumentCaptor.forClass( org.kie.event.rule.AfterMatchFiredEvent.class ); - verify( ael ).afterActivationFired( arg.capture() ); + verify( ael ).afterMatchFired(arg.capture()); assertThat( arg.getValue().getMatch().getRule().getName(), is( "Bbb" ) ); } @@ -7409,7 +7410,7 @@ public void testAgendaFilter4() { rules ); ArgumentCaptor arg = ArgumentCaptor.forClass( org.kie.event.rule.AfterMatchFiredEvent.class ); - verify( ael ).afterActivationFired( arg.capture() ); + verify( ael ).afterMatchFired(arg.capture()); assertThat( arg.getValue().getMatch().getRule().getName(), is( "Aaa" ) ); } @@ -7758,7 +7759,7 @@ public void testJBRULES3111() { ArgumentCaptor captor = ArgumentCaptor.forClass( org.kie.event.rule.AfterMatchFiredEvent.class ); verify( ael, - times( 2 ) ).afterActivationFired( captor.capture() ); + times( 2 ) ).afterMatchFired(captor.capture()); List aafe = captor.getAllValues(); Assert.assertThat( aafe.get( 0 ).getMatch().getRule().getName(), @@ -8127,7 +8128,7 @@ public void testNestedAccessors2() throws Exception { ksession.fireAllRules(); ArgumentCaptor captor = ArgumentCaptor.forClass( org.kie.event.rule.AfterMatchFiredEvent.class ); - verify( ael, times( 2 ) ).afterActivationFired( captor.capture() ); + verify( ael, times( 2 ) ).afterMatchFired(captor.capture()); List values = captor.getAllValues(); assertThat( (Cheesery) values.get( 0 ).getMatch().getObjects().get( 0 ), is( c1 ) ); @@ -10043,9 +10044,9 @@ public void noDormantCheckOnModifies() throws Exception { ksession.fireAllRules(); // both rules should fire exactly once - verify( ael, times( 2 ) ).afterActivationFired( any( org.kie.event.rule.AfterMatchFiredEvent.class ) ); + verify( ael, times( 2 ) ).afterMatchFired(any(org.kie.event.rule.AfterMatchFiredEvent.class)); // no cancellations should have happened - verify( ael, never() ).activationCancelled( any( org.kie.event.rule.MatchCancelledEvent.class ) ); + verify( ael, never() ).matchCancelled(any(org.kie.event.rule.MatchCancelledEvent.class)); } @Test diff --git a/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest2.java b/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest2.java index 2418be73a2a..85fbdad969c 100644 --- a/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest2.java +++ b/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest2.java @@ -274,16 +274,16 @@ public void testReuseAgendaAfterException() throws Exception { ksession.setGlobal( "results", res ); AgendaEventListener agendaEventListener = new AgendaEventListener() { - public void activationCreated(org.kie.event.rule.MatchCreatedEvent event) { + public void matchCreated(org.kie.event.rule.MatchCreatedEvent event) { } - public void activationCancelled(org.kie.event.rule.MatchCancelledEvent event) { + public void matchCancelled(org.kie.event.rule.MatchCancelledEvent event) { } - public void beforeActivationFired(org.kie.event.rule.BeforeMatchFiredEvent event) { + public void beforeMatchFired(org.kie.event.rule.BeforeMatchFiredEvent event) { } - public void afterActivationFired(org.kie.event.rule.AfterMatchFiredEvent event) { + public void afterMatchFired(org.kie.event.rule.AfterMatchFiredEvent event) { } public void agendaGroupPopped(org.kie.event.rule.AgendaGroupPoppedEvent event) { diff --git a/drools-compiler/src/test/java/org/drools/integrationtests/MultithreadTest.java b/drools-compiler/src/test/java/org/drools/integrationtests/MultithreadTest.java index b4709508699..aa8d6133cc8 100644 --- a/drools-compiler/src/test/java/org/drools/integrationtests/MultithreadTest.java +++ b/drools-compiler/src/test/java/org/drools/integrationtests/MultithreadTest.java @@ -582,7 +582,7 @@ public Boolean call() throws Exception { // session.fireAllRules(); // // // facts are being expired -// verify( wmel, atLeastOnce() ).objectRetracted( any( ObjectRetractedEvent.class ) ); +// verify( wmel, atLeastOnce() ).objectDeleted( any( ObjectDeletedEvent.class ) ); // } diff --git a/drools-compiler/src/test/java/org/drools/integrationtests/PseudoClockEventsTest.java b/drools-compiler/src/test/java/org/drools/integrationtests/PseudoClockEventsTest.java index 59bfeaa5ff1..af04814b408 100644 --- a/drools-compiler/src/test/java/org/drools/integrationtests/PseudoClockEventsTest.java +++ b/drools-compiler/src/test/java/org/drools/integrationtests/PseudoClockEventsTest.java @@ -85,8 +85,8 @@ public void testEvenFirePseudoClockRuleA() throws Exception { evalFirePseudoClockDeclaration + evalFirePseudoClockRuleA); verify(ael, - times(evalFirePseudoClockStockCount * (evalFirePseudoClockStockCount - 1) / 2)).afterActivationFired( - any(AfterMatchFiredEvent.class)); + times(evalFirePseudoClockStockCount * (evalFirePseudoClockStockCount - 1) / 2)).afterMatchFired( + any(AfterMatchFiredEvent.class)); } @Test(timeout = 6000) @@ -98,8 +98,8 @@ public void testEvenFirePseudoClockRuleB() throws Exception { evalFirePseudoClockDeclaration + evalFirePseudoClockRuleB); verify(ael, - times(evalFirePseudoClockStockCount - 1)).afterActivationFired( - any(AfterMatchFiredEvent.class)); + times(evalFirePseudoClockStockCount - 1)).afterMatchFired( + any(AfterMatchFiredEvent.class)); } @Test//(timeout = 60000) @@ -113,8 +113,8 @@ public void testEvenFirePseudoClockRulesAB() throws Exception { final int expectedActivationCount = evalFirePseudoClockStockCount * (evalFirePseudoClockStockCount - 1) / 2 + evalFirePseudoClockStockCount - 1; verify(ael, - times(expectedActivationCount)).afterActivationFired( - any(AfterMatchFiredEvent.class)); + times(expectedActivationCount)).afterMatchFired( + any(AfterMatchFiredEvent.class)); } private int processStocks(int stockCount, AgendaEventListener agendaEventListener, String drlContentString) diff --git a/drools-compiler/src/test/java/org/drools/integrationtests/SerializationHelper.java b/drools-compiler/src/test/java/org/drools/integrationtests/SerializationHelper.java index b554f71fa57..6028dae730f 100644 --- a/drools-compiler/src/test/java/org/drools/integrationtests/SerializationHelper.java +++ b/drools-compiler/src/test/java/org/drools/integrationtests/SerializationHelper.java @@ -133,7 +133,7 @@ public static StatefulKnowledgeSession getSerialisedStatefulKnowledgeSession(Sta boolean dispose, boolean testRoundTrip ) throws Exception { - ProtobufMarshaller marshaller = (ProtobufMarshaller) MarshallerFactory.newMarshaller( ksession.getKnowledgeBase(), + ProtobufMarshaller marshaller = (ProtobufMarshaller) MarshallerFactory.newMarshaller( ksession.getKieBase(), (ObjectMarshallingStrategy[])ksession.getEnvironment().get(EnvironmentName.OBJECT_MARSHALLING_STRATEGIES) ); long time = ksession.getSessionClock().getCurrentTime(); // make sure globas are in the environment of the session diff --git a/drools-compiler/src/test/java/org/drools/integrationtests/StreamsTest.java b/drools-compiler/src/test/java/org/drools/integrationtests/StreamsTest.java index d44df5e1287..87614b32e0e 100644 --- a/drools-compiler/src/test/java/org/drools/integrationtests/StreamsTest.java +++ b/drools-compiler/src/test/java/org/drools/integrationtests/StreamsTest.java @@ -367,7 +367,7 @@ public void testModifyOnEntryPointFacts() throws Exception { ArgumentCaptor captor = ArgumentCaptor.forClass(org.kie.event.rule.AfterMatchFiredEvent.class); verify(ael, - times(3)).afterActivationFired(captor.capture()); + times(3)).afterMatchFired(captor.capture()); List aafe = captor.getAllValues(); Assert.assertThat(aafe.get(0).getMatch().getRule().getName(), @@ -408,7 +408,7 @@ public void testEntryPointWithAccumulateAndMVEL() throws Exception { ArgumentCaptor captor = ArgumentCaptor.forClass(org.kie.event.rule.AfterMatchFiredEvent.class); verify(ael, - times(1)).afterActivationFired(captor.capture()); + times(1)).afterMatchFired(captor.capture()); List aafe = captor.getAllValues(); Assert.assertThat(aafe.get(0).getMatch().getRule().getName(), @@ -516,7 +516,7 @@ public void testEventExpirationSetToZero() throws Exception { verify(wml, times(2)).objectInserted(any(org.kie.event.rule.ObjectInsertedEvent.class)); verify(ael, - times(2)).activationCreated(any(MatchCreatedEvent.class)); + times(2)).matchCreated(any(MatchCreatedEvent.class)); assertThat(ksession.getObjects().size(), equalTo(2)); assertThat(ksession.getObjects(), @@ -641,7 +641,7 @@ public void testWindowDeclaration() throws Exception { ArgumentCaptor captor = ArgumentCaptor.forClass(org.kie.event.rule.AfterMatchFiredEvent.class); verify(ael, - times(1)).afterActivationFired(captor.capture()); + times(1)).afterMatchFired(captor.capture()); AfterMatchFiredEvent aafe = captor.getValue(); Assert.assertThat(((Number) aafe.getMatch().getDeclarationValue("$sum")).intValue(), @@ -687,7 +687,7 @@ public void testWindowDeclaration2() throws Exception { ArgumentCaptor captor = ArgumentCaptor.forClass(org.kie.event.rule.AfterMatchFiredEvent.class); verify(ael, - times(1)).afterActivationFired(captor.capture()); + times(1)).afterMatchFired(captor.capture()); AfterMatchFiredEvent aafe = captor.getValue(); Assert.assertThat(((Number) aafe.getMatch().getDeclarationValue("$sum")).intValue(), @@ -724,7 +724,7 @@ public void testMultipleWindows() throws Exception { ArgumentCaptor captor = ArgumentCaptor.forClass(org.kie.event.rule.AfterMatchFiredEvent.class); verify(ael, - times(1)).afterActivationFired(captor.capture()); + times(1)).afterMatchFired(captor.capture()); AfterMatchFiredEvent aafe = captor.getValue(); Assert.assertThat( (StockTick) aafe.getMatch().getDeclarationValue("f1"), diff --git a/drools-compiler/src/test/java/org/drools/integrationtests/TruthMaintenanceTest.java b/drools-compiler/src/test/java/org/drools/integrationtests/TruthMaintenanceTest.java index 761b62dd71d..6e76d90147e 100644 --- a/drools-compiler/src/test/java/org/drools/integrationtests/TruthMaintenanceTest.java +++ b/drools-compiler/src/test/java/org/drools/integrationtests/TruthMaintenanceTest.java @@ -44,8 +44,8 @@ import org.kie.builder.KnowledgeBuilder; import org.kie.builder.KnowledgeBuilderFactory; import org.kie.definition.KnowledgePackage; +import org.kie.event.rule.ObjectDeletedEvent; import org.kie.event.rule.ObjectInsertedEvent; -import org.kie.event.rule.ObjectRetractedEvent; import org.kie.event.rule.WorkingMemoryEventListener; import org.kie.io.ResourceFactory; import org.kie.io.ResourceType; @@ -122,7 +122,7 @@ public void testLogicalInsertionsDynamicRule() throws Exception { ksession = getSerialisedStatefulKnowledgeSession( ksession, true ); - kbase = ksession.getKnowledgeBase(); + kbase = ksession.getKieBase(); // check all now have just one logical assertion each list = new ArrayList( ksession.getObjects( new ClassObjectFilter( Person.class ) ) ); @@ -1037,9 +1037,9 @@ public void testLogicalInsertOrder() throws Exception { assertThat( inserts.get( 1 ).getObject(), is( (Object) mark) ); assertThat( inserts.get( 2 ).getObject(), is( (Object) "rule 2" ) ); - ArgumentCaptor retractsCaptor = ArgumentCaptor.forClass( ObjectRetractedEvent.class ); - verify( wmel, times(1) ).objectRetracted( retractsCaptor.capture() ); - List retracts = retractsCaptor.getAllValues(); + ArgumentCaptor retractsCaptor = ArgumentCaptor.forClass( ObjectDeletedEvent.class ); + verify( wmel, times(1) ).objectDeleted(retractsCaptor.capture()); + List retracts = retractsCaptor.getAllValues(); assertThat( retracts.get( 0 ).getOldObject(), is( (Object) "rule 2" ) ); } diff --git a/drools-compiler/src/test/java/org/drools/integrationtests/marshalling/MarshallingTest.java b/drools-compiler/src/test/java/org/drools/integrationtests/marshalling/MarshallingTest.java index 165b998c728..8a143668c1e 100644 --- a/drools-compiler/src/test/java/org/drools/integrationtests/marshalling/MarshallingTest.java +++ b/drools-compiler/src/test/java/org/drools/integrationtests/marshalling/MarshallingTest.java @@ -555,7 +555,7 @@ public void testSerializeAdd2() throws Exception { // serialize session and rulebase out ByteArrayOutputStream baos = new ByteArrayOutputStream(); StatefulKnowledgeSessionImpl ksession = new StatefulKnowledgeSessionImpl( (ReteooStatefulSession) session ); - Marshaller marshaller = MarshallerFactory.newMarshaller( ksession.getKnowledgeBase() ); + Marshaller marshaller = MarshallerFactory.newMarshaller( ksession.getKieBase() ); marshaller.marshall( baos, ksession ); baos.close(); @@ -647,7 +647,7 @@ public void testSerializeAdd_newRuleNotFiredForNewData() throws Exception { // serialize session and rulebase out ByteArrayOutputStream baos = new ByteArrayOutputStream(); StatefulKnowledgeSessionImpl ksession = new StatefulKnowledgeSessionImpl( (ReteooStatefulSession) session ); - Marshaller marshaller = MarshallerFactory.newMarshaller( ksession.getKnowledgeBase() ); + Marshaller marshaller = MarshallerFactory.newMarshaller( ksession.getKieBase() ); marshaller.marshall( baos, ksession ); baos.close(); @@ -734,7 +734,7 @@ public void testSerializeAdd3() throws Exception { ByteArrayOutputStream baos = new ByteArrayOutputStream(); StatefulKnowledgeSessionImpl ksession = new StatefulKnowledgeSessionImpl( (ReteooStatefulSession) session ); - Marshaller marshaller = MarshallerFactory.newMarshaller( ksession.getKnowledgeBase() ); + Marshaller marshaller = MarshallerFactory.newMarshaller( ksession.getKieBase() ); marshaller.marshall( baos, ksession ); baos.close(); @@ -787,7 +787,7 @@ public void testSerializeAdd3() throws Exception { resolver = session.getGlobalResolver(); baos = new ByteArrayOutputStream(); ksession = new StatefulKnowledgeSessionImpl( (ReteooStatefulSession) session ); - marshaller = MarshallerFactory.newMarshaller( ksession.getKnowledgeBase() ); + marshaller = MarshallerFactory.newMarshaller( ksession.getKieBase() ); marshaller.marshall( baos, ksession ); baos.close(); @@ -841,7 +841,7 @@ public void testSerializeAdd3() throws Exception { resolver = session.getGlobalResolver(); baos = new ByteArrayOutputStream(); ksession = new StatefulKnowledgeSessionImpl( (ReteooStatefulSession) session ); - marshaller = MarshallerFactory.newMarshaller( ksession.getKnowledgeBase() ); + marshaller = MarshallerFactory.newMarshaller( ksession.getKieBase() ); marshaller.marshall( baos, ksession ); baos.close(); @@ -927,7 +927,7 @@ public void testSerializeAddRemove_NoClassDefFoundError() throws Exception { ByteArrayOutputStream baos = new ByteArrayOutputStream(); StatefulKnowledgeSessionImpl ksession = new StatefulKnowledgeSessionImpl( (ReteooStatefulSession) session ); - Marshaller marshaller = MarshallerFactory.newMarshaller( ksession.getKnowledgeBase() ); + Marshaller marshaller = MarshallerFactory.newMarshaller( ksession.getKieBase() ); marshaller.marshall( baos, ksession ); baos.close(); @@ -980,7 +980,7 @@ public void testSerializeAddRemove_NoClassDefFoundError() throws Exception { baos = new ByteArrayOutputStream(); ksession = new StatefulKnowledgeSessionImpl( (ReteooStatefulSession) session ); - marshaller = MarshallerFactory.newMarshaller( ksession.getKnowledgeBase() ); + marshaller = MarshallerFactory.newMarshaller( ksession.getKieBase() ); marshaller.marshall( baos, ksession ); baos.close(); @@ -1055,7 +1055,7 @@ public void testSerializeAddRemove_NoClassDefFoundError() throws Exception { serializedRulebase = null; baos = new ByteArrayOutputStream(); ksession = new StatefulKnowledgeSessionImpl( (ReteooStatefulSession) session ); - marshaller = MarshallerFactory.newMarshaller( ksession.getKnowledgeBase() ); + marshaller = MarshallerFactory.newMarshaller( ksession.getKieBase() ); marshaller.marshall( baos, ksession ); baos.close(); @@ -3088,7 +3088,7 @@ private KieSession marsallStatefulKnowledgeSession(KieSession ksession) throws I ClassNotFoundException { Globals globals = ksession.getGlobals(); - KieBase kbase = ksession.getKnowledgeBase(); + KieBase kbase = ksession.getKieBase(); ByteArrayOutputStream out = new ByteArrayOutputStream(); MarshallerFactory.newMarshaller( kbase ).marshall( out, diff --git a/drools-compiler/src/test/java/org/drools/integrationtests/sequential/SequentialTest.java b/drools-compiler/src/test/java/org/drools/integrationtests/sequential/SequentialTest.java index 313b3d2c725..d2342019a0f 100644 --- a/drools-compiler/src/test/java/org/drools/integrationtests/sequential/SequentialTest.java +++ b/drools-compiler/src/test/java/org/drools/integrationtests/sequential/SequentialTest.java @@ -26,8 +26,8 @@ import org.kie.event.rule.BeforeMatchFiredEvent; import org.kie.event.rule.MatchCancelledEvent; import org.kie.event.rule.MatchCreatedEvent; +import org.kie.event.rule.ObjectDeletedEvent; import org.kie.event.rule.ObjectInsertedEvent; -import org.kie.event.rule.ObjectRetractedEvent; import org.kie.event.rule.ObjectUpdatedEvent; import org.kie.event.rule.RuleFlowGroupActivatedEvent; import org.kie.event.rule.RuleFlowGroupDeactivatedEvent; @@ -181,17 +181,17 @@ public void testEvents() throws Exception { ksession.addEventListener( new AgendaEventListener() { - public void activationCancelled(MatchCancelledEvent event) { + public void matchCancelled(MatchCancelledEvent event) { assertNotNull( event.getKieRuntime() ); list.add( event ); } - public void activationCreated(MatchCreatedEvent event) { + public void matchCreated(MatchCreatedEvent event) { assertNotNull( event.getKieRuntime() ); list.add( event ); } - public void afterActivationFired(AfterMatchFiredEvent event) { + public void afterMatchFired(AfterMatchFiredEvent event) { assertNotNull( event.getKieRuntime() ); list.add( event ); } @@ -206,7 +206,7 @@ public void agendaGroupPushed(AgendaGroupPushedEvent event) { list.add( event ); } - public void beforeActivationFired(BeforeMatchFiredEvent event) { + public void beforeMatchFired(BeforeMatchFiredEvent event) { assertNotNull( event.getKieRuntime() ); list.add( event ); } @@ -240,7 +240,7 @@ public void objectInserted(ObjectInsertedEvent event) { list.add( event ); } - public void objectRetracted(ObjectRetractedEvent event) { + public void objectDeleted(ObjectDeletedEvent event) { assertNotNull( event.getKieRuntime() ); list.add( event ); } diff --git a/drools-compiler/src/test/java/org/drools/lang/api/DescrBuilderTest.java b/drools-compiler/src/test/java/org/drools/lang/api/DescrBuilderTest.java index f3a02621aaf..fdd6c1135b8 100644 --- a/drools-compiler/src/test/java/org/drools/lang/api/DescrBuilderTest.java +++ b/drools-compiler/src/test/java/org/drools/lang/api/DescrBuilderTest.java @@ -433,7 +433,7 @@ public void testTopLevelAccumulate() throws InstantiationException, assertEquals( 1, rules ); ArgumentCaptor cap = ArgumentCaptor.forClass( AfterMatchFiredEvent.class ); - verify( ael ).afterActivationFired( cap.capture() ); + verify( ael ).afterMatchFired(cap.capture()); assertThat( ((Number) cap.getValue().getMatch().getDeclarationValue( "$sum" )).intValue(), is( 180 ) ); assertThat( ((Number) cap.getValue().getMatch().getDeclarationValue( "$cnt" )).intValue(), is( 2 ) ); diff --git a/drools-compiler/src/test/java/org/kie/builder/WireListenerTest.java b/drools-compiler/src/test/java/org/kie/builder/WireListenerTest.java index b9656e6fef2..be96579c51f 100644 --- a/drools-compiler/src/test/java/org/kie/builder/WireListenerTest.java +++ b/drools-compiler/src/test/java/org/kie/builder/WireListenerTest.java @@ -1,8 +1,8 @@ package org.kie.builder; import org.junit.Test; +import org.kie.event.rule.ObjectDeletedEvent; import org.kie.event.rule.ObjectInsertedEvent; -import org.kie.event.rule.ObjectRetractedEvent; import org.kie.event.rule.ObjectUpdatedEvent; import org.kie.event.rule.WorkingMemoryEventListener; import org.kie.runtime.KieSession; @@ -19,7 +19,7 @@ public class WireListenerTest { private static final List insertEvents = new ArrayList(); private static final List updateEvents = new ArrayList(); - private static final List retractEvents = new ArrayList(); + private static final List retractEvents = new ArrayList(); @Test public void testWireListener() throws Exception { @@ -87,7 +87,7 @@ public void objectUpdated(ObjectUpdatedEvent event) { } @Override - public void objectRetracted(ObjectRetractedEvent event) { + public void objectDeleted(ObjectDeletedEvent event) { retractEvents.add(event); } } diff --git a/drools-core/src/main/java/org/drools/base/DefaultKnowledgeHelper.java b/drools-core/src/main/java/org/drools/base/DefaultKnowledgeHelper.java index 4299b4005d3..d813076400d 100644 --- a/drools-core/src/main/java/org/drools/base/DefaultKnowledgeHelper.java +++ b/drools-core/src/main/java/org/drools/base/DefaultKnowledgeHelper.java @@ -572,7 +572,7 @@ public void setNext(RetractTrait next) { } protected T applyTrait( K core, Class trait, boolean logical ) { - AbstractRuleBase arb = (AbstractRuleBase) ((KnowledgeBaseImpl) this.getKnowledgeRuntime().getKnowledgeBase() ).getRuleBase(); + AbstractRuleBase arb = (AbstractRuleBase) ((KnowledgeBaseImpl) this.getKnowledgeRuntime().getKieBase() ).getRuleBase(); TraitFactory builder = arb.getConfiguration().getComponentFactory().getTraitFactory(); boolean needsWrapping = ! ( core instanceof TraitableBean ); diff --git a/drools-core/src/main/java/org/drools/command/impl/CommandBasedStatefulKnowledgeSession.java b/drools-core/src/main/java/org/drools/command/impl/CommandBasedStatefulKnowledgeSession.java index 0b6fa61eb0c..d117bb27f66 100644 --- a/drools-core/src/main/java/org/drools/command/impl/CommandBasedStatefulKnowledgeSession.java +++ b/drools-core/src/main/java/org/drools/command/impl/CommandBasedStatefulKnowledgeSession.java @@ -259,7 +259,7 @@ public void fireUntilHalt(AgendaFilter agendaFilter) { this.commandService.execute( new FireUntilHaltCommand( agendaFilter ) ); } - public KnowledgeBase getKnowledgeBase() { + public KnowledgeBase getKieBase() { return this.commandService.execute( new GetKnowledgeBaseCommand() ); } diff --git a/drools-core/src/main/java/org/drools/command/runtime/GetKnowledgeBaseCommand.java b/drools-core/src/main/java/org/drools/command/runtime/GetKnowledgeBaseCommand.java index 2e95f050d41..4f67663e762 100644 --- a/drools-core/src/main/java/org/drools/command/runtime/GetKnowledgeBaseCommand.java +++ b/drools-core/src/main/java/org/drools/command/runtime/GetKnowledgeBaseCommand.java @@ -18,7 +18,6 @@ import org.drools.command.impl.GenericCommand; import org.drools.command.impl.KnowledgeCommandContext; -import org.kie.KieBase; import org.kie.KnowledgeBase; import org.kie.command.Context; import org.kie.runtime.StatefulKnowledgeSession; @@ -32,7 +31,7 @@ public GetKnowledgeBaseCommand() { public KnowledgeBase execute(Context context) { StatefulKnowledgeSession ksession = ((KnowledgeCommandContext) context).getStatefulKnowledgesession(); - return ksession.getKnowledgeBase(); + return ksession.getKieBase(); } public String toString() { diff --git a/drools-core/src/main/java/org/drools/common/ActivationIterator.java b/drools-core/src/main/java/org/drools/common/ActivationIterator.java index 465cd57b1ca..843b2c70f13 100644 --- a/drools-core/src/main/java/org/drools/common/ActivationIterator.java +++ b/drools-core/src/main/java/org/drools/common/ActivationIterator.java @@ -49,7 +49,7 @@ public static ActivationIterator iterator(InternalWorkingMemory wm) { public static ActivationIterator iterator(StatefulKnowledgeSession ksession) { return new ActivationIterator( ((InternalWorkingMemoryEntryPoint) ksession).getInternalWorkingMemory(), - ksession.getKnowledgeBase() ); + ksession.getKieBase() ); } public Object next() { diff --git a/drools-core/src/main/java/org/drools/event/rule/impl/ObjectRetractedEventImpl.java b/drools-core/src/main/java/org/drools/event/rule/impl/ObjectDeletedEventImpl.java similarity index 84% rename from drools-core/src/main/java/org/drools/event/rule/impl/ObjectRetractedEventImpl.java rename to drools-core/src/main/java/org/drools/event/rule/impl/ObjectDeletedEventImpl.java index 5b09e76c118..ec1a084a563 100644 --- a/drools-core/src/main/java/org/drools/event/rule/impl/ObjectRetractedEventImpl.java +++ b/drools-core/src/main/java/org/drools/event/rule/impl/ObjectDeletedEventImpl.java @@ -18,17 +18,17 @@ import org.drools.FactHandle; import org.drools.common.InternalWorkingMemory; -import org.kie.event.rule.ObjectRetractedEvent; +import org.kie.event.rule.ObjectDeletedEvent; import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; -public class ObjectRetractedEventImpl extends WorkingMemoryEventImpl implements ObjectRetractedEvent { +public class ObjectDeletedEventImpl extends WorkingMemoryEventImpl implements ObjectDeletedEvent { private FactHandle factHandle; private Object oldbOject; - public ObjectRetractedEventImpl( org.drools.event.ObjectRetractedEvent event) { + public ObjectDeletedEventImpl(org.drools.event.ObjectRetractedEvent event) { super( ((InternalWorkingMemory) event.getWorkingMemory() ).getKnowledgeRuntime(), event.getPropagationContext() ); factHandle = event.getFactHandle(); oldbOject = event.getOldObject(); @@ -57,7 +57,7 @@ public Object getOldObject() { @Override public String toString() { - return "==>[ObjectRetractedEventImpl: getFactHandle()=" + getFactHandle() + ", getOldObject()=" + return "==>[ObjectDeletedEventImpl: getFactHandle()=" + getFactHandle() + ", getOldObject()=" + getOldObject() + ", getKnowledgeRuntime()=" + getKieRuntime() + ", getPropagationContext()=" + getPropagationContext() + "]"; } diff --git a/drools-core/src/main/java/org/drools/impl/KnowledgeBaseImpl.java b/drools-core/src/main/java/org/drools/impl/KnowledgeBaseImpl.java index 4289cc0b694..7bf2c117a9c 100644 --- a/drools-core/src/main/java/org/drools/impl/KnowledgeBaseImpl.java +++ b/drools-core/src/main/java/org/drools/impl/KnowledgeBaseImpl.java @@ -136,7 +136,7 @@ public void removeEventListener(KieBaseEventListener listener) { this.ruleBase.removeEventListener( wrapper ); } - public Collection getKnowledgeBaseEventListeners() { + public Collection getKieBaseEventListeners() { return Collections.unmodifiableCollection( this.mappedKnowledgeBaseListeners.keySet() ); } diff --git a/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java b/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java index 898cb48c16a..ec1ad6af2ba 100644 --- a/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java +++ b/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java @@ -57,8 +57,8 @@ import org.drools.event.rule.impl.AgendaGroupPoppedEventImpl; import org.drools.event.rule.impl.AgendaGroupPushedEventImpl; import org.drools.event.rule.impl.BeforeActivationFiredEventImpl; +import org.drools.event.rule.impl.ObjectDeletedEventImpl; import org.drools.event.rule.impl.ObjectInsertedEventImpl; -import org.drools.event.rule.impl.ObjectRetractedEventImpl; import org.drools.event.rule.impl.ObjectUpdatedEventImpl; import org.drools.event.rule.impl.RuleFlowGroupActivatedEventImpl; import org.drools.event.rule.impl.RuleFlowGroupDeactivatedEventImpl; @@ -219,7 +219,7 @@ public void removeEventListener(ProcessEventListener listener) { getInternalProcessRuntime().removeEventListener( listener ); } - public KnowledgeBase getKnowledgeBase() { + public KnowledgeBase getKieBase() { if ( this.kbase == null ) { this.kbase = new KnowledgeBaseImpl( session.getRuleBase() ); } @@ -577,7 +577,7 @@ public void objectInserted(ObjectInsertedEvent event) { } public void objectRetracted(ObjectRetractedEvent event) { - listener.objectRetracted( new ObjectRetractedEventImpl( event ) ); + listener.objectDeleted(new ObjectDeletedEventImpl(event)); } public void objectUpdated(ObjectUpdatedEvent event) { @@ -631,28 +631,28 @@ public AgendaEventListenerWrapper(AgendaEventListener listener) { public void activationCancelled(ActivationCancelledEvent event, WorkingMemory workingMemory) { - listener.activationCancelled( new ActivationCancelledEventImpl( event.getActivation(), - ((InternalWorkingMemory) workingMemory).getKnowledgeRuntime(), - event.getCause() ) ); + listener.matchCancelled(new ActivationCancelledEventImpl(event.getActivation(), + ((InternalWorkingMemory) workingMemory).getKnowledgeRuntime(), + event.getCause())); } public void activationCreated(ActivationCreatedEvent event, WorkingMemory workingMemory) { - listener.activationCreated( new ActivationCreatedEventImpl( event.getActivation(), - ((InternalWorkingMemory) workingMemory).getKnowledgeRuntime() ) ); + listener.matchCreated(new ActivationCreatedEventImpl(event.getActivation(), + ((InternalWorkingMemory) workingMemory).getKnowledgeRuntime())); } public void beforeActivationFired(BeforeActivationFiredEvent event, WorkingMemory workingMemory) { - listener.beforeActivationFired( new BeforeActivationFiredEventImpl( event.getActivation(), - ((InternalWorkingMemory) workingMemory).getKnowledgeRuntime() ) ); + listener.beforeMatchFired(new BeforeActivationFiredEventImpl(event.getActivation(), + ((InternalWorkingMemory) workingMemory).getKnowledgeRuntime())); } public void afterActivationFired(AfterActivationFiredEvent event, WorkingMemory workingMemory) { - listener.afterActivationFired( new AfterActivationFiredEventImpl( event.getActivation(), - ((InternalWorkingMemory) workingMemory).getKnowledgeRuntime() ) ); + listener.afterMatchFired(new AfterActivationFiredEventImpl(event.getActivation(), + ((InternalWorkingMemory) workingMemory).getKnowledgeRuntime())); } public void agendaGroupPopped(AgendaGroupPoppedEvent event, diff --git a/drools-core/src/main/java/org/drools/reteoo/ReteooStatefulSession.java b/drools-core/src/main/java/org/drools/reteoo/ReteooStatefulSession.java index 3cd7f0c1f78..d6fbdc64010 100644 --- a/drools-core/src/main/java/org/drools/reteoo/ReteooStatefulSession.java +++ b/drools-core/src/main/java/org/drools/reteoo/ReteooStatefulSession.java @@ -94,7 +94,7 @@ public void writeExternal(ObjectOutput out) throws IOException { // all we do is create marshall to a byte[] and write to the stream StatefulKnowledgeSession ksession = (StatefulKnowledgeSession) getKnowledgeRuntime(); - Marshaller marshaller = MarshallerFactory.newMarshaller( ksession.getKnowledgeBase(), new ObjectMarshallingStrategy[] { MarshallerFactory.newSerializeMarshallingStrategy() } ); + Marshaller marshaller = MarshallerFactory.newMarshaller( ksession.getKieBase(), new ObjectMarshallingStrategy[] { MarshallerFactory.newSerializeMarshallingStrategy() } ); ByteArrayOutputStream stream = new ByteArrayOutputStream(); marshaller.marshall( stream, (StatefulKnowledgeSession) getKnowledgeRuntime() ); diff --git a/drools-core/src/test/java/org/drools/event/WorkingMemoryEventSupportTest.java b/drools-core/src/test/java/org/drools/event/WorkingMemoryEventSupportTest.java index 0b6877664f9..a571e08fe65 100644 --- a/drools-core/src/test/java/org/drools/event/WorkingMemoryEventSupportTest.java +++ b/drools-core/src/test/java/org/drools/event/WorkingMemoryEventSupportTest.java @@ -20,13 +20,11 @@ import java.util.ArrayList; import java.util.List; -import org.junit.After; -import org.junit.Before; import org.junit.Test; import org.kie.KnowledgeBase; import org.kie.KnowledgeBaseFactory; import org.kie.event.rule.ObjectInsertedEvent; -import org.kie.event.rule.ObjectRetractedEvent; +import org.kie.event.rule.ObjectDeletedEvent; import org.kie.event.rule.ObjectUpdatedEvent; import org.kie.event.rule.WorkingMemoryEventListener; import org.kie.runtime.StatefulKnowledgeSession; @@ -57,7 +55,7 @@ public void objectUpdated(ObjectUpdatedEvent event) { wmList.add( event ); } - public void objectRetracted(ObjectRetractedEvent event) { + public void objectDeleted(ObjectDeletedEvent event) { wmList.add( event ); } @@ -86,7 +84,7 @@ public void objectRetracted(ObjectRetractedEvent event) { assertEquals( stilton, ome.getOldObject() ); wm.retract( stiltonHandle ); - final ObjectRetractedEvent ore = (ObjectRetractedEvent) wmList.get( 2 ); + final ObjectDeletedEvent ore = (ObjectDeletedEvent) wmList.get( 2 ); assertSame( stiltonHandle, ore.getFactHandle() ); diff --git a/drools-core/src/test/java/org/drools/event/rule/AgendaEventSupportTest.java b/drools-core/src/test/java/org/drools/event/rule/AgendaEventSupportTest.java index bdd8d229d03..a5a6b59961f 100644 --- a/drools-core/src/test/java/org/drools/event/rule/AgendaEventSupportTest.java +++ b/drools-core/src/test/java/org/drools/event/rule/AgendaEventSupportTest.java @@ -123,19 +123,19 @@ public String getName() { final List agendaList = new ArrayList(); final AgendaEventListener agendaEventListener = new AgendaEventListener() { - public void activationCancelled(MatchCancelledEvent event) { + public void matchCancelled(MatchCancelledEvent event) { assertNotNull( event.getKieRuntime() ); agendaList.add( event ); } - public void activationCreated(MatchCreatedEvent event) { + public void matchCreated(MatchCreatedEvent event) { assertNotNull( event.getKieRuntime() ); agendaList.add( event ); } - public void afterActivationFired(AfterMatchFiredEvent event) { + public void afterMatchFired(AfterMatchFiredEvent event) { assertNotNull( event.getKieRuntime() ); agendaList.add( event ); } @@ -150,7 +150,7 @@ public void agendaGroupPushed(AgendaGroupPushedEvent event) { agendaList.add( event ); } - public void beforeActivationFired(BeforeMatchFiredEvent event) { + public void beforeMatchFired(BeforeMatchFiredEvent event) { assertNotNull( event.getKieRuntime() ); agendaList.add( event ); } diff --git a/drools-core/src/test/java/org/drools/event/rule/WorkingMemoryEventSupportTest.java b/drools-core/src/test/java/org/drools/event/rule/WorkingMemoryEventSupportTest.java index 962e1f828b0..1cf164a0e61 100644 --- a/drools-core/src/test/java/org/drools/event/rule/WorkingMemoryEventSupportTest.java +++ b/drools-core/src/test/java/org/drools/event/rule/WorkingMemoryEventSupportTest.java @@ -16,25 +16,18 @@ package org.drools.event.rule; -import java.io.Serializable; import java.util.ArrayList; import java.util.List; import org.drools.Cheese; -import org.drools.RuleBase; -import org.drools.RuleBaseFactory; -import org.drools.WorkingMemory; -import org.junit.After; -import org.junit.Before; import org.junit.Test; import org.kie.KnowledgeBase; import org.kie.KnowledgeBaseFactory; import org.kie.event.rule.ObjectInsertedEvent; -import org.kie.event.rule.ObjectRetractedEvent; +import org.kie.event.rule.ObjectDeletedEvent; import org.kie.event.rule.ObjectUpdatedEvent; import org.kie.event.rule.WorkingMemoryEventListener; -import org.kie.runtime.KnowledgeRuntime; import org.kie.runtime.StatefulKnowledgeSession; import org.kie.runtime.rule.FactHandle; @@ -58,7 +51,7 @@ public void objectUpdated(ObjectUpdatedEvent event) { wmList.add( event ); } - public void objectRetracted(ObjectRetractedEvent event) { + public void objectDeleted(ObjectDeletedEvent event) { wmList.add( event ); } @@ -84,7 +77,7 @@ public void objectRetracted(ObjectRetractedEvent event) { ome.getFactHandle() ); ksession.retract( stiltonHandle ); - final ObjectRetractedEvent ore = (ObjectRetractedEvent) wmList.get( 2 ); + final ObjectDeletedEvent ore = (ObjectDeletedEvent) wmList.get( 2 ); assertSame( stiltonHandle, ore.getFactHandle() ); @@ -107,7 +100,7 @@ public void objectUpdated(ObjectUpdatedEvent event) { wmList.add( event ); } - public void objectRetracted(ObjectRetractedEvent event) { + public void objectDeleted(ObjectDeletedEvent event) { wmList.add( event ); } diff --git a/drools-core/src/test/java/org/drools/examples/manners/ReteooMannersTest.java b/drools-core/src/test/java/org/drools/examples/manners/ReteooMannersTest.java index a3a4c09e996..875bc4dbde6 100644 --- a/drools-core/src/test/java/org/drools/examples/manners/ReteooMannersTest.java +++ b/drools-core/src/test/java/org/drools/examples/manners/ReteooMannersTest.java @@ -39,24 +39,24 @@ public void testManners() throws Exception { final DefaultAgendaEventListener listener = new DefaultAgendaEventListener() { private int counter = 0; - // public void activationCreated(ActivationCreatedEvent event) { - // super.activationCreated( event ); + // public void matchCreated(ActivationCreatedEvent event) { + // super.matchCreated( event ); // System.out.println( event ); // } // - // public void activationCancelled(ActivationCancelledEvent event) { - // super.activationCancelled( event ); + // public void matchCancelled(ActivationCancelledEvent event) { + // super.matchCancelled( event ); // System.out.println( event ); // } // - // public void beforeActivationFired(BeforeActivationFiredEvent event) { - // super.beforeActivationFired( event ); + // public void beforeMatchFired(BeforeActivationFiredEvent event) { + // super.beforeMatchFired( event ); // System.out.println( event ); // } public void afterActivationFired(AfterActivationFiredEvent event) { this.counter++; - //super.afterActivationFired( event ); + //super.afterMatchFired( event ); //System.out.println( event ); } diff --git a/drools-core/src/test/java/org/drools/reteoo/ReteDumper.java b/drools-core/src/test/java/org/drools/reteoo/ReteDumper.java index fb022b8548c..f2136368b9f 100644 --- a/drools-core/src/test/java/org/drools/reteoo/ReteDumper.java +++ b/drools-core/src/test/java/org/drools/reteoo/ReteDumper.java @@ -6,7 +6,6 @@ import org.drools.impl.KnowledgeBaseImpl; import org.kie.KnowledgeBase; import org.kie.runtime.KnowledgeRuntime; -import org.kie.runtime.StatefulKnowledgeSession; import java.util.Collection; @@ -19,7 +18,7 @@ public static void dumpRete(KnowledgeBase kbase) { } public static void dumpRete(KnowledgeRuntime session) { - dumpRete(((KnowledgeBaseImpl)session.getKnowledgeBase()).getRuleBase()); + dumpRete(((KnowledgeBaseImpl)session.getKieBase()).getRuleBase()); } public static void dumpRete(RuleBase ruleBase) { diff --git a/drools-docs/drools-expert-docs/src/main/docbook/en-US/Chapter-ApiReference/Section-Running.xml b/drools-docs/drools-expert-docs/src/main/docbook/en-US/Chapter-ApiReference/Section-Running.xml index 1a5f0c61d54..c34306425b9 100644 --- a/drools-docs/drools-expert-docs/src/main/docbook/en-US/Chapter-ApiReference/Section-Running.xml +++ b/drools-docs/drools-expert-docs/src/main/docbook/en-US/Chapter-ApiReference/Section-Running.xml @@ -630,8 +630,8 @@ ksession.setGlobal("list", list); Adding an AgendaEventListener ksession.addEventListener( new DefaultAgendaEventListener() { - public void afterActivationFired(AfterActivationFiredEvent event) { - super.afterActivationFired( event ); + public void afterMatchFired(AfterActivationFiredEvent event) { + super.afterMatchFired( event ); System.out.println( event ); } }); diff --git a/drools-examples/src/main/java/org/drools/examples/DroolsExamplesApp.java b/drools-examples/src/main/java/org/drools/examples/DroolsExamplesApp.java index 8e086e6ea27..45ce54da82c 100644 --- a/drools-examples/src/main/java/org/drools/examples/DroolsExamplesApp.java +++ b/drools-examples/src/main/java/org/drools/examples/DroolsExamplesApp.java @@ -16,16 +16,6 @@ package org.drools.examples; -import java.awt.Container; -import java.awt.GridLayout; -import java.awt.event.ActionEvent; - -import javax.swing.AbstractAction; -import javax.swing.JButton; -import javax.swing.JFrame; -import javax.swing.JLabel; -import javax.swing.JPanel; - import org.drools.examples.datadriventemplate.DataDrivenTemplateExample; import org.drools.examples.decisiontable.PricingRuleDTExample; import org.drools.examples.decisiontable.PricingRuleTemplateExample; @@ -33,7 +23,6 @@ import org.drools.examples.golfing.GolfingExample; import org.drools.examples.helloworld.HelloWorldExample; import org.drools.examples.honestpolitician.HonestPoliticianExample; -import org.drools.examples.pacman.PacmanExample; import org.drools.examples.petstore.PetStoreExample; import org.drools.examples.shopping.ShoppingExample; import org.drools.examples.state.StateExampleUsingAgendaGroup; @@ -52,6 +41,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.swing.*; +import java.awt.*; +import java.awt.event.ActionEvent; + public class DroolsExamplesApp extends JFrame { public static void main(String[] args) { @@ -83,11 +76,6 @@ public void actionPerformed(ActionEvent e) { new PetStoreExample().init(false); } })); - contentPane.add(new JButton(new AbstractAction("PacmanExample") { - public void actionPerformed(ActionEvent e) { - new PacmanExample().init(false); - } - })); contentPane.add(new JButton(new AbstractAction("TextAdventure") { public void actionPerformed(ActionEvent e) { new TextAdventure().init(false); diff --git a/drools-examples/src/main/java/org/drools/examples/pacman/Cell.java b/drools-examples/src/main/java/org/drools/examples/pacman/Cell.java deleted file mode 100644 index 209f1a24715..00000000000 --- a/drools-examples/src/main/java/org/drools/examples/pacman/Cell.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2010 JBoss Inc - * - * Licensed 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.drools.examples.pacman; - -public class Cell { - private int row; - private int col; - - public Cell(int row, int col) { - super(); - this.row = row; - this.col = col; - } - - public int getRow() { - return row; - } - - public int getCol() { - return col; - } - - @Override - public String toString() { - return "Cell " + row + ":" + col; - } -} diff --git a/drools-examples/src/main/java/org/drools/examples/pacman/CellContents.java b/drools-examples/src/main/java/org/drools/examples/pacman/CellContents.java deleted file mode 100644 index 90b4575bb26..00000000000 --- a/drools-examples/src/main/java/org/drools/examples/pacman/CellContents.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2010 JBoss Inc - * - * Licensed 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.drools.examples.pacman; - -public class CellContents { - private Cell cell; - private CellType cellType; - - public CellContents(Cell cell, - CellType cellType) { - this.cell = cell; - this.cellType = cellType; - } - - public Cell getCell() { - return cell; - } - - public CellType getCellType() { - return cellType; - } - - public void setCellType(CellType cellType) { - this.cellType = cellType; - } - - @Override - public String toString() { - return "CellType " + cellType; - } -} diff --git a/drools-examples/src/main/java/org/drools/examples/pacman/CellType.java b/drools-examples/src/main/java/org/drools/examples/pacman/CellType.java deleted file mode 100644 index 60afde3e439..00000000000 --- a/drools-examples/src/main/java/org/drools/examples/pacman/CellType.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2010 JBoss Inc - * - * Licensed 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.drools.examples.pacman; - -public enum CellType { - EMPTY, - FOOD, - POWER_PILL, - WALL; -} diff --git a/drools-examples/src/main/java/org/drools/examples/pacman/Character.java b/drools-examples/src/main/java/org/drools/examples/pacman/Character.java deleted file mode 100644 index 8cf350fc032..00000000000 --- a/drools-examples/src/main/java/org/drools/examples/pacman/Character.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2010 JBoss Inc - * - * Licensed 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.drools.examples.pacman; - -public class Character { - String name; - - private int speed; - - public Character( String name ) { - this.name = name; - } - - public String getName() { - return this.name; - } - - public int getSpeed() { - return speed; - } - - public void setSpeed(int speed) { - this.speed = speed; - } - - @Override - public String toString() { - return this.name + " speed = " + getSpeed(); - } -} diff --git a/drools-examples/src/main/java/org/drools/examples/pacman/Direction.java b/drools-examples/src/main/java/org/drools/examples/pacman/Direction.java deleted file mode 100644 index bf4e4792150..00000000000 --- a/drools-examples/src/main/java/org/drools/examples/pacman/Direction.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright 2010 JBoss Inc - * - * Licensed 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.drools.examples.pacman; - -public class Direction { - public static final int NONE = 0; - public static final int LEFT = -1; - public static final int RIGHT = 1; - public static final int UP = 1; - public static final int DOWN = -1; - - private Character character; - private int horizontal; - private int vertical; - - public Direction(Character character, - int horizontal, - int vertical) { - this.character = character; - this.horizontal = horizontal; - this.vertical = vertical; - } - - public Character getCharacter() { - return character; - } - - public int getHorizontal() { - return horizontal; - } - - public int getVertical() { - return vertical; - } - - public static Direction newDirection(Character character, - DirectionEnum directionEnum) { - switch ( directionEnum ) { - case LEFT : { - return new Direction( character, - -1, - 0 ); - } - case RIGHT : { - return new Direction( character, - 1, - 0 ); - } - case UP : { - return new Direction( character, - 0, - 1 ); - } - case DOWN : { - return new Direction( character, - 0, - -1 ); - } - default : { - - } - } - throw new IllegalArgumentException( "Direction must be a valid DirectionEnum" ); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((character == null) ? 0 : character.hashCode()); - result = prime * result + horizontal; - result = prime * result + vertical; - return result; - } - - @Override - public boolean equals(Object obj) { - if ( this == obj ) return true; - if ( obj == null ) return false; - if ( getClass() != obj.getClass() ) return false; - Direction other = (Direction) obj; - if ( character == null ) { - if ( other.character != null ) return false; - } else if ( !character.equals( other.character ) ) return false; - if ( horizontal != other.horizontal ) return false; - if ( vertical != other.vertical ) return false; - return true; - } - - @Override - public String toString() { - if ( horizontal != 0 ) { - return "Direction " + character + " " + ((horizontal == LEFT) ? "LEFT" : "RIGHT"); - } else { - return "Direction " + character + " " + ((vertical == UP) ? "UP" : "DOWN"); - } - - } - -} diff --git a/drools-examples/src/main/java/org/drools/examples/pacman/DirectionDiff.java b/drools-examples/src/main/java/org/drools/examples/pacman/DirectionDiff.java deleted file mode 100644 index 4a2b819fc9a..00000000000 --- a/drools-examples/src/main/java/org/drools/examples/pacman/DirectionDiff.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright 2010 JBoss Inc - * - * Licensed 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.drools.examples.pacman; - -public class DirectionDiff { - private Character fromChar; - private Character toChar; - private int col; - private int row; - private int colDiff; - private int rowDiff; - - public DirectionDiff(Character fromChar, - Character toChar, - int col, - int row, - int colDiff, - int rowDiff) { - this.fromChar = fromChar; - this.toChar = toChar; - this.col = col; - this.row = row; - this.colDiff = colDiff; - this.rowDiff = rowDiff; - } - - public Character getFromChar() { - return fromChar; - } - - public Character getToChar() { - return toChar; - } - - public int getCol() { - return col; - } - - public int getRow() { - return row; - } - - public int getColDiff() { - return colDiff; - } - - public int getRowDiff() { - return rowDiff; - } - - public String toString() { - return "from: " + fromChar + " to: " + toChar + " col: " + col + " row: " + row + " colDiff: " + colDiff + " rowDiff: " + rowDiff; - } - -} diff --git a/drools-examples/src/main/java/org/drools/examples/pacman/DirectionEnum.java b/drools-examples/src/main/java/org/drools/examples/pacman/DirectionEnum.java deleted file mode 100644 index 31dcd89ac3e..00000000000 --- a/drools-examples/src/main/java/org/drools/examples/pacman/DirectionEnum.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2010 JBoss Inc - * - * Licensed 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.drools.examples.pacman; - -public enum DirectionEnum { - UP, DOWN, LEFT, RIGHT; -} diff --git a/drools-examples/src/main/java/org/drools/examples/pacman/Location.java b/drools-examples/src/main/java/org/drools/examples/pacman/Location.java deleted file mode 100644 index 26f0160755f..00000000000 --- a/drools-examples/src/main/java/org/drools/examples/pacman/Location.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright 2010 JBoss Inc - * - * Licensed 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.drools.examples.pacman; - -public class Location { - private Character character; - private int row; - private int col; - - public Location(Character character, - int row, - int col) { - this.character = character; - this.row = row; - this.col = col; - } - - public Character getCharacter() { - return character; - } - - public void setRow(int row) { - this.row = row; - } - - public int getRow() { - return row; - } - - public int getCol() { - return col; - } - - public void setCol(int col) { - this.col = col; - } - - @Override - public String toString() { - return "Location " + character + " " + row + ":" + col; - } -} diff --git a/drools-examples/src/main/java/org/drools/examples/pacman/Monster.java b/drools-examples/src/main/java/org/drools/examples/pacman/Monster.java deleted file mode 100644 index bc1f0b27655..00000000000 --- a/drools-examples/src/main/java/org/drools/examples/pacman/Monster.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright 2010 JBoss Inc - * - * Licensed 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.drools.examples.pacman; - -public class Monster extends Character { - public Monster() { - super( "Monster" ); - } -} diff --git a/drools-examples/src/main/java/org/drools/examples/pacman/PacMan.java b/drools-examples/src/main/java/org/drools/examples/pacman/PacMan.java deleted file mode 100644 index 816939bc8d1..00000000000 --- a/drools-examples/src/main/java/org/drools/examples/pacman/PacMan.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright 2010 JBoss Inc - * - * Licensed 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.drools.examples.pacman; - -public class PacMan extends Character { - public PacMan() { - super( "Pacman" ); - } -} diff --git a/drools-examples/src/main/java/org/drools/examples/pacman/PacmanExample.java b/drools-examples/src/main/java/org/drools/examples/pacman/PacmanExample.java deleted file mode 100644 index a1e54406a88..00000000000 --- a/drools-examples/src/main/java/org/drools/examples/pacman/PacmanExample.java +++ /dev/null @@ -1,183 +0,0 @@ -/* - * Copyright 2010 JBoss Inc - * - * Licensed 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.drools.examples.pacman; - -import org.kie.KnowledgeBase; -import org.kie.KnowledgeBaseFactory; -import org.kie.builder.KnowledgeBuilder; -import org.kie.builder.KnowledgeBuilderFactory; -import org.kie.io.ResourceFactory; -import org.kie.io.ResourceType; -import org.kie.runtime.StatefulKnowledgeSession; - -import java.io.BufferedReader; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - -public class PacmanExample { - volatile StatefulKnowledgeSession ksession = null; - PacMan pacMan; - - public static void main(String[] args) { - new PacmanExample().init(true); - } - - public PacmanExample() { - } - - public void init(boolean exitOnClose) { - initKsession(); - buildGrid(); - initGui(exitOnClose); - runKSession(); - } - - public void initKsession() { - KnowledgeBuilder kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder(); - kbuilder.add( ResourceFactory.newClassPathResource( "base.drl", - getClass() ), - ResourceType.DRL ); - kbuilder.add( ResourceFactory.newClassPathResource( "key-handlers.drl", - getClass() ), - ResourceType.DRL ); - kbuilder.add( ResourceFactory.newClassPathResource( "pacman.drl", - getClass() ), - ResourceType.DRL ); - kbuilder.add( ResourceFactory.newClassPathResource( "monster.drl", - getClass() ), - ResourceType.DRL ); - - if ( kbuilder.hasErrors() ) { - System.out.println( kbuilder.getErrors() ); - } - - KnowledgeBase kbase = KnowledgeBaseFactory.newKnowledgeBase(); - kbase.addKnowledgePackages( kbuilder.getKnowledgePackages() ); - - this.ksession = kbase.newStatefulKnowledgeSession(); - - this.pacMan = new PacMan(); - this.pacMan.setSpeed( 3 ); - this.ksession.insert( this.pacMan ); - - Monster monster = new Monster(); - monster.setSpeed( 5 ); - this.ksession.insert( monster ); - - this.ksession.insert( new Score() ); - -// KnowledgeRuntimeLoggerFactory.newThreadedFileLogger( this.ksession, -// "log/pacman.log", -// 3000 ); - - Location pacLocation = new Location( this.pacMan, - 1, - 5 ); - - Location monLocation = new Location( monster, - 10, - 5 ); - - this.ksession.insert( pacLocation ); - this.ksession.insert( monLocation ); - - Tick tick = new Tick( 0 ); - this.ksession.insert( tick ); - } - - public void buildGrid() { - - BufferedReader reader; - List lines = new ArrayList(); - try { - reader = new BufferedReader( ResourceFactory.newClassPathResource("grid1.dat", - PacmanExample.class).getReader() ); - - String line; - while ( (line = reader.readLine()) != null ) { - lines.add( line ); - } - } catch (IOException e) { - throw new IllegalStateException("Reading dat file failed.", e); - } - - for ( int row = lines.size() - 1; row >= 0; row-- ) { - String line = lines.get( row ); - int whiteCellCount = 0; - for ( int col = 0; col < line.length(); col++ ) { - char c = line.charAt( col ); - - Cell cell = new Cell( lines.size() - row - 1, - col - whiteCellCount ); // use white spaces for layout, so need to correct - CellContents contents = null; - switch ( c ) { - case '*' : { - contents = new CellContents( cell, - CellType.WALL ); - break; - } - case '.' : { - contents = new CellContents( cell, - CellType.FOOD ); - break; - } - case '#' : { - contents = new CellContents( cell, - CellType.POWER_PILL ); - break; - } - case '_' : { - contents = new CellContents( cell, - CellType.EMPTY ); - break; - } - case ' ' : { - // ignore, just for spacing - whiteCellCount++; - break; - } - default : { - throw new IllegalArgumentException( "'" + c + "' is an invalid cell type" ); - } - } - if ( contents != null ) { - System.out.println( cell + " : " + contents ); - ksession.insert( cell ); - ksession.insert( contents ); - } - } - } - } - - public void initGui(boolean exitOnClose) { - PacmanGui.createAndShowGUI( this.ksession, exitOnClose ); - } - - public void runKSession() { - ExecutorService executorService = Executors.newFixedThreadPool(1); - executorService.submit(new Runnable() { - public void run() { - // run forever - ksession.fireUntilHalt(); - } - }); - } - -} diff --git a/drools-examples/src/main/java/org/drools/examples/pacman/PacmanGui.java b/drools-examples/src/main/java/org/drools/examples/pacman/PacmanGui.java deleted file mode 100644 index 4045c05908e..00000000000 --- a/drools-examples/src/main/java/org/drools/examples/pacman/PacmanGui.java +++ /dev/null @@ -1,146 +0,0 @@ -/* - * Copyright 2010 JBoss Inc - * - * Licensed 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.drools.examples.pacman; - -import java.awt.BorderLayout; -import java.awt.Dimension; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.KeyEvent; -import java.awt.event.KeyListener; - -import javax.swing.JButton; -import javax.swing.JFrame; -import javax.swing.JLabel; -import javax.swing.JScrollPane; -import javax.swing.JTextArea; - -import org.kie.runtime.ExitPoint; -import org.kie.runtime.StatefulKnowledgeSession; -import org.kie.runtime.rule.WorkingMemoryEntryPoint; - -public class PacmanGui extends JFrame - implements - KeyListener, - ActionListener { - JTextArea displayArea; - static final String newline = System.getProperty( "line.separator" ); - WorkingMemoryEntryPoint keyListenerEntryPoint; - - public static void createAndShowGUI(StatefulKnowledgeSession ksession, boolean exitOnClose) { - //Create and set up the window. - PacmanGui frame = new PacmanGui( "KeyEventDemo", - ksession ); - frame.setDefaultCloseOperation(exitOnClose ? JFrame.EXIT_ON_CLOSE : JFrame.DISPOSE_ON_CLOSE); - - //Set up the content pane. - frame.addComponentsToPane(); - - //Display the window. - frame.pack(); - frame.setLocationRelativeTo(null); // Center in screen - frame.setVisible( true ); - } - - public void appendText(final String string) { - javax.swing.SwingUtilities.invokeLater( new Runnable() { - public void run() { - displayArea.append( string ); - displayArea.setCaretPosition( displayArea.getDocument().getLength() ); - } - } ); - } - - private void addComponentsToPane() { - - getContentPane().add( new JLabel("Press an arrow key to start the key event output."), - BorderLayout.NORTH ); - - displayArea = new JTextArea(); - displayArea.setEditable( false ); - JScrollPane scrollPane = new JScrollPane( displayArea ); - scrollPane.setPreferredSize( new Dimension( 600, - 600 ) ); - displayArea.addKeyListener( this ); - getContentPane().add( scrollPane, - BorderLayout.CENTER ); - - JButton clearButton = new JButton( "Clear" ); - clearButton.addActionListener(this); - getContentPane().add( clearButton, - BorderLayout.PAGE_END ); - } - - public PacmanGui(String name, - StatefulKnowledgeSession ksession) { - super( name ); - this.keyListenerEntryPoint = ksession.getWorkingMemoryEntryPoint( "KeyListener" ); - ksession.registerExitPoint( "ConsoleExitPoint", - new ConsoleExitPoint( this ) ); - } - - public static class ConsoleExitPoint - implements - ExitPoint { - private PacmanGui gui; - - public ConsoleExitPoint(PacmanGui gui) { - this.gui = gui; - } - - public void insert(final Object arg) { - gui.appendText( (String) arg ); - } - - } - - /** Handle the key typed event from the text field. */ - public void keyTyped(KeyEvent e) { - // do nothing - } - - public void keyPressed(KeyEvent e) { - // do nothing - } - - public void keyReleased(KeyEvent e) { - // switch ( e.getKeyCode() ) { - // case 38 : { // UP - // break; - // } - // case 40 : { // DOWN - // break; - // } - // case 37 : { // LEFt - // break; - // } - // case 39 : { // RIGHT - // break; - // } - // default: { - // - // } - // } - //System.out.println( e ); - this.keyListenerEntryPoint.insert( e ); - } - - public void actionPerformed(ActionEvent e) { - displayArea.setText( "" ); - } - -} diff --git a/drools-examples/src/main/java/org/drools/examples/pacman/ScheduledLocationUpdate.java b/drools-examples/src/main/java/org/drools/examples/pacman/ScheduledLocationUpdate.java deleted file mode 100644 index 75234a82dc9..00000000000 --- a/drools-examples/src/main/java/org/drools/examples/pacman/ScheduledLocationUpdate.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright 2010 JBoss Inc - * - * Licensed 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.drools.examples.pacman; - -public class ScheduledLocationUpdate { - private Character character; - private Location location; - private int row; - private int col; - private int tock; - - public ScheduledLocationUpdate(Character character, - Location location, - int row, - int col, - int tock) { - this.character = character; - this.location = location; - this.row = row; - this.col = col; - this.tock = tock; - } - - public Character getCharacter() { - return character; - } - - public Location getLocation() { - return location; - } - - public void setRow(int row) { - this.row = row; - } - - public int getRow() { - return row; - } - - public int getCol() { - return col; - } - - public void setCol(int col) { - this.col = col; - } - - public int getTock() { - return tock; - } - - public void setTock(int tock) { - this.tock = tock; - } - - @Override - public String toString() { - return "ScheduledLocationUpdate " + location.getCharacter() + " " + row + ":" + col; - } -} diff --git a/drools-examples/src/main/java/org/drools/examples/pacman/Score.java b/drools-examples/src/main/java/org/drools/examples/pacman/Score.java deleted file mode 100644 index beecd7df22b..00000000000 --- a/drools-examples/src/main/java/org/drools/examples/pacman/Score.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2010 JBoss Inc - * - * Licensed 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.drools.examples.pacman; - -public class Score { - private int score; - - public int getScore() { - return score; - } - - public void setScore(int score) { - this.score = score; - } - - -} diff --git a/drools-examples/src/main/java/org/drools/examples/pacman/Tick.java b/drools-examples/src/main/java/org/drools/examples/pacman/Tick.java deleted file mode 100644 index 7eef69a9315..00000000000 --- a/drools-examples/src/main/java/org/drools/examples/pacman/Tick.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2010 JBoss Inc - * - * Licensed 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.drools.examples.pacman; - -public class Tick { - private int tock; - - public Tick(int tock) { - this.tock = tock; - } - - public void setTock(int tock) { - this.tock = tock; - } - - public int getTock() { - return tock; - } - -} diff --git a/drools-examples/src/main/java/org/drools/examples/sudoku/Sudoku.java b/drools-examples/src/main/java/org/drools/examples/sudoku/Sudoku.java index ae70c160d7d..a6093f3ce2c 100644 --- a/drools-examples/src/main/java/org/drools/examples/sudoku/Sudoku.java +++ b/drools-examples/src/main/java/org/drools/examples/sudoku/Sudoku.java @@ -23,8 +23,8 @@ import org.drools.examples.sudoku.swing.SudokuGridEvent; import org.drools.examples.sudoku.swing.SudokuGridModel; import org.kie.KnowledgeBase; +import org.kie.event.rule.ObjectDeletedEvent; import org.kie.event.rule.ObjectInsertedEvent; -import org.kie.event.rule.ObjectRetractedEvent; import org.kie.event.rule.ObjectUpdatedEvent; import org.kie.event.rule.WorkingMemoryEventListener; import org.kie.runtime.StatefulKnowledgeSession; @@ -324,7 +324,7 @@ public void objectInserted(ObjectInsertedEvent ev) { } } - public void objectRetracted(ObjectRetractedEvent ev) { + public void objectDeleted(ObjectDeletedEvent ev) { } public void objectUpdated(ObjectUpdatedEvent ev) { diff --git a/drools-examples/src/main/java/org/drools/games/pong/PongMain.java b/drools-examples/src/main/java/org/drools/games/pong/PongMain.java index 416c7b6f0d9..4a1a9adb171 100644 --- a/drools-examples/src/main/java/org/drools/games/pong/PongMain.java +++ b/drools-examples/src/main/java/org/drools/games/pong/PongMain.java @@ -55,16 +55,16 @@ public void init(boolean exitOnClose) { ksession.setGlobal("pconf", pconf); // ksession.addEventListener( new DefaultAgendaEventListener() { -// public void beforeActivationFired(BeforeActivationFiredEvent event) { +// public void beforeMatchFired(BeforeActivationFiredEvent event) { // System.out.println( "b: " + event.getActivation().getRule().getName() + " : " + event.getActivation().getFactHandles() ); // } -// public void afterActivationFired(AfterActivationFiredEvent event) { +// public void afterMatchFired(AfterActivationFiredEvent event) { // System.out.println( "a: " + event.getActivation().getRule().getName() + " : " + event.getActivation().getFactHandles() ); // } -//// public void activationCreated(ActivationCreatedEvent event) { +//// public void matchCreated(ActivationCreatedEvent event) { //// System.out.println( "cr: " + event.getActivation().getRule().getName() + " : " + event.getActivation().getFactHandles() ); //// } -//// public void activationCancelled(ActivationCancelledEvent event) { +//// public void matchCancelled(ActivationCancelledEvent event) { //// System.out.println( "cl: " + event.getActivation().getRule().getName() + " : " + event.getActivation().getFactHandles() ); //// } // diff --git a/drools-persistence-jpa/src/main/java/org/drools/persistence/SessionMarshallingHelper.java b/drools-persistence-jpa/src/main/java/org/drools/persistence/SessionMarshallingHelper.java index 617859c5ce0..e825c67a2f5 100644 --- a/drools-persistence-jpa/src/main/java/org/drools/persistence/SessionMarshallingHelper.java +++ b/drools-persistence-jpa/src/main/java/org/drools/persistence/SessionMarshallingHelper.java @@ -54,7 +54,7 @@ public SessionMarshallingHelper(KnowledgeBase kbase, public SessionMarshallingHelper(StatefulKnowledgeSession ksession, KnowledgeSessionConfiguration conf) { this.ksession = ksession; - this.kbase = ksession.getKnowledgeBase(); + this.kbase = ksession.getKieBase(); this.conf = conf; this.env = ksession.getEnvironment(); ObjectMarshallingStrategy[] strategies = (ObjectMarshallingStrategy[]) this.env.get( EnvironmentName.OBJECT_MARSHALLING_STRATEGIES ); diff --git a/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/processinstance/JPAWorkItemManager.java b/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/processinstance/JPAWorkItemManager.java index cf8de0eebcb..45c5ef8ea05 100644 --- a/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/processinstance/JPAWorkItemManager.java +++ b/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/processinstance/JPAWorkItemManager.java @@ -5,8 +5,6 @@ import java.util.Map; import java.util.Set; -import javax.persistence.EntityManager; - import org.drools.WorkItemHandlerNotFoundException; import org.drools.common.InternalKnowledgeRuntime; import org.drools.common.InternalRuleBase; @@ -183,7 +181,7 @@ public WorkItem getWorkItem(long id) { private WorkItem internalGetWorkItem(WorkItemInfo workItemInfo) { Environment env = kruntime.getEnvironment(); - InternalRuleBase ruleBase = (InternalRuleBase) ((KnowledgeBaseImpl) kruntime.getKnowledgeBase()).getRuleBase(); + InternalRuleBase ruleBase = (InternalRuleBase) ((KnowledgeBaseImpl) kruntime.getKieBase()).getRuleBase(); WorkItem workItem = workItemInfo.getWorkItem(env, ruleBase); return workItem; } diff --git a/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/TransactionTestCommand.java b/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/TransactionTestCommand.java index 4c4c8b131df..394c22d6669 100644 --- a/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/TransactionTestCommand.java +++ b/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/TransactionTestCommand.java @@ -88,7 +88,7 @@ public Void execute(Context context) { // THe following 3 lines are the important ones! (See below for an explanation) KnowledgeBase cleanKBase = KnowledgeBaseFactory.newKnowledgeBase(); - cleanKBase.addKnowledgePackages(ksession.getKnowledgeBase().getKnowledgePackages()); + cleanKBase.addKnowledgePackages(ksession.getKieBase().getKnowledgePackages()); StatefulKnowledgeSession commandKSession = JPAKnowledgeService.newStatefulKnowledgeSession( cleanKBase, null, initializeEnvironment() ); /**