[#1887] Remove all deprecated code

This commit is contained in:
Lukas Eder 2012-10-26 20:24:15 +02:00
parent 446104c02d
commit 8a20d38248
5 changed files with 10 additions and 65 deletions

View File

@ -61,8 +61,7 @@ import org.jooq.impl.Factory;
* @param <R> The record type associated with this table
* @author Lukas Eder
*/
@SuppressWarnings("deprecation")
public interface Table<R extends Record> extends org.jooq.Type<R>, TableLike<R> {
public interface Table<R extends Record> extends FieldProvider, TableLike<R> {
/**
* Get the table schema
@ -77,7 +76,6 @@ public interface Table<R extends Record> extends org.jooq.Type<R>, TableLike<R>
/**
* @return The record type produced by this table
*/
@Override
Class<? extends R> getRecordType();
/**

View File

@ -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 <R> The record type
* @author Lukas Eder
* @deprecated - 2.5.0 [#1579] - The <code>org.jooq.Type</code marker interface
* has not proven to be useful to the public API so far. There is no
* real need to abstract {@link org.jooq.Table} and
* {@link org.jooq.UDT} with a single interface
*/
@Deprecated
public interface Type<R extends Record> extends QueryPart, FieldProvider {
/**
* @return The record type produced by this table
*/
Class<? extends R> getRecordType();
}

View File

@ -42,8 +42,7 @@ package org.jooq;
* @param <R> The record type
* @author Lukas Eder
*/
@SuppressWarnings("deprecation")
public interface UDT<R extends UDTRecord<R>> extends org.jooq.Type<R> {
public interface UDT<R extends UDTRecord<R>> extends FieldProvider, QueryPart {
/**
* Get the UDT schema
@ -58,7 +57,6 @@ public interface UDT<R extends UDTRecord<R>> extends org.jooq.Type<R> {
/**
* @return The record type produced by this table
*/
@Override
Class<? extends R> getRecordType();
/**

View File

@ -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<R extends Record> extends AbstractQueryPart implements
org.jooq.Type<R> {
/**
* @author Lukas Eder
*/
abstract class AbstractFieldProviderQueryPart<R extends Record> extends AbstractQueryPart implements FieldProvider {
/**
* Generated UID

View File

@ -59,6 +59,9 @@ import org.jooq.TableOnStep;
import org.jooq.TableOptionalOnStep;
import org.jooq.TablePartitionByStep;
/**
* @author Lukas Eder
*/
abstract class AbstractTable<R extends Record> extends AbstractFieldProviderQueryPart<R> implements Table<R> {
/**