More code review; Closes #300
Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/22d282b7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/22d282b7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/22d282b7 Branch: refs/heads/3.x/master Commit: 22d282b7660f3fdd69352c1c8ba4a0b0d156fa78 Parents: 010f40d Author: Andrew Smith <[email protected]> Authored: Fri Sep 14 18:19:56 2018 -0400 Committer: Valiyil <[email protected]> Committed: Mon Oct 1 09:13:59 2018 -0400 ---------------------------------------------------------------------- .../AbstractMongoDBRdfConfigurationBuilder.java | 1 - .../apache/rya/mongodb/MongoDBQueryEngine.java | 8 +++---- .../rya/mongodb/MongoDBRdfConfiguration.java | 21 +++-------------- .../org/apache/rya/mongodb/MongoDBRyaDAO.java | 6 ++--- .../SparqlToPipelineTransformVisitor.java | 2 +- .../mongodb/MongoDBRdfConfigurationTest.java | 2 -- .../apache/rya/mongodb/MongoDBRyaDAO2IT.java | 10 ++++---- .../org/apache/rya/mongodb/MongoDBRyaDAOIT.java | 12 +++++----- .../org/apache/rya/mongodb/MongoITBase.java | 5 ++-- .../client/mongo/MongoConnectionDetails.java | 1 - .../indexing/mongodb/AbstractMongoIndexer.java | 12 +++------- .../mongodb/freetext/MongoFreeTextIndexer.java | 6 ++++- .../mongodb/temporal/MongoTemporalIndexer.java | 3 +-- .../apache/rya/sail/config/RyaSailFactory.java | 4 ++-- .../rya/api/client/mongo/MongoInstallIT.java | 8 +++---- .../mongo/MongoIndexingConfigurationTest.java | 2 -- .../indexing/mongo/MongoPcjIntegrationTest.java | 24 ++++++++++---------- .../indexing/mongo/MongoTemporalIndexerIT.java | 2 +- ...tatementMetadataExternalSetProviderTest.java | 2 +- .../StatementMetadataOptimizerTest.java | 2 +- .../client/conf/MergeConfigHadoopAdapter.java | 2 +- .../org/apache/rya/indexing/export/ITBase.java | 6 +---- .../strategy/MongoPipelineStrategy.java | 2 +- .../apache/rya/indexing/GeoRyaSailFactory.java | 4 ++-- .../indexing/mongo/MongoIndexerDeleteIT.java | 16 ++++++------- 25 files changed, 67 insertions(+), 96 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/22d282b7/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/AbstractMongoDBRdfConfigurationBuilder.java ---------------------------------------------------------------------- diff --git a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/AbstractMongoDBRdfConfigurationBuilder.java b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/AbstractMongoDBRdfConfigurationBuilder.java index ee7cb61..02032b0 100644 --- a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/AbstractMongoDBRdfConfigurationBuilder.java +++ b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/AbstractMongoDBRdfConfigurationBuilder.java @@ -166,7 +166,6 @@ public abstract class AbstractMongoDBRdfConfigurationBuilder<B extends AbstractM if (pass != null) { conf.setMongoPassword(pass); } - conf.setMongoDBName(mongoDBName); conf.setRyaInstanceName(mongoDBName); conf.setMongoHostname(host); conf.setMongoPort(port); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/22d282b7/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBQueryEngine.java ---------------------------------------------------------------------- diff --git a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBQueryEngine.java b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBQueryEngine.java index 9ddb15a..a526437 100644 --- a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBQueryEngine.java +++ b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBQueryEngine.java @@ -78,8 +78,8 @@ public class MongoDBQueryEngine implements RyaQueryEngine<StatefulMongoDBRdfConf checkNotNull(stmt); checkNotNull(conf); - Entry<RyaStatement, BindingSet> entry = new AbstractMap.SimpleEntry<>(stmt, new MapBindingSet()); - Collection<Entry<RyaStatement, BindingSet>> collection = Collections.singleton(entry); + final Entry<RyaStatement, BindingSet> entry = new AbstractMap.SimpleEntry<>(stmt, new MapBindingSet()); + final Collection<Entry<RyaStatement, BindingSet>> collection = Collections.singleton(entry); return new RyaStatementCursorIterator(queryWithBindingSet(collection, conf)); } @@ -143,12 +143,12 @@ public class MongoDBQueryEngine implements RyaQueryEngine<StatefulMongoDBRdfConf queries.put(stmt, new MapBindingSet()); } - Iterator<RyaStatement> iterator = new RyaStatementCursorIterator(queryWithBindingSet(queries.entrySet(), getConf())); + final Iterator<RyaStatement> iterator = new RyaStatementCursorIterator(queryWithBindingSet(queries.entrySet(), getConf())); return CloseableIterables.wrap((Iterable<RyaStatement>) () -> iterator); } private MongoCollection<Document> getCollection(final StatefulMongoDBRdfConfiguration conf) { - final MongoDatabase db = conf.getMongoClient().getDatabase(conf.getMongoDBName()); + final MongoDatabase db = conf.getMongoClient().getDatabase(conf.getRyaInstanceName()); return db.getCollection(conf.getTriplesCollectionName()); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/22d282b7/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRdfConfiguration.java ---------------------------------------------------------------------- diff --git a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRdfConfiguration.java b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRdfConfiguration.java index 2c7a40f..ae7467b 100644 --- a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRdfConfiguration.java +++ b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRdfConfiguration.java @@ -42,7 +42,7 @@ public class MongoDBRdfConfiguration extends RdfCloudTripleStoreConfiguration { public static final String MONGO_PORT = "mongo.db.port"; // MongoDB Database values. - public static final String MONGO_DB_NAME = "mongo.db.name"; + public static final String RYA_INSTANCE_NAME = "mongo.db.name"; public static final String MONGO_USER = "mongo.db.user"; public static final String MONGO_USER_PASSWORD = "mongo.db.userpassword"; @@ -147,21 +147,6 @@ public class MongoDBRdfConfiguration extends RdfCloudTripleStoreConfiguration { } /** - * @return The name of the MongoDB Database to connect to. (default: rya) - */ - public String getMongoDBName() { - return get(MONGO_DB_NAME, "rya"); - } - - /** - * @param database - The name of the MongoDb Database to connect to. - */ - public void setMongoDBName(final String database) { - requireNonNull(database); - set(MONGO_DB_NAME, database); - } - - /** * @param user - The user used to connect to the MongoDB Database that hosts the Rya Instance. (not null) */ public void setMongoUser(final String user) { @@ -195,7 +180,7 @@ public class MongoDBRdfConfiguration extends RdfCloudTripleStoreConfiguration { * @return The name of the Rya instance to connect to. (default: rya) */ public String getRyaInstanceName() { - return get(MONGO_DB_NAME, "rya"); + return get(RYA_INSTANCE_NAME, "rya"); } /** @@ -203,7 +188,7 @@ public class MongoDBRdfConfiguration extends RdfCloudTripleStoreConfiguration { */ public void setRyaInstanceName(final String name) { requireNonNull(name); - set(MONGO_DB_NAME, name); + set(RYA_INSTANCE_NAME, name); } /** http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/22d282b7/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRyaDAO.java ---------------------------------------------------------------------- diff --git a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRyaDAO.java b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRyaDAO.java index d01c2d7..b18079f 100644 --- a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRyaDAO.java +++ b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRyaDAO.java @@ -82,8 +82,8 @@ public final class MongoDBRyaDAO implements RyaDAO<StatefulMongoDBRdfConfigurati auths = conf.getAuthorizations(); flushEachUpdate.set(conf.flushEachUpdate()); } - - + + public void setDB(final DB db) { this.db = db; } @@ -107,7 +107,7 @@ public final class MongoDBRyaDAO implements RyaDAO<StatefulMongoDBRdfConfigurati index.setConf(conf); } - db = mongoClient.getDB(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME)); + db = mongoClient.getDB(conf.getRyaInstanceName()); coll = db.getCollection(conf.getTriplesCollectionName()); nameSpaceManager = new SimpleMongoDBNamespaceManager(db.getCollection(conf.getNameSpacesCollectionName())); queryEngine = new MongoDBQueryEngine(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/22d282b7/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/aggregation/SparqlToPipelineTransformVisitor.java ---------------------------------------------------------------------- diff --git a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/aggregation/SparqlToPipelineTransformVisitor.java b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/aggregation/SparqlToPipelineTransformVisitor.java index b7f5a67..91fd61d 100644 --- a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/aggregation/SparqlToPipelineTransformVisitor.java +++ b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/aggregation/SparqlToPipelineTransformVisitor.java @@ -91,7 +91,7 @@ public class SparqlToPipelineTransformVisitor extends QueryModelVisitorBase<Exce public SparqlToPipelineTransformVisitor(StatefulMongoDBRdfConfiguration conf) { Preconditions.checkNotNull(conf); MongoClient mongo = conf.getMongoClient(); - MongoDatabase db = mongo.getDatabase(conf.getMongoDBName()); + MongoDatabase db = mongo.getDatabase(conf.getRyaInstanceName()); this.inputCollection = db.getCollection(conf.getTriplesCollectionName()); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/22d282b7/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRdfConfigurationTest.java ---------------------------------------------------------------------- diff --git a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRdfConfigurationTest.java b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRdfConfigurationTest.java index 01718dc..e782ca4 100644 --- a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRdfConfigurationTest.java +++ b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRdfConfigurationTest.java @@ -61,7 +61,6 @@ public class MongoDBRdfConfigurationTest { assertEquals(conf.getMongoHostname(), "host"); assertEquals(conf.getBoolean(".useMockInstance", false), useMock); assertEquals(conf.getMongoPort(), "1000"); - assertEquals(conf.getMongoDBName(), "dbname"); assertEquals(conf.getRyaInstanceName(), "dbname"); assertEquals(conf.get(MongoDBRdfConfiguration.MONGO_USER), user); assertEquals(conf.get(MongoDBRdfConfiguration.MONGO_USER_PASSWORD), password); @@ -90,7 +89,6 @@ public class MongoDBRdfConfigurationTest { assertEquals(conf.getMongoHostname(), "host"); assertEquals(conf.getBoolean(".useMockInstance", false), useMock); assertEquals(conf.getMongoPort(), "1000"); - assertEquals(conf.getMongoDBName(), "dbname"); assertEquals(conf.getRyaInstanceName(), "dbname"); assertEquals(conf.get(MongoDBRdfConfiguration.MONGO_USER), user); assertEquals(conf.get(MongoDBRdfConfiguration.MONGO_USER_PASSWORD), password); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/22d282b7/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAO2IT.java ---------------------------------------------------------------------- diff --git a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAO2IT.java b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAO2IT.java index 67002d7..0d6922d 100644 --- a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAO2IT.java +++ b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAO2IT.java @@ -70,7 +70,7 @@ public class MongoDBRyaDAO2IT extends MongoITBase { builder.setSubject(new RyaURI("http://subject.com";)); builder.setObject(new RyaURI("http://object.com";)); - final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME)); + final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.RYA_INSTANCE_NAME)); final MongoCollection<Document> coll = db.getCollection(conf.getTriplesCollectionName()); dao.add(builder.build()); @@ -94,7 +94,7 @@ public class MongoDBRyaDAO2IT extends MongoITBase { builder.setObject(new RyaURI("http://object.com";)); final RyaStatement statement = builder.build(); - final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME)); + final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.RYA_INSTANCE_NAME)); final MongoCollection<Document> coll = db.getCollection(conf.getTriplesCollectionName()); dao.add(statement); @@ -121,7 +121,7 @@ public class MongoDBRyaDAO2IT extends MongoITBase { builder.setContext(new RyaURI("http://context.com";)); final RyaStatement statement = builder.build(); - final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME)); + final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.RYA_INSTANCE_NAME)); final MongoCollection<Document> coll = db.getCollection(conf.getTriplesCollectionName()); dao.add(statement); @@ -153,7 +153,7 @@ public class MongoDBRyaDAO2IT extends MongoITBase { builder.setObject(new RyaURI("http://object.com";)); builder.setColumnVisibility(new DocumentVisibility("B").flatten()); - final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME)); + final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.RYA_INSTANCE_NAME)); final MongoCollection<Document> coll = db.getCollection(conf.getTriplesCollectionName()); dao.add(builder.build()); @@ -186,7 +186,7 @@ public class MongoDBRyaDAO2IT extends MongoITBase { builder.setObject(new RyaURI("http://object.com";)); builder.setColumnVisibility(new DocumentVisibility("B").flatten()); - final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME)); + final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.RYA_INSTANCE_NAME)); final MongoCollection<Document> coll = db.getCollection(conf.getTriplesCollectionName()); dao.add(builder.build()); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/22d282b7/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAOIT.java ---------------------------------------------------------------------- diff --git a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAOIT.java b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAOIT.java index c5ff223..13b88f8 100644 --- a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAOIT.java +++ b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAOIT.java @@ -78,7 +78,7 @@ public class MongoDBRyaDAOIT extends MongoITBase { builder.setObject(new RyaURI("http://object.com";)); builder.setColumnVisibility(new DocumentVisibility("B").flatten()); - final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME)); + final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.RYA_INSTANCE_NAME)); final MongoCollection<Document> coll = db.getCollection(conf.getTriplesCollectionName()); dao.add(builder.build()); @@ -106,7 +106,7 @@ public class MongoDBRyaDAOIT extends MongoITBase { builder.setObject(new RyaURI("http://object.com";)); builder.setColumnVisibility(new DocumentVisibility("C").flatten()); final RyaStatement statement = builder.build(); - final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME)); + final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.RYA_INSTANCE_NAME)); final MongoCollection<Document> coll = db.getCollection(conf.getTriplesCollectionName()); dao.add(statement); @@ -134,7 +134,7 @@ public class MongoDBRyaDAOIT extends MongoITBase { builder.setColumnVisibility(new DocumentVisibility("A&B&C").flatten()); final RyaStatement statement = builder.build(); - final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME)); + final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.RYA_INSTANCE_NAME)); final MongoCollection<Document> coll = db.getCollection(conf.getTriplesCollectionName()); dao.add(statement); @@ -166,7 +166,7 @@ public class MongoDBRyaDAOIT extends MongoITBase { builder.setObject(new RyaURI("http://object.com";)); builder.setColumnVisibility(new DocumentVisibility("B").flatten()); - final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME)); + final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.RYA_INSTANCE_NAME)); final MongoCollection<Document> coll = db.getCollection(conf.getTriplesCollectionName()); dao.add(builder.build()); @@ -199,7 +199,7 @@ public class MongoDBRyaDAOIT extends MongoITBase { builder.setObject(new RyaURI("http://object.com";)); builder.setColumnVisibility(new DocumentVisibility("B").flatten()); - final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME)); + final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.RYA_INSTANCE_NAME)); final MongoCollection<Document> coll = db.getCollection(conf.getTriplesCollectionName()); dao.add(builder.build()); @@ -593,7 +593,7 @@ public class MongoDBRyaDAOIT extends MongoITBase { final MongoDBRyaDAO dao, final String documentVisibility, final Authorizations userAuthorizations) throws RyaDAOException { - final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME)); + final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.RYA_INSTANCE_NAME)); final MongoCollection<Document> coll = db.getCollection(conf.getTriplesCollectionName()); final RyaStatement statement = buildVisibilityTestRyaStatement(documentVisibility); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/22d282b7/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoITBase.java ---------------------------------------------------------------------- diff --git a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoITBase.java b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoITBase.java index bd3870f..1f4b628 100644 --- a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoITBase.java +++ b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoITBase.java @@ -43,7 +43,6 @@ public class MongoITBase { final MongoDBRdfConfiguration conf = new MongoDBRdfConfiguration( new Configuration() ); conf.setBoolean("sc.useMongo", true); conf.setTablePrefix("test_"); - conf.setMongoDBName(conf.getRyaInstanceName()); conf.setMongoHostname(EmbeddedMongoSingleton.getMongodConfig().net().getServerAddress().getHostAddress()); conf.setMongoPort(Integer.toString(EmbeddedMongoSingleton.getMongodConfig().net().getPort())); @@ -82,13 +81,13 @@ public class MongoITBase { * @return The Rya triples {@link MongoCollection}. */ public MongoCollection<Document> getRyaCollection() { - return mongoClient.getDatabase(conf.getMongoDBName()).getCollection(conf.getTriplesCollectionName()); + return mongoClient.getDatabase(conf.getRyaInstanceName()).getCollection(conf.getTriplesCollectionName()); } /** * @return The Rya triples {@link DBCollection}. */ public DBCollection getRyaDbCollection() { - return mongoClient.getDB(conf.getMongoDBName()).getCollection(conf.getTriplesCollectionName()); + return mongoClient.getDB(conf.getRyaInstanceName()).getCollection(conf.getTriplesCollectionName()); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/22d282b7/extras/indexing/src/main/java/org/apache/rya/api/client/mongo/MongoConnectionDetails.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/api/client/mongo/MongoConnectionDetails.java b/extras/indexing/src/main/java/org/apache/rya/api/client/mongo/MongoConnectionDetails.java index f4f969c..2a7bb91 100644 --- a/extras/indexing/src/main/java/org/apache/rya/api/client/mongo/MongoConnectionDetails.java +++ b/extras/indexing/src/main/java/org/apache/rya/api/client/mongo/MongoConnectionDetails.java @@ -102,7 +102,6 @@ public class MongoConnectionDetails { conf.setBoolean(ConfigUtils.USE_MONGO, true); conf.setMongoHostname(hostname); conf.setMongoPort("" + port); - conf.setMongoDBName(ryaInstanceName); conf.setRyaInstanceName(ryaInstanceName); if(username.isPresent()) { conf.setMongoUser(username.get()); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/22d282b7/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/AbstractMongoIndexer.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/AbstractMongoIndexer.java b/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/AbstractMongoIndexer.java index 253cac7..bd14e74 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/AbstractMongoIndexer.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/AbstractMongoIndexer.java @@ -72,13 +72,12 @@ public abstract class AbstractMongoIndexer<T extends IndexingMongoDBStorageStrat protected T storageStrategy; private MongoDbBatchWriter<DBObject> mongoDbBatchWriter; - protected String collectionName; protected void initCore() { - dbName = conf.getMongoDBName(); + dbName = conf.getRyaInstanceName(); this.mongoClient = conf.getMongoClient(); db = this.mongoClient.getDB(dbName); - collection = db.getCollection(collectionName); + collection = db.getCollection(getCollectionName()); flushEachUpdate = ((MongoDBRdfConfiguration)conf).flushEachUpdate(); @@ -217,10 +216,5 @@ public abstract class AbstractMongoIndexer<T extends IndexingMongoDBStorageStrat }; } - /** - * @return The name of the {@link DBCollection} to use with the storage strategy. - */ - public String getCollectionName() { - return collectionName; - } + public abstract String getCollectionName(); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/22d282b7/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/freetext/MongoFreeTextIndexer.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/freetext/MongoFreeTextIndexer.java b/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/freetext/MongoFreeTextIndexer.java index 77c7d15..f36c265 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/freetext/MongoFreeTextIndexer.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/freetext/MongoFreeTextIndexer.java @@ -38,7 +38,6 @@ public class MongoFreeTextIndexer extends AbstractMongoIndexer<TextMongoDBStorag @Override public void init() { - collectionName = COLLECTION_NAME; initCore(); predicates = ConfigUtils.getFreeTextPredicates(conf); if(predicates.size() == 0) { @@ -54,4 +53,9 @@ public class MongoFreeTextIndexer extends AbstractMongoIndexer<TextMongoDBStorag final QueryBuilder qb = QueryBuilder.start().text(query); return withConstraints(constraints, qb.get()); } + + @Override + public String getCollectionName() { + return COLLECTION_NAME; + } } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/22d282b7/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/temporal/MongoTemporalIndexer.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/temporal/MongoTemporalIndexer.java b/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/temporal/MongoTemporalIndexer.java index e0bc5d7..1c2e75d 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/temporal/MongoTemporalIndexer.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/temporal/MongoTemporalIndexer.java @@ -47,7 +47,6 @@ public class MongoTemporalIndexer extends AbstractMongoIndexer<TemporalMongoDBSt @Override public void init() { - collectionName = COLLECTION_NAME; initCore(); predicates = ConfigUtils.getTemporalPredicates(conf); if(predicates.size() == 0) { @@ -144,7 +143,7 @@ public class MongoTemporalIndexer extends AbstractMongoIndexer<TemporalMongoDBSt @Override public String getCollectionName() { - return ConfigUtils.getTablePrefix(conf) + COLLECTION_NAME; + return COLLECTION_NAME; } @VisibleForTesting http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/22d282b7/extras/indexing/src/main/java/org/apache/rya/sail/config/RyaSailFactory.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/sail/config/RyaSailFactory.java b/extras/indexing/src/main/java/org/apache/rya/sail/config/RyaSailFactory.java index 56af9b4..2660b3f 100644 --- a/extras/indexing/src/main/java/org/apache/rya/sail/config/RyaSailFactory.java +++ b/extras/indexing/src/main/java/org/apache/rya/sail/config/RyaSailFactory.java @@ -129,7 +129,7 @@ public class RyaSailFactory { requireNonNull(mongoConf); requireNonNull(mongoConf.getMongoHostname()); requireNonNull(mongoConf.getMongoPort()); - requireNonNull(mongoConf.getMongoDBName()); + requireNonNull(mongoConf.getRyaInstanceName()); // Connect to a running MongoDB server. final int port; @@ -143,7 +143,7 @@ public class RyaSailFactory { // Connect to a specific MongoDB Database if that information is provided. final String username = mongoConf.getMongoUser(); - final String database = mongoConf.getMongoDBName(); + final String database = mongoConf.getRyaInstanceName(); final String password = mongoConf.getMongoPassword(); if(username != null && password != null) { final MongoCredential cred = MongoCredential.createCredential(username, database, password.toCharArray()); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/22d282b7/extras/indexing/src/test/java/org/apache/rya/api/client/mongo/MongoInstallIT.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/api/client/mongo/MongoInstallIT.java b/extras/indexing/src/test/java/org/apache/rya/api/client/mongo/MongoInstallIT.java index ecca646..f0a11db 100644 --- a/extras/indexing/src/test/java/org/apache/rya/api/client/mongo/MongoInstallIT.java +++ b/extras/indexing/src/test/java/org/apache/rya/api/client/mongo/MongoInstallIT.java @@ -44,7 +44,7 @@ public class MongoInstallIT extends MongoITBase { @Test public void install() throws DuplicateInstanceNameException, RyaClientException { // Install an instance of Rya. - final String ryaInstance = conf.getMongoDBName(); + final String ryaInstance = conf.getRyaInstanceName(); // Setup the connection details that were used for the embedded Mongo DB instance we are testing with. final MongoConnectionDetails connectionDetails = getConnectionDetails(); @@ -71,7 +71,7 @@ public class MongoInstallIT extends MongoITBase { final List<String> expected = Arrays.asList(INSTANCE_DETAILS_COLLECTION_NAME, "rya_triples"); int count = 0; final List<String> found = new ArrayList<>(); - for (final String collection : getMongoClient().getDatabase(conf.getMongoDBName()).listCollectionNames()) { + for (final String collection : getMongoClient().getDatabase(conf.getRyaInstanceName()).listCollectionNames()) { count += expected.contains(collection) ? 1 : 0; found.add( collection ); } @@ -82,7 +82,7 @@ public class MongoInstallIT extends MongoITBase { @Test public void install_withAllIndexers() throws DuplicateInstanceNameException, RyaClientException { // Install an instance of Rya. - final String ryaInstance = conf.getMongoDBName(); + final String ryaInstance = conf.getRyaInstanceName(); // Setup the connection details that were used for the embedded Mongo DB instance we are testing with. final MongoConnectionDetails connectionDetails = getConnectionDetails(); @@ -112,7 +112,7 @@ public class MongoInstallIT extends MongoITBase { final List<String> expected = Arrays.asList(INSTANCE_DETAILS_COLLECTION_NAME, "rya_triples"); int count = 0; final List<String> found = new ArrayList<>(); - for (final String collection : getMongoClient().getDatabase(conf.getMongoDBName()).listCollectionNames()) { + for (final String collection : getMongoClient().getDatabase(conf.getRyaInstanceName()).listCollectionNames()) { count += expected.contains(collection) ? 1 : 0; found.add( collection ); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/22d282b7/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoIndexingConfigurationTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoIndexingConfigurationTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoIndexingConfigurationTest.java index 50f301c..90460b1 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoIndexingConfigurationTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoIndexingConfigurationTest.java @@ -69,7 +69,6 @@ public class MongoIndexingConfigurationTest { assertEquals(conf.getMongoHostname(), "host"); assertEquals(conf.getBoolean(".useMockInstance", false), useMock); assertEquals(conf.getMongoPort(), "1000"); - assertEquals(conf.getMongoDBName(), "dbname"); assertEquals(conf.getRyaInstanceName(), "dbname"); assertEquals(conf.get(MongoDBRdfConfiguration.MONGO_USER), user); assertEquals(conf.get(MongoDBRdfConfiguration.MONGO_USER_PASSWORD), password); @@ -102,7 +101,6 @@ public class MongoIndexingConfigurationTest { assertEquals(conf.getMongoHostname(), "host"); assertEquals(conf.getBoolean(".useMockInstance", false), useMock); assertEquals(conf.getMongoPort(), "1000"); - assertEquals(conf.getMongoDBName(), "dbname"); assertEquals(conf.getRyaInstanceName(), "dbname"); assertEquals(conf.get(MongoDBRdfConfiguration.MONGO_USER), user); assertEquals(conf.get(MongoDBRdfConfiguration.MONGO_USER_PASSWORD), password); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/22d282b7/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoPcjIntegrationTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoPcjIntegrationTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoPcjIntegrationTest.java index af81cf6..d001757 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoPcjIntegrationTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoPcjIntegrationTest.java @@ -100,7 +100,7 @@ public class MongoPcjIntegrationTest extends MongoITBase { + " ?e <http://www.w3.org/2000/01/rdf-schema#label> ?l "// + "}";// - PcjIntegrationTestingUtil.createAndPopulatePcj(conn, getMongoClient(), conf.getMongoDBName() + 1, conf.getRyaInstanceName(), indexSparqlString); + PcjIntegrationTestingUtil.createAndPopulatePcj(conn, getMongoClient(), conf.getRyaInstanceName() + 1, conf.getRyaInstanceName(), indexSparqlString); final String queryString = ""// + "SELECT ?e ?c ?l ?o " // @@ -153,7 +153,7 @@ public class MongoPcjIntegrationTest extends MongoITBase { final CountingResultHandler crh1 = new CountingResultHandler(); final CountingResultHandler crh2 = new CountingResultHandler(); - PcjIntegrationTestingUtil.createAndPopulatePcj(conn, getMongoClient(), conf.getMongoDBName() + 1, conf.getRyaInstanceName(), indexSparqlString); + PcjIntegrationTestingUtil.createAndPopulatePcj(conn, getMongoClient(), conf.getRyaInstanceName() + 1, conf.getRyaInstanceName(), indexSparqlString); conn.prepareTupleQuery(QueryLanguage.SPARQL, indexSparqlString).evaluate(crh1); PcjIntegrationTestingUtil.deleteCoreRyaTables(getMongoClient(), conf.getRyaInstanceName(), conf.getTriplesCollectionName()); @@ -211,11 +211,11 @@ public class MongoPcjIntegrationTest extends MongoITBase { + " ?c a ?f . " // + "}";// - PcjIntegrationTestingUtil.createAndPopulatePcj(conn, getMongoClient(), conf.getMongoDBName() + 1, conf.getRyaInstanceName(), indexSparqlString); - final MongoPcjQueryNode ais1 = new MongoPcjQueryNode(conf, conf.getMongoDBName() + 1); + PcjIntegrationTestingUtil.createAndPopulatePcj(conn, getMongoClient(), conf.getRyaInstanceName() + 1, conf.getRyaInstanceName(), indexSparqlString); + final MongoPcjQueryNode ais1 = new MongoPcjQueryNode(conf, conf.getRyaInstanceName() + 1); - PcjIntegrationTestingUtil.createAndPopulatePcj(conn, getMongoClient(), conf.getMongoDBName() + 2, conf.getRyaInstanceName(), indexSparqlString2); - final MongoPcjQueryNode ais2 = new MongoPcjQueryNode(conf, conf.getMongoDBName() + 2); + PcjIntegrationTestingUtil.createAndPopulatePcj(conn, getMongoClient(), conf.getRyaInstanceName() + 2, conf.getRyaInstanceName(), indexSparqlString2); + final MongoPcjQueryNode ais2 = new MongoPcjQueryNode(conf, conf.getRyaInstanceName() + 2); final List<ExternalTupleSet> index = new ArrayList<>(); index.add(ais1); @@ -300,14 +300,14 @@ public class MongoPcjIntegrationTest extends MongoITBase { + " ?f <uri:subType> ?o. "// + "}";// - PcjIntegrationTestingUtil.createAndPopulatePcj(conn, getMongoClient(), conf.getMongoDBName() + 1, conf.getRyaInstanceName(), indexSparqlString); - final MongoPcjQueryNode ais1 = new MongoPcjQueryNode(conf, conf.getMongoDBName() + 1); + PcjIntegrationTestingUtil.createAndPopulatePcj(conn, getMongoClient(), conf.getRyaInstanceName() + 1, conf.getRyaInstanceName(), indexSparqlString); + final MongoPcjQueryNode ais1 = new MongoPcjQueryNode(conf, conf.getRyaInstanceName() + 1); - PcjIntegrationTestingUtil.createAndPopulatePcj(conn, getMongoClient(), conf.getMongoDBName() + 2, conf.getRyaInstanceName(), indexSparqlString2); - final MongoPcjQueryNode ais2 = new MongoPcjQueryNode(conf, conf.getMongoDBName() + 2); + PcjIntegrationTestingUtil.createAndPopulatePcj(conn, getMongoClient(), conf.getRyaInstanceName() + 2, conf.getRyaInstanceName(), indexSparqlString2); + final MongoPcjQueryNode ais2 = new MongoPcjQueryNode(conf, conf.getRyaInstanceName() + 2); - PcjIntegrationTestingUtil.createAndPopulatePcj(conn, getMongoClient(), conf.getMongoDBName() + 3, conf.getRyaInstanceName(), indexSparqlString3); - final MongoPcjQueryNode ais3 = new MongoPcjQueryNode(conf, conf.getMongoDBName() + 3); + PcjIntegrationTestingUtil.createAndPopulatePcj(conn, getMongoClient(), conf.getRyaInstanceName() + 3, conf.getRyaInstanceName(), indexSparqlString3); + final MongoPcjQueryNode ais3 = new MongoPcjQueryNode(conf, conf.getRyaInstanceName() + 3); final List<ExternalTupleSet> index = new ArrayList<>(); index.add(ais1); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/22d282b7/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoTemporalIndexerIT.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoTemporalIndexerIT.java b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoTemporalIndexerIT.java index 81e268a..d84a706 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoTemporalIndexerIT.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoTemporalIndexerIT.java @@ -232,7 +232,7 @@ public final class MongoTemporalIndexerIT extends MongoITBase { tIndexer.storeStatement(convertStatement(s1)); tIndexer.storeStatement(convertStatement(s2)); - final String dbName = conf.getMongoDBName(); + final String dbName = conf.getRyaInstanceName(); final DB db = super.getMongoClient().getDB(dbName); final DBCollection collection = db.getCollection(tIndexer.getCollectionName()); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/22d282b7/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataExternalSetProviderTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataExternalSetProviderTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataExternalSetProviderTest.java index f3d0c1e..8f9fd99 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataExternalSetProviderTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataExternalSetProviderTest.java @@ -149,7 +149,7 @@ public class StatementMetadataExternalSetProviderTest { conf.setBoolean("sc.useMongo", true); conf.setMongoHostname("localhost"); conf.setMongoPort("27017"); - conf.setMongoDBName("rya_"); + conf.setRyaInstanceName("rya_"); return conf; } else { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/22d282b7/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataOptimizerTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataOptimizerTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataOptimizerTest.java index 4a65d99..a109f05 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataOptimizerTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataOptimizerTest.java @@ -134,7 +134,7 @@ public class StatementMetadataOptimizerTest { mConf.setBoolean("sc.useMongo", true); mConf.setMongoHostname("localhost"); mConf.setMongoPort("27017"); - mConf.setMongoDBName("rya_"); + mConf.setRyaInstanceName("rya_"); conf = mConf; } else { conf = new AccumuloRdfConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/22d282b7/extras/rya.export/export.client/src/main/java/org/apache/rya/export/client/conf/MergeConfigHadoopAdapter.java ---------------------------------------------------------------------- diff --git a/extras/rya.export/export.client/src/main/java/org/apache/rya/export/client/conf/MergeConfigHadoopAdapter.java b/extras/rya.export/export.client/src/main/java/org/apache/rya/export/client/conf/MergeConfigHadoopAdapter.java index 3b722f1..5879dc4 100644 --- a/extras/rya.export/export.client/src/main/java/org/apache/rya/export/client/conf/MergeConfigHadoopAdapter.java +++ b/extras/rya.export/export.client/src/main/java/org/apache/rya/export/client/conf/MergeConfigHadoopAdapter.java @@ -30,7 +30,7 @@ public class MergeConfigHadoopAdapter { final MongoDBRdfConfiguration configuration = new MongoDBRdfConfiguration(); configuration.setMongoHostname(config.getChildHostname()); configuration.set(MongoDBRdfConfiguration.MONGO_PORT, config.getChildPort() + ""); - configuration.set(MongoDBRdfConfiguration.MONGO_DB_NAME, config.getChildRyaInstanceName()); + configuration.set(MongoDBRdfConfiguration.RYA_INSTANCE_NAME, config.getChildRyaInstanceName()); return configuration; } } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/22d282b7/extras/rya.export/export.integration/src/test/java/org/apache/rya/indexing/export/ITBase.java ---------------------------------------------------------------------- diff --git a/extras/rya.export/export.integration/src/test/java/org/apache/rya/indexing/export/ITBase.java b/extras/rya.export/export.integration/src/test/java/org/apache/rya/indexing/export/ITBase.java index 491ed26..012f270 100644 --- a/extras/rya.export/export.integration/src/test/java/org/apache/rya/indexing/export/ITBase.java +++ b/extras/rya.export/export.integration/src/test/java/org/apache/rya/indexing/export/ITBase.java @@ -31,7 +31,6 @@ import java.util.Map; import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.log4j.Logger; -import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaStatement.RyaStatementBuilder; import org.apache.rya.api.domain.RyaType; @@ -259,12 +258,9 @@ public abstract class ITBase { conf.set(ConfigUtils.CLOUDBASE_USER, USER); conf.set(ConfigUtils.CLOUDBASE_PASSWORD, PASSWORD); - conf.set(MongoDBRdfConfiguration.MONGO_DB_NAME, "test"); - conf.set(RdfCloudTripleStoreConfiguration.CONF_TBL_PREFIX, "rya_"); - + conf.setRyaInstanceName(ryaInstanceName); conf.setMongoPort(""+port); conf.setMongoHostname(hostname); - conf.setMongoDBName(ryaInstanceName); return conf; } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/22d282b7/extras/rya.forwardchain/src/main/java/org/apache/rya/forwardchain/strategy/MongoPipelineStrategy.java ---------------------------------------------------------------------- diff --git a/extras/rya.forwardchain/src/main/java/org/apache/rya/forwardchain/strategy/MongoPipelineStrategy.java b/extras/rya.forwardchain/src/main/java/org/apache/rya/forwardchain/strategy/MongoPipelineStrategy.java index c095122..f03755b 100644 --- a/extras/rya.forwardchain/src/main/java/org/apache/rya/forwardchain/strategy/MongoPipelineStrategy.java +++ b/extras/rya.forwardchain/src/main/java/org/apache/rya/forwardchain/strategy/MongoPipelineStrategy.java @@ -85,7 +85,7 @@ public class MongoPipelineStrategy extends AbstractRuleExecutionStrategy { */ public MongoPipelineStrategy(MongoDBRdfConfiguration mongoConf) throws ForwardChainException { Preconditions.checkNotNull(mongoConf); - final String mongoDBName = mongoConf.getMongoDBName(); + final String mongoDBName = mongoConf.getRyaInstanceName(); final String collectionName = mongoConf.getTriplesCollectionName(); mongoConf.setFlush(false); final StatefulMongoDBRdfConfiguration statefulConf; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/22d282b7/extras/rya.geoindexing/geo.common/src/main/java/org/apache/rya/indexing/GeoRyaSailFactory.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/geo.common/src/main/java/org/apache/rya/indexing/GeoRyaSailFactory.java b/extras/rya.geoindexing/geo.common/src/main/java/org/apache/rya/indexing/GeoRyaSailFactory.java index c53fea1..8c177d9 100644 --- a/extras/rya.geoindexing/geo.common/src/main/java/org/apache/rya/indexing/GeoRyaSailFactory.java +++ b/extras/rya.geoindexing/geo.common/src/main/java/org/apache/rya/indexing/GeoRyaSailFactory.java @@ -152,7 +152,7 @@ public class GeoRyaSailFactory { requireNonNull(mongoConf); requireNonNull(mongoConf.getMongoHostname()); requireNonNull(mongoConf.getMongoPort()); - requireNonNull(mongoConf.getMongoDBName()); + requireNonNull(mongoConf.getRyaInstanceName()); // Connect to a running MongoDB server. final int port; @@ -166,7 +166,7 @@ public class GeoRyaSailFactory { // Connect to a specific MongoDB Database if that information is provided. final String username = mongoConf.getMongoUser(); - final String database = mongoConf.getMongoDBName(); + final String database = mongoConf.getRyaInstanceName(); final String password = mongoConf.getMongoPassword(); if(username != null && password != null) { final MongoCredential cred = MongoCredential.createCredential(username, database, password.toCharArray()); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/22d282b7/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/mongo/MongoIndexerDeleteIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/mongo/MongoIndexerDeleteIT.java b/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/mongo/MongoIndexerDeleteIT.java index 6acc998..9b314ce 100644 --- a/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/mongo/MongoIndexerDeleteIT.java +++ b/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/mongo/MongoIndexerDeleteIT.java @@ -73,10 +73,10 @@ public class MongoIndexerDeleteIT extends MongoITBase { final MongoClient client = conf.getMongoClient(); //The extra 1 is from the person type defined in freetext - assertEquals(8, client.getDatabase(conf.getMongoDBName()).getCollection(conf.getTriplesCollectionName()).count()); - assertEquals(4, client.getDatabase(conf.getMongoDBName()).getCollection("ryatest_geo").count()); - assertEquals(1, client.getDatabase(conf.getMongoDBName()).getCollection("ryatest_temporal").count()); - assertEquals(2, client.getDatabase(conf.getMongoDBName()).getCollection("ryatest_freetext").count()); + assertEquals(8, client.getDatabase(conf.getRyaInstanceName()).getCollection(conf.getTriplesCollectionName()).count()); + assertEquals(4, client.getDatabase(conf.getRyaInstanceName()).getCollection("ryatest_geo").count()); + assertEquals(1, client.getDatabase(conf.getRyaInstanceName()).getCollection("ryatest_temporal").count()); + assertEquals(2, client.getDatabase(conf.getRyaInstanceName()).getCollection("ryatest_freetext").count()); //free text -- remove one from many String delete = "DELETE DATA \n" // @@ -111,10 +111,10 @@ public class MongoIndexerDeleteIT extends MongoITBase { update = conn.prepareUpdate(QueryLanguage.SPARQL, delete); update.execute(); - assertEquals(2, client.getDatabase(conf.getMongoDBName()).getCollection("ryatest_geo").count()); - assertEquals(0, client.getDatabase(conf.getMongoDBName()).getCollection("ryatest_temporal").count()); - assertEquals(1, client.getDatabase(conf.getMongoDBName()).getCollection("ryatest_freetext").count()); - assertEquals(4, client.getDatabase(conf.getMongoDBName()).getCollection(conf.getTriplesCollectionName()).count()); + assertEquals(2, client.getDatabase(conf.getRyaInstanceName()).getCollection("ryatest_geo").count()); + assertEquals(0, client.getDatabase(conf.getRyaInstanceName()).getCollection("ryatest_temporal").count()); + assertEquals(1, client.getDatabase(conf.getRyaInstanceName()).getCollection("ryatest_freetext").count()); + assertEquals(4, client.getDatabase(conf.getRyaInstanceName()).getCollection(conf.getTriplesCollectionName()).count()); } finally { conn.close(); sail.shutDown();
