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:20 UTC
[5/5] incubator-rya git commit: RYA-211 Replacing Findbugs
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