Repository: metamodel Updated Branches: refs/heads/master 312fb603b -> c57d50805
METAMODEL-1177: Replaced null TableType with TableType.TABLE. Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/7a3de103 Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/7a3de103 Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/7a3de103 Branch: refs/heads/master Commit: 7a3de1038811c4c9635fdfaf135b7f77ec6861c9 Parents: 312fb60 Author: Kasper Sørensen <i.am.kasper.soren...@gmail.com> Authored: Mon Jan 8 22:42:12 2018 -0800 Committer: Kasper Sørensen <i.am.kasper.soren...@gmail.com> Committed: Mon Jan 8 22:43:27 2018 -0800 ---------------------------------------------------------------------- CHANGES.md | 4 ++++ .../main/java/org/apache/metamodel/schema/ImmutableTable.java | 3 +++ core/src/main/java/org/apache/metamodel/schema/MutableTable.java | 3 +++ .../apache/metamodel/excel/DefaultSpreadsheetReaderDelegate.java | 3 ++- 4 files changed, 12 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel/blob/7a3de103/CHANGES.md ---------------------------------------------------------------------- diff --git a/CHANGES.md b/CHANGES.md index 95650f8..5af3fc4 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,7 @@ +### WIP + + * [METAMODEL-1177] - Made TableType.TABLE the default table type, replacing null values. + ### Apache MetaModel 5.0.1 * [METAMODEL-1169] - Fixed issue with SQL Server milliseconds precision in WHERE. http://git-wip-us.apache.org/repos/asf/metamodel/blob/7a3de103/core/src/main/java/org/apache/metamodel/schema/ImmutableTable.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/schema/ImmutableTable.java b/core/src/main/java/org/apache/metamodel/schema/ImmutableTable.java index 150384c..edd65f4 100644 --- a/core/src/main/java/org/apache/metamodel/schema/ImmutableTable.java +++ b/core/src/main/java/org/apache/metamodel/schema/ImmutableTable.java @@ -80,6 +80,9 @@ final class ImmutableTable extends AbstractTable implements Serializable { @Override public TableType getType() { + if (type == null) { + return TableType.TABLE; + } return type; } http://git-wip-us.apache.org/repos/asf/metamodel/blob/7a3de103/core/src/main/java/org/apache/metamodel/schema/MutableTable.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/schema/MutableTable.java b/core/src/main/java/org/apache/metamodel/schema/MutableTable.java index 8678085..930af61 100644 --- a/core/src/main/java/org/apache/metamodel/schema/MutableTable.java +++ b/core/src/main/java/org/apache/metamodel/schema/MutableTable.java @@ -149,6 +149,9 @@ public class MutableTable extends AbstractTable implements Serializable { @Override public TableType getType() { + if (_type == null) { + return TableType.TABLE; + } return _type; } http://git-wip-us.apache.org/repos/asf/metamodel/blob/7a3de103/excel/src/main/java/org/apache/metamodel/excel/DefaultSpreadsheetReaderDelegate.java ---------------------------------------------------------------------- diff --git a/excel/src/main/java/org/apache/metamodel/excel/DefaultSpreadsheetReaderDelegate.java b/excel/src/main/java/org/apache/metamodel/excel/DefaultSpreadsheetReaderDelegate.java index 934d47c..17f11ec 100644 --- a/excel/src/main/java/org/apache/metamodel/excel/DefaultSpreadsheetReaderDelegate.java +++ b/excel/src/main/java/org/apache/metamodel/excel/DefaultSpreadsheetReaderDelegate.java @@ -33,6 +33,7 @@ import org.apache.metamodel.schema.MutableSchema; import org.apache.metamodel.schema.MutableTable; import org.apache.metamodel.schema.Schema; import org.apache.metamodel.schema.Table; +import org.apache.metamodel.schema.TableType; import org.apache.metamodel.schema.naming.ColumnNamingContext; import org.apache.metamodel.schema.naming.ColumnNamingContextImpl; import org.apache.metamodel.schema.naming.ColumnNamingSession; @@ -103,7 +104,7 @@ final class DefaultSpreadsheetReaderDelegate implements SpreadsheetReaderDelegat } private MutableTable createTable(final Workbook wb, final Sheet sheet) { - final MutableTable table = new MutableTable(sheet.getSheetName()); + final MutableTable table = new MutableTable(sheet.getSheetName(), TableType.TABLE); if (sheet.getPhysicalNumberOfRows() <= 0) { // no physical rows in sheet
