Skip to content

Commit 3593c53

Browse files
isper3atisper3at
committed
More code review
1 parent 010f40d commit 3593c53

File tree

25 files changed

+67
-96
lines changed

25 files changed

+67
-96
lines changed

‎dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/AbstractMongoDBRdfConfigurationBuilder.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ private C getConf(final C conf) {
166166
if (pass != null) {
167167
conf.setMongoPassword(pass);
168168
}
169-
conf.setMongoDBName(mongoDBName);
170169
conf.setRyaInstanceName(mongoDBName);
171170
conf.setMongoHostname(host);
172171
conf.setMongoPort(port);

‎dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBQueryEngine.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ public CloseableIteration<RyaStatement, RyaDAOException> query(
7878
checkNotNull(stmt);
7979
checkNotNull(conf);
8080

81-
Entry<RyaStatement, BindingSet> entry = new AbstractMap.SimpleEntry<>(stmt, new MapBindingSet());
82-
Collection<Entry<RyaStatement, BindingSet>> collection = Collections.singleton(entry);
81+
final Entry<RyaStatement, BindingSet> entry = new AbstractMap.SimpleEntry<>(stmt, new MapBindingSet());
82+
final Collection<Entry<RyaStatement, BindingSet>> collection = Collections.singleton(entry);
8383

8484
return new RyaStatementCursorIterator(queryWithBindingSet(collection, conf));
8585
}
@@ -143,12 +143,12 @@ public CloseableIterable<RyaStatement> query(final BatchRyaQuery batchRyaQuery)
143143
queries.put(stmt, new MapBindingSet());
144144
}
145145

146-
Iterator<RyaStatement> iterator = new RyaStatementCursorIterator(queryWithBindingSet(queries.entrySet(), getConf()));
146+
final Iterator<RyaStatement> iterator = new RyaStatementCursorIterator(queryWithBindingSet(queries.entrySet(), getConf()));
147147
return CloseableIterables.wrap((Iterable<RyaStatement>) () -> iterator);
148148
}
149149

150150
private MongoCollection<Document> getCollection(final StatefulMongoDBRdfConfiguration conf) {
151-
final MongoDatabase db = conf.getMongoClient().getDatabase(conf.getMongoDBName());
151+
final MongoDatabase db = conf.getMongoClient().getDatabase(conf.getRyaInstanceName());
152152
return db.getCollection(conf.getTriplesCollectionName());
153153
}
154154

‎dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRdfConfiguration.java‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public class MongoDBRdfConfiguration extends RdfCloudTripleStoreConfiguration {
4242
public static final String MONGO_PORT = "mongo.db.port";
4343

4444
// MongoDB Database values.
45-
public static final String MONGO_DB_NAME = "mongo.db.name";
45+
public static final String RYA_INSTANCE_NAME = "mongo.db.name";
4646
public static final String MONGO_USER = "mongo.db.user";
4747
public static final String MONGO_USER_PASSWORD = "mongo.db.userpassword";
4848

@@ -146,21 +146,6 @@ public void setMongoPort(final String port) {
146146
set(MONGO_PORT, port);
147147
}
148148

149-
/**
150-
* @return The name of the MongoDB Database to connect to. (default: rya)
151-
*/
152-
public String getMongoDBName() {
153-
return get(MONGO_DB_NAME, "rya");
154-
}
155-
156-
/**
157-
* @param database - The name of the MongoDb Database to connect to.
158-
*/
159-
public void setMongoDBName(final String database) {
160-
requireNonNull(database);
161-
set(MONGO_DB_NAME, database);
162-
}
163-
164149
/**
165150
* @param user - The user used to connect to the MongoDB Database that hosts the Rya Instance. (not null)
166151
*/
@@ -195,15 +180,15 @@ public void setMongoPassword(final String password) {
195180
* @return The name of the Rya instance to connect to. (default: rya)
196181
*/
197182
public String getRyaInstanceName() {
198-
return get(MONGO_DB_NAME, "rya");
183+
return get(RYA_INSTANCE_NAME, "rya");
199184
}
200185

201186
/**
202187
* @param name - The name of the Rya instance to connect to.
203188
*/
204189
public void setRyaInstanceName(final String name) {
205190
requireNonNull(name);
206-
set(MONGO_DB_NAME, name);
191+
set(RYA_INSTANCE_NAME, name);
207192
}
208193

209194
/**

‎dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRyaDAO.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ public synchronized void setConf(final StatefulMongoDBRdfConfiguration conf) {
8282
auths = conf.getAuthorizations();
8383
flushEachUpdate.set(conf.flushEachUpdate());
8484
}
85-
86-
85+
86+
8787
public void setDB(final DB db) {
8888
this.db = db;
8989
}
@@ -107,7 +107,7 @@ public void init() throws RyaDAOException {
107107
index.setConf(conf);
108108
}
109109

110-
db = mongoClient.getDB(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME));
110+
db = mongoClient.getDB(conf.getRyaInstanceName());
111111
coll = db.getCollection(conf.getTriplesCollectionName());
112112
nameSpaceManager = new SimpleMongoDBNamespaceManager(db.getCollection(conf.getNameSpacesCollectionName()));
113113
queryEngine = new MongoDBQueryEngine();

‎dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/aggregation/SparqlToPipelineTransformVisitor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public SparqlToPipelineTransformVisitor(MongoCollection<Document> inputCollectio
9191
public SparqlToPipelineTransformVisitor(StatefulMongoDBRdfConfiguration conf) {
9292
Preconditions.checkNotNull(conf);
9393
MongoClient mongo = conf.getMongoClient();
94-
MongoDatabase db = mongo.getDatabase(conf.getMongoDBName());
94+
MongoDatabase db = mongo.getDatabase(conf.getRyaInstanceName());
9595
this.inputCollection = db.getCollection(conf.getTriplesCollectionName());
9696
}
9797

‎dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRdfConfigurationTest.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ public void testBuilder() {
6161
assertEquals(conf.getMongoHostname(), "host");
6262
assertEquals(conf.getBoolean(".useMockInstance", false), useMock);
6363
assertEquals(conf.getMongoPort(), "1000");
64-
assertEquals(conf.getMongoDBName(), "dbname");
6564
assertEquals(conf.getRyaInstanceName(), "dbname");
6665
assertEquals(conf.get(MongoDBRdfConfiguration.MONGO_USER), user);
6766
assertEquals(conf.get(MongoDBRdfConfiguration.MONGO_USER_PASSWORD), password);
@@ -90,7 +89,6 @@ public void testBuilderFromProperties() throws FileNotFoundException, IOExceptio
9089
assertEquals(conf.getMongoHostname(), "host");
9190
assertEquals(conf.getBoolean(".useMockInstance", false), useMock);
9291
assertEquals(conf.getMongoPort(), "1000");
93-
assertEquals(conf.getMongoDBName(), "dbname");
9492
assertEquals(conf.getRyaInstanceName(), "dbname");
9593
assertEquals(conf.get(MongoDBRdfConfiguration.MONGO_USER), user);
9694
assertEquals(conf.get(MongoDBRdfConfiguration.MONGO_USER_PASSWORD), password);

‎dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAO2IT.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void testAdd() throws RyaDAOException, MongoException, IOException {
7070
builder.setSubject(new RyaURI("http://subject.com"));
7171
builder.setObject(new RyaURI("http://object.com"));
7272

73-
final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME));
73+
final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.RYA_INSTANCE_NAME));
7474
final MongoCollection<Document> coll = db.getCollection(conf.getTriplesCollectionName());
7575

7676
dao.add(builder.build());
@@ -94,7 +94,7 @@ public void testDelete() throws RyaDAOException, MongoException, IOException {
9494
builder.setObject(new RyaURI("http://object.com"));
9595
final RyaStatement statement = builder.build();
9696

97-
final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME));
97+
final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.RYA_INSTANCE_NAME));
9898
final MongoCollection<Document> coll = db.getCollection(conf.getTriplesCollectionName());
9999

100100
dao.add(statement);
@@ -121,7 +121,7 @@ public void testDeleteWildcardSubjectWithContext() throws RyaDAOException, Mongo
121121
builder.setContext(new RyaURI("http://context.com"));
122122
final RyaStatement statement = builder.build();
123123

124-
final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME));
124+
final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.RYA_INSTANCE_NAME));
125125
final MongoCollection<Document> coll = db.getCollection(conf.getTriplesCollectionName());
126126

127127
dao.add(statement);
@@ -153,7 +153,7 @@ public void testReconstructDao() throws RyaDAOException, IOException {
153153
builder.setObject(new RyaURI("http://object.com"));
154154
builder.setColumnVisibility(new DocumentVisibility("B").flatten());
155155

156-
final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME));
156+
final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.RYA_INSTANCE_NAME));
157157
final MongoCollection<Document> coll = db.getCollection(conf.getTriplesCollectionName());
158158

159159
dao.add(builder.build());
@@ -186,7 +186,7 @@ public void testReconstructDao() throws RyaDAOException, IOException {
186186
builder.setObject(new RyaURI("http://object.com"));
187187
builder.setColumnVisibility(new DocumentVisibility("B").flatten());
188188

189-
final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME));
189+
final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.RYA_INSTANCE_NAME));
190190
final MongoCollection<Document> coll = db.getCollection(conf.getTriplesCollectionName());
191191

192192
dao.add(builder.build());

‎dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAOIT.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public void testAdd() throws RyaDAOException, MongoException, IOException {
7878
builder.setObject(new RyaURI("http://object.com"));
7979
builder.setColumnVisibility(new DocumentVisibility("B").flatten());
8080

81-
final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME));
81+
final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.RYA_INSTANCE_NAME));
8282
final MongoCollection<Document> coll = db.getCollection(conf.getTriplesCollectionName());
8383

8484
dao.add(builder.build());
@@ -106,7 +106,7 @@ public void testDelete() throws RyaDAOException, MongoException, IOException {
106106
builder.setObject(new RyaURI("http://object.com"));
107107
builder.setColumnVisibility(new DocumentVisibility("C").flatten());
108108
final RyaStatement statement = builder.build();
109-
final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME));
109+
final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.RYA_INSTANCE_NAME));
110110
final MongoCollection<Document> coll = db.getCollection(conf.getTriplesCollectionName());
111111

112112
dao.add(statement);
@@ -134,7 +134,7 @@ public void testDeleteWildcardSubjectWithContext() throws RyaDAOException, Mongo
134134
builder.setColumnVisibility(new DocumentVisibility("A&B&C").flatten());
135135
final RyaStatement statement = builder.build();
136136

137-
final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME));
137+
final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.RYA_INSTANCE_NAME));
138138
final MongoCollection<Document> coll = db.getCollection(conf.getTriplesCollectionName());
139139

140140
dao.add(statement);
@@ -166,7 +166,7 @@ public void testReconstructDao() throws RyaDAOException, IOException {
166166
builder.setObject(new RyaURI("http://object.com"));
167167
builder.setColumnVisibility(new DocumentVisibility("B").flatten());
168168

169-
final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME));
169+
final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.RYA_INSTANCE_NAME));
170170
final MongoCollection<Document> coll = db.getCollection(conf.getTriplesCollectionName());
171171

172172
dao.add(builder.build());
@@ -199,7 +199,7 @@ public void testReconstructDao() throws RyaDAOException, IOException {
199199
builder.setObject(new RyaURI("http://object.com"));
200200
builder.setColumnVisibility(new DocumentVisibility("B").flatten());
201201

202-
final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME));
202+
final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.RYA_INSTANCE_NAME));
203203
final MongoCollection<Document> coll = db.getCollection(conf.getTriplesCollectionName());
204204

205205
dao.add(builder.build());
@@ -593,7 +593,7 @@ private boolean testVisibilityStatement(
593593
final MongoDBRyaDAO dao,
594594
final String documentVisibility,
595595
final Authorizations userAuthorizations) throws RyaDAOException {
596-
final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME));
596+
final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.RYA_INSTANCE_NAME));
597597
final MongoCollection<Document> coll = db.getCollection(conf.getTriplesCollectionName());
598598

599599
final RyaStatement statement = buildVisibilityTestRyaStatement(documentVisibility);

‎dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoITBase.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ public void setupTest() throws Exception {
4343
final MongoDBRdfConfiguration conf = new MongoDBRdfConfiguration( new Configuration() );
4444
conf.setBoolean("sc.useMongo", true);
4545
conf.setTablePrefix("test_");
46-
conf.setMongoDBName(conf.getRyaInstanceName());
4746
conf.setMongoHostname(EmbeddedMongoSingleton.getMongodConfig().net().getServerAddress().getHostAddress());
4847
conf.setMongoPort(Integer.toString(EmbeddedMongoSingleton.getMongodConfig().net().getPort()));
4948

@@ -82,13 +81,13 @@ public MongoClient getMongoClient() {
8281
* @return The Rya triples {@link MongoCollection}.
8382
*/
8483
public MongoCollection<Document> getRyaCollection() {
85-
return mongoClient.getDatabase(conf.getMongoDBName()).getCollection(conf.getTriplesCollectionName());
84+
return mongoClient.getDatabase(conf.getRyaInstanceName()).getCollection(conf.getTriplesCollectionName());
8685
}
8786

8887
/**
8988
* @return The Rya triples {@link DBCollection}.
9089
*/
9190
public DBCollection getRyaDbCollection() {
92-
return mongoClient.getDB(conf.getMongoDBName()).getCollection(conf.getTriplesCollectionName());
91+
return mongoClient.getDB(conf.getRyaInstanceName()).getCollection(conf.getTriplesCollectionName());
9392
}
9493
}

‎extras/indexing/src/main/java/org/apache/rya/api/client/mongo/MongoConnectionDetails.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ public MongoDBRdfConfiguration build(final String ryaInstanceName) {
102102
conf.setBoolean(ConfigUtils.USE_MONGO, true);
103103
conf.setMongoHostname(hostname);
104104
conf.setMongoPort("" + port);
105-
conf.setMongoDBName(ryaInstanceName);
106105
conf.setRyaInstanceName(ryaInstanceName);
107106
if(username.isPresent()) {
108107
conf.setMongoUser(username.get());

0 commit comments

Comments
 (0)