removing the getMutableTables and casting instead
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/dd079994 Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/dd079994 Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/dd079994 Branch: refs/heads/master Commit: dd07999449168f2f767e68b75d90943e38028eab Parents: 7f76973 Author: JoÌrg Unbehauen <jo...@unbehauen.net> Authored: Fri Jul 28 12:16:07 2017 +0200 Committer: JoÌrg Unbehauen <jo...@unbehauen.net> Committed: Fri Jul 28 12:16:07 2017 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/metamodel/schema/MutableSchema.java | 4 ---- .../metamodel/couchdb/CouchDbSimpleTableDefSchemaBuilder.java | 4 ++-- jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcSchema.java | 3 ++- 3 files changed, 4 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel/blob/dd079994/core/src/main/java/org/apache/metamodel/schema/MutableSchema.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/schema/MutableSchema.java b/core/src/main/java/org/apache/metamodel/schema/MutableSchema.java index f01b5c0..1dbc0c0 100644 --- a/core/src/main/java/org/apache/metamodel/schema/MutableSchema.java +++ b/core/src/main/java/org/apache/metamodel/schema/MutableSchema.java @@ -68,10 +68,6 @@ public class MutableSchema extends AbstractSchema implements Serializable, return Collections.unmodifiableList(_tables); } - public List<MutableTable> getMutableTables() { - return Collections.unmodifiableList(_tables); - } - public MutableSchema setTables(Collection<? extends MutableTable> tables) { clearTables(); http://git-wip-us.apache.org/repos/asf/metamodel/blob/dd079994/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbSimpleTableDefSchemaBuilder.java ---------------------------------------------------------------------- diff --git a/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbSimpleTableDefSchemaBuilder.java b/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbSimpleTableDefSchemaBuilder.java index 97e0f8b..c96120a 100644 --- a/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbSimpleTableDefSchemaBuilder.java +++ b/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbSimpleTableDefSchemaBuilder.java @@ -40,8 +40,8 @@ public class CouchDbSimpleTableDefSchemaBuilder extends SimpleTableDefSchemaBuil @Override public MutableSchema build() { MutableSchema schema = super.build(); - for (MutableTable table : schema.getMutableTables()) { - CouchDbTableCreationBuilder.addMandatoryColumns(table); + for (Table table : schema.getTables()) { + CouchDbTableCreationBuilder.addMandatoryColumns((MutableTable) table); } return schema; } http://git-wip-us.apache.org/repos/asf/metamodel/blob/dd079994/jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcSchema.java ---------------------------------------------------------------------- diff --git a/jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcSchema.java b/jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcSchema.java index 0dc0381..ccac3f8 100644 --- a/jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcSchema.java +++ b/jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcSchema.java @@ -24,6 +24,7 @@ import java.sql.Connection; import org.apache.metamodel.schema.MutableSchema; import org.apache.metamodel.schema.MutableTable; import org.apache.metamodel.schema.Schema; +import org.apache.metamodel.schema.Table; /** * Schema implementation for JDBC data contexts @@ -59,7 +60,7 @@ final class JdbcSchema extends MutableSchema { } public Schema toSerializableForm() { - for (MutableTable table : getMutableTables()) { + for (Table table : getTables()) { table.getColumns(); table.getIndexedColumns(); table.getPrimaryKeys();
