Skip to content

Commit d38e26a

Browse files
committed
Minor refactoring code cleanup
1 parent 59c2f2f commit d38e26a

File tree

2 files changed

+20
-37
lines changed

2 files changed

+20
-37
lines changed

engine/src/main/java/com/arcadedb/query/QueryEngineManager.java

Lines changed: 12 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -16,44 +16,30 @@
1616
package com.arcadedb.query;
1717

1818
import com.arcadedb.database.DatabaseInternal;
19+
import com.arcadedb.log.LogManager;
1920
import com.arcadedb.query.sql.SQLQueryEngine;
2021

2122
import java.util.*;
23+
import java.util.logging.*;
2224

2325
public class QueryEngineManager {
2426
private final Map<String, QueryEngine.QueryEngineFactory> implementations = new HashMap<>();
2527

2628
public QueryEngineManager() {
27-
29+
// REGISTER QUERY ENGINES IF AVAILABLE ON CLASSPATH AT RUN-TIME
2830
register(new SQLQueryEngine.SQLQueryEngineFactory());
29-
try {
30-
QueryEngine.QueryEngineFactory engineFactory = (QueryEngine.QueryEngineFactory) Class.forName("com.arcadedb.gremlin.query.GremlinQueryEngineFactory")
31-
.getConstructor().newInstance();
32-
register(engineFactory);
33-
} catch (Exception e) {
34-
// LogManager.instance().log(this, Level.SEVERE, "Unable to register engine", e);
35-
}
36-
try {
37-
QueryEngine.QueryEngineFactory engineFactory = (QueryEngine.QueryEngineFactory) Class.forName("com.arcadedb.gremlin.query.CypherQueryEngineFactory")
38-
.getConstructor().newInstance();
39-
register(engineFactory);
40-
} catch (Exception e) {
41-
// LogManager.instance().log(this, Level.SEVERE, "Unable to register engine", e);
42-
}
43-
try {
44-
QueryEngine.QueryEngineFactory engineFactory = (QueryEngine.QueryEngineFactory) Class.forName("com.arcadedb.mongo.query.MongoQueryEngineFactory")
45-
.getConstructor().newInstance();
46-
register(engineFactory);
47-
} catch (Exception e) {
48-
// LogManager.instance().log(this, Level.SEVERE, "Unable to register engine", e);
49-
}
5031

32+
register("com.arcadedb.gremlin.query.GremlinQueryEngineFactory");
33+
register("com.arcadedb.gremlin.query.CypherQueryEngineFactory");
34+
register("com.arcadedb.mongo.query.MongoQueryEngineFactory");
35+
register("com.arcadedb.graphql.query.GraphQLQueryEngineFactory");
36+
}
37+
38+
public void register(final String className) {
5139
try {
52-
QueryEngine.QueryEngineFactory engineFactory = (QueryEngine.QueryEngineFactory) Class.forName("com.arcadedb.graphql.query.GraphQLQueryEngineFactory")
53-
.getConstructor().newInstance();
54-
register(engineFactory);
40+
register((QueryEngine.QueryEngineFactory) Class.forName(className).getConstructor().newInstance());
5541
} catch (Exception e) {
56-
// LogManager.instance().log(this, Level.SEVERE, "Unable to register engine", e);
42+
LogManager.instance().log(this, Level.FINE, "Unable to register engine '%s' (%s)", className, e.getMessage());
5743
}
5844
}
5945

engine/src/test/java/com/arcadedb/index/LSMTreeIndexTest.java

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1055,17 +1055,14 @@ public void run() {
10551055

10561056
LogManager.instance().log(this, Level.INFO, "COUNT OF INSERTED RECORDS (ORDERED BY ID)");
10571057
final Map<Integer, Integer> result = new HashMap<>();
1058-
database.scanType(TYPE_NAME, true, new DocumentCallback() {
1059-
@Override
1060-
public boolean onRecord(Document record) {
1061-
final int id = (int) record.get("id");
1062-
Integer key = result.get(id);
1063-
if (key == null)
1064-
result.put(id, 1);
1065-
else
1066-
result.put(id, key + 1);
1067-
return true;
1068-
}
1058+
database.scanType(TYPE_NAME, true, record -> {
1059+
final int id = (int) record.get("id");
1060+
Integer key = result.get(id);
1061+
if (key == null)
1062+
result.put(id, 1);
1063+
else
1064+
result.put(id, key + 1);
1065+
return true;
10691066
});
10701067

10711068
LogManager.instance().log(this, Level.INFO, "FOUND %d ENTRIES", null, result.size());

0 commit comments

Comments
 (0)