Removed all deprecated API from MetaModel (aaaaah) Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/28ba2df1 Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/28ba2df1 Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/28ba2df1
Branch: refs/heads/master Commit: 28ba2df15630d2909ea627602065715ea95a919f Parents: 6d50f0e Author: kaspersorensen <i.am.kasper.soren...@gmail.com> Authored: Sun May 15 21:19:11 2016 -0700 Committer: kaspersorensen <i.am.kasper.soren...@gmail.com> Committed: Sun May 15 21:19:11 2016 -0700 ---------------------------------------------------------------------- .../org/apache/metamodel/MetaModelHelper.java | 22 +----- .../metamodel/QueryPostprocessDataContext.java | 25 +------ .../apache/metamodel/data/AbstractDataSet.java | 20 ----- .../org/apache/metamodel/data/AbstractRow.java | 6 -- .../java/org/apache/metamodel/data/DataSet.java | 10 --- .../org/apache/metamodel/data/DefaultRow.java | 73 ------------------ .../java/org/apache/metamodel/data/Row.java | 11 --- .../org/apache/metamodel/query/FilterItem.java | 21 ------ .../org/apache/metamodel/query/OrderByItem.java | 20 ----- .../java/org/apache/metamodel/query/Query.java | 12 --- .../org/apache/metamodel/query/SelectItem.java | 23 +----- .../query/builder/AbstractFilterBuilder.java | 54 -------------- .../builder/AbstractQueryFilterBuilder.java | 54 -------------- .../metamodel/query/builder/FilterBuilder.java | 70 ------------------ .../apache/metamodel/util/ImmutableDate.java | 61 --------------- .../QueryPostprocessDataContextTest.java | 6 +- .../metamodel/data/DataSetTableModelTest.java | 3 +- .../apache/metamodel/csv/CsvDataContext.java | 78 -------------------- .../metamodel/excel/ExcelDataContext.java | 14 ---- .../metamodel/excel/ExcelDataContextTest.java | 8 +- .../fixedwidth/FixedWidthDataContext.java | 35 --------- .../mongodb/common/MongoDbTableDef.java | 46 ------------ .../mongodb/mongo2/MongoDbDataContext.java | 14 +--- .../mongodb/mongo3/MongoDbDataContext.java | 2 +- .../salesforce/SalesforceDataContext.java | 2 +- .../salesforce/SalesforceUpdateCallback.java | 2 +- .../apache/metamodel/xml/XmlDataContext.java | 59 --------------- 27 files changed, 15 insertions(+), 736 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel/blob/28ba2df1/core/src/main/java/org/apache/metamodel/MetaModelHelper.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/MetaModelHelper.java b/core/src/main/java/org/apache/metamodel/MetaModelHelper.java index 7ffa870..db95a64 100644 --- a/core/src/main/java/org/apache/metamodel/MetaModelHelper.java +++ b/core/src/main/java/org/apache/metamodel/MetaModelHelper.java @@ -314,8 +314,8 @@ public final class MetaModelHelper { } final DataSetHeader groupByHeader = new CachingDataSetHeader(groupBySelects); - // Creates a list of SelectItems that have functions - List<SelectItem> functionItems = getFunctionSelectItems(selectItems); + // Creates a list of SelectItems that have aggregate functions + List<SelectItem> functionItems = getAggregateFunctionSelectItems(selectItems); // Loop through the dataset and identify groups while (dataSet.next()) { @@ -508,24 +508,6 @@ public final class MetaModelHelper { return new InMemoryDataSet(header, resultRows); } - /** - * - * @param selectItems - * @return - * - * @deprecated use {@link #getAggregateFunctionSelectItems(Iterable)} or - * {@link #getScalarFunctionSelectItems(Iterable)} instead - */ - @Deprecated - public static List<SelectItem> getFunctionSelectItems(Iterable<SelectItem> selectItems) { - return CollectionUtils.filter(selectItems, new Predicate<SelectItem>() { - @Override - public Boolean eval(SelectItem arg) { - return arg.getFunction() != null; - } - }); - } - public static List<SelectItem> getAggregateFunctionSelectItems(Iterable<SelectItem> selectItems) { return CollectionUtils.filter(selectItems, new Predicate<SelectItem>() { @Override http://git-wip-us.apache.org/repos/asf/metamodel/blob/28ba2df1/core/src/main/java/org/apache/metamodel/QueryPostprocessDataContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/QueryPostprocessDataContext.java b/core/src/main/java/org/apache/metamodel/QueryPostprocessDataContext.java index c7dcfb7..fac70d0 100644 --- a/core/src/main/java/org/apache/metamodel/QueryPostprocessDataContext.java +++ b/core/src/main/java/org/apache/metamodel/QueryPostprocessDataContext.java @@ -167,12 +167,6 @@ public abstract class QueryPostprocessDataContext extends AbstractDataContext im // check for simple queries with or without simple criteria if (orderByItems.isEmpty()) { - // no WHERE criteria set - if (whereItems.isEmpty()) { - final DataSet dataSet = materializeTable(table, selectItems, firstRow, maxRows); - return dataSet; - } - final DataSet dataSet = materializeTable(table, selectItems, whereItems, firstRow, maxRows); return dataSet; } @@ -313,7 +307,7 @@ public abstract class QueryPostprocessDataContext extends AbstractDataContext im // Dispatching to the concrete subclass of // QueryPostprocessDataContextStrategy - dataSet = materializeTable(table, selectItemsToMaterialize, 1, -1); + dataSet = materializeTable(table, selectItemsToMaterialize, Collections.emptyList(), 1, -1); } else if (joinType != null) { // We need to (recursively) materialize a joined FromItem @@ -438,12 +432,6 @@ public abstract class QueryPostprocessDataContext extends AbstractDataContext im return false; } - @Deprecated - protected DataSet materializeTable(final Table table, final List<SelectItem> selectItems, final int firstRow, - final int maxRows) { - return materializeTable(table, selectItems, Collections.<FilterItem> emptyList(), firstRow, maxRows); - } - protected boolean isMainSchemaTable(Table table) { Schema schema = table.getSchema(); if (INFORMATION_SCHEMA_NAME.equals(schema.getName())) { @@ -600,17 +588,6 @@ public abstract class QueryPostprocessDataContext extends AbstractDataContext im } /** - * - * @return - * - * @deprecated use {@link #getDefaultSchema()} instead - */ - @Deprecated - protected Schema getMainSchemaInternal() { - return getDefaultSchema(); - } - - /** * Adds a {@link TypeConverter} to this DataContext's query engine (Query * Postprocessor) for read operations. Note that this method should NOT be * invoked directly by consuming code. Rather use http://git-wip-us.apache.org/repos/asf/metamodel/blob/28ba2df1/core/src/main/java/org/apache/metamodel/data/AbstractDataSet.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/data/AbstractDataSet.java b/core/src/main/java/org/apache/metamodel/data/AbstractDataSet.java index d296735..cd46591 100644 --- a/core/src/main/java/org/apache/metamodel/data/AbstractDataSet.java +++ b/core/src/main/java/org/apache/metamodel/data/AbstractDataSet.java @@ -23,8 +23,6 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; -import javax.swing.table.TableModel; - import org.apache.metamodel.MetaModelHelper; import org.apache.metamodel.query.SelectItem; import org.apache.metamodel.schema.Column; @@ -38,15 +36,6 @@ public abstract class AbstractDataSet extends BaseObject implements DataSet { private final DataSetHeader _header; - /** - * @deprecated use one of the other constructors, to provide header - * information. - */ - @Deprecated - public AbstractDataSet() { - _header = null; - } - public AbstractDataSet(SelectItem[] selectItems) { this(Arrays.asList(selectItems)); } @@ -110,15 +99,6 @@ public abstract class AbstractDataSet extends BaseObject implements DataSet { * {@inheritDoc} */ @Override - public final TableModel toTableModel() { - TableModel tableModel = new DataSetTableModel(this); - return tableModel; - } - - /** - * {@inheritDoc} - */ - @Override public final List<Object[]> toObjectArrays() { try { List<Object[]> objects = new ArrayList<Object[]>(); http://git-wip-us.apache.org/repos/asf/metamodel/blob/28ba2df1/core/src/main/java/org/apache/metamodel/data/AbstractRow.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/data/AbstractRow.java b/core/src/main/java/org/apache/metamodel/data/AbstractRow.java index b736592..9c931f1 100644 --- a/core/src/main/java/org/apache/metamodel/data/AbstractRow.java +++ b/core/src/main/java/org/apache/metamodel/data/AbstractRow.java @@ -122,12 +122,6 @@ public abstract class AbstractRow implements Cloneable, Row { } @Override - public Row getSubSelection(final SelectItem[] selectItems) { - final DataSetHeader header = new SimpleDataSetHeader(selectItems); - return getSubSelection(header); - } - - @Override public final SelectItem[] getSelectItems() { return getHeader().getSelectItems(); } http://git-wip-us.apache.org/repos/asf/metamodel/blob/28ba2df1/core/src/main/java/org/apache/metamodel/data/DataSet.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/data/DataSet.java b/core/src/main/java/org/apache/metamodel/data/DataSet.java index 9c29860..993d408 100644 --- a/core/src/main/java/org/apache/metamodel/data/DataSet.java +++ b/core/src/main/java/org/apache/metamodel/data/DataSet.java @@ -22,8 +22,6 @@ import java.io.Closeable; import java.util.Iterator; import java.util.List; -import javax.swing.table.TableModel; - import org.apache.metamodel.query.SelectItem; /** @@ -67,14 +65,6 @@ public interface DataSet extends Closeable, Iterable<Row> { public void close(); /** - * Converts the DataSet into a TableModel (will load all values into memory). - * - * @deprecated instantiate a new {@link DataSetTableModel} instead. - */ - @Deprecated - public TableModel toTableModel(); - - /** * Converts the DataSet into a list of object arrays (will load all values * into memory) */ http://git-wip-us.apache.org/repos/asf/metamodel/blob/28ba2df1/core/src/main/java/org/apache/metamodel/data/DefaultRow.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/data/DefaultRow.java b/core/src/main/java/org/apache/metamodel/data/DefaultRow.java index 0e1fdf7..872b375 100644 --- a/core/src/main/java/org/apache/metamodel/data/DefaultRow.java +++ b/core/src/main/java/org/apache/metamodel/data/DefaultRow.java @@ -90,79 +90,6 @@ public final class DefaultRow extends AbstractRow implements Row { this(header, values, null); } - /** - * Constructs a row from an array of SelectItems and an array of - * corresponding values - * - * @param items - * the array of SelectItems - * @param values - * the array of values - * - * @deprecated use {@link #DefaultRow(DataSetHeader, Object[])} or - * {@link #DefaultRow(DataSetHeader, Object[], Style[])} - * instead. - */ - @Deprecated - public DefaultRow(SelectItem[] items, Object[] values) { - this(Arrays.asList(items), values, null); - } - - /** - * Constructs a row from an array of SelectItems and an array of - * corresponding values - * - * @param items - * the array of SelectItems - * @param values - * the array of values - * @param styles - * an optional array of styles - * @deprecated use {@link #DefaultRow(DataSetHeader, Object[])} or - * {@link #DefaultRow(DataSetHeader, Object[], Style[])} - * instead. - */ - @Deprecated - public DefaultRow(SelectItem[] items, Object[] values, Style[] styles) { - this(Arrays.asList(items), values, styles); - } - - /** - * Constructs a row from a list of SelectItems and an array of corresponding - * values - * - * @param items - * the list of SelectItems - * @param values - * the array of values - * @deprecated use {@link #DefaultRow(DataSetHeader, Object[])} or - * {@link #DefaultRow(DataSetHeader, Object[], Style[])} - * instead. - */ - @Deprecated - public DefaultRow(List<SelectItem> items, Object[] values) { - this(items, values, null); - } - - /** - * Constructs a row from a list of SelectItems and an array of corresponding - * values - * - * @param items - * the list of SelectItems - * @param values - * the array of values - * @param styles - * an optional array of styles - * @deprecated use {@link #DefaultRow(DataSetHeader, Object[])} or - * {@link #DefaultRow(DataSetHeader, Object[], Style[])} - * instead. - */ - @Deprecated - public DefaultRow(List<SelectItem> items, Object[] values, Style[] styles) { - this(new SimpleDataSetHeader(items), values, styles); - } - @Override public Object getValue(int index) throws ArrayIndexOutOfBoundsException { return _values[index]; http://git-wip-us.apache.org/repos/asf/metamodel/blob/28ba2df1/core/src/main/java/org/apache/metamodel/data/Row.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/data/Row.java b/core/src/main/java/org/apache/metamodel/data/Row.java index d636343..65fc273 100644 --- a/core/src/main/java/org/apache/metamodel/data/Row.java +++ b/core/src/main/java/org/apache/metamodel/data/Row.java @@ -108,17 +108,6 @@ public interface Row extends Serializable { /** * Creates a row similar to this one but only with a subset of the values. * - * @param selectItems - * the select items (~ columns) to sub-select the row with - * @return a new Row object containing only the select items requested - * @deprecated use {@link #getSubSelection(DataSetHeader)} instead. - */ - @Deprecated - public Row getSubSelection(SelectItem[] selectItems); - - /** - * Creates a row similar to this one but only with a subset of the values. - * * @param header * the new header to sub-select the row with * @return a new Row object containing only the select items in the newly http://git-wip-us.apache.org/repos/asf/metamodel/blob/28ba2df1/core/src/main/java/org/apache/metamodel/query/FilterItem.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/query/FilterItem.java b/core/src/main/java/org/apache/metamodel/query/FilterItem.java index 6fb7578..4634c47 100644 --- a/core/src/main/java/org/apache/metamodel/query/FilterItem.java +++ b/core/src/main/java/org/apache/metamodel/query/FilterItem.java @@ -460,27 +460,6 @@ public class FilterItem extends BaseObject implements QueryItem, Cloneable, IRow } /** - * Gets the {@link FilterItem}s that this filter item consists of, if it is - * a compound filter item. - * - * @deprecated use {@link #getChildItems()} instead - */ - @Deprecated - public FilterItem[] getOrItems() { - return getChildItems(); - } - - /** - * Gets the number of child items, if this is a compound filter item. - * - * @deprecated use {@link #getChildItemCount()} instead. - */ - @Deprecated - public int getOrItemCount() { - return getChildItemCount(); - } - - /** * Get the number of child items, if this is a compound filter item. */ public int getChildItemCount() { http://git-wip-us.apache.org/repos/asf/metamodel/blob/28ba2df1/core/src/main/java/org/apache/metamodel/query/OrderByItem.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/query/OrderByItem.java b/core/src/main/java/org/apache/metamodel/query/OrderByItem.java index 3fde53c..c0a7682 100644 --- a/core/src/main/java/org/apache/metamodel/query/OrderByItem.java +++ b/core/src/main/java/org/apache/metamodel/query/OrderByItem.java @@ -57,26 +57,6 @@ public class OrderByItem extends BaseObject implements QueryItem, Cloneable { } /** - * Creates an OrderByItem - * - * @param selectItem - * @param ascending - * @deprecated user OrderByItem(SelectItem, Direction) instead - */ - @Deprecated - public OrderByItem(SelectItem selectItem, boolean ascending) { - if (selectItem == null) { - throw new IllegalArgumentException("SelectItem cannot be null"); - } - _selectItem = selectItem; - if (ascending) { - _direction = Direction.ASC; - } else { - _direction = Direction.DESC; - } - } - - /** * Creates an ascending OrderByItem * * @param selectItem http://git-wip-us.apache.org/repos/asf/metamodel/blob/28ba2df1/core/src/main/java/org/apache/metamodel/query/Query.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/query/Query.java b/core/src/main/java/org/apache/metamodel/query/Query.java index f8194a7..bbb9c5b 100644 --- a/core/src/main/java/org/apache/metamodel/query/Query.java +++ b/core/src/main/java/org/apache/metamodel/query/Query.java @@ -271,18 +271,6 @@ public final class Query extends BaseObject implements Cloneable, Serializable { return orderBy(column, Direction.ASC); } - /** - * @deprecated use orderBy(Column, Direction) instead - */ - @Deprecated - public Query orderBy(Column column, boolean ascending) { - if (ascending) { - return orderBy(column, Direction.ASC); - } else { - return orderBy(column, Direction.DESC); - } - } - public Query orderBy(Column column, Direction direction) { SelectItem selectItem = _selectClause.getSelectItem(column); if (selectItem == null) { http://git-wip-us.apache.org/repos/asf/metamodel/blob/28ba2df1/core/src/main/java/org/apache/metamodel/query/SelectItem.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/query/SelectItem.java b/core/src/main/java/org/apache/metamodel/query/SelectItem.java index bc872d1..df4b995 100644 --- a/core/src/main/java/org/apache/metamodel/query/SelectItem.java +++ b/core/src/main/java/org/apache/metamodel/query/SelectItem.java @@ -98,7 +98,7 @@ public class SelectItem extends BaseObject implements QueryItem, Cloneable { } public static boolean isCountAllItem(SelectItem item) { - if (item != null && item.getFunction() != null && item.getFunction().toString().equals("COUNT") + if (item != null && item.getAggregateFunction() != null && item.getAggregateFunction().toString().equals("COUNT") && item.getExpression() == "*") { return true; } @@ -242,19 +242,6 @@ public class SelectItem extends BaseObject implements QueryItem, Cloneable { return this; } - /** - * - * @return - * @deprecated use {@link #getAggregateFunction()} or - * {@link #getScalarFunction()} instead, - * or {@link #hasFunction()} to check if a - * function is set at all. - */ - @Deprecated - public FunctionType getFunction() { - return _function; - } - public boolean hasFunction(){ return _function != null; } @@ -349,14 +336,6 @@ public class SelectItem extends BaseObject implements QueryItem, Cloneable { return _subQuerySelectItem; } - /** - * @deprecated use {@link #getFromItem()} instead - */ - @Deprecated - public FromItem getSubQueryFromItem() { - return _fromItem; - } - public FromItem getFromItem() { return _fromItem; } http://git-wip-us.apache.org/repos/asf/metamodel/blob/28ba2df1/core/src/main/java/org/apache/metamodel/query/builder/AbstractFilterBuilder.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/query/builder/AbstractFilterBuilder.java b/core/src/main/java/org/apache/metamodel/query/builder/AbstractFilterBuilder.java index f14b4af..c49df7e 100644 --- a/core/src/main/java/org/apache/metamodel/query/builder/AbstractFilterBuilder.java +++ b/core/src/main/java/org/apache/metamodel/query/builder/AbstractFilterBuilder.java @@ -193,12 +193,6 @@ public abstract class AbstractFilterBuilder<B> implements FilterBuilder<B> { throw new UnsupportedOperationException("Argument must be a Boolean, Number, Date or String. Found: " + obj); } - @Deprecated - @Override - public B higherThan(Column arg) { - return greaterThan(arg); - } - @Override public B greaterThan(Column column) { if (column == null) { @@ -207,12 +201,6 @@ public abstract class AbstractFilterBuilder<B> implements FilterBuilder<B> { return applyFilter(new FilterItem(_selectItem, OperatorType.GREATER_THAN, new SelectItem(column))); } - @Deprecated - @Override - public B higherThan(Date arg) { - return greaterThan(arg); - } - @Override public B greaterThan(Date date) { if (date == null) { @@ -221,12 +209,6 @@ public abstract class AbstractFilterBuilder<B> implements FilterBuilder<B> { return applyFilter(new FilterItem(_selectItem, OperatorType.GREATER_THAN, date)); } - @Deprecated - @Override - public B higherThan(Number arg) { - return greaterThan(arg); - } - @Override public B greaterThan(Number number) { if (number == null) { @@ -235,12 +217,6 @@ public abstract class AbstractFilterBuilder<B> implements FilterBuilder<B> { return applyFilter(new FilterItem(_selectItem, OperatorType.GREATER_THAN, number)); } - @Deprecated - @Override - public B higherThan(String arg) { - return greaterThan(arg); - } - @Override public B greaterThan(String string) { if (string == null) { @@ -557,36 +533,6 @@ public abstract class AbstractFilterBuilder<B> implements FilterBuilder<B> { } @Override - @Deprecated - public B equals(Boolean bool) { - return isEquals(bool); - } - - @Override - @Deprecated - public B equals(Column column) { - return isEquals(column); - } - - @Override - @Deprecated - public B equals(Date date) { - return isEquals(date); - } - - @Override - @Deprecated - public B equals(Number number) { - return isEquals(number); - } - - @Override - @Deprecated - public B equals(String string) { - return isEquals(string); - } - - @Override public B lt(Object obj) { return lessThan(obj); } http://git-wip-us.apache.org/repos/asf/metamodel/blob/28ba2df1/core/src/main/java/org/apache/metamodel/query/builder/AbstractQueryFilterBuilder.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/query/builder/AbstractQueryFilterBuilder.java b/core/src/main/java/org/apache/metamodel/query/builder/AbstractQueryFilterBuilder.java index 133bce0..9b22793 100644 --- a/core/src/main/java/org/apache/metamodel/query/builder/AbstractQueryFilterBuilder.java +++ b/core/src/main/java/org/apache/metamodel/query/builder/AbstractQueryFilterBuilder.java @@ -126,12 +126,6 @@ abstract class AbstractQueryFilterBuilder<B> extends GroupedQueryBuilderCallback return _filterBuilder.differentFrom(obj); } - @Deprecated - @Override - public B higherThan(Column arg) { - return _filterBuilder.higherThan(arg); - } - public B greaterThan(Column column) { return _filterBuilder.greaterThan(column); } @@ -141,34 +135,16 @@ abstract class AbstractQueryFilterBuilder<B> extends GroupedQueryBuilderCallback return _filterBuilder.greaterThan(obj); } - @Deprecated - @Override - public B higherThan(Date arg) { - return _filterBuilder.higherThan(arg); - } - @Override public B greaterThan(Date date) { return _filterBuilder.greaterThan(date); } - @Deprecated - @Override - public B higherThan(Number arg) { - return _filterBuilder.higherThan(arg); - } - @Override public B greaterThan(Number number) { return _filterBuilder.greaterThan(number); } - @Deprecated - @Override - public B higherThan(String arg) { - return _filterBuilder.higherThan(arg); - } - @Override public B greaterThan(String string) { return _filterBuilder.greaterThan(string); @@ -402,36 +378,6 @@ abstract class AbstractQueryFilterBuilder<B> extends GroupedQueryBuilderCallback } @Override - @Deprecated - public B equals(Boolean bool) { - return isEquals(bool); - } - - @Override - @Deprecated - public B equals(Column column) { - return isEquals(column); - } - - @Override - @Deprecated - public B equals(Date date) { - return isEquals(date); - } - - @Override - @Deprecated - public B equals(Number number) { - return isEquals(number); - } - - @Override - @Deprecated - public B equals(String string) { - return isEquals(string); - } - - @Override public B lt(Object obj) { return lessThan(obj); } http://git-wip-us.apache.org/repos/asf/metamodel/blob/28ba2df1/core/src/main/java/org/apache/metamodel/query/builder/FilterBuilder.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/query/builder/FilterBuilder.java b/core/src/main/java/org/apache/metamodel/query/builder/FilterBuilder.java index 8ba1f62..036319e 100644 --- a/core/src/main/java/org/apache/metamodel/query/builder/FilterBuilder.java +++ b/core/src/main/java/org/apache/metamodel/query/builder/FilterBuilder.java @@ -124,46 +124,6 @@ public interface FilterBuilder<B> { public B isEquals(Object obj); /** - * Equal to ... - * - * @deprecated use 'eq' or 'isEquals' instead. - */ - @Deprecated - public B equals(Column column); - - /** - * Equal to ... - * - * @deprecated use 'eq' or 'isEquals' instead. - */ - @Deprecated - public B equals(Date date); - - /** - * Equal to ... - * - * @deprecated use 'eq' or 'isEquals' instead. - */ - @Deprecated - public B equals(Number number); - - /** - * Equal to ... - * - * @deprecated use 'eq' or 'isEquals' instead. - */ - @Deprecated - public B equals(String string); - - /** - * Equal to ... - * - * @deprecated use 'eq' or 'isEquals' instead. - */ - @Deprecated - public B equals(Boolean bool); - - /** * Not equal to ... */ public B differentFrom(Column column); @@ -225,14 +185,6 @@ public interface FilterBuilder<B> { /** * Greater than ... - * - * @deprecated use {@link #greaterThan(Column)} instead - */ - @Deprecated - public B higherThan(Column column); - - /** - * Greater than ... */ public B greaterThan(Column column); @@ -253,14 +205,6 @@ public interface FilterBuilder<B> { /** * Greater than ... - * - * @deprecated use {@link #greaterThan(Date)} instead - */ - @Deprecated - public B higherThan(Date date); - - /** - * Greater than ... */ public B greaterThan(Date date); @@ -270,12 +214,6 @@ public interface FilterBuilder<B> { public B gt(Date date); /** - * @deprecated use {@link #greaterThan(Number)} instead - */ - @Deprecated - public B higherThan(Number number); - - /** * Greater than ... */ public B greaterThan(Number number); @@ -287,14 +225,6 @@ public interface FilterBuilder<B> { /** * Greater than ... - * - * @deprecated use {@link #greaterThan(String)} instead - */ - @Deprecated - public B higherThan(String string); - - /** - * Greater than ... */ public B greaterThan(String string); http://git-wip-us.apache.org/repos/asf/metamodel/blob/28ba2df1/core/src/main/java/org/apache/metamodel/util/ImmutableDate.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/util/ImmutableDate.java b/core/src/main/java/org/apache/metamodel/util/ImmutableDate.java deleted file mode 100644 index b74c604..0000000 --- a/core/src/main/java/org/apache/metamodel/util/ImmutableDate.java +++ /dev/null @@ -1,61 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.metamodel.util; - -import java.text.DateFormat; -import java.util.Date; - -/** - * A Date implementation that is immutable and has a predictable - * (locale-indifferent) toString() method. - * - * @deprecated MetaModel is not a Date API, use Joda time or live with - * java.util.Date. - */ -@Deprecated -public final class ImmutableDate extends Date { - - private static final long serialVersionUID = 1L; - - public ImmutableDate(long time) { - super(time); - } - - public ImmutableDate(Date date) { - super(date.getTime()); - } - - /** - * This mutator will throw an {@link UnsupportedOperationException}, since - * the date is ummutable. - * - * @param time - * new time to set - */ - @Override - public void setTime(long time) { - throw new UnsupportedOperationException("setTime(...) is not allowed"); - } - - @Override - public String toString() { - DateFormat format = DateUtils.createDateFormat(); - return format.format(this); - } -} http://git-wip-us.apache.org/repos/asf/metamodel/blob/28ba2df1/core/src/test/java/org/apache/metamodel/QueryPostprocessDataContextTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/metamodel/QueryPostprocessDataContextTest.java b/core/src/test/java/org/apache/metamodel/QueryPostprocessDataContextTest.java index 6a8438a..d6955a9 100644 --- a/core/src/test/java/org/apache/metamodel/QueryPostprocessDataContextTest.java +++ b/core/src/test/java/org/apache/metamodel/QueryPostprocessDataContextTest.java @@ -494,8 +494,7 @@ public class QueryPostprocessDataContextTest extends MetaModelTestCase { DataSet data = dc.executeQuery(q); assertEquals(1, data.getSelectItems().length); - @SuppressWarnings("deprecation") - TableModel tableModel = data.toTableModel(); + TableModel tableModel = new DataSetTableModel(data); // should correspond to these lines: @@ -537,8 +536,7 @@ public class QueryPostprocessDataContextTest extends MetaModelTestCase { assertEquals(1, data.getSelectItems().length); assertEquals("SUM(r.project_id)", data.getSelectItems()[0].toString()); - @SuppressWarnings("deprecation") - TableModel tableModel = data.toTableModel(); + TableModel tableModel = new DataSetTableModel(data); assertEquals(3, tableModel.getRowCount()); assertEquals(1, tableModel.getColumnCount()); assertEquals(1.0, tableModel.getValueAt(0, 0)); http://git-wip-us.apache.org/repos/asf/metamodel/blob/28ba2df1/core/src/test/java/org/apache/metamodel/data/DataSetTableModelTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/metamodel/data/DataSetTableModelTest.java b/core/src/test/java/org/apache/metamodel/data/DataSetTableModelTest.java index 6ab60eb..b70bc8c 100644 --- a/core/src/test/java/org/apache/metamodel/data/DataSetTableModelTest.java +++ b/core/src/test/java/org/apache/metamodel/data/DataSetTableModelTest.java @@ -40,8 +40,7 @@ public class DataSetTableModelTest extends TestCase { rows.add(new DefaultRow(header, new Object[] { 2, "John", "Taylor" })); DataSet data = new InMemoryDataSet(header, rows); - @SuppressWarnings("deprecation") - TableModel tableModel = data.toTableModel(); + TableModel tableModel = new DataSetTableModel(data); data.close(); assertEquals(3, tableModel.getColumnCount()); http://git-wip-us.apache.org/repos/asf/metamodel/blob/28ba2df1/csv/src/main/java/org/apache/metamodel/csv/CsvDataContext.java ---------------------------------------------------------------------- diff --git a/csv/src/main/java/org/apache/metamodel/csv/CsvDataContext.java b/csv/src/main/java/org/apache/metamodel/csv/CsvDataContext.java index d7a8b47..6bc6207 100644 --- a/csv/src/main/java/org/apache/metamodel/csv/CsvDataContext.java +++ b/csv/src/main/java/org/apache/metamodel/csv/CsvDataContext.java @@ -134,69 +134,6 @@ public final class CsvDataContext extends QueryPostprocessDataContext implements } /** - * @deprecated use {@link #CsvDataContext(File, CsvConfiguration)} instead. - */ - @Deprecated - public CsvDataContext(File file, char separatorChar) { - this(file, separatorChar, CsvConfiguration.DEFAULT_QUOTE_CHAR); - } - - /** - * @deprecated use {@link #CsvDataContext(File, CsvConfiguration)} instead. - */ - @Deprecated - public CsvDataContext(File file, char separatorChar, char quoteChar) { - this(file, new CsvConfiguration(CsvConfiguration.DEFAULT_COLUMN_NAME_LINE, FileHelper.DEFAULT_ENCODING, - separatorChar, quoteChar, CsvConfiguration.DEFAULT_ESCAPE_CHAR)); - } - - /** - * @deprecated use {@link #CsvDataContext(File, CsvConfiguration)} instead. - */ - @Deprecated - public CsvDataContext(File file, char separatorChar, char quoteChar, String encoding) { - this(file, new CsvConfiguration(CsvConfiguration.DEFAULT_COLUMN_NAME_LINE, encoding, separatorChar, quoteChar, - CsvConfiguration.DEFAULT_ESCAPE_CHAR)); - } - - /** - * @deprecated use {@link #CsvDataContext(URL, CsvConfiguration)} instead. - */ - @Deprecated - public CsvDataContext(URL url, char separatorChar, char quoteChar) { - this(url, separatorChar, quoteChar, FileHelper.DEFAULT_ENCODING); - } - - /** - * @deprecated use {@link #CsvDataContext(URL, CsvConfiguration)} instead. - */ - @Deprecated - public CsvDataContext(URL url, char separatorChar, char quoteChar, String encoding) { - this(url, new CsvConfiguration(CsvConfiguration.DEFAULT_COLUMN_NAME_LINE, encoding, separatorChar, quoteChar, - CsvConfiguration.DEFAULT_ESCAPE_CHAR)); - } - - /** - * @deprecated use {@link #CsvDataContext(InputStream, CsvConfiguration)} - * instead. - */ - @Deprecated - public CsvDataContext(InputStream inputStream, char separatorChar, char quoteChar) { - this(inputStream, new CsvConfiguration(CsvConfiguration.DEFAULT_COLUMN_NAME_LINE, FileHelper.DEFAULT_ENCODING, - separatorChar, quoteChar, CsvConfiguration.DEFAULT_ESCAPE_CHAR)); - } - - /** - * @deprecated use {@link #CsvDataContext(InputStream, CsvConfiguration)} - * instead. - */ - @Deprecated - public CsvDataContext(InputStream inputStream, char separatorChar, char quoteChar, String encoding) { - this(inputStream, new CsvConfiguration(CsvConfiguration.DEFAULT_COLUMN_NAME_LINE, encoding, separatorChar, - quoteChar, CsvConfiguration.DEFAULT_ESCAPE_CHAR)); - } - - /** * Gets the CSV configuration used * * @return a CSV configuration @@ -206,21 +143,6 @@ public final class CsvDataContext extends QueryPostprocessDataContext implements } /** - * Gets the CSV file being read - * - * @return a file - * - * @deprecated use {@link #getResource()} instead. - */ - @Deprecated - public File getFile() { - if (_resource instanceof FileResource) { - return ((FileResource) _resource).getFile(); - } - return null; - } - - /** * Gets the resource that is being read from. * * @return http://git-wip-us.apache.org/repos/asf/metamodel/blob/28ba2df1/excel/src/main/java/org/apache/metamodel/excel/ExcelDataContext.java ---------------------------------------------------------------------- diff --git a/excel/src/main/java/org/apache/metamodel/excel/ExcelDataContext.java b/excel/src/main/java/org/apache/metamodel/excel/ExcelDataContext.java index 294de2e..9ef931b 100644 --- a/excel/src/main/java/org/apache/metamodel/excel/ExcelDataContext.java +++ b/excel/src/main/java/org/apache/metamodel/excel/ExcelDataContext.java @@ -114,20 +114,6 @@ public final class ExcelDataContext extends QueryPostprocessDataContext implemen } /** - * Gets the Excel file being read. - * - * @return a file. - * @deprecated - */ - @Deprecated - public File getFile() { - if (_resource instanceof FileResource) { - return ((FileResource) _resource).getFile(); - } - return null; - } - - /** * Gets the Excel resource being read * * @return http://git-wip-us.apache.org/repos/asf/metamodel/blob/28ba2df1/excel/src/test/java/org/apache/metamodel/excel/ExcelDataContextTest.java ---------------------------------------------------------------------- diff --git a/excel/src/test/java/org/apache/metamodel/excel/ExcelDataContextTest.java b/excel/src/test/java/org/apache/metamodel/excel/ExcelDataContextTest.java index 3b69290..eef29ae 100644 --- a/excel/src/test/java/org/apache/metamodel/excel/ExcelDataContextTest.java +++ b/excel/src/test/java/org/apache/metamodel/excel/ExcelDataContextTest.java @@ -22,8 +22,6 @@ import java.io.File; import java.util.Arrays; import java.util.List; -import junit.framework.TestCase; - import org.apache.metamodel.DataContext; import org.apache.metamodel.MetaModelHelper; import org.apache.metamodel.UpdateCallback; @@ -38,8 +36,11 @@ import org.apache.metamodel.schema.Schema; import org.apache.metamodel.schema.Table; import org.apache.metamodel.util.DateUtils; import org.apache.metamodel.util.FileHelper; +import org.apache.metamodel.util.FileResource; import org.apache.metamodel.util.Month; +import junit.framework.TestCase; + public class ExcelDataContextTest extends TestCase { /** @@ -73,7 +74,6 @@ public class ExcelDataContextTest extends TestCase { } } - @SuppressWarnings("deprecation") public void testEmptyFile() throws Exception { File file = copyOf("src/test/resources/empty_file.xls"); ExcelDataContext dc = new ExcelDataContext(file); @@ -85,7 +85,7 @@ public class ExcelDataContextTest extends TestCase { assertEquals("sheet", table.getName()); assertEquals(0, table.getColumnCount()); - assertSame(file, dc.getFile()); + assertSame(file, ((FileResource) dc.getResource()).getFile()); } public void testEmptyFileNoHeaderLine() throws Exception { http://git-wip-us.apache.org/repos/asf/metamodel/blob/28ba2df1/fixedwidth/src/main/java/org/apache/metamodel/fixedwidth/FixedWidthDataContext.java ---------------------------------------------------------------------- diff --git a/fixedwidth/src/main/java/org/apache/metamodel/fixedwidth/FixedWidthDataContext.java b/fixedwidth/src/main/java/org/apache/metamodel/fixedwidth/FixedWidthDataContext.java index d28a0b2..28ee300 100644 --- a/fixedwidth/src/main/java/org/apache/metamodel/fixedwidth/FixedWidthDataContext.java +++ b/fixedwidth/src/main/java/org/apache/metamodel/fixedwidth/FixedWidthDataContext.java @@ -49,26 +49,6 @@ public class FixedWidthDataContext extends QueryPostprocessDataContext { private final Resource _resource; private final FixedWidthConfiguration _configuration; - /** - * @deprecated use - * {@link #FixedWidthDataContext(File, FixedWidthConfiguration)} - * instead - */ - @Deprecated - public FixedWidthDataContext(String filename, String fileEncoding, int fixedValueWidth) { - this(new FileResource(filename), new FixedWidthConfiguration(fixedValueWidth)); - } - - /** - * @deprecated use - * {@link #FixedWidthDataContext(File, FixedWidthConfiguration)} - * instead - */ - @Deprecated - public FixedWidthDataContext(File file, String fileEncoding, int fixedValueWidth, int headerLineNumber) { - this(file, new FixedWidthConfiguration(headerLineNumber, fileEncoding, fixedValueWidth)); - } - public FixedWidthDataContext(File file, FixedWidthConfiguration configuration) { _resource = new FileResource(file); _configuration = configuration; @@ -89,21 +69,6 @@ public class FixedWidthDataContext extends QueryPostprocessDataContext { } /** - * Gets the file being read. - * - * @return a file - * - * @deprecated use {@link #getResource()} instead. - */ - @Deprecated - public File getFile() { - if (_resource instanceof FileResource) { - return ((FileResource) _resource).getFile(); - } - return null; - } - - /** * Gets the resource being read * * @return http://git-wip-us.apache.org/repos/asf/metamodel/blob/28ba2df1/mongodb/common/src/main/java/org/apache/metamodel/mongodb/common/MongoDbTableDef.java ---------------------------------------------------------------------- diff --git a/mongodb/common/src/main/java/org/apache/metamodel/mongodb/common/MongoDbTableDef.java b/mongodb/common/src/main/java/org/apache/metamodel/mongodb/common/MongoDbTableDef.java deleted file mode 100644 index 7805b53..0000000 --- a/mongodb/common/src/main/java/org/apache/metamodel/mongodb/common/MongoDbTableDef.java +++ /dev/null @@ -1,46 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.metamodel.mongodb.common; - -import java.io.Serializable; - -import org.apache.metamodel.schema.ColumnType; -import org.apache.metamodel.util.SimpleTableDef; - -/** - * Defines a table layout for MongoDB tables. This class can - * be used as an instruction set for the MongoDB DataContext implementations to specify - * which collections, which columns (and their types) should be included in the - * schema structure of a Mongo DB database. - * - * @deprecated use {@link SimpleTableDef} instead. - */ -@Deprecated -public final class MongoDbTableDef extends SimpleTableDef implements Serializable { - - private static final long serialVersionUID = 1L; - - public MongoDbTableDef(String name, String[] columnNames, ColumnType[] columnTypes) { - super(name, columnNames, columnTypes); - } - - public MongoDbTableDef(String name, String[] columnNames) { - super(name, columnNames); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/metamodel/blob/28ba2df1/mongodb/mongo2/src/main/java/org/apache/metamodel/mongodb/mongo2/MongoDbDataContext.java ---------------------------------------------------------------------- diff --git a/mongodb/mongo2/src/main/java/org/apache/metamodel/mongodb/mongo2/MongoDbDataContext.java b/mongodb/mongo2/src/main/java/org/apache/metamodel/mongodb/mongo2/MongoDbDataContext.java index d2095e9..b32d4f1 100644 --- a/mongodb/mongo2/src/main/java/org/apache/metamodel/mongodb/mongo2/MongoDbDataContext.java +++ b/mongodb/mongo2/src/main/java/org/apache/metamodel/mongodb/mongo2/MongoDbDataContext.java @@ -39,7 +39,6 @@ import org.apache.metamodel.data.InMemoryDataSet; import org.apache.metamodel.data.Row; import org.apache.metamodel.data.SimpleDataSetHeader; import org.apache.metamodel.mongodb.common.MongoDBUtils; -import org.apache.metamodel.mongodb.common.MongoDbTableDef; import org.apache.metamodel.query.FilterItem; import org.apache.metamodel.query.FromItem; import org.apache.metamodel.query.OperatorType; @@ -84,17 +83,6 @@ public class MongoDbDataContext extends QueryPostprocessDataContext implements U private Schema _schema; /** - * Constructor available for backwards compatibility - * - * @deprecated use {@link #MongoDbDataContext(DB, SimpleTableDef...)} - * instead - */ - @Deprecated - public MongoDbDataContext(DB mongoDb, MongoDbTableDef... tableDefs) { - this(mongoDb, (SimpleTableDef[]) tableDefs); - } - - /** * Constructs a {@link MongoDbDataContext}. This constructor accepts a * custom array of {@link MongoDbTableDef}s which allows the user to define * his own view on the collections in the database. @@ -288,7 +276,7 @@ public class MongoDbDataContext extends QueryPostprocessDataContext implements U // "SELECT [columns] FROM [table] WHERE [conditions]" // query. for (SelectItem selectItem : selectItems) { - if (selectItem.getFunction() != null || selectItem.getColumn() == null) { + if (selectItem.hasFunction() || selectItem.getColumn() == null) { allSelectItemsAreColumns = false; break; } http://git-wip-us.apache.org/repos/asf/metamodel/blob/28ba2df1/mongodb/mongo3/src/main/java/org/apache/metamodel/mongodb/mongo3/MongoDbDataContext.java ---------------------------------------------------------------------- diff --git a/mongodb/mongo3/src/main/java/org/apache/metamodel/mongodb/mongo3/MongoDbDataContext.java b/mongodb/mongo3/src/main/java/org/apache/metamodel/mongodb/mongo3/MongoDbDataContext.java index cf89f39..a7e0eba 100644 --- a/mongodb/mongo3/src/main/java/org/apache/metamodel/mongodb/mongo3/MongoDbDataContext.java +++ b/mongodb/mongo3/src/main/java/org/apache/metamodel/mongodb/mongo3/MongoDbDataContext.java @@ -276,7 +276,7 @@ public class MongoDbDataContext extends QueryPostprocessDataContext implements U // "SELECT [columns] FROM [table] WHERE [conditions]" // query. for (SelectItem selectItem : selectItems) { - if (selectItem.getFunction() != null || selectItem.getColumn() == null) { + if (selectItem.hasFunction() || selectItem.getColumn() == null) { allSelectItemsAreColumns = false; break; } http://git-wip-us.apache.org/repos/asf/metamodel/blob/28ba2df1/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java ---------------------------------------------------------------------- diff --git a/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java b/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java index 793c42d..165116c 100644 --- a/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java +++ b/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java @@ -324,7 +324,7 @@ public class SalesforceDataContext extends QueryPostprocessDataContext implement } private static void validateSoqlSupportedSelectItem(SelectItem selectItem) throws UnsupportedOperationException { - if (selectItem.getFunction() != null) { + if (selectItem.hasFunction()) { throw new UnsupportedOperationException("Function select items not supported: " + selectItem); } if (selectItem.getSubQuerySelectItem() != null) { http://git-wip-us.apache.org/repos/asf/metamodel/blob/28ba2df1/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceUpdateCallback.java ---------------------------------------------------------------------- diff --git a/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceUpdateCallback.java b/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceUpdateCallback.java index 757cb95..5db2264 100644 --- a/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceUpdateCallback.java +++ b/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceUpdateCallback.java @@ -244,7 +244,7 @@ final class SalesforceUpdateCallback extends AbstractUpdateCallback implements C final Object operand = whereItem.getOperand(); - if (column == null || operand == null || selectItem.getFunction() != null) { + if (column == null || operand == null || selectItem.hasFunction()) { throw new IllegalStateException( "Salesforce only allows deletion of records by their specific IDs. Violated by where item: " + whereItem); http://git-wip-us.apache.org/repos/asf/metamodel/blob/28ba2df1/xml/src/main/java/org/apache/metamodel/xml/XmlDataContext.java ---------------------------------------------------------------------- diff --git a/xml/src/main/java/org/apache/metamodel/xml/XmlDataContext.java b/xml/src/main/java/org/apache/metamodel/xml/XmlDataContext.java deleted file mode 100644 index c03c24d..0000000 --- a/xml/src/main/java/org/apache/metamodel/xml/XmlDataContext.java +++ /dev/null @@ -1,59 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.metamodel.xml; - -import java.io.File; -import java.net.URL; - -import org.w3c.dom.Document; -import org.xml.sax.InputSource; - -/** - * DataContext implementation for XML files. - * - * @deprecated use {@link XmlDomDataContext} or {@link XmlSaxDataContext} - * instead. - */ -@Deprecated -public final class XmlDataContext extends XmlDomDataContext { - - public XmlDataContext(File file, boolean autoFlattenTables) - throws IllegalArgumentException { - super(file, autoFlattenTables); - } - - public XmlDataContext(File file) { - super(file); - } - - public XmlDataContext(InputSource inputSource, String schemaName, - boolean autoFlattenTables) { - super(inputSource, schemaName, autoFlattenTables); - } - - public XmlDataContext(String schemaName, Document document, - boolean autoFlattenTables) { - super(schemaName, document, autoFlattenTables); - } - - public XmlDataContext(URL url, boolean autoFlattenTables) - throws IllegalArgumentException { - super(url, autoFlattenTables); - } -}