Skip to content

Commit

Permalink
refactored some packaging
Browse files Browse the repository at this point in the history
  • Loading branch information
mdproctor committed Aug 14, 2024
1 parent d7d149d commit 539d93a
Show file tree
Hide file tree
Showing 246 changed files with 796 additions and 706 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

import org.drools.base.common.NetworkNode;
import org.drools.core.reteoo.AlphaNode;
import org.drools.core.reteoo.Sink;
import org.drools.base.reteoo.Sink;
import org.drools.base.rule.ContextEntry;
import org.drools.core.util.index.AlphaRangeIndex;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import com.github.javaparser.ast.expr.NameExpr;
import com.github.javaparser.ast.stmt.Statement;
import org.drools.base.reteoo.NodeTypeEnums;
import org.drools.core.reteoo.Sink;
import org.drools.base.reteoo.Sink;

import static com.github.javaparser.StaticJavaParser.parseStatement;
import static com.github.javaparser.ast.NodeList.nodeList;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import org.drools.core.reteoo.AlphaNode;
import org.drools.core.reteoo.BetaNode;
import org.drools.core.reteoo.LeftInputAdapterNode;
import org.drools.core.reteoo.Sink;
import org.drools.base.reteoo.Sink;
import org.drools.core.reteoo.WindowNode;
import org.drools.base.rule.ContextEntry;
import org.drools.base.rule.IndexableConstraint;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
import com.github.javaparser.ast.type.VoidType;
import org.drools.base.common.NetworkNode;
import org.drools.core.reteoo.AlphaNode;
import org.drools.core.reteoo.Sink;
import org.drools.base.reteoo.Sink;

import static com.github.javaparser.StaticJavaParser.parseStatement;
import static com.github.javaparser.ast.NodeList.nodeList;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import com.github.javaparser.ast.expr.NameExpr;
import com.github.javaparser.ast.stmt.Statement;
import org.drools.base.reteoo.NodeTypeEnums;
import org.drools.core.reteoo.Sink;
import org.drools.base.reteoo.Sink;

import static com.github.javaparser.StaticJavaParser.parseStatement;
import static com.github.javaparser.ast.NodeList.nodeList;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
import org.drools.core.reteoo.LeftInputAdapterNode;
import org.drools.core.reteoo.ModifyPreviousTuples;
import org.drools.core.reteoo.ObjectTypeNode;
import org.drools.core.reteoo.Sink;
import org.drools.base.reteoo.Sink;
import org.drools.core.reteoo.WindowNode;
import org.drools.base.rule.IndexableConstraint;
import org.drools.core.common.PropagationContext;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
import com.github.javaparser.ast.type.VoidType;
import org.drools.base.common.NetworkNode;
import org.drools.core.reteoo.AlphaNode;
import org.drools.core.reteoo.Sink;
import org.drools.base.reteoo.Sink;

import static com.github.javaparser.StaticJavaParser.parseExpression;
import static com.github.javaparser.StaticJavaParser.parseStatement;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

import org.drools.base.RuleBase;
import org.drools.base.rule.accessor.GlobalResolver;
import org.drools.core.phreak.PropagationEntry;
import org.drools.core.time.TimerService;
import org.drools.base.phreak.PropagationEntry;
import org.drools.base.time.TimerService;
import org.kie.api.runtime.KieSessionConfiguration;

import java.util.function.Consumer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import org.drools.base.base.SalienceInteger;
import org.drools.base.base.ValueResolver;
import org.drools.base.reteoo.BaseTuple;
import org.drools.base.reteoo.sequencing.Sequence;
import org.drools.base.rule.ConsequenceMetaData;
import org.drools.base.rule.Declaration;
import org.drools.base.rule.Dialectable;
Expand Down Expand Up @@ -545,6 +546,11 @@ public void addPattern(final RuleConditionElement element) {
this.lhsRoot.addChild( element );
}

public void addSequence(final Sequence element) {
this.dirty = true;
this.lhsRoot.addChild( element );
}

/**
* Retrieve the <code>List</code> of <code>Conditions</code> for this
* rule.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.drools.core.phreak;
package org.drools.base.phreak;

import org.drools.base.base.ValueResolver;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.drools.core.phreak.actions;
package org.drools.base.phreak.actions;

import org.drools.base.base.ValueResolver;
import org.drools.core.phreak.PropagationEntry;
import org.drools.base.phreak.PropagationEntry;

public abstract class AbstractPropagationEntry<T extends ValueResolver> implements PropagationEntry<T> {
protected PropagationEntry next;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.drools.core.reteoo;
package org.drools.base.reteoo;

import org.drools.base.base.ValueResolver;
import org.drools.base.rule.constraint.AlphaNodeFieldConstraint;
import org.drools.core.util.AbstractLinkedListNode;
import org.drools.core.util.LinkedList;
import org.drools.base.util.AbstractLinkedListNode;
import org.drools.base.util.LinkedList;
import org.kie.api.runtime.rule.FactHandle;

public class DynamicFilter extends AbstractLinkedListNode<DynamicFilter> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.drools.core.reteoo;
package org.drools.base.reteoo;

import org.drools.base.rule.constraint.AlphaNodeFieldConstraint;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.drools.core.reteoo;
package org.drools.base.reteoo;

public class ObjectTypeNodeId {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package org.drools.core.reteoo;
package org.drools.base.reteoo;

import org.drools.base.base.ValueResolver;
import org.drools.core.reteoo.sequencing.Sequence.SequenceMemory;
import org.drools.core.reteoo.sequencing.signalprocessors.SignalProcessor;
import org.drools.core.reteoo.sequencing.signalprocessors.SignalStatus;
import org.drools.core.util.AbstractLinkedListNode;
import org.drools.base.reteoo.sequencing.Sequence.SequenceMemory;
import org.drools.base.reteoo.sequencing.signalprocessors.SignalProcessor;
import org.drools.base.reteoo.sequencing.signalprocessors.SignalStatus;
import org.drools.base.util.AbstractLinkedListNode;
import org.kie.api.runtime.rule.FactHandle;

public class SignalAdapter extends AbstractLinkedListNode<SignalAdapter> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.drools.core.reteoo;
package org.drools.base.reteoo;

import org.drools.base.common.NetworkNode;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.drools.core.reteoo.sequencing;
package org.drools.base.reteoo.sequencing;

import org.drools.core.reteoo.DynamicFilter;
import org.drools.base.reteoo.DynamicFilter;

public interface DynamicFilters {
DynamicFilter getActiveDynamicFilter(int filterIndex);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
package org.drools.core.reteoo.sequencing;
package org.drools.base.reteoo.sequencing;

import org.drools.base.base.ValueResolver;
import org.drools.base.phreak.actions.AbstractPropagationEntry;
import org.drools.base.reteoo.DynamicFilter;
import org.drools.base.reteoo.DynamicFilterProto;
import org.drools.base.reteoo.sequencing.signalprocessors.ConditionalSignalCounter;
import org.drools.base.reteoo.sequencing.signalprocessors.LogicGate;
import org.drools.base.reteoo.sequencing.signalprocessors.SignalStatus;
import org.drools.base.reteoo.sequencing.steps.LogicCircuitStep;
import org.drools.base.reteoo.sequencing.steps.Step;
import org.drools.base.reteoo.sequencing.steps.Step.StepFactory;
import org.drools.base.rule.Declaration;
import org.drools.base.rule.Pattern;
import org.drools.base.rule.RuleConditionElement;
import org.drools.base.time.JobHandle;
import org.drools.base.time.Trigger;
import org.drools.base.time.Timer;
import org.drools.core.phreak.actions.AbstractPropagationEntry;
import org.drools.core.reteoo.DynamicFilter;
import org.drools.core.reteoo.SignalAdapter;
import org.drools.core.reteoo.sequencing.signalprocessors.ConditionalSignalCounter;
import org.drools.core.reteoo.sequencing.signalprocessors.LogicGate;
import org.drools.core.reteoo.sequencing.signalprocessors.SignalStatus;
import org.drools.core.reteoo.sequencing.steps.Step;
import org.drools.core.reteoo.sequencing.steps.LogicCircuitStep;
import org.drools.core.reteoo.sequencing.steps.Step.StepFactory;
import org.drools.base.reteoo.SignalAdapter;
import org.drools.base.time.Job;
import org.drools.base.time.JobContext;

Expand All @@ -31,6 +33,8 @@
public class Sequence implements RuleConditionElement {
private final int sequenceIndex;

private Pattern[] filters;

private Step[] steps;

private LogicGate[] gates;
Expand All @@ -52,6 +56,14 @@ public Sequence(int sequenceIndex, StepFactory... stepFactories) {
controller = new DefaultController();
}

public Pattern[] getFilters() {
return filters;
}

public void setFilters(Pattern[] filters) {
this.filters = filters;
}

public int getOutputSize() {
return outputSize;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package org.drools.core.reteoo.sequencing;
package org.drools.base.reteoo.sequencing;

import org.drools.base.base.ValueResolver;
import org.drools.base.reteoo.BaseTuple;
import org.drools.core.reteoo.sequencing.Sequence.SequenceMemory;
import org.drools.core.reteoo.sequencing.steps.Step;
import org.drools.core.reteoo.sequencing.steps.SequenceStep;
import org.drools.base.reteoo.sequencing.Sequence.SequenceMemory;
import org.drools.base.reteoo.sequencing.steps.SequenceStep;
import org.drools.base.reteoo.sequencing.steps.Step;

import java.util.ArrayList;
import java.util.List;
Expand Down Expand Up @@ -41,7 +40,7 @@ public void start(SequencerMemory memory, ValueResolver valueResolver) {

public void stop(SequencerMemory memory, ValueResolver valueResolver) {
// deactive each active sequence on the stack.
ArrayList<SequenceMemory> stack = memory.getSequenceStack();
ArrayList<SequenceMemory> stack = memory.getSequenceStack();
for (int i = stack.size()-1; i >= 0; i--) {
SequenceMemory sequenceMemory = stack.get(i);
sequenceMemory.getSequence().getSteps()[sequenceMemory.getStep()].deactivate(sequenceMemory, valueResolver);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package org.drools.core.reteoo.sequencing;
package org.drools.base.reteoo.sequencing;

import org.drools.base.reteoo.BaseTuple;
import org.drools.core.reteoo.DynamicFilter;
import org.drools.core.reteoo.Sink;
import org.drools.core.reteoo.sequencing.Sequence.SequenceMemory;
import org.drools.core.util.CircularArrayList;
import org.drools.base.reteoo.DynamicFilter;
import org.drools.base.reteoo.Sink;
import org.drools.base.reteoo.sequencing.Sequence.SequenceMemory;
import org.drools.base.util.CircularArrayList;

import java.util.ArrayList;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.drools.core.reteoo.sequencing.signalprocessors;
package org.drools.base.reteoo.sequencing.signalprocessors;

import org.drools.base.base.ValueResolver;
import org.drools.base.util.index.ConstraintTypeOperator;
import org.drools.core.reteoo.sequencing.Sequence.SequenceMemory;
import org.drools.base.reteoo.sequencing.Sequence.SequenceMemory;

import java.util.function.Consumer;
import java.util.function.LongPredicate;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.drools.core.reteoo.sequencing.signalprocessors;
package org.drools.base.reteoo.sequencing.signalprocessors;

public class Gates {
public static boolean and(long a, long b) {return a == b;}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.drools.core.reteoo.sequencing.signalprocessors;
package org.drools.base.reteoo.sequencing.signalprocessors;

public class LogicCircuit {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package org.drools.core.reteoo.sequencing.signalprocessors;
package org.drools.base.reteoo.sequencing.signalprocessors;

import org.drools.base.base.ValueResolver;
import org.drools.base.phreak.actions.AbstractPropagationEntry;
import org.drools.base.time.JobHandle;
import org.drools.base.time.Trigger;
import org.drools.base.time.Timer;
import org.drools.core.phreak.actions.AbstractPropagationEntry;
import org.drools.core.reteoo.sequencing.signalprocessors.LogicCircuit.LongBiPredicate;
import org.drools.core.reteoo.sequencing.Sequence.SequenceMemory;
import org.drools.base.reteoo.sequencing.signalprocessors.LogicCircuit.LongBiPredicate;
import org.drools.base.reteoo.sequencing.Sequence.SequenceMemory;
import org.drools.base.time.Job;
import org.drools.base.time.JobContext;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.drools.core.reteoo.sequencing.signalprocessors;
package org.drools.base.reteoo.sequencing.signalprocessors;

import org.drools.base.base.ValueResolver;
import org.drools.core.reteoo.sequencing.Sequence.SequenceMemory;
import org.drools.base.reteoo.sequencing.Sequence.SequenceMemory;

public class LogicGateOutputSignalProcessor extends SignalProcessor {
private final SignalIndex[] gates;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.drools.core.reteoo.sequencing.signalprocessors;
package org.drools.base.reteoo.sequencing.signalprocessors;

public class SignalIndex {
private final LogicGate gate;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.drools.core.reteoo.sequencing.signalprocessors;
package org.drools.base.reteoo.sequencing.signalprocessors;

import org.drools.base.base.ValueResolver;
import org.drools.core.reteoo.sequencing.Sequence.SequenceMemory;
import org.drools.base.reteoo.sequencing.Sequence.SequenceMemory;

public abstract class SignalProcessor {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.drools.core.reteoo.sequencing.signalprocessors;
package org.drools.base.reteoo.sequencing.signalprocessors;

public enum SignalStatus {
MATCHED(0),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.drools.core.reteoo.sequencing.signalprocessors;
package org.drools.base.reteoo.sequencing.signalprocessors;

import org.drools.base.base.ValueResolver;
import org.drools.core.reteoo.sequencing.Sequence.SequenceMemory;
import org.drools.base.reteoo.sequencing.Sequence.SequenceMemory;

public class TerminatingSignalProcessor extends SignalProcessor {
private static final TerminatingSignalProcessor INSTANCE = new TerminatingSignalProcessor();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.drools.core.reteoo.sequencing.steps;
package org.drools.base.reteoo.sequencing.steps;

import org.drools.base.base.ValueResolver;
import org.drools.core.reteoo.sequencing.Sequence;
import org.drools.core.reteoo.sequencing.Sequence.SequenceMemory;
import org.drools.core.reteoo.sequencing.SequencerMemory;
import org.drools.base.reteoo.sequencing.Sequence;
import org.drools.base.reteoo.sequencing.Sequence.SequenceMemory;
import org.drools.base.reteoo.sequencing.SequencerMemory;

public abstract class AbstractStep implements Step {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.drools.core.reteoo.sequencing.steps;
package org.drools.base.reteoo.sequencing.steps;

import org.drools.base.base.ValueResolver;
import org.drools.core.reteoo.sequencing.Sequence;
import org.drools.core.reteoo.sequencing.Sequence.SequenceMemory;
import org.drools.base.reteoo.sequencing.Sequence;
import org.drools.base.reteoo.sequencing.Sequence.SequenceMemory;

import java.util.function.Consumer;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.drools.core.reteoo.sequencing.steps;
package org.drools.base.reteoo.sequencing.steps;

import org.drools.core.reteoo.sequencing.Sequence;
import org.drools.core.reteoo.sequencing.Sequence.SequenceMemory;
import org.drools.base.reteoo.sequencing.Sequence;
import org.drools.base.reteoo.sequencing.Sequence.SequenceMemory;

import java.util.function.Consumer;

Expand Down
Loading

0 comments on commit 539d93a

Please sign in to comment.