http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSet.java ---------------------------------------------------------------------- diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSet.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSet.java index 1a0bbc5..d98f556 100644 --- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSet.java +++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSet.java @@ -20,14 +20,14 @@ package org.apache.rya.indexing.pcj.storage.accumulo; import static java.util.Objects.requireNonNull; -import javax.annotation.ParametersAreNonnullByDefault; +// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault; import org.openrdf.query.BindingSet; /** * Decorates a {@link BindingSet} with a collection of visibilities. */ -@ParametersAreNonnullByDefault +// SEE RYA-211 @ParametersAreNonnullByDefault public class VisibilityBindingSet extends BindingSetDecorator { private static final long serialVersionUID = 1L; private String visibility;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetStringConverter.java ---------------------------------------------------------------------- diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetStringConverter.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetStringConverter.java index 307d0b4..8530efe 100644 --- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetStringConverter.java +++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetStringConverter.java @@ -18,7 +18,7 @@ */ package org.apache.rya.indexing.pcj.storage.accumulo; -import javax.annotation.ParametersAreNonnullByDefault; +// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault; import org.openrdf.query.BindingSet; @@ -26,7 +26,7 @@ import org.openrdf.query.BindingSet; * Converts {@link BindingSet}s to Strings and back again. The Strings do not * include the binding names and are ordered with a {@link VariableOrder}. */ -@ParametersAreNonnullByDefault +// SEE RYA-211 @ParametersAreNonnullByDefault public class VisibilityBindingSetStringConverter extends BindingSetStringConverter { public static final char VISIBILITY_DELIM = 1; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/update/PrecomputedJoinUpdater.java ---------------------------------------------------------------------- diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/update/PrecomputedJoinUpdater.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/update/PrecomputedJoinUpdater.java index 54fe325..462bf4d 100644 --- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/update/PrecomputedJoinUpdater.java +++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/update/PrecomputedJoinUpdater.java @@ -20,7 +20,7 @@ package org.apache.rya.indexing.pcj.update; import java.util.Collection; -import javax.annotation.ParametersAreNonnullByDefault; +// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault; import org.apache.rya.indexing.pcj.storage.PcjException; @@ -30,7 +30,7 @@ import org.apache.rya.api.domain.RyaStatement; * Updates the state of all PCJ indices whenever {@link RyaStatement}s are * added to or removed from the system. */ -@ParametersAreNonnullByDefault +// SEE RYA-211 @ParametersAreNonnullByDefault public interface PrecomputedJoinUpdater { /** http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CreatePcj.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CreatePcj.java b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CreatePcj.java index d31e578..1066050 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CreatePcj.java +++ b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CreatePcj.java @@ -26,7 +26,7 @@ import static org.apache.rya.indexing.pcj.fluo.app.IncrementalUpdateConstants.NO import java.util.HashSet; import java.util.Set; -import javax.annotation.ParametersAreNonnullByDefault; +// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault; import org.apache.rya.indexing.pcj.fluo.app.FluoStringConverter; import org.apache.rya.indexing.pcj.fluo.app.query.FluoQuery; @@ -71,7 +71,7 @@ import org.apache.fluo.api.client.Transaction; * will percolate to the top of the query, and those results will be exported to * Rya's query system. */ -@ParametersAreNonnullByDefault +// SEE RYA-211 @ParametersAreNonnullByDefault public class CreatePcj { /** http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/DeletePcj.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/DeletePcj.java b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/DeletePcj.java index 79ca0ea..4d3d779 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/DeletePcj.java +++ b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/DeletePcj.java @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import javax.annotation.ParametersAreNonnullByDefault; +// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault; import org.apache.rya.indexing.pcj.fluo.app.NodeType; import org.apache.rya.indexing.pcj.fluo.app.query.FilterMetadata; @@ -56,7 +56,7 @@ import org.apache.fluo.api.data.Span; * into memory.</li> * </ol> */ -@ParametersAreNonnullByDefault +// SEE RYA-211 @ParametersAreNonnullByDefault public class DeletePcj { private final FluoQueryMetadataDAO dao = new FluoQueryMetadataDAO(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/GetQueryReport.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/GetQueryReport.java b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/GetQueryReport.java index e1e8566..51d580d 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/GetQueryReport.java +++ b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/GetQueryReport.java @@ -25,9 +25,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.concurrent.Immutable; +import edu.umd.cs.findbugs.annotations.Nullable; +// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault; +// SEE RYA-211 import javax.annotation.concurrent.Immutable; import org.apache.rya.indexing.pcj.fluo.app.query.FilterMetadata; import org.apache.rya.indexing.pcj.fluo.app.query.FluoQuery; @@ -50,7 +50,7 @@ import org.apache.fluo.api.data.Span; * Get a reports that indicates how many binding sets have been emitted for * the queries that is being managed by the fluo application. */ -@ParametersAreNonnullByDefault +// SEE RYA-211 @ParametersAreNonnullByDefault public class GetQueryReport { private final FluoQueryMetadataDAO metadataDao = new FluoQueryMetadataDAO(); @@ -145,8 +145,8 @@ public class GetQueryReport { * as well as the number of Binding Sets that have been emitted for each of * the query nodes. */ - @Immutable - @ParametersAreNonnullByDefault +// SEE RYA-211 @Immutable +// SEE RYA-211 @ParametersAreNonnullByDefault public static final class QueryReport { /** @@ -212,7 +212,7 @@ public class GetQueryReport { /** * Builds instances of {@link QueryReport}. */ - @ParametersAreNonnullByDefault +// SEE RYA-211 @ParametersAreNonnullByDefault public static final class Builder { private FluoQuery fluoQuery = null; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/BindingSetRow.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/BindingSetRow.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/BindingSetRow.java index fa0ea70..16374ad 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/BindingSetRow.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/BindingSetRow.java @@ -21,8 +21,8 @@ package org.apache.rya.indexing.pcj.fluo.app; import static com.google.common.base.Preconditions.checkNotNull; import static org.apache.rya.indexing.pcj.fluo.app.IncrementalUpdateConstants.NODEID_BS_DELIM; -import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.concurrent.Immutable; +// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault; +// SEE RYA-211 import javax.annotation.concurrent.Immutable; import org.apache.fluo.api.data.Bytes; @@ -30,8 +30,8 @@ import org.apache.fluo.api.data.Bytes; * The values of an Accumulo Row ID for a row that stores a Binding set for * a specific Node ID of a query. */ -@Immutable -@ParametersAreNonnullByDefault +// SEE RYA-211 @Immutable +// SEE RYA-211 @ParametersAreNonnullByDefault public class BindingSetRow { private final String nodeId; private final String bindingSetString; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FilterFinder.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FilterFinder.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FilterFinder.java index 3c9b875..034f510 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FilterFinder.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FilterFinder.java @@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.ParametersAreNonnullByDefault; +// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault; import org.openrdf.query.algebra.Filter; import org.openrdf.query.algebra.helpers.QueryModelVisitorBase; @@ -35,7 +35,7 @@ import com.google.common.base.Optional; /** * Searches a SPARQL query for {@link Filter}s. */ -@ParametersAreNonnullByDefault +// SEE RYA-211 @ParametersAreNonnullByDefault class FilterFinder { /** http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FilterResultUpdater.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FilterResultUpdater.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FilterResultUpdater.java index b1af4fc..85b7bd7 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FilterResultUpdater.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FilterResultUpdater.java @@ -21,7 +21,7 @@ package org.apache.rya.indexing.pcj.fluo.app; import static com.google.common.base.Preconditions.checkNotNull; import static org.apache.rya.indexing.pcj.fluo.app.IncrementalUpdateConstants.NODEID_BS_DELIM; -import javax.annotation.ParametersAreNonnullByDefault; +// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault; import org.apache.rya.indexing.pcj.fluo.app.query.FilterMetadata; import org.apache.rya.indexing.pcj.fluo.app.query.FluoQueryColumns; @@ -57,7 +57,7 @@ import org.apache.fluo.api.data.Column; * Updates the results of a Filter node when its child has added a new Binding * Set to its results. */ -@ParametersAreNonnullByDefault +// SEE RYA-211 @ParametersAreNonnullByDefault public class FilterResultUpdater { private static final BindingSetStringConverter ID_CONVERTER = new BindingSetStringConverter(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FluoStringConverter.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FluoStringConverter.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FluoStringConverter.java index 98f3620..86676cb 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FluoStringConverter.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FluoStringConverter.java @@ -23,7 +23,7 @@ import static org.apache.rya.indexing.pcj.fluo.app.IncrementalUpdateConstants.DE import static org.apache.rya.indexing.pcj.fluo.app.IncrementalUpdateConstants.TYPE_DELIM; import static org.apache.rya.indexing.pcj.fluo.app.IncrementalUpdateConstants.URI_TYPE; -import javax.annotation.ParametersAreNonnullByDefault; +// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault; import org.openrdf.model.Literal; import org.openrdf.model.URI; @@ -40,7 +40,7 @@ import org.apache.rya.api.resolver.RdfToRyaConversions; * Contains method that convert between the Sesame representations of RDF * components and the Strings that are used by the Fluo PCJ application. */ -@ParametersAreNonnullByDefault +// SEE RYA-211 @ParametersAreNonnullByDefault public class FluoStringConverter { /** http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/JoinResultUpdater.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/JoinResultUpdater.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/JoinResultUpdater.java index 73a03ca..7661959 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/JoinResultUpdater.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/JoinResultUpdater.java @@ -27,7 +27,7 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import javax.annotation.ParametersAreNonnullByDefault; +// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault; import org.apache.rya.indexing.pcj.fluo.app.query.FluoQueryColumns; import org.apache.rya.indexing.pcj.fluo.app.query.FluoQueryMetadataDAO; @@ -57,7 +57,7 @@ import org.apache.fluo.api.data.Span; * Updates the results of a Join node when one of its children has added a * new Binding Set to its results. */ -@ParametersAreNonnullByDefault +// SEE RYA-211 @ParametersAreNonnullByDefault public class JoinResultUpdater { private static final BindingSetStringConverter idConverter = new BindingSetStringConverter(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/QueryResultUpdater.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/QueryResultUpdater.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/QueryResultUpdater.java index b4800fc..947e624 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/QueryResultUpdater.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/QueryResultUpdater.java @@ -21,7 +21,7 @@ package org.apache.rya.indexing.pcj.fluo.app; import static com.google.common.base.Preconditions.checkNotNull; import static org.apache.rya.indexing.pcj.fluo.app.IncrementalUpdateConstants.NODEID_BS_DELIM; -import javax.annotation.ParametersAreNonnullByDefault; +// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault; import org.apache.rya.indexing.pcj.fluo.app.query.FluoQueryColumns; import org.apache.rya.indexing.pcj.fluo.app.query.QueryMetadata; @@ -39,7 +39,7 @@ import org.apache.fluo.api.data.Column; * Updates the results of a Query node when one of its children has added a * new Binding Set to its results. */ -@ParametersAreNonnullByDefault +// SEE RYA-211 @ParametersAreNonnullByDefault public class QueryResultUpdater { private final BindingSetStringConverter converter = new BindingSetStringConverter(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporter.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporter.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporter.java index ecc39bd..e58d2d4 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporter.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporter.java @@ -18,7 +18,7 @@ */ package org.apache.rya.indexing.pcj.fluo.app.export; -import javax.annotation.ParametersAreNonnullByDefault; +// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault; import org.apache.fluo.api.client.TransactionBase; import org.apache.rya.indexing.pcj.storage.accumulo.VisibilityBindingSet; @@ -28,7 +28,7 @@ import org.apache.rya.indexing.pcj.storage.accumulo.VisibilityBindingSet; * Exports a single Binding Set that is a new result for a SPARQL query to some * other location. */ -@ParametersAreNonnullByDefault +// SEE RYA-211 @ParametersAreNonnullByDefault public interface IncrementalResultExporter { /** http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporterFactory.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporterFactory.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporterFactory.java index 7052069..feb648f 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporterFactory.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporterFactory.java @@ -18,7 +18,7 @@ */ package org.apache.rya.indexing.pcj.fluo.app.export; -import javax.annotation.ParametersAreNonnullByDefault; +// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault; import com.google.common.base.Optional; @@ -28,7 +28,7 @@ import org.apache.fluo.api.observer.Observer.Context; * Builds instances of {@link IncrementalResultExporter} using the provided * configurations. */ -@ParametersAreNonnullByDefault +// SEE RYA-211 @ParametersAreNonnullByDefault public interface IncrementalResultExporterFactory { /** http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/ParametersBase.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/ParametersBase.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/ParametersBase.java index 57938c7..b19c7cd 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/ParametersBase.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/ParametersBase.java @@ -22,14 +22,14 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; -import javax.annotation.ParametersAreNonnullByDefault; +// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault; import com.google.common.base.Optional; /** * Contains common parsing functions that make it easier to interpret parameter maps. */ -@ParametersAreNonnullByDefault +// SEE RYA-211 @ParametersAreNonnullByDefault public abstract class ParametersBase { protected final Map<String, String> params; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/rya/RyaExportParameters.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/rya/RyaExportParameters.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/rya/RyaExportParameters.java index 18af878..c220bee 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/rya/RyaExportParameters.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/rya/RyaExportParameters.java @@ -20,8 +20,8 @@ package org.apache.rya.indexing.pcj.fluo.app.export.rya; import java.util.Map; -import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; +import edu.umd.cs.findbugs.annotations.Nullable; +// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault; import org.apache.rya.indexing.pcj.fluo.app.export.ParametersBase; @@ -34,7 +34,7 @@ import org.apache.fluo.api.observer.Observer; * {@link Observer#init(io.fluo.api.observer.Observer.Context)} method related * to Rya PCJ exporting. */ -@ParametersAreNonnullByDefault +// SEE RYA-211 @ParametersAreNonnullByDefault public class RyaExportParameters extends ParametersBase { public static final String CONF_EXPORT_TO_RYA = "pcj.fluo.export.rya.enabled"; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/BindingSetUpdater.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/BindingSetUpdater.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/BindingSetUpdater.java index a2953cf..5e56009 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/BindingSetUpdater.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/BindingSetUpdater.java @@ -20,7 +20,7 @@ package org.apache.rya.indexing.pcj.fluo.app.observers; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.ParametersAreNonnullByDefault; +// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault; import org.apache.rya.indexing.pcj.fluo.app.BindingSetRow; import org.apache.rya.indexing.pcj.fluo.app.FilterResultUpdater; @@ -44,7 +44,7 @@ import org.apache.fluo.api.observer.AbstractObserver; * Set. This observer updates its parent if the new Binding Set effects the parent's * results. */ -@ParametersAreNonnullByDefault +// SEE RYA-211 @ParametersAreNonnullByDefault public abstract class BindingSetUpdater extends AbstractObserver { // DAO http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/CommonNodeMetadata.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/CommonNodeMetadata.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/CommonNodeMetadata.java index aeace2c..ee1f364 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/CommonNodeMetadata.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/CommonNodeMetadata.java @@ -20,8 +20,8 @@ package org.apache.rya.indexing.pcj.fluo.app.query; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.concurrent.Immutable; +// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault; +// SEE RYA-211 import javax.annotation.concurrent.Immutable; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; @@ -31,8 +31,8 @@ import com.google.common.base.Objects; /** * Metadata that is common to all nodes that are part of a query. */ -@Immutable -@ParametersAreNonnullByDefault +// SEE RYA-211 @Immutable +// SEE RYA-211 @ParametersAreNonnullByDefault public abstract class CommonNodeMetadata { private final String nodeId; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FilterMetadata.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FilterMetadata.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FilterMetadata.java index 1e167b1..481f520 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FilterMetadata.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FilterMetadata.java @@ -21,9 +21,9 @@ package org.apache.rya.indexing.pcj.fluo.app.query; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.concurrent.Immutable; +import edu.umd.cs.findbugs.annotations.Nullable; +// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault; +// SEE RYA-211 import javax.annotation.concurrent.Immutable; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; @@ -33,8 +33,8 @@ import com.google.common.base.Objects; /** * Metadata that is specific to Filter nodes. */ -@Immutable -@ParametersAreNonnullByDefault +// SEE RYA-211 @Immutable +// SEE RYA-211 @ParametersAreNonnullByDefault public class FilterMetadata extends CommonNodeMetadata { private final String originalSparql; @@ -158,7 +158,7 @@ public class FilterMetadata extends CommonNodeMetadata { /** * Builds instances of {@link FilterMetadata}. */ - @ParametersAreNonnullByDefault +// SEE RYA-211 @ParametersAreNonnullByDefault public static final class Builder { private final String nodeId; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQuery.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQuery.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQuery.java index 4282c99..4d3002e 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQuery.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQuery.java @@ -25,9 +25,9 @@ import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; -import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.concurrent.Immutable; +import edu.umd.cs.findbugs.annotations.Nullable; +// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault; +// SEE RYA-211 import javax.annotation.concurrent.Immutable; import org.apache.commons.lang3.builder.EqualsBuilder; @@ -38,8 +38,8 @@ import com.google.common.collect.ImmutableMap; /** * Metadata for every node of a query that is being updated by the Fluo application. */ -@Immutable -@ParametersAreNonnullByDefault +// SEE RYA-211 @Immutable +// SEE RYA-211 @ParametersAreNonnullByDefault public class FluoQuery { private final QueryMetadata queryMetadata; @@ -196,7 +196,7 @@ public class FluoQuery { /** * Builds instances of {@link FluoQuery}. */ - @ParametersAreNonnullByDefault +// SEE RYA-211 @ParametersAreNonnullByDefault public static final class Builder { private QueryMetadata.Builder queryBuilder = null; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryColumns.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryColumns.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryColumns.java index 13743f4..9b9836f 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryColumns.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryColumns.java @@ -23,7 +23,7 @@ import static java.util.Objects.requireNonNull; import java.util.Arrays; import java.util.List; -import javax.annotation.ParametersAreNonnullByDefault; +// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault; import org.apache.fluo.api.data.Column; @@ -163,7 +163,7 @@ public class FluoQueryColumns { * Enumerates the {@link Column}s that hold all of the fields for each type * of node that can compose a query. */ - @ParametersAreNonnullByDefault +// SEE RYA-211 @ParametersAreNonnullByDefault public enum QueryNodeMetadataColumns { /** * The columns a {@link QueryMetadata} object's fields are stored within. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAO.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAO.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAO.java index 8d41c61..8886b39 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAO.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAO.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; -import javax.annotation.ParametersAreNonnullByDefault; +// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault; import org.apache.rya.indexing.pcj.fluo.app.NodeType; import org.apache.rya.indexing.pcj.fluo.app.query.JoinMetadata.JoinType; @@ -39,7 +39,7 @@ import org.apache.fluo.api.data.Column; * Reads and writes {@link FluoQuery} instances and their components to/from * a Fluo table. */ -@ParametersAreNonnullByDefault +// SEE RYA-211 @ParametersAreNonnullByDefault public class FluoQueryMetadataDAO { /** http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/JoinMetadata.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/JoinMetadata.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/JoinMetadata.java index 9696449..7dfcf37 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/JoinMetadata.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/JoinMetadata.java @@ -20,9 +20,9 @@ package org.apache.rya.indexing.pcj.fluo.app.query; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.concurrent.Immutable; +import edu.umd.cs.findbugs.annotations.Nullable; +// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault; +// SEE RYA-211 import javax.annotation.concurrent.Immutable; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; @@ -32,8 +32,8 @@ import com.google.common.base.Objects; /** * Metadata that is specific to Join nodes. */ -@Immutable -@ParametersAreNonnullByDefault +// SEE RYA-211 @Immutable +// SEE RYA-211 @ParametersAreNonnullByDefault public class JoinMetadata extends CommonNodeMetadata { /** @@ -161,7 +161,7 @@ public class JoinMetadata extends CommonNodeMetadata { /** * Builds instances of {@link JoinMetadata}. */ - @ParametersAreNonnullByDefault +// SEE RYA-211 @ParametersAreNonnullByDefault public static final class Builder { private final String nodeId; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/QueryMetadata.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/QueryMetadata.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/QueryMetadata.java index f3cd739..7bb3c5f 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/QueryMetadata.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/QueryMetadata.java @@ -20,9 +20,9 @@ package org.apache.rya.indexing.pcj.fluo.app.query; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.concurrent.Immutable; +import edu.umd.cs.findbugs.annotations.Nullable; +// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault; +// SEE RYA-211 import javax.annotation.concurrent.Immutable; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; @@ -32,8 +32,8 @@ import com.google.common.base.Objects; /** * Metadata that is specific to a Projection. */ -@Immutable -@ParametersAreNonnullByDefault +// SEE RYA-211 @Immutable +// SEE RYA-211 @ParametersAreNonnullByDefault public class QueryMetadata extends CommonNodeMetadata { private final String sparql; @@ -125,7 +125,7 @@ public class QueryMetadata extends CommonNodeMetadata { /** * Builds instances of {@link QueryMetadata}. */ - @ParametersAreNonnullByDefault +// SEE RYA-211 @ParametersAreNonnullByDefault public static final class Builder { private final String nodeId; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/SparqlFluoQueryBuilder.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/SparqlFluoQueryBuilder.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/SparqlFluoQueryBuilder.java index 3adff7f..15039c1 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/SparqlFluoQueryBuilder.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/SparqlFluoQueryBuilder.java @@ -32,8 +32,8 @@ import java.util.Map; import java.util.Set; import java.util.UUID; -import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.concurrent.Immutable; +// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault; +// SEE RYA-211 import javax.annotation.concurrent.Immutable; import org.apache.rya.indexing.pcj.fluo.app.FilterResultUpdater; import org.apache.rya.indexing.pcj.fluo.app.FluoStringConverter; @@ -89,7 +89,7 @@ public class SparqlFluoQueryBuilder { * of a {@link ParsedQuery}. This structure should only be used while creating * a new PCJ in Fluo and disposed of afterwards. */ - @ParametersAreNonnullByDefault +// SEE RYA-211 @ParametersAreNonnullByDefault public static final class NodeIds { /** @@ -415,8 +415,8 @@ public class SparqlFluoQueryBuilder { /** * Holds the Variable Order of the binding sets for the children of a join node. */ - @Immutable - @ParametersAreNonnullByDefault +// SEE RYA-211 @Immutable +// SEE RYA-211 @ParametersAreNonnullByDefault private static final class JoinVarOrders { private final VariableOrder leftVarOrder; private final VariableOrder rightVarOrder; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/StatementPatternMetadata.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/StatementPatternMetadata.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/StatementPatternMetadata.java index 253a41a..2531436 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/StatementPatternMetadata.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/StatementPatternMetadata.java @@ -20,9 +20,9 @@ package org.apache.rya.indexing.pcj.fluo.app.query; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.concurrent.Immutable; +import edu.umd.cs.findbugs.annotations.Nullable; +// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault; +// SEE RYA-211 import javax.annotation.concurrent.Immutable; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; @@ -32,8 +32,8 @@ import com.google.common.base.Objects; /** * Metadata that is specific to Statement Pattern nodes. */ -@Immutable -@ParametersAreNonnullByDefault +// SEE RYA-211 @Immutable +// SEE RYA-211 @ParametersAreNonnullByDefault public class StatementPatternMetadata extends CommonNodeMetadata { private final String statementPattern; @@ -125,7 +125,7 @@ public class StatementPatternMetadata extends CommonNodeMetadata { /** * Builds instances of {@link StatementPatternMetadata}. */ - @ParametersAreNonnullByDefault +// SEE RYA-211 @ParametersAreNonnullByDefault public static final class Builder { private final String nodeId; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClient.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClient.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClient.java index 9ee45e0..cadb035 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClient.java +++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClient.java @@ -32,7 +32,7 @@ import java.util.List; import java.util.Properties; import java.util.Set; -import javax.annotation.ParametersAreNonnullByDefault; +// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault; import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; @@ -65,7 +65,7 @@ import org.apache.rya.rdftriplestore.RyaSailRepository; /** * An application that helps Rya PCJ administrators interact with the cluster. */ -@ParametersAreNonnullByDefault +// SEE RYA-211 @ParametersAreNonnullByDefault public class PcjAdminClient { private static final Logger log = LogManager.getLogger(PcjAdminClient.class); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientCommand.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientCommand.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientCommand.java index 48ddf55..5d546a5 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientCommand.java +++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientCommand.java @@ -18,7 +18,7 @@ */ package org.apache.rya.indexing.pcj.fluo.client; -import javax.annotation.ParametersAreNonnullByDefault; +// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault; import org.apache.accumulo.core.client.Connector; @@ -28,7 +28,7 @@ import org.apache.rya.rdftriplestore.RyaSailRepository; /** * A command that may be executed by the {@link PcjAdminClient}. */ -@ParametersAreNonnullByDefault +// SEE RYA-211 @ParametersAreNonnullByDefault public interface PcjAdminClientCommand { /** http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientProperties.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientProperties.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientProperties.java index 794881f..d5aca09 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientProperties.java +++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientProperties.java @@ -22,14 +22,14 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Properties; -import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; +import edu.umd.cs.findbugs.annotations.Nullable; +// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault; /** * Interprets a {@link Properties} object so that it is easier to access * configuration values used by {@link PcjAdminClient}. */ -@ParametersAreNonnullByDefault +// SEE RYA-211 @ParametersAreNonnullByDefault public class PcjAdminClientProperties { // Properties that configure how Fluo will connect to Accumulo. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/ListQueriesCommand.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/ListQueriesCommand.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/ListQueriesCommand.java index 16a76cb..95d36f4 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/ListQueriesCommand.java +++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/ListQueriesCommand.java @@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.HashMap; import java.util.Map; -import javax.annotation.ParametersAreNonnullByDefault; +// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault; import org.apache.accumulo.core.client.Connector; import org.apache.logging.log4j.LogManager; @@ -47,7 +47,7 @@ import org.apache.rya.rdftriplestore.RyaSailRepository; /** * A command that lists information about the queries that are being managed by the Fluo app. */ -@ParametersAreNonnullByDefault +// SEE RYA-211 @ParametersAreNonnullByDefault public class ListQueriesCommand implements PcjAdminClientCommand { private static final Logger log = LogManager.getLogger(ListQueriesCommand.class); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/LoadTriplesCommand.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/LoadTriplesCommand.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/LoadTriplesCommand.java index a8b2c28..99da653 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/LoadTriplesCommand.java +++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/LoadTriplesCommand.java @@ -25,7 +25,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import javax.annotation.ParametersAreNonnullByDefault; +// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault; import org.apache.accumulo.core.client.Connector; import org.apache.commons.io.FilenameUtils; @@ -51,7 +51,7 @@ import org.apache.rya.rdftriplestore.RyaSailRepository; /** * A command that loads the contents of an NTriple file into the Fluo application. */ -@ParametersAreNonnullByDefault +// SEE RYA-211 @ParametersAreNonnullByDefault public class LoadTriplesCommand implements PcjAdminClientCommand { private static final Logger log = LogManager.getLogger(LoadTriplesCommand.class); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/NewQueryCommand.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/NewQueryCommand.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/NewQueryCommand.java index 23b93cd..b5d3c9e 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/NewQueryCommand.java +++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/NewQueryCommand.java @@ -25,7 +25,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import javax.annotation.ParametersAreNonnullByDefault; +// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault; import org.apache.accumulo.core.client.Connector; import org.apache.commons.io.IOUtils; @@ -52,7 +52,7 @@ import org.apache.rya.rdftriplestore.RyaSailRepository; * A command that creates a creates a new PCJ in the Fluo app and loads historic * statement pattern matches for it. */ -@ParametersAreNonnullByDefault +// SEE RYA-211 @ParametersAreNonnullByDefault public class NewQueryCommand implements PcjAdminClientCommand { private static final Logger log = LogManager.getLogger(NewQueryCommand.class); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/ParsedQueryRequest.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/ParsedQueryRequest.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/ParsedQueryRequest.java index 2993f17..a8604a6 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/ParsedQueryRequest.java +++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/ParsedQueryRequest.java @@ -27,8 +27,8 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.concurrent.Immutable; +// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault; +// SEE RYA-211 import javax.annotation.concurrent.Immutable; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; @@ -36,8 +36,8 @@ import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; /** * Represents a request to create a new PCJ in the Fluo app. */ -@Immutable -@ParametersAreNonnullByDefault +// SEE RYA-211 @Immutable +// SEE RYA-211 @ParametersAreNonnullByDefault public class ParsedQueryRequest { private final String sparql; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/QueryReportRenderer.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/QueryReportRenderer.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/QueryReportRenderer.java index 2b5bd8a..51a6495 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/QueryReportRenderer.java +++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/QueryReportRenderer.java @@ -20,7 +20,7 @@ package org.apache.rya.indexing.pcj.fluo.client.util; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.ParametersAreNonnullByDefault; +// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault; import org.apache.commons.lang3.StringUtils; import org.apache.rya.indexing.pcj.fluo.api.GetQueryReport.QueryReport; @@ -37,7 +37,7 @@ import org.openrdf.queryrender.sparql.SPARQLQueryRenderer; /** * Pretty renders a {@link QueryReport}. */ -@ParametersAreNonnullByDefault +// SEE RYA-211 @ParametersAreNonnullByDefault public class QueryReportRenderer { /** http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/Report.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/Report.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/Report.java index cdd51f8..524a4ed 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/Report.java +++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/Report.java @@ -21,8 +21,8 @@ package org.apache.rya.indexing.pcj.fluo.client.util; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.concurrent.Immutable; +// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault; +// SEE RYA-211 import javax.annotation.concurrent.Immutable; import org.apache.commons.lang3.StringUtils; @@ -33,8 +33,8 @@ import com.google.common.collect.ImmutableList; * left hand side of the table and the value of the item on the right hand side. * If an item does not have any values, then it prints an empty line. */ -@Immutable -@ParametersAreNonnullByDefault +// SEE RYA-211 @Immutable +// SEE RYA-211 @ParametersAreNonnullByDefault public class Report { private final ImmutableList<ReportItem> items; @@ -111,8 +111,8 @@ public class Report { * An item that may appear within a {@link Report}. Each item has a title * that briefly describes the value it holds. */ - @Immutable - @ParametersAreNonnullByDefault +// SEE RYA-211 @Immutable +// SEE RYA-211 @ParametersAreNonnullByDefault public static final class ReportItem { private final String title; private final String[] valueLines; @@ -172,7 +172,7 @@ public class Report { /** * Builds instances of {@link Report}. */ - @ParametersAreNonnullByDefault +// SEE RYA-211 @ParametersAreNonnullByDefault public static final class Builder { private final ImmutableList.Builder<ReportItem> lines = ImmutableList.builder(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b170574..ac950ec 100644 --- a/pom.xml +++ b/pom.xml @@ -122,7 +122,7 @@ under the License. <fluo.version>1.0.0-incubating</fluo.version> <jmh.version>1.13</jmh.version> - <jsr305.version>3.0.1</jsr305.version> + <jsr305.version>1.3.9-1</jsr305.version> </properties> <dependencyManagement> <dependencies> @@ -331,6 +331,13 @@ under the License. <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> <version>${hadoop.version}</version> + <exclusions> + <!-- released under the LGPL license --> + <exclusion> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -502,6 +509,13 @@ under the License. <groupId>org.apache.fluo</groupId> <artifactId>fluo-core</artifactId> <version>${fluo.version}</version> + <exclusions> + <!-- released under the LGPL license --> + <exclusion> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.fluo</groupId> @@ -556,8 +570,8 @@ under the License. </dependency> <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> + <groupId>com.github.stephenc.findbugs</groupId> + <artifactId>findbugs-annotations</artifactId> <version>${jsr305.version}</version> </dependency> @@ -566,6 +580,13 @@ under the License. <artifactId>accumulo-minicluster</artifactId> <version>${accumulo.version}</version> <scope>test</scope> + <exclusions> + <!-- released under the LGPL license --> + <exclusion> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> </dependencyManagement>
