diff --git a/querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions10Test.java b/querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions10Test.java index 10e964f84..846a662da 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions10Test.java +++ b/querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions10Test.java @@ -9,7 +9,6 @@ import com.mysema.query.annotations.QueryDelegate; import com.mysema.query.annotations.QueryEmbeddable; import com.mysema.query.annotations.QueryEntity; import com.mysema.query.annotations.QuerySupertype; -import com.mysema.query.types.Interval; import com.mysema.query.types.expr.EBoolean; import com.mysema.query.types.expr.EBooleanConst; import com.mysema.query.types.path.PDate; @@ -17,6 +16,10 @@ import com.mysema.query.types.path.PDateTime; public class QueryExtensions10Test { + public interface Interval{ + + } + /** * Adds a period filter */ diff --git a/querydsl-core/src/main/java/com/mysema/query/codegen/EntitySerializer.java b/querydsl-core/src/main/java/com/mysema/query/codegen/EntitySerializer.java index ca9e28db3..d266f88ed 100644 --- a/querydsl-core/src/main/java/com/mysema/query/codegen/EntitySerializer.java +++ b/querydsl-core/src/main/java/com/mysema/query/codegen/EntitySerializer.java @@ -642,7 +642,7 @@ public class EntitySerializer implements Serializer{ queryType = typeMappings.getPathType(property.getParameter(1), model, true); serialize(model, property, new ClassType(PMap.class, getRaw(property.getParameter(0)), getRaw(property.getParameter(1)), genericQueryType), - writer, "this.<"+genericKey+COMMA+genericValue+COMMA+genericQueryType+">createMap", + writer, "this.<" + genericKey + COMMA + genericValue + COMMA + model.getRawName(genericQueryType) + ">createMap", keyType+DOT_CLASS, valueType+DOT_CLASS, queryType+DOT_CLASS); @@ -652,7 +652,7 @@ public class EntitySerializer implements Serializer{ localRawName = model.getRawName(property.getParameter(0)); queryType = typeMappings.getPathType(property.getParameter(0), model, true); - serialize(model, property, new ClassType(PList.class, getRaw(property.getParameter(0)), genericQueryType), writer, "createList", localRawName + DOT_CLASS, queryType +DOT_CLASS); + serialize(model, property, new ClassType(PList.class, getRaw(property.getParameter(0)), genericQueryType), writer, "createList", localRawName + DOT_CLASS, model.getRawName(queryType) + DOT_CLASS); break; case ENTITY: entityField(model, property, config, writer); @@ -662,7 +662,7 @@ public class EntitySerializer implements Serializer{ } private Type getRaw(Type type) { - if (type instanceof EntityType){ + if (type instanceof EntityType && type.getPackageName().startsWith("ext.java")){ return type; }else{ return new SimpleType(type, type.getParameters()); diff --git a/querydsl-core/src/main/java/com/mysema/query/types/Converters.java b/querydsl-core/src/main/java/com/mysema/query/types/Converters.java index d2de4de18..de4244d52 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/Converters.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/Converters.java @@ -10,6 +10,10 @@ import org.apache.commons.collections15.Transformer; import com.mysema.query.types.expr.EString; import com.mysema.query.types.expr.EStringEscape; +/** + * @author tiwe + * + */ public final class Converters { private Converters(){} diff --git a/querydsl-core/src/main/java/com/mysema/query/types/Interval.java b/querydsl-core/src/main/java/com/mysema/query/types/Interval.java deleted file mode 100644 index b45781858..000000000 --- a/querydsl-core/src/main/java/com/mysema/query/types/Interval.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2010 Mysema Ltd. - * All rights reserved. - * - */ -package com.mysema.query.types; - -import javax.annotation.Nullable; - -/** - * Interval is a typed inclusive interval from begin to end with optional open begin and end - * - * @author tiwe - * - * @param - */ -public interface Interval { - - /** - * Get the beginning of the interval or null - * - * @return - */ - @Nullable - T getBegin(); - - /** - * Get the end of the interval or null - * - * @return - */ - @Nullable - T getEnd(); - -} diff --git a/querydsl-core/src/main/java/com/mysema/query/types/IntervalImpl.java b/querydsl-core/src/main/java/com/mysema/query/types/IntervalImpl.java deleted file mode 100644 index 41fb38119..000000000 --- a/querydsl-core/src/main/java/com/mysema/query/types/IntervalImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2010 Mysema Ltd. - * All rights reserved. - * - */ -package com.mysema.query.types; - -import javax.annotation.Nullable; - -/** - * Default implementation of the interval interface - * - * @author tiwe - * - * @param - */ -public class IntervalImpl implements Interval { - - public static Interval create(@Nullable T begin, @Nullable T end){ - return new IntervalImpl(begin, end); - } - - @Nullable - private final T begin, end; - - public IntervalImpl(@Nullable T begin, @Nullable T end){ - this.begin = begin; - this.end = end; - } - - @Override - public T getBegin() { - return begin; - } - - @Override - public T getEnd() { - return end; - } - -} diff --git a/querydsl-core/src/main/java/com/mysema/query/types/SerializerBase.java b/querydsl-core/src/main/java/com/mysema/query/types/SerializerBase.java index e71a0d328..48467649f 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/SerializerBase.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/SerializerBase.java @@ -16,7 +16,6 @@ import com.mysema.query.BooleanBuilder; import com.mysema.query.JoinFlag; import com.mysema.query.QueryFlag; import com.mysema.query.QueryFlag.Position; -import com.mysema.query.types.*; /** * SerializerBase is a stub for Serializer implementations diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/EComparable.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/EComparable.java index b25e48dcf..2099769e4 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/expr/EComparable.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/expr/EComparable.java @@ -5,9 +5,7 @@ */ package com.mysema.query.types.expr; -import com.mysema.query.BooleanBuilder; import com.mysema.query.types.Expr; -import com.mysema.query.types.Interval; import com.mysema.query.types.Operator; import com.mysema.query.types.Ops; import com.mysema.query.types.Path; @@ -165,21 +163,4 @@ public abstract class EComparable extends EComparableBase< return OBoolean.create(Ops.BOE, this, right); } - /** - * Get this in period expression - * - * @param period - * @return - */ - public EBoolean in(Interval period) { - BooleanBuilder builder = new BooleanBuilder(); - if (period.getBegin() != null) { - builder.and(goe(period.getBegin())); - } - if (period.getEnd() != null) { - builder.and(loe(period.getEnd())); - } - return builder.getValue(); - } - } diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/ENumber.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/ENumber.java index db127762e..edc59d814 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/expr/ENumber.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/expr/ENumber.java @@ -12,9 +12,7 @@ import java.util.List; import javax.annotation.Nullable; -import com.mysema.query.BooleanBuilder; import com.mysema.query.types.Expr; -import com.mysema.query.types.Interval; import com.mysema.query.types.Operator; import com.mysema.query.types.Ops; import com.mysema.query.types.Path; @@ -344,23 +342,6 @@ public abstract class ENumber> extends ECompara return castToNum(Integer.class); } - /** - * Get this in period expression - * - * @param period - * @return - */ - public > EBoolean in(Interval period) { - BooleanBuilder builder = new BooleanBuilder(); - if (period.getBegin() != null) { - builder.and(goe(period.getBegin())); - } - if (period.getEnd() != null) { - builder.and(loe(period.getEnd())); - } - return builder.getValue(); - } - /** * Create a this <= right expression * diff --git a/querydsl-core/src/test/java/com/mysema/query/Filters.java b/querydsl-core/src/test/java/com/mysema/query/Filters.java index d4cef5d6a..a012850a3 100644 --- a/querydsl-core/src/test/java/com/mysema/query/Filters.java +++ b/querydsl-core/src/test/java/com/mysema/query/Filters.java @@ -12,7 +12,6 @@ import java.util.HashSet; import java.util.List; import com.mysema.query.types.Expr; -import com.mysema.query.types.IntervalImpl; import com.mysema.query.types.Path; import com.mysema.query.types.expr.*; @@ -76,8 +75,8 @@ public class Filters { rv.add(expr.loe(other)); rv.add(expr.loe(knownValue)); - rv.add(expr.in(IntervalImpl.create(knownValue, null))); - rv.add(expr.in(IntervalImpl.create(null, knownValue))); +// rv.add(expr.in(IntervalImpl.create(knownValue, null))); +// rv.add(expr.in(IntervalImpl.create(null, knownValue))); return rv; @@ -195,7 +194,7 @@ public class Filters { rv.add(elong.mod(5l).eq(0l)); } - rv.add(expr.in(IntervalImpl.create(0, 100))); +// rv.add(expr.in(IntervalImpl.create(0, 100))); return rv; } @@ -279,7 +278,7 @@ public class Filters { rv.add(new Coalesce(String.class, expr, other).eq("xxx")); } - rv.add(expr.in(IntervalImpl.create("A", "Z"))); +// rv.add(expr.in(IntervalImpl.create("A", "Z"))); return rv; }