diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/DefaultQueryEngine.java b/querydsl-collections/src/main/java/com/mysema/query/collections/DefaultQueryEngine.java index 91f1b0e30..b98aa71c3 100644 --- a/querydsl-collections/src/main/java/com/mysema/query/collections/DefaultQueryEngine.java +++ b/querydsl-collections/src/main/java/com/mysema/query/collections/DefaultQueryEngine.java @@ -26,7 +26,7 @@ import com.mysema.query.types.Expression; import com.mysema.query.types.Operation; import com.mysema.query.types.Order; import com.mysema.query.types.OrderSpecifier; -import com.mysema.util.MultiComparator; +import com.mysema.query.util.MultiComparator; /** * Default implementation of the QueryEngine interface diff --git a/querydsl-collections/src/test/java/com/mysema/util/LimitingIteratorTest.java b/querydsl-collections/src/test/java/com/mysema/util/LimitingIteratorTest.java index 66c09a687..fffe54e26 100644 --- a/querydsl-collections/src/test/java/com/mysema/util/LimitingIteratorTest.java +++ b/querydsl-collections/src/test/java/com/mysema/util/LimitingIteratorTest.java @@ -16,6 +16,7 @@ import org.apache.commons.collections15.IteratorUtils; import org.junit.Test; import com.mysema.query.QueryModifiers; +import com.mysema.query.util.LimitingIterator; public class LimitingIteratorTest { diff --git a/querydsl-collections/src/main/java/com/mysema/util/LimitingIterator.java b/querydsl-core/src/main/java/com/mysema/query/util/LimitingIterator.java similarity index 97% rename from querydsl-collections/src/main/java/com/mysema/util/LimitingIterator.java rename to querydsl-core/src/main/java/com/mysema/query/util/LimitingIterator.java index bb2cdf344..aca350b1b 100644 --- a/querydsl-collections/src/main/java/com/mysema/util/LimitingIterator.java +++ b/querydsl-core/src/main/java/com/mysema/query/util/LimitingIterator.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.util; +package com.mysema.query.util; import java.util.Iterator; diff --git a/querydsl-collections/src/main/java/com/mysema/util/MultiComparator.java b/querydsl-core/src/main/java/com/mysema/query/util/MultiComparator.java similarity index 97% rename from querydsl-collections/src/main/java/com/mysema/util/MultiComparator.java rename to querydsl-core/src/main/java/com/mysema/query/util/MultiComparator.java index 36b5ab961..7b6c0ac73 100644 --- a/querydsl-collections/src/main/java/com/mysema/util/MultiComparator.java +++ b/querydsl-core/src/main/java/com/mysema/query/util/MultiComparator.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.util; +package com.mysema.query.util; import java.io.Serializable; import java.util.Comparator; diff --git a/querydsl-collections/src/main/java/com/mysema/util/NullSafeComparableComparator.java b/querydsl-core/src/main/java/com/mysema/query/util/NullSafeComparableComparator.java similarity index 94% rename from querydsl-collections/src/main/java/com/mysema/util/NullSafeComparableComparator.java rename to querydsl-core/src/main/java/com/mysema/query/util/NullSafeComparableComparator.java index cf3ba5f75..00ec30f57 100644 --- a/querydsl-collections/src/main/java/com/mysema/util/NullSafeComparableComparator.java +++ b/querydsl-core/src/main/java/com/mysema/query/util/NullSafeComparableComparator.java @@ -1,4 +1,4 @@ -package com.mysema.util; +package com.mysema.query.util; import java.io.Serializable; import java.util.Comparator;