Repository: incubator-rya Updated Branches: refs/heads/3.x/master 5c84df21d -> 22d282b76
RYA-135 Hard code triples collection There is no need for the triples collection to be configurable, as only the mongo database name will change the rya instance. Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/942d9d62 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/942d9d62 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/942d9d62 Branch: refs/heads/3.x/master Commit: 942d9d62350815a33f28a22f101cdb5c262c70ed Parents: 5c84df2 Author: Andrew Smith <smith...@gmail.com> Authored: Fri Sep 14 12:33:10 2018 -0400 Committer: Andrew Smith <smith...@gmail.com> Committed: Fri Sep 14 12:44:51 2018 -0400 ---------------------------------------------------------------------- .../rya/mongodb/MongoDBRdfConfiguration.java | 17 +++++++++-------- .../api/client/mongo/MongoConnectionDetails.java | 4 ++-- 2 files changed, 11 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/942d9d62/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 44dc851..bdb802c 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 @@ -105,7 +105,7 @@ public class MongoDBRdfConfiguration extends RdfCloudTripleStoreConfiguration { * @param useMock - {@code true} to use an embedded Mongo DB instance; {@code false} to connect to a real server. */ public void setUseMock(final boolean useMock) { - this.setBoolean(USE_MOCK_MONGO, useMock); + setBoolean(USE_MOCK_MONGO, useMock); } /** @@ -197,7 +197,7 @@ public class MongoDBRdfConfiguration extends RdfCloudTripleStoreConfiguration { * @return The name of the Rya instance to connect to. (default: rya) */ public String getRyaInstanceName() { - return get(MONGO_COLLECTION_PREFIX, "rya"); + return get(MONGO_DB_NAME, "rya"); } /** @@ -205,14 +205,14 @@ public class MongoDBRdfConfiguration extends RdfCloudTripleStoreConfiguration { */ public void setRyaInstanceName(final String name) { requireNonNull(name); - set(MONGO_COLLECTION_PREFIX, name); + set(MONGO_DB_NAME, name); } /** - * @return The name of the MongoDB Collection that contains Rya statements. (default: rya_triples) + * @return The name of the MongoDB Collection that contains Rya statements. (rya_triples) */ public String getTriplesCollectionName() { - return getRyaInstanceName() + "_triples"; + return "rya_triples"; } /** @@ -274,16 +274,17 @@ public class MongoDBRdfConfiguration extends RdfCloudTripleStoreConfiguration { * on their child subtrees. * @param value whether to use aggregation pipeline optimization. */ - public void setUseAggregationPipeline(boolean value) { + public void setUseAggregationPipeline(final boolean value) { setBoolean(USE_AGGREGATION_PIPELINE, value); } @Override public List<Class<QueryOptimizer>> getOptimizers() { - List<Class<QueryOptimizer>> optimizers = super.getOptimizers(); + final List<Class<QueryOptimizer>> optimizers = super.getOptimizers(); if (getUseAggregationPipeline()) { - Class<?> cl = AggregationPipelineQueryOptimizer.class; + final Class<?> cl = AggregationPipelineQueryOptimizer.class; @SuppressWarnings("unchecked") + final Class<QueryOptimizer> optCl = (Class<QueryOptimizer>) cl; optimizers.add(optCl); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/942d9d62/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 192ea20..f4f969c 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 @@ -78,7 +78,7 @@ public class MongoConnectionDetails { * @return The username that was used to establish the connection when performing administrative operations. */ public Optional<String> getUsername() { - return this.username; + return username; } /** @@ -103,7 +103,7 @@ public class MongoConnectionDetails { conf.setMongoHostname(hostname); conf.setMongoPort("" + port); conf.setMongoDBName(ryaInstanceName); - + conf.setRyaInstanceName(ryaInstanceName); if(username.isPresent()) { conf.setMongoUser(username.get()); }
