METAMODEL-183: Updated CHANGES.md and removed deprecated new code Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/63262e9a Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/63262e9a Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/63262e9a
Branch: refs/heads/5.x Commit: 63262e9aac449a166482744dae703f829fc71fa5 Parents: 365fae3 Author: Kasper Sørensen <[email protected]> Authored: Sat Jan 23 17:44:24 2016 +0100 Committer: Kasper Sørensen <[email protected]> Committed: Sat Jan 23 17:44:24 2016 +0100 ---------------------------------------------------------------------- CHANGES.md | 1 + mongodb/mongo2/pom.xml | 2 +- mongodb/mongo3/pom.xml | 2 +- .../metamodel/mongodb/mongo3/MongoDbDataContext.java | 13 +------------ mongodb/pom.xml | 2 +- 5 files changed, 5 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel/blob/63262e9a/CHANGES.md ---------------------------------------------------------------------- diff --git a/CHANGES.md b/CHANGES.md index 0a0d387..773a57d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,7 @@ ### Apache MetaModel 4.5.1 (work-in-progress) * [METAMODEL-227] - Fix for respecting CSV escape character also when no quote character is set. + * [METAMODEL-183] - MongoDB module split into three: common, Mongo2 and Mongo3 to allow use of either old or new MongoDB API. ### Apache MetaModel 4.5.0 http://git-wip-us.apache.org/repos/asf/metamodel/blob/63262e9a/mongodb/mongo2/pom.xml ---------------------------------------------------------------------- diff --git a/mongodb/mongo2/pom.xml b/mongodb/mongo2/pom.xml index 24b1bca..b5e374e 100644 --- a/mongodb/mongo2/pom.xml +++ b/mongodb/mongo2/pom.xml @@ -25,7 +25,7 @@ under the License. </parent> <modelVersion>4.0.0</modelVersion> <artifactId>MetaModel-mongodb-mongo2</artifactId> - <name>MetaModel module for MongoDB databases under version 3</name> + <name>MetaModel module for MongoDB 2.x</name> <dependencies> <dependency> <groupId>org.apache.metamodel</groupId> http://git-wip-us.apache.org/repos/asf/metamodel/blob/63262e9a/mongodb/mongo3/pom.xml ---------------------------------------------------------------------- diff --git a/mongodb/mongo3/pom.xml b/mongodb/mongo3/pom.xml index 7bc97e4..bf2e340 100644 --- a/mongodb/mongo3/pom.xml +++ b/mongodb/mongo3/pom.xml @@ -25,7 +25,7 @@ under the License. </parent> <modelVersion>4.0.0</modelVersion> <artifactId>MetaModel-mongodb-mongo3</artifactId> - <name>MetaModel module for MongoDB databases</name> + <name>MetaModel module for MongoDB 3.x</name> <dependencies> <dependency> <groupId>org.apache.metamodel</groupId> http://git-wip-us.apache.org/repos/asf/metamodel/blob/63262e9a/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 e13285b..1595a28 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 @@ -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; @@ -59,6 +58,7 @@ import org.bson.types.ObjectId; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.mongodb.DB; import com.mongodb.WriteConcern; import com.mongodb.client.FindIterable; import com.mongodb.client.MongoCollection; @@ -84,17 +84,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(MongoDatabase 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. http://git-wip-us.apache.org/repos/asf/metamodel/blob/63262e9a/mongodb/pom.xml ---------------------------------------------------------------------- diff --git a/mongodb/pom.xml b/mongodb/pom.xml index c0a9448..4b81223 100644 --- a/mongodb/pom.xml +++ b/mongodb/pom.xml @@ -26,7 +26,7 @@ under the License. <modelVersion>4.0.0</modelVersion> <artifactId>MetaModel-mongodb</artifactId> <packaging>pom</packaging> - <name>MetaModel module for MongoDB databases</name> + <name>MetaModel module for MongoDB</name> <modules> <module>common</module>
