You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rya.apache.org by mi...@apache.org on 2016/10/20 21:54:16 UTC
[1/5] incubator-rya git commit: RYA-174 Adding Mongo Random Port and
Cleanup in Test
Repository: incubator-rya
Updated Branches:
refs/heads/master ef5e2bc15 -> c06c1073c
RYA-174 Adding Mongo Random Port and Cleanup in Test
Closes #117
Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/f3b1680b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/f3b1680b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/f3b1680b
Branch: refs/heads/master
Commit: f3b1680b4a98ae4712c21d6c17f4a62b11ba5b8e
Parents: ef5e2bc
Author: Aaron Mihalik <mi...@alum.mit.edu>
Authored: Wed Oct 19 19:34:04 2016 -0400
Committer: Aaron Mihalik <aa...@gmail.com>
Committed: Thu Oct 20 17:52:17 2016 -0400
----------------------------------------------------------------------
dao/mongodb.rya/pom.xml | 14 ++-
.../rya/mongodb/MongoDBQueryEngineTest.java | 12 +-
.../org/apache/rya/mongodb/MongoDBRyaDAOIT.java | 20 +---
.../apache/rya/mongodb/MongoDBRyaDAOTest.java | 21 ++--
.../apache/rya/mongodb/MongoRyaTestBase.java | 118 +++++++++++++++++++
.../instance/MongoRyaDetailsRepositoryIT.java | 48 ++------
extras/indexing/pom.xml | 9 +-
.../mongo/MongoFreeTextIndexerTest.java | 35 +++---
.../mongo/MongoTemporalIndexerTest.java | 25 ++--
extras/rya.geoindexing/pom.xml | 8 +-
.../indexing/mongo/MongoGeoIndexerSfTest.java | 26 ++--
.../rya/indexing/mongo/MongoGeoIndexerTest.java | 22 ++--
12 files changed, 219 insertions(+), 139 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/f3b1680b/dao/mongodb.rya/pom.xml
----------------------------------------------------------------------
diff --git a/dao/mongodb.rya/pom.xml b/dao/mongodb.rya/pom.xml
index 40554c0..1b04d23 100644
--- a/dao/mongodb.rya/pom.xml
+++ b/dao/mongodb.rya/pom.xml
@@ -32,9 +32,21 @@ under the License.
<build>
<plugins>
<plugin>
+ <!-- generate the test jar as well so it can be reused by dependent tools.
+ TODO this is messy. in the future, classes that provide this functionality
+ should be decoupled into reusable frameworks. -->
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.19.1</version>
<executions>
<execution>
<goals>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/f3b1680b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBQueryEngineTest.java
----------------------------------------------------------------------
diff --git a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBQueryEngineTest.java b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBQueryEngineTest.java
index ebfb1ff..c6baf1f 100644
--- a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBQueryEngineTest.java
+++ b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBQueryEngineTest.java
@@ -23,14 +23,12 @@ import java.util.Collection;
import java.util.Map;
import java.util.Map.Entry;
-import info.aduna.iteration.CloseableIteration;
+import org.apache.hadoop.conf.Configuration;
import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
import org.apache.rya.api.RdfCloudTripleStoreUtils;
import org.apache.rya.api.domain.RyaStatement;
import org.apache.rya.api.domain.RyaStatement.RyaStatementBuilder;
import org.apache.rya.api.domain.RyaURI;
-
-import org.apache.hadoop.conf.Configuration;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -39,12 +37,10 @@ import org.openrdf.query.BindingSet;
import org.openrdf.query.impl.MapBindingSet;
import com.google.common.collect.Lists;
-import com.mongodb.MongoClient;
-import de.flapdoodle.embed.mongo.distribution.Version;
-import de.flapdoodle.embed.mongo.tests.MongodForTestsFactory;
+import info.aduna.iteration.CloseableIteration;
-public class MongoDBQueryEngineTest {
+public class MongoDBQueryEngineTest extends MongoRyaTestBase {
// private dao;
// private configuration;
@@ -55,14 +51,12 @@ public class MongoDBQueryEngineTest {
@Before
public void setUp() throws Exception {
// Set up Mongo/Rya
- MongodForTestsFactory testsFactory = MongodForTestsFactory.with(Version.Main.PRODUCTION);
Configuration conf = new Configuration();
conf.set(MongoDBRdfConfiguration.USE_TEST_MONGO, "true");
conf.set(MongoDBRdfConfiguration.MONGO_DB_NAME, "test");
conf.set(MongoDBRdfConfiguration.MONGO_COLLECTION_PREFIX, "rya_");
conf.set(RdfCloudTripleStoreConfiguration.CONF_TBL_PREFIX, "rya_");
configuration = new MongoDBRdfConfiguration(conf);
- MongoClient mongoClient = testsFactory.newMongo();
int port = mongoClient.getServerAddressList().get(0).getPort();
configuration.set(MongoDBRdfConfiguration.MONGO_INSTANCE_PORT, Integer.toString(port));
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/f3b1680b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAOIT.java
----------------------------------------------------------------------
diff --git a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAOIT.java b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAOIT.java
index 59904db..b48f1eb 100644
--- a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAOIT.java
+++ b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAOIT.java
@@ -25,40 +25,32 @@ import static org.junit.Assert.assertTrue;
import java.io.IOException;
import org.apache.hadoop.conf.Configuration;
+import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
+import org.apache.rya.api.domain.RyaStatement;
+import org.apache.rya.api.domain.RyaStatement.RyaStatementBuilder;
+import org.apache.rya.api.domain.RyaURI;
+import org.apache.rya.api.persist.RyaDAOException;
import org.junit.Before;
import org.junit.Test;
import com.mongodb.DB;
import com.mongodb.DBCollection;
import com.mongodb.DBObject;
-import com.mongodb.MongoClient;
import com.mongodb.MongoException;
-import de.flapdoodle.embed.mongo.distribution.Version;
-import de.flapdoodle.embed.mongo.tests.MongodForTestsFactory;
-import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
-import org.apache.rya.api.domain.RyaStatement;
-import org.apache.rya.api.domain.RyaStatement.RyaStatementBuilder;
-import org.apache.rya.api.domain.RyaURI;
-import org.apache.rya.api.persist.RyaDAOException;
-
-public class MongoDBRyaDAOIT {
+public class MongoDBRyaDAOIT extends MongoRyaTestBase {
- private MongodForTestsFactory testsFactory;
private MongoDBRyaDAO dao;
private MongoDBRdfConfiguration configuration;
- private MongoClient mongoClient;
@Before
public void setUp() throws IOException, RyaDAOException{
- testsFactory = MongodForTestsFactory.with(Version.Main.PRODUCTION);
final Configuration conf = new Configuration();
conf.set(MongoDBRdfConfiguration.USE_TEST_MONGO, "true");
conf.set(MongoDBRdfConfiguration.MONGO_DB_NAME, "test");
conf.set(MongoDBRdfConfiguration.MONGO_COLLECTION_PREFIX, "rya_");
conf.set(RdfCloudTripleStoreConfiguration.CONF_TBL_PREFIX, "rya_");
configuration = new MongoDBRdfConfiguration(conf);
- mongoClient = testsFactory.newMongo();
final int port = mongoClient.getServerAddressList().get(0).getPort();
configuration.set(MongoDBRdfConfiguration.MONGO_INSTANCE_PORT, Integer.toString(port));
dao = new MongoDBRyaDAO(configuration, mongoClient);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/f3b1680b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAOTest.java
----------------------------------------------------------------------
diff --git a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAOTest.java b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAOTest.java
index f9fdb04..5b19d5a 100644
--- a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAOTest.java
+++ b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAOTest.java
@@ -23,44 +23,37 @@ import static org.junit.Assert.assertEquals;
import java.io.IOException;
import org.apache.hadoop.conf.Configuration;
+import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
+import org.apache.rya.api.domain.RyaStatement;
+import org.apache.rya.api.domain.RyaStatement.RyaStatementBuilder;
+import org.apache.rya.api.domain.RyaURI;
+import org.apache.rya.api.persist.RyaDAOException;
import org.junit.Before;
import org.junit.Test;
import com.mongodb.DB;
import com.mongodb.DBCollection;
-import com.mongodb.MongoClient;
import com.mongodb.MongoException;
-import de.flapdoodle.embed.mongo.distribution.Version;
-import de.flapdoodle.embed.mongo.tests.MongodForTestsFactory;
-import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
-import org.apache.rya.api.domain.RyaStatement;
-import org.apache.rya.api.domain.RyaStatement.RyaStatementBuilder;
-import org.apache.rya.api.domain.RyaURI;
-import org.apache.rya.api.persist.RyaDAOException;
-
-public class MongoDBRyaDAOTest {
+public class MongoDBRyaDAOTest extends MongoRyaTestBase {
- private MongodForTestsFactory testsFactory;
private MongoDBRyaDAO dao;
private MongoDBRdfConfiguration configuration;
- private MongoClient mongoClient;
@Before
public void setUp() throws IOException, RyaDAOException{
- testsFactory = MongodForTestsFactory.with(Version.Main.PRODUCTION);
final Configuration conf = new Configuration();
conf.set(MongoDBRdfConfiguration.USE_TEST_MONGO, "true");
conf.set(MongoDBRdfConfiguration.MONGO_DB_NAME, "test");
conf.set(MongoDBRdfConfiguration.MONGO_COLLECTION_PREFIX, "rya_");
conf.set(RdfCloudTripleStoreConfiguration.CONF_TBL_PREFIX, "rya_");
configuration = new MongoDBRdfConfiguration(conf);
- mongoClient = testsFactory.newMongo();
final int port = mongoClient.getServerAddressList().get(0).getPort();
configuration.set(MongoDBRdfConfiguration.MONGO_INSTANCE_PORT, ""+port);
dao = new MongoDBRyaDAO(configuration, mongoClient);
}
+
@Test
public void testDeleteWildcard() throws RyaDAOException {
final RyaStatementBuilder builder = new RyaStatementBuilder();
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/f3b1680b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoRyaTestBase.java
----------------------------------------------------------------------
diff --git a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoRyaTestBase.java b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoRyaTestBase.java
new file mode 100644
index 0000000..340d5ae
--- /dev/null
+++ b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoRyaTestBase.java
@@ -0,0 +1,118 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.rya.mongodb;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.UnknownHostException;
+
+import org.apache.rya.api.persist.RyaDAOException;
+import org.junit.After;
+import org.junit.Before;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.mongodb.MongoClient;
+import com.mongodb.MongoException;
+import com.mongodb.ServerAddress;
+
+import de.flapdoodle.embed.mongo.Command;
+import de.flapdoodle.embed.mongo.MongodExecutable;
+import de.flapdoodle.embed.mongo.MongodProcess;
+import de.flapdoodle.embed.mongo.MongodStarter;
+import de.flapdoodle.embed.mongo.config.IMongodConfig;
+import de.flapdoodle.embed.mongo.config.MongodConfigBuilder;
+import de.flapdoodle.embed.mongo.config.Net;
+import de.flapdoodle.embed.mongo.config.RuntimeConfigBuilder;
+import de.flapdoodle.embed.mongo.distribution.IFeatureAwareVersion;
+import de.flapdoodle.embed.mongo.distribution.Version;
+
+public class MongoRyaTestBase {
+
+ protected RyaMongodForTestsFactory testsFactory;
+ protected MongoClient mongoClient;
+
+ @Before
+ public void MongoRyaTestBaseSetUp() throws IOException, RyaDAOException {
+ testsFactory = RyaMongodForTestsFactory.with(Version.Main.PRODUCTION);
+ mongoClient = testsFactory.newMongo();
+ }
+
+ @After
+ public void MongoRyaTestBaseAfter() throws Exception {
+ if (mongoClient != null) {
+ mongoClient.close();
+ }
+ if (testsFactory != null) {
+ testsFactory.shutdown();
+ }
+ }
+
+ private static class RyaMongodForTestsFactory {
+ private static Logger logger = LoggerFactory.getLogger(RyaMongodForTestsFactory.class.getName());
+
+ public static RyaMongodForTestsFactory with(final IFeatureAwareVersion version) throws IOException {
+ return new RyaMongodForTestsFactory(version);
+ }
+
+ private final MongodExecutable mongodExecutable;
+ private final MongodProcess mongodProcess;
+
+ /**
+ * Create the testing utility using the specified version of MongoDB.
+ *
+ * @param version
+ * version of MongoDB.
+ */
+ private RyaMongodForTestsFactory(final IFeatureAwareVersion version) throws IOException {
+ final MongodStarter runtime = MongodStarter.getInstance(new RuntimeConfigBuilder().defaultsWithLogger(Command.MongoD, logger).build());
+ mongodExecutable = runtime.prepare(newMongodConfig(version));
+ mongodProcess = mongodExecutable.start();
+ }
+
+ private IMongodConfig newMongodConfig(final IFeatureAwareVersion version) throws UnknownHostException, IOException {
+ Net net = new Net(findRandomOpenPortOnAllLocalInterfaces(), false);
+ return new MongodConfigBuilder().version(version).net(net).build();
+ }
+
+ private int findRandomOpenPortOnAllLocalInterfaces() throws IOException {
+ try (ServerSocket socket = new ServerSocket(0);) {
+ return socket.getLocalPort();
+ }
+ }
+
+ /**
+ * Creates a new Mongo connection.
+ *
+ * @throws MongoException
+ * @throws UnknownHostException
+ */
+ private MongoClient newMongo() throws UnknownHostException, MongoException {
+ return new MongoClient(new ServerAddress(mongodProcess.getConfig().net().getServerAddress(), mongodProcess.getConfig().net().getPort()));
+ }
+
+ /**
+ * Cleans up the resources created by the utility.
+ */
+ public void shutdown() {
+ mongodProcess.stop();
+ mongodExecutable.stop();
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/f3b1680b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/instance/MongoRyaDetailsRepositoryIT.java
----------------------------------------------------------------------
diff --git a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/instance/MongoRyaDetailsRepositoryIT.java b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/instance/MongoRyaDetailsRepositoryIT.java
index 9cb8917..86a8965 100644
--- a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/instance/MongoRyaDetailsRepositoryIT.java
+++ b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/instance/MongoRyaDetailsRepositoryIT.java
@@ -23,19 +23,8 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import java.io.IOException;
import java.util.Date;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import com.google.common.base.Optional;
-import com.mongodb.MongoClient;
-import com.mongodb.MongoException;
-
-import de.flapdoodle.embed.mongo.tests.MongodForTestsFactory;
import org.apache.rya.api.instance.RyaDetails;
import org.apache.rya.api.instance.RyaDetails.EntityCentricIndexDetails;
import org.apache.rya.api.instance.RyaDetails.FreeTextIndexDetails;
@@ -52,29 +41,16 @@ import org.apache.rya.api.instance.RyaDetailsRepository.AlreadyInitializedExcept
import org.apache.rya.api.instance.RyaDetailsRepository.ConcurrentUpdateException;
import org.apache.rya.api.instance.RyaDetailsRepository.NotInitializedException;
import org.apache.rya.api.instance.RyaDetailsRepository.RyaDetailsRepositoryException;
+import org.apache.rya.mongodb.MongoRyaTestBase;
+import org.junit.Test;
+
+import com.google.common.base.Optional;
/**
* Tests the methods of {@link AccumuloRyaDetailsRepository} by using a {@link MiniAccumuloCluster}.
*/
-public class MongoRyaDetailsRepositoryIT {
+public class MongoRyaDetailsRepositoryIT extends MongoRyaTestBase {
- private static MongoClient client = null;
-
- @BeforeClass
- public static void startMiniAccumulo() throws MongoException, IOException {
- final MongodForTestsFactory mongoFactory = new MongodForTestsFactory();
- client = mongoFactory.newMongo();
- }
-
- @Before
- public void clearLastTest() {
- client.dropDatabase("testInstance");
- }
-
- @AfterClass
- public static void stopMiniAccumulo() throws IOException, InterruptedException {
- client.close();
- }
@Test
public void initializeAndGet() throws AlreadyInitializedException, RyaDetailsRepositoryException {
@@ -105,7 +81,7 @@ public class MongoRyaDetailsRepositoryIT {
.build();
// Setup the repository that will be tested using a mock instance of MongoDB.
- final RyaDetailsRepository repo = new MongoRyaInstanceDetailsRepository(client, instanceName);
+ final RyaDetailsRepository repo = new MongoRyaInstanceDetailsRepository(mongoClient, instanceName);
// Initialize the repository
repo.initialize(details);
@@ -146,7 +122,7 @@ public class MongoRyaDetailsRepositoryIT {
.build();
// Setup the repository that will be tested using a mock instance of MongoDB.
- final RyaDetailsRepository repo = new MongoRyaInstanceDetailsRepository(client, instanceName);
+ final RyaDetailsRepository repo = new MongoRyaInstanceDetailsRepository(mongoClient, instanceName);
// Initialize the repository
repo.initialize(details);
@@ -158,7 +134,7 @@ public class MongoRyaDetailsRepositoryIT {
@Test(expected = NotInitializedException.class)
public void getRyaInstance_notInitialized() throws NotInitializedException, RyaDetailsRepositoryException {
// Setup the repository that will be tested using a mock instance of Accumulo.
- final RyaDetailsRepository repo = new MongoRyaInstanceDetailsRepository(client, "testInstance");
+ final RyaDetailsRepository repo = new MongoRyaInstanceDetailsRepository(mongoClient, "testInstance");
// Try to fetch the details from the uninitialized repository.
repo.getRyaInstanceDetails();
@@ -193,7 +169,7 @@ public class MongoRyaDetailsRepositoryIT {
.build();
// Setup the repository that will be tested using a mock instance of MongoDB.
- final RyaDetailsRepository repo = new MongoRyaInstanceDetailsRepository(client, "testInstance");
+ final RyaDetailsRepository repo = new MongoRyaInstanceDetailsRepository(mongoClient, "testInstance");
// Initialize the repository
repo.initialize(details);
@@ -205,7 +181,7 @@ public class MongoRyaDetailsRepositoryIT {
@Test
public void isInitialized_false() throws RyaDetailsRepositoryException {
// Setup the repository that will be tested using a mock instance of MongoDB.
- final RyaDetailsRepository repo = new MongoRyaInstanceDetailsRepository(client, "testInstance");
+ final RyaDetailsRepository repo = new MongoRyaInstanceDetailsRepository(mongoClient, "testInstance");
// Ensure the repository reports that is has not been initialized.
assertFalse( repo.isInitialized() );
@@ -240,7 +216,7 @@ public class MongoRyaDetailsRepositoryIT {
.build();
// Setup the repository that will be tested using a mock instance of MongoDB.
- final RyaDetailsRepository repo = new MongoRyaInstanceDetailsRepository(client, "testInstance");
+ final RyaDetailsRepository repo = new MongoRyaInstanceDetailsRepository(mongoClient, "testInstance");
// Initialize the repository
repo.initialize(details);
@@ -287,7 +263,7 @@ public class MongoRyaDetailsRepositoryIT {
.build();
// Setup the repository that will be tested using a mock instance of MongoDB.
- final RyaDetailsRepository repo = new MongoRyaInstanceDetailsRepository(client, "testInstance");
+ final RyaDetailsRepository repo = new MongoRyaInstanceDetailsRepository(mongoClient, "testInstance");
// Initialize the repository
repo.initialize(details);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/f3b1680b/extras/indexing/pom.xml
----------------------------------------------------------------------
diff --git a/extras/indexing/pom.xml b/extras/indexing/pom.xml
index 32cdb10..650c9f7 100644
--- a/extras/indexing/pom.xml
+++ b/extras/indexing/pom.xml
@@ -32,7 +32,6 @@
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-minicluster</artifactId>
- <version>${accumulo.version}</version>
<scope>test</scope>
</dependency>
@@ -104,6 +103,14 @@
<groupId>org.apache.rya</groupId>
<artifactId>accumulo.rya</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rya</groupId>
+ <artifactId>mongodb.rya</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
<type>test-jar</type>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/f3b1680b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoFreeTextIndexerTest.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoFreeTextIndexerTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoFreeTextIndexerTest.java
index 0dac019..637610d 100644
--- a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoFreeTextIndexerTest.java
+++ b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoFreeTextIndexerTest.java
@@ -21,6 +21,17 @@ package org.apache.rya.indexing.mongo;
import java.util.HashSet;
import java.util.Set;
+import org.apache.rya.accumulo.AccumuloRdfConfiguration;
+import org.apache.rya.api.domain.RyaStatement;
+import org.apache.rya.api.domain.RyaType;
+import org.apache.rya.api.domain.RyaURI;
+import org.apache.rya.api.resolver.RdfToRyaConversions;
+import org.apache.rya.api.resolver.RyaToRdfConversions;
+import org.apache.rya.indexing.StatementConstraints;
+import org.apache.rya.indexing.accumulo.ConfigUtils;
+import org.apache.rya.indexing.mongodb.freetext.MongoFreeTextIndexer;
+import org.apache.rya.mongodb.MongoDBRdfConfiguration;
+import org.apache.rya.mongodb.MongoRyaTestBase;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -33,27 +44,13 @@ import org.openrdf.model.impl.ValueFactoryImpl;
import org.openrdf.model.vocabulary.RDFS;
import com.google.common.collect.Sets;
-import com.mongodb.MongoClient;
-import de.flapdoodle.embed.mongo.distribution.Version;
-import de.flapdoodle.embed.mongo.tests.MongodForTestsFactory;
import info.aduna.iteration.CloseableIteration;
-import org.apache.rya.accumulo.AccumuloRdfConfiguration;
-import org.apache.rya.api.domain.RyaStatement;
-import org.apache.rya.api.domain.RyaType;
-import org.apache.rya.api.domain.RyaURI;
-import org.apache.rya.api.resolver.RdfToRyaConversions;
-import org.apache.rya.api.resolver.RyaToRdfConversions;
-import org.apache.rya.indexing.StatementConstraints;
-import org.apache.rya.indexing.accumulo.ConfigUtils;
-import org.apache.rya.indexing.mongodb.freetext.MongoFreeTextIndexer;
-import org.apache.rya.mongodb.MongoDBRdfConfiguration;
-public class MongoFreeTextIndexerTest {
+public class MongoFreeTextIndexerTest extends MongoRyaTestBase {
private static final StatementConstraints EMPTY_CONSTRAINTS = new StatementConstraints();
AccumuloRdfConfiguration conf;
- MongoClient mongoClient;
@Before
public void before() throws Exception {
@@ -63,11 +60,9 @@ public class MongoFreeTextIndexerTest {
conf.set(MongoDBRdfConfiguration.MONGO_DB_NAME, "test");
conf.set(MongoDBRdfConfiguration.MONGO_COLLECTION_PREFIX, "rya_");
conf.setTablePrefix("another_");
- final MongodForTestsFactory testsFactory = MongodForTestsFactory.with(Version.Main.PRODUCTION);
- mongoClient = testsFactory.newMongo();
- }
-
- @Test
+ }
+
+ @Test
public void testSearch() throws Exception {
try (MongoFreeTextIndexer f = new MongoFreeTextIndexer()) {
f.initIndexer(conf, mongoClient);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/f3b1680b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoTemporalIndexerTest.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoTemporalIndexerTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoTemporalIndexerTest.java
index 7b65c73..9e81c90 100644
--- a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoTemporalIndexerTest.java
+++ b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoTemporalIndexerTest.java
@@ -29,9 +29,17 @@ import java.io.IOException;
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
import java.util.HashSet;
+
import org.apache.accumulo.core.client.TableExistsException;
import org.apache.accumulo.core.client.TableNotFoundException;
-import org.apache.hadoop.conf.Configuration;
+import org.apache.rya.indexing.StatementConstraints;
+import org.apache.rya.indexing.TemporalInstant;
+import org.apache.rya.indexing.TemporalInstantRfc3339;
+import org.apache.rya.indexing.TemporalInterval;
+import org.apache.rya.indexing.accumulo.ConfigUtils;
+import org.apache.rya.indexing.mongodb.temporal.MongoTemporalIndexer;
+import org.apache.rya.mongodb.MongoDBRdfConfiguration;
+import org.apache.rya.mongodb.MongoRyaTestBase;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
@@ -48,19 +56,10 @@ import com.mongodb.DB;
import com.mongodb.DBCollection;
import com.mongodb.DBCursor;
import com.mongodb.DBObject;
-import com.mongodb.MongoClient;
import com.mongodb.MongoException;
+import com.mongodb.MongoSecurityException;
-import de.flapdoodle.embed.mongo.distribution.Version;
-import de.flapdoodle.embed.mongo.tests.MongodForTestsFactory;
import info.aduna.iteration.CloseableIteration;
-import org.apache.rya.indexing.StatementConstraints;
-import org.apache.rya.indexing.TemporalInstant;
-import org.apache.rya.indexing.TemporalInstantRfc3339;
-import org.apache.rya.indexing.TemporalInterval;
-import org.apache.rya.indexing.accumulo.ConfigUtils;
-import org.apache.rya.indexing.mongodb.temporal.MongoTemporalIndexer;
-import org.apache.rya.mongodb.MongoDBRdfConfiguration;
/**
* JUnit tests for TemporalIndexer and it's implementation MongoTemporalIndexer
@@ -82,7 +81,7 @@ import org.apache.rya.mongodb.MongoDBRdfConfiguration;
* And a few more.
*
*/
-public final class MongoTemporalIndexerTest {
+public final class MongoTemporalIndexerTest extends MongoRyaTestBase {
MongoDBRdfConfiguration conf;
MongoTemporalIndexer tIndexer;
DBCollection collection;
@@ -190,8 +189,6 @@ public final class MongoTemporalIndexerTest {
+ URI_PROPERTY_CIRCA + ","
+ URI_PROPERTY_EVENT_TIME);
- final MongodForTestsFactory testsFactory = MongodForTestsFactory.with(Version.Main.PRODUCTION);
- final MongoClient mongoClient = testsFactory.newMongo();
tIndexer = new MongoTemporalIndexer();
tIndexer.initIndexer(conf, mongoClient);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/f3b1680b/extras/rya.geoindexing/pom.xml
----------------------------------------------------------------------
diff --git a/extras/rya.geoindexing/pom.xml b/extras/rya.geoindexing/pom.xml
index 1c2040a..9221026 100644
--- a/extras/rya.geoindexing/pom.xml
+++ b/extras/rya.geoindexing/pom.xml
@@ -40,7 +40,6 @@
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-minicluster</artifactId>
- <version>${accumulo.version}</version>
<scope>test</scope>
</dependency>
@@ -110,6 +109,13 @@
<type>test-jar</type>
</dependency>
<dependency>
+ <groupId>org.apache.rya</groupId>
+ <artifactId>mongodb.rya</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
<groupId>org.geotools.xsd</groupId>
<artifactId>gt-xsd-gml3</artifactId>
<version>${geotools.version}</version>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/f3b1680b/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerSfTest.java
----------------------------------------------------------------------
diff --git a/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerSfTest.java b/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerSfTest.java
index df4b4a1..057b6c7 100644
--- a/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerSfTest.java
+++ b/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerSfTest.java
@@ -23,6 +23,16 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
+import org.apache.rya.api.domain.RyaStatement;
+import org.apache.rya.api.resolver.RdfToRyaConversions;
+import org.apache.rya.api.resolver.RyaToRdfConversions;
+import org.apache.rya.indexing.GeoConstants;
+import org.apache.rya.indexing.OptionalConfigUtils;
+import org.apache.rya.indexing.StatementConstraints;
+import org.apache.rya.indexing.accumulo.ConfigUtils;
+import org.apache.rya.indexing.mongodb.geo.MongoGeoIndexer;
+import org.apache.rya.mongodb.MongoDBRdfConfiguration;
+import org.apache.rya.mongodb.MongoRyaTestBase;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -36,7 +46,6 @@ import org.openrdf.model.impl.ValueFactoryImpl;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
-import com.mongodb.MongoClient;
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.Geometry;
import com.vividsolutions.jts.geom.GeometryFactory;
@@ -47,23 +56,12 @@ import com.vividsolutions.jts.geom.Polygon;
import com.vividsolutions.jts.geom.PrecisionModel;
import com.vividsolutions.jts.geom.impl.PackedCoordinateSequence;
-import de.flapdoodle.embed.mongo.distribution.Version;
-import de.flapdoodle.embed.mongo.tests.MongodForTestsFactory;
import info.aduna.iteration.CloseableIteration;
-import org.apache.rya.api.domain.RyaStatement;
-import org.apache.rya.api.resolver.RdfToRyaConversions;
-import org.apache.rya.api.resolver.RyaToRdfConversions;
-import org.apache.rya.indexing.GeoConstants;
-import org.apache.rya.indexing.OptionalConfigUtils;
-import org.apache.rya.indexing.StatementConstraints;
-import org.apache.rya.indexing.accumulo.ConfigUtils;
-import org.apache.rya.indexing.mongodb.geo.MongoGeoIndexer;
-import org.apache.rya.mongodb.MongoDBRdfConfiguration;
/**
* Tests all of the "simple functions" of the geoindexer.
*/
-public class MongoGeoIndexerSfTest {
+public class MongoGeoIndexerSfTest extends MongoRyaTestBase {
private MongoDBRdfConfiguration conf;
private static GeometryFactory gf = new GeometryFactory(new PrecisionModel(), 4326);
private static MongoGeoIndexer g;
@@ -118,8 +116,6 @@ public class MongoGeoIndexerSfTest {
conf.set(OptionalConfigUtils.USE_GEO, "true");
conf.setTablePrefix("rya_");
- final MongodForTestsFactory testsFactory = MongodForTestsFactory.with(Version.Main.PRODUCTION);
- final MongoClient mongoClient = testsFactory.newMongo();
g = new MongoGeoIndexer();
g.initIndexer(conf, mongoClient);
g.storeStatement(statement(A));
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/f3b1680b/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerTest.java
----------------------------------------------------------------------
diff --git a/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerTest.java b/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerTest.java
index 71a5db7..08d15a6 100644
--- a/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerTest.java
+++ b/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerTest.java
@@ -27,6 +27,13 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
+import org.apache.rya.indexing.GeoConstants;
+import org.apache.rya.indexing.OptionalConfigUtils;
+import org.apache.rya.indexing.StatementConstraints;
+import org.apache.rya.indexing.accumulo.ConfigUtils;
+import org.apache.rya.indexing.mongodb.geo.MongoGeoIndexer;
+import org.apache.rya.mongodb.MongoDBRdfConfiguration;
+import org.apache.rya.mongodb.MongoRyaTestBase;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -40,7 +47,6 @@ import org.openrdf.model.impl.StatementImpl;
import org.openrdf.model.impl.ValueFactoryImpl;
import com.google.common.collect.Sets;
-import com.mongodb.MongoClient;
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.GeometryFactory;
import com.vividsolutions.jts.geom.LinearRing;
@@ -49,22 +55,13 @@ import com.vividsolutions.jts.geom.Polygon;
import com.vividsolutions.jts.geom.PrecisionModel;
import com.vividsolutions.jts.geom.impl.PackedCoordinateSequence;
-import de.flapdoodle.embed.mongo.distribution.Version;
-import de.flapdoodle.embed.mongo.tests.MongodForTestsFactory;
import info.aduna.iteration.CloseableIteration;
-import org.apache.rya.indexing.GeoConstants;
-import org.apache.rya.indexing.OptionalConfigUtils;
-import org.apache.rya.indexing.StatementConstraints;
-import org.apache.rya.indexing.accumulo.ConfigUtils;
-import org.apache.rya.indexing.mongodb.geo.MongoGeoIndexer;
-import org.apache.rya.mongodb.MongoDBRdfConfiguration;
-public class MongoGeoIndexerTest {
+public class MongoGeoIndexerTest extends MongoRyaTestBase {
private static final StatementConstraints EMPTY_CONSTRAINTS = new StatementConstraints();
MongoDBRdfConfiguration conf;
- MongoClient mongoClient;
GeometryFactory gf = new GeometryFactory(new PrecisionModel(), 4326);
@Before
@@ -77,9 +74,6 @@ public class MongoGeoIndexerTest {
conf.set(ConfigUtils.GEO_PREDICATES_LIST, "http://www.opengis.net/ont/geosparql#asWKT");
conf.set(OptionalConfigUtils.USE_GEO, "true");
conf.setTablePrefix("rya_");
-
- final MongodForTestsFactory testsFactory = MongodForTestsFactory.with(Version.Main.PRODUCTION);
- mongoClient = testsFactory.newMongo();
}
@Test
[5/5] incubator-rya git commit: RYA-211 Replacing Findbugs
Posted by mi...@apache.org.
RYA-211 Replacing Findbugs
Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/c06c1073
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/c06c1073
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/c06c1073
Branch: refs/heads/master
Commit: c06c1073cbe9340e67f8c1aadc894f9105e752fc
Parents: a0a871f
Author: Aaron Mihalik <mi...@alum.mit.edu>
Authored: Tue Oct 18 21:34:23 2016 -0400
Committer: Aaron Mihalik <aa...@gmail.com>
Committed: Thu Oct 20 17:53:30 2016 -0400
----------------------------------------------------------------------
common/rya.api/pom.xml | 5 ++
.../apache/rya/api/client/BatchUpdatePCJ.java | 5 +-
.../org/apache/rya/api/client/CreatePCJ.java | 5 +-
.../org/apache/rya/api/client/DeletePCJ.java | 5 +-
.../rya/api/client/GetInstanceDetails.java | 5 +-
.../java/org/apache/rya/api/client/Install.java | 13 ++---
.../client/InstanceDoesNotExistException.java | 5 +-
.../apache/rya/api/client/InstanceExists.java | 5 +-
.../apache/rya/api/client/ListInstances.java | 5 +-
.../api/client/PCJDoesNotExistException.java | 5 +-
.../org/apache/rya/api/client/RyaClient.java | 9 ++--
.../rya/api/client/RyaClientException.java | 5 +-
.../org/apache/rya/api/instance/RyaDetails.java | 51 ++++++++++----------
.../rya/api/instance/RyaDetailsRepository.java | 5 +-
.../api/instance/RyaDetailsToConfiguration.java | 5 +-
.../rya/api/instance/RyaDetailsUpdater.java | 7 +--
.../AccumuloRyaInstanceDetailsRepository.java | 5 +-
.../accumulo/instance/RyaDetailsSerializer.java | 5 +-
.../accumulo/utils/VisibilitySimplifier.java | 5 +-
.../mongodb/instance/MongoDetailsAdapter.java | 5 +-
.../MongoRyaInstanceDetailsRepository.java | 5 +-
.../api/client/accumulo/AccumuloCommand.java | 5 +-
.../accumulo/AccumuloConnectionDetails.java | 9 ++--
.../api/client/accumulo/AccumuloCreatePCJ.java | 5 +-
.../api/client/accumulo/AccumuloDeletePCJ.java | 5 +-
.../accumulo/AccumuloGetInstanceDetails.java | 5 +-
.../api/client/accumulo/AccumuloInstall.java | 5 +-
.../client/accumulo/AccumuloInstanceExists.java | 5 +-
.../client/accumulo/AccumuloListInstances.java | 7 +--
.../accumulo/AccumuloRyaClientFactory.java | 5 +-
.../api/client/accumulo/FluoClientFactory.java | 5 +-
.../external/PrecomputedJoinIndexer.java | 5 +-
.../external/PrecomputedJoinIndexerConfig.java | 5 +-
.../indexing/external/fluo/FluoPcjUpdater.java | 5 +-
.../external/fluo/FluoPcjUpdaterSupplier.java | 5 +-
.../external/tupleSet/ParsedQueryUtil.java | 5 +-
.../benchmark/query/PCJOptimizerBenchmark.java | 9 ++--
.../query/QueriesBenchmarkConfReader.java | 5 +-
.../rya/benchmark/query/QueryBenchmark.java | 5 +-
.../org/apache/rya/shell/SharedShellState.java | 17 ++++---
.../apache/rya/shell/util/ConnectorFactory.java | 5 +-
.../rya/shell/util/InstanceNamesFormatter.java | 5 +-
.../org/apache/rya/shell/util/JLinePrompt.java | 5 +-
.../apache/rya/shell/util/PasswordPrompt.java | 5 +-
.../rya/shell/util/RyaDetailsFormatter.java | 5 +-
.../org/apache/rya/shell/util/SparqlPrompt.java | 7 +--
.../rya/indexing/pcj/storage/PcjMetadata.java | 9 ++--
.../pcj/storage/PrecomputedJoinStorage.java | 5 +-
.../storage/accumulo/AccumuloPcjSerializer.java | 5 +-
.../storage/accumulo/AccumuloPcjStorage.java | 5 +-
.../storage/accumulo/BindingSetConverter.java | 5 +-
.../accumulo/BindingSetStringConverter.java | 5 +-
.../storage/accumulo/PcjTableNameFactory.java | 5 +-
.../pcj/storage/accumulo/PcjTables.java | 5 +-
.../storage/accumulo/PcjVarOrderFactory.java | 5 +-
.../accumulo/ScannerBindingSetIterator.java | 5 +-
.../storage/accumulo/ShiftVarOrderFactory.java | 5 +-
.../pcj/storage/accumulo/VariableOrder.java | 9 ++--
.../storage/accumulo/VisibilityBindingSet.java | 5 +-
.../VisibilityBindingSetStringConverter.java | 5 +-
.../pcj/update/PrecomputedJoinUpdater.java | 5 +-
.../rya/indexing/pcj/fluo/api/CreatePcj.java | 5 +-
.../rya/indexing/pcj/fluo/api/DeletePcj.java | 5 +-
.../indexing/pcj/fluo/api/GetQueryReport.java | 13 ++---
.../indexing/pcj/fluo/app/BindingSetRow.java | 9 ++--
.../rya/indexing/pcj/fluo/app/FilterFinder.java | 5 +-
.../pcj/fluo/app/FilterResultUpdater.java | 5 +-
.../pcj/fluo/app/FluoStringConverter.java | 5 +-
.../pcj/fluo/app/JoinResultUpdater.java | 5 +-
.../pcj/fluo/app/QueryResultUpdater.java | 5 +-
.../app/export/IncrementalResultExporter.java | 5 +-
.../IncrementalResultExporterFactory.java | 5 +-
.../pcj/fluo/app/export/ParametersBase.java | 5 +-
.../app/export/rya/RyaExportParameters.java | 5 +-
.../fluo/app/observers/BindingSetUpdater.java | 5 +-
.../pcj/fluo/app/query/CommonNodeMetadata.java | 9 ++--
.../pcj/fluo/app/query/FilterMetadata.java | 11 +++--
.../indexing/pcj/fluo/app/query/FluoQuery.java | 11 +++--
.../pcj/fluo/app/query/FluoQueryColumns.java | 5 +-
.../fluo/app/query/FluoQueryMetadataDAO.java | 5 +-
.../pcj/fluo/app/query/JoinMetadata.java | 11 +++--
.../pcj/fluo/app/query/QueryMetadata.java | 11 +++--
.../fluo/app/query/SparqlFluoQueryBuilder.java | 11 +++--
.../app/query/StatementPatternMetadata.java | 11 +++--
.../pcj/fluo/client/PcjAdminClient.java | 5 +-
.../pcj/fluo/client/PcjAdminClientCommand.java | 5 +-
.../fluo/client/PcjAdminClientProperties.java | 5 +-
.../fluo/client/command/ListQueriesCommand.java | 5 +-
.../fluo/client/command/LoadTriplesCommand.java | 5 +-
.../fluo/client/command/NewQueryCommand.java | 5 +-
.../fluo/client/util/ParsedQueryRequest.java | 9 ++--
.../fluo/client/util/QueryReportRenderer.java | 5 +-
.../indexing/pcj/fluo/client/util/Report.java | 15 +++---
pom.xml | 18 +++++++
94 files changed, 378 insertions(+), 263 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/common/rya.api/pom.xml
----------------------------------------------------------------------
diff --git a/common/rya.api/pom.xml b/common/rya.api/pom.xml
index acf394d..07179a9 100644
--- a/common/rya.api/pom.xml
+++ b/common/rya.api/pom.xml
@@ -62,6 +62,11 @@ under the License.
<artifactId>findbugs-annotations</artifactId>
</dependency>
<dependency>
+ <groupId>com.github.stephenc.jcip</groupId>
+ <artifactId>jcip-annotations</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/common/rya.api/src/main/java/org/apache/rya/api/client/BatchUpdatePCJ.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/BatchUpdatePCJ.java b/common/rya.api/src/main/java/org/apache/rya/api/client/BatchUpdatePCJ.java
index e4b760e..3362d72 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/client/BatchUpdatePCJ.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/client/BatchUpdatePCJ.java
@@ -18,12 +18,13 @@
*/
package org.apache.rya.api.client;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
/**
* Batch update a PCJ index.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public interface BatchUpdatePCJ {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/common/rya.api/src/main/java/org/apache/rya/api/client/CreatePCJ.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/CreatePCJ.java b/common/rya.api/src/main/java/org/apache/rya/api/client/CreatePCJ.java
index 45ec32a..e03a1f1 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/client/CreatePCJ.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/client/CreatePCJ.java
@@ -18,12 +18,13 @@
*/
package org.apache.rya.api.client;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
/**
* Create a new PCJ within the target instance of Rya.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public interface CreatePCJ {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/common/rya.api/src/main/java/org/apache/rya/api/client/DeletePCJ.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/DeletePCJ.java b/common/rya.api/src/main/java/org/apache/rya/api/client/DeletePCJ.java
index 6dcfa5c..b92a9a0 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/client/DeletePCJ.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/client/DeletePCJ.java
@@ -18,12 +18,13 @@
*/
package org.apache.rya.api.client;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
/**
* Deletes a PCJ from an instance of Rya.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public interface DeletePCJ {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/common/rya.api/src/main/java/org/apache/rya/api/client/GetInstanceDetails.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/GetInstanceDetails.java b/common/rya.api/src/main/java/org/apache/rya/api/client/GetInstanceDetails.java
index 411c430..7cdbe63 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/client/GetInstanceDetails.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/client/GetInstanceDetails.java
@@ -18,7 +18,8 @@
*/
package org.apache.rya.api.client;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import com.google.common.base.Optional;
@@ -27,7 +28,7 @@ import org.apache.rya.api.instance.RyaDetails;
/**
* Get configuration and maintenance information about a specific instance of Rya.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public interface GetInstanceDetails {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/common/rya.api/src/main/java/org/apache/rya/api/client/Install.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/Install.java b/common/rya.api/src/main/java/org/apache/rya/api/client/Install.java
index 2cbad7c..fd754ea 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/client/Install.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/client/Install.java
@@ -23,15 +23,16 @@ import static java.util.Objects.requireNonNull;
import java.util.Objects;
import edu.umd.cs.findbugs.annotations.Nullable;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
-// SEE RYA-211 import javax.annotation.concurrent.Immutable;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import net.jcip.annotations.Immutable;
import com.google.common.base.Optional;
/**
* Installs a new instance of Rya.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public interface Install {
/**
@@ -59,8 +60,8 @@ public interface Install {
/**
* Configures how an instance of Rya will be configured when it is installed.
*/
-// SEE RYA-211 @Immutable
-// SEE RYA-211 @ParametersAreNonnullByDefault
+ @Immutable
+ @DefaultAnnotation(NonNull.class)
public static class InstallConfiguration {
private final boolean enableTableHashPrefix;
@@ -181,7 +182,7 @@ public interface Install {
/**
* Builds instances of {@link InstallConfiguration}.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+ @DefaultAnnotation(NonNull.class)
public static class Builder {
private boolean enableTableHashPrefix = false;
private boolean enableFreeTextIndex = false;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/common/rya.api/src/main/java/org/apache/rya/api/client/InstanceDoesNotExistException.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/InstanceDoesNotExistException.java b/common/rya.api/src/main/java/org/apache/rya/api/client/InstanceDoesNotExistException.java
index 03dd219..1e634a6 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/client/InstanceDoesNotExistException.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/client/InstanceDoesNotExistException.java
@@ -18,13 +18,14 @@
*/
package org.apache.rya.api.client;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
/**
* One of the {@link RyaClient} commands could not execute because the connected
* instance of Rya does not exist.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class InstanceDoesNotExistException extends RyaClientException {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/common/rya.api/src/main/java/org/apache/rya/api/client/InstanceExists.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/InstanceExists.java b/common/rya.api/src/main/java/org/apache/rya/api/client/InstanceExists.java
index abfa278..3bc5f3a 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/client/InstanceExists.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/client/InstanceExists.java
@@ -18,12 +18,13 @@
*/
package org.apache.rya.api.client;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
/**
* Checks if an instance of Rya has been installed.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public interface InstanceExists {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/common/rya.api/src/main/java/org/apache/rya/api/client/ListInstances.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/ListInstances.java b/common/rya.api/src/main/java/org/apache/rya/api/client/ListInstances.java
index 427e603..871327b 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/client/ListInstances.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/client/ListInstances.java
@@ -20,12 +20,13 @@ package org.apache.rya.api.client;
import java.util.List;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
/**
* List the names of the installed Rya instances.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public interface ListInstances {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/common/rya.api/src/main/java/org/apache/rya/api/client/PCJDoesNotExistException.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/PCJDoesNotExistException.java b/common/rya.api/src/main/java/org/apache/rya/api/client/PCJDoesNotExistException.java
index 71430b9..2879719 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/client/PCJDoesNotExistException.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/client/PCJDoesNotExistException.java
@@ -18,13 +18,14 @@
*/
package org.apache.rya.api.client;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
/**
* One of the {@link RyaClient} commands could not execute because the connected
* instance of Rya does not have a PCJ matching the provided PCJ ID.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class PCJDoesNotExistException extends RyaClientException {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/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 83b0756..e43dfce 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
@@ -20,14 +20,15 @@ package org.apache.rya.api.client;
import static java.util.Objects.requireNonNull;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
-// SEE RYA-211 import javax.annotation.concurrent.Immutable;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import net.jcip.annotations.Immutable;
/**
* Provides access to a set of Rya functions.
*/
-// SEE RYA-211 @Immutable
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@Immutable
+@DefaultAnnotation(NonNull.class)
public class RyaClient {
// Administrative functions.
private final Install install;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/common/rya.api/src/main/java/org/apache/rya/api/client/RyaClientException.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/RyaClientException.java b/common/rya.api/src/main/java/org/apache/rya/api/client/RyaClientException.java
index e14fb84..e1a3ff5 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/client/RyaClientException.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/client/RyaClientException.java
@@ -18,12 +18,13 @@
*/
package org.apache.rya.api.client;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
/**
* One of the {@link RyaClient} functions failed.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class RyaClientException extends Exception {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetails.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetails.java b/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetails.java
index 648b2fd..09085f3 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetails.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetails.java
@@ -29,8 +29,9 @@ import java.util.Map.Entry;
import java.util.Objects;
import edu.umd.cs.findbugs.annotations.Nullable;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
-// SEE RYA-211 import javax.annotation.concurrent.Immutable;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import net.jcip.annotations.Immutable;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableMap;
@@ -38,8 +39,8 @@ import com.google.common.collect.ImmutableMap;
/**
* Details about how a Rya instance's state.
*/
-// SEE RYA-211 @Immutable
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@Immutable
+@DefaultAnnotation(NonNull.class)
public class RyaDetails implements Serializable {
private static final long serialVersionUID = 1L;
@@ -199,7 +200,7 @@ public class RyaDetails implements Serializable {
/**
* Builds instances of {@link RyaDetails}.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+ @DefaultAnnotation(NonNull.class)
public static class Builder {
// General metadata about the instance.
@@ -353,8 +354,8 @@ public class RyaDetails implements Serializable {
/**
* Details about a Rya instance's Geospatial Index.
*/
-// SEE RYA-211 @Immutable
-// SEE RYA-211 @ParametersAreNonnullByDefault
+ @Immutable
+ @DefaultAnnotation(NonNull.class)
public static class GeoIndexDetails implements Serializable {
private static final long serialVersionUID = 1L;
@@ -397,8 +398,8 @@ public class RyaDetails implements Serializable {
/**
* Details about a Rya instance's Temporal Index.
*/
-// SEE RYA-211 @Immutable
-// SEE RYA-211 @ParametersAreNonnullByDefault
+ @Immutable
+ @DefaultAnnotation(NonNull.class)
public static class TemporalIndexDetails implements Serializable {
private static final long serialVersionUID = 1L;
@@ -441,8 +442,8 @@ public class RyaDetails implements Serializable {
/**
* Details about a Rya instance's Entity Centric Index.
*/
-// SEE RYA-211 @Immutable
-// SEE RYA-211 @ParametersAreNonnullByDefault
+ @Immutable
+ @DefaultAnnotation(NonNull.class)
public static class EntityCentricIndexDetails implements Serializable {
private static final long serialVersionUID = 1L;
@@ -485,8 +486,8 @@ public class RyaDetails implements Serializable {
/**
* Details about a Rya instance's Free Text Index.
*/
-// SEE RYA-211 @Immutable
-// SEE RYA-211 @ParametersAreNonnullByDefault
+ @Immutable
+ @DefaultAnnotation(NonNull.class)
public static class FreeTextIndexDetails implements Serializable {
private static final long serialVersionUID = 1L;
@@ -529,8 +530,8 @@ public class RyaDetails implements Serializable {
/**
* Details about a Rya instance's PCJ Index.
*/
-// SEE RYA-211 @Immutable
-// SEE RYA-211 @ParametersAreNonnullByDefault
+ @Immutable
+ @DefaultAnnotation(NonNull.class)
public static class PCJIndexDetails implements Serializable {
private static final long serialVersionUID = 1L;
@@ -618,7 +619,7 @@ public class RyaDetails implements Serializable {
/**
* Builds instance of {@link PCJIndexDetails).
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+ @DefaultAnnotation(NonNull.class)
public static class Builder {
private Boolean enabled = null;
@@ -707,8 +708,8 @@ public class RyaDetails implements Serializable {
* Details about a Fluo Incremental PCJ application that has been installed
* as part of this Rya instance.
*/
-// SEE RYA-211 @Immutable
-// SEE RYA-211 @ParametersAreNonnullByDefault
+ @Immutable
+ @DefaultAnnotation(NonNull.class)
public static class FluoDetails implements Serializable {
private static final long serialVersionUID = 1L;
@@ -752,8 +753,8 @@ public class RyaDetails implements Serializable {
/**
* Details about a specific PCJ that is being maintained within the Rya instance.
*/
-// SEE RYA-211 @Immutable
-// SEE RYA-211 @ParametersAreNonnullByDefault
+ @Immutable
+ @DefaultAnnotation(NonNull.class)
public static class PCJDetails implements Serializable {
private static final long serialVersionUID = 1L;
@@ -838,7 +839,7 @@ public class RyaDetails implements Serializable {
/**
* Builds instance of {@link PCJDetails}.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+ @DefaultAnnotation(NonNull.class)
public static class Builder {
private String id;
@@ -944,8 +945,8 @@ public class RyaDetails implements Serializable {
/**
* Details about a Rya instance's Prospector statistics.
*/
-// SEE RYA-211 @Immutable
-// SEE RYA-211 @ParametersAreNonnullByDefault
+ @Immutable
+ @DefaultAnnotation(NonNull.class)
public static class ProspectorDetails implements Serializable {
private static final long serialVersionUID = 1L;
@@ -988,8 +989,8 @@ public class RyaDetails implements Serializable {
/**
* Details about a Rya instance's Join Selectivity statistics.
*/
-// SEE RYA-211 @Immutable
-// SEE RYA-211 @ParametersAreNonnullByDefault
+ @Immutable
+ @DefaultAnnotation(NonNull.class)
public static class JoinSelectivityDetails implements Serializable {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsRepository.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsRepository.java b/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsRepository.java
index a009ba7..5c7b68a 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsRepository.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsRepository.java
@@ -19,13 +19,14 @@ package org.apache.rya.api.instance;
* under the License.
*/
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
/**
* Provides access to the {@link RyaDetails} information that describes
* an instance of Rya.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public interface RyaDetailsRepository {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsToConfiguration.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsToConfiguration.java b/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsToConfiguration.java
index 678ead2..0d0191a 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsToConfiguration.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsToConfiguration.java
@@ -20,7 +20,8 @@ package org.apache.rya.api.instance;
import static java.util.Objects.requireNonNull;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.hadoop.conf.Configuration;
import org.apache.log4j.Logger;
@@ -31,7 +32,7 @@ import com.google.common.base.Optional;
* Used to fetch {@link RyaDetails} from a {@link RyaDetailsRepository} and
* add them to the application's {@link Configuration}.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class RyaDetailsToConfiguration {
private static final Logger log = Logger.getLogger(RyaDetailsToConfiguration.class);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsUpdater.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsUpdater.java b/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsUpdater.java
index cc0c833..d7324f6 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsUpdater.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsUpdater.java
@@ -20,7 +20,8 @@ package org.apache.rya.api.instance;
import static java.util.Objects.requireNonNull;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -35,14 +36,14 @@ import org.apache.rya.api.instance.RyaDetailsUpdater.RyaDetailsMutator.CouldNotA
* can be used in place of boilerplate code that handles the concurrent nature
* of details updates.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class RyaDetailsUpdater {
private static final Logger log = LoggerFactory.getLogger(RyaDetailsUpdater.class);
/**
* Applies a mutation to a an instance of {@link RyaDetails}.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+ @DefaultAnnotation(NonNull.class)
public static interface RyaDetailsMutator {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/instance/AccumuloRyaInstanceDetailsRepository.java
----------------------------------------------------------------------
diff --git a/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/instance/AccumuloRyaInstanceDetailsRepository.java b/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/instance/AccumuloRyaInstanceDetailsRepository.java
index 2479d3e..c56bffc 100644
--- a/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/instance/AccumuloRyaInstanceDetailsRepository.java
+++ b/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/instance/AccumuloRyaInstanceDetailsRepository.java
@@ -23,7 +23,8 @@ import static java.util.Objects.requireNonNull;
import java.util.Map.Entry;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
@@ -60,7 +61,7 @@ import org.apache.rya.api.instance.RyaDetailsRepository;
* style operations to synchronize writes to the object. On the downside, only
* Java clients will work.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class AccumuloRyaInstanceDetailsRepository implements RyaDetailsRepository {
public static final String INSTANCE_DETAILS_TABLE_NAME = "instance_details";
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/instance/RyaDetailsSerializer.java
----------------------------------------------------------------------
diff --git a/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/instance/RyaDetailsSerializer.java b/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/instance/RyaDetailsSerializer.java
index 3186d33..97ebb5b 100644
--- a/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/instance/RyaDetailsSerializer.java
+++ b/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/instance/RyaDetailsSerializer.java
@@ -27,7 +27,8 @@ import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.rya.api.instance.RyaDetails;
import org.apache.rya.api.instance.RyaDetailsRepository.RyaDetailsRepositoryException;
@@ -35,7 +36,7 @@ import org.apache.rya.api.instance.RyaDetailsRepository.RyaDetailsRepositoryExce
/**
* Serializes {@link RyaDetails} instances.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class RyaDetailsSerializer {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/utils/VisibilitySimplifier.java
----------------------------------------------------------------------
diff --git a/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/utils/VisibilitySimplifier.java b/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/utils/VisibilitySimplifier.java
index 838c1b2..98c6abd 100644
--- a/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/utils/VisibilitySimplifier.java
+++ b/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/utils/VisibilitySimplifier.java
@@ -20,7 +20,8 @@ package org.apache.rya.accumulo.utils;
import static java.util.Objects.requireNonNull;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.accumulo.core.security.ColumnVisibility;
@@ -29,7 +30,7 @@ import com.google.common.base.Charsets;
/**
* Simplifies Accumulo visibility expressions.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class VisibilitySimplifier {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/instance/MongoDetailsAdapter.java
----------------------------------------------------------------------
diff --git a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/instance/MongoDetailsAdapter.java b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/instance/MongoDetailsAdapter.java
index f80c055..39b05eb 100644
--- a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/instance/MongoDetailsAdapter.java
+++ b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/instance/MongoDetailsAdapter.java
@@ -25,7 +25,8 @@ import java.util.Date;
import java.util.List;
import java.util.Map.Entry;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
@@ -73,7 +74,7 @@ import org.apache.rya.api.instance.RyaDetails.TemporalIndexDetails;
* }
* </pre>
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class MongoDetailsAdapter {
public static final String INSTANCE_KEY = "instanceName";
public static final String VERSION_KEY = "version";
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/instance/MongoRyaInstanceDetailsRepository.java
----------------------------------------------------------------------
diff --git a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/instance/MongoRyaInstanceDetailsRepository.java b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/instance/MongoRyaInstanceDetailsRepository.java
index 51f1faa..4a961be 100644
--- a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/instance/MongoRyaInstanceDetailsRepository.java
+++ b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/instance/MongoRyaInstanceDetailsRepository.java
@@ -22,7 +22,8 @@ package org.apache.rya.mongodb.instance;
import static com.google.common.base.Preconditions.checkNotNull;
import static java.util.Objects.requireNonNull;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import com.mongodb.BasicDBObject;
import com.mongodb.DB;
@@ -39,7 +40,7 @@ import org.apache.rya.mongodb.instance.MongoDetailsAdapter.MalformedRyaDetailsEx
* An implementation of {@link RyaDetailsRepository} that stores a Rya
* instance's {@link RyaDetails} in a Mongo document.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class MongoRyaInstanceDetailsRepository implements RyaDetailsRepository {
private static final String INSTANCE_DETAILS_COLLECTION_NAME = "instance_details";
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloCommand.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloCommand.java b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloCommand.java
index 1ca8e19..0691bb5 100644
--- a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloCommand.java
+++ b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloCommand.java
@@ -20,7 +20,8 @@ package org.apache.rya.api.client.accumulo;
import static java.util.Objects.requireNonNull;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.accumulo.core.client.Connector;
@@ -28,7 +29,7 @@ import org.apache.accumulo.core.client.Connector;
* An abstract class that holds onto Accumulo access information. Extend this
* when implementing a command that interacts with Accumulo.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public abstract class AccumuloCommand {
private final AccumuloConnectionDetails connectionDetails;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloConnectionDetails.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloConnectionDetails.java b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloConnectionDetails.java
index 84deeee..a746bf1 100644
--- a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloConnectionDetails.java
+++ b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloConnectionDetails.java
@@ -20,14 +20,15 @@ package org.apache.rya.api.client.accumulo;
import static java.util.Objects.requireNonNull;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
-// SEE RYA-211 import javax.annotation.concurrent.Immutable;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import net.jcip.annotations.Immutable;
/**
* The information that the shell used to connect to Accumulo.
*/
-// SEE RYA-211 @Immutable
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@Immutable
+@DefaultAnnotation(NonNull.class)
public class AccumuloConnectionDetails {
private final String username;
private final char[] password;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloCreatePCJ.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloCreatePCJ.java b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloCreatePCJ.java
index dcf1368..80ece33 100644
--- a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloCreatePCJ.java
+++ b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloCreatePCJ.java
@@ -21,7 +21,8 @@ package org.apache.rya.api.client.accumulo;
import static com.google.common.base.Preconditions.checkNotNull;
import static java.util.Objects.requireNonNull;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.accumulo.core.client.Connector;
import org.apache.rya.indexing.pcj.storage.PcjException;
@@ -59,7 +60,7 @@ import org.apache.rya.rdftriplestore.RyaSailRepository;
/**
* An Accumulo implementation of the {@link CreatePCJ} command.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class AccumuloCreatePCJ extends AccumuloCommand implements CreatePCJ {
private final GetInstanceDetails getInstanceDetails;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloDeletePCJ.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloDeletePCJ.java b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloDeletePCJ.java
index ac9633f..b6728ec 100644
--- a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloDeletePCJ.java
+++ b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloDeletePCJ.java
@@ -20,7 +20,8 @@ package org.apache.rya.api.client.accumulo;
import static java.util.Objects.requireNonNull;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.accumulo.core.client.Connector;
import org.apache.rya.indexing.pcj.fluo.api.DeletePcj;
@@ -46,7 +47,7 @@ import org.apache.rya.api.instance.RyaDetails.PCJIndexDetails.PCJDetails.PCJUpda
/**
* An Accumulo implementation of the {@link DeletePCJ} command.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class AccumuloDeletePCJ extends AccumuloCommand implements DeletePCJ {
private static final Logger log = LoggerFactory.getLogger(AccumuloDeletePCJ.class);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloGetInstanceDetails.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloGetInstanceDetails.java b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloGetInstanceDetails.java
index 4a23df3..2e394fb 100644
--- a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloGetInstanceDetails.java
+++ b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloGetInstanceDetails.java
@@ -20,7 +20,8 @@ package org.apache.rya.api.client.accumulo;
import static java.util.Objects.requireNonNull;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.accumulo.core.client.Connector;
@@ -39,7 +40,7 @@ import org.apache.rya.api.instance.RyaDetailsRepository.RyaDetailsRepositoryExce
/**
* An Accumulo implementation of the {@link GetInstanceDetails} command.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class AccumuloGetInstanceDetails extends AccumuloCommand implements GetInstanceDetails {
private final InstanceExists instanceExists;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloInstall.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloInstall.java b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloInstall.java
index c873775..c4ba8b4 100644
--- a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloInstall.java
+++ b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloInstall.java
@@ -22,7 +22,8 @@ import static java.util.Objects.requireNonNull;
import java.util.Date;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
@@ -60,7 +61,7 @@ import org.apache.rya.sail.config.RyaSailFactory;
* An Accumulo implementation of the {@link Install} command.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class AccumuloInstall extends AccumuloCommand implements Install {
private final InstanceExists instanceExists;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloInstanceExists.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloInstanceExists.java b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloInstanceExists.java
index fce56d4..7f7d061 100644
--- a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloInstanceExists.java
+++ b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloInstanceExists.java
@@ -20,7 +20,8 @@ package org.apache.rya.api.client.accumulo;
import static java.util.Objects.requireNonNull;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.admin.TableOperations;
@@ -33,7 +34,7 @@ import org.apache.rya.api.client.RyaClientException;
/**
* An Accumulo implementation of the {@link InstanceExists} command.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class AccumuloInstanceExists extends AccumuloCommand implements InstanceExists {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloListInstances.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloListInstances.java b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloListInstances.java
index b35dc58..02ff505 100644
--- a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloListInstances.java
+++ b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloListInstances.java
@@ -26,7 +26,8 @@ import java.util.Map.Entry;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.accumulo.core.client.Connector;
@@ -37,7 +38,7 @@ import org.apache.rya.api.client.RyaClientException;
/**
* An Accumulo implementation of the {@link ListInstances} command.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class AccumuloListInstances extends AccumuloCommand implements ListInstances {
private final Pattern spoPattern = Pattern.compile("(.*)" + RdfCloudTripleStoreConstants.TBL_SPO_SUFFIX);
@@ -104,7 +105,7 @@ public class AccumuloListInstances extends AccumuloCommand implements ListInstan
/**
* Flags that are used to determine if a String is a Rya Instance name.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+ @DefaultAnnotation(NonNull.class)
private static class InstanceTablesFound {
private boolean spoFound = false;
private boolean ospFound = false;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloRyaClientFactory.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloRyaClientFactory.java b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloRyaClientFactory.java
index 44779ac..e0fd25f 100644
--- a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloRyaClientFactory.java
+++ b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloRyaClientFactory.java
@@ -20,7 +20,8 @@ package org.apache.rya.api.client.accumulo;
import static java.util.Objects.requireNonNull;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.accumulo.core.client.Connector;
@@ -30,7 +31,7 @@ import org.apache.rya.api.client.RyaClient;
* Constructs instance of {@link RyaClient} that are connected to instance of
* Rya hosted by Accumulo clusters.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class AccumuloRyaClientFactory {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/FluoClientFactory.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/FluoClientFactory.java b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/FluoClientFactory.java
index 15c8785..d019b7f 100644
--- a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/FluoClientFactory.java
+++ b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/FluoClientFactory.java
@@ -20,7 +20,8 @@ package org.apache.rya.api.client.accumulo;
import static java.util.Objects.requireNonNull;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.fluo.api.client.FluoClient;
import org.apache.fluo.api.client.FluoFactory;
@@ -29,7 +30,7 @@ import org.apache.fluo.api.config.FluoConfiguration;
/**
* Creates {@link FluoClient}s that are connected to a specific Fluo Application.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class FluoClientFactory {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinIndexer.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinIndexer.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinIndexer.java
index be55687..a09b726 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinIndexer.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinIndexer.java
@@ -26,7 +26,8 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.MultiTableBatchWriter;
@@ -53,7 +54,7 @@ import org.apache.rya.indexing.external.fluo.PcjUpdaterSupplierFactory;
/**
* Updates the state of the Precomputed Join indices that are used by Rya.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class PrecomputedJoinIndexer extends AbstractAccumuloIndexer {
private static final Logger log = Logger
.getLogger(PrecomputedJoinIndexer.class);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinIndexerConfig.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinIndexerConfig.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinIndexerConfig.java
index 4f25137..be1f17f 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinIndexerConfig.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinIndexerConfig.java
@@ -20,7 +20,8 @@ package org.apache.rya.indexing.external;
import static com.google.common.base.Preconditions.checkNotNull;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.rya.api.persist.index.RyaSecondaryIndexer;
import org.apache.rya.indexing.accumulo.ConfigUtils;
@@ -36,7 +37,7 @@ import com.google.common.base.Optional;
* of {@link RyaSecondaryIndexer} to provide {@link PrecomputedJoinIndexer}
* specific values.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class PrecomputedJoinIndexerConfig {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdater.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdater.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdater.java
index 7a73fba..39a3ca2 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdater.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdater.java
@@ -22,7 +22,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Collection;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.log4j.Logger;
import org.apache.rya.indexing.pcj.fluo.api.InsertTriples;
@@ -37,7 +38,7 @@ import org.apache.rya.api.domain.RyaStatement;
* Updates the PCJ indices by forwarding the statement additions/removals to
* a Fluo application.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class FluoPcjUpdater implements PrecomputedJoinUpdater {
private static final Logger log = Logger.getLogger(FluoPcjUpdater.class);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdaterSupplier.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdaterSupplier.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdaterSupplier.java
index 98deac7..44a4b4a 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdaterSupplier.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdaterSupplier.java
@@ -30,7 +30,8 @@ import org.apache.fluo.api.client.FluoClient;
import org.apache.fluo.api.client.FluoFactory;
import org.apache.fluo.api.config.FluoConfiguration;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.rya.indexing.external.PrecomputedJoinIndexerConfig;
import org.apache.rya.indexing.external.PrecomputedJoinIndexerConfig.PrecomputedJoinUpdaterType;
@@ -44,7 +45,7 @@ import com.google.common.base.Supplier;
/**
* Creates instances of {@link FluoPcjUpdater} using the values found in a {@link Configuration}.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class FluoPcjUpdaterSupplier implements Supplier<PrecomputedJoinUpdater> {
private final Supplier<Configuration> configSupplier;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/indexing/src/main/java/org/apache/rya/indexing/external/tupleSet/ParsedQueryUtil.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/tupleSet/ParsedQueryUtil.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/tupleSet/ParsedQueryUtil.java
index cac68bc..98d61e7 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/tupleSet/ParsedQueryUtil.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/tupleSet/ParsedQueryUtil.java
@@ -22,7 +22,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.concurrent.atomic.AtomicReference;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.openrdf.query.algebra.Projection;
import org.openrdf.query.algebra.helpers.QueryModelVisitorBase;
@@ -33,7 +34,7 @@ import com.google.common.base.Optional;
/**
* Utilities that help applications inspect {@link ParsedQuery} objects.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class ParsedQueryUtil {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/PCJOptimizerBenchmark.java
----------------------------------------------------------------------
diff --git a/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/PCJOptimizerBenchmark.java b/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/PCJOptimizerBenchmark.java
index 57a6b41..38abf87 100644
--- a/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/PCJOptimizerBenchmark.java
+++ b/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/PCJOptimizerBenchmark.java
@@ -28,7 +28,8 @@ import java.util.Map;
import java.util.Objects;
import java.util.Queue;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.Param;
@@ -71,7 +72,7 @@ import org.apache.rya.indexing.pcj.matching.PCJOptimizer;
* </pre>
*/
@State(Scope.Thread)
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class PCJOptimizerBenchmark {
/**
@@ -305,7 +306,7 @@ public class PCJOptimizerBenchmark {
/**
* The parameter values used by the benchmark. Used to lookup a benchmark' {@link BenchmarkValues}.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+ @DefaultAnnotation(NonNull.class)
public static class BenchmarkParams {
private final int numPCJs;
private final int pcjSPCount;
@@ -369,7 +370,7 @@ public class PCJOptimizerBenchmark {
* Holds onto the SPARQL query that will be optimized as well as the optimizers
* that will be used to optimize the query.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+ @DefaultAnnotation(NonNull.class)
public static class BenchmarkValues {
private final TupleExpr query;
private final PCJOptimizer optimizer;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/QueriesBenchmarkConfReader.java
----------------------------------------------------------------------
diff --git a/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/QueriesBenchmarkConfReader.java b/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/QueriesBenchmarkConfReader.java
index 7a92d1f..ce91ba1 100644
--- a/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/QueriesBenchmarkConfReader.java
+++ b/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/QueriesBenchmarkConfReader.java
@@ -22,7 +22,8 @@ import static java.util.Objects.requireNonNull;
import java.io.InputStream;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import javax.xml.XMLConstants;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
@@ -39,7 +40,7 @@ import com.google.common.base.Suppliers;
/**
* Unmarshalls instances of {@link QueriesBenchmarkConf}.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public final class QueriesBenchmarkConfReader {
// It is assumed the schema file is held within the root directory of the packaged jar.
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/QueryBenchmark.java
----------------------------------------------------------------------
diff --git a/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/QueryBenchmark.java b/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/QueryBenchmark.java
index 8cf05f1..248ea88 100644
--- a/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/QueryBenchmark.java
+++ b/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/QueryBenchmark.java
@@ -28,7 +28,8 @@ import java.util.List;
import java.util.Optional;
import java.util.concurrent.TimeUnit;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.log4j.ConsoleAppender;
import org.apache.log4j.Level;
@@ -248,7 +249,7 @@ public class QueryBenchmark {
/**
* Executes an iteration of the benchmarked logic.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+ @DefaultAnnotation(NonNull.class)
public static final class QueryBenchmarkRun {
private final SailConnection sailConn;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.console/src/main/java/org/apache/rya/shell/SharedShellState.java
----------------------------------------------------------------------
diff --git a/extras/rya.console/src/main/java/org/apache/rya/shell/SharedShellState.java b/extras/rya.console/src/main/java/org/apache/rya/shell/SharedShellState.java
index 508e65e..526b031 100644
--- a/extras/rya.console/src/main/java/org/apache/rya/shell/SharedShellState.java
+++ b/extras/rya.console/src/main/java/org/apache/rya/shell/SharedShellState.java
@@ -24,9 +24,10 @@ import java.util.Objects;
import java.util.concurrent.locks.ReentrantLock;
import edu.umd.cs.findbugs.annotations.Nullable;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
-// SEE RYA-211 import javax.annotation.concurrent.Immutable;
-// SEE RYA-211 import javax.annotation.concurrent.ThreadSafe;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import net.jcip.annotations.Immutable;
+import net.jcip.annotations.ThreadSafe;
import com.google.common.base.Optional;
@@ -36,8 +37,8 @@ import org.apache.rya.api.client.accumulo.AccumuloConnectionDetails;
/**
* Holds values that are shared between the various Rya command classes.
*/
-// SEE RYA-211 @ThreadSafe
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@ThreadSafe
+@DefaultAnnotation(NonNull.class)
public class SharedShellState {
// The shared nature of this object means we shouldn't assume only a single thread is accessing it.
private final ReentrantLock lock = new ReentrantLock();
@@ -161,8 +162,8 @@ public class SharedShellState {
/**
* Values that define the state of a Rya Shell.
*/
-// SEE RYA-211 @Immutable
-// SEE RYA-211 @ParametersAreNonnullByDefault
+ @Immutable
+ @DefaultAnnotation(NonNull.class)
public static final class ShellState {
// Indicates the state of the shell.
private final ConnectionState connectionState;
@@ -258,7 +259,7 @@ public class SharedShellState {
/**
* Builds instances of {@link ShellState}.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+ @DefaultAnnotation(NonNull.class)
public static class Builder {
private ConnectionState connectionState;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.console/src/main/java/org/apache/rya/shell/util/ConnectorFactory.java
----------------------------------------------------------------------
diff --git a/extras/rya.console/src/main/java/org/apache/rya/shell/util/ConnectorFactory.java b/extras/rya.console/src/main/java/org/apache/rya/shell/util/ConnectorFactory.java
index f960530..d18c5c8 100644
--- a/extras/rya.console/src/main/java/org/apache/rya/shell/util/ConnectorFactory.java
+++ b/extras/rya.console/src/main/java/org/apache/rya/shell/util/ConnectorFactory.java
@@ -20,7 +20,8 @@ package org.apache.rya.shell.util;
import static java.util.Objects.requireNonNull;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
@@ -32,7 +33,7 @@ import org.apache.accumulo.core.client.security.tokens.PasswordToken;
/**
* Creates {@link Connector}s that are linked to an instance of Accumulo.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class ConnectorFactory {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.console/src/main/java/org/apache/rya/shell/util/InstanceNamesFormatter.java
----------------------------------------------------------------------
diff --git a/extras/rya.console/src/main/java/org/apache/rya/shell/util/InstanceNamesFormatter.java b/extras/rya.console/src/main/java/org/apache/rya/shell/util/InstanceNamesFormatter.java
index c99cef0..f50164b 100644
--- a/extras/rya.console/src/main/java/org/apache/rya/shell/util/InstanceNamesFormatter.java
+++ b/extras/rya.console/src/main/java/org/apache/rya/shell/util/InstanceNamesFormatter.java
@@ -22,12 +22,13 @@ import static java.util.Objects.requireNonNull;
import java.util.List;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
/**
* Pretty formats a list of Rya instance names.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class InstanceNamesFormatter {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.console/src/main/java/org/apache/rya/shell/util/JLinePrompt.java
----------------------------------------------------------------------
diff --git a/extras/rya.console/src/main/java/org/apache/rya/shell/util/JLinePrompt.java b/extras/rya.console/src/main/java/org/apache/rya/shell/util/JLinePrompt.java
index 472016d..c9403b0 100644
--- a/extras/rya.console/src/main/java/org/apache/rya/shell/util/JLinePrompt.java
+++ b/extras/rya.console/src/main/java/org/apache/rya/shell/util/JLinePrompt.java
@@ -23,7 +23,8 @@ import static java.util.Objects.requireNonNull;
import java.io.IOException;
import java.util.Set;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.util.FieldUtils;
@@ -38,7 +39,7 @@ import jline.console.ConsoleReader;
* Provides access to the host {@link Shell}'s {@link ConsoleReader} and some
* utility functions for using it.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public abstract class JLinePrompt {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.console/src/main/java/org/apache/rya/shell/util/PasswordPrompt.java
----------------------------------------------------------------------
diff --git a/extras/rya.console/src/main/java/org/apache/rya/shell/util/PasswordPrompt.java b/extras/rya.console/src/main/java/org/apache/rya/shell/util/PasswordPrompt.java
index 88b96ff..b61faf9 100644
--- a/extras/rya.console/src/main/java/org/apache/rya/shell/util/PasswordPrompt.java
+++ b/extras/rya.console/src/main/java/org/apache/rya/shell/util/PasswordPrompt.java
@@ -20,14 +20,15 @@ package org.apache.rya.shell.util;
import java.io.IOException;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import jline.console.ConsoleReader;
/**
* A mechanism for prompting a user of the application for a password.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public interface PasswordPrompt {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.console/src/main/java/org/apache/rya/shell/util/RyaDetailsFormatter.java
----------------------------------------------------------------------
diff --git a/extras/rya.console/src/main/java/org/apache/rya/shell/util/RyaDetailsFormatter.java b/extras/rya.console/src/main/java/org/apache/rya/shell/util/RyaDetailsFormatter.java
index fbb9837..fb00296 100644
--- a/extras/rya.console/src/main/java/org/apache/rya/shell/util/RyaDetailsFormatter.java
+++ b/extras/rya.console/src/main/java/org/apache/rya/shell/util/RyaDetailsFormatter.java
@@ -20,7 +20,8 @@ package org.apache.rya.shell.util;
import static java.util.Objects.requireNonNull;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableMap;
@@ -32,7 +33,7 @@ import org.apache.rya.api.instance.RyaDetails.PCJIndexDetails.PCJDetails;
/**
* Formats an instance of {@link RyaDetails}.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class RyaDetailsFormatter {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.console/src/main/java/org/apache/rya/shell/util/SparqlPrompt.java
----------------------------------------------------------------------
diff --git a/extras/rya.console/src/main/java/org/apache/rya/shell/util/SparqlPrompt.java b/extras/rya.console/src/main/java/org/apache/rya/shell/util/SparqlPrompt.java
index 4b29d28..97aefdd 100644
--- a/extras/rya.console/src/main/java/org/apache/rya/shell/util/SparqlPrompt.java
+++ b/extras/rya.console/src/main/java/org/apache/rya/shell/util/SparqlPrompt.java
@@ -20,14 +20,15 @@ package org.apache.rya.shell.util;
import java.io.IOException;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import jline.console.ConsoleReader;
/**
* A mechanism for prompting a user of the application for a SPARQL string.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public interface SparqlPrompt {
/**
@@ -42,7 +43,7 @@ public interface SparqlPrompt {
/**
* Prompts a user for a SPARQL query using a JLine {@link ConsoleReader}.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+ @DefaultAnnotation(NonNull.class)
public static class JLineSparqlPrompt extends JLinePrompt implements SparqlPrompt {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/PcjMetadata.java
----------------------------------------------------------------------
diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/PcjMetadata.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/PcjMetadata.java
index 75bde6c..dbff41d 100644
--- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/PcjMetadata.java
+++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/PcjMetadata.java
@@ -24,8 +24,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Collection;
import java.util.Objects;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
-// SEE RYA-211 import javax.annotation.concurrent.Immutable;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import net.jcip.annotations.Immutable;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder;
@@ -35,8 +36,8 @@ import com.google.common.collect.ImmutableSet;
/**
* Metadata that is stored in a PCJ table about the results that are stored within it.
*/
-// SEE RYA-211 @Immutable
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@Immutable
+@DefaultAnnotation(NonNull.class)
public final class PcjMetadata {
private final String sparql;
private final long cardinality;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/PrecomputedJoinStorage.java
----------------------------------------------------------------------
diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/PrecomputedJoinStorage.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/PrecomputedJoinStorage.java
index 9f0dc5c..16653ee 100644
--- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/PrecomputedJoinStorage.java
+++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/PrecomputedJoinStorage.java
@@ -22,7 +22,8 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.rya.indexing.pcj.storage.accumulo.VisibilityBindingSet;
import org.openrdf.query.BindingSet;
@@ -30,7 +31,7 @@ import org.openrdf.query.BindingSet;
/**
* Functions that create and maintain the PCJ tables that are used by Rya.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public interface PrecomputedJoinStorage {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjSerializer.java
----------------------------------------------------------------------
diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjSerializer.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjSerializer.java
index 249c0d2..4769758 100644
--- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjSerializer.java
+++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjSerializer.java
@@ -30,7 +30,8 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Set;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.openrdf.model.Value;
import org.openrdf.query.Binding;
@@ -49,7 +50,7 @@ import org.apache.rya.api.resolver.RyaTypeResolverException;
* Converts {@link BindingSet}s to byte[]s and back again. The bytes do not
* include the binding names and are ordered with a {@link VariableOrder}.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class AccumuloPcjSerializer implements BindingSetConverter<byte[]> {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjStorage.java
----------------------------------------------------------------------
diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjStorage.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjStorage.java
index 8463c43..282d438 100644
--- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjStorage.java
+++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjStorage.java
@@ -25,7 +25,8 @@ import java.util.Collection;
import java.util.List;
import java.util.Set;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
@@ -50,7 +51,7 @@ import org.apache.rya.api.instance.RyaDetailsUpdater.RyaDetailsMutator.CouldNotA
/**
* An Accumulo backed implementation of {@link PrecomputedJoinStorage}.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class AccumuloPcjStorage implements PrecomputedJoinStorage {
// Factories that are used to create new PCJs.
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetConverter.java
----------------------------------------------------------------------
diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetConverter.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetConverter.java
index 6c2e056..d2cf366 100644
--- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetConverter.java
+++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetConverter.java
@@ -18,7 +18,8 @@
*/
package org.apache.rya.indexing.pcj.storage.accumulo;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.openrdf.query.Binding;
import org.openrdf.query.BindingSet;
@@ -30,7 +31,7 @@ import org.openrdf.query.BindingSet;
*
* @param <T> Defines the type of model {@link BindingSet}s will be converted into/from.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public interface BindingSetConverter<T> {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetStringConverter.java
----------------------------------------------------------------------
diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetStringConverter.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetStringConverter.java
index b1ea054..b2d04e1 100644
--- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetStringConverter.java
+++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetStringConverter.java
@@ -25,7 +25,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.openrdf.model.URI;
import org.openrdf.model.Value;
@@ -46,7 +47,7 @@ import org.apache.rya.api.resolver.RdfToRyaConversions;
* Converts {@link BindingSet}s to Strings and back again. The Strings do not
* include the binding names and are ordered with a {@link VariableOrder}.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class BindingSetStringConverter implements BindingSetConverter<String> {
public static final String BINDING_DELIM = ":::";
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTableNameFactory.java
----------------------------------------------------------------------
diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTableNameFactory.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTableNameFactory.java
index 19fb8ba..bcc2381 100644
--- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTableNameFactory.java
+++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTableNameFactory.java
@@ -20,13 +20,14 @@ package org.apache.rya.indexing.pcj.storage.accumulo;
import static java.util.Objects.requireNonNull;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
/**
* Creates Accumulo table names that may be recognized by Rya as a table that
* holds the results of a Precomputed Join.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class PcjTableNameFactory {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTables.java
----------------------------------------------------------------------
diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTables.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTables.java
index a883ed0..ce3e5d1 100644
--- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTables.java
+++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTables.java
@@ -30,7 +30,8 @@ import java.util.List;
import java.util.Map.Entry;
import java.util.Set;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
@@ -74,7 +75,7 @@ import com.google.common.base.Optional;
/**
* Functions that create and maintain the PCJ tables that are used by Rya.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class PcjTables {
private static final Logger log = Logger.getLogger(PcjTables.class);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjVarOrderFactory.java
----------------------------------------------------------------------
diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjVarOrderFactory.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjVarOrderFactory.java
index 75b53d2..b699ab4 100644
--- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjVarOrderFactory.java
+++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjVarOrderFactory.java
@@ -20,7 +20,8 @@ package org.apache.rya.indexing.pcj.storage.accumulo;
import java.util.Set;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.openrdf.query.MalformedQueryException;
@@ -28,7 +29,7 @@ import org.openrdf.query.MalformedQueryException;
* Create alternative variable orders for a SPARQL query based on
* the original ordering of its results.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public interface PcjVarOrderFactory {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/ScannerBindingSetIterator.java
----------------------------------------------------------------------
diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/ScannerBindingSetIterator.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/ScannerBindingSetIterator.java
index e476dd6..d0fd7bf 100644
--- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/ScannerBindingSetIterator.java
+++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/ScannerBindingSetIterator.java
@@ -23,7 +23,8 @@ import static java.util.Objects.requireNonNull;
import java.util.Iterator;
import java.util.Map.Entry;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.data.Key;
@@ -35,7 +36,7 @@ import org.openrdf.query.BindingSet;
* Iterates over the results of a {@link Scanner} assuming the results are
* binding sets that can be converted using a {@link AccumuloPcjSerializer}.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class ScannerBindingSetIterator implements Iterator<BindingSet> {
private static final AccumuloPcjSerializer converter = new AccumuloPcjSerializer();
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/ShiftVarOrderFactory.java
----------------------------------------------------------------------
diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/ShiftVarOrderFactory.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/ShiftVarOrderFactory.java
index dedeb77..26c4339 100644
--- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/ShiftVarOrderFactory.java
+++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/ShiftVarOrderFactory.java
@@ -24,7 +24,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.openrdf.query.MalformedQueryException;
import org.openrdf.query.parser.sparql.SPARQLParser;
@@ -35,7 +36,7 @@ import com.google.common.collect.Lists;
* Shifts the variables to the left so that each variable will appear at
* the head of the varOrder once.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class ShiftVarOrderFactory implements PcjVarOrderFactory {
@Override
[3/5] incubator-rya git commit: RYA-200 Removing findbugs:jsr305
Dependency
Posted by mi...@apache.org.
RYA-200 Removing findbugs:jsr305 Dependency
Closes #115
Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/a0a871fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/a0a871fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/a0a871fc
Branch: refs/heads/master
Commit: a0a871fcd1a1f5a3154cd40543a206789ffe1d2b
Parents: f3b1680
Author: Aaron Mihalik <mi...@alum.mit.edu>
Authored: Mon Oct 17 15:20:39 2016 -0400
Committer: Aaron Mihalik <aa...@gmail.com>
Committed: Thu Oct 20 17:53:11 2016 -0400
----------------------------------------------------------------------
common/rya.api/pom.xml | 4 ++
.../apache/rya/api/client/BatchUpdatePCJ.java | 4 +-
.../org/apache/rya/api/client/CreatePCJ.java | 4 +-
.../org/apache/rya/api/client/DeletePCJ.java | 4 +-
.../rya/api/client/GetInstanceDetails.java | 4 +-
.../java/org/apache/rya/api/client/Install.java | 14 +++---
.../client/InstanceDoesNotExistException.java | 4 +-
.../apache/rya/api/client/InstanceExists.java | 4 +-
.../apache/rya/api/client/ListInstances.java | 4 +-
.../api/client/PCJDoesNotExistException.java | 4 +-
.../org/apache/rya/api/client/RyaClient.java | 8 +--
.../rya/api/client/RyaClientException.java | 4 +-
.../org/apache/rya/api/instance/RyaDetails.java | 52 ++++++++++----------
.../rya/api/instance/RyaDetailsRepository.java | 4 +-
.../api/instance/RyaDetailsToConfiguration.java | 4 +-
.../rya/api/instance/RyaDetailsUpdater.java | 6 +--
.../AccumuloRyaInstanceDetailsRepository.java | 4 +-
.../accumulo/instance/RyaDetailsSerializer.java | 4 +-
.../accumulo/utils/VisibilitySimplifier.java | 4 +-
.../mongodb/instance/MongoDetailsAdapter.java | 4 +-
.../MongoRyaInstanceDetailsRepository.java | 4 +-
.../api/client/accumulo/AccumuloCommand.java | 4 +-
.../accumulo/AccumuloConnectionDetails.java | 8 +--
.../api/client/accumulo/AccumuloCreatePCJ.java | 4 +-
.../api/client/accumulo/AccumuloDeletePCJ.java | 4 +-
.../accumulo/AccumuloGetInstanceDetails.java | 4 +-
.../api/client/accumulo/AccumuloInstall.java | 4 +-
.../client/accumulo/AccumuloInstanceExists.java | 4 +-
.../client/accumulo/AccumuloListInstances.java | 6 +--
.../accumulo/AccumuloRyaClientFactory.java | 4 +-
.../api/client/accumulo/FluoClientFactory.java | 4 +-
.../external/PrecomputedJoinIndexer.java | 4 +-
.../external/PrecomputedJoinIndexerConfig.java | 4 +-
.../indexing/external/fluo/FluoPcjUpdater.java | 4 +-
.../external/fluo/FluoPcjUpdaterSupplier.java | 4 +-
.../external/tupleSet/ParsedQueryUtil.java | 4 +-
extras/rya.benchmark/pom.xml | 5 --
.../benchmark/query/PCJOptimizerBenchmark.java | 8 +--
.../query/QueriesBenchmarkConfReader.java | 4 +-
.../rya/benchmark/query/QueryBenchmark.java | 4 +-
.../org/apache/rya/shell/SharedShellState.java | 18 +++----
.../apache/rya/shell/util/ConnectorFactory.java | 4 +-
.../rya/shell/util/InstanceNamesFormatter.java | 4 +-
.../org/apache/rya/shell/util/JLinePrompt.java | 4 +-
.../apache/rya/shell/util/PasswordPrompt.java | 4 +-
.../rya/shell/util/RyaDetailsFormatter.java | 4 +-
.../org/apache/rya/shell/util/SparqlPrompt.java | 6 +--
.../rya/indexing/pcj/storage/PcjMetadata.java | 8 +--
.../pcj/storage/PrecomputedJoinStorage.java | 4 +-
.../storage/accumulo/AccumuloPcjSerializer.java | 4 +-
.../storage/accumulo/AccumuloPcjStorage.java | 4 +-
.../storage/accumulo/BindingSetConverter.java | 4 +-
.../accumulo/BindingSetStringConverter.java | 4 +-
.../storage/accumulo/PcjTableNameFactory.java | 4 +-
.../pcj/storage/accumulo/PcjTables.java | 4 +-
.../storage/accumulo/PcjVarOrderFactory.java | 4 +-
.../accumulo/ScannerBindingSetIterator.java | 4 +-
.../storage/accumulo/ShiftVarOrderFactory.java | 4 +-
.../pcj/storage/accumulo/VariableOrder.java | 8 +--
.../storage/accumulo/VisibilityBindingSet.java | 4 +-
.../VisibilityBindingSetStringConverter.java | 4 +-
.../pcj/update/PrecomputedJoinUpdater.java | 4 +-
.../rya/indexing/pcj/fluo/api/CreatePcj.java | 4 +-
.../rya/indexing/pcj/fluo/api/DeletePcj.java | 4 +-
.../indexing/pcj/fluo/api/GetQueryReport.java | 14 +++---
.../indexing/pcj/fluo/app/BindingSetRow.java | 8 +--
.../rya/indexing/pcj/fluo/app/FilterFinder.java | 4 +-
.../pcj/fluo/app/FilterResultUpdater.java | 4 +-
.../pcj/fluo/app/FluoStringConverter.java | 4 +-
.../pcj/fluo/app/JoinResultUpdater.java | 4 +-
.../pcj/fluo/app/QueryResultUpdater.java | 4 +-
.../app/export/IncrementalResultExporter.java | 4 +-
.../IncrementalResultExporterFactory.java | 4 +-
.../pcj/fluo/app/export/ParametersBase.java | 4 +-
.../app/export/rya/RyaExportParameters.java | 6 +--
.../fluo/app/observers/BindingSetUpdater.java | 4 +-
.../pcj/fluo/app/query/CommonNodeMetadata.java | 8 +--
.../pcj/fluo/app/query/FilterMetadata.java | 12 ++---
.../indexing/pcj/fluo/app/query/FluoQuery.java | 12 ++---
.../pcj/fluo/app/query/FluoQueryColumns.java | 4 +-
.../fluo/app/query/FluoQueryMetadataDAO.java | 4 +-
.../pcj/fluo/app/query/JoinMetadata.java | 12 ++---
.../pcj/fluo/app/query/QueryMetadata.java | 12 ++---
.../fluo/app/query/SparqlFluoQueryBuilder.java | 10 ++--
.../app/query/StatementPatternMetadata.java | 12 ++---
.../pcj/fluo/client/PcjAdminClient.java | 4 +-
.../pcj/fluo/client/PcjAdminClientCommand.java | 4 +-
.../fluo/client/PcjAdminClientProperties.java | 6 +--
.../fluo/client/command/ListQueriesCommand.java | 4 +-
.../fluo/client/command/LoadTriplesCommand.java | 4 +-
.../fluo/client/command/NewQueryCommand.java | 4 +-
.../fluo/client/util/ParsedQueryRequest.java | 8 +--
.../fluo/client/util/QueryReportRenderer.java | 4 +-
.../indexing/pcj/fluo/client/util/Report.java | 14 +++---
pom.xml | 27 ++++++++--
95 files changed, 302 insertions(+), 282 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/common/rya.api/pom.xml
----------------------------------------------------------------------
diff --git a/common/rya.api/pom.xml b/common/rya.api/pom.xml
index a6f434d..acf394d 100644
--- a/common/rya.api/pom.xml
+++ b/common/rya.api/pom.xml
@@ -58,6 +58,10 @@ under the License.
<artifactId>guava</artifactId>
</dependency>
<dependency>
+ <groupId>com.github.stephenc.findbugs</groupId>
+ <artifactId>findbugs-annotations</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/common/rya.api/src/main/java/org/apache/rya/api/client/BatchUpdatePCJ.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/BatchUpdatePCJ.java b/common/rya.api/src/main/java/org/apache/rya/api/client/BatchUpdatePCJ.java
index 7fe77dd..e4b760e 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/client/BatchUpdatePCJ.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/client/BatchUpdatePCJ.java
@@ -18,12 +18,12 @@
*/
package org.apache.rya.api.client;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
/**
* Batch update a PCJ index.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public interface BatchUpdatePCJ {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/common/rya.api/src/main/java/org/apache/rya/api/client/CreatePCJ.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/CreatePCJ.java b/common/rya.api/src/main/java/org/apache/rya/api/client/CreatePCJ.java
index 57b4633..45ec32a 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/client/CreatePCJ.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/client/CreatePCJ.java
@@ -18,12 +18,12 @@
*/
package org.apache.rya.api.client;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
/**
* Create a new PCJ within the target instance of Rya.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public interface CreatePCJ {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/common/rya.api/src/main/java/org/apache/rya/api/client/DeletePCJ.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/DeletePCJ.java b/common/rya.api/src/main/java/org/apache/rya/api/client/DeletePCJ.java
index 473361b..6dcfa5c 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/client/DeletePCJ.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/client/DeletePCJ.java
@@ -18,12 +18,12 @@
*/
package org.apache.rya.api.client;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
/**
* Deletes a PCJ from an instance of Rya.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public interface DeletePCJ {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/common/rya.api/src/main/java/org/apache/rya/api/client/GetInstanceDetails.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/GetInstanceDetails.java b/common/rya.api/src/main/java/org/apache/rya/api/client/GetInstanceDetails.java
index a51076b..411c430 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/client/GetInstanceDetails.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/client/GetInstanceDetails.java
@@ -18,7 +18,7 @@
*/
package org.apache.rya.api.client;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import com.google.common.base.Optional;
@@ -27,7 +27,7 @@ import org.apache.rya.api.instance.RyaDetails;
/**
* Get configuration and maintenance information about a specific instance of Rya.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public interface GetInstanceDetails {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/common/rya.api/src/main/java/org/apache/rya/api/client/Install.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/Install.java b/common/rya.api/src/main/java/org/apache/rya/api/client/Install.java
index 2e91b00..2cbad7c 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/client/Install.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/client/Install.java
@@ -22,16 +22,16 @@ import static java.util.Objects.requireNonNull;
import java.util.Objects;
-import javax.annotation.Nullable;
-import javax.annotation.ParametersAreNonnullByDefault;
-import javax.annotation.concurrent.Immutable;
+import edu.umd.cs.findbugs.annotations.Nullable;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.concurrent.Immutable;
import com.google.common.base.Optional;
/**
* Installs a new instance of Rya.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public interface Install {
/**
@@ -59,8 +59,8 @@ public interface Install {
/**
* Configures how an instance of Rya will be configured when it is installed.
*/
- @Immutable
- @ParametersAreNonnullByDefault
+// SEE RYA-211 @Immutable
+// SEE RYA-211 @ParametersAreNonnullByDefault
public static class InstallConfiguration {
private final boolean enableTableHashPrefix;
@@ -181,7 +181,7 @@ public interface Install {
/**
* Builds instances of {@link InstallConfiguration}.
*/
- @ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public static class Builder {
private boolean enableTableHashPrefix = false;
private boolean enableFreeTextIndex = false;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/common/rya.api/src/main/java/org/apache/rya/api/client/InstanceDoesNotExistException.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/InstanceDoesNotExistException.java b/common/rya.api/src/main/java/org/apache/rya/api/client/InstanceDoesNotExistException.java
index be08e9a..03dd219 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/client/InstanceDoesNotExistException.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/client/InstanceDoesNotExistException.java
@@ -18,13 +18,13 @@
*/
package org.apache.rya.api.client;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
/**
* One of the {@link RyaClient} commands could not execute because the connected
* instance of Rya does not exist.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class InstanceDoesNotExistException extends RyaClientException {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/common/rya.api/src/main/java/org/apache/rya/api/client/InstanceExists.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/InstanceExists.java b/common/rya.api/src/main/java/org/apache/rya/api/client/InstanceExists.java
index 8b207d9..abfa278 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/client/InstanceExists.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/client/InstanceExists.java
@@ -18,12 +18,12 @@
*/
package org.apache.rya.api.client;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
/**
* Checks if an instance of Rya has been installed.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public interface InstanceExists {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/common/rya.api/src/main/java/org/apache/rya/api/client/ListInstances.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/ListInstances.java b/common/rya.api/src/main/java/org/apache/rya/api/client/ListInstances.java
index f1396ad..427e603 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/client/ListInstances.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/client/ListInstances.java
@@ -20,12 +20,12 @@ package org.apache.rya.api.client;
import java.util.List;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
/**
* List the names of the installed Rya instances.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public interface ListInstances {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/common/rya.api/src/main/java/org/apache/rya/api/client/PCJDoesNotExistException.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/PCJDoesNotExistException.java b/common/rya.api/src/main/java/org/apache/rya/api/client/PCJDoesNotExistException.java
index f58e7b4..71430b9 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/client/PCJDoesNotExistException.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/client/PCJDoesNotExistException.java
@@ -18,13 +18,13 @@
*/
package org.apache.rya.api.client;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
/**
* One of the {@link RyaClient} commands could not execute because the connected
* instance of Rya does not have a PCJ matching the provided PCJ ID.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class PCJDoesNotExistException extends RyaClientException {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/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 8b52ad9..83b0756 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
@@ -20,14 +20,14 @@ package org.apache.rya.api.client;
import static java.util.Objects.requireNonNull;
-import javax.annotation.ParametersAreNonnullByDefault;
-import javax.annotation.concurrent.Immutable;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.concurrent.Immutable;
/**
* Provides access to a set of Rya functions.
*/
-@Immutable
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @Immutable
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class RyaClient {
// Administrative functions.
private final Install install;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/common/rya.api/src/main/java/org/apache/rya/api/client/RyaClientException.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/RyaClientException.java b/common/rya.api/src/main/java/org/apache/rya/api/client/RyaClientException.java
index 491fc35..e14fb84 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/client/RyaClientException.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/client/RyaClientException.java
@@ -18,12 +18,12 @@
*/
package org.apache.rya.api.client;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
/**
* One of the {@link RyaClient} functions failed.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class RyaClientException extends Exception {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetails.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetails.java b/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetails.java
index b56d255..648b2fd 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetails.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetails.java
@@ -28,9 +28,9 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;
-import javax.annotation.Nullable;
-import javax.annotation.ParametersAreNonnullByDefault;
-import javax.annotation.concurrent.Immutable;
+import edu.umd.cs.findbugs.annotations.Nullable;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.concurrent.Immutable;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableMap;
@@ -38,8 +38,8 @@ import com.google.common.collect.ImmutableMap;
/**
* Details about how a Rya instance's state.
*/
-@Immutable
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @Immutable
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class RyaDetails implements Serializable {
private static final long serialVersionUID = 1L;
@@ -199,7 +199,7 @@ public class RyaDetails implements Serializable {
/**
* Builds instances of {@link RyaDetails}.
*/
- @ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public static class Builder {
// General metadata about the instance.
@@ -353,8 +353,8 @@ public class RyaDetails implements Serializable {
/**
* Details about a Rya instance's Geospatial Index.
*/
- @Immutable
- @ParametersAreNonnullByDefault
+// SEE RYA-211 @Immutable
+// SEE RYA-211 @ParametersAreNonnullByDefault
public static class GeoIndexDetails implements Serializable {
private static final long serialVersionUID = 1L;
@@ -397,8 +397,8 @@ public class RyaDetails implements Serializable {
/**
* Details about a Rya instance's Temporal Index.
*/
- @Immutable
- @ParametersAreNonnullByDefault
+// SEE RYA-211 @Immutable
+// SEE RYA-211 @ParametersAreNonnullByDefault
public static class TemporalIndexDetails implements Serializable {
private static final long serialVersionUID = 1L;
@@ -441,8 +441,8 @@ public class RyaDetails implements Serializable {
/**
* Details about a Rya instance's Entity Centric Index.
*/
- @Immutable
- @ParametersAreNonnullByDefault
+// SEE RYA-211 @Immutable
+// SEE RYA-211 @ParametersAreNonnullByDefault
public static class EntityCentricIndexDetails implements Serializable {
private static final long serialVersionUID = 1L;
@@ -485,8 +485,8 @@ public class RyaDetails implements Serializable {
/**
* Details about a Rya instance's Free Text Index.
*/
- @Immutable
- @ParametersAreNonnullByDefault
+// SEE RYA-211 @Immutable
+// SEE RYA-211 @ParametersAreNonnullByDefault
public static class FreeTextIndexDetails implements Serializable {
private static final long serialVersionUID = 1L;
@@ -529,8 +529,8 @@ public class RyaDetails implements Serializable {
/**
* Details about a Rya instance's PCJ Index.
*/
- @Immutable
- @ParametersAreNonnullByDefault
+// SEE RYA-211 @Immutable
+// SEE RYA-211 @ParametersAreNonnullByDefault
public static class PCJIndexDetails implements Serializable {
private static final long serialVersionUID = 1L;
@@ -618,7 +618,7 @@ public class RyaDetails implements Serializable {
/**
* Builds instance of {@link PCJIndexDetails).
*/
- @ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public static class Builder {
private Boolean enabled = null;
@@ -707,8 +707,8 @@ public class RyaDetails implements Serializable {
* Details about a Fluo Incremental PCJ application that has been installed
* as part of this Rya instance.
*/
- @Immutable
- @ParametersAreNonnullByDefault
+// SEE RYA-211 @Immutable
+// SEE RYA-211 @ParametersAreNonnullByDefault
public static class FluoDetails implements Serializable {
private static final long serialVersionUID = 1L;
@@ -752,8 +752,8 @@ public class RyaDetails implements Serializable {
/**
* Details about a specific PCJ that is being maintained within the Rya instance.
*/
- @Immutable
- @ParametersAreNonnullByDefault
+// SEE RYA-211 @Immutable
+// SEE RYA-211 @ParametersAreNonnullByDefault
public static class PCJDetails implements Serializable {
private static final long serialVersionUID = 1L;
@@ -838,7 +838,7 @@ public class RyaDetails implements Serializable {
/**
* Builds instance of {@link PCJDetails}.
*/
- @ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public static class Builder {
private String id;
@@ -944,8 +944,8 @@ public class RyaDetails implements Serializable {
/**
* Details about a Rya instance's Prospector statistics.
*/
- @Immutable
- @ParametersAreNonnullByDefault
+// SEE RYA-211 @Immutable
+// SEE RYA-211 @ParametersAreNonnullByDefault
public static class ProspectorDetails implements Serializable {
private static final long serialVersionUID = 1L;
@@ -988,8 +988,8 @@ public class RyaDetails implements Serializable {
/**
* Details about a Rya instance's Join Selectivity statistics.
*/
- @Immutable
- @ParametersAreNonnullByDefault
+// SEE RYA-211 @Immutable
+// SEE RYA-211 @ParametersAreNonnullByDefault
public static class JoinSelectivityDetails implements Serializable {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsRepository.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsRepository.java b/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsRepository.java
index c93bbce..a009ba7 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsRepository.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsRepository.java
@@ -19,13 +19,13 @@ package org.apache.rya.api.instance;
* under the License.
*/
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
/**
* Provides access to the {@link RyaDetails} information that describes
* an instance of Rya.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public interface RyaDetailsRepository {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsToConfiguration.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsToConfiguration.java b/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsToConfiguration.java
index 6c31044..678ead2 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsToConfiguration.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsToConfiguration.java
@@ -20,7 +20,7 @@ package org.apache.rya.api.instance;
import static java.util.Objects.requireNonNull;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.hadoop.conf.Configuration;
import org.apache.log4j.Logger;
@@ -31,7 +31,7 @@ import com.google.common.base.Optional;
* Used to fetch {@link RyaDetails} from a {@link RyaDetailsRepository} and
* add them to the application's {@link Configuration}.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class RyaDetailsToConfiguration {
private static final Logger log = Logger.getLogger(RyaDetailsToConfiguration.class);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsUpdater.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsUpdater.java b/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsUpdater.java
index 8205c06..cc0c833 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsUpdater.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsUpdater.java
@@ -20,7 +20,7 @@ package org.apache.rya.api.instance;
import static java.util.Objects.requireNonNull;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -35,14 +35,14 @@ import org.apache.rya.api.instance.RyaDetailsUpdater.RyaDetailsMutator.CouldNotA
* can be used in place of boilerplate code that handles the concurrent nature
* of details updates.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class RyaDetailsUpdater {
private static final Logger log = LoggerFactory.getLogger(RyaDetailsUpdater.class);
/**
* Applies a mutation to a an instance of {@link RyaDetails}.
*/
- @ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public static interface RyaDetailsMutator {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/instance/AccumuloRyaInstanceDetailsRepository.java
----------------------------------------------------------------------
diff --git a/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/instance/AccumuloRyaInstanceDetailsRepository.java b/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/instance/AccumuloRyaInstanceDetailsRepository.java
index 46d2a69..2479d3e 100644
--- a/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/instance/AccumuloRyaInstanceDetailsRepository.java
+++ b/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/instance/AccumuloRyaInstanceDetailsRepository.java
@@ -23,7 +23,7 @@ import static java.util.Objects.requireNonNull;
import java.util.Map.Entry;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
@@ -60,7 +60,7 @@ import org.apache.rya.api.instance.RyaDetailsRepository;
* style operations to synchronize writes to the object. On the downside, only
* Java clients will work.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class AccumuloRyaInstanceDetailsRepository implements RyaDetailsRepository {
public static final String INSTANCE_DETAILS_TABLE_NAME = "instance_details";
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/instance/RyaDetailsSerializer.java
----------------------------------------------------------------------
diff --git a/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/instance/RyaDetailsSerializer.java b/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/instance/RyaDetailsSerializer.java
index ca130ee..3186d33 100644
--- a/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/instance/RyaDetailsSerializer.java
+++ b/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/instance/RyaDetailsSerializer.java
@@ -27,7 +27,7 @@ import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.rya.api.instance.RyaDetails;
import org.apache.rya.api.instance.RyaDetailsRepository.RyaDetailsRepositoryException;
@@ -35,7 +35,7 @@ import org.apache.rya.api.instance.RyaDetailsRepository.RyaDetailsRepositoryExce
/**
* Serializes {@link RyaDetails} instances.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class RyaDetailsSerializer {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/utils/VisibilitySimplifier.java
----------------------------------------------------------------------
diff --git a/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/utils/VisibilitySimplifier.java b/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/utils/VisibilitySimplifier.java
index 173948c..838c1b2 100644
--- a/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/utils/VisibilitySimplifier.java
+++ b/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/utils/VisibilitySimplifier.java
@@ -20,7 +20,7 @@ package org.apache.rya.accumulo.utils;
import static java.util.Objects.requireNonNull;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.accumulo.core.security.ColumnVisibility;
@@ -29,7 +29,7 @@ import com.google.common.base.Charsets;
/**
* Simplifies Accumulo visibility expressions.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class VisibilitySimplifier {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/instance/MongoDetailsAdapter.java
----------------------------------------------------------------------
diff --git a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/instance/MongoDetailsAdapter.java b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/instance/MongoDetailsAdapter.java
index 0237b97..f80c055 100644
--- a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/instance/MongoDetailsAdapter.java
+++ b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/instance/MongoDetailsAdapter.java
@@ -25,7 +25,7 @@ import java.util.Date;
import java.util.List;
import java.util.Map.Entry;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
@@ -73,7 +73,7 @@ import org.apache.rya.api.instance.RyaDetails.TemporalIndexDetails;
* }
* </pre>
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class MongoDetailsAdapter {
public static final String INSTANCE_KEY = "instanceName";
public static final String VERSION_KEY = "version";
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/instance/MongoRyaInstanceDetailsRepository.java
----------------------------------------------------------------------
diff --git a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/instance/MongoRyaInstanceDetailsRepository.java b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/instance/MongoRyaInstanceDetailsRepository.java
index cc37013..51f1faa 100644
--- a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/instance/MongoRyaInstanceDetailsRepository.java
+++ b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/instance/MongoRyaInstanceDetailsRepository.java
@@ -22,7 +22,7 @@ package org.apache.rya.mongodb.instance;
import static com.google.common.base.Preconditions.checkNotNull;
import static java.util.Objects.requireNonNull;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import com.mongodb.BasicDBObject;
import com.mongodb.DB;
@@ -39,7 +39,7 @@ import org.apache.rya.mongodb.instance.MongoDetailsAdapter.MalformedRyaDetailsEx
* An implementation of {@link RyaDetailsRepository} that stores a Rya
* instance's {@link RyaDetails} in a Mongo document.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class MongoRyaInstanceDetailsRepository implements RyaDetailsRepository {
private static final String INSTANCE_DETAILS_COLLECTION_NAME = "instance_details";
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloCommand.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloCommand.java b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloCommand.java
index 2ccc46e..1ca8e19 100644
--- a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloCommand.java
+++ b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloCommand.java
@@ -20,7 +20,7 @@ package org.apache.rya.api.client.accumulo;
import static java.util.Objects.requireNonNull;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.accumulo.core.client.Connector;
@@ -28,7 +28,7 @@ import org.apache.accumulo.core.client.Connector;
* An abstract class that holds onto Accumulo access information. Extend this
* when implementing a command that interacts with Accumulo.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public abstract class AccumuloCommand {
private final AccumuloConnectionDetails connectionDetails;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloConnectionDetails.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloConnectionDetails.java b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloConnectionDetails.java
index ece329b..84deeee 100644
--- a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloConnectionDetails.java
+++ b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloConnectionDetails.java
@@ -20,14 +20,14 @@ package org.apache.rya.api.client.accumulo;
import static java.util.Objects.requireNonNull;
-import javax.annotation.ParametersAreNonnullByDefault;
-import javax.annotation.concurrent.Immutable;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.concurrent.Immutable;
/**
* The information that the shell used to connect to Accumulo.
*/
-@Immutable
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @Immutable
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class AccumuloConnectionDetails {
private final String username;
private final char[] password;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloCreatePCJ.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloCreatePCJ.java b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloCreatePCJ.java
index b3718be..dcf1368 100644
--- a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloCreatePCJ.java
+++ b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloCreatePCJ.java
@@ -21,7 +21,7 @@ package org.apache.rya.api.client.accumulo;
import static com.google.common.base.Preconditions.checkNotNull;
import static java.util.Objects.requireNonNull;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.accumulo.core.client.Connector;
import org.apache.rya.indexing.pcj.storage.PcjException;
@@ -59,7 +59,7 @@ import org.apache.rya.rdftriplestore.RyaSailRepository;
/**
* An Accumulo implementation of the {@link CreatePCJ} command.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class AccumuloCreatePCJ extends AccumuloCommand implements CreatePCJ {
private final GetInstanceDetails getInstanceDetails;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloDeletePCJ.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloDeletePCJ.java b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloDeletePCJ.java
index 757c076..ac9633f 100644
--- a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloDeletePCJ.java
+++ b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloDeletePCJ.java
@@ -20,7 +20,7 @@ package org.apache.rya.api.client.accumulo;
import static java.util.Objects.requireNonNull;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.accumulo.core.client.Connector;
import org.apache.rya.indexing.pcj.fluo.api.DeletePcj;
@@ -46,7 +46,7 @@ import org.apache.rya.api.instance.RyaDetails.PCJIndexDetails.PCJDetails.PCJUpda
/**
* An Accumulo implementation of the {@link DeletePCJ} command.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class AccumuloDeletePCJ extends AccumuloCommand implements DeletePCJ {
private static final Logger log = LoggerFactory.getLogger(AccumuloDeletePCJ.class);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloGetInstanceDetails.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloGetInstanceDetails.java b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloGetInstanceDetails.java
index b6fb1ee..4a23df3 100644
--- a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloGetInstanceDetails.java
+++ b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloGetInstanceDetails.java
@@ -20,7 +20,7 @@ package org.apache.rya.api.client.accumulo;
import static java.util.Objects.requireNonNull;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.accumulo.core.client.Connector;
@@ -39,7 +39,7 @@ import org.apache.rya.api.instance.RyaDetailsRepository.RyaDetailsRepositoryExce
/**
* An Accumulo implementation of the {@link GetInstanceDetails} command.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class AccumuloGetInstanceDetails extends AccumuloCommand implements GetInstanceDetails {
private final InstanceExists instanceExists;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloInstall.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloInstall.java b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloInstall.java
index 8030150..c873775 100644
--- a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloInstall.java
+++ b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloInstall.java
@@ -22,7 +22,7 @@ import static java.util.Objects.requireNonNull;
import java.util.Date;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
@@ -60,7 +60,7 @@ import org.apache.rya.sail.config.RyaSailFactory;
* An Accumulo implementation of the {@link Install} command.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class AccumuloInstall extends AccumuloCommand implements Install {
private final InstanceExists instanceExists;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloInstanceExists.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloInstanceExists.java b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloInstanceExists.java
index 17084fb..fce56d4 100644
--- a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloInstanceExists.java
+++ b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloInstanceExists.java
@@ -20,7 +20,7 @@ package org.apache.rya.api.client.accumulo;
import static java.util.Objects.requireNonNull;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.admin.TableOperations;
@@ -33,7 +33,7 @@ import org.apache.rya.api.client.RyaClientException;
/**
* An Accumulo implementation of the {@link InstanceExists} command.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class AccumuloInstanceExists extends AccumuloCommand implements InstanceExists {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloListInstances.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloListInstances.java b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloListInstances.java
index a6275bc..b35dc58 100644
--- a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloListInstances.java
+++ b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloListInstances.java
@@ -26,7 +26,7 @@ import java.util.Map.Entry;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.accumulo.core.client.Connector;
@@ -37,7 +37,7 @@ import org.apache.rya.api.client.RyaClientException;
/**
* An Accumulo implementation of the {@link ListInstances} command.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class AccumuloListInstances extends AccumuloCommand implements ListInstances {
private final Pattern spoPattern = Pattern.compile("(.*)" + RdfCloudTripleStoreConstants.TBL_SPO_SUFFIX);
@@ -104,7 +104,7 @@ public class AccumuloListInstances extends AccumuloCommand implements ListInstan
/**
* Flags that are used to determine if a String is a Rya Instance name.
*/
- @ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
private static class InstanceTablesFound {
private boolean spoFound = false;
private boolean ospFound = false;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloRyaClientFactory.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloRyaClientFactory.java b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloRyaClientFactory.java
index 335156e..44779ac 100644
--- a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloRyaClientFactory.java
+++ b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloRyaClientFactory.java
@@ -20,7 +20,7 @@ package org.apache.rya.api.client.accumulo;
import static java.util.Objects.requireNonNull;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.accumulo.core.client.Connector;
@@ -30,7 +30,7 @@ import org.apache.rya.api.client.RyaClient;
* Constructs instance of {@link RyaClient} that are connected to instance of
* Rya hosted by Accumulo clusters.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class AccumuloRyaClientFactory {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/FluoClientFactory.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/FluoClientFactory.java b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/FluoClientFactory.java
index d77c2ec..15c8785 100644
--- a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/FluoClientFactory.java
+++ b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/FluoClientFactory.java
@@ -20,7 +20,7 @@ package org.apache.rya.api.client.accumulo;
import static java.util.Objects.requireNonNull;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.fluo.api.client.FluoClient;
import org.apache.fluo.api.client.FluoFactory;
@@ -29,7 +29,7 @@ import org.apache.fluo.api.config.FluoConfiguration;
/**
* Creates {@link FluoClient}s that are connected to a specific Fluo Application.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class FluoClientFactory {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinIndexer.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinIndexer.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinIndexer.java
index 37d3305..be55687 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinIndexer.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinIndexer.java
@@ -26,7 +26,7 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.MultiTableBatchWriter;
@@ -53,7 +53,7 @@ import org.apache.rya.indexing.external.fluo.PcjUpdaterSupplierFactory;
/**
* Updates the state of the Precomputed Join indices that are used by Rya.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class PrecomputedJoinIndexer extends AbstractAccumuloIndexer {
private static final Logger log = Logger
.getLogger(PrecomputedJoinIndexer.class);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinIndexerConfig.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinIndexerConfig.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinIndexerConfig.java
index a4f0c2d..4f25137 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinIndexerConfig.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinIndexerConfig.java
@@ -20,7 +20,7 @@ package org.apache.rya.indexing.external;
import static com.google.common.base.Preconditions.checkNotNull;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.rya.api.persist.index.RyaSecondaryIndexer;
import org.apache.rya.indexing.accumulo.ConfigUtils;
@@ -36,7 +36,7 @@ import com.google.common.base.Optional;
* of {@link RyaSecondaryIndexer} to provide {@link PrecomputedJoinIndexer}
* specific values.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class PrecomputedJoinIndexerConfig {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdater.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdater.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdater.java
index c31ef02..7a73fba 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdater.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdater.java
@@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Collection;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.log4j.Logger;
import org.apache.rya.indexing.pcj.fluo.api.InsertTriples;
@@ -37,7 +37,7 @@ import org.apache.rya.api.domain.RyaStatement;
* Updates the PCJ indices by forwarding the statement additions/removals to
* a Fluo application.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class FluoPcjUpdater implements PrecomputedJoinUpdater {
private static final Logger log = Logger.getLogger(FluoPcjUpdater.class);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdaterSupplier.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdaterSupplier.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdaterSupplier.java
index d0e4c23..98deac7 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdaterSupplier.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdaterSupplier.java
@@ -30,7 +30,7 @@ import org.apache.fluo.api.client.FluoClient;
import org.apache.fluo.api.client.FluoFactory;
import org.apache.fluo.api.config.FluoConfiguration;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.rya.indexing.external.PrecomputedJoinIndexerConfig;
import org.apache.rya.indexing.external.PrecomputedJoinIndexerConfig.PrecomputedJoinUpdaterType;
@@ -44,7 +44,7 @@ import com.google.common.base.Supplier;
/**
* Creates instances of {@link FluoPcjUpdater} using the values found in a {@link Configuration}.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class FluoPcjUpdaterSupplier implements Supplier<PrecomputedJoinUpdater> {
private final Supplier<Configuration> configSupplier;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/indexing/src/main/java/org/apache/rya/indexing/external/tupleSet/ParsedQueryUtil.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/tupleSet/ParsedQueryUtil.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/tupleSet/ParsedQueryUtil.java
index 434afb0..cac68bc 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/tupleSet/ParsedQueryUtil.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/tupleSet/ParsedQueryUtil.java
@@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.concurrent.atomic.AtomicReference;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.openrdf.query.algebra.Projection;
import org.openrdf.query.algebra.helpers.QueryModelVisitorBase;
@@ -33,7 +33,7 @@ import com.google.common.base.Optional;
/**
* Utilities that help applications inspect {@link ParsedQuery} objects.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class ParsedQueryUtil {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.benchmark/pom.xml
----------------------------------------------------------------------
diff --git a/extras/rya.benchmark/pom.xml b/extras/rya.benchmark/pom.xml
index 5f39cc8..090a0aa 100644
--- a/extras/rya.benchmark/pom.xml
+++ b/extras/rya.benchmark/pom.xml
@@ -54,11 +54,6 @@
<!-- Utils -->
<dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </dependency>
-
- <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/PCJOptimizerBenchmark.java
----------------------------------------------------------------------
diff --git a/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/PCJOptimizerBenchmark.java b/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/PCJOptimizerBenchmark.java
index b9d12d1..57a6b41 100644
--- a/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/PCJOptimizerBenchmark.java
+++ b/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/PCJOptimizerBenchmark.java
@@ -28,7 +28,7 @@ import java.util.Map;
import java.util.Objects;
import java.util.Queue;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.Param;
@@ -71,7 +71,7 @@ import org.apache.rya.indexing.pcj.matching.PCJOptimizer;
* </pre>
*/
@State(Scope.Thread)
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class PCJOptimizerBenchmark {
/**
@@ -305,7 +305,7 @@ public class PCJOptimizerBenchmark {
/**
* The parameter values used by the benchmark. Used to lookup a benchmark' {@link BenchmarkValues}.
*/
- @ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public static class BenchmarkParams {
private final int numPCJs;
private final int pcjSPCount;
@@ -369,7 +369,7 @@ public class PCJOptimizerBenchmark {
* Holds onto the SPARQL query that will be optimized as well as the optimizers
* that will be used to optimize the query.
*/
- @ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public static class BenchmarkValues {
private final TupleExpr query;
private final PCJOptimizer optimizer;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/QueriesBenchmarkConfReader.java
----------------------------------------------------------------------
diff --git a/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/QueriesBenchmarkConfReader.java b/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/QueriesBenchmarkConfReader.java
index 8cbf203..7a92d1f 100644
--- a/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/QueriesBenchmarkConfReader.java
+++ b/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/QueriesBenchmarkConfReader.java
@@ -22,7 +22,7 @@ import static java.util.Objects.requireNonNull;
import java.io.InputStream;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import javax.xml.XMLConstants;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
@@ -39,7 +39,7 @@ import com.google.common.base.Suppliers;
/**
* Unmarshalls instances of {@link QueriesBenchmarkConf}.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public final class QueriesBenchmarkConfReader {
// It is assumed the schema file is held within the root directory of the packaged jar.
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/QueryBenchmark.java
----------------------------------------------------------------------
diff --git a/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/QueryBenchmark.java b/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/QueryBenchmark.java
index e24ac54..8cf05f1 100644
--- a/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/QueryBenchmark.java
+++ b/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/QueryBenchmark.java
@@ -28,7 +28,7 @@ import java.util.List;
import java.util.Optional;
import java.util.concurrent.TimeUnit;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.log4j.ConsoleAppender;
import org.apache.log4j.Level;
@@ -248,7 +248,7 @@ public class QueryBenchmark {
/**
* Executes an iteration of the benchmarked logic.
*/
- @ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public static final class QueryBenchmarkRun {
private final SailConnection sailConn;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.console/src/main/java/org/apache/rya/shell/SharedShellState.java
----------------------------------------------------------------------
diff --git a/extras/rya.console/src/main/java/org/apache/rya/shell/SharedShellState.java b/extras/rya.console/src/main/java/org/apache/rya/shell/SharedShellState.java
index e9ada65..508e65e 100644
--- a/extras/rya.console/src/main/java/org/apache/rya/shell/SharedShellState.java
+++ b/extras/rya.console/src/main/java/org/apache/rya/shell/SharedShellState.java
@@ -23,10 +23,10 @@ import static java.util.Objects.requireNonNull;
import java.util.Objects;
import java.util.concurrent.locks.ReentrantLock;
-import javax.annotation.Nullable;
-import javax.annotation.ParametersAreNonnullByDefault;
-import javax.annotation.concurrent.Immutable;
-import javax.annotation.concurrent.ThreadSafe;
+import edu.umd.cs.findbugs.annotations.Nullable;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.concurrent.Immutable;
+// SEE RYA-211 import javax.annotation.concurrent.ThreadSafe;
import com.google.common.base.Optional;
@@ -36,8 +36,8 @@ import org.apache.rya.api.client.accumulo.AccumuloConnectionDetails;
/**
* Holds values that are shared between the various Rya command classes.
*/
-@ThreadSafe
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ThreadSafe
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class SharedShellState {
// The shared nature of this object means we shouldn't assume only a single thread is accessing it.
private final ReentrantLock lock = new ReentrantLock();
@@ -161,8 +161,8 @@ public class SharedShellState {
/**
* Values that define the state of a Rya Shell.
*/
- @Immutable
- @ParametersAreNonnullByDefault
+// SEE RYA-211 @Immutable
+// SEE RYA-211 @ParametersAreNonnullByDefault
public static final class ShellState {
// Indicates the state of the shell.
private final ConnectionState connectionState;
@@ -258,7 +258,7 @@ public class SharedShellState {
/**
* Builds instances of {@link ShellState}.
*/
- @ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public static class Builder {
private ConnectionState connectionState;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.console/src/main/java/org/apache/rya/shell/util/ConnectorFactory.java
----------------------------------------------------------------------
diff --git a/extras/rya.console/src/main/java/org/apache/rya/shell/util/ConnectorFactory.java b/extras/rya.console/src/main/java/org/apache/rya/shell/util/ConnectorFactory.java
index 9aaa402..f960530 100644
--- a/extras/rya.console/src/main/java/org/apache/rya/shell/util/ConnectorFactory.java
+++ b/extras/rya.console/src/main/java/org/apache/rya/shell/util/ConnectorFactory.java
@@ -20,7 +20,7 @@ package org.apache.rya.shell.util;
import static java.util.Objects.requireNonNull;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
@@ -32,7 +32,7 @@ import org.apache.accumulo.core.client.security.tokens.PasswordToken;
/**
* Creates {@link Connector}s that are linked to an instance of Accumulo.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class ConnectorFactory {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.console/src/main/java/org/apache/rya/shell/util/InstanceNamesFormatter.java
----------------------------------------------------------------------
diff --git a/extras/rya.console/src/main/java/org/apache/rya/shell/util/InstanceNamesFormatter.java b/extras/rya.console/src/main/java/org/apache/rya/shell/util/InstanceNamesFormatter.java
index c8fe791..c99cef0 100644
--- a/extras/rya.console/src/main/java/org/apache/rya/shell/util/InstanceNamesFormatter.java
+++ b/extras/rya.console/src/main/java/org/apache/rya/shell/util/InstanceNamesFormatter.java
@@ -22,12 +22,12 @@ import static java.util.Objects.requireNonNull;
import java.util.List;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
/**
* Pretty formats a list of Rya instance names.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class InstanceNamesFormatter {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.console/src/main/java/org/apache/rya/shell/util/JLinePrompt.java
----------------------------------------------------------------------
diff --git a/extras/rya.console/src/main/java/org/apache/rya/shell/util/JLinePrompt.java b/extras/rya.console/src/main/java/org/apache/rya/shell/util/JLinePrompt.java
index caa19b2..472016d 100644
--- a/extras/rya.console/src/main/java/org/apache/rya/shell/util/JLinePrompt.java
+++ b/extras/rya.console/src/main/java/org/apache/rya/shell/util/JLinePrompt.java
@@ -23,7 +23,7 @@ import static java.util.Objects.requireNonNull;
import java.io.IOException;
import java.util.Set;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.util.FieldUtils;
@@ -38,7 +38,7 @@ import jline.console.ConsoleReader;
* Provides access to the host {@link Shell}'s {@link ConsoleReader} and some
* utility functions for using it.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public abstract class JLinePrompt {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.console/src/main/java/org/apache/rya/shell/util/PasswordPrompt.java
----------------------------------------------------------------------
diff --git a/extras/rya.console/src/main/java/org/apache/rya/shell/util/PasswordPrompt.java b/extras/rya.console/src/main/java/org/apache/rya/shell/util/PasswordPrompt.java
index db2913d..88b96ff 100644
--- a/extras/rya.console/src/main/java/org/apache/rya/shell/util/PasswordPrompt.java
+++ b/extras/rya.console/src/main/java/org/apache/rya/shell/util/PasswordPrompt.java
@@ -20,14 +20,14 @@ package org.apache.rya.shell.util;
import java.io.IOException;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import jline.console.ConsoleReader;
/**
* A mechanism for prompting a user of the application for a password.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public interface PasswordPrompt {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.console/src/main/java/org/apache/rya/shell/util/RyaDetailsFormatter.java
----------------------------------------------------------------------
diff --git a/extras/rya.console/src/main/java/org/apache/rya/shell/util/RyaDetailsFormatter.java b/extras/rya.console/src/main/java/org/apache/rya/shell/util/RyaDetailsFormatter.java
index fc85bb0..fbb9837 100644
--- a/extras/rya.console/src/main/java/org/apache/rya/shell/util/RyaDetailsFormatter.java
+++ b/extras/rya.console/src/main/java/org/apache/rya/shell/util/RyaDetailsFormatter.java
@@ -20,7 +20,7 @@ package org.apache.rya.shell.util;
import static java.util.Objects.requireNonNull;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableMap;
@@ -32,7 +32,7 @@ import org.apache.rya.api.instance.RyaDetails.PCJIndexDetails.PCJDetails;
/**
* Formats an instance of {@link RyaDetails}.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class RyaDetailsFormatter {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.console/src/main/java/org/apache/rya/shell/util/SparqlPrompt.java
----------------------------------------------------------------------
diff --git a/extras/rya.console/src/main/java/org/apache/rya/shell/util/SparqlPrompt.java b/extras/rya.console/src/main/java/org/apache/rya/shell/util/SparqlPrompt.java
index e1cb390..4b29d28 100644
--- a/extras/rya.console/src/main/java/org/apache/rya/shell/util/SparqlPrompt.java
+++ b/extras/rya.console/src/main/java/org/apache/rya/shell/util/SparqlPrompt.java
@@ -20,14 +20,14 @@ package org.apache.rya.shell.util;
import java.io.IOException;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import jline.console.ConsoleReader;
/**
* A mechanism for prompting a user of the application for a SPARQL string.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public interface SparqlPrompt {
/**
@@ -42,7 +42,7 @@ public interface SparqlPrompt {
/**
* Prompts a user for a SPARQL query using a JLine {@link ConsoleReader}.
*/
- @ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public static class JLineSparqlPrompt extends JLinePrompt implements SparqlPrompt {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/PcjMetadata.java
----------------------------------------------------------------------
diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/PcjMetadata.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/PcjMetadata.java
index 90ca83c..75bde6c 100644
--- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/PcjMetadata.java
+++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/PcjMetadata.java
@@ -24,8 +24,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Collection;
import java.util.Objects;
-import javax.annotation.ParametersAreNonnullByDefault;
-import javax.annotation.concurrent.Immutable;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.concurrent.Immutable;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder;
@@ -35,8 +35,8 @@ import com.google.common.collect.ImmutableSet;
/**
* Metadata that is stored in a PCJ table about the results that are stored within it.
*/
-@Immutable
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @Immutable
+// SEE RYA-211 @ParametersAreNonnullByDefault
public final class PcjMetadata {
private final String sparql;
private final long cardinality;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/PrecomputedJoinStorage.java
----------------------------------------------------------------------
diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/PrecomputedJoinStorage.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/PrecomputedJoinStorage.java
index caaa8b6..9f0dc5c 100644
--- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/PrecomputedJoinStorage.java
+++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/PrecomputedJoinStorage.java
@@ -22,7 +22,7 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.rya.indexing.pcj.storage.accumulo.VisibilityBindingSet;
import org.openrdf.query.BindingSet;
@@ -30,7 +30,7 @@ import org.openrdf.query.BindingSet;
/**
* Functions that create and maintain the PCJ tables that are used by Rya.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public interface PrecomputedJoinStorage {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjSerializer.java
----------------------------------------------------------------------
diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjSerializer.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjSerializer.java
index 77f70b1..249c0d2 100644
--- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjSerializer.java
+++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjSerializer.java
@@ -30,7 +30,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Set;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.openrdf.model.Value;
import org.openrdf.query.Binding;
@@ -49,7 +49,7 @@ import org.apache.rya.api.resolver.RyaTypeResolverException;
* Converts {@link BindingSet}s to byte[]s and back again. The bytes do not
* include the binding names and are ordered with a {@link VariableOrder}.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class AccumuloPcjSerializer implements BindingSetConverter<byte[]> {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjStorage.java
----------------------------------------------------------------------
diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjStorage.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjStorage.java
index bc615d1..8463c43 100644
--- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjStorage.java
+++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjStorage.java
@@ -25,7 +25,7 @@ import java.util.Collection;
import java.util.List;
import java.util.Set;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
@@ -50,7 +50,7 @@ import org.apache.rya.api.instance.RyaDetailsUpdater.RyaDetailsMutator.CouldNotA
/**
* An Accumulo backed implementation of {@link PrecomputedJoinStorage}.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class AccumuloPcjStorage implements PrecomputedJoinStorage {
// Factories that are used to create new PCJs.
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetConverter.java
----------------------------------------------------------------------
diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetConverter.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetConverter.java
index 9a52531..6c2e056 100644
--- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetConverter.java
+++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetConverter.java
@@ -18,7 +18,7 @@
*/
package org.apache.rya.indexing.pcj.storage.accumulo;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.openrdf.query.Binding;
import org.openrdf.query.BindingSet;
@@ -30,7 +30,7 @@ import org.openrdf.query.BindingSet;
*
* @param <T> Defines the type of model {@link BindingSet}s will be converted into/from.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public interface BindingSetConverter<T> {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetStringConverter.java
----------------------------------------------------------------------
diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetStringConverter.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetStringConverter.java
index e73870a..b1ea054 100644
--- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetStringConverter.java
+++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetStringConverter.java
@@ -25,7 +25,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.openrdf.model.URI;
import org.openrdf.model.Value;
@@ -46,7 +46,7 @@ import org.apache.rya.api.resolver.RdfToRyaConversions;
* Converts {@link BindingSet}s to Strings and back again. The Strings do not
* include the binding names and are ordered with a {@link VariableOrder}.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class BindingSetStringConverter implements BindingSetConverter<String> {
public static final String BINDING_DELIM = ":::";
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTableNameFactory.java
----------------------------------------------------------------------
diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTableNameFactory.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTableNameFactory.java
index 588792b..19fb8ba 100644
--- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTableNameFactory.java
+++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTableNameFactory.java
@@ -20,13 +20,13 @@ package org.apache.rya.indexing.pcj.storage.accumulo;
import static java.util.Objects.requireNonNull;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
/**
* Creates Accumulo table names that may be recognized by Rya as a table that
* holds the results of a Precomputed Join.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class PcjTableNameFactory {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTables.java
----------------------------------------------------------------------
diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTables.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTables.java
index c29cd2e..a883ed0 100644
--- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTables.java
+++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTables.java
@@ -30,7 +30,7 @@ import java.util.List;
import java.util.Map.Entry;
import java.util.Set;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
@@ -74,7 +74,7 @@ import com.google.common.base.Optional;
/**
* Functions that create and maintain the PCJ tables that are used by Rya.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class PcjTables {
private static final Logger log = Logger.getLogger(PcjTables.class);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjVarOrderFactory.java
----------------------------------------------------------------------
diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjVarOrderFactory.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjVarOrderFactory.java
index 00b4c99..75b53d2 100644
--- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjVarOrderFactory.java
+++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjVarOrderFactory.java
@@ -20,7 +20,7 @@ package org.apache.rya.indexing.pcj.storage.accumulo;
import java.util.Set;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.openrdf.query.MalformedQueryException;
@@ -28,7 +28,7 @@ import org.openrdf.query.MalformedQueryException;
* Create alternative variable orders for a SPARQL query based on
* the original ordering of its results.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public interface PcjVarOrderFactory {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/ScannerBindingSetIterator.java
----------------------------------------------------------------------
diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/ScannerBindingSetIterator.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/ScannerBindingSetIterator.java
index b641070..e476dd6 100644
--- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/ScannerBindingSetIterator.java
+++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/ScannerBindingSetIterator.java
@@ -23,7 +23,7 @@ import static java.util.Objects.requireNonNull;
import java.util.Iterator;
import java.util.Map.Entry;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.data.Key;
@@ -35,7 +35,7 @@ import org.openrdf.query.BindingSet;
* Iterates over the results of a {@link Scanner} assuming the results are
* binding sets that can be converted using a {@link AccumuloPcjSerializer}.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class ScannerBindingSetIterator implements Iterator<BindingSet> {
private static final AccumuloPcjSerializer converter = new AccumuloPcjSerializer();
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/ShiftVarOrderFactory.java
----------------------------------------------------------------------
diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/ShiftVarOrderFactory.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/ShiftVarOrderFactory.java
index b4ba348..dedeb77 100644
--- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/ShiftVarOrderFactory.java
+++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/ShiftVarOrderFactory.java
@@ -24,7 +24,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.openrdf.query.MalformedQueryException;
import org.openrdf.query.parser.sparql.SPARQLParser;
@@ -35,7 +35,7 @@ import com.google.common.collect.Lists;
* Shifts the variables to the left so that each variable will appear at
* the head of the varOrder once.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class ShiftVarOrderFactory implements PcjVarOrderFactory {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VariableOrder.java
----------------------------------------------------------------------
diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VariableOrder.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VariableOrder.java
index ef88d8c..7e903bc 100644
--- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VariableOrder.java
+++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VariableOrder.java
@@ -23,8 +23,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Collection;
import java.util.Iterator;
-import javax.annotation.ParametersAreNonnullByDefault;
-import javax.annotation.concurrent.Immutable;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.concurrent.Immutable;
import org.openrdf.query.BindingSet;
@@ -36,8 +36,8 @@ import com.google.common.collect.ImmutableList;
* specify the order {@link Binding}s within the set are serialized to Accumulo.
* This order effects which rows a prefix scan will hit.
*/
-@Immutable
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @Immutable
+// SEE RYA-211 @ParametersAreNonnullByDefault
public final class VariableOrder implements Iterable<String> {
public static final String VAR_ORDER_DELIM = ";";
[4/5] incubator-rya git commit: RYA-211 Replacing Findbugs
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VariableOrder.java
----------------------------------------------------------------------
diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VariableOrder.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VariableOrder.java
index 7e903bc..6ec801e 100644
--- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VariableOrder.java
+++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VariableOrder.java
@@ -23,8 +23,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Collection;
import java.util.Iterator;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
-// SEE RYA-211 import javax.annotation.concurrent.Immutable;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import net.jcip.annotations.Immutable;
import org.openrdf.query.BindingSet;
@@ -36,8 +37,8 @@ import com.google.common.collect.ImmutableList;
* specify the order {@link Binding}s within the set are serialized to Accumulo.
* This order effects which rows a prefix scan will hit.
*/
-// SEE RYA-211 @Immutable
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@Immutable
+@DefaultAnnotation(NonNull.class)
public final class VariableOrder implements Iterable<String> {
public static final String VAR_ORDER_DELIM = ";";
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSet.java
----------------------------------------------------------------------
diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSet.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSet.java
index d98f556..740c41e 100644
--- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSet.java
+++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSet.java
@@ -20,14 +20,15 @@ package org.apache.rya.indexing.pcj.storage.accumulo;
import static java.util.Objects.requireNonNull;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.openrdf.query.BindingSet;
/**
* Decorates a {@link BindingSet} with a collection of visibilities.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class VisibilityBindingSet extends BindingSetDecorator {
private static final long serialVersionUID = 1L;
private String visibility;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetStringConverter.java
----------------------------------------------------------------------
diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetStringConverter.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetStringConverter.java
index 8530efe..942ba38 100644
--- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetStringConverter.java
+++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetStringConverter.java
@@ -18,7 +18,8 @@
*/
package org.apache.rya.indexing.pcj.storage.accumulo;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.openrdf.query.BindingSet;
@@ -26,7 +27,7 @@ import org.openrdf.query.BindingSet;
* Converts {@link BindingSet}s to Strings and back again. The Strings do not
* include the binding names and are ordered with a {@link VariableOrder}.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class VisibilityBindingSetStringConverter extends BindingSetStringConverter {
public static final char VISIBILITY_DELIM = 1;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/update/PrecomputedJoinUpdater.java
----------------------------------------------------------------------
diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/update/PrecomputedJoinUpdater.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/update/PrecomputedJoinUpdater.java
index 462bf4d..2baa52e 100644
--- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/update/PrecomputedJoinUpdater.java
+++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/update/PrecomputedJoinUpdater.java
@@ -20,7 +20,8 @@ package org.apache.rya.indexing.pcj.update;
import java.util.Collection;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.rya.indexing.pcj.storage.PcjException;
@@ -30,7 +31,7 @@ import org.apache.rya.api.domain.RyaStatement;
* Updates the state of all PCJ indices whenever {@link RyaStatement}s are
* added to or removed from the system.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public interface PrecomputedJoinUpdater {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CreatePcj.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CreatePcj.java b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CreatePcj.java
index 1066050..1259a01 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CreatePcj.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CreatePcj.java
@@ -26,7 +26,8 @@ import static org.apache.rya.indexing.pcj.fluo.app.IncrementalUpdateConstants.NO
import java.util.HashSet;
import java.util.Set;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.rya.indexing.pcj.fluo.app.FluoStringConverter;
import org.apache.rya.indexing.pcj.fluo.app.query.FluoQuery;
@@ -71,7 +72,7 @@ import org.apache.fluo.api.client.Transaction;
* will percolate to the top of the query, and those results will be exported to
* Rya's query system.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class CreatePcj {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/DeletePcj.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/DeletePcj.java b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/DeletePcj.java
index 4d3d779..1d92262 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/DeletePcj.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/DeletePcj.java
@@ -25,7 +25,8 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.rya.indexing.pcj.fluo.app.NodeType;
import org.apache.rya.indexing.pcj.fluo.app.query.FilterMetadata;
@@ -56,7 +57,7 @@ import org.apache.fluo.api.data.Span;
* into memory.</li>
* </ol>
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class DeletePcj {
private final FluoQueryMetadataDAO dao = new FluoQueryMetadataDAO();
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/GetQueryReport.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/GetQueryReport.java b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/GetQueryReport.java
index 51d580d..1fb1485 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/GetQueryReport.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/GetQueryReport.java
@@ -26,8 +26,9 @@ import java.util.List;
import java.util.Map;
import edu.umd.cs.findbugs.annotations.Nullable;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
-// SEE RYA-211 import javax.annotation.concurrent.Immutable;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import net.jcip.annotations.Immutable;
import org.apache.rya.indexing.pcj.fluo.app.query.FilterMetadata;
import org.apache.rya.indexing.pcj.fluo.app.query.FluoQuery;
@@ -50,7 +51,7 @@ import org.apache.fluo.api.data.Span;
* Get a reports that indicates how many binding sets have been emitted for
* the queries that is being managed by the fluo application.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class GetQueryReport {
private final FluoQueryMetadataDAO metadataDao = new FluoQueryMetadataDAO();
@@ -145,8 +146,8 @@ public class GetQueryReport {
* as well as the number of Binding Sets that have been emitted for each of
* the query nodes.
*/
-// SEE RYA-211 @Immutable
-// SEE RYA-211 @ParametersAreNonnullByDefault
+ @Immutable
+ @DefaultAnnotation(NonNull.class)
public static final class QueryReport {
/**
@@ -212,7 +213,7 @@ public class GetQueryReport {
/**
* Builds instances of {@link QueryReport}.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+ @DefaultAnnotation(NonNull.class)
public static final class Builder {
private FluoQuery fluoQuery = null;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/BindingSetRow.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/BindingSetRow.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/BindingSetRow.java
index 16374ad..8c8505d 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/BindingSetRow.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/BindingSetRow.java
@@ -21,8 +21,9 @@ package org.apache.rya.indexing.pcj.fluo.app;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.apache.rya.indexing.pcj.fluo.app.IncrementalUpdateConstants.NODEID_BS_DELIM;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
-// SEE RYA-211 import javax.annotation.concurrent.Immutable;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import net.jcip.annotations.Immutable;
import org.apache.fluo.api.data.Bytes;
@@ -30,8 +31,8 @@ import org.apache.fluo.api.data.Bytes;
* The values of an Accumulo Row ID for a row that stores a Binding set for
* a specific Node ID of a query.
*/
-// SEE RYA-211 @Immutable
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@Immutable
+@DefaultAnnotation(NonNull.class)
public class BindingSetRow {
private final String nodeId;
private final String bindingSetString;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FilterFinder.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FilterFinder.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FilterFinder.java
index 034f510..ae976ee 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FilterFinder.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FilterFinder.java
@@ -23,7 +23,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.concurrent.atomic.AtomicReference;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.openrdf.query.algebra.Filter;
import org.openrdf.query.algebra.helpers.QueryModelVisitorBase;
@@ -35,7 +36,7 @@ import com.google.common.base.Optional;
/**
* Searches a SPARQL query for {@link Filter}s.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
class FilterFinder {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FilterResultUpdater.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FilterResultUpdater.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FilterResultUpdater.java
index 85b7bd7..3b17a33 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FilterResultUpdater.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FilterResultUpdater.java
@@ -21,7 +21,8 @@ package org.apache.rya.indexing.pcj.fluo.app;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.apache.rya.indexing.pcj.fluo.app.IncrementalUpdateConstants.NODEID_BS_DELIM;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.rya.indexing.pcj.fluo.app.query.FilterMetadata;
import org.apache.rya.indexing.pcj.fluo.app.query.FluoQueryColumns;
@@ -57,7 +58,7 @@ import org.apache.fluo.api.data.Column;
* Updates the results of a Filter node when its child has added a new Binding
* Set to its results.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class FilterResultUpdater {
private static final BindingSetStringConverter ID_CONVERTER = new BindingSetStringConverter();
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FluoStringConverter.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FluoStringConverter.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FluoStringConverter.java
index 86676cb..5221c21 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FluoStringConverter.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FluoStringConverter.java
@@ -23,7 +23,8 @@ import static org.apache.rya.indexing.pcj.fluo.app.IncrementalUpdateConstants.DE
import static org.apache.rya.indexing.pcj.fluo.app.IncrementalUpdateConstants.TYPE_DELIM;
import static org.apache.rya.indexing.pcj.fluo.app.IncrementalUpdateConstants.URI_TYPE;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.openrdf.model.Literal;
import org.openrdf.model.URI;
@@ -40,7 +41,7 @@ import org.apache.rya.api.resolver.RdfToRyaConversions;
* Contains method that convert between the Sesame representations of RDF
* components and the Strings that are used by the Fluo PCJ application.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class FluoStringConverter {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/JoinResultUpdater.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/JoinResultUpdater.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/JoinResultUpdater.java
index 7661959..9084cd6 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/JoinResultUpdater.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/JoinResultUpdater.java
@@ -27,7 +27,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.rya.indexing.pcj.fluo.app.query.FluoQueryColumns;
import org.apache.rya.indexing.pcj.fluo.app.query.FluoQueryMetadataDAO;
@@ -57,7 +58,7 @@ import org.apache.fluo.api.data.Span;
* Updates the results of a Join node when one of its children has added a
* new Binding Set to its results.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class JoinResultUpdater {
private static final BindingSetStringConverter idConverter = new BindingSetStringConverter();
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/QueryResultUpdater.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/QueryResultUpdater.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/QueryResultUpdater.java
index 947e624..9cd2bd7 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/QueryResultUpdater.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/QueryResultUpdater.java
@@ -21,7 +21,8 @@ package org.apache.rya.indexing.pcj.fluo.app;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.apache.rya.indexing.pcj.fluo.app.IncrementalUpdateConstants.NODEID_BS_DELIM;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.rya.indexing.pcj.fluo.app.query.FluoQueryColumns;
import org.apache.rya.indexing.pcj.fluo.app.query.QueryMetadata;
@@ -39,7 +40,7 @@ import org.apache.fluo.api.data.Column;
* Updates the results of a Query node when one of its children has added a
* new Binding Set to its results.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class QueryResultUpdater {
private final BindingSetStringConverter converter = new BindingSetStringConverter();
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporter.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporter.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporter.java
index e58d2d4..a0edbda 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporter.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporter.java
@@ -18,7 +18,8 @@
*/
package org.apache.rya.indexing.pcj.fluo.app.export;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.fluo.api.client.TransactionBase;
import org.apache.rya.indexing.pcj.storage.accumulo.VisibilityBindingSet;
@@ -28,7 +29,7 @@ import org.apache.rya.indexing.pcj.storage.accumulo.VisibilityBindingSet;
* Exports a single Binding Set that is a new result for a SPARQL query to some
* other location.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public interface IncrementalResultExporter {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporterFactory.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporterFactory.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporterFactory.java
index feb648f..f9fe2bd 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporterFactory.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporterFactory.java
@@ -18,7 +18,8 @@
*/
package org.apache.rya.indexing.pcj.fluo.app.export;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import com.google.common.base.Optional;
@@ -28,7 +29,7 @@ import org.apache.fluo.api.observer.Observer.Context;
* Builds instances of {@link IncrementalResultExporter} using the provided
* configurations.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public interface IncrementalResultExporterFactory {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/ParametersBase.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/ParametersBase.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/ParametersBase.java
index b19c7cd..a21ba14 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/ParametersBase.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/ParametersBase.java
@@ -22,14 +22,15 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Map;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import com.google.common.base.Optional;
/**
* Contains common parsing functions that make it easier to interpret parameter maps.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public abstract class ParametersBase {
protected final Map<String, String> params;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/rya/RyaExportParameters.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/rya/RyaExportParameters.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/rya/RyaExportParameters.java
index c220bee..cba6a43 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/rya/RyaExportParameters.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/rya/RyaExportParameters.java
@@ -21,7 +21,8 @@ package org.apache.rya.indexing.pcj.fluo.app.export.rya;
import java.util.Map;
import edu.umd.cs.findbugs.annotations.Nullable;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.rya.indexing.pcj.fluo.app.export.ParametersBase;
@@ -34,7 +35,7 @@ import org.apache.fluo.api.observer.Observer;
* {@link Observer#init(io.fluo.api.observer.Observer.Context)} method related
* to Rya PCJ exporting.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class RyaExportParameters extends ParametersBase {
public static final String CONF_EXPORT_TO_RYA = "pcj.fluo.export.rya.enabled";
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/BindingSetUpdater.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/BindingSetUpdater.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/BindingSetUpdater.java
index 5e56009..20d3005 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/BindingSetUpdater.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/BindingSetUpdater.java
@@ -20,7 +20,8 @@ package org.apache.rya.indexing.pcj.fluo.app.observers;
import static com.google.common.base.Preconditions.checkNotNull;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.rya.indexing.pcj.fluo.app.BindingSetRow;
import org.apache.rya.indexing.pcj.fluo.app.FilterResultUpdater;
@@ -44,7 +45,7 @@ import org.apache.fluo.api.observer.AbstractObserver;
* Set. This observer updates its parent if the new Binding Set effects the parent's
* results.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public abstract class BindingSetUpdater extends AbstractObserver {
// DAO
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/CommonNodeMetadata.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/CommonNodeMetadata.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/CommonNodeMetadata.java
index ee1f364..e54acf1 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/CommonNodeMetadata.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/CommonNodeMetadata.java
@@ -20,8 +20,9 @@ package org.apache.rya.indexing.pcj.fluo.app.query;
import static com.google.common.base.Preconditions.checkNotNull;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
-// SEE RYA-211 import javax.annotation.concurrent.Immutable;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import net.jcip.annotations.Immutable;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder;
@@ -31,8 +32,8 @@ import com.google.common.base.Objects;
/**
* Metadata that is common to all nodes that are part of a query.
*/
-// SEE RYA-211 @Immutable
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@Immutable
+@DefaultAnnotation(NonNull.class)
public abstract class CommonNodeMetadata {
private final String nodeId;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FilterMetadata.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FilterMetadata.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FilterMetadata.java
index 481f520..8866bd4 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FilterMetadata.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FilterMetadata.java
@@ -22,8 +22,9 @@ import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import edu.umd.cs.findbugs.annotations.Nullable;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
-// SEE RYA-211 import javax.annotation.concurrent.Immutable;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import net.jcip.annotations.Immutable;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder;
@@ -33,8 +34,8 @@ import com.google.common.base.Objects;
/**
* Metadata that is specific to Filter nodes.
*/
-// SEE RYA-211 @Immutable
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@Immutable
+@DefaultAnnotation(NonNull.class)
public class FilterMetadata extends CommonNodeMetadata {
private final String originalSparql;
@@ -158,7 +159,7 @@ public class FilterMetadata extends CommonNodeMetadata {
/**
* Builds instances of {@link FilterMetadata}.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+ @DefaultAnnotation(NonNull.class)
public static final class Builder {
private final String nodeId;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQuery.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQuery.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQuery.java
index 4d3002e..263db7e 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQuery.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQuery.java
@@ -26,8 +26,9 @@ import java.util.Map;
import java.util.Map.Entry;
import edu.umd.cs.findbugs.annotations.Nullable;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
-// SEE RYA-211 import javax.annotation.concurrent.Immutable;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import net.jcip.annotations.Immutable;
import org.apache.commons.lang3.builder.EqualsBuilder;
@@ -38,8 +39,8 @@ import com.google.common.collect.ImmutableMap;
/**
* Metadata for every node of a query that is being updated by the Fluo application.
*/
-// SEE RYA-211 @Immutable
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@Immutable
+@DefaultAnnotation(NonNull.class)
public class FluoQuery {
private final QueryMetadata queryMetadata;
@@ -196,7 +197,7 @@ public class FluoQuery {
/**
* Builds instances of {@link FluoQuery}.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+ @DefaultAnnotation(NonNull.class)
public static final class Builder {
private QueryMetadata.Builder queryBuilder = null;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryColumns.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryColumns.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryColumns.java
index 9b9836f..f12c6ab 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryColumns.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryColumns.java
@@ -23,7 +23,8 @@ import static java.util.Objects.requireNonNull;
import java.util.Arrays;
import java.util.List;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.fluo.api.data.Column;
@@ -163,7 +164,7 @@ public class FluoQueryColumns {
* Enumerates the {@link Column}s that hold all of the fields for each type
* of node that can compose a query.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+ @DefaultAnnotation(NonNull.class)
public enum QueryNodeMetadataColumns {
/**
* The columns a {@link QueryMetadata} object's fields are stored within.
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAO.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAO.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAO.java
index 8886b39..f9acb11 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAO.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAO.java
@@ -22,7 +22,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Map;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.rya.indexing.pcj.fluo.app.NodeType;
import org.apache.rya.indexing.pcj.fluo.app.query.JoinMetadata.JoinType;
@@ -39,7 +40,7 @@ import org.apache.fluo.api.data.Column;
* Reads and writes {@link FluoQuery} instances and their components to/from
* a Fluo table.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class FluoQueryMetadataDAO {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/JoinMetadata.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/JoinMetadata.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/JoinMetadata.java
index 7dfcf37..7bad9a7 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/JoinMetadata.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/JoinMetadata.java
@@ -21,8 +21,9 @@ package org.apache.rya.indexing.pcj.fluo.app.query;
import static com.google.common.base.Preconditions.checkNotNull;
import edu.umd.cs.findbugs.annotations.Nullable;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
-// SEE RYA-211 import javax.annotation.concurrent.Immutable;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import net.jcip.annotations.Immutable;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder;
@@ -32,8 +33,8 @@ import com.google.common.base.Objects;
/**
* Metadata that is specific to Join nodes.
*/
-// SEE RYA-211 @Immutable
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@Immutable
+@DefaultAnnotation(NonNull.class)
public class JoinMetadata extends CommonNodeMetadata {
/**
@@ -161,7 +162,7 @@ public class JoinMetadata extends CommonNodeMetadata {
/**
* Builds instances of {@link JoinMetadata}.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+ @DefaultAnnotation(NonNull.class)
public static final class Builder {
private final String nodeId;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/QueryMetadata.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/QueryMetadata.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/QueryMetadata.java
index 7bb3c5f..064cfe8 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/QueryMetadata.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/QueryMetadata.java
@@ -21,8 +21,9 @@ package org.apache.rya.indexing.pcj.fluo.app.query;
import static com.google.common.base.Preconditions.checkNotNull;
import edu.umd.cs.findbugs.annotations.Nullable;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
-// SEE RYA-211 import javax.annotation.concurrent.Immutable;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import net.jcip.annotations.Immutable;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder;
@@ -32,8 +33,8 @@ import com.google.common.base.Objects;
/**
* Metadata that is specific to a Projection.
*/
-// SEE RYA-211 @Immutable
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@Immutable
+@DefaultAnnotation(NonNull.class)
public class QueryMetadata extends CommonNodeMetadata {
private final String sparql;
@@ -125,7 +126,7 @@ public class QueryMetadata extends CommonNodeMetadata {
/**
* Builds instances of {@link QueryMetadata}.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+ @DefaultAnnotation(NonNull.class)
public static final class Builder {
private final String nodeId;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/SparqlFluoQueryBuilder.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/SparqlFluoQueryBuilder.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/SparqlFluoQueryBuilder.java
index 15039c1..2128700 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/SparqlFluoQueryBuilder.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/SparqlFluoQueryBuilder.java
@@ -32,8 +32,9 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
-// SEE RYA-211 import javax.annotation.concurrent.Immutable;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import net.jcip.annotations.Immutable;
import org.apache.rya.indexing.pcj.fluo.app.FilterResultUpdater;
import org.apache.rya.indexing.pcj.fluo.app.FluoStringConverter;
@@ -89,7 +90,7 @@ public class SparqlFluoQueryBuilder {
* of a {@link ParsedQuery}. This structure should only be used while creating
* a new PCJ in Fluo and disposed of afterwards.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+ @DefaultAnnotation(NonNull.class)
public static final class NodeIds {
/**
@@ -415,8 +416,8 @@ public class SparqlFluoQueryBuilder {
/**
* Holds the Variable Order of the binding sets for the children of a join node.
*/
-// SEE RYA-211 @Immutable
-// SEE RYA-211 @ParametersAreNonnullByDefault
+ @Immutable
+ @DefaultAnnotation(NonNull.class)
private static final class JoinVarOrders {
private final VariableOrder leftVarOrder;
private final VariableOrder rightVarOrder;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/StatementPatternMetadata.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/StatementPatternMetadata.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/StatementPatternMetadata.java
index 2531436..7de10d5 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/StatementPatternMetadata.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/StatementPatternMetadata.java
@@ -21,8 +21,9 @@ package org.apache.rya.indexing.pcj.fluo.app.query;
import static com.google.common.base.Preconditions.checkNotNull;
import edu.umd.cs.findbugs.annotations.Nullable;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
-// SEE RYA-211 import javax.annotation.concurrent.Immutable;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import net.jcip.annotations.Immutable;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder;
@@ -32,8 +33,8 @@ import com.google.common.base.Objects;
/**
* Metadata that is specific to Statement Pattern nodes.
*/
-// SEE RYA-211 @Immutable
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@Immutable
+@DefaultAnnotation(NonNull.class)
public class StatementPatternMetadata extends CommonNodeMetadata {
private final String statementPattern;
@@ -125,7 +126,7 @@ public class StatementPatternMetadata extends CommonNodeMetadata {
/**
* Builds instances of {@link StatementPatternMetadata}.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+ @DefaultAnnotation(NonNull.class)
public static final class Builder {
private final String nodeId;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClient.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClient.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClient.java
index cadb035..901f39d 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClient.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClient.java
@@ -32,7 +32,8 @@ import java.util.List;
import java.util.Properties;
import java.util.Set;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
@@ -65,7 +66,7 @@ import org.apache.rya.rdftriplestore.RyaSailRepository;
/**
* An application that helps Rya PCJ administrators interact with the cluster.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class PcjAdminClient {
private static final Logger log = LogManager.getLogger(PcjAdminClient.class);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientCommand.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientCommand.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientCommand.java
index 5d546a5..2b3b105 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientCommand.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientCommand.java
@@ -18,7 +18,8 @@
*/
package org.apache.rya.indexing.pcj.fluo.client;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.accumulo.core.client.Connector;
@@ -28,7 +29,7 @@ import org.apache.rya.rdftriplestore.RyaSailRepository;
/**
* A command that may be executed by the {@link PcjAdminClient}.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public interface PcjAdminClientCommand {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientProperties.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientProperties.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientProperties.java
index d5aca09..02f344d 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientProperties.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientProperties.java
@@ -23,13 +23,14 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Properties;
import edu.umd.cs.findbugs.annotations.Nullable;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
/**
* Interprets a {@link Properties} object so that it is easier to access
* configuration values used by {@link PcjAdminClient}.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class PcjAdminClientProperties {
// Properties that configure how Fluo will connect to Accumulo.
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/ListQueriesCommand.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/ListQueriesCommand.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/ListQueriesCommand.java
index 95d36f4..d242372 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/ListQueriesCommand.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/ListQueriesCommand.java
@@ -23,7 +23,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.HashMap;
import java.util.Map;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.accumulo.core.client.Connector;
import org.apache.logging.log4j.LogManager;
@@ -47,7 +48,7 @@ import org.apache.rya.rdftriplestore.RyaSailRepository;
/**
* A command that lists information about the queries that are being managed by the Fluo app.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class ListQueriesCommand implements PcjAdminClientCommand {
private static final Logger log = LogManager.getLogger(ListQueriesCommand.class);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/LoadTriplesCommand.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/LoadTriplesCommand.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/LoadTriplesCommand.java
index 99da653..8a7004d 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/LoadTriplesCommand.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/LoadTriplesCommand.java
@@ -25,7 +25,8 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.accumulo.core.client.Connector;
import org.apache.commons.io.FilenameUtils;
@@ -51,7 +52,7 @@ import org.apache.rya.rdftriplestore.RyaSailRepository;
/**
* A command that loads the contents of an NTriple file into the Fluo application.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class LoadTriplesCommand implements PcjAdminClientCommand {
private static final Logger log = LogManager.getLogger(LoadTriplesCommand.class);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/NewQueryCommand.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/NewQueryCommand.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/NewQueryCommand.java
index b5d3c9e..e612a07 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/NewQueryCommand.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/NewQueryCommand.java
@@ -25,7 +25,8 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.accumulo.core.client.Connector;
import org.apache.commons.io.IOUtils;
@@ -52,7 +53,7 @@ import org.apache.rya.rdftriplestore.RyaSailRepository;
* A command that creates a creates a new PCJ in the Fluo app and loads historic
* statement pattern matches for it.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class NewQueryCommand implements PcjAdminClientCommand {
private static final Logger log = LogManager.getLogger(NewQueryCommand.class);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/ParsedQueryRequest.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/ParsedQueryRequest.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/ParsedQueryRequest.java
index a8604a6..bf49663 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/ParsedQueryRequest.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/ParsedQueryRequest.java
@@ -27,8 +27,9 @@ import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
-// SEE RYA-211 import javax.annotation.concurrent.Immutable;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import net.jcip.annotations.Immutable;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder;
@@ -36,8 +37,8 @@ import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder;
/**
* Represents a request to create a new PCJ in the Fluo app.
*/
-// SEE RYA-211 @Immutable
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@Immutable
+@DefaultAnnotation(NonNull.class)
public class ParsedQueryRequest {
private final String sparql;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/QueryReportRenderer.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/QueryReportRenderer.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/QueryReportRenderer.java
index 51a6495..e1c386d 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/QueryReportRenderer.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/QueryReportRenderer.java
@@ -20,7 +20,8 @@ package org.apache.rya.indexing.pcj.fluo.client.util;
import static com.google.common.base.Preconditions.checkNotNull;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.commons.lang3.StringUtils;
import org.apache.rya.indexing.pcj.fluo.api.GetQueryReport.QueryReport;
@@ -37,7 +38,7 @@ import org.openrdf.queryrender.sparql.SPARQLQueryRenderer;
/**
* Pretty renders a {@link QueryReport}.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@DefaultAnnotation(NonNull.class)
public class QueryReportRenderer {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/Report.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/Report.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/Report.java
index 524a4ed..542bb60 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/Report.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/Report.java
@@ -21,8 +21,9 @@ package org.apache.rya.indexing.pcj.fluo.client.util;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
-// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
-// SEE RYA-211 import javax.annotation.concurrent.Immutable;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import net.jcip.annotations.Immutable;
import org.apache.commons.lang3.StringUtils;
@@ -33,8 +34,8 @@ import com.google.common.collect.ImmutableList;
* left hand side of the table and the value of the item on the right hand side.
* If an item does not have any values, then it prints an empty line.
*/
-// SEE RYA-211 @Immutable
-// SEE RYA-211 @ParametersAreNonnullByDefault
+@Immutable
+@DefaultAnnotation(NonNull.class)
public class Report {
private final ImmutableList<ReportItem> items;
@@ -111,8 +112,8 @@ public class Report {
* An item that may appear within a {@link Report}. Each item has a title
* that briefly describes the value it holds.
*/
-// SEE RYA-211 @Immutable
-// SEE RYA-211 @ParametersAreNonnullByDefault
+ @Immutable
+ @DefaultAnnotation(NonNull.class)
public static final class ReportItem {
private final String title;
private final String[] valueLines;
@@ -172,7 +173,7 @@ public class Report {
/**
* Builds instances of {@link Report}.
*/
-// SEE RYA-211 @ParametersAreNonnullByDefault
+ @DefaultAnnotation(NonNull.class)
public static final class Builder {
private final ImmutableList.Builder<ReportItem> lines = ImmutableList.builder();
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c06c1073/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ac950ec..797f3af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,7 +122,10 @@ under the License.
<fluo.version>1.0.0-incubating</fluo.version>
<jmh.version>1.13</jmh.version>
+
<jsr305.version>1.3.9-1</jsr305.version>
+ <jcip.version>1.0-1</jcip.version>
+ <findbugs.plugin.version>3.0.4</findbugs.plugin.version>
</properties>
<dependencyManagement>
<dependencies>
@@ -574,6 +577,11 @@ under the License.
<artifactId>findbugs-annotations</artifactId>
<version>${jsr305.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.github.stephenc.jcip</groupId>
+ <artifactId>jcip-annotations</artifactId>
+ <version>${jcip.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
@@ -830,6 +838,16 @@ under the License.
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>${findbugs.plugin.version}</version>
+ </plugin>
+ </plugins>
+ </reporting>
+
<repositories>
<repository>
<id>LocationTech - SNAPSHOT</id>
[2/5] incubator-rya git commit: RYA-200 Removing findbugs:jsr305
Dependency
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSet.java
----------------------------------------------------------------------
diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSet.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSet.java
index 1a0bbc5..d98f556 100644
--- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSet.java
+++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSet.java
@@ -20,14 +20,14 @@ package org.apache.rya.indexing.pcj.storage.accumulo;
import static java.util.Objects.requireNonNull;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.openrdf.query.BindingSet;
/**
* Decorates a {@link BindingSet} with a collection of visibilities.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class VisibilityBindingSet extends BindingSetDecorator {
private static final long serialVersionUID = 1L;
private String visibility;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetStringConverter.java
----------------------------------------------------------------------
diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetStringConverter.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetStringConverter.java
index 307d0b4..8530efe 100644
--- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetStringConverter.java
+++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetStringConverter.java
@@ -18,7 +18,7 @@
*/
package org.apache.rya.indexing.pcj.storage.accumulo;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.openrdf.query.BindingSet;
@@ -26,7 +26,7 @@ import org.openrdf.query.BindingSet;
* Converts {@link BindingSet}s to Strings and back again. The Strings do not
* include the binding names and are ordered with a {@link VariableOrder}.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class VisibilityBindingSetStringConverter extends BindingSetStringConverter {
public static final char VISIBILITY_DELIM = 1;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/update/PrecomputedJoinUpdater.java
----------------------------------------------------------------------
diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/update/PrecomputedJoinUpdater.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/update/PrecomputedJoinUpdater.java
index 54fe325..462bf4d 100644
--- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/update/PrecomputedJoinUpdater.java
+++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/update/PrecomputedJoinUpdater.java
@@ -20,7 +20,7 @@ package org.apache.rya.indexing.pcj.update;
import java.util.Collection;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.rya.indexing.pcj.storage.PcjException;
@@ -30,7 +30,7 @@ import org.apache.rya.api.domain.RyaStatement;
* Updates the state of all PCJ indices whenever {@link RyaStatement}s are
* added to or removed from the system.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public interface PrecomputedJoinUpdater {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CreatePcj.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CreatePcj.java b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CreatePcj.java
index d31e578..1066050 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CreatePcj.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CreatePcj.java
@@ -26,7 +26,7 @@ import static org.apache.rya.indexing.pcj.fluo.app.IncrementalUpdateConstants.NO
import java.util.HashSet;
import java.util.Set;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.rya.indexing.pcj.fluo.app.FluoStringConverter;
import org.apache.rya.indexing.pcj.fluo.app.query.FluoQuery;
@@ -71,7 +71,7 @@ import org.apache.fluo.api.client.Transaction;
* will percolate to the top of the query, and those results will be exported to
* Rya's query system.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class CreatePcj {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/DeletePcj.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/DeletePcj.java b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/DeletePcj.java
index 79ca0ea..4d3d779 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/DeletePcj.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/DeletePcj.java
@@ -25,7 +25,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.rya.indexing.pcj.fluo.app.NodeType;
import org.apache.rya.indexing.pcj.fluo.app.query.FilterMetadata;
@@ -56,7 +56,7 @@ import org.apache.fluo.api.data.Span;
* into memory.</li>
* </ol>
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class DeletePcj {
private final FluoQueryMetadataDAO dao = new FluoQueryMetadataDAO();
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/GetQueryReport.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/GetQueryReport.java b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/GetQueryReport.java
index e1e8566..51d580d 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/GetQueryReport.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/GetQueryReport.java
@@ -25,9 +25,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
-import javax.annotation.ParametersAreNonnullByDefault;
-import javax.annotation.concurrent.Immutable;
+import edu.umd.cs.findbugs.annotations.Nullable;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.concurrent.Immutable;
import org.apache.rya.indexing.pcj.fluo.app.query.FilterMetadata;
import org.apache.rya.indexing.pcj.fluo.app.query.FluoQuery;
@@ -50,7 +50,7 @@ import org.apache.fluo.api.data.Span;
* Get a reports that indicates how many binding sets have been emitted for
* the queries that is being managed by the fluo application.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class GetQueryReport {
private final FluoQueryMetadataDAO metadataDao = new FluoQueryMetadataDAO();
@@ -145,8 +145,8 @@ public class GetQueryReport {
* as well as the number of Binding Sets that have been emitted for each of
* the query nodes.
*/
- @Immutable
- @ParametersAreNonnullByDefault
+// SEE RYA-211 @Immutable
+// SEE RYA-211 @ParametersAreNonnullByDefault
public static final class QueryReport {
/**
@@ -212,7 +212,7 @@ public class GetQueryReport {
/**
* Builds instances of {@link QueryReport}.
*/
- @ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public static final class Builder {
private FluoQuery fluoQuery = null;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/BindingSetRow.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/BindingSetRow.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/BindingSetRow.java
index fa0ea70..16374ad 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/BindingSetRow.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/BindingSetRow.java
@@ -21,8 +21,8 @@ package org.apache.rya.indexing.pcj.fluo.app;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.apache.rya.indexing.pcj.fluo.app.IncrementalUpdateConstants.NODEID_BS_DELIM;
-import javax.annotation.ParametersAreNonnullByDefault;
-import javax.annotation.concurrent.Immutable;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.concurrent.Immutable;
import org.apache.fluo.api.data.Bytes;
@@ -30,8 +30,8 @@ import org.apache.fluo.api.data.Bytes;
* The values of an Accumulo Row ID for a row that stores a Binding set for
* a specific Node ID of a query.
*/
-@Immutable
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @Immutable
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class BindingSetRow {
private final String nodeId;
private final String bindingSetString;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FilterFinder.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FilterFinder.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FilterFinder.java
index 3c9b875..034f510 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FilterFinder.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FilterFinder.java
@@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.concurrent.atomic.AtomicReference;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.openrdf.query.algebra.Filter;
import org.openrdf.query.algebra.helpers.QueryModelVisitorBase;
@@ -35,7 +35,7 @@ import com.google.common.base.Optional;
/**
* Searches a SPARQL query for {@link Filter}s.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
class FilterFinder {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FilterResultUpdater.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FilterResultUpdater.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FilterResultUpdater.java
index b1af4fc..85b7bd7 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FilterResultUpdater.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FilterResultUpdater.java
@@ -21,7 +21,7 @@ package org.apache.rya.indexing.pcj.fluo.app;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.apache.rya.indexing.pcj.fluo.app.IncrementalUpdateConstants.NODEID_BS_DELIM;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.rya.indexing.pcj.fluo.app.query.FilterMetadata;
import org.apache.rya.indexing.pcj.fluo.app.query.FluoQueryColumns;
@@ -57,7 +57,7 @@ import org.apache.fluo.api.data.Column;
* Updates the results of a Filter node when its child has added a new Binding
* Set to its results.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class FilterResultUpdater {
private static final BindingSetStringConverter ID_CONVERTER = new BindingSetStringConverter();
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FluoStringConverter.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FluoStringConverter.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FluoStringConverter.java
index 98f3620..86676cb 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FluoStringConverter.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FluoStringConverter.java
@@ -23,7 +23,7 @@ import static org.apache.rya.indexing.pcj.fluo.app.IncrementalUpdateConstants.DE
import static org.apache.rya.indexing.pcj.fluo.app.IncrementalUpdateConstants.TYPE_DELIM;
import static org.apache.rya.indexing.pcj.fluo.app.IncrementalUpdateConstants.URI_TYPE;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.openrdf.model.Literal;
import org.openrdf.model.URI;
@@ -40,7 +40,7 @@ import org.apache.rya.api.resolver.RdfToRyaConversions;
* Contains method that convert between the Sesame representations of RDF
* components and the Strings that are used by the Fluo PCJ application.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class FluoStringConverter {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/JoinResultUpdater.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/JoinResultUpdater.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/JoinResultUpdater.java
index 73a03ca..7661959 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/JoinResultUpdater.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/JoinResultUpdater.java
@@ -27,7 +27,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.rya.indexing.pcj.fluo.app.query.FluoQueryColumns;
import org.apache.rya.indexing.pcj.fluo.app.query.FluoQueryMetadataDAO;
@@ -57,7 +57,7 @@ import org.apache.fluo.api.data.Span;
* Updates the results of a Join node when one of its children has added a
* new Binding Set to its results.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class JoinResultUpdater {
private static final BindingSetStringConverter idConverter = new BindingSetStringConverter();
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/QueryResultUpdater.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/QueryResultUpdater.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/QueryResultUpdater.java
index b4800fc..947e624 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/QueryResultUpdater.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/QueryResultUpdater.java
@@ -21,7 +21,7 @@ package org.apache.rya.indexing.pcj.fluo.app;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.apache.rya.indexing.pcj.fluo.app.IncrementalUpdateConstants.NODEID_BS_DELIM;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.rya.indexing.pcj.fluo.app.query.FluoQueryColumns;
import org.apache.rya.indexing.pcj.fluo.app.query.QueryMetadata;
@@ -39,7 +39,7 @@ import org.apache.fluo.api.data.Column;
* Updates the results of a Query node when one of its children has added a
* new Binding Set to its results.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class QueryResultUpdater {
private final BindingSetStringConverter converter = new BindingSetStringConverter();
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporter.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporter.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporter.java
index ecc39bd..e58d2d4 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporter.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporter.java
@@ -18,7 +18,7 @@
*/
package org.apache.rya.indexing.pcj.fluo.app.export;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.fluo.api.client.TransactionBase;
import org.apache.rya.indexing.pcj.storage.accumulo.VisibilityBindingSet;
@@ -28,7 +28,7 @@ import org.apache.rya.indexing.pcj.storage.accumulo.VisibilityBindingSet;
* Exports a single Binding Set that is a new result for a SPARQL query to some
* other location.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public interface IncrementalResultExporter {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporterFactory.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporterFactory.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporterFactory.java
index 7052069..feb648f 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporterFactory.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporterFactory.java
@@ -18,7 +18,7 @@
*/
package org.apache.rya.indexing.pcj.fluo.app.export;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import com.google.common.base.Optional;
@@ -28,7 +28,7 @@ import org.apache.fluo.api.observer.Observer.Context;
* Builds instances of {@link IncrementalResultExporter} using the provided
* configurations.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public interface IncrementalResultExporterFactory {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/ParametersBase.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/ParametersBase.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/ParametersBase.java
index 57938c7..b19c7cd 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/ParametersBase.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/ParametersBase.java
@@ -22,14 +22,14 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Map;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import com.google.common.base.Optional;
/**
* Contains common parsing functions that make it easier to interpret parameter maps.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public abstract class ParametersBase {
protected final Map<String, String> params;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/rya/RyaExportParameters.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/rya/RyaExportParameters.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/rya/RyaExportParameters.java
index 18af878..c220bee 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/rya/RyaExportParameters.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/rya/RyaExportParameters.java
@@ -20,8 +20,8 @@ package org.apache.rya.indexing.pcj.fluo.app.export.rya;
import java.util.Map;
-import javax.annotation.Nullable;
-import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.Nullable;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.rya.indexing.pcj.fluo.app.export.ParametersBase;
@@ -34,7 +34,7 @@ import org.apache.fluo.api.observer.Observer;
* {@link Observer#init(io.fluo.api.observer.Observer.Context)} method related
* to Rya PCJ exporting.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class RyaExportParameters extends ParametersBase {
public static final String CONF_EXPORT_TO_RYA = "pcj.fluo.export.rya.enabled";
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/BindingSetUpdater.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/BindingSetUpdater.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/BindingSetUpdater.java
index a2953cf..5e56009 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/BindingSetUpdater.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/BindingSetUpdater.java
@@ -20,7 +20,7 @@ package org.apache.rya.indexing.pcj.fluo.app.observers;
import static com.google.common.base.Preconditions.checkNotNull;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.rya.indexing.pcj.fluo.app.BindingSetRow;
import org.apache.rya.indexing.pcj.fluo.app.FilterResultUpdater;
@@ -44,7 +44,7 @@ import org.apache.fluo.api.observer.AbstractObserver;
* Set. This observer updates its parent if the new Binding Set effects the parent's
* results.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public abstract class BindingSetUpdater extends AbstractObserver {
// DAO
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/CommonNodeMetadata.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/CommonNodeMetadata.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/CommonNodeMetadata.java
index aeace2c..ee1f364 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/CommonNodeMetadata.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/CommonNodeMetadata.java
@@ -20,8 +20,8 @@ package org.apache.rya.indexing.pcj.fluo.app.query;
import static com.google.common.base.Preconditions.checkNotNull;
-import javax.annotation.ParametersAreNonnullByDefault;
-import javax.annotation.concurrent.Immutable;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.concurrent.Immutable;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder;
@@ -31,8 +31,8 @@ import com.google.common.base.Objects;
/**
* Metadata that is common to all nodes that are part of a query.
*/
-@Immutable
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @Immutable
+// SEE RYA-211 @ParametersAreNonnullByDefault
public abstract class CommonNodeMetadata {
private final String nodeId;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FilterMetadata.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FilterMetadata.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FilterMetadata.java
index 1e167b1..481f520 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FilterMetadata.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FilterMetadata.java
@@ -21,9 +21,9 @@ package org.apache.rya.indexing.pcj.fluo.app.query;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
-import javax.annotation.Nullable;
-import javax.annotation.ParametersAreNonnullByDefault;
-import javax.annotation.concurrent.Immutable;
+import edu.umd.cs.findbugs.annotations.Nullable;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.concurrent.Immutable;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder;
@@ -33,8 +33,8 @@ import com.google.common.base.Objects;
/**
* Metadata that is specific to Filter nodes.
*/
-@Immutable
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @Immutable
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class FilterMetadata extends CommonNodeMetadata {
private final String originalSparql;
@@ -158,7 +158,7 @@ public class FilterMetadata extends CommonNodeMetadata {
/**
* Builds instances of {@link FilterMetadata}.
*/
- @ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public static final class Builder {
private final String nodeId;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQuery.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQuery.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQuery.java
index 4282c99..4d3002e 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQuery.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQuery.java
@@ -25,9 +25,9 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
-import javax.annotation.Nullable;
-import javax.annotation.ParametersAreNonnullByDefault;
-import javax.annotation.concurrent.Immutable;
+import edu.umd.cs.findbugs.annotations.Nullable;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.concurrent.Immutable;
import org.apache.commons.lang3.builder.EqualsBuilder;
@@ -38,8 +38,8 @@ import com.google.common.collect.ImmutableMap;
/**
* Metadata for every node of a query that is being updated by the Fluo application.
*/
-@Immutable
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @Immutable
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class FluoQuery {
private final QueryMetadata queryMetadata;
@@ -196,7 +196,7 @@ public class FluoQuery {
/**
* Builds instances of {@link FluoQuery}.
*/
- @ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public static final class Builder {
private QueryMetadata.Builder queryBuilder = null;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryColumns.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryColumns.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryColumns.java
index 13743f4..9b9836f 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryColumns.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryColumns.java
@@ -23,7 +23,7 @@ import static java.util.Objects.requireNonNull;
import java.util.Arrays;
import java.util.List;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.fluo.api.data.Column;
@@ -163,7 +163,7 @@ public class FluoQueryColumns {
* Enumerates the {@link Column}s that hold all of the fields for each type
* of node that can compose a query.
*/
- @ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public enum QueryNodeMetadataColumns {
/**
* The columns a {@link QueryMetadata} object's fields are stored within.
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAO.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAO.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAO.java
index 8d41c61..8886b39 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAO.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAO.java
@@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Map;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.rya.indexing.pcj.fluo.app.NodeType;
import org.apache.rya.indexing.pcj.fluo.app.query.JoinMetadata.JoinType;
@@ -39,7 +39,7 @@ import org.apache.fluo.api.data.Column;
* Reads and writes {@link FluoQuery} instances and their components to/from
* a Fluo table.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class FluoQueryMetadataDAO {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/JoinMetadata.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/JoinMetadata.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/JoinMetadata.java
index 9696449..7dfcf37 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/JoinMetadata.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/JoinMetadata.java
@@ -20,9 +20,9 @@ package org.apache.rya.indexing.pcj.fluo.app.query;
import static com.google.common.base.Preconditions.checkNotNull;
-import javax.annotation.Nullable;
-import javax.annotation.ParametersAreNonnullByDefault;
-import javax.annotation.concurrent.Immutable;
+import edu.umd.cs.findbugs.annotations.Nullable;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.concurrent.Immutable;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder;
@@ -32,8 +32,8 @@ import com.google.common.base.Objects;
/**
* Metadata that is specific to Join nodes.
*/
-@Immutable
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @Immutable
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class JoinMetadata extends CommonNodeMetadata {
/**
@@ -161,7 +161,7 @@ public class JoinMetadata extends CommonNodeMetadata {
/**
* Builds instances of {@link JoinMetadata}.
*/
- @ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public static final class Builder {
private final String nodeId;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/QueryMetadata.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/QueryMetadata.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/QueryMetadata.java
index f3cd739..7bb3c5f 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/QueryMetadata.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/QueryMetadata.java
@@ -20,9 +20,9 @@ package org.apache.rya.indexing.pcj.fluo.app.query;
import static com.google.common.base.Preconditions.checkNotNull;
-import javax.annotation.Nullable;
-import javax.annotation.ParametersAreNonnullByDefault;
-import javax.annotation.concurrent.Immutable;
+import edu.umd.cs.findbugs.annotations.Nullable;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.concurrent.Immutable;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder;
@@ -32,8 +32,8 @@ import com.google.common.base.Objects;
/**
* Metadata that is specific to a Projection.
*/
-@Immutable
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @Immutable
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class QueryMetadata extends CommonNodeMetadata {
private final String sparql;
@@ -125,7 +125,7 @@ public class QueryMetadata extends CommonNodeMetadata {
/**
* Builds instances of {@link QueryMetadata}.
*/
- @ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public static final class Builder {
private final String nodeId;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/SparqlFluoQueryBuilder.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/SparqlFluoQueryBuilder.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/SparqlFluoQueryBuilder.java
index 3adff7f..15039c1 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/SparqlFluoQueryBuilder.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/SparqlFluoQueryBuilder.java
@@ -32,8 +32,8 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
-import javax.annotation.ParametersAreNonnullByDefault;
-import javax.annotation.concurrent.Immutable;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.concurrent.Immutable;
import org.apache.rya.indexing.pcj.fluo.app.FilterResultUpdater;
import org.apache.rya.indexing.pcj.fluo.app.FluoStringConverter;
@@ -89,7 +89,7 @@ public class SparqlFluoQueryBuilder {
* of a {@link ParsedQuery}. This structure should only be used while creating
* a new PCJ in Fluo and disposed of afterwards.
*/
- @ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public static final class NodeIds {
/**
@@ -415,8 +415,8 @@ public class SparqlFluoQueryBuilder {
/**
* Holds the Variable Order of the binding sets for the children of a join node.
*/
- @Immutable
- @ParametersAreNonnullByDefault
+// SEE RYA-211 @Immutable
+// SEE RYA-211 @ParametersAreNonnullByDefault
private static final class JoinVarOrders {
private final VariableOrder leftVarOrder;
private final VariableOrder rightVarOrder;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/StatementPatternMetadata.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/StatementPatternMetadata.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/StatementPatternMetadata.java
index 253a41a..2531436 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/StatementPatternMetadata.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/StatementPatternMetadata.java
@@ -20,9 +20,9 @@ package org.apache.rya.indexing.pcj.fluo.app.query;
import static com.google.common.base.Preconditions.checkNotNull;
-import javax.annotation.Nullable;
-import javax.annotation.ParametersAreNonnullByDefault;
-import javax.annotation.concurrent.Immutable;
+import edu.umd.cs.findbugs.annotations.Nullable;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.concurrent.Immutable;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder;
@@ -32,8 +32,8 @@ import com.google.common.base.Objects;
/**
* Metadata that is specific to Statement Pattern nodes.
*/
-@Immutable
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @Immutable
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class StatementPatternMetadata extends CommonNodeMetadata {
private final String statementPattern;
@@ -125,7 +125,7 @@ public class StatementPatternMetadata extends CommonNodeMetadata {
/**
* Builds instances of {@link StatementPatternMetadata}.
*/
- @ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public static final class Builder {
private final String nodeId;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClient.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClient.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClient.java
index 9ee45e0..cadb035 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClient.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClient.java
@@ -32,7 +32,7 @@ import java.util.List;
import java.util.Properties;
import java.util.Set;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
@@ -65,7 +65,7 @@ import org.apache.rya.rdftriplestore.RyaSailRepository;
/**
* An application that helps Rya PCJ administrators interact with the cluster.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class PcjAdminClient {
private static final Logger log = LogManager.getLogger(PcjAdminClient.class);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientCommand.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientCommand.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientCommand.java
index 48ddf55..5d546a5 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientCommand.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientCommand.java
@@ -18,7 +18,7 @@
*/
package org.apache.rya.indexing.pcj.fluo.client;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.accumulo.core.client.Connector;
@@ -28,7 +28,7 @@ import org.apache.rya.rdftriplestore.RyaSailRepository;
/**
* A command that may be executed by the {@link PcjAdminClient}.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public interface PcjAdminClientCommand {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientProperties.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientProperties.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientProperties.java
index 794881f..d5aca09 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientProperties.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientProperties.java
@@ -22,14 +22,14 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Properties;
-import javax.annotation.Nullable;
-import javax.annotation.ParametersAreNonnullByDefault;
+import edu.umd.cs.findbugs.annotations.Nullable;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
/**
* Interprets a {@link Properties} object so that it is easier to access
* configuration values used by {@link PcjAdminClient}.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class PcjAdminClientProperties {
// Properties that configure how Fluo will connect to Accumulo.
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/ListQueriesCommand.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/ListQueriesCommand.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/ListQueriesCommand.java
index 16a76cb..95d36f4 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/ListQueriesCommand.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/ListQueriesCommand.java
@@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.HashMap;
import java.util.Map;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.accumulo.core.client.Connector;
import org.apache.logging.log4j.LogManager;
@@ -47,7 +47,7 @@ import org.apache.rya.rdftriplestore.RyaSailRepository;
/**
* A command that lists information about the queries that are being managed by the Fluo app.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class ListQueriesCommand implements PcjAdminClientCommand {
private static final Logger log = LogManager.getLogger(ListQueriesCommand.class);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/LoadTriplesCommand.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/LoadTriplesCommand.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/LoadTriplesCommand.java
index a8b2c28..99da653 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/LoadTriplesCommand.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/LoadTriplesCommand.java
@@ -25,7 +25,7 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.accumulo.core.client.Connector;
import org.apache.commons.io.FilenameUtils;
@@ -51,7 +51,7 @@ import org.apache.rya.rdftriplestore.RyaSailRepository;
/**
* A command that loads the contents of an NTriple file into the Fluo application.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class LoadTriplesCommand implements PcjAdminClientCommand {
private static final Logger log = LogManager.getLogger(LoadTriplesCommand.class);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/NewQueryCommand.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/NewQueryCommand.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/NewQueryCommand.java
index 23b93cd..b5d3c9e 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/NewQueryCommand.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/NewQueryCommand.java
@@ -25,7 +25,7 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.accumulo.core.client.Connector;
import org.apache.commons.io.IOUtils;
@@ -52,7 +52,7 @@ import org.apache.rya.rdftriplestore.RyaSailRepository;
* A command that creates a creates a new PCJ in the Fluo app and loads historic
* statement pattern matches for it.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class NewQueryCommand implements PcjAdminClientCommand {
private static final Logger log = LogManager.getLogger(NewQueryCommand.class);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/ParsedQueryRequest.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/ParsedQueryRequest.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/ParsedQueryRequest.java
index 2993f17..a8604a6 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/ParsedQueryRequest.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/ParsedQueryRequest.java
@@ -27,8 +27,8 @@ import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.annotation.ParametersAreNonnullByDefault;
-import javax.annotation.concurrent.Immutable;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.concurrent.Immutable;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder;
@@ -36,8 +36,8 @@ import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder;
/**
* Represents a request to create a new PCJ in the Fluo app.
*/
-@Immutable
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @Immutable
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class ParsedQueryRequest {
private final String sparql;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/QueryReportRenderer.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/QueryReportRenderer.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/QueryReportRenderer.java
index 2b5bd8a..51a6495 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/QueryReportRenderer.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/QueryReportRenderer.java
@@ -20,7 +20,7 @@ package org.apache.rya.indexing.pcj.fluo.client.util;
import static com.google.common.base.Preconditions.checkNotNull;
-import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.commons.lang3.StringUtils;
import org.apache.rya.indexing.pcj.fluo.api.GetQueryReport.QueryReport;
@@ -37,7 +37,7 @@ import org.openrdf.queryrender.sparql.SPARQLQueryRenderer;
/**
* Pretty renders a {@link QueryReport}.
*/
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class QueryReportRenderer {
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/Report.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/Report.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/Report.java
index cdd51f8..524a4ed 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/Report.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/Report.java
@@ -21,8 +21,8 @@ package org.apache.rya.indexing.pcj.fluo.client.util;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
-import javax.annotation.ParametersAreNonnullByDefault;
-import javax.annotation.concurrent.Immutable;
+// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault;
+// SEE RYA-211 import javax.annotation.concurrent.Immutable;
import org.apache.commons.lang3.StringUtils;
@@ -33,8 +33,8 @@ import com.google.common.collect.ImmutableList;
* left hand side of the table and the value of the item on the right hand side.
* If an item does not have any values, then it prints an empty line.
*/
-@Immutable
-@ParametersAreNonnullByDefault
+// SEE RYA-211 @Immutable
+// SEE RYA-211 @ParametersAreNonnullByDefault
public class Report {
private final ImmutableList<ReportItem> items;
@@ -111,8 +111,8 @@ public class Report {
* An item that may appear within a {@link Report}. Each item has a title
* that briefly describes the value it holds.
*/
- @Immutable
- @ParametersAreNonnullByDefault
+// SEE RYA-211 @Immutable
+// SEE RYA-211 @ParametersAreNonnullByDefault
public static final class ReportItem {
private final String title;
private final String[] valueLines;
@@ -172,7 +172,7 @@ public class Report {
/**
* Builds instances of {@link Report}.
*/
- @ParametersAreNonnullByDefault
+// SEE RYA-211 @ParametersAreNonnullByDefault
public static final class Builder {
private final ImmutableList.Builder<ReportItem> lines = ImmutableList.builder();
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b170574..ac950ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,7 +122,7 @@ under the License.
<fluo.version>1.0.0-incubating</fluo.version>
<jmh.version>1.13</jmh.version>
- <jsr305.version>3.0.1</jsr305.version>
+ <jsr305.version>1.3.9-1</jsr305.version>
</properties>
<dependencyManagement>
<dependencies>
@@ -331,6 +331,13 @@ under the License.
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>${hadoop.version}</version>
+ <exclusions>
+ <!-- released under the LGPL license -->
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -502,6 +509,13 @@ under the License.
<groupId>org.apache.fluo</groupId>
<artifactId>fluo-core</artifactId>
<version>${fluo.version}</version>
+ <exclusions>
+ <!-- released under the LGPL license -->
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.fluo</groupId>
@@ -556,8 +570,8 @@ under the License.
</dependency>
<dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
+ <groupId>com.github.stephenc.findbugs</groupId>
+ <artifactId>findbugs-annotations</artifactId>
<version>${jsr305.version}</version>
</dependency>
@@ -566,6 +580,13 @@ under the License.
<artifactId>accumulo-minicluster</artifactId>
<version>${accumulo.version}</version>
<scope>test</scope>
+ <exclusions>
+ <!-- released under the LGPL license -->
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</dependencyManagement>