RYA-104 Code review.
Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/ed82a6ff Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/ed82a6ff Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/ed82a6ff Branch: refs/heads/master Commit: ed82a6ff4031259682dfa73b32923d1cf0a8f589 Parents: 00800b6 Author: kchilton2 <kevin.e.chil...@gmail.com> Authored: Fri Jan 5 16:58:23 2018 -0500 Committer: kchilton2 <kevin.e.chil...@gmail.com> Committed: Fri Jan 5 16:58:23 2018 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/rya/api/client/RyaClient.java | 6 +++--- .../apache/rya/api/client/mongo/MongoConnectionDetails.java | 2 +- .../java/org/apache/rya/api/client/mongo/MongoUninstall.java | 1 + extras/rya.pcj.fluo/pom.xml | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ed82a6ff/common/rya.api/src/main/java/org/apache/rya/api/client/RyaClient.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/RyaClient.java b/common/rya.api/src/main/java/org/apache/rya/api/client/RyaClient.java index de0b542..a14e300 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/client/RyaClient.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/client/RyaClient.java @@ -83,9 +83,9 @@ public class RyaClient { this.addUser = requireNonNull(addUser); this.removeUser = requireNonNull(removeUser); this.uninstall = requireNonNull(uninstall); - this.loadStatements = loadStatements; - this.loadStatementsFile = loadStatementsFile; - this.executeSparqlQuery = executeSparqlQuery; + this.loadStatements = requireNonNull(loadStatements); + this.loadStatementsFile = requireNonNull(loadStatementsFile); + this.executeSparqlQuery = requireNonNull(executeSparqlQuery); } /** http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ed82a6ff/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 acce15f..192ea20 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 @@ -112,7 +112,7 @@ public class MongoConnectionDetails { conf.setMongoPassword( new String(password.get()) ); } - // Default to having a table prefix of "rya", otherwise the app doesn't work for some reason. + // Default to having a table prefix of "rya", otherwise the app doesn't work. Remove this in RYA-135. conf.setTablePrefix("rya"); return conf; } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ed82a6ff/extras/indexing/src/main/java/org/apache/rya/api/client/mongo/MongoUninstall.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/api/client/mongo/MongoUninstall.java b/extras/indexing/src/main/java/org/apache/rya/api/client/mongo/MongoUninstall.java index a6fbb4c..c450077 100644 --- a/extras/indexing/src/main/java/org/apache/rya/api/client/mongo/MongoUninstall.java +++ b/extras/indexing/src/main/java/org/apache/rya/api/client/mongo/MongoUninstall.java @@ -53,6 +53,7 @@ public class MongoUninstall implements Uninstall { @Override public void uninstall(final String ryaInstanceName) throws InstanceDoesNotExistException, RyaClientException { + requireNonNull(ryaInstanceName); try { if (!instanceExists.exists(ryaInstanceName)) { throw new InstanceDoesNotExistException("The database '" + ryaInstanceName + "' does not exist."); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ed82a6ff/extras/rya.pcj.fluo/pom.xml ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pom.xml b/extras/rya.pcj.fluo/pom.xml index 3cae897..b6f5403 100644 --- a/extras/rya.pcj.fluo/pom.xml +++ b/extras/rya.pcj.fluo/pom.xml @@ -37,7 +37,7 @@ <module>pcj.fluo.api</module> <module>pcj.fluo.app</module> <module>pcj.fluo.client</module> - <!--<module>pcj.fluo.integration</module>--> + <module>pcj.fluo.integration</module> <module>pcj.fluo.test.base</module> <module>pcj.fluo.demo</module> </modules>