diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/eval/JaninoEvaluator.java b/querydsl-collections/src/main/java/com/mysema/query/collections/eval/JaninoEvaluator.java index f92ec9103..d4a54f0bc 100644 --- a/querydsl-collections/src/main/java/com/mysema/query/collections/eval/JaninoEvaluator.java +++ b/querydsl-collections/src/main/java/com/mysema/query/collections/eval/JaninoEvaluator.java @@ -12,7 +12,7 @@ import org.codehaus.janino.ExpressionEvaluator; import com.mysema.query.grammar.JavaOps; import com.mysema.query.grammar.types.Expr; -import com.mysema.query.util.Assert; +import com.mysema.util.Assert; /** * JaninoEvaluator is a Janino compiler based Evaluator implementation diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/eval/JavaSerializer.java b/querydsl-collections/src/main/java/com/mysema/query/collections/eval/JavaSerializer.java index 9cddc36a3..251249322 100644 --- a/querydsl-collections/src/main/java/com/mysema/query/collections/eval/JavaSerializer.java +++ b/querydsl-collections/src/main/java/com/mysema/query/collections/eval/JavaSerializer.java @@ -29,7 +29,7 @@ import com.mysema.query.grammar.types.Path; import com.mysema.query.grammar.types.Expr.EConstant; import com.mysema.query.grammar.types.PathMetadata.PathType; import com.mysema.query.serialization.BaseSerializer; -import com.mysema.query.util.Assert; +import com.mysema.util.Assert; /** diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/iterators/FilteringMultiIterator.java b/querydsl-collections/src/main/java/com/mysema/query/collections/iterators/FilteringMultiIterator.java index b2314af71..337d943f9 100644 --- a/querydsl-collections/src/main/java/com/mysema/query/collections/iterators/FilteringMultiIterator.java +++ b/querydsl-collections/src/main/java/com/mysema/query/collections/iterators/FilteringMultiIterator.java @@ -27,7 +27,7 @@ import com.mysema.query.collections.utils.QueryIteratorUtils; import com.mysema.query.grammar.JavaOps; import com.mysema.query.grammar.types.Expr; import com.mysema.query.grammar.types.Expr.EBoolean; -import com.mysema.query.util.Assert; +import com.mysema.util.Assert; /** * FilteringMultiIterator extends the MultiIterator to provide a filtered view diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/support/CustomQueryable.java b/querydsl-collections/src/main/java/com/mysema/query/collections/support/CustomQueryable.java index 53118569d..945f8342c 100644 --- a/querydsl-collections/src/main/java/com/mysema/query/collections/support/CustomQueryable.java +++ b/querydsl-collections/src/main/java/com/mysema/query/collections/support/CustomQueryable.java @@ -17,7 +17,7 @@ import com.mysema.query.collections.QueryIndexSupport; import com.mysema.query.grammar.JavaOps; import com.mysema.query.grammar.OrderSpecifier; import com.mysema.query.grammar.types.Expr; -import com.mysema.query.util.Assert; +import com.mysema.util.Assert; /** * CustomQueryable a ColQuery like interface for querying on custom IteratorSource sources diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/support/DefaultIndexCreationTask.java b/querydsl-collections/src/main/java/com/mysema/query/collections/support/DefaultIndexCreationTask.java index 5ef0d2087..ab7f41089 100644 --- a/querydsl-collections/src/main/java/com/mysema/query/collections/support/DefaultIndexCreationTask.java +++ b/querydsl-collections/src/main/java/com/mysema/query/collections/support/DefaultIndexCreationTask.java @@ -17,7 +17,7 @@ import com.mysema.query.grammar.types.Operation; import com.mysema.query.grammar.types.Path; import com.mysema.query.grammar.types.Expr.EBoolean; import com.mysema.query.grammar.types.Expr.EConstant; -import com.mysema.query.util.Assert; +import com.mysema.util.Assert; /** * IndexCreationTask provides diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/support/SimpleIndexSupport.java b/querydsl-collections/src/main/java/com/mysema/query/collections/support/SimpleIndexSupport.java index 4f3bf2aa6..45627ef26 100644 --- a/querydsl-collections/src/main/java/com/mysema/query/collections/support/SimpleIndexSupport.java +++ b/querydsl-collections/src/main/java/com/mysema/query/collections/support/SimpleIndexSupport.java @@ -13,7 +13,7 @@ import com.mysema.query.collections.QueryIndexSupport; import com.mysema.query.grammar.JavaOps; import com.mysema.query.grammar.types.Expr; import com.mysema.query.grammar.types.Expr.EBoolean; -import com.mysema.query.util.Assert; +import com.mysema.util.Assert; /** * SimpleIndexSupport is a minimal QueryIndexSupport implementation diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/support/SimpleIteratorSource.java b/querydsl-collections/src/main/java/com/mysema/query/collections/support/SimpleIteratorSource.java index 882df6fe5..3d290657a 100644 --- a/querydsl-collections/src/main/java/com/mysema/query/collections/support/SimpleIteratorSource.java +++ b/querydsl-collections/src/main/java/com/mysema/query/collections/support/SimpleIteratorSource.java @@ -12,7 +12,7 @@ import java.util.Map; import com.mysema.query.collections.IteratorSource; import com.mysema.query.collections.QueryIndexSupport; import com.mysema.query.grammar.types.Expr; -import com.mysema.query.util.Assert; +import com.mysema.util.Assert; /** * SimpleIteratorSource is the default implementation of the IndexSupport interface diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/utils/EvaluatorUtils.java b/querydsl-collections/src/main/java/com/mysema/query/collections/utils/EvaluatorUtils.java index 61fea1051..fed05d17d 100644 --- a/querydsl-collections/src/main/java/com/mysema/query/collections/utils/EvaluatorUtils.java +++ b/querydsl-collections/src/main/java/com/mysema/query/collections/utils/EvaluatorUtils.java @@ -11,7 +11,7 @@ import com.mysema.query.collections.eval.Evaluator; import com.mysema.query.collections.eval.JaninoEvaluator; import com.mysema.query.grammar.JavaOps; import com.mysema.query.grammar.types.Expr; -import com.mysema.query.util.Assert; +import com.mysema.util.Assert; /** * EvaluatorUtils provides factory methods for Evaluator creation diff --git a/querydsl-core/src/main/java/com/mysema/query/JoinExpression.java b/querydsl-core/src/main/java/com/mysema/query/JoinExpression.java index 0ace25d3f..0dd8f1cab 100644 --- a/querydsl-core/src/main/java/com/mysema/query/JoinExpression.java +++ b/querydsl-core/src/main/java/com/mysema/query/JoinExpression.java @@ -8,7 +8,7 @@ package com.mysema.query; import org.apache.commons.lang.builder.EqualsBuilder; import com.mysema.query.grammar.types.Expr; -import com.mysema.query.util.Assert; +import com.mysema.util.Assert; /** * JoinExpression is a join element in a Query instance diff --git a/querydsl-core/src/main/java/com/mysema/query/ProjectableAdapter.java b/querydsl-core/src/main/java/com/mysema/query/ProjectableAdapter.java index 1fcc4145b..5c7470263 100644 --- a/querydsl-core/src/main/java/com/mysema/query/ProjectableAdapter.java +++ b/querydsl-core/src/main/java/com/mysema/query/ProjectableAdapter.java @@ -9,7 +9,7 @@ import java.util.Iterator; import java.util.List; import com.mysema.query.grammar.types.Expr; -import com.mysema.query.util.Assert; +import com.mysema.util.Assert; /** * ProjectableAdapter is an adapter implementation for the Projectable diff --git a/querydsl-core/src/main/java/com/mysema/query/QueryAdapter.java b/querydsl-core/src/main/java/com/mysema/query/QueryAdapter.java index e8ef96a9b..0f3b3a127 100644 --- a/querydsl-core/src/main/java/com/mysema/query/QueryAdapter.java +++ b/querydsl-core/src/main/java/com/mysema/query/QueryAdapter.java @@ -8,7 +8,7 @@ package com.mysema.query; import com.mysema.query.grammar.OrderSpecifier; import com.mysema.query.grammar.types.Expr; import com.mysema.query.grammar.types.Expr.EBoolean; -import com.mysema.query.util.Assert; +import com.mysema.util.Assert; /** * QueryAdapter is an adapter implementation for Query instace wrapping diff --git a/querydsl-core/src/main/java/com/mysema/query/grammar/Grammar.java b/querydsl-core/src/main/java/com/mysema/query/grammar/Grammar.java index ed904069d..3e0d70059 100644 --- a/querydsl-core/src/main/java/com/mysema/query/grammar/Grammar.java +++ b/querydsl-core/src/main/java/com/mysema/query/grammar/Grammar.java @@ -17,7 +17,7 @@ import com.mysema.query.grammar.types.Expr.EString; import com.mysema.query.grammar.types.Operation.OBoolean; import com.mysema.query.grammar.types.Path.PEntity; import com.mysema.query.grammar.types.Path.PEntityCollection; -import com.mysema.query.util.Assert; +import com.mysema.util.Assert; /** * Grammar provides the factory methods for the fluent grammar. diff --git a/querydsl-core/src/main/java/com/mysema/query/grammar/OrderSpecifier.java b/querydsl-core/src/main/java/com/mysema/query/grammar/OrderSpecifier.java index 24cee046a..86dc1f25b 100644 --- a/querydsl-core/src/main/java/com/mysema/query/grammar/OrderSpecifier.java +++ b/querydsl-core/src/main/java/com/mysema/query/grammar/OrderSpecifier.java @@ -6,7 +6,7 @@ package com.mysema.query.grammar; import com.mysema.query.grammar.types.Expr; -import com.mysema.query.util.Assert; +import com.mysema.util.Assert; /** * OrderSpecifier represents an order by element in a Query instance diff --git a/querydsl-core/src/main/java/com/mysema/query/grammar/types/SimpleExprFactory.java b/querydsl-core/src/main/java/com/mysema/query/grammar/types/SimpleExprFactory.java index c48424141..aaf280264 100644 --- a/querydsl-core/src/main/java/com/mysema/query/grammar/types/SimpleExprFactory.java +++ b/querydsl-core/src/main/java/com/mysema/query/grammar/types/SimpleExprFactory.java @@ -19,7 +19,7 @@ import com.mysema.query.grammar.types.Operation.OComparable; import com.mysema.query.grammar.types.Operation.ONumber; import com.mysema.query.grammar.types.Operation.OString; import com.mysema.query.grammar.types.Operation.OStringArray; -import com.mysema.query.util.Assert; +import com.mysema.util.Assert; /** * Factory provides factory methods for various needs diff --git a/querydsl-core/src/main/java/com/mysema/query/util/Assert.java b/querydsl-core/src/main/java/com/mysema/util/Assert.java similarity index 54% rename from querydsl-core/src/main/java/com/mysema/query/util/Assert.java rename to querydsl-core/src/main/java/com/mysema/util/Assert.java index 6edfc2ec1..9860429f9 100644 --- a/querydsl-core/src/main/java/com/mysema/query/util/Assert.java +++ b/querydsl-core/src/main/java/com/mysema/util/Assert.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.util; +package com.mysema.util; /** * Assert provides @@ -19,12 +19,21 @@ public class Assert { } public static T notNull(T object) { - if (object == null) throw new IllegalArgumentException("was null"); - return object; + return notNull(object, "was null"); } + public static T notNull(T object, String message) { + if (object == null) throw new IllegalArgumentException(message); + return object; + } + public static String notEmpty(String contentType) { return hasText(contentType); } + + public static T[] notEmpty(T[] objects) { + if(objects == null || objects.length == 0) throw new IllegalArgumentException("was empty"); + return objects; + } }