From 8a20d38248803b1ef37bafa7735a3fdbac635c6e Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Fri, 26 Oct 2012 20:24:15 +0200 Subject: [PATCH] [#1887] Remove all deprecated code --- jOOQ/src/main/java/org/jooq/Table.java | 4 +- jOOQ/src/main/java/org/jooq/Type.java | 56 ------------------- jOOQ/src/main/java/org/jooq/UDT.java | 4 +- .../impl/AbstractFieldProviderQueryPart.java | 8 ++- .../java/org/jooq/impl/AbstractTable.java | 3 + 5 files changed, 10 insertions(+), 65 deletions(-) delete mode 100644 jOOQ/src/main/java/org/jooq/Type.java diff --git a/jOOQ/src/main/java/org/jooq/Table.java b/jOOQ/src/main/java/org/jooq/Table.java index b6e507edfc..5740305111 100644 --- a/jOOQ/src/main/java/org/jooq/Table.java +++ b/jOOQ/src/main/java/org/jooq/Table.java @@ -61,8 +61,7 @@ import org.jooq.impl.Factory; * @param The record type associated with this table * @author Lukas Eder */ -@SuppressWarnings("deprecation") -public interface Table extends org.jooq.Type, TableLike { +public interface Table extends FieldProvider, TableLike { /** * Get the table schema @@ -77,7 +76,6 @@ public interface Table extends org.jooq.Type, TableLike /** * @return The record type produced by this table */ - @Override Class getRecordType(); /** diff --git a/jOOQ/src/main/java/org/jooq/Type.java b/jOOQ/src/main/java/org/jooq/Type.java deleted file mode 100644 index 4be02ea0d8..0000000000 --- a/jOOQ/src/main/java/org/jooq/Type.java +++ /dev/null @@ -1,56 +0,0 @@ -/** - * 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; - -/** - * A type (udt or table) that represents any database row - * - * @param The record type - * @author Lukas Eder - * @deprecated - 2.5.0 [#1579] - The org.jooq.Type extends QueryPart, FieldProvider { - - /** - * @return The record type produced by this table - */ - Class getRecordType(); - -} diff --git a/jOOQ/src/main/java/org/jooq/UDT.java b/jOOQ/src/main/java/org/jooq/UDT.java index b8e820122b..cd1b4e5770 100644 --- a/jOOQ/src/main/java/org/jooq/UDT.java +++ b/jOOQ/src/main/java/org/jooq/UDT.java @@ -42,8 +42,7 @@ package org.jooq; * @param The record type * @author Lukas Eder */ -@SuppressWarnings("deprecation") -public interface UDT> extends org.jooq.Type { +public interface UDT> extends FieldProvider, QueryPart { /** * Get the UDT schema @@ -58,7 +57,6 @@ public interface UDT> extends org.jooq.Type { /** * @return The record type produced by this table */ - @Override Class getRecordType(); /** diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractFieldProviderQueryPart.java b/jOOQ/src/main/java/org/jooq/impl/AbstractFieldProviderQueryPart.java index 1e4049cba0..80ce14fdb7 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractFieldProviderQueryPart.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractFieldProviderQueryPart.java @@ -39,11 +39,13 @@ import java.util.ArrayList; import java.util.List; import org.jooq.Field; +import org.jooq.FieldProvider; import org.jooq.Record; -@SuppressWarnings("deprecation") -abstract class AbstractFieldProviderQueryPart extends AbstractQueryPart implements - org.jooq.Type { +/** + * @author Lukas Eder + */ +abstract class AbstractFieldProviderQueryPart extends AbstractQueryPart implements FieldProvider { /** * Generated UID diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractTable.java b/jOOQ/src/main/java/org/jooq/impl/AbstractTable.java index 344928a14c..2267aa7c5e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractTable.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractTable.java @@ -59,6 +59,9 @@ import org.jooq.TableOnStep; import org.jooq.TableOptionalOnStep; import org.jooq.TablePartitionByStep; +/** + * @author Lukas Eder + */ abstract class AbstractTable extends AbstractFieldProviderQueryPart implements Table { /**