diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/AbstractColQuery.java b/querydsl-collections/src/main/java/com/mysema/query/collections/AbstractColQuery.java index 74bcdde33..aa7c9b6f2 100644 --- a/querydsl-collections/src/main/java/com/mysema/query/collections/AbstractColQuery.java +++ b/querydsl-collections/src/main/java/com/mysema/query/collections/AbstractColQuery.java @@ -75,7 +75,7 @@ public abstract class AbstractColQuery> extends P return (Q)this; } - private QueryMetadata getMetadata() { + protected QueryMetadata getMetadata() { return queryMixin.getMetadata(); } diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/ColQueryImpl.java b/querydsl-collections/src/main/java/com/mysema/query/collections/ColQueryImpl.java index f84f752b7..1612b9f1a 100644 --- a/querydsl-collections/src/main/java/com/mysema/query/collections/ColQueryImpl.java +++ b/querydsl-collections/src/main/java/com/mysema/query/collections/ColQueryImpl.java @@ -49,13 +49,4 @@ public class ColQueryImpl extends AbstractColQuery implements ColQ return new ColQueryImpl(queryMixin.getMetadata(), getQueryEngine()); } - /** - * @return - */ - public QueryMetadata getMetadata() { - return queryMixin.getMetadata(); - } - - - } \ No newline at end of file diff --git a/querydsl-collections/src/test/java/com/mysema/query/ColQueryStandardTest.java b/querydsl-collections/src/test/java/com/mysema/query/ColQueryStandardTest.java index 798b15c0b..dbdc4747f 100644 --- a/querydsl-collections/src/test/java/com/mysema/query/ColQueryStandardTest.java +++ b/querydsl-collections/src/test/java/com/mysema/query/ColQueryStandardTest.java @@ -16,8 +16,8 @@ import java.util.List; import org.junit.Test; import com.mysema.commons.lang.Pair; -import com.mysema.query.animal.Cat; import com.mysema.query.animal.QCat; +import com.mysema.query.collections.Cat; import com.mysema.query.collections.MiniApi; import com.mysema.query.types.EConstructor; import com.mysema.query.types.Expr; diff --git a/querydsl-collections/src/test/java/com/mysema/query/CompilationOverheadTest.java b/querydsl-collections/src/test/java/com/mysema/query/CompilationOverheadTest.java index 19f5e5e56..7579b9637 100644 --- a/querydsl-collections/src/test/java/com/mysema/query/CompilationOverheadTest.java +++ b/querydsl-collections/src/test/java/com/mysema/query/CompilationOverheadTest.java @@ -11,8 +11,8 @@ import java.util.List; import org.junit.Test; -import com.mysema.query.animal.Cat; import com.mysema.query.animal.QCat; +import com.mysema.query.collections.Cat; import com.mysema.query.collections.MiniApi; import com.mysema.query.types.expr.EBoolean; diff --git a/querydsl-collections/src/test/java/com/mysema/query/LoadTest.java b/querydsl-collections/src/test/java/com/mysema/query/LoadTest.java index 609eeec91..13e45de2a 100644 --- a/querydsl-collections/src/test/java/com/mysema/query/LoadTest.java +++ b/querydsl-collections/src/test/java/com/mysema/query/LoadTest.java @@ -14,8 +14,8 @@ import java.util.List; import org.junit.Test; -import com.mysema.query.animal.Cat; import com.mysema.query.animal.QCat; +import com.mysema.query.collections.Cat; import com.mysema.query.collections.ColQueryTemplates; import com.mysema.query.collections.DefaultEvaluatorFactory; import com.mysema.query.collections.MiniApi; diff --git a/querydsl-collections/src/test/java/com/mysema/query/QueryMutabilityTest.java b/querydsl-collections/src/test/java/com/mysema/query/QueryMutabilityTest.java index 630c28eea..c7a939560 100644 --- a/querydsl-collections/src/test/java/com/mysema/query/QueryMutabilityTest.java +++ b/querydsl-collections/src/test/java/com/mysema/query/QueryMutabilityTest.java @@ -11,8 +11,8 @@ import java.util.Collections; import org.junit.Test; -import com.mysema.query.animal.Cat; import com.mysema.query.animal.QCat; +import com.mysema.query.collections.Cat; import com.mysema.query.collections.ColQueryImpl; public class QueryMutabilityTest { diff --git a/querydsl-collections/src/test/java/com/mysema/query/alias/Extensions.java b/querydsl-collections/src/test/java/com/mysema/query/alias/Extensions.java deleted file mode 100644 index 04cbf2b7b..000000000 --- a/querydsl-collections/src/test/java/com/mysema/query/alias/Extensions.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (c) 2010 Mysema Ltd. - * All rights reserved. - * - */ -package com.mysema.query.alias; - -import com.mysema.query.types.Expr; -import com.mysema.query.types.expr.EBoolean; -import com.mysema.query.types.expr.EComparable; -import com.mysema.query.types.expr.ENumber; -import com.mysema.query.types.expr.EString; - -public final class Extensions { - - private Extensions(){} - - public static EBoolean having(T arg, EBoolean rv){ - return rv; - } - - public static EBoolean eq(T val){ - return Alias.>$().eq(val); - } - - public static EBoolean ne(T val){ - return Alias.>$().ne(val); - } - - public static > EBoolean gt(T val){ - return Alias.>$().gt(val); - } - - public static > EBoolean lt(T val){ - return Alias.>$().gt(val); - } - - public static > EBoolean goe(T val){ - return Alias.>$().loe(val); - } - - public static > EBoolean loe(T val){ - return Alias.>$().loe(val); - } - - public static EBoolean startsWith(String str){ - return Alias.$().startsWith(str); - } - - public static EBoolean endsWith(String str){ - return Alias.$().endsWith(str); - } - - public static > EBoolean gt(T val){ - return Alias.>$().gt(val); - } - - public static > EBoolean lt(T val){ - return Alias.>$().lt(val); - } - - public static > EBoolean goe(T val){ - return Alias.>$().gt(val); - } - - public static > EBoolean loe(T val){ - return Alias.>$().lt(val); - } - -} diff --git a/querydsl-collections/src/test/java/com/mysema/query/alias/ExtensionsTest.java b/querydsl-collections/src/test/java/com/mysema/query/alias/ExtensionsTest.java deleted file mode 100644 index 1a265b647..000000000 --- a/querydsl-collections/src/test/java/com/mysema/query/alias/ExtensionsTest.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (c) 2010 Mysema Ltd. - * All rights reserved. - * - */ -package com.mysema.query.alias; - -import static com.mysema.query.alias.Alias.$; -import static com.mysema.query.alias.Extensions.gt; -import static com.mysema.query.alias.Extensions.having; -import static org.junit.Assert.assertEquals; - -import java.util.Arrays; -import java.util.List; - -import org.junit.Before; -import org.junit.Test; - -import com.mysema.query.collections.MiniApi; - -public class ExtensionsTest { - - private List meAndMyFriends; - - public static class Person { - private String firstName, lastName; - private int age; - - public Person(){} - - public Person(String firstName, String lastName, int age) { - this.firstName = firstName; - this.lastName = lastName; - this.age = age; - } - - public String getFirstName() { - return firstName; - } - - public String getLastName() { - return lastName; - } - - public int getAge() { - return age; - } - - } - - @Before - public void setup() { - Person me = new Person("Mario", "Fusco", 35); - Person luca = new Person("Luca", "Marrocco", 29); - Person biagio = new Person("Biagio", "Beatrice", 39); - Person celestino = new Person("Celestino", "Bellone", 29); - meAndMyFriends = Arrays.asList(me, luca, biagio, celestino); - } - - @Test - public void oldFriends(){ -// List oldFriends = filter(having(on(Person.class).getAge(), greaterThan(30)), meAndMyFriends); - - // querydsl style - Person alias = Alias.alias(Person.class); - MiniApi.from(alias, meAndMyFriends).where($(alias.getAge()).gt(30)).list($(alias)); - - // lambdaj style - MiniApi.from(alias, meAndMyFriends).where(having(alias.getAge(), gt(30))).list($(alias)); - - assertEquals("person.age > 30", having(alias.getAge(), gt(30)).toString()); - - } - - @Test - public void test(){ - Person alias = Alias.alias(Person.class); - assertEquals("person.firstName > Bob", having(alias.getFirstName(), gt("Bob")).toString()); - } - - -} diff --git a/querydsl-collections/src/test/java/com/mysema/query/alias/SimpleTest.java b/querydsl-collections/src/test/java/com/mysema/query/alias/SimpleTest.java deleted file mode 100644 index bffca18a3..000000000 --- a/querydsl-collections/src/test/java/com/mysema/query/alias/SimpleTest.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright (c) 2010 Mysema Ltd. - * All rights reserved. - * - */ -package com.mysema.query.alias; - -import java.util.ArrayList; -import java.util.List; - -import org.junit.Test; - -import com.mysema.query.collections.MiniApi; -import com.mysema.query.types.path.PEntity; -import com.mysema.query.types.path.PNumber; -import com.mysema.query.types.path.PString; -import com.mysema.query.types.path.PathMetadataFactory; - -public class SimpleTest { - - public static class TestClass { - - private int age; - - private String name; - - public TestClass(String name, int age){ - this.name = name; - this.age = age; - } - - public TestClass(){} - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getAge() { - return age; - } - - public void setAge(int age) { - this.age = age; - } - - } - - public static class QTestClass extends PEntity { - - public static final QTestClass testClass = new QTestClass("testClass"); - - public final PString name = createString("name"); - - public final PNumber age = createNumber("age",Integer.class); - - public QTestClass(String variable) { - super(TestClass.class, PathMetadataFactory.forVariable(variable)); - } - - } - - @Test - public void test(){ - List testSource = new ArrayList(); - testSource.add(new TestClass("old timer", 89)); - testSource.add(new TestClass("bob", 22)); - testSource.add(new TestClass("joe", 24)); - - QTestClass tc = QTestClass.testClass; - for (TestClass t : MiniApi.from(tc, testSource).where(tc.name.eq("bob")).list(tc)){ - System.out.println(t.getName()); - } - - for (TestClass t : MiniApi.from(tc, testSource).where(tc.name.in("bob")).list(tc)){ - System.out.println(t.getName()); - } - } - -} diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/AbstractQueryTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/AbstractQueryTest.java index 9d4bc5d09..4322c52b3 100644 --- a/querydsl-collections/src/test/java/com/mysema/query/collections/AbstractQueryTest.java +++ b/querydsl-collections/src/test/java/com/mysema/query/collections/AbstractQueryTest.java @@ -12,7 +12,6 @@ import java.util.List; import org.junit.Before; import com.mysema.query.alias.Alias; -import com.mysema.query.animal.Cat; import com.mysema.query.animal.QCat; import com.mysema.query.types.Expr; diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/AliasTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/AliasTest.java index b2065676a..ab82e5bda 100644 --- a/querydsl-collections/src/test/java/com/mysema/query/collections/AliasTest.java +++ b/querydsl-collections/src/test/java/com/mysema/query/collections/AliasTest.java @@ -20,7 +20,6 @@ import org.junit.Before; import org.junit.Test; import com.mysema.query.alias.Alias; -import com.mysema.query.animal.Cat; import com.mysema.query.animal.QCat; import com.mysema.query.types.path.PNumber; import com.mysema.query.types.path.PString; diff --git a/querydsl-collections/src/test/java/com/mysema/query/animal/Animal.java b/querydsl-collections/src/test/java/com/mysema/query/collections/Animal.java similarity index 92% rename from querydsl-collections/src/test/java/com/mysema/query/animal/Animal.java rename to querydsl-collections/src/test/java/com/mysema/query/collections/Animal.java index 41bd48807..6872662f0 100644 --- a/querydsl-collections/src/test/java/com/mysema/query/animal/Animal.java +++ b/querydsl-collections/src/test/java/com/mysema/query/collections/Animal.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.animal; +package com.mysema.query.collections; import java.util.Date; diff --git a/querydsl-collections/src/test/java/com/mysema/query/animal/AnimalTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/AnimalTest.java similarity index 80% rename from querydsl-collections/src/test/java/com/mysema/query/animal/AnimalTest.java rename to querydsl-collections/src/test/java/com/mysema/query/collections/AnimalTest.java index d38061305..8a531dffc 100644 --- a/querydsl-collections/src/test/java/com/mysema/query/animal/AnimalTest.java +++ b/querydsl-collections/src/test/java/com/mysema/query/collections/AnimalTest.java @@ -3,13 +3,15 @@ * All rights reserved. * */ -package com.mysema.query.animal; +package com.mysema.query.collections; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import org.junit.Test; +import com.mysema.query.animal.QAnimal; +import com.mysema.query.animal.QCat; import com.mysema.query.types.path.PSimple; public class AnimalTest { diff --git a/querydsl-collections/src/test/java/com/mysema/query/animal/Cat.java b/querydsl-collections/src/test/java/com/mysema/query/collections/Cat.java similarity index 94% rename from querydsl-collections/src/test/java/com/mysema/query/animal/Cat.java rename to querydsl-collections/src/test/java/com/mysema/query/collections/Cat.java index 1e6d4d940..5bc276c08 100644 --- a/querydsl-collections/src/test/java/com/mysema/query/animal/Cat.java +++ b/querydsl-collections/src/test/java/com/mysema/query/collections/Cat.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.animal; +package com.mysema.query.collections; import java.util.Arrays; import java.util.Collections; diff --git a/querydsl-collections/src/test/java/com/mysema/query/animal/CatTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/CatTest.java similarity index 86% rename from querydsl-collections/src/test/java/com/mysema/query/animal/CatTest.java rename to querydsl-collections/src/test/java/com/mysema/query/collections/CatTest.java index bba81701a..f98be8f9d 100644 --- a/querydsl-collections/src/test/java/com/mysema/query/animal/CatTest.java +++ b/querydsl-collections/src/test/java/com/mysema/query/collections/CatTest.java @@ -3,12 +3,13 @@ * All rights reserved. * */ -package com.mysema.query.animal; +package com.mysema.query.collections; import static org.junit.Assert.assertTrue; import org.junit.Test; +import com.mysema.query.animal.QCat; import com.mysema.query.types.path.PSimple; public class CatTest { diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/ColDeleteClauseTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/ColDeleteClauseTest.java index f83e5aa9f..305c5b434 100644 --- a/querydsl-collections/src/test/java/com/mysema/query/collections/ColDeleteClauseTest.java +++ b/querydsl-collections/src/test/java/com/mysema/query/collections/ColDeleteClauseTest.java @@ -13,7 +13,6 @@ import java.util.List; import org.junit.Test; -import com.mysema.query.animal.Cat; import com.mysema.query.animal.QCat; public class ColDeleteClauseTest { diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/ColQueryTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/ColQueryTest.java index e5312c65c..3f74f4b0f 100644 --- a/querydsl-collections/src/test/java/com/mysema/query/collections/ColQueryTest.java +++ b/querydsl-collections/src/test/java/com/mysema/query/collections/ColQueryTest.java @@ -15,7 +15,6 @@ import java.util.Date; import org.junit.Test; -import com.mysema.query.animal.Cat; import com.mysema.query.types.Expr; import com.mysema.query.types.expr.ENumber; import com.mysema.query.types.path.PString; diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/ColUpdateClauseTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/ColUpdateClauseTest.java index 7e10a4843..62ee8f0cf 100644 --- a/querydsl-collections/src/test/java/com/mysema/query/collections/ColUpdateClauseTest.java +++ b/querydsl-collections/src/test/java/com/mysema/query/collections/ColUpdateClauseTest.java @@ -12,7 +12,6 @@ import java.util.List; import org.junit.Test; -import com.mysema.query.animal.Cat; import com.mysema.query.animal.QCat; public class ColUpdateClauseTest { diff --git a/querydsl-collections/src/test/java/com/mysema/query/animal/Color.java b/querydsl-collections/src/test/java/com/mysema/query/collections/Color.java similarity index 69% rename from querydsl-collections/src/test/java/com/mysema/query/animal/Color.java rename to querydsl-collections/src/test/java/com/mysema/query/collections/Color.java index 9672bf0b8..b74ec9276 100644 --- a/querydsl-collections/src/test/java/com/mysema/query/animal/Color.java +++ b/querydsl-collections/src/test/java/com/mysema/query/collections/Color.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.animal; +package com.mysema.query.collections; public enum Color { BLACK, TABBY diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/EvaluatorTransformerTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/EvaluatorTransformerTest.java index 8e8405055..6713179be 100644 --- a/querydsl-collections/src/test/java/com/mysema/query/collections/EvaluatorTransformerTest.java +++ b/querydsl-collections/src/test/java/com/mysema/query/collections/EvaluatorTransformerTest.java @@ -12,7 +12,6 @@ import java.util.Collections; import org.junit.Test; import com.mysema.codegen.Evaluator; -import com.mysema.query.animal.Cat; import com.mysema.query.animal.QCat; public class EvaluatorTransformerTest { diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/InnerJoinTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/InnerJoinTest.java index 5492d8329..1c8163d14 100644 --- a/querydsl-collections/src/test/java/com/mysema/query/collections/InnerJoinTest.java +++ b/querydsl-collections/src/test/java/com/mysema/query/collections/InnerJoinTest.java @@ -14,7 +14,6 @@ import java.util.List; import org.junit.Before; import org.junit.Test; -import com.mysema.query.animal.Cat; import com.mysema.query.animal.QCat; public class InnerJoinTest extends AbstractQueryTest{ diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/MathFunctionTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/MathFunctionTest.java index 56fe8e073..756b7ace6 100644 --- a/querydsl-collections/src/test/java/com/mysema/query/collections/MathFunctionTest.java +++ b/querydsl-collections/src/test/java/com/mysema/query/collections/MathFunctionTest.java @@ -10,7 +10,6 @@ import static com.mysema.query.collections.MiniApi.from; import org.junit.Test; -import com.mysema.query.animal.Cat; import com.mysema.query.functions.MathFunctions; import com.mysema.query.types.Expr; import com.mysema.query.types.expr.ENumber; diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/SerializationTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/SerializationTest.java index 0bc5781b4..85ec10ac8 100644 --- a/querydsl-collections/src/test/java/com/mysema/query/collections/SerializationTest.java +++ b/querydsl-collections/src/test/java/com/mysema/query/collections/SerializationTest.java @@ -12,7 +12,6 @@ import org.junit.Ignore; import org.junit.Test; import com.mysema.query.Tuple; -import com.mysema.query.animal.Cat; import com.mysema.query.types.expr.QTuple; public class SerializationTest extends AbstractQueryTest{ diff --git a/querydsl-collections/src/test/java/com/mysema/query/animal/TypeCastTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/TypeCastTest.java similarity index 84% rename from querydsl-collections/src/test/java/com/mysema/query/animal/TypeCastTest.java rename to querydsl-collections/src/test/java/com/mysema/query/collections/TypeCastTest.java index 2747f0402..fb47a23f1 100644 --- a/querydsl-collections/src/test/java/com/mysema/query/animal/TypeCastTest.java +++ b/querydsl-collections/src/test/java/com/mysema/query/collections/TypeCastTest.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.animal; +package com.mysema.query.collections; import static org.junit.Assert.assertEquals; @@ -11,6 +11,8 @@ import java.util.Collections; import org.junit.Test; +import com.mysema.query.animal.QAnimal; +import com.mysema.query.animal.QCat; import com.mysema.query.collections.ColQuery; import com.mysema.query.collections.ColQueryImpl; import com.mysema.query.collections.MiniApi; diff --git a/querydsl-collections/src/test/java/com/mysema/query/file/DirectoryWalk.java b/querydsl-collections/src/test/java/com/mysema/query/file/DirectoryWalk.java deleted file mode 100644 index 9f828e3cd..000000000 --- a/querydsl-collections/src/test/java/com/mysema/query/file/DirectoryWalk.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2010 Mysema Ltd. - * All rights reserved. - * - */ -package com.mysema.query.file; - -import java.io.File; -import java.util.Iterator; - -/** - * @author tiwe - * - */ -public class DirectoryWalk implements Iterable{ - - private final File directory; - - public DirectoryWalk(String path) { - this.directory = new File(path); - } - - public DirectoryWalk(File directory) { - this.directory = directory; - } - - @Override - public Iterator iterator() { - return new DirectoryWalkIterator(directory); - } - -} diff --git a/querydsl-collections/src/test/java/com/mysema/query/file/DirectoryWalkIterator.java b/querydsl-collections/src/test/java/com/mysema/query/file/DirectoryWalkIterator.java deleted file mode 100644 index 72d07d4bf..000000000 --- a/querydsl-collections/src/test/java/com/mysema/query/file/DirectoryWalkIterator.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (c) 2010 Mysema Ltd. - * All rights reserved. - * - */ -package com.mysema.query.file; - -import java.io.File; -import java.util.ArrayDeque; -import java.util.Deque; -import java.util.Iterator; -import java.util.NoSuchElementException; - -/** - * @author tiwe - * - */ -public class DirectoryWalkIterator implements Iterator { - - private final Deque files = new ArrayDeque(); - - public DirectoryWalkIterator(File directory) { - File[] children = directory.listFiles(); - if (children != null){ - for (File file : children){ - files.add(file); - } - } - } - - @Override - public boolean hasNext() { - return !files.isEmpty(); - } - - @Override - public File next() { - if (!files.isEmpty()){ - File file = files.pop(); - File[] children = file.listFiles(); - if (children != null){ - for (File child : children){ - files.add(child); - } - } - return file; - }else{ - throw new NoSuchElementException(); - } - } - - @Override - public void remove() { - throw new UnsupportedOperationException(); - } - -} diff --git a/querydsl-collections/src/test/java/com/mysema/query/file/DirectoryWalkTest.java b/querydsl-collections/src/test/java/com/mysema/query/file/DirectoryWalkTest.java deleted file mode 100644 index 72251415a..000000000 --- a/querydsl-collections/src/test/java/com/mysema/query/file/DirectoryWalkTest.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) 2010 Mysema Ltd. - * All rights reserved. - * - */ -package com.mysema.query.file; - -import java.io.File; - -import org.junit.Test; - -public class DirectoryWalkTest { - - @Test - public void test(){ - DirectoryWalk walk = new DirectoryWalk(new File("target")); - for (File file : walk){ - System.out.println(file.getPath()); - } - } - -} diff --git a/querydsl-collections/src/test/java/com/mysema/query/file/QFile.java b/querydsl-collections/src/test/java/com/mysema/query/file/QFile.java deleted file mode 100644 index 138aa9cd8..000000000 --- a/querydsl-collections/src/test/java/com/mysema/query/file/QFile.java +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright (c) 2010 Mysema Ltd. - * All rights reserved. - * - */ -package com.mysema.query.file; - -import static com.mysema.query.types.path.PathMetadataFactory.forProperty; -import static com.mysema.query.types.path.PathMetadataFactory.forVariable; - -import java.io.File; - -import com.mysema.query.types.PathMetadata; -import com.mysema.query.types.custom.CString; -import com.mysema.query.types.expr.EString; -import com.mysema.query.types.expr.EStringConst; -import com.mysema.query.types.path.PBoolean; -import com.mysema.query.types.path.PComparable; -import com.mysema.query.types.path.PString; - -/** - * @author tiwe - * - */ -public class QFile extends PComparable{ - - private static final long serialVersionUID = -7703329992523284173L; - - public static final QFile any = new QFile("any"); - - private static final String GET_CONTENT = QFile.class.getName() + "Utils.readFileToString({0}, {1})"; - - public static Iterable walk(File dir){ - return new DirectoryWalk(dir); - } - - public final PBoolean absolute = new PBoolean(this, "absolute"); - - private volatile QFile absoluteFile, canonicalFile, parentFile; - - public final PString absolutePath = new PString(this, "absolutePath"); - - public final PString canonicalPath = new PString(this, "canonicalPath"); - - public final PBoolean directory = new PBoolean(this, "directory"); - - public final PBoolean file = new PBoolean(this, "file"); - - public final PBoolean hidden = new PBoolean(this, "hidden"); - - public final PString name = new PString(this, "name"); - - public final PString parent = new PString(this, "parent"); - - public final PString path = new PString(this, "path"); - - public QFile(PathMetadata metadata) { - super(File.class, metadata); - } - - public QFile(QFile parent, String property) { - super(File.class, forProperty(parent,property)); - } - - public QFile(String variable) { - super(File.class, forVariable(variable)); - } - - public QFile absoluteFile() { - if (absoluteFile == null){ - absoluteFile = new QFile(this, "absoluteFile"); - } - return absoluteFile; - } - - public QFile canonicalFile() { - if (canonicalFile == null){ - canonicalFile = new QFile(this, "canonicalFile"); - } - return canonicalFile; - } - - public EString getContent(String encoding){ - return CString.create(GET_CONTENT, this, EStringConst.create(encoding)); - } - - public QFile parentFile() { - if (parentFile == null){ - parentFile = new QFile(this, "parentFile"); - } - return parentFile; - } - -} diff --git a/querydsl-collections/src/test/java/com/mysema/query/file/QFileTest.java b/querydsl-collections/src/test/java/com/mysema/query/file/QFileTest.java deleted file mode 100644 index f41d55db2..000000000 --- a/querydsl-collections/src/test/java/com/mysema/query/file/QFileTest.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2010 Mysema Ltd. - * All rights reserved. - * - */ -package com.mysema.query.file; - -import java.io.File; -import java.util.Map; - -import org.junit.Test; - -import com.mysema.query.collections.MiniApi; - -public class QFileTest { - - @Test - public void path_to_file_map(){ - QFile anyFile = QFile.any; - Map files = MiniApi - .from(anyFile, new File(".").listFiles()) - .map(anyFile.absolutePath, anyFile); - - for (Map.Entry entry : files.entrySet()){ - System.out.println(entry.getKey() + " : " + entry.getValue()); - } - } - - @Test - public void walk(){ - QFile anyFile = QFile.any; - for (File file : MiniApi - .from(anyFile, QFile.walk(new File("target"))) - .where(anyFile.name.endsWith(".class")) - .list(anyFile)){ - System.out.println(file.getName()); - } - } - - @Test - public void getContent(){ - QFile anyFile = QFile.any; - Map rv = MiniApi - .from(anyFile, QFile.walk(new File("src/test"))) - .where(anyFile.name.endsWith(".properties")) - .map(anyFile, anyFile.getContent("ISO-8859-1")); - System.out.println(rv); - } -} diff --git a/querydsl-collections/src/test/java/com/mysema/query/file/QFileUtils.java b/querydsl-collections/src/test/java/com/mysema/query/file/QFileUtils.java deleted file mode 100644 index 5bc9b90d3..000000000 --- a/querydsl-collections/src/test/java/com/mysema/query/file/QFileUtils.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2010 Mysema Ltd. - * All rights reserved. - * - */ -package com.mysema.query.file; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.FileUtils; - -import com.mysema.query.QueryException; - -public final class QFileUtils { - - private QFileUtils(){} - - public static String readFileToString(File file, String enc){ - try { - return FileUtils.readFileToString(file, enc); - } catch (IOException e) { - throw new QueryException(e); - } - } - -} diff --git a/querydsl-collections/src/test/java/com/mysema/query/url/QURL.java b/querydsl-collections/src/test/java/com/mysema/query/url/QURL.java deleted file mode 100644 index 9e6bb4c14..000000000 --- a/querydsl-collections/src/test/java/com/mysema/query/url/QURL.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (c) 2010 Mysema Ltd. - * All rights reserved. - * - */ -package com.mysema.query.url; - -import static com.mysema.query.types.path.PathMetadataFactory.forVariable; - -import java.net.URL; - -import com.mysema.query.types.PathMetadata; -import com.mysema.query.types.path.PEntity; -import com.mysema.query.types.path.PNumber; -import com.mysema.query.types.path.PSimple; -import com.mysema.query.types.path.PString; -import com.mysema.query.types.path.PathMetadataFactory; - -/** - * @author tiwe - * - */ -public class QURL extends PEntity{ - - private static final long serialVersionUID = 9048088068716893900L; - - // TODO : website walk - - public final PString authority = createString("authority"); - - public final PSimple content = createSimple("content",Object.class); - - public final PNumber defaultPort = createNumber("defaultPort",Integer.class); - - public final PString file = createString("file"); - - public final PString host = createString("host"); - - public final PString path = createString("path"); - - public final PNumber port = createNumber("port",Integer.class); - - public final PString protocol = createString("protocol"); - - public final PString query = createString("query"); - - public final PString ref = createString("ref"); - - public final PString userInfo = createString("userInfo"); - - public QURL(PathMetadata metadata) { - super(URL.class, metadata); - } - - public QURL(QURL parent, String property) { - super(URL.class, PathMetadataFactory.forProperty(parent, property)); - } - - public QURL(String variable) { - super(URL.class, forVariable(variable)); - } - -}