This is an automated email from the ASF dual-hosted git repository.
Rikkola pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie.git
The following commit(s) were added to refs/heads/main by this push:
new b50eecb1c95 refactor: move util linked-list/iterator types from
drools-core to drools-base (#6884)
b50eecb1c95 is described below
commit b50eecb1c9591f49c5ab989ab7a6da0dbc1f10d4
Author: Toni Rikkola <[email protected]>
AuthorDate: Fri Aug 14 13:54:00 2026 +0300
refactor: move util linked-list/iterator types from drools-core to
drools-base (#6884)
AbstractLinkedListNode, DoubleLinkedEntry, SingleLinkedEntry, LinkedList,
LinkedListEntry, FastIterator, and Iterator relocated from
org.drools.core.util to org.drools.base.util so that drools-base sequencing
infrastructure (DynamicFilter, SignalAdapter) can depend on them without
a circular dependency on drools-core.
All import sites updated (~83 files across drools-core, drools-tms,
drools-beliefs, drools-kiesession, drools-serialization-protobuf,
drools-fastutil, drools-traits).
Closes apache/incubator-kie-issues#2388
Co-authored-by: Toni Rikkola <[email protected]>
Co-authored-by: Mark Proctor <[email protected]>
Co-authored-by: Bob <[email protected]>
---
.../java/org/drools/base}/util/AbstractLinkedListNode.java | 2 +-
.../main/java/org/drools/base}/util/DoubleLinkedEntry.java | 2 +-
.../src/main/java/org/drools/base}/util/FastIterator.java | 2 +-
.../src/main/java/org/drools/base}/util/Iterator.java | 2 +-
.../src/main/java/org/drools/base}/util/LinkedList.java | 9 ++++-----
.../src/main/java/org/drools/base}/util/LinkedListEntry.java | 2 +-
.../main/java/org/drools/base}/util/SingleLinkedEntry.java | 2 +-
.../java/org/drools/beliefs/bayes/BayesHardEvidence.java | 2 +-
.../java/org/drools/beliefs/bayes/NonConflictingModeSet.java | 2 +-
.../java/org/drools/core/common/ActivationGroupImpl.java | 2 +-
.../java/org/drools/core/common/ActivationGroupNode.java | 2 +-
.../src/main/java/org/drools/core/common/ActivationNode.java | 2 +-
.../main/java/org/drools/core/common/DefaultEventHandle.java | 2 +-
.../main/java/org/drools/core/common/DefaultFactHandle.java | 2 +-
.../src/main/java/org/drools/core/common/EqualityKey.java | 2 +-
.../java/org/drools/core/common/InternalActivationGroup.java | 2 +-
drools-core/src/main/java/org/drools/core/common/Memory.java | 2 +-
.../java/org/drools/core/impl/ActivationsManagerImpl.java | 2 +-
.../main/java/org/drools/core/phreak/EagerPhreakBuilder.java | 2 +-
.../main/java/org/drools/core/phreak/LazyPhreakBuilder.java | 2 +-
.../java/org/drools/core/phreak/PhreakAccumulateNode.java | 2 +-
.../main/java/org/drools/core/phreak/PhreakExistsNode.java | 2 +-
.../src/main/java/org/drools/core/phreak/PhreakFromNode.java | 4 ++--
.../src/main/java/org/drools/core/phreak/PhreakJoinNode.java | 2 +-
.../java/org/drools/core/phreak/PhreakNodeOperations.java | 2 +-
.../src/main/java/org/drools/core/phreak/PhreakNotNode.java | 2 +-
.../java/org/drools/core/phreak/PhreakQueryTerminalNode.java | 2 +-
.../src/main/java/org/drools/core/phreak/RuleAgendaItem.java | 4 ++--
.../src/main/java/org/drools/core/phreak/RuleExecutor.java | 2 +-
.../org/drools/core/phreak/RuleNetworkEvaluatorImpl.java | 2 +-
.../src/main/java/org/drools/core/phreak/StackEntry.java | 2 +-
.../src/main/java/org/drools/core/reteoo/AccumulateNode.java | 2 +-
.../main/java/org/drools/core/reteoo/AsyncReceiveNode.java | 2 +-
.../src/main/java/org/drools/core/reteoo/AsyncSendNode.java | 2 +-
.../src/main/java/org/drools/core/reteoo/BetaMemory.java | 2 +-
.../src/main/java/org/drools/core/reteoo/BetaNode.java | 2 +-
.../java/org/drools/core/reteoo/ConditionalBranchNode.java | 2 +-
.../main/java/org/drools/core/reteoo/EvalConditionNode.java | 2 +-
.../src/main/java/org/drools/core/reteoo/FromNode.java | 2 +-
.../java/org/drools/core/reteoo/LeftInputAdapterNode.java | 2 +-
.../main/java/org/drools/core/reteoo/NotNodeLeftTuple.java | 2 +-
.../src/main/java/org/drools/core/reteoo/PathMemory.java | 2 +-
.../main/java/org/drools/core/reteoo/QueryElementNode.java | 2 +-
.../src/main/java/org/drools/core/reteoo/SegmentMemory.java | 4 ++--
.../src/main/java/org/drools/core/reteoo/TimerNode.java | 2 +-
drools-core/src/main/java/org/drools/core/reteoo/Tuple.java | 2 +-
.../src/main/java/org/drools/core/reteoo/TupleMemory.java | 2 +-
.../java/org/drools/core/time/impl/AbstractJobHandle.java | 4 ++--
.../main/java/org/drools/core/util/AbstractHashTable.java | 1 +
.../org/drools/core/util/DeserializationFilterHelper.java | 2 +-
.../main/java/org/drools/core/util/HashTableIterator.java | 3 +++
.../src/main/java/org/drools/core/util/TupleRBTree.java | 1 +
.../java/org/drools/core/util/index/TupleIndexHashTable.java | 6 +++---
.../java/org/drools/core/util/index/TupleIndexRBTree.java | 4 ++--
.../src/main/java/org/drools/core/util/index/TupleList.java | 6 +++---
.../test/java/org/drools/core/util/LeftTupleRBTreeTest.java | 1 +
.../src/test/java/org/drools/core/util/LinkedListTest.java | 3 +++
.../java/org/drools/fastutil/FastUtilHashTupleMemory.java | 6 +++---
.../main/java/org/drools/fastutil/FastUtilTreeMemory.java | 4 ++--
.../java/org/drools/fastutil/FastUtilTreeMemoryTest.java | 2 +-
.../java/org/drools/kiesession/agenda/DefaultAgenda.java | 2 +-
.../org/drools/kiesession/debug/AccumulateNodeVisitor.java | 2 +-
.../java/org/drools/kiesession/debug/FromNodeVisitor.java | 2 +-
.../test/java/org/drools/kiesession/MockInternalMatch.java | 2 +-
.../drools/metric/phreak/PhreakQueryTerminalNodeMetric.java | 2 +-
.../serialization/protobuf/ProtobufOutputMarshaller.java | 12 ++++++------
.../serialization/protobuf/iterators/ActivationIterator.java | 2 +-
.../serialization/protobuf/iterators/LeftTupleIterator.java | 4 ++--
.../protobuf/iterators/PhreakActivationIterator.java | 2 +-
.../protobuf/iterators/TerminalNodeIterator.java | 2 +-
.../org/drools/compiler/integrationtests/IndexingTest.java | 2 +-
.../drools/compiler/integrationtests/operators/NotTest.java | 2 +-
.../drools/mvel/AbstractTupleIndexHashTableIteratorTest.java | 2 +-
.../test/java/org/drools/mvel/BaseBetaConstraintsTest.java | 4 ++--
.../org/drools/mvel/LeftTupleIndexHashTableIteratorTest.java | 2 +-
.../drools/mvel/RightTupleIndexHashTableIteratorTest.java | 2 +-
.../mvel/compiler/common/InternalMatchIteratorTest.java | 2 +-
.../mvel/compiler/common/TerminalNodeIteratorTest.java | 2 +-
.../org/drools/mvel/compiler/oopath/OOPathReactiveTest.java | 2 +-
.../org/drools/mvel/integrationtests/phreak/Scenario.java | 2 +-
.../org/drools/mvel/util/RightTupleIndexHashTableTest.java | 2 +-
.../src/main/java/org/drools/tms/LogicalDependency.java | 2 +-
drools-tms/src/main/java/org/drools/tms/SimpleMode.java | 2 +-
.../main/java/org/drools/tms/TruthMaintenanceSystemImpl.java | 2 +-
.../drools/tms/TruthMaintenanceSystemKnowledgeHelper.java | 4 ++--
.../tms/agenda/TruthMaintenanceSystemInternalMatch.java | 2 +-
.../TruthMaintenanceSystemRuleTerminalNodeLeftTuple.java | 2 +-
.../src/main/java/org/drools/tms/beliefsystem/BeliefSet.java | 2 +-
.../java/org/drools/tms/beliefsystem/ModedAssertion.java | 2 +-
.../tms/beliefsystem/defeasible/DefeasibleBeliefSet.java | 4 ++--
.../org/drools/tms/beliefsystem/jtms/JTMSBeliefSetImpl.java | 2 +-
.../main/java/org/drools/tms/beliefsystem/jtms/JTMSMode.java | 2 +-
.../org/drools/tms/beliefsystem/simple/SimpleBeliefSet.java | 4 ++--
.../tms/beliefsystem/simple/SimpleLogicalDependency.java | 2 +-
.../src/test/java/org/drools/tms/TMSMockInternalMatch.java | 2 +-
.../main/java/org/drools/traits/core/factmodel/Triple.java | 2 +-
.../java/org/drools/traits/core/factmodel/TripleImpl.java | 2 +-
.../java/org/drools/traits/core/factmodel/TripleStore.java | 2 +-
98 files changed, 127 insertions(+), 119 deletions(-)
diff --git
a/drools-core/src/main/java/org/drools/core/util/AbstractLinkedListNode.java
b/drools-base/src/main/java/org/drools/base/util/AbstractLinkedListNode.java
similarity index 98%
rename from
drools-core/src/main/java/org/drools/core/util/AbstractLinkedListNode.java
rename to
drools-base/src/main/java/org/drools/base/util/AbstractLinkedListNode.java
index 08564d9d7e3..f27a11aadeb 100644
--- a/drools-core/src/main/java/org/drools/core/util/AbstractLinkedListNode.java
+++ b/drools-base/src/main/java/org/drools/base/util/AbstractLinkedListNode.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.drools.core.util;
+package org.drools.base.util;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
diff --git
a/drools-core/src/main/java/org/drools/core/util/DoubleLinkedEntry.java
b/drools-base/src/main/java/org/drools/base/util/DoubleLinkedEntry.java
similarity index 97%
rename from
drools-core/src/main/java/org/drools/core/util/DoubleLinkedEntry.java
rename to drools-base/src/main/java/org/drools/base/util/DoubleLinkedEntry.java
index 190f593fc1b..70439df62c1 100644
--- a/drools-core/src/main/java/org/drools/core/util/DoubleLinkedEntry.java
+++ b/drools-base/src/main/java/org/drools/base/util/DoubleLinkedEntry.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.drools.core.util;
+package org.drools.base.util;
/**
* Items placed in a <code>LinkedList<code> must implement this interface .
diff --git a/drools-core/src/main/java/org/drools/core/util/FastIterator.java
b/drools-base/src/main/java/org/drools/base/util/FastIterator.java
similarity index 98%
rename from drools-core/src/main/java/org/drools/core/util/FastIterator.java
rename to drools-base/src/main/java/org/drools/base/util/FastIterator.java
index 9026791cb2f..aa6e887bdee 100644
--- a/drools-core/src/main/java/org/drools/core/util/FastIterator.java
+++ b/drools-base/src/main/java/org/drools/base/util/FastIterator.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.drools.core.util;
+package org.drools.base.util;
public interface FastIterator<T> {
public class NullFastIterator<T> implements FastIterator<T> {
diff --git a/drools-core/src/main/java/org/drools/core/util/Iterator.java
b/drools-base/src/main/java/org/drools/base/util/Iterator.java
similarity index 96%
rename from drools-core/src/main/java/org/drools/core/util/Iterator.java
rename to drools-base/src/main/java/org/drools/base/util/Iterator.java
index 8624a77d115..f22a5962663 100644
--- a/drools-core/src/main/java/org/drools/core/util/Iterator.java
+++ b/drools-base/src/main/java/org/drools/base/util/Iterator.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.drools.core.util;
+package org.drools.base.util;
import java.io.Serializable;
diff --git a/drools-core/src/main/java/org/drools/core/util/LinkedList.java
b/drools-base/src/main/java/org/drools/base/util/LinkedList.java
similarity index 98%
rename from drools-core/src/main/java/org/drools/core/util/LinkedList.java
rename to drools-base/src/main/java/org/drools/base/util/LinkedList.java
index d2c006be090..4f3cacd458c 100644
--- a/drools-core/src/main/java/org/drools/core/util/LinkedList.java
+++ b/drools-base/src/main/java/org/drools/base/util/LinkedList.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.drools.core.util;
+package org.drools.base.util;
import java.io.Externalizable;
import java.io.IOException;
@@ -25,7 +25,6 @@ import java.io.ObjectOutput;
import java.util.Collection;
import java.util.NoSuchElementException;
-import org.drools.core.reteoo.TupleImpl;
/**
* This is a simple linked implementation. Each node must implement
</code>LinkedListNode<code> so that it references
@@ -391,15 +390,15 @@ public class LinkedList<T extends DoubleLinkedEntry<T>>
}
// All the tuples except for TMS are AbstractTuple
- public static class LinkedListFastIterator implements
FastIterator<TupleImpl> {
+ public static class LinkedListFastIterator<K extends DoubleLinkedEntry<K>>
implements FastIterator<K> {
- public TupleImpl next(TupleImpl object) {
+ public K next(K object) {
return object.getNext();
}
public boolean isFullIterator() {
return false;
- }
+ }
}
// Special case of iterator that uses K extends Entry<K> to support TMS
custom objects
diff --git
a/drools-core/src/main/java/org/drools/core/util/LinkedListEntry.java
b/drools-base/src/main/java/org/drools/base/util/LinkedListEntry.java
similarity index 98%
rename from drools-core/src/main/java/org/drools/core/util/LinkedListEntry.java
rename to drools-base/src/main/java/org/drools/base/util/LinkedListEntry.java
index ec83e6d248e..57b20facf98 100644
--- a/drools-core/src/main/java/org/drools/core/util/LinkedListEntry.java
+++ b/drools-base/src/main/java/org/drools/base/util/LinkedListEntry.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.drools.core.util;
+package org.drools.base.util;
import java.io.Externalizable;
import java.io.IOException;
diff --git
a/drools-core/src/main/java/org/drools/core/util/SingleLinkedEntry.java
b/drools-base/src/main/java/org/drools/base/util/SingleLinkedEntry.java
similarity index 96%
rename from
drools-core/src/main/java/org/drools/core/util/SingleLinkedEntry.java
rename to drools-base/src/main/java/org/drools/base/util/SingleLinkedEntry.java
index e936a792bf4..528ea1a0e7b 100644
--- a/drools-core/src/main/java/org/drools/core/util/SingleLinkedEntry.java
+++ b/drools-base/src/main/java/org/drools/base/util/SingleLinkedEntry.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.drools.core.util;
+package org.drools.base.util;
public interface SingleLinkedEntry<T extends SingleLinkedEntry<T>>{
diff --git
a/drools-beliefs/src/main/java/org/drools/beliefs/bayes/BayesHardEvidence.java
b/drools-beliefs/src/main/java/org/drools/beliefs/bayes/BayesHardEvidence.java
index 3b333bb7438..d0bd1ccf56e 100644
---
a/drools-beliefs/src/main/java/org/drools/beliefs/bayes/BayesHardEvidence.java
+++
b/drools-beliefs/src/main/java/org/drools/beliefs/bayes/BayesHardEvidence.java
@@ -23,7 +23,7 @@ import java.util.Arrays;
import org.drools.tms.beliefsystem.BeliefSystem;
import org.drools.tms.beliefsystem.ModedAssertion;
import org.drools.tms.LogicalDependency;
-import org.drools.core.util.AbstractLinkedListNode;
+import org.drools.base.util.AbstractLinkedListNode;
import org.drools.base.beliefsystem.Mode;
public class BayesHardEvidence<M extends BayesHardEvidence<M>> extends
AbstractLinkedListNode<M> implements ModedAssertion<M> {
diff --git
a/drools-beliefs/src/main/java/org/drools/beliefs/bayes/NonConflictingModeSet.java
b/drools-beliefs/src/main/java/org/drools/beliefs/bayes/NonConflictingModeSet.java
index b3ffe84fe33..82029ca22f5 100644
---
a/drools-beliefs/src/main/java/org/drools/beliefs/bayes/NonConflictingModeSet.java
+++
b/drools-beliefs/src/main/java/org/drools/beliefs/bayes/NonConflictingModeSet.java
@@ -24,7 +24,7 @@ import org.drools.tms.beliefsystem.ModedAssertion;
import org.drools.core.common.InternalFactHandle;
import org.drools.core.common.WorkingMemoryAction;
import org.drools.core.common.PropagationContext;
-import org.drools.core.util.LinkedList;
+import org.drools.base.util.LinkedList;
public class NonConflictingModeSet<M extends ModedAssertion<M>> extends
LinkedList<M> implements BeliefSet<M> {
BayesBeliefSystem<? extends ModedAssertion> beliefSystem;
diff --git
a/drools-core/src/main/java/org/drools/core/common/ActivationGroupImpl.java
b/drools-core/src/main/java/org/drools/core/common/ActivationGroupImpl.java
index 474843e79fb..a88887ed33d 100644
--- a/drools-core/src/main/java/org/drools/core/common/ActivationGroupImpl.java
+++ b/drools-core/src/main/java/org/drools/core/common/ActivationGroupImpl.java
@@ -19,7 +19,7 @@
package org.drools.core.common;
import org.drools.core.rule.consequence.InternalMatch;
-import org.drools.core.util.LinkedList;
+import org.drools.base.util.LinkedList;
public class ActivationGroupImpl
implements
diff --git
a/drools-core/src/main/java/org/drools/core/common/ActivationGroupNode.java
b/drools-core/src/main/java/org/drools/core/common/ActivationGroupNode.java
index 293aab549b5..695897402b0 100644
--- a/drools-core/src/main/java/org/drools/core/common/ActivationGroupNode.java
+++ b/drools-core/src/main/java/org/drools/core/common/ActivationGroupNode.java
@@ -19,7 +19,7 @@
package org.drools.core.common;
import org.drools.core.rule.consequence.InternalMatch;
-import org.drools.core.util.AbstractLinkedListNode;
+import org.drools.base.util.AbstractLinkedListNode;
public class ActivationGroupNode extends
AbstractLinkedListNode<ActivationGroupNode> {
diff --git
a/drools-core/src/main/java/org/drools/core/common/ActivationNode.java
b/drools-core/src/main/java/org/drools/core/common/ActivationNode.java
index 2d6d8f9293f..670b2530e2c 100644
--- a/drools-core/src/main/java/org/drools/core/common/ActivationNode.java
+++ b/drools-core/src/main/java/org/drools/core/common/ActivationNode.java
@@ -19,7 +19,7 @@
package org.drools.core.common;
import org.drools.core.rule.consequence.InternalMatch;
-import org.drools.core.util.AbstractLinkedListNode;
+import org.drools.base.util.AbstractLinkedListNode;
public class ActivationNode extends AbstractLinkedListNode<ActivationNode> {
diff --git
a/drools-core/src/main/java/org/drools/core/common/DefaultEventHandle.java
b/drools-core/src/main/java/org/drools/core/common/DefaultEventHandle.java
index c7d5643a3f4..699ad8f78ff 100644
--- a/drools-core/src/main/java/org/drools/core/common/DefaultEventHandle.java
+++ b/drools-core/src/main/java/org/drools/core/common/DefaultEventHandle.java
@@ -23,7 +23,7 @@ import org.drools.base.time.JobHandle;
import org.drools.core.WorkingMemoryEntryPoint;
import org.drools.core.time.TimerService;
import org.drools.core.time.impl.DefaultJobHandle;
-import org.drools.core.util.LinkedList;
+import org.drools.base.util.LinkedList;
import org.kie.api.runtime.rule.EventHandle;
public class DefaultEventHandle extends DefaultFactHandle implements
EventHandle, Comparable<DefaultEventHandle> {
diff --git
a/drools-core/src/main/java/org/drools/core/common/DefaultFactHandle.java
b/drools-core/src/main/java/org/drools/core/common/DefaultFactHandle.java
index ab0a95108f2..1b7f02f58af 100644
--- a/drools-core/src/main/java/org/drools/core/common/DefaultFactHandle.java
+++ b/drools-core/src/main/java/org/drools/core/common/DefaultFactHandle.java
@@ -38,7 +38,7 @@ import org.drools.core.reteoo.ObjectTypeNodeId;
import org.drools.core.reteoo.RightTuple;
import org.drools.core.reteoo.Tuple;
import org.drools.core.reteoo.TupleImpl;
-import org.drools.core.util.AbstractLinkedListNode;
+import org.drools.base.util.AbstractLinkedListNode;
import org.drools.util.StringUtils;
import org.kie.api.runtime.rule.FactHandle;
diff --git a/drools-core/src/main/java/org/drools/core/common/EqualityKey.java
b/drools-core/src/main/java/org/drools/core/common/EqualityKey.java
index d1110b2861b..9d079086976 100644
--- a/drools-core/src/main/java/org/drools/core/common/EqualityKey.java
+++ b/drools-core/src/main/java/org/drools/core/common/EqualityKey.java
@@ -23,7 +23,7 @@ import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import org.drools.core.util.LinkedList;
+import org.drools.base.util.LinkedList;
/**
* Upon instantiation the EqualityKey caches the first Object's hashCode
diff --git
a/drools-core/src/main/java/org/drools/core/common/InternalActivationGroup.java
b/drools-core/src/main/java/org/drools/core/common/InternalActivationGroup.java
index db21dc20277..dde5309e954 100644
---
a/drools-core/src/main/java/org/drools/core/common/InternalActivationGroup.java
+++
b/drools-core/src/main/java/org/drools/core/common/InternalActivationGroup.java
@@ -21,7 +21,7 @@ package org.drools.core.common;
import java.util.Iterator;
import org.drools.core.rule.consequence.InternalMatch;
-import org.drools.core.util.LinkedList;
+import org.drools.base.util.LinkedList;
import org.kie.api.runtime.rule.ActivationGroup;
public interface InternalActivationGroup extends ActivationGroup {
diff --git a/drools-core/src/main/java/org/drools/core/common/Memory.java
b/drools-core/src/main/java/org/drools/core/common/Memory.java
index 14ce187dbb6..d4c7999e8af 100644
--- a/drools-core/src/main/java/org/drools/core/common/Memory.java
+++ b/drools-core/src/main/java/org/drools/core/common/Memory.java
@@ -20,7 +20,7 @@ package org.drools.core.common;
import org.drools.core.reteoo.LeftTupleSource;
import org.drools.core.reteoo.SegmentMemory;
-import org.drools.core.util.DoubleLinkedEntry;
+import org.drools.base.util.DoubleLinkedEntry;
/**
* A super interface for node memories
diff --git
a/drools-core/src/main/java/org/drools/core/impl/ActivationsManagerImpl.java
b/drools-core/src/main/java/org/drools/core/impl/ActivationsManagerImpl.java
index 97fe44cf0c0..3f16ca92ba0 100644
--- a/drools-core/src/main/java/org/drools/core/impl/ActivationsManagerImpl.java
+++ b/drools-core/src/main/java/org/drools/core/impl/ActivationsManagerImpl.java
@@ -77,7 +77,7 @@ public class ActivationsManagerImpl implements
ActivationsManager {
private boolean firing = false;
- private final org.drools.core.util.LinkedList<RuleAgendaItem> eager = new
org.drools.core.util.LinkedList<>();
+ private final org.drools.base.util.LinkedList<RuleAgendaItem> eager = new
org.drools.base.util.LinkedList<>();
private final Map<QueryImpl, RuleAgendaItem> queries = new
ConcurrentHashMap<>();
diff --git
a/drools-core/src/main/java/org/drools/core/phreak/EagerPhreakBuilder.java
b/drools-core/src/main/java/org/drools/core/phreak/EagerPhreakBuilder.java
index 1d6ade47cd8..552c73fb9e5 100644
--- a/drools-core/src/main/java/org/drools/core/phreak/EagerPhreakBuilder.java
+++ b/drools-core/src/main/java/org/drools/core/phreak/EagerPhreakBuilder.java
@@ -75,7 +75,7 @@ import org.drools.core.reteoo.TupleFactory;
import org.drools.core.reteoo.TupleImpl;
import org.drools.core.reteoo.TupleMemory;
import org.drools.core.reteoo.WindowNode;
-import org.drools.core.util.FastIterator;
+import org.drools.base.util.FastIterator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/drools-core/src/main/java/org/drools/core/phreak/LazyPhreakBuilder.java
b/drools-core/src/main/java/org/drools/core/phreak/LazyPhreakBuilder.java
index 1ebc2da7d40..c04802de86d 100644
--- a/drools-core/src/main/java/org/drools/core/phreak/LazyPhreakBuilder.java
+++ b/drools-core/src/main/java/org/drools/core/phreak/LazyPhreakBuilder.java
@@ -73,7 +73,7 @@ import org.drools.core.reteoo.TupleMemory;
import org.drools.core.reteoo.TupleToObjectNode;
import org.drools.core.reteoo.TupleToObjectNode.SubnetworkPathMemory;
import org.drools.core.reteoo.WindowNode;
-import org.drools.core.util.FastIterator;
+import org.drools.base.util.FastIterator;
import org.kie.api.definition.rule.Rule;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/drools-core/src/main/java/org/drools/core/phreak/PhreakAccumulateNode.java
b/drools-core/src/main/java/org/drools/core/phreak/PhreakAccumulateNode.java
index 4c10f846417..967789121ed 100644
--- a/drools-core/src/main/java/org/drools/core/phreak/PhreakAccumulateNode.java
+++ b/drools-core/src/main/java/org/drools/core/phreak/PhreakAccumulateNode.java
@@ -41,7 +41,7 @@ import org.drools.core.reteoo.TupleFactory;
import org.drools.core.reteoo.TupleImpl;
import org.drools.core.reteoo.TupleMemory;
import org.drools.core.util.AbstractHashTable;
-import org.drools.core.util.FastIterator;
+import org.drools.base.util.FastIterator;
import org.kie.api.runtime.rule.FactHandle;
import static
org.drools.core.phreak.PhreakNodeOperations.doUpdatesReorderLeftMemory;
diff --git
a/drools-core/src/main/java/org/drools/core/phreak/PhreakExistsNode.java
b/drools-core/src/main/java/org/drools/core/phreak/PhreakExistsNode.java
index 31f93d31f8b..3df6c100986 100644
--- a/drools-core/src/main/java/org/drools/core/phreak/PhreakExistsNode.java
+++ b/drools-core/src/main/java/org/drools/core/phreak/PhreakExistsNode.java
@@ -30,7 +30,7 @@ import org.drools.core.reteoo.RightTuple;
import org.drools.core.reteoo.TupleFactory;
import org.drools.core.reteoo.TupleImpl;
import org.drools.core.reteoo.TupleMemory;
-import org.drools.core.util.FastIterator;
+import org.drools.base.util.FastIterator;
import static org.drools.core.phreak.PhreakJoinNode.updateChildLeftTuple;
import static
org.drools.core.phreak.PhreakNodeOperations.doUpdatesExistentialReorderLeftMemory;
diff --git
a/drools-core/src/main/java/org/drools/core/phreak/PhreakFromNode.java
b/drools-core/src/main/java/org/drools/core/phreak/PhreakFromNode.java
index ead533567d6..4fff82ca008 100644
--- a/drools-core/src/main/java/org/drools/core/phreak/PhreakFromNode.java
+++ b/drools-core/src/main/java/org/drools/core/phreak/PhreakFromNode.java
@@ -37,8 +37,8 @@ import org.drools.core.reteoo.FromNode.FromMemory;
import org.drools.core.reteoo.LeftTupleSink;
import org.drools.core.reteoo.RightTuple;
import org.drools.core.reteoo.TupleMemory;
-import org.drools.core.util.FastIterator;
-import org.drools.core.util.LinkedList;
+import org.drools.base.util.FastIterator;
+import org.drools.base.util.LinkedList;
import org.kie.api.runtime.rule.FactHandle;
import static org.drools.core.phreak.PhreakJoinNode.updateChildLeftTuple;
diff --git
a/drools-core/src/main/java/org/drools/core/phreak/PhreakJoinNode.java
b/drools-core/src/main/java/org/drools/core/phreak/PhreakJoinNode.java
index de4b6f06d58..a139c21c4fe 100644
--- a/drools-core/src/main/java/org/drools/core/phreak/PhreakJoinNode.java
+++ b/drools-core/src/main/java/org/drools/core/phreak/PhreakJoinNode.java
@@ -29,7 +29,7 @@ import org.drools.core.reteoo.TupleFactory;
import org.drools.core.reteoo.TupleImpl;
import org.drools.core.reteoo.TupleMemory;
import org.drools.core.util.AbstractHashTable;
-import org.drools.core.util.FastIterator;
+import org.drools.base.util.FastIterator;
import static
org.drools.core.phreak.PhreakNodeOperations.doUpdatesReorderLeftMemory;
import static
org.drools.core.phreak.PhreakNodeOperations.doUpdatesReorderRightMemory;
diff --git
a/drools-core/src/main/java/org/drools/core/phreak/PhreakNodeOperations.java
b/drools-core/src/main/java/org/drools/core/phreak/PhreakNodeOperations.java
index 8634768df26..bffa5fca5dc 100644
--- a/drools-core/src/main/java/org/drools/core/phreak/PhreakNodeOperations.java
+++ b/drools-core/src/main/java/org/drools/core/phreak/PhreakNodeOperations.java
@@ -32,7 +32,7 @@ import org.drools.core.reteoo.SubnetworkTuple;
import org.drools.core.reteoo.Tuple;
import org.drools.core.reteoo.TupleImpl;
import org.drools.core.reteoo.TupleMemory;
-import org.drools.core.util.FastIterator;
+import org.drools.base.util.FastIterator;
import static org.drools.core.phreak.PhreakNotNode.updateBlockersAndPropagate;
import static org.drools.core.reteoo.BetaNode.getBetaMemory;
diff --git
a/drools-core/src/main/java/org/drools/core/phreak/PhreakNotNode.java
b/drools-core/src/main/java/org/drools/core/phreak/PhreakNotNode.java
index 9851cd27977..1aa1f5ad4ae 100644
--- a/drools-core/src/main/java/org/drools/core/phreak/PhreakNotNode.java
+++ b/drools-core/src/main/java/org/drools/core/phreak/PhreakNotNode.java
@@ -31,7 +31,7 @@ import org.drools.core.reteoo.RightTuple;
import org.drools.core.reteoo.TupleFactory;
import org.drools.core.reteoo.TupleImpl;
import org.drools.core.reteoo.TupleMemory;
-import org.drools.core.util.FastIterator;
+import org.drools.base.util.FastIterator;
import static org.drools.core.phreak.PhreakJoinNode.updateChildLeftTuple;
import static
org.drools.core.phreak.PhreakNodeOperations.doUpdatesExistentialReorderLeftMemory;
diff --git
a/drools-core/src/main/java/org/drools/core/phreak/PhreakQueryTerminalNode.java
b/drools-core/src/main/java/org/drools/core/phreak/PhreakQueryTerminalNode.java
index 9898a212518..fe0ab266a15 100644
---
a/drools-core/src/main/java/org/drools/core/phreak/PhreakQueryTerminalNode.java
+++
b/drools-core/src/main/java/org/drools/core/phreak/PhreakQueryTerminalNode.java
@@ -29,7 +29,7 @@ import
org.drools.core.reteoo.QueryElementNode.QueryElementNodeMemory;
import org.drools.core.reteoo.QueryTerminalNode;
import org.drools.core.reteoo.Tuple;
import org.drools.core.reteoo.TupleImpl;
-import org.drools.core.util.LinkedList;
+import org.drools.base.util.LinkedList;
/**
* Created with IntelliJ IDEA.
diff --git
a/drools-core/src/main/java/org/drools/core/phreak/RuleAgendaItem.java
b/drools-core/src/main/java/org/drools/core/phreak/RuleAgendaItem.java
index 357606f5736..7d31b43b221 100644
--- a/drools-core/src/main/java/org/drools/core/phreak/RuleAgendaItem.java
+++ b/drools-core/src/main/java/org/drools/core/phreak/RuleAgendaItem.java
@@ -23,8 +23,8 @@ import org.drools.base.definitions.rule.impl.RuleImpl;
import org.drools.core.common.InternalAgendaGroup;
import org.drools.core.reteoo.PathMemory;
import org.drools.core.reteoo.TerminalNode;
-import org.drools.core.util.LinkedList;
-import org.drools.core.util.DoubleLinkedEntry;
+import org.drools.base.util.LinkedList;
+import org.drools.base.util.DoubleLinkedEntry;
import org.drools.core.util.Queue.QueueEntry;
public class RuleAgendaItem implements DoubleLinkedEntry<RuleAgendaItem>,
QueueEntry {
diff --git a/drools-core/src/main/java/org/drools/core/phreak/RuleExecutor.java
b/drools-core/src/main/java/org/drools/core/phreak/RuleExecutor.java
index 46f0de6064b..2a74c4e074d 100644
--- a/drools-core/src/main/java/org/drools/core/phreak/RuleExecutor.java
+++ b/drools-core/src/main/java/org/drools/core/phreak/RuleExecutor.java
@@ -37,7 +37,7 @@ import org.drools.core.reteoo.Tuple;
import org.drools.core.reteoo.TupleImpl;
import org.drools.core.rule.consequence.InternalMatch;
import org.drools.core.rule.consequence.KnowledgeHelper;
-import org.drools.core.util.LinkedList;
+import org.drools.base.util.LinkedList;
import org.drools.core.util.Queue;
import org.drools.core.util.QueueFactory;
import org.drools.core.util.index.TupleList;
diff --git
a/drools-core/src/main/java/org/drools/core/phreak/RuleNetworkEvaluatorImpl.java
b/drools-core/src/main/java/org/drools/core/phreak/RuleNetworkEvaluatorImpl.java
index 3d97f306423..c6a4759f3b8 100644
---
a/drools-core/src/main/java/org/drools/core/phreak/RuleNetworkEvaluatorImpl.java
+++
b/drools-core/src/main/java/org/drools/core/phreak/RuleNetworkEvaluatorImpl.java
@@ -70,7 +70,7 @@ import org.drools.core.reteoo.Tuple;
import org.drools.core.reteoo.TupleFactory;
import org.drools.core.reteoo.TupleImpl;
import org.drools.core.reteoo.TupleToObjectNode;
-import org.drools.core.util.LinkedList;
+import org.drools.base.util.LinkedList;
import static org.drools.core.common.TupleSetsImpl.createLeftTupleTupleSets;
diff --git a/drools-core/src/main/java/org/drools/core/phreak/StackEntry.java
b/drools-core/src/main/java/org/drools/core/phreak/StackEntry.java
index 60359b2cd44..5c006533184 100644
--- a/drools-core/src/main/java/org/drools/core/phreak/StackEntry.java
+++ b/drools-core/src/main/java/org/drools/core/phreak/StackEntry.java
@@ -24,7 +24,7 @@ import org.drools.core.common.TupleSets;
import org.drools.core.reteoo.LeftTupleSinkNode;
import org.drools.core.reteoo.PathMemory;
import org.drools.core.reteoo.SegmentMemory;
-import org.drools.core.util.AbstractLinkedListNode;
+import org.drools.base.util.AbstractLinkedListNode;
/**
* Created with IntelliJ IDEA.
diff --git
a/drools-core/src/main/java/org/drools/core/reteoo/AccumulateNode.java
b/drools-core/src/main/java/org/drools/core/reteoo/AccumulateNode.java
index b5b2e4fe8d1..0c56592f030 100644
--- a/drools-core/src/main/java/org/drools/core/reteoo/AccumulateNode.java
+++ b/drools-core/src/main/java/org/drools/core/reteoo/AccumulateNode.java
@@ -45,7 +45,7 @@ import org.drools.core.common.ReteEvaluator;
import org.drools.core.impl.InternalRuleBase;
import org.drools.core.phreak.PhreakAccumulateNode;
import org.drools.core.reteoo.builder.BuildContext;
-import org.drools.core.util.AbstractLinkedListNode;
+import org.drools.base.util.AbstractLinkedListNode;
import org.drools.core.util.index.TupleList;
import org.drools.core.util.index.TupleListWithContext;
import org.drools.util.bitmask.BitMask;
diff --git
a/drools-core/src/main/java/org/drools/core/reteoo/AsyncReceiveNode.java
b/drools-core/src/main/java/org/drools/core/reteoo/AsyncReceiveNode.java
index 7fe6cad7128..3848a124610 100644
--- a/drools-core/src/main/java/org/drools/core/reteoo/AsyncReceiveNode.java
+++ b/drools-core/src/main/java/org/drools/core/reteoo/AsyncReceiveNode.java
@@ -37,7 +37,7 @@ import org.drools.core.common.UpdateContext;
import org.drools.base.phreak.PropagationEntry;
import org.drools.base.phreak.actions.AbstractPropagationEntry;
import org.drools.core.reteoo.builder.BuildContext;
-import org.drools.core.util.AbstractLinkedListNode;
+import org.drools.base.util.AbstractLinkedListNode;
import org.drools.core.util.index.TupleList;
public class AsyncReceiveNode extends LeftTupleSource
diff --git
a/drools-core/src/main/java/org/drools/core/reteoo/AsyncSendNode.java
b/drools-core/src/main/java/org/drools/core/reteoo/AsyncSendNode.java
index f48a9f4866e..122bbfd587b 100644
--- a/drools-core/src/main/java/org/drools/core/reteoo/AsyncSendNode.java
+++ b/drools-core/src/main/java/org/drools/core/reteoo/AsyncSendNode.java
@@ -37,7 +37,7 @@ import org.drools.core.common.PropagationContext;
import org.drools.core.common.ReteEvaluator;
import org.drools.core.common.UpdateContext;
import org.drools.core.reteoo.builder.BuildContext;
-import org.drools.core.util.AbstractLinkedListNode;
+import org.drools.base.util.AbstractLinkedListNode;
import org.drools.core.util.index.TupleList;
public class AsyncSendNode<T extends AsyncSendNode.AsyncSendMemory> extends
LeftTupleSource
diff --git a/drools-core/src/main/java/org/drools/core/reteoo/BetaMemory.java
b/drools-core/src/main/java/org/drools/core/reteoo/BetaMemory.java
index 04ec2587f61..b0582d60051 100644
--- a/drools-core/src/main/java/org/drools/core/reteoo/BetaMemory.java
+++ b/drools-core/src/main/java/org/drools/core/reteoo/BetaMemory.java
@@ -23,7 +23,7 @@ import org.drools.core.common.ReteEvaluator;
import org.drools.core.common.TupleSets;
import org.drools.core.common.TupleSetsImpl;
import org.drools.core.reteoo.TupleToObjectNode.SubnetworkPathMemory;
-import org.drools.core.util.AbstractLinkedListNode;
+import org.drools.base.util.AbstractLinkedListNode;
public class BetaMemory<C> extends AbstractLinkedListNode<Memory> implements
SegmentNodeMemory {
diff --git a/drools-core/src/main/java/org/drools/core/reteoo/BetaNode.java
b/drools-core/src/main/java/org/drools/core/reteoo/BetaNode.java
index 35490d63165..d5b3e12d006 100644
--- a/drools-core/src/main/java/org/drools/core/reteoo/BetaNode.java
+++ b/drools-core/src/main/java/org/drools/core/reteoo/BetaNode.java
@@ -50,7 +50,7 @@ import org.drools.core.phreak.DetachedTuple;
import org.drools.core.reteoo.AccumulateNode.AccumulateMemory;
import org.drools.core.reteoo.builder.BuildContext;
import org.drools.base.rule.constraint.BetaConstraint;
-import org.drools.core.util.FastIterator;
+import org.drools.base.util.FastIterator;
import org.kie.api.definition.rule.Rule;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/drools-core/src/main/java/org/drools/core/reteoo/ConditionalBranchNode.java
b/drools-core/src/main/java/org/drools/core/reteoo/ConditionalBranchNode.java
index fb72e44c574..88597bae354 100644
---
a/drools-core/src/main/java/org/drools/core/reteoo/ConditionalBranchNode.java
+++
b/drools-core/src/main/java/org/drools/core/reteoo/ConditionalBranchNode.java
@@ -31,7 +31,7 @@ import org.drools.core.common.MemoryFactory;
import org.drools.core.common.ReteEvaluator;
import org.drools.core.common.UpdateContext;
import org.drools.core.reteoo.builder.BuildContext;
-import org.drools.core.util.AbstractLinkedListNode;
+import org.drools.base.util.AbstractLinkedListNode;
/**
* Node which allows to follow different paths in the Rete-OO network,
diff --git
a/drools-core/src/main/java/org/drools/core/reteoo/EvalConditionNode.java
b/drools-core/src/main/java/org/drools/core/reteoo/EvalConditionNode.java
index 0a771779da8..327c2fd39ed 100644
--- a/drools-core/src/main/java/org/drools/core/reteoo/EvalConditionNode.java
+++ b/drools-core/src/main/java/org/drools/core/reteoo/EvalConditionNode.java
@@ -35,7 +35,7 @@ import org.drools.core.common.MemoryFactory;
import org.drools.core.common.ReteEvaluator;
import org.drools.core.common.UpdateContext;
import org.drools.core.reteoo.builder.BuildContext;
-import org.drools.core.util.AbstractLinkedListNode;
+import org.drools.base.util.AbstractLinkedListNode;
import org.kie.api.definition.rule.Rule;
public class EvalConditionNode extends LeftTupleSource
diff --git a/drools-core/src/main/java/org/drools/core/reteoo/FromNode.java
b/drools-core/src/main/java/org/drools/core/reteoo/FromNode.java
index a70757d3e00..ea4fa8c2be2 100644
--- a/drools-core/src/main/java/org/drools/core/reteoo/FromNode.java
+++ b/drools-core/src/main/java/org/drools/core/reteoo/FromNode.java
@@ -43,7 +43,7 @@ import org.drools.core.common.PropagationContext;
import org.drools.core.common.ReteEvaluator;
import org.drools.core.common.UpdateContext;
import org.drools.core.reteoo.builder.BuildContext;
-import org.drools.core.util.AbstractLinkedListNode;
+import org.drools.base.util.AbstractLinkedListNode;
import org.drools.core.util.index.TupleList;
import org.drools.util.bitmask.AllSetBitMask;
import org.drools.util.bitmask.BitMask;
diff --git
a/drools-core/src/main/java/org/drools/core/reteoo/LeftInputAdapterNode.java
b/drools-core/src/main/java/org/drools/core/reteoo/LeftInputAdapterNode.java
index 676de2a570a..f65f0f0703c 100644
--- a/drools-core/src/main/java/org/drools/core/reteoo/LeftInputAdapterNode.java
+++ b/drools-core/src/main/java/org/drools/core/reteoo/LeftInputAdapterNode.java
@@ -47,7 +47,7 @@ import org.drools.core.phreak.DetachedTuple;
import org.drools.core.phreak.RuleNetworkEvaluatorImpl;
import org.drools.core.reteoo.builder.BuildContext;
import org.drools.core.rule.consequence.InternalMatch;
-import org.drools.core.util.AbstractLinkedListNode;
+import org.drools.base.util.AbstractLinkedListNode;
import org.drools.util.bitmask.AllSetBitMask;
import org.drools.util.bitmask.BitMask;
import org.kie.api.definition.rule.Rule;
diff --git
a/drools-core/src/main/java/org/drools/core/reteoo/NotNodeLeftTuple.java
b/drools-core/src/main/java/org/drools/core/reteoo/NotNodeLeftTuple.java
index f92271eadfe..704bfbea72c 100644
--- a/drools-core/src/main/java/org/drools/core/reteoo/NotNodeLeftTuple.java
+++ b/drools-core/src/main/java/org/drools/core/reteoo/NotNodeLeftTuple.java
@@ -28,7 +28,7 @@ import org.drools.core.common.InternalFactHandle;
import org.drools.core.common.MemoryFactory;
import org.drools.core.common.PropagationContext;
import org.drools.core.common.ReteEvaluator;
-import org.drools.core.util.FastIterator;
+import org.drools.base.util.FastIterator;
public class NotNodeLeftTuple extends LeftTuple {
private static final long serialVersionUID = 540l;
diff --git a/drools-core/src/main/java/org/drools/core/reteoo/PathMemory.java
b/drools-core/src/main/java/org/drools/core/reteoo/PathMemory.java
index 03fa08f1a4d..1745e58b7ac 100644
--- a/drools-core/src/main/java/org/drools/core/reteoo/PathMemory.java
+++ b/drools-core/src/main/java/org/drools/core/reteoo/PathMemory.java
@@ -28,7 +28,7 @@ import org.drools.core.common.InternalAgendaGroup;
import org.drools.core.common.Memory;
import org.drools.core.common.ReteEvaluator;
import org.drools.core.phreak.RuleAgendaItem;
-import org.drools.core.util.AbstractLinkedListNode;
+import org.drools.base.util.AbstractLinkedListNode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/drools-core/src/main/java/org/drools/core/reteoo/QueryElementNode.java
b/drools-core/src/main/java/org/drools/core/reteoo/QueryElementNode.java
index 50880c75745..648630fad03 100644
--- a/drools-core/src/main/java/org/drools/core/reteoo/QueryElementNode.java
+++ b/drools-core/src/main/java/org/drools/core/reteoo/QueryElementNode.java
@@ -43,7 +43,7 @@ import org.drools.core.phreak.BuildtimeSegmentUtilities;
import org.drools.core.phreak.StackEntry;
import org.drools.core.reteoo.builder.BuildContext;
import org.drools.core.rule.consequence.InternalMatch;
-import org.drools.core.util.AbstractLinkedListNode;
+import org.drools.base.util.AbstractLinkedListNode;
import org.kie.api.runtime.rule.FactHandle;
public class QueryElementNode extends LeftTupleSource implements
LeftTupleSinkNode, MemoryFactory<QueryElementNode.QueryElementNodeMemory> {
diff --git
a/drools-core/src/main/java/org/drools/core/reteoo/SegmentMemory.java
b/drools-core/src/main/java/org/drools/core/reteoo/SegmentMemory.java
index fe5da91e80f..26fb206a0b9 100644
--- a/drools-core/src/main/java/org/drools/core/reteoo/SegmentMemory.java
+++ b/drools-core/src/main/java/org/drools/core/reteoo/SegmentMemory.java
@@ -36,8 +36,8 @@ import
org.drools.core.reteoo.AsyncReceiveNode.AsyncReceiveMemory;
import org.drools.core.reteoo.QueryElementNode.QueryElementNodeMemory;
import org.drools.core.reteoo.TupleToObjectNode.SubnetworkPathMemory;
import org.drools.core.reteoo.TimerNode.TimerNodeMemory;
-import org.drools.core.util.LinkedList;
-import org.drools.core.util.DoubleLinkedEntry;
+import org.drools.base.util.LinkedList;
+import org.drools.base.util.DoubleLinkedEntry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/drools-core/src/main/java/org/drools/core/reteoo/TimerNode.java
b/drools-core/src/main/java/org/drools/core/reteoo/TimerNode.java
index b8bcb07dc3a..23e0f4520d9 100644
--- a/drools-core/src/main/java/org/drools/core/reteoo/TimerNode.java
+++ b/drools-core/src/main/java/org/drools/core/reteoo/TimerNode.java
@@ -31,7 +31,7 @@ import org.drools.core.common.MemoryFactory;
import org.drools.core.common.ReteEvaluator;
import org.drools.core.common.UpdateContext;
import org.drools.core.reteoo.builder.BuildContext;
-import org.drools.core.util.AbstractLinkedListNode;
+import org.drools.base.util.AbstractLinkedListNode;
import org.drools.core.util.index.TupleList;
public class TimerNode extends LeftTupleSource
diff --git a/drools-core/src/main/java/org/drools/core/reteoo/Tuple.java
b/drools-core/src/main/java/org/drools/core/reteoo/Tuple.java
index 1bd7b51fc19..c1b9c646dc8 100644
--- a/drools-core/src/main/java/org/drools/core/reteoo/Tuple.java
+++ b/drools-core/src/main/java/org/drools/core/reteoo/Tuple.java
@@ -23,7 +23,7 @@ import java.io.Serializable;
import org.drools.base.reteoo.BaseTuple;
import org.drools.core.common.InternalFactHandle;
import org.drools.core.common.PropagationContext;
-import org.drools.core.util.DoubleLinkedEntry;
+import org.drools.base.util.DoubleLinkedEntry;
import org.drools.core.util.index.TupleList;
import org.kie.api.runtime.rule.FactHandle;
diff --git a/drools-core/src/main/java/org/drools/core/reteoo/TupleMemory.java
b/drools-core/src/main/java/org/drools/core/reteoo/TupleMemory.java
index 1cd1e92afd8..42965a8ee5f 100644
--- a/drools-core/src/main/java/org/drools/core/reteoo/TupleMemory.java
+++ b/drools-core/src/main/java/org/drools/core/reteoo/TupleMemory.java
@@ -19,7 +19,7 @@
package org.drools.core.reteoo;
import org.drools.core.util.AbstractHashTable.Index;
-import org.drools.core.util.FastIterator;
+import org.drools.base.util.FastIterator;
public interface TupleMemory {
diff --git
a/drools-core/src/main/java/org/drools/core/time/impl/AbstractJobHandle.java
b/drools-core/src/main/java/org/drools/core/time/impl/AbstractJobHandle.java
index cdd6217568f..ee070952998 100644
--- a/drools-core/src/main/java/org/drools/core/time/impl/AbstractJobHandle.java
+++ b/drools-core/src/main/java/org/drools/core/time/impl/AbstractJobHandle.java
@@ -19,8 +19,8 @@
package org.drools.core.time.impl;
import org.drools.base.time.JobHandle;
-import org.drools.core.util.AbstractLinkedListNode;
-import org.drools.core.util.DoubleLinkedEntry;
+import org.drools.base.util.AbstractLinkedListNode;
+import org.drools.base.util.DoubleLinkedEntry;
public abstract class AbstractJobHandle<T extends AbstractJobHandle<T>>
extends AbstractLinkedListNode<T> implements JobHandle,
DoubleLinkedEntry<T> {
diff --git
a/drools-core/src/main/java/org/drools/core/util/AbstractHashTable.java
b/drools-core/src/main/java/org/drools/core/util/AbstractHashTable.java
index aadf8c548d6..0d86ac3be5e 100644
--- a/drools-core/src/main/java/org/drools/core/util/AbstractHashTable.java
+++ b/drools-core/src/main/java/org/drools/core/util/AbstractHashTable.java
@@ -25,6 +25,7 @@ import java.io.ObjectOutput;
import java.util.Objects;
import org.drools.base.util.IndexedValueReader;
+import org.drools.base.util.Iterator;
import org.drools.core.reteoo.TupleImpl;
import org.drools.core.util.index.TupleList;
diff --git
a/drools-core/src/main/java/org/drools/core/util/DeserializationFilterHelper.java
b/drools-core/src/main/java/org/drools/core/util/DeserializationFilterHelper.java
index 29ce1da123a..3d27536d679 100644
---
a/drools-core/src/main/java/org/drools/core/util/DeserializationFilterHelper.java
+++
b/drools-core/src/main/java/org/drools/core/util/DeserializationFilterHelper.java
@@ -35,7 +35,7 @@ public class DeserializationFilterHelper {
private static final Set<String> DEFAULT_ALLOWED_CLASSES = Set.of(
"org.drools.base.reteoo.InitialFactImpl",
- "org.drools.core.util.LinkedListEntry",
+ "org.drools.base.util.LinkedListEntry",
"org.drools.tms.SimpleMode",
"org.drools.tms.DefeasibleMode",
"org.drools.traits.core.factmodel.AbstractTriple",
diff --git
a/drools-core/src/main/java/org/drools/core/util/HashTableIterator.java
b/drools-core/src/main/java/org/drools/core/util/HashTableIterator.java
index c9f2a625266..c931943a57c 100644
--- a/drools-core/src/main/java/org/drools/core/util/HashTableIterator.java
+++ b/drools-core/src/main/java/org/drools/core/util/HashTableIterator.java
@@ -23,6 +23,9 @@ import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
+import org.drools.base.util.Iterator;
+import org.drools.base.util.SingleLinkedEntry;
+
/**
* Fast re-usable iterator
*/
diff --git a/drools-core/src/main/java/org/drools/core/util/TupleRBTree.java
b/drools-core/src/main/java/org/drools/core/util/TupleRBTree.java
index c5cdc1a9f34..0c41ec2238a 100644
--- a/drools-core/src/main/java/org/drools/core/util/TupleRBTree.java
+++ b/drools-core/src/main/java/org/drools/core/util/TupleRBTree.java
@@ -18,6 +18,7 @@
*/
package org.drools.core.util;
+import org.drools.base.util.Iterator;
import org.drools.core.util.index.TupleList;
public class TupleRBTree<K extends Comparable< ? super K>> {
diff --git
a/drools-core/src/main/java/org/drools/core/util/index/TupleIndexHashTable.java
b/drools-core/src/main/java/org/drools/core/util/index/TupleIndexHashTable.java
index 3ae9f360b60..33daac1f9b6 100644
---
a/drools-core/src/main/java/org/drools/core/util/index/TupleIndexHashTable.java
+++
b/drools-core/src/main/java/org/drools/core/util/index/TupleIndexHashTable.java
@@ -25,9 +25,9 @@ import java.io.ObjectOutput;
import org.drools.core.reteoo.TupleImpl;
import org.drools.core.reteoo.TupleMemory;
import org.drools.core.util.AbstractHashTable;
-import org.drools.core.util.FastIterator;
-import org.drools.core.util.Iterator;
-import org.drools.core.util.LinkedList;
+import org.drools.base.util.FastIterator;
+import org.drools.base.util.Iterator;
+import org.drools.base.util.LinkedList;
public class TupleIndexHashTable extends AbstractHashTable implements
TupleMemory {
diff --git
a/drools-core/src/main/java/org/drools/core/util/index/TupleIndexRBTree.java
b/drools-core/src/main/java/org/drools/core/util/index/TupleIndexRBTree.java
index 15b613515ee..56fee477457 100644
--- a/drools-core/src/main/java/org/drools/core/util/index/TupleIndexRBTree.java
+++ b/drools-core/src/main/java/org/drools/core/util/index/TupleIndexRBTree.java
@@ -27,8 +27,8 @@ import org.drools.base.util.IndexedValueReader;
import org.drools.base.util.index.ConstraintTypeOperator;
import org.drools.core.reteoo.TupleImpl;
import org.drools.core.reteoo.TupleMemory;
-import org.drools.core.util.FastIterator;
-import org.drools.core.util.Iterator;
+import org.drools.base.util.FastIterator;
+import org.drools.base.util.Iterator;
import org.drools.core.util.TupleRBTree;
import org.drools.core.util.TupleRBTree.Boundary;
import org.drools.core.util.TupleRBTree.Node;
diff --git
a/drools-core/src/main/java/org/drools/core/util/index/TupleList.java
b/drools-core/src/main/java/org/drools/core/util/index/TupleList.java
index ed648588cd6..b580e0cc792 100644
--- a/drools-core/src/main/java/org/drools/core/util/index/TupleList.java
+++ b/drools-core/src/main/java/org/drools/core/util/index/TupleList.java
@@ -23,9 +23,9 @@ import java.io.Serializable;
import org.drools.core.common.InternalFactHandle;
import org.drools.core.reteoo.TupleImpl;
import org.drools.core.reteoo.TupleMemory;
-import org.drools.core.util.SingleLinkedEntry;
-import org.drools.core.util.FastIterator;
-import org.drools.core.util.LinkedList;
+import org.drools.base.util.SingleLinkedEntry;
+import org.drools.base.util.FastIterator;
+import org.drools.base.util.LinkedList;
public class TupleList extends LinkedList<TupleImpl> implements TupleMemory,
SingleLinkedEntry<TupleList>, Serializable {
diff --git
a/drools-core/src/test/java/org/drools/core/util/LeftTupleRBTreeTest.java
b/drools-core/src/test/java/org/drools/core/util/LeftTupleRBTreeTest.java
index fc7d7d80f56..ceb53067875 100644
--- a/drools-core/src/test/java/org/drools/core/util/LeftTupleRBTreeTest.java
+++ b/drools-core/src/test/java/org/drools/core/util/LeftTupleRBTreeTest.java
@@ -20,6 +20,7 @@ package org.drools.core.util;
import java.util.Random;
+import org.drools.base.util.Iterator;
import org.drools.core.util.TupleRBTree.Node;
import org.junit.jupiter.api.Test;
diff --git a/drools-core/src/test/java/org/drools/core/util/LinkedListTest.java
b/drools-core/src/test/java/org/drools/core/util/LinkedListTest.java
index 251b5812825..28a5f26318b 100644
--- a/drools-core/src/test/java/org/drools/core/util/LinkedListTest.java
+++ b/drools-core/src/test/java/org/drools/core/util/LinkedListTest.java
@@ -18,6 +18,9 @@
*/
package org.drools.core.util;
+import org.drools.base.util.AbstractLinkedListNode;
+import org.drools.base.util.DoubleLinkedEntry;
+import org.drools.base.util.LinkedList;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git
a/drools-fastutil/src/main/java/org/drools/fastutil/FastUtilHashTupleMemory.java
b/drools-fastutil/src/main/java/org/drools/fastutil/FastUtilHashTupleMemory.java
index e99d30473f3..b9d2db72dd0 100644
---
a/drools-fastutil/src/main/java/org/drools/fastutil/FastUtilHashTupleMemory.java
+++
b/drools-fastutil/src/main/java/org/drools/fastutil/FastUtilHashTupleMemory.java
@@ -25,9 +25,9 @@ import org.drools.core.reteoo.Tuple;
import org.drools.core.reteoo.TupleMemory;
import org.drools.core.util.AbstractHashTable.HashEntry;
import org.drools.core.util.AbstractHashTable.Index;
-import org.drools.core.util.FastIterator;
-import org.drools.core.util.Iterator;
-import org.drools.core.util.LinkedList;
+import org.drools.base.util.FastIterator;
+import org.drools.base.util.Iterator;
+import org.drools.base.util.LinkedList;
import org.drools.core.util.index.TupleList;
public class FastUtilHashTupleMemory implements TupleMemory {
diff --git
a/drools-fastutil/src/main/java/org/drools/fastutil/FastUtilTreeMemory.java
b/drools-fastutil/src/main/java/org/drools/fastutil/FastUtilTreeMemory.java
index 98a343176ef..f0d2e4d8636 100644
--- a/drools-fastutil/src/main/java/org/drools/fastutil/FastUtilTreeMemory.java
+++ b/drools-fastutil/src/main/java/org/drools/fastutil/FastUtilTreeMemory.java
@@ -26,9 +26,9 @@ import org.drools.core.reteoo.TupleImpl;
import org.drools.core.reteoo.Tuple;
import org.drools.core.reteoo.TupleMemory;
import it.unimi.dsi.fastutil.objects.ObjectIterator;
-import org.drools.core.util.FastIterator;
+import org.drools.base.util.FastIterator;
import org.drools.base.util.IndexedValueReader;
-import org.drools.core.util.Iterator;
+import org.drools.base.util.Iterator;
import org.drools.core.util.index.AbstractTupleIndexTree;
import org.drools.base.util.index.ConstraintTypeOperator;
import org.drools.core.util.index.TupleIndexRBTree;
diff --git
a/drools-fastutil/src/test/java/org/drools/fastutil/FastUtilTreeMemoryTest.java
b/drools-fastutil/src/test/java/org/drools/fastutil/FastUtilTreeMemoryTest.java
index 222f7a4660a..87ac00a0aa9 100644
---
a/drools-fastutil/src/test/java/org/drools/fastutil/FastUtilTreeMemoryTest.java
+++
b/drools-fastutil/src/test/java/org/drools/fastutil/FastUtilTreeMemoryTest.java
@@ -30,7 +30,7 @@ import org.drools.core.reteoo.LeftTuple;
import org.drools.core.reteoo.Tuple;
import org.drools.base.rule.accessor.ReadAccessor;
import org.drools.base.rule.accessor.TupleValueExtractor;
-import org.drools.core.util.FastIterator;
+import org.drools.base.util.FastIterator;
import org.drools.base.util.IndexedValueReader;
import org.drools.fastutil.FastUtilTreeMemory.TreeFastIterator;
import org.junit.jupiter.api.Test;
diff --git
a/drools-kiesession/src/main/java/org/drools/kiesession/agenda/DefaultAgenda.java
b/drools-kiesession/src/main/java/org/drools/kiesession/agenda/DefaultAgenda.java
index c3192b696ec..2233607a4b4 100644
---
a/drools-kiesession/src/main/java/org/drools/kiesession/agenda/DefaultAgenda.java
+++
b/drools-kiesession/src/main/java/org/drools/kiesession/agenda/DefaultAgenda.java
@@ -100,7 +100,7 @@ public class DefaultAgenda implements InternalAgenda {
private final Map<String, InternalActivationGroup> activationGroups;
- private final org.drools.core.util.LinkedList<RuleAgendaItem> eager = new
org.drools.core.util.LinkedList<>();
+ private final org.drools.base.util.LinkedList<RuleAgendaItem> eager = new
org.drools.base.util.LinkedList<>();
private final Map<QueryImpl, RuleAgendaItem> queries = new
ConcurrentHashMap<>();
diff --git
a/drools-kiesession/src/main/java/org/drools/kiesession/debug/AccumulateNodeVisitor.java
b/drools-kiesession/src/main/java/org/drools/kiesession/debug/AccumulateNodeVisitor.java
index b939966db7a..02703310e69 100755
---
a/drools-kiesession/src/main/java/org/drools/kiesession/debug/AccumulateNodeVisitor.java
+++
b/drools-kiesession/src/main/java/org/drools/kiesession/debug/AccumulateNodeVisitor.java
@@ -24,7 +24,7 @@ import
org.drools.core.reteoo.AccumulateNode.AccumulateContext;
import org.drools.core.reteoo.AccumulateNode.AccumulateMemory;
import org.drools.core.reteoo.BetaNode;
import org.drools.core.reteoo.Tuple;
-import org.drools.core.util.FastIterator;
+import org.drools.base.util.FastIterator;
import java.util.Collection;
diff --git
a/drools-kiesession/src/main/java/org/drools/kiesession/debug/FromNodeVisitor.java
b/drools-kiesession/src/main/java/org/drools/kiesession/debug/FromNodeVisitor.java
index 0daa43dae26..b101f65feb6 100755
---
a/drools-kiesession/src/main/java/org/drools/kiesession/debug/FromNodeVisitor.java
+++
b/drools-kiesession/src/main/java/org/drools/kiesession/debug/FromNodeVisitor.java
@@ -22,7 +22,7 @@ import org.drools.base.common.NetworkNode;
import org.drools.core.reteoo.FromNode;
import org.drools.core.reteoo.FromNode.FromMemory;
import org.drools.core.reteoo.TupleImpl;
-import org.drools.core.util.FastIterator;
+import org.drools.base.util.FastIterator;
import java.util.Collection;
diff --git
a/drools-kiesession/src/test/java/org/drools/kiesession/MockInternalMatch.java
b/drools-kiesession/src/test/java/org/drools/kiesession/MockInternalMatch.java
index 9fc5dce63bc..87738eabf64 100644
---
a/drools-kiesession/src/test/java/org/drools/kiesession/MockInternalMatch.java
+++
b/drools-kiesession/src/test/java/org/drools/kiesession/MockInternalMatch.java
@@ -34,7 +34,7 @@ import org.drools.core.reteoo.TupleImpl;
import org.drools.core.rule.consequence.InternalMatch;
import org.drools.base.rule.consequence.Consequence;
import org.drools.core.common.PropagationContext;
-import org.drools.core.util.LinkedList;
+import org.drools.base.util.LinkedList;
import org.kie.api.runtime.rule.FactHandle;
public class MockInternalMatch implements InternalMatch {
diff --git
a/drools-metric/src/main/java/org/drools/metric/phreak/PhreakQueryTerminalNodeMetric.java
b/drools-metric/src/main/java/org/drools/metric/phreak/PhreakQueryTerminalNodeMetric.java
index 8c6a54900e2..f1f54f329fa 100644
---
a/drools-metric/src/main/java/org/drools/metric/phreak/PhreakQueryTerminalNodeMetric.java
+++
b/drools-metric/src/main/java/org/drools/metric/phreak/PhreakQueryTerminalNodeMetric.java
@@ -23,7 +23,7 @@ import org.drools.core.common.TupleSets;
import org.drools.core.phreak.PhreakQueryTerminalNode;
import org.drools.core.phreak.StackEntry;
import org.drools.core.reteoo.QueryTerminalNode;
-import org.drools.core.util.LinkedList;
+import org.drools.base.util.LinkedList;
import org.drools.metric.util.MetricLogUtils;
public class PhreakQueryTerminalNodeMetric extends PhreakQueryTerminalNode {
diff --git
a/drools-serialization-protobuf/src/main/java/org/drools/serialization/protobuf/ProtobufOutputMarshaller.java
b/drools-serialization-protobuf/src/main/java/org/drools/serialization/protobuf/ProtobufOutputMarshaller.java
index 64bae8ee43d..885fe9c96b2 100644
---
a/drools-serialization-protobuf/src/main/java/org/drools/serialization/protobuf/ProtobufOutputMarshaller.java
+++
b/drools-serialization-protobuf/src/main/java/org/drools/serialization/protobuf/ProtobufOutputMarshaller.java
@@ -60,9 +60,9 @@ import org.drools.core.time.impl.IntervalTrigger;
import org.drools.core.time.impl.PointInTimeTrigger;
import org.drools.core.time.impl.PseudoClockScheduler;
import org.drools.core.time.impl.TimerJobInstance;
-import org.drools.core.util.FastIterator;
-import org.drools.core.util.LinkedList;
-import org.drools.core.util.LinkedListEntry;
+import org.drools.base.util.FastIterator;
+import org.drools.base.util.LinkedList;
+import org.drools.base.util.LinkedListEntry;
import org.drools.kiesession.entrypoints.NamedEntryPoint;
import org.drools.kiesession.session.StatefulKnowledgeSessionImpl;
import org.drools.serialization.protobuf.ProtobufMessages.FactHandle;
@@ -297,7 +297,7 @@ public class ProtobufOutputMarshaller {
_ab.setFocusStack( _fsb.build() );
// serialize all dormant activations
- org.drools.core.util.Iterator it = ActivationIterator.iterator( wm );
+ org.drools.base.util.Iterator it = ActivationIterator.iterator( wm );
List<InternalMatch> dormant = new ArrayList<>();
for (InternalMatch item = (InternalMatch) it.next(); item != null;
item = (InternalMatch) it.next() ) {
if ( !item.isQueued() ) {
@@ -356,7 +356,7 @@ public class ProtobufOutputMarshaller {
private static ProtobufMessages.NodeMemory
writeQueryElementNodeMemory(final int nodeId,
final Memory memory,
final InternalWorkingMemory wm) {
- org.drools.core.util.Iterator<TupleImpl> it =
LeftTupleIterator.iterator(wm, ((QueryElementNodeMemory) memory).getNode() );
+ org.drools.base.util.Iterator<TupleImpl> it =
LeftTupleIterator.iterator(wm, ((QueryElementNodeMemory) memory).getNode() );
ProtobufMessages.NodeMemory.QueryElementNodeMemory.Builder _query =
ProtobufMessages.NodeMemory.QueryElementNodeMemory.newBuilder();
for ( TupleImpl leftTuple = it.next(); leftTuple != null; leftTuple =
it.next() ) {
@@ -681,7 +681,7 @@ public class ProtobufOutputMarshaller {
}
if (internalMatch instanceof TruthMaintenanceSystemInternalMatch) {
- org.drools.core.util.LinkedList<LogicalDependency<M>> list =
((TruthMaintenanceSystemInternalMatch) internalMatch).getLogicalDependencies();
+ org.drools.base.util.LinkedList<LogicalDependency<M>> list =
((TruthMaintenanceSystemInternalMatch) internalMatch).getLogicalDependencies();
if (list != null && !list.isEmpty()) {
for (LogicalDependency<?> node = list.getFirst(); node !=
null; node = node.getNext()) {
_activation.addLogicalDependency(((BeliefSet)
node.getJustified()).getFactHandle().getId());
diff --git
a/drools-serialization-protobuf/src/main/java/org/drools/serialization/protobuf/iterators/ActivationIterator.java
b/drools-serialization-protobuf/src/main/java/org/drools/serialization/protobuf/iterators/ActivationIterator.java
index 90a5357e265..558117eb888 100644
---
a/drools-serialization-protobuf/src/main/java/org/drools/serialization/protobuf/iterators/ActivationIterator.java
+++
b/drools-serialization-protobuf/src/main/java/org/drools/serialization/protobuf/iterators/ActivationIterator.java
@@ -26,7 +26,7 @@ import org.drools.core.reteoo.TerminalNode;
import org.drools.core.reteoo.TupleImpl;
import org.drools.core.rule.consequence.InternalMatch;
import org.drools.core.reteoo.Tuple;
-import org.drools.core.util.Iterator;
+import org.drools.base.util.Iterator;
import org.kie.api.KieBase;
import org.kie.api.runtime.KieSession;
diff --git
a/drools-serialization-protobuf/src/main/java/org/drools/serialization/protobuf/iterators/LeftTupleIterator.java
b/drools-serialization-protobuf/src/main/java/org/drools/serialization/protobuf/iterators/LeftTupleIterator.java
index d9cf5ec11e4..36c2390f097 100644
---
a/drools-serialization-protobuf/src/main/java/org/drools/serialization/protobuf/iterators/LeftTupleIterator.java
+++
b/drools-serialization-protobuf/src/main/java/org/drools/serialization/protobuf/iterators/LeftTupleIterator.java
@@ -42,8 +42,8 @@ import org.drools.core.reteoo.QueryElementNode;
import org.drools.core.reteoo.RightTuple;
import org.drools.core.reteoo.Tuple;
import org.drools.core.reteoo.TupleImpl;
-import org.drools.core.util.FastIterator;
-import org.drools.core.util.Iterator;
+import org.drools.base.util.FastIterator;
+import org.drools.base.util.Iterator;
public class LeftTupleIterator
implements
diff --git
a/drools-serialization-protobuf/src/main/java/org/drools/serialization/protobuf/iterators/PhreakActivationIterator.java
b/drools-serialization-protobuf/src/main/java/org/drools/serialization/protobuf/iterators/PhreakActivationIterator.java
index 8987394d176..1446cad1bab 100644
---
a/drools-serialization-protobuf/src/main/java/org/drools/serialization/protobuf/iterators/PhreakActivationIterator.java
+++
b/drools-serialization-protobuf/src/main/java/org/drools/serialization/protobuf/iterators/PhreakActivationIterator.java
@@ -28,7 +28,7 @@ import org.drools.core.phreak.RuleExecutor;
import org.drools.core.reteoo.PathMemory;
import org.drools.core.reteoo.TerminalNode;
import org.drools.core.rule.consequence.InternalMatch;
-import org.drools.core.util.Iterator;
+import org.drools.base.util.Iterator;
public class PhreakActivationIterator implements Iterator<InternalMatch> {
diff --git
a/drools-serialization-protobuf/src/main/java/org/drools/serialization/protobuf/iterators/TerminalNodeIterator.java
b/drools-serialization-protobuf/src/main/java/org/drools/serialization/protobuf/iterators/TerminalNodeIterator.java
index db4e8bd5436..a779665c2a1 100644
---
a/drools-serialization-protobuf/src/main/java/org/drools/serialization/protobuf/iterators/TerminalNodeIterator.java
+++
b/drools-serialization-protobuf/src/main/java/org/drools/serialization/protobuf/iterators/TerminalNodeIterator.java
@@ -22,7 +22,7 @@ import java.util.Map;
import org.drools.core.impl.InternalRuleBase;
import org.drools.core.reteoo.TerminalNode;
-import org.drools.core.util.Iterator;
+import org.drools.base.util.Iterator;
import org.kie.api.KieBase;
public class TerminalNodeIterator implements Iterator {
diff --git
a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/IndexingTest.java
b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/IndexingTest.java
index 546b0c20fb4..cbecc5e06e1 100644
---
a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/IndexingTest.java
+++
b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/IndexingTest.java
@@ -46,7 +46,7 @@ import org.drools.core.reteoo.ObjectSinkPropagator;
import org.drools.core.reteoo.ObjectTypeNode;
import org.drools.core.reteoo.RightTuple;
import org.drools.core.reteoo.TupleMemory;
-import org.drools.core.util.FastIterator;
+import org.drools.base.util.FastIterator;
import org.drools.kiesession.session.StatefulKnowledgeSessionImpl;
import org.drools.testcoverage.common.model.Address;
import org.drools.testcoverage.common.model.Cheese;
diff --git
a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/operators/NotTest.java
b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/operators/NotTest.java
index 54d26fe14e5..e122544cffd 100644
---
a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/operators/NotTest.java
+++
b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/operators/NotTest.java
@@ -34,7 +34,7 @@ import org.drools.core.reteoo.ObjectTypeNode;
import org.drools.core.reteoo.RightTuple;
import org.drools.core.reteoo.TupleImpl;
import org.drools.core.reteoo.TupleMemory;
-import org.drools.core.util.FastIterator;
+import org.drools.base.util.FastIterator;
import org.drools.kiesession.session.StatefulKnowledgeSessionImpl;
import org.drools.testcoverage.common.model.AFact;
import org.drools.testcoverage.common.model.Cheese;
diff --git
a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/AbstractTupleIndexHashTableIteratorTest.java
b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/AbstractTupleIndexHashTableIteratorTest.java
index 499e7c26374..83c1bd24859 100644
---
a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/AbstractTupleIndexHashTableIteratorTest.java
+++
b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/AbstractTupleIndexHashTableIteratorTest.java
@@ -29,7 +29,7 @@ import org.drools.base.rule.Declaration;
import org.drools.base.rule.Pattern;
import org.drools.base.rule.accessor.ReadAccessor;
import org.drools.base.rule.constraint.BetaConstraint;
-import org.drools.core.util.SingleLinkedEntry;
+import org.drools.base.util.SingleLinkedEntry;
import org.drools.core.util.index.IndexMemory;
import org.drools.core.util.index.TupleIndexHashTable;
import org.drools.drl.parser.impl.Operator;
diff --git
a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/BaseBetaConstraintsTest.java
b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/BaseBetaConstraintsTest.java
index 16a9c4f4b55..ebd1e685dd0 100644
---
a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/BaseBetaConstraintsTest.java
+++
b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/BaseBetaConstraintsTest.java
@@ -40,8 +40,8 @@ import org.drools.base.rule.constraint.BetaConstraint;
import org.drools.base.rule.accessor.ReadAccessor;
import org.drools.base.util.IndexedValueReader;
import org.drools.core.util.AbstractHashTable.Index;
-import org.drools.core.util.LinkedList;
-import org.drools.core.util.LinkedListEntry;
+import org.drools.base.util.LinkedList;
+import org.drools.base.util.LinkedListEntry;
import org.drools.base.util.index.ConstraintTypeOperator;
import org.drools.core.util.index.TupleList;
import org.drools.model.functions.Predicate1;
diff --git
a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/LeftTupleIndexHashTableIteratorTest.java
b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/LeftTupleIndexHashTableIteratorTest.java
index d41c983d099..084bf7fcdf9 100644
---
a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/LeftTupleIndexHashTableIteratorTest.java
+++
b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/LeftTupleIndexHashTableIteratorTest.java
@@ -35,7 +35,7 @@ import org.drools.base.rule.constraint.BetaConstraint;
import org.drools.core.reteoo.MockLeftTupleSink;
import org.drools.core.reteoo.TupleImpl;
import org.drools.core.reteoo.builder.BuildContext;
-import org.drools.core.util.FastIterator;
+import org.drools.base.util.FastIterator;
import org.drools.core.util.index.TupleIndexHashTable;
import
org.drools.core.util.index.TupleIndexHashTable.FieldIndexHashTableFullIterator;
import org.drools.core.util.index.TupleList;
diff --git
a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/RightTupleIndexHashTableIteratorTest.java
b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/RightTupleIndexHashTableIteratorTest.java
index 4840f3f0d56..d52d9b82e05 100644
---
a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/RightTupleIndexHashTableIteratorTest.java
+++
b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/RightTupleIndexHashTableIteratorTest.java
@@ -33,7 +33,7 @@ import org.drools.core.reteoo.MockRightTupleSink;
import org.drools.core.reteoo.RightTuple;
import org.drools.base.rule.constraint.BetaConstraint;
import org.drools.core.reteoo.TupleImpl;
-import org.drools.core.util.FastIterator;
+import org.drools.base.util.FastIterator;
import org.drools.core.util.index.TupleIndexHashTable;
import
org.drools.core.util.index.TupleIndexHashTable.FieldIndexHashTableFullIterator;
import org.drools.core.util.index.TupleList;
diff --git
a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/common/InternalMatchIteratorTest.java
b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/common/InternalMatchIteratorTest.java
index de34354aaca..15fb80f051e 100644
---
a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/common/InternalMatchIteratorTest.java
+++
b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/common/InternalMatchIteratorTest.java
@@ -28,7 +28,7 @@ import org.drools.core.common.InternalWorkingMemory;
import org.drools.core.event.TrackingAgendaEventListener;
import org.drools.core.impl.RuleBaseFactory;
import org.drools.core.rule.consequence.InternalMatch;
-import org.drools.core.util.Iterator;
+import org.drools.base.util.Iterator;
import org.drools.serialization.protobuf.iterators.ActivationIterator;
import org.drools.testcoverage.common.util.KieBaseTestConfiguration;
import org.drools.testcoverage.common.util.KieBaseUtil;
diff --git
a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/common/TerminalNodeIteratorTest.java
b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/common/TerminalNodeIteratorTest.java
index f82dacc8a0f..47f716fa95f 100644
---
a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/common/TerminalNodeIteratorTest.java
+++
b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/common/TerminalNodeIteratorTest.java
@@ -24,7 +24,7 @@ import java.util.stream.Stream;
import org.drools.serialization.protobuf.iterators.TerminalNodeIterator;
import org.drools.core.reteoo.TerminalNode;
-import org.drools.core.util.Iterator;
+import org.drools.base.util.Iterator;
import org.drools.testcoverage.common.util.KieBaseTestConfiguration;
import org.drools.testcoverage.common.util.KieBaseUtil;
import org.drools.testcoverage.common.util.TestParametersUtil2;
diff --git
a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathReactiveTest.java
b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathReactiveTest.java
index 93ccd68fd2c..cda2afaa045 100644
---
a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathReactiveTest.java
+++
b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathReactiveTest.java
@@ -31,7 +31,7 @@ import org.drools.core.reteoo.ObjectTypeNode;
import org.drools.core.reteoo.ReactiveFromNode;
import org.drools.core.reteoo.TupleImpl;
import org.drools.core.reteoo.TupleMemory;
-import org.drools.core.util.FastIterator;
+import org.drools.base.util.FastIterator;
import org.drools.kiesession.rulebase.InternalKnowledgeBase;
import org.drools.mvel.compiler.oopath.model.Adult;
import org.drools.mvel.compiler.oopath.model.Child;
diff --git
a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/phreak/Scenario.java
b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/phreak/Scenario.java
index b8e12d6bb17..498f3a17305 100644
---
a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/phreak/Scenario.java
+++
b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/phreak/Scenario.java
@@ -34,7 +34,7 @@ import org.drools.core.reteoo.SegmentMemory;
import org.drools.core.reteoo.TupleImpl;
import org.drools.core.reteoo.TupleMemory;
import org.drools.core.reteoo.Tuple;
-import org.drools.core.util.FastIterator;
+import org.drools.base.util.FastIterator;
import java.util.ArrayList;
import java.util.List;
diff --git
a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/util/RightTupleIndexHashTableTest.java
b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/util/RightTupleIndexHashTableTest.java
index 88ad1d184f0..8ac90ca84db 100644
---
a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/util/RightTupleIndexHashTableTest.java
+++
b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/util/RightTupleIndexHashTableTest.java
@@ -45,7 +45,7 @@ import org.drools.core.reteoo.Tuple;
import org.drools.core.test.model.Cheese;
import org.drools.core.util.AbstractHashTable;
import org.drools.base.util.IndexedValueReader;
-import org.drools.core.util.SingleLinkedEntry;
+import org.drools.base.util.SingleLinkedEntry;
import org.drools.core.util.index.TupleIndexHashTable;
import org.drools.core.util.index.TupleList;
diff --git a/drools-tms/src/main/java/org/drools/tms/LogicalDependency.java
b/drools-tms/src/main/java/org/drools/tms/LogicalDependency.java
index acd8e96e923..fec527d0a25 100644
--- a/drools-tms/src/main/java/org/drools/tms/LogicalDependency.java
+++ b/drools-tms/src/main/java/org/drools/tms/LogicalDependency.java
@@ -18,7 +18,7 @@
*/
package org.drools.tms;
-import org.drools.core.util.DoubleLinkedEntry;
+import org.drools.base.util.DoubleLinkedEntry;
import org.drools.tms.agenda.TruthMaintenanceSystemInternalMatch;
import org.drools.tms.beliefsystem.ModedAssertion;
diff --git a/drools-tms/src/main/java/org/drools/tms/SimpleMode.java
b/drools-tms/src/main/java/org/drools/tms/SimpleMode.java
index 3df91c687cd..1099b6b4f05 100644
--- a/drools-tms/src/main/java/org/drools/tms/SimpleMode.java
+++ b/drools-tms/src/main/java/org/drools/tms/SimpleMode.java
@@ -24,7 +24,7 @@ import java.io.ObjectOutput;
import org.drools.tms.beliefsystem.BeliefSystem;
import org.drools.base.beliefsystem.Mode;
-import org.drools.core.util.LinkedListEntry;
+import org.drools.base.util.LinkedListEntry;
import org.drools.tms.beliefsystem.ModedAssertion;
public class SimpleMode extends LinkedListEntry<SimpleMode,
LogicalDependency<SimpleMode>>
diff --git
a/drools-tms/src/main/java/org/drools/tms/TruthMaintenanceSystemImpl.java
b/drools-tms/src/main/java/org/drools/tms/TruthMaintenanceSystemImpl.java
index 824e26c0826..5e846b38aa3 100644
--- a/drools-tms/src/main/java/org/drools/tms/TruthMaintenanceSystemImpl.java
+++ b/drools-tms/src/main/java/org/drools/tms/TruthMaintenanceSystemImpl.java
@@ -35,7 +35,7 @@ import org.drools.core.common.TruthMaintenanceSystem;
import org.drools.core.reteoo.ObjectTypeConf;
import org.drools.core.reteoo.Tuple;
import org.drools.core.rule.consequence.InternalMatch;
-import org.drools.core.util.LinkedList;
+import org.drools.base.util.LinkedList;
import org.drools.tms.agenda.TruthMaintenanceSystemInternalMatch;
import org.drools.tms.beliefsystem.BeliefSet;
import org.drools.tms.beliefsystem.BeliefSystem;
diff --git
a/drools-tms/src/main/java/org/drools/tms/TruthMaintenanceSystemKnowledgeHelper.java
b/drools-tms/src/main/java/org/drools/tms/TruthMaintenanceSystemKnowledgeHelper.java
index 579c8896005..344d2abf987 100644
---
a/drools-tms/src/main/java/org/drools/tms/TruthMaintenanceSystemKnowledgeHelper.java
+++
b/drools-tms/src/main/java/org/drools/tms/TruthMaintenanceSystemKnowledgeHelper.java
@@ -29,8 +29,8 @@ import org.drools.core.reteoo.ObjectTypeConf;
import org.drools.core.reteoo.RuntimeComponentFactory;
import org.drools.base.rule.EntryPointId;
import org.drools.core.rule.consequence.InternalMatch;
-import org.drools.core.util.LinkedList;
-import org.drools.core.util.LinkedListEntry;
+import org.drools.base.util.LinkedList;
+import org.drools.base.util.LinkedListEntry;
import org.drools.kiesession.consequence.DefaultKnowledgeHelper;
import org.drools.kiesession.entrypoints.NamedEntryPoint;
import org.drools.tms.agenda.TruthMaintenanceSystemInternalMatch;
diff --git
a/drools-tms/src/main/java/org/drools/tms/agenda/TruthMaintenanceSystemInternalMatch.java
b/drools-tms/src/main/java/org/drools/tms/agenda/TruthMaintenanceSystemInternalMatch.java
index 5eebb39efa1..3dc0e2e57f7 100644
---
a/drools-tms/src/main/java/org/drools/tms/agenda/TruthMaintenanceSystemInternalMatch.java
+++
b/drools-tms/src/main/java/org/drools/tms/agenda/TruthMaintenanceSystemInternalMatch.java
@@ -23,7 +23,7 @@ import org.drools.tms.beliefsystem.ModedAssertion;
import org.drools.tms.SimpleMode;
import org.drools.tms.LogicalDependency;
import org.drools.core.rule.consequence.InternalMatch;
-import org.drools.core.util.LinkedList;
+import org.drools.base.util.LinkedList;
public interface TruthMaintenanceSystemInternalMatch<T extends
ModedAssertion<T>> extends InternalMatch {
diff --git
a/drools-tms/src/main/java/org/drools/tms/agenda/TruthMaintenanceSystemRuleTerminalNodeLeftTuple.java
b/drools-tms/src/main/java/org/drools/tms/agenda/TruthMaintenanceSystemRuleTerminalNodeLeftTuple.java
index 5b87dd9c826..a226bf475c4 100644
---
a/drools-tms/src/main/java/org/drools/tms/agenda/TruthMaintenanceSystemRuleTerminalNodeLeftTuple.java
+++
b/drools-tms/src/main/java/org/drools/tms/agenda/TruthMaintenanceSystemRuleTerminalNodeLeftTuple.java
@@ -24,7 +24,7 @@ import org.drools.core.reteoo.RuleTerminalNodeLeftTuple;
import org.drools.core.reteoo.Sink;
import org.drools.core.common.PropagationContext;
import org.drools.core.reteoo.TupleImpl;
-import org.drools.core.util.LinkedList;
+import org.drools.base.util.LinkedList;
import org.drools.tms.LogicalDependency;
import org.drools.tms.SimpleMode;
import org.drools.tms.TruthMaintenanceSystemImpl;
diff --git
a/drools-tms/src/main/java/org/drools/tms/beliefsystem/BeliefSet.java
b/drools-tms/src/main/java/org/drools/tms/beliefsystem/BeliefSet.java
index 30c1f4c6495..4bfc000450f 100644
--- a/drools-tms/src/main/java/org/drools/tms/beliefsystem/BeliefSet.java
+++ b/drools-tms/src/main/java/org/drools/tms/beliefsystem/BeliefSet.java
@@ -20,7 +20,7 @@ package org.drools.tms.beliefsystem;
import org.drools.core.common.InternalFactHandle;
import org.drools.core.common.WorkingMemoryAction;
-import org.drools.core.util.FastIterator;
+import org.drools.base.util.FastIterator;
import org.drools.core.common.PropagationContext;
public interface BeliefSet<M extends ModedAssertion<M>> {
diff --git
a/drools-tms/src/main/java/org/drools/tms/beliefsystem/ModedAssertion.java
b/drools-tms/src/main/java/org/drools/tms/beliefsystem/ModedAssertion.java
index c5389861d49..49c68f707ba 100644
--- a/drools-tms/src/main/java/org/drools/tms/beliefsystem/ModedAssertion.java
+++ b/drools-tms/src/main/java/org/drools/tms/beliefsystem/ModedAssertion.java
@@ -18,7 +18,7 @@
*/
package org.drools.tms.beliefsystem;
-import org.drools.core.util.DoubleLinkedEntry;
+import org.drools.base.util.DoubleLinkedEntry;
public interface ModedAssertion<M extends ModedAssertion<M>> extends
BeliefSystemMode, DoubleLinkedEntry<M> {
diff --git
a/drools-tms/src/main/java/org/drools/tms/beliefsystem/defeasible/DefeasibleBeliefSet.java
b/drools-tms/src/main/java/org/drools/tms/beliefsystem/defeasible/DefeasibleBeliefSet.java
index 71ccf7d2cab..d9295e73efe 100644
---
a/drools-tms/src/main/java/org/drools/tms/beliefsystem/defeasible/DefeasibleBeliefSet.java
+++
b/drools-tms/src/main/java/org/drools/tms/beliefsystem/defeasible/DefeasibleBeliefSet.java
@@ -27,8 +27,8 @@ import org.drools.core.common.QueryElementFactHandle;
import org.drools.core.common.WorkingMemoryAction;
import org.drools.base.definitions.rule.impl.RuleImpl;
import org.drools.core.common.PropagationContext;
-import org.drools.core.util.FastIterator;
-import org.drools.core.util.DoubleLinkedEntry;
+import org.drools.base.util.FastIterator;
+import org.drools.base.util.DoubleLinkedEntry;
import org.drools.tms.LogicalDependency;
import org.drools.tms.TruthMaintenanceSystemEqualityKey;
import org.drools.tms.beliefsystem.BeliefSystem;
diff --git
a/drools-tms/src/main/java/org/drools/tms/beliefsystem/jtms/JTMSBeliefSetImpl.java
b/drools-tms/src/main/java/org/drools/tms/beliefsystem/jtms/JTMSBeliefSetImpl.java
index 6380bbbe564..26b4aecd5cb 100644
---
a/drools-tms/src/main/java/org/drools/tms/beliefsystem/jtms/JTMSBeliefSetImpl.java
+++
b/drools-tms/src/main/java/org/drools/tms/beliefsystem/jtms/JTMSBeliefSetImpl.java
@@ -23,7 +23,7 @@ import org.drools.core.common.InternalFactHandle;
import org.drools.tms.LogicalDependency;
import org.drools.core.common.WorkingMemoryAction;
import org.drools.core.common.PropagationContext;
-import org.drools.core.util.LinkedList;
+import org.drools.base.util.LinkedList;
public class JTMSBeliefSetImpl<M extends JTMSMode<M>> extends LinkedList<M>
implements JTMSBeliefSet<M> {
diff --git
a/drools-tms/src/main/java/org/drools/tms/beliefsystem/jtms/JTMSMode.java
b/drools-tms/src/main/java/org/drools/tms/beliefsystem/jtms/JTMSMode.java
index e2173db2c8c..4d34d2bce08 100644
--- a/drools-tms/src/main/java/org/drools/tms/beliefsystem/jtms/JTMSMode.java
+++ b/drools-tms/src/main/java/org/drools/tms/beliefsystem/jtms/JTMSMode.java
@@ -21,7 +21,7 @@ package org.drools.tms.beliefsystem.jtms;
import org.drools.tms.beliefsystem.BeliefSystem;
import org.drools.tms.beliefsystem.ModedAssertion;
import org.drools.tms.LogicalDependency;
-import org.drools.core.util.AbstractLinkedListNode;
+import org.drools.base.util.AbstractLinkedListNode;
import org.drools.base.beliefsystem.Mode;
public class JTMSMode<M extends JTMSMode<M>> extends AbstractLinkedListNode<M>
implements ModedAssertion<M> {
diff --git
a/drools-tms/src/main/java/org/drools/tms/beliefsystem/simple/SimpleBeliefSet.java
b/drools-tms/src/main/java/org/drools/tms/beliefsystem/simple/SimpleBeliefSet.java
index 7bf7aca6bbb..74acd8ca901 100644
---
a/drools-tms/src/main/java/org/drools/tms/beliefsystem/simple/SimpleBeliefSet.java
+++
b/drools-tms/src/main/java/org/drools/tms/beliefsystem/simple/SimpleBeliefSet.java
@@ -25,8 +25,8 @@ import org.drools.core.common.InternalFactHandle;
import org.drools.tms.LogicalDependency;
import org.drools.core.common.WorkingMemoryAction;
import org.drools.core.common.PropagationContext;
-import org.drools.core.util.LinkedList;
-import org.drools.core.util.LinkedListEntry;
+import org.drools.base.util.LinkedList;
+import org.drools.base.util.LinkedListEntry;
public class SimpleBeliefSet extends LinkedList<SimpleMode> implements
BeliefSet<SimpleMode> {
protected BeliefSystem beliefSystem;
diff --git
a/drools-tms/src/main/java/org/drools/tms/beliefsystem/simple/SimpleLogicalDependency.java
b/drools-tms/src/main/java/org/drools/tms/beliefsystem/simple/SimpleLogicalDependency.java
index c7b28a8cb07..535e46e7d0c 100644
---
a/drools-tms/src/main/java/org/drools/tms/beliefsystem/simple/SimpleLogicalDependency.java
+++
b/drools-tms/src/main/java/org/drools/tms/beliefsystem/simple/SimpleLogicalDependency.java
@@ -19,7 +19,7 @@
package org.drools.tms.beliefsystem.simple;
import org.drools.tms.beliefsystem.ModedAssertion;
-import org.drools.core.util.AbstractLinkedListNode;
+import org.drools.base.util.AbstractLinkedListNode;
import org.drools.tms.LogicalDependency;
import org.drools.tms.agenda.TruthMaintenanceSystemInternalMatch;
diff --git a/drools-tms/src/test/java/org/drools/tms/TMSMockInternalMatch.java
b/drools-tms/src/test/java/org/drools/tms/TMSMockInternalMatch.java
index 82cb4f76f1a..9b5a12a0f0a 100644
--- a/drools-tms/src/test/java/org/drools/tms/TMSMockInternalMatch.java
+++ b/drools-tms/src/test/java/org/drools/tms/TMSMockInternalMatch.java
@@ -21,7 +21,7 @@ package org.drools.tms;
import org.drools.core.common.ActivationsManager;
import org.drools.core.common.InternalFactHandle;
import org.drools.core.reteoo.TerminalNode;
-import org.drools.core.util.LinkedList;
+import org.drools.base.util.LinkedList;
import org.drools.kiesession.MockInternalMatch;
import org.drools.tms.agenda.TruthMaintenanceSystemInternalMatch;
diff --git
a/drools-traits/src/main/java/org/drools/traits/core/factmodel/Triple.java
b/drools-traits/src/main/java/org/drools/traits/core/factmodel/Triple.java
index fb5d6925827..124d0106ddf 100644
--- a/drools-traits/src/main/java/org/drools/traits/core/factmodel/Triple.java
+++ b/drools-traits/src/main/java/org/drools/traits/core/factmodel/Triple.java
@@ -20,7 +20,7 @@ package org.drools.traits.core.factmodel;
import java.io.Serializable;
-import org.drools.core.util.SingleLinkedEntry;
+import org.drools.base.util.SingleLinkedEntry;
public interface Triple extends SingleLinkedEntry, Serializable {
diff --git
a/drools-traits/src/main/java/org/drools/traits/core/factmodel/TripleImpl.java
b/drools-traits/src/main/java/org/drools/traits/core/factmodel/TripleImpl.java
index 3f6059aa322..5d648466b31 100644
---
a/drools-traits/src/main/java/org/drools/traits/core/factmodel/TripleImpl.java
+++
b/drools-traits/src/main/java/org/drools/traits/core/factmodel/TripleImpl.java
@@ -18,7 +18,7 @@
*/
package org.drools.traits.core.factmodel;
-import org.drools.core.util.SingleLinkedEntry;
+import org.drools.base.util.SingleLinkedEntry;
public class TripleImpl extends AbstractTriple {
private SingleLinkedEntry next;
diff --git
a/drools-traits/src/main/java/org/drools/traits/core/factmodel/TripleStore.java
b/drools-traits/src/main/java/org/drools/traits/core/factmodel/TripleStore.java
index 2b02b53c89e..78013bf3a60 100644
---
a/drools-traits/src/main/java/org/drools/traits/core/factmodel/TripleStore.java
+++
b/drools-traits/src/main/java/org/drools/traits/core/factmodel/TripleStore.java
@@ -29,7 +29,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.drools.core.util.SingleLinkedEntry;
+import org.drools.base.util.SingleLinkedEntry;
import org.kie.api.runtime.rule.Variable;
public class TripleStore implements Externalizable {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
