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 <[email protected]> Authored: Mon Oct 17 15:20:39 2016 -0400 Committer: Aaron Mihalik <[email protected]> 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 = ";";
