diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/ResultTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/ResultTests.java new file mode 100644 index 0000000000..bb64a365b3 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/_/testcases/ResultTests.java @@ -0,0 +1,107 @@ +/** + * Copyright (c) 2009-2012, Lukas Eder, lukas.eder@gmail.com + * All rights reserved. + * + * This software is licensed to you under the Apache License, Version 2.0 + * (the "License"); You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * . Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * . Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * . Neither the name "jOOQ" nor the names of its contributors may be + * used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ +package org.jooq.test._.testcases; + +import static java.util.Arrays.asList; +import static junit.framework.Assert.assertEquals; +import static junit.framework.Assert.assertTrue; + +import java.util.Comparator; + +import org.jooq.Result; +import org.jooq.TableRecord; +import org.jooq.UpdatableRecord; +import org.jooq.test.BaseTest; +import org.jooq.test.jOOQAbstractTest; + +import org.junit.Test; + +public class ResultTests< + A extends UpdatableRecord, + AP, + B extends UpdatableRecord, + S extends UpdatableRecord, + B2S extends UpdatableRecord, + BS extends UpdatableRecord, + L extends TableRecord, + X extends TableRecord, + DATE extends UpdatableRecord, + BOOL extends UpdatableRecord, + D extends UpdatableRecord, + T extends UpdatableRecord, + U extends TableRecord, + I extends TableRecord, + IPK extends UpdatableRecord, + T658 extends TableRecord, + T725 extends UpdatableRecord, + T639 extends UpdatableRecord, + T785 extends TableRecord> +extends BaseTest { + + public ResultTests(jOOQAbstractTest delegate) { + super(delegate); + } + + @Test + public void testResultSort() throws Exception { + Result result = create().fetch(TBook()); + + class C implements Comparator { + + @Override + public int compare(Integer o1, Integer o2) { + + // Put 1 at the end of everything + if (o1 == 1 && o2 != 1) return 1; + if (o2 == 1 && o1 != 1) return -1; + + return o1.compareTo(o2); + } + } + + assertTrue(result == result.sortAsc(TBook_ID())); + assertEquals(asList(1, 2, 3, 4), result.getValues(TBook_ID())); + + assertTrue(result == result.sortDesc(TBook_ID())); + assertEquals(asList(4, 3, 2, 1), result.getValues(TBook_ID())); + + assertTrue(result == result.sortAsc(TBook_ID(), new C())); + assertEquals(asList(2, 3, 4, 1), result.getValues(TBook_ID())); + + assertTrue(result == result.sortDesc(TBook_ID(), new C())); + assertEquals(asList(1, 4, 3, 2), result.getValues(TBook_ID())); + } +} diff --git a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java index 0abac64d01..321e0db4ed 100644 --- a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java +++ b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java @@ -109,6 +109,7 @@ import org.jooq.test._.testcases.OrderByTests; import org.jooq.test._.testcases.PlainSQLTests; import org.jooq.test._.testcases.PredicateTests; import org.jooq.test._.testcases.RenderAndBindTests; +import org.jooq.test._.testcases.ResultTests; import org.jooq.test._.testcases.RoutineAndUDTTests; import org.jooq.test._.testcases.SchemaAndMappingTests; import org.jooq.test._.testcases.SelectTests; @@ -964,6 +965,11 @@ public abstract class jOOQAbstractTest< new SelectTests(this).testDistinctQuery(); } + @Test + public void testResultSort() throws Exception { + new ResultTests(this).testResultSort(); + } + @Test public void testFetch() throws Exception { new FetchTests(this).testFetch(); diff --git a/jOOQ/src/main/java/org/jooq/Result.java b/jOOQ/src/main/java/org/jooq/Result.java index b33b3100b9..3458f41786 100644 --- a/jOOQ/src/main/java/org/jooq/Result.java +++ b/jOOQ/src/main/java/org/jooq/Result.java @@ -1875,4 +1875,47 @@ public interface Result extends FieldProvider, List, Attach */ ResultSet intoResultSet(); + /** + * Sort this result by one of its contained fields. + *

+ * nulls are sorted last by this method. + * + * @param field The sort field + * @return The result itself + */ + > Result sortAsc(Field field); + + /** + * Reverse-sort this result by one of its contained fields. + *

+ * nulls are sorted last by this method. + * + * @param field The sort field + * @return The result itself + */ + > Result sortDesc(Field field); + + /** + * Sort this result by one of its contained fields using a comparator. + *

+ * null sorting must be handled by the supplied + * comparator. + * + * @param field The sort field + * @param comparator The comparator used to sort this result. + * @return The result itself + */ + Result sortAsc(Field field, java.util.Comparator comparator); + + /** + * Reverse-sort this result by one of its contained fields using a comparator. + *

+ * null sorting must be handled by the supplied + * comparator. + * + * @param field The sort field + * @param comparator The comparator used to sort this result. + * @return The result itself + */ + Result sortDesc(Field field, java.util.Comparator comparator); } diff --git a/jOOQ/src/main/java/org/jooq/impl/ResultImpl.java b/jOOQ/src/main/java/org/jooq/impl/ResultImpl.java index 4570f06e74..b8ae613615 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ResultImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/ResultImpl.java @@ -51,6 +51,8 @@ import java.sql.Timestamp; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashMap; @@ -1321,6 +1323,67 @@ class ResultImpl implements Result, AttachableInternal { return new ResultSetImpl(this); } + @Override + public final > Result sortAsc(Field field) { + return sortAsc(field, new NaturalComparator()); + } + + @Override + public final Result sortAsc(Field field, Comparator comparator) { + Collections.sort(this, new RecordComparator(getIndex(field), comparator)); + return this; + } + + @Override + public final > Result sortDesc(Field field) { + return sortAsc(field, Collections.reverseOrder(new NaturalComparator())); + } + + @Override + public final Result sortDesc(Field field, Comparator comparator) { + return sortAsc(field, Collections.reverseOrder(comparator)); + } + + /** + * A comparator for records, wrapping another comparator for <T> + */ + private class RecordComparator implements Comparator { + + private final Comparator comparator; + private final int fieldIndex; + + RecordComparator(int fieldIndex, Comparator comparator) { + this.fieldIndex = fieldIndex; + this.comparator = comparator; + } + + @SuppressWarnings("unchecked") + @Override + public int compare(R record1, R record2) { + return comparator.compare((T) record1.getValue(fieldIndex), (T) record2.getValue(fieldIndex)); + } + } + + /** + * A natural comparator + */ + private class NaturalComparator> implements Comparator { + + @Override + public int compare(T o1, T o2) { + if (o1 == null && o2 == null) { + return 0; + } + else if (o1 == null) { + return -1; + } + else if (o2 == null) { + return 1; + } + return o1.compareTo(o2); + } + } + // ------------------------------------------------------------------------- // XXX Object API // -------------------------------------------------------------------------