Responded to code review removed all references to mongo collection prefix
Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/010f40de Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/010f40de Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/010f40de Branch: refs/heads/3.x/master Commit: 010f40de276b2152451a42e1c830a2ad88b94860 Parents: 942d9d6 Author: Andrew Smith <[email protected]> Authored: Fri Sep 14 17:06:27 2018 -0400 Committer: Andrew Smith <[email protected]> Committed: Fri Sep 14 17:08:55 2018 -0400 ---------------------------------------------------------------------- .../AbstractMongoDBRdfConfigurationBuilder.java | 34 ++++--------- .../rya/mongodb/MongoDBRdfConfiguration.java | 9 ++-- .../mongodb/MongoDBRdfConfigurationBuilder.java | 12 ++--- .../mongodb/MongoDBRdfConfigurationTest.java | 12 ++--- .../indexing/mongodb/AbstractMongoIndexer.java | 9 ++-- .../mongodb/MongoIndexingConfiguration.java | 8 ++- .../mongodb/freetext/MongoFreeTextIndexer.java | 10 ++-- .../mongodb/temporal/MongoTemporalIndexer.java | 5 +- .../mongo/MongoIndexingConfigurationTest.java | 44 ++++++++-------- .../indexing/mongo/MongoTemporalIndexerIT.java | 4 +- .../src/main/java/InferenceExamples.java | 1 - .../src/main/java/MongoRyaDirectExample.java | 1 - .../org/apache/rya/indexing/export/ITBase.java | 2 - .../geoExamples/RyaMongoGeoDirectExample.java | 53 ++++++++++---------- 14 files changed, 83 insertions(+), 121 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/010f40de/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 8afcb42..ee7cb61 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 @@ -41,14 +41,12 @@ public abstract class AbstractMongoDBRdfConfigurationBuilder<B extends AbstractM private String host = "localhost"; private String port = DEFAULT_MONGO_PORT; public static final String DEFAULT_MONGO_PORT = "27017"; - private String mongoCollectionPrefix = "rya_"; private String mongoDBName = "rya"; private boolean usePipeline = false; public static final String MONGO_USER = "mongo.user"; public static final String MONGO_PASSWORD = "mongo.password"; public static final String MONGO_DB_NAME = "mongo.db.name"; - public static final String MONGO_COLLECTION_PREFIX = "mongo.collection.prefix"; public static final String MONGO_HOST = "mongo.host"; public static final String MONGO_PORT = "mongo.port"; public static final String MONGO_AUTHS = "mongo.auths"; @@ -64,7 +62,7 @@ public abstract class AbstractMongoDBRdfConfigurationBuilder<B extends AbstractM * @param user - user name used to connect to Mongo * @return specified builder for chaining method invocations */ - public B setMongoUser(String user) { + public B setMongoUser(final String user) { this.user = user; return confBuilder(); } @@ -76,7 +74,7 @@ public abstract class AbstractMongoDBRdfConfigurationBuilder<B extends AbstractM * @param password - password used to connect to Mongo * @return specified builder for chaining method invocations */ - public B setMongoPassword(String password) { + public B setMongoPassword(final String password) { this.pass = password; return confBuilder(); } @@ -88,7 +86,7 @@ public abstract class AbstractMongoDBRdfConfigurationBuilder<B extends AbstractM * @param port - port used to connect Mongo * @return specified builder for chaining method invocations */ - public B setMongoPort(String port) { + public B setMongoPort(final String port) { this.port = port; return confBuilder(); } @@ -100,7 +98,7 @@ public abstract class AbstractMongoDBRdfConfigurationBuilder<B extends AbstractM * @param host - host used to connect to Mongo * @return specified builder for chaining method invocations */ - public B setMongoHost(String host) { + public B setMongoHost(final String host) { this.host = host; return confBuilder(); } @@ -112,32 +110,19 @@ public abstract class AbstractMongoDBRdfConfigurationBuilder<B extends AbstractM * @param name - name of MongoDB to connect to * @return specified builder for chaining method invocations */ - public B setMongoDBName(String name) { + public B setMongoDBName(final String name) { this.mongoDBName = name; return confBuilder(); } /** - * Sets MongoDB Collection prefix. This parameter must be set to connect to - * an instance of MongoDB and will default to "rya_" is no value is - * specified. - * - * @param prefix - name of Collection to connect to - * @return specified builder for chaining method invocations - */ - public B setMongoCollectionPrefix(String prefix) { - this.mongoCollectionPrefix = prefix; - return confBuilder(); - } - - /** * Set whether to use instance of embedded Mongo as backend for Rya * instance. * * @param useMock - indicates whether to use embedded Mongo as Rya backing * @return specified builder for chaining method invocations */ - public B setUseMockMongo(boolean useMock) { + public B setUseMockMongo(final boolean useMock) { this.useMock = useMock; return confBuilder(); } @@ -151,7 +136,7 @@ public abstract class AbstractMongoDBRdfConfigurationBuilder<B extends AbstractM * optimization is attempted on their child subtrees. * @param usePipeline whether to use aggregation pipeline optimization. */ - public B setUseAggregationPipeline(boolean usePipeline) { + public B setUseAggregationPipeline(final boolean usePipeline) { this.usePipeline = usePipeline; return confBuilder(); } @@ -170,7 +155,7 @@ public abstract class AbstractMongoDBRdfConfigurationBuilder<B extends AbstractM * @param conf - Configuration object * @return - Configuration object with parameters set */ - private C getConf(C conf) { + private C getConf(final C conf) { conf.setUseMock(useMock); conf.set("sc.useMongo", "true"); @@ -182,8 +167,7 @@ public abstract class AbstractMongoDBRdfConfigurationBuilder<B extends AbstractM conf.setMongoPassword(pass); } conf.setMongoDBName(mongoDBName); - conf.setRyaInstanceName(mongoCollectionPrefix); - conf.setTablePrefix(mongoCollectionPrefix); + conf.setRyaInstanceName(mongoDBName); conf.setMongoHostname(host); conf.setMongoPort(port); conf.setUseAggregationPipeline(usePipeline); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/010f40de/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 bdb802c..2c7a40f 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 @@ -35,6 +35,7 @@ import edu.umd.cs.findbugs.annotations.Nullable; * A {@link RdfCloudTripleStoreConfiguration} that configures how Rya connects to a MongoDB Rya triple store. */ public class MongoDBRdfConfiguration extends RdfCloudTripleStoreConfiguration { + public static final String RYA_TRIPLES_COLLECTION = "rya_triples"; // MongoDB Server connection values. public static final String MONGO_HOSTNAME = "mongo.db.instance"; @@ -45,9 +46,6 @@ public class MongoDBRdfConfiguration extends RdfCloudTripleStoreConfiguration { public static final String MONGO_USER = "mongo.db.user"; public static final String MONGO_USER_PASSWORD = "mongo.db.userpassword"; - // Rya Instance values. - public static final String MONGO_COLLECTION_PREFIX = "mongo.db.collectionprefix"; - // Rya Sail configuration values. public static final String USE_MOCK_MONGO = ".useMockInstance"; public static final String CONF_FLUSH_EACH_UPDATE = "rya.mongodb.dao.flusheachupdate"; @@ -212,7 +210,7 @@ public class MongoDBRdfConfiguration extends RdfCloudTripleStoreConfiguration { * @return The name of the MongoDB Collection that contains Rya statements. (rya_triples) */ public String getTriplesCollectionName() { - return "rya_triples"; + return RYA_TRIPLES_COLLECTION; } /** @@ -284,8 +282,7 @@ public class MongoDBRdfConfiguration extends RdfCloudTripleStoreConfiguration { if (getUseAggregationPipeline()) { final Class<?> cl = AggregationPipelineQueryOptimizer.class; @SuppressWarnings("unchecked") - final - Class<QueryOptimizer> optCl = (Class<QueryOptimizer>) cl; + final Class<QueryOptimizer> optCl = (Class<QueryOptimizer>) cl; optimizers.add(optCl); } return optimizers; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/010f40de/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRdfConfigurationBuilder.java ---------------------------------------------------------------------- diff --git a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRdfConfigurationBuilder.java b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRdfConfigurationBuilder.java index cbe8f45..36e973a 100644 --- a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRdfConfigurationBuilder.java +++ b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRdfConfigurationBuilder.java @@ -35,7 +35,7 @@ public class MongoDBRdfConfigurationBuilder * Creates a MongoRdfConfiguration object from a Properties file. This * method assumes that all values in the Properties file are Strings and * that the Properties file uses the keys below. - * + * * <br> * <ul> * <li>"mongo.auths" - String of Mongo authorizations. Empty auths used by @@ -59,16 +59,16 @@ public class MongoDBRdfConfigurationBuilder * by default. * </ul> * <br> - * + * * @param props * - Properties file containing Mongo specific configuration * parameters * @return MongoRdfConfiguration with properties set */ - public static MongoDBRdfConfiguration fromProperties(Properties props) { + public static MongoDBRdfConfiguration fromProperties(final Properties props) { try { - MongoDBRdfConfigurationBuilder builder = new MongoDBRdfConfigurationBuilder() // + final MongoDBRdfConfigurationBuilder builder = new MongoDBRdfConfigurationBuilder() // .setAuths(props.getProperty(AbstractMongoDBRdfConfigurationBuilder.MONGO_AUTHS, "")) // .setRyaPrefix(props.getProperty(AbstractMongoDBRdfConfigurationBuilder.MONGO_RYA_PREFIX, "rya_"))// .setVisibilities(props.getProperty(AbstractMongoDBRdfConfigurationBuilder.MONGO_VISIBILITIES, "")) @@ -78,8 +78,6 @@ public class MongoDBRdfConfigurationBuilder props.getProperty(AbstractMongoDBRdfConfigurationBuilder.USE_DISPLAY_QUERY_PLAN, "true")))// .setMongoUser(props.getProperty(AbstractMongoDBRdfConfigurationBuilder.MONGO_USER)) // .setMongoPassword(props.getProperty(AbstractMongoDBRdfConfigurationBuilder.MONGO_PASSWORD))// - .setMongoCollectionPrefix( - props.getProperty(AbstractMongoDBRdfConfigurationBuilder.MONGO_COLLECTION_PREFIX, "rya_"))// .setMongoDBName( props.getProperty(AbstractMongoDBRdfConfigurationBuilder.MONGO_DB_NAME, "rya_triples"))// .setMongoHost(props.getProperty(AbstractMongoDBRdfConfigurationBuilder.MONGO_HOST, "localhost"))// @@ -89,7 +87,7 @@ public class MongoDBRdfConfigurationBuilder props.getProperty(AbstractMongoDBRdfConfigurationBuilder.USE_MOCK_MONGO, "false"))); return builder.build(); - } catch (Exception e) { + } catch (final Exception e) { throw new RuntimeException(e); } } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/010f40de/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 c53c9f2..01718dc 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 @@ -33,7 +33,6 @@ public class MongoDBRdfConfigurationTest { @Test public void testBuilder() { - final String prefix = "prefix_"; final String auth = "U,V,W"; final String visibility = "U,W"; final String user = "user"; @@ -42,12 +41,12 @@ public class MongoDBRdfConfigurationTest { final boolean useInference = true; final boolean displayPlan = false; - final MongoDBRdfConfiguration conf = new MongoDBRdfConfiguration().getBuilder() + new MongoDBRdfConfiguration(); + final MongoDBRdfConfiguration conf = MongoDBRdfConfiguration.getBuilder() .setVisibilities(visibility) .setUseInference(useInference) .setDisplayQueryPlan(displayPlan) .setUseMockMongo(useMock) - .setMongoCollectionPrefix(prefix) .setMongoDBName("dbname") .setMongoHost("host") .setMongoPort("1000") @@ -55,7 +54,6 @@ public class MongoDBRdfConfigurationTest { .setMongoUser(user) .setMongoPassword(password).build(); - assertEquals(conf.getTablePrefix(), prefix); assertTrue(Arrays.equals(conf.getAuths(), new String[] { "U", "V", "W" })); assertEquals(conf.getCv(), visibility); assertEquals(conf.isInfer(), useInference); @@ -64,7 +62,7 @@ public class MongoDBRdfConfigurationTest { assertEquals(conf.getBoolean(".useMockInstance", false), useMock); assertEquals(conf.getMongoPort(), "1000"); assertEquals(conf.getMongoDBName(), "dbname"); - assertEquals(conf.getRyaInstanceName(), "prefix_"); + assertEquals(conf.getRyaInstanceName(), "dbname"); assertEquals(conf.get(MongoDBRdfConfiguration.MONGO_USER), user); assertEquals(conf.get(MongoDBRdfConfiguration.MONGO_USER_PASSWORD), password); @@ -72,7 +70,6 @@ public class MongoDBRdfConfigurationTest { @Test public void testBuilderFromProperties() throws FileNotFoundException, IOException { - final String prefix = "prefix_"; final String auth = "U"; final String visibility = "U"; final String user = "user"; @@ -86,7 +83,6 @@ public class MongoDBRdfConfigurationTest { final MongoDBRdfConfiguration conf = MongoDBRdfConfiguration.fromProperties(props); - assertEquals(conf.getTablePrefix(), prefix); assertTrue(Arrays.equals(conf.getAuths(), new String[] { auth })); assertEquals(conf.getCv(), visibility); assertEquals(conf.isInfer(), useInference); @@ -95,7 +91,7 @@ public class MongoDBRdfConfigurationTest { assertEquals(conf.getBoolean(".useMockInstance", false), useMock); assertEquals(conf.getMongoPort(), "1000"); assertEquals(conf.getMongoDBName(), "dbname"); - assertEquals(conf.getRyaInstanceName(), "prefix_"); + 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/010f40de/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 1c4c2fa..253cac7 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 @@ -60,7 +60,6 @@ import info.aduna.iteration.CloseableIteration; public abstract class AbstractMongoIndexer<T extends IndexingMongoDBStorageStrategy> implements MongoSecondaryIndex { private static final Logger LOG = Logger.getLogger(AbstractMongoIndexer.class); - private boolean isInit = false; private boolean flushEachUpdate = true; protected StatefulMongoDBRdfConfiguration conf; protected MongoDBRyaDAO dao; @@ -73,12 +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(); this.mongoClient = conf.getMongoClient(); db = this.mongoClient.getDB(dbName); - final String collectionName = conf.get(MongoDBRdfConfiguration.MONGO_COLLECTION_PREFIX, "rya") + getCollectionName(); collection = db.getCollection(collectionName); flushEachUpdate = ((MongoDBRdfConfiguration)conf).flushEachUpdate(); @@ -171,7 +170,7 @@ public abstract class AbstractMongoIndexer<T extends IndexingMongoDBStorageStrat try { final Statement statement = RyaToRdfConversions.convertStatement(ryaStatement); final boolean isValidPredicate = predicates.isEmpty() || predicates.contains(statement.getPredicate()); - if (isValidPredicate && (statement.getObject() instanceof Literal)) { + if (isValidPredicate && statement.getObject() instanceof Literal) { final DBObject obj = storageStrategy.serialize(ryaStatement); return obj; } @@ -221,5 +220,7 @@ public abstract class AbstractMongoIndexer<T extends IndexingMongoDBStorageStrat /** * @return The name of the {@link DBCollection} to use with the storage strategy. */ - public abstract String getCollectionName(); + public String getCollectionName() { + return collectionName; + } } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/010f40de/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/MongoIndexingConfiguration.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/MongoIndexingConfiguration.java b/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/MongoIndexingConfiguration.java index ebdb914..3c4fc55 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/MongoIndexingConfiguration.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/MongoIndexingConfiguration.java @@ -279,8 +279,6 @@ public class MongoIndexingConfiguration extends MongoDBRdfConfiguration { .getProperty(AbstractMongoDBRdfConfigurationBuilder.USE_DISPLAY_QUERY_PLAN, "true")))// .setMongoUser(props.getProperty(AbstractMongoDBRdfConfigurationBuilder.MONGO_USER)) // .setMongoPassword(props.getProperty(AbstractMongoDBRdfConfigurationBuilder.MONGO_PASSWORD))// - .setMongoCollectionPrefix(props - .getProperty(AbstractMongoDBRdfConfigurationBuilder.MONGO_COLLECTION_PREFIX, "rya_"))// .setMongoDBName( props.getProperty(AbstractMongoDBRdfConfigurationBuilder.MONGO_DB_NAME, "rya_triples"))// .setMongoHost(props.getProperty(AbstractMongoDBRdfConfigurationBuilder.MONGO_HOST, "localhost"))// @@ -312,7 +310,7 @@ public class MongoIndexingConfiguration extends MongoDBRdfConfiguration { * @return MongoIndexingConfigBuilder for chaining method invocations */ public MongoDBIndexingConfigBuilder setUseMongoFreetextIndex(final boolean useFreeText) { - this.useFreetext = useFreeText; + useFreetext = useFreeText; return this; } @@ -355,7 +353,7 @@ public class MongoIndexingConfiguration extends MongoDBRdfConfiguration { * @return MongoIndexingConfigBuilder for chaining method invocations */ public MongoDBIndexingConfigBuilder setMongoFreeTextPredicates(final String... predicates) { - this.freetextPredicates = predicates; + freetextPredicates = predicates; return this; } @@ -367,7 +365,7 @@ public class MongoIndexingConfiguration extends MongoDBRdfConfiguration { * @return MongoIndexingConfigBuilder for chaining method invocations */ public MongoDBIndexingConfigBuilder setMongoTemporalPredicates(final String... predicates) { - this.temporalPredicates = predicates; + temporalPredicates = predicates; return this; } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/010f40de/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 913a4fd..77c7d15 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 @@ -33,11 +33,12 @@ import com.mongodb.QueryBuilder; import info.aduna.iteration.CloseableIteration; public class MongoFreeTextIndexer extends AbstractMongoIndexer<TextMongoDBStorageStrategy> implements FreeTextIndexer { - private static final String COLLECTION_SUFFIX = "freetext"; + private static final String COLLECTION_NAME = "freetext"; private static final Logger logger = Logger.getLogger(MongoFreeTextIndexer.class); - + @Override public void init() { + collectionName = COLLECTION_NAME; initCore(); predicates = ConfigUtils.getFreeTextPredicates(conf); if(predicates.size() == 0) { @@ -53,9 +54,4 @@ public class MongoFreeTextIndexer extends AbstractMongoIndexer<TextMongoDBStorag final QueryBuilder qb = QueryBuilder.start().text(query); return withConstraints(constraints, qb.get()); } - - @Override - public String getCollectionName() { - return ConfigUtils.getTablePrefix(conf) + COLLECTION_SUFFIX; - } } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/010f40de/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 fe8a7fa..e0bc5d7 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 @@ -42,11 +42,12 @@ import info.aduna.iteration.CloseableIteration; * Indexes MongoDB based on time instants or intervals. */ public class MongoTemporalIndexer extends AbstractMongoIndexer<TemporalMongoDBStorageStrategy> implements TemporalIndexer { - private static final String COLLECTION_SUFFIX = "temporal"; + protected final String COLLECTION_NAME = "temporal"; private static final Logger LOG = Logger.getLogger(MongoTemporalIndexer.class); @Override public void init() { + collectionName = COLLECTION_NAME; initCore(); predicates = ConfigUtils.getTemporalPredicates(conf); if(predicates.size() == 0) { @@ -143,7 +144,7 @@ public class MongoTemporalIndexer extends AbstractMongoIndexer<TemporalMongoDBSt @Override public String getCollectionName() { - return ConfigUtils.getTablePrefix(conf) + COLLECTION_SUFFIX; + return ConfigUtils.getTablePrefix(conf) + COLLECTION_NAME; } @VisibleForTesting http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/010f40de/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 708219c..50f301c 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 @@ -35,21 +35,20 @@ public class MongoIndexingConfigurationTest { @Test public void testBuilder() { - String prefix = "prefix_"; - String auth = "U,V,W"; - String visibility = "U,W"; - String user = "user"; - String password = "password"; - boolean useMock = true; - boolean useInference = true; - boolean displayPlan = false; + final String prefix = "prefix_"; + final String auth = "U,V,W"; + final String visibility = "U,W"; + final String user = "user"; + final String password = "password"; + final boolean useMock = true; + final boolean useInference = true; + final boolean displayPlan = false; - MongoIndexingConfiguration conf = MongoIndexingConfiguration.builder() + final MongoIndexingConfiguration conf = MongoIndexingConfiguration.builder() .setVisibilities(visibility) .setUseInference(useInference) .setDisplayQueryPlan(displayPlan) .setUseMockMongo(useMock) - .setMongoCollectionPrefix(prefix) .setMongoDBName("dbname") .setMongoHost("host") .setMongoPort("1000") @@ -63,7 +62,6 @@ public class MongoIndexingConfigurationTest { .setMongoTemporalPredicates("http://pred3";, "http://pred4";) .build(); - assertEquals(conf.getTablePrefix(), prefix); assertTrue(Arrays.equals(conf.getAuths(), new String[] { "U", "V", "W" })); assertEquals(conf.getCv(), visibility); assertEquals(conf.isInfer(), useInference); @@ -72,7 +70,7 @@ public class MongoIndexingConfigurationTest { assertEquals(conf.getBoolean(".useMockInstance", false), useMock); assertEquals(conf.getMongoPort(), "1000"); assertEquals(conf.getMongoDBName(), "dbname"); - assertEquals(conf.getRyaInstanceName(), "prefix_"); + assertEquals(conf.getRyaInstanceName(), "dbname"); assertEquals(conf.get(MongoDBRdfConfiguration.MONGO_USER), user); assertEquals(conf.get(MongoDBRdfConfiguration.MONGO_USER_PASSWORD), password); assertTrue( @@ -84,21 +82,19 @@ public class MongoIndexingConfigurationTest { @Test public void testBuilderFromProperties() throws FileNotFoundException, IOException { - String prefix = "prefix_"; - String auth = "U"; - String visibility = "U"; - String user = "user"; - String password = "password"; - boolean useMock = true; - boolean useInference = true; - boolean displayPlan = false; + final String auth = "U"; + final String visibility = "U"; + final String user = "user"; + final String password = "password"; + final boolean useMock = true; + final boolean useInference = true; + final boolean displayPlan = false; - Properties props = new Properties(); + final Properties props = new Properties(); props.load(new FileInputStream("src/test/resources/mongo_rya_indexing.properties")); - MongoIndexingConfiguration conf = MongoIndexingConfiguration.fromProperties(props); + final MongoIndexingConfiguration conf = MongoIndexingConfiguration.fromProperties(props); - assertEquals(conf.getTablePrefix(), prefix); assertTrue(Arrays.equals(conf.getAuths(), new String[] { auth })); assertEquals(conf.getCv(), visibility); assertEquals(conf.isInfer(), useInference); @@ -107,7 +103,7 @@ public class MongoIndexingConfigurationTest { assertEquals(conf.getBoolean(".useMockInstance", false), useMock); assertEquals(conf.getMongoPort(), "1000"); assertEquals(conf.getMongoDBName(), "dbname"); - assertEquals(conf.getRyaInstanceName(), "prefix_"); + assertEquals(conf.getRyaInstanceName(), "dbname"); assertEquals(conf.get(MongoDBRdfConfiguration.MONGO_USER), user); assertEquals(conf.get(MongoDBRdfConfiguration.MONGO_USER_PASSWORD), password); assertTrue( http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/010f40de/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 e92bcbb..81e268a 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 @@ -234,7 +234,7 @@ public final class MongoTemporalIndexerIT extends MongoITBase { final String dbName = conf.getMongoDBName(); final DB db = super.getMongoClient().getDB(dbName); - DBCollection collection = db.getCollection(conf.get(MongoDBRdfConfiguration.MONGO_COLLECTION_PREFIX, "rya") + tIndexer.getCollectionName()); + final DBCollection collection = db.getCollection(tIndexer.getCollectionName()); printTables(tIndexer, "junit testing: Temporal entities stored in testDelete before delete"); assertEquals("Number of rows stored.", 2, collection.count()); // 4 index entries per statement @@ -709,7 +709,7 @@ public final class MongoTemporalIndexerIT extends MongoITBase { * @return Count of entries in the index table. * @throws IOException */ - public void printTables(MongoTemporalIndexer tIndexer, final String description) throws IOException { + public void printTables(final MongoTemporalIndexer tIndexer, final String description) throws IOException { System.out.println("-- start printTables() -- " + description); System.out.println("Reading : " + tIndexer.getCollection().getFullName()); final DBCursor cursor = tIndexer.getCollection().find(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/010f40de/extras/indexingExample/src/main/java/InferenceExamples.java ---------------------------------------------------------------------- diff --git a/extras/indexingExample/src/main/java/InferenceExamples.java b/extras/indexingExample/src/main/java/InferenceExamples.java index 83c3bc0..cf21308 100644 --- a/extras/indexingExample/src/main/java/InferenceExamples.java +++ b/extras/indexingExample/src/main/java/InferenceExamples.java @@ -162,7 +162,6 @@ public class InferenceExamples { } return builder.setMongoDBName(MONGO_DB) - .setMongoCollectionPrefix(MONGO_COLL_PREFIX) .setUseMongoFreetextIndex(true) .setMongoFreeTextPredicates(RDFS.LABEL.stringValue()).build(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/010f40de/extras/indexingExample/src/main/java/MongoRyaDirectExample.java ---------------------------------------------------------------------- diff --git a/extras/indexingExample/src/main/java/MongoRyaDirectExample.java b/extras/indexingExample/src/main/java/MongoRyaDirectExample.java index 1744606..508bd8e 100644 --- a/extras/indexingExample/src/main/java/MongoRyaDirectExample.java +++ b/extras/indexingExample/src/main/java/MongoRyaDirectExample.java @@ -322,7 +322,6 @@ public class MongoRyaDirectExample { } return builder.setMongoDBName(MONGO_DB) - .setMongoCollectionPrefix(MONGO_COLL_PREFIX) .setUseMongoFreetextIndex(true) .setMongoFreeTextPredicates(RDFS.LABEL.stringValue()).build(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/010f40de/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 60fff56..491ed26 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 @@ -260,8 +260,6 @@ public abstract class ITBase { conf.set(ConfigUtils.CLOUDBASE_PASSWORD, PASSWORD); conf.set(MongoDBRdfConfiguration.MONGO_DB_NAME, "test"); - conf.set(MongoDBRdfConfiguration.MONGO_COLLECTION_PREFIX, "rya_"); - conf.set(RdfCloudTripleStoreConfiguration.CONF_TBL_PREFIX, "rya_"); conf.setMongoPort(""+port); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/010f40de/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geoExamples/RyaMongoGeoDirectExample.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geoExamples/RyaMongoGeoDirectExample.java b/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geoExamples/RyaMongoGeoDirectExample.java index 04488bb..6a8f8e3 100644 --- a/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geoExamples/RyaMongoGeoDirectExample.java +++ b/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geoExamples/RyaMongoGeoDirectExample.java @@ -7,9 +7,9 @@ package org.apache.rya.indexing.geoExamples; * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -61,21 +61,21 @@ public class RyaMongoGeoDirectExample { private static final String MONGO_INSTANCE_URL = "localhost"; private static final String MONGO_INSTANCE_PORT = "27017"; - public static void main(String[] args) throws Exception { - Configuration conf = getConf(); + public static void main(final String[] args) throws Exception { + final Configuration conf = getConf(); conf.setBoolean(ConfigUtils.DISPLAY_QUERY_PLAN, PRINT_QUERIES); conf.setBoolean(OptionalConfigUtils.USE_GEO, true); // Note also the use of "GeoRyaSailFactory" below. conf.setStrings(OptionalConfigUtils.GEO_PREDICATES_LIST, "http://www.opengis.net/ont/geosparql#asWKT";); // Note also the use of "GeoRyaSailFactory" below. - + SailRepository repository = null; SailRepositoryConnection conn = null; try { log.info("Connecting to Indexing Sail Repository."); - Sail sail = GeoRyaSailFactory.getInstance(conf); + final Sail sail = GeoRyaSailFactory.getInstance(conf); repository = new SailRepository(sail); conn = repository.getConnection(); - long start = System.currentTimeMillis(); + final long start = System.currentTimeMillis(); testAddPointAndWithinSearch(conn); // uses geospatial features log.info("TIME: " + (System.currentTimeMillis() - start) / 1000.); @@ -92,9 +92,9 @@ public class RyaMongoGeoDirectExample { * Try out some geospatial data and queries * @param repository */ - private static void testAddPointAndWithinSearch(SailRepositoryConnection conn) throws Exception { + private static void testAddPointAndWithinSearch(final SailRepositoryConnection conn) throws Exception { - String update = "PREFIX geo: <http://www.opengis.net/ont/geosparql#> "// + final String update = "PREFIX geo: <http://www.opengis.net/ont/geosparql#> "// + "INSERT DATA { " // + " <urn:feature> a geo:Feature ; " // + " geo:hasGeometry [ " // @@ -103,7 +103,7 @@ public class RyaMongoGeoDirectExample { + " ] . " // + "}"; - Update u = conn.prepareUpdate(QueryLanguage.SPARQL, update); + final Update u = conn.prepareUpdate(QueryLanguage.SPARQL, update); u.execute(); String queryString; @@ -147,21 +147,21 @@ public class RyaMongoGeoDirectExample { Validate.isTrue(tupleHandler.getCount() == 0); } - private static void closeQuietly(SailRepository repository) { + private static void closeQuietly(final SailRepository repository) { if (repository != null) { try { repository.shutDown(); - } catch (RepositoryException e) { + } catch (final RepositoryException e) { // quietly absorb this exception } } } - private static void closeQuietly(SailRepositoryConnection conn) { + private static void closeQuietly(final SailRepositoryConnection conn) { if (conn != null) { try { conn.close(); - } catch (RepositoryException e) { + } catch (final RepositoryException e) { // quietly absorb this exception } } @@ -175,10 +175,10 @@ public class RyaMongoGeoDirectExample { if (USE_MOCK) { mock = EmbeddedMongoFactory.newFactory(); - MongoClient c = mock.newMongoClient(); - ServerAddress address = c.getAddress(); - String url = address.getHost(); - String port = Integer.toString(address.getPort()); + final MongoClient c = mock.newMongoClient(); + final ServerAddress address = c.getAddress(); + final String url = address.getHost(); + final String port = Integer.toString(address.getPort()); c.close(); builder.setMongoHost(url).setMongoPort(port); } else { @@ -188,12 +188,11 @@ public class RyaMongoGeoDirectExample { .setMongoHost(MONGO_INSTANCE_URL) .setMongoPort(MONGO_INSTANCE_PORT); } - + return builder.setMongoDBName(MONGO_DB) - .setMongoCollectionPrefix(MONGO_COLL_PREFIX) .setUseMongoFreetextIndex(true) .setMongoFreeTextPredicates(RDFS.LABEL.stringValue()).build(); - + } @@ -205,11 +204,11 @@ public class RyaMongoGeoDirectExample { } @Override - public void startQueryResult(List<String> arg0) throws TupleQueryResultHandlerException { + public void startQueryResult(final List<String> arg0) throws TupleQueryResultHandlerException { } @Override - public void handleSolution(BindingSet arg0) throws TupleQueryResultHandlerException { + public void handleSolution(final BindingSet arg0) throws TupleQueryResultHandlerException { count++; System.out.println(arg0); } @@ -219,15 +218,15 @@ public class RyaMongoGeoDirectExample { } @Override - public void handleBoolean(boolean arg0) throws QueryResultHandlerException { + public void handleBoolean(final boolean arg0) throws QueryResultHandlerException { // TODO Auto-generated method stub - + } @Override - public void handleLinks(List<String> arg0) throws QueryResultHandlerException { + public void handleLinks(final List<String> arg0) throws QueryResultHandlerException { // TODO Auto-generated method stub - + } } }
