[jboss-svn-commits] JBL Code SVN: r23908 - labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Nov 17 20:47:04 EST 2008
Author: KrisVerlaenen
Date: 2008-11-17 20:47:04 -0500 (Mon, 17 Nov 2008)
New Revision: 23908
Modified:
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/WorkingMemoryConsoleLogger.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/WorkingMemoryFileLogger.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/WorkingMemoryInMemoryLogger.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/WorkingMemoryLogger.java
Log:
JBRULES-1734: Drools-API
- made audit logger accept StatefulKnowledgeSession in constructors
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/WorkingMemoryConsoleLogger.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/WorkingMemoryConsoleLogger.java 2008-11-18 01:45:59 UTC (rev 23907)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/WorkingMemoryConsoleLogger.java 2008-11-18 01:47:04 UTC (rev 23908)
@@ -7,6 +7,7 @@
import org.drools.WorkingMemoryEventManager;
import org.drools.audit.event.LogEvent;
+import org.drools.runtime.StatefulKnowledgeSession;
public class WorkingMemoryConsoleLogger extends WorkingMemoryLogger {
@@ -21,6 +22,10 @@
public WorkingMemoryConsoleLogger(WorkingMemoryEventManager workingMemory) {
super(workingMemory);
}
+
+ public WorkingMemoryConsoleLogger(StatefulKnowledgeSession session) {
+ super(session);
+ }
public void logEventCreated(LogEvent logEvent) {
System.out.println(logEvent);
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/WorkingMemoryFileLogger.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/WorkingMemoryFileLogger.java 2008-11-18 01:45:59 UTC (rev 23907)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/WorkingMemoryFileLogger.java 2008-11-18 01:47:04 UTC (rev 23908)
@@ -26,6 +26,7 @@
import org.drools.WorkingMemoryEventManager;
import org.drools.audit.event.LogEvent;
+import org.drools.runtime.StatefulKnowledgeSession;
import com.thoughtworks.xstream.XStream;
@@ -65,10 +66,15 @@
super( workingMemoryEventManager );
}
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+ public WorkingMemoryFileLogger(final StatefulKnowledgeSession session) {
+ super( session );
+ }
+
+ @SuppressWarnings("unchecked")
+ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
super.readExternal(in);
events = (List<LogEvent>)in.readObject();
- fileName = (String)in.readObject();
+ fileName = (String) in.readObject();
maxEventsInMemory = in.readInt();
nbOfFile = in.readInt();
split = in.readBoolean();
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/WorkingMemoryInMemoryLogger.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/WorkingMemoryInMemoryLogger.java 2008-11-18 01:45:59 UTC (rev 23907)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/WorkingMemoryInMemoryLogger.java 2008-11-18 01:47:04 UTC (rev 23908)
@@ -27,6 +27,8 @@
import org.drools.WorkingMemoryEventManager;
import org.drools.audit.event.LogEvent;
+import org.drools.runtime.StatefulKnowledgeSession;
+import org.drools.runtime.rule.StatefulRuleSession;
import com.thoughtworks.xstream.XStream;
@@ -43,13 +45,13 @@
public WorkingMemoryInMemoryLogger() {
}
- /**
- * Creates a new WorkingMemoryInMemoryLogger for the given working memory.
- * @param workingMemory
- */
public WorkingMemoryInMemoryLogger(final WorkingMemoryEventManager workingMemory) {
super( workingMemory );
}
+
+ public WorkingMemoryInMemoryLogger(final StatefulKnowledgeSession session) {
+ super( session );
+ }
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
super.readExternal(in);
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/WorkingMemoryLogger.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/WorkingMemoryLogger.java 2008-11-18 01:45:59 UTC (rev 23907)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/WorkingMemoryLogger.java 2008-11-18 01:47:04 UTC (rev 23908)
@@ -24,6 +24,7 @@
import java.util.List;
import java.util.Map;
+import org.drools.FactHandle;
import org.drools.WorkingMemory;
import org.drools.WorkingMemoryEventManager;
import org.drools.audit.event.ActivationLogEvent;
@@ -39,18 +40,24 @@
import org.drools.event.ActivationCancelledEvent;
import org.drools.event.ActivationCreatedEvent;
import org.drools.event.AfterActivationFiredEvent;
+import org.drools.event.AfterFunctionRemovedEvent;
import org.drools.event.AfterPackageAddedEvent;
import org.drools.event.AfterPackageRemovedEvent;
+import org.drools.event.AfterRuleAddedEvent;
import org.drools.event.AfterRuleBaseLockedEvent;
import org.drools.event.AfterRuleBaseUnlockedEvent;
+import org.drools.event.AfterRuleRemovedEvent;
import org.drools.event.AgendaEventListener;
import org.drools.event.AgendaGroupPoppedEvent;
import org.drools.event.AgendaGroupPushedEvent;
import org.drools.event.BeforeActivationFiredEvent;
+import org.drools.event.BeforeFunctionRemovedEvent;
import org.drools.event.BeforePackageAddedEvent;
import org.drools.event.BeforePackageRemovedEvent;
+import org.drools.event.BeforeRuleAddedEvent;
import org.drools.event.BeforeRuleBaseLockedEvent;
import org.drools.event.BeforeRuleBaseUnlockedEvent;
+import org.drools.event.BeforeRuleRemovedEvent;
import org.drools.event.ObjectInsertedEvent;
import org.drools.event.ObjectRetractedEvent;
import org.drools.event.ObjectUpdatedEvent;
@@ -62,14 +69,9 @@
import org.drools.event.RuleFlowNodeTriggeredEvent;
import org.drools.event.RuleFlowStartedEvent;
import org.drools.event.WorkingMemoryEventListener;
-import org.drools.event.AfterFunctionRemovedEvent;
-import org.drools.event.AfterRuleAddedEvent;
-import org.drools.event.AfterRuleRemovedEvent;
-import org.drools.event.BeforeFunctionRemovedEvent;
-import org.drools.event.BeforeRuleAddedEvent;
-import org.drools.event.BeforeRuleRemovedEvent;
+import org.drools.impl.StatefulKnowledgeSessionImpl;
import org.drools.rule.Declaration;
-import org.drools.FactHandle;
+import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.spi.Activation;
import org.drools.spi.Tuple;
@@ -94,7 +96,7 @@
RuleFlowEventListener,
RuleBaseEventListener {
- private List filters = new ArrayList();
+ private List<ILogEventFilter> filters = new ArrayList<ILogEventFilter>();
public WorkingMemoryLogger() {
}
@@ -110,9 +112,14 @@
workingMemoryEventManager.addEventListener( (RuleFlowEventListener) this );
workingMemoryEventManager.addEventListener( (RuleBaseEventListener) this );
}
+
+ public WorkingMemoryLogger(final StatefulKnowledgeSession session) {
+ this(((StatefulKnowledgeSessionImpl) session).session);
+ }
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- filters = (List)in.readObject();
+ @SuppressWarnings("unchecked")
+ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+ filters = (List<ILogEventFilter>) in.readObject();
}
public void writeExternal(ObjectOutput out) throws IOException {
@@ -135,9 +142,7 @@
* @param logEvent
*/
private void filterLogEvent(final LogEvent logEvent) {
- final Iterator iterator = this.filters.iterator();
- while ( iterator.hasNext() ) {
- final ILogEventFilter filter = (ILogEventFilter) iterator.next();
+ for ( ILogEventFilter filter: this.filters) {
// do nothing if one of the filters doesn't accept the event
if ( !filter.acceptEvent( logEvent ) ) {
return;
@@ -268,8 +273,8 @@
private String extractDeclarations(final Activation activation, final WorkingMemory workingMemory) {
final StringBuffer result = new StringBuffer();
final Tuple tuple = activation.getTuple();
- final Map declarations = activation.getSubRule().getOuterDeclarations();
- for ( Iterator it = declarations.values().iterator(); it.hasNext(); ) {
+ final Map<?, ?> declarations = activation.getSubRule().getOuterDeclarations();
+ for ( Iterator<?> it = declarations.values().iterator(); it.hasNext(); ) {
final Declaration declaration = (Declaration) it.next();
final FactHandle handle = tuple.get( declaration );
if ( handle instanceof InternalFactHandle ) {
More information about the jboss-svn-commits
mailing list