You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by dl...@apache.org on 2016/06/13 14:22:25 UTC
[1/6] incubator-quarks git commit: fix javadoc warnings and errors
when Xdoclint:none is disabled
Repository: incubator-quarks
Updated Branches:
refs/heads/master d982184bb -> 725c10765
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/utils/streamscope/src/main/java/quarks/streamscope/StreamScope.java
----------------------------------------------------------------------
diff --git a/utils/streamscope/src/main/java/quarks/streamscope/StreamScope.java b/utils/streamscope/src/main/java/quarks/streamscope/StreamScope.java
index 2a76755..77a87e5 100644
--- a/utils/streamscope/src/main/java/quarks/streamscope/StreamScope.java
+++ b/utils/streamscope/src/main/java/quarks/streamscope/StreamScope.java
@@ -51,6 +51,8 @@ import quarks.streamscope.mbeans.StreamScopeRegistryMXBean;
* </P>
* @see StreamScopeRegistry
* @see quarks.providers.development.DevelopmentProvider DevelopmentProvider
+ *
+ * @param <T> Tuple type
*/
public class StreamScope<T> implements Consumer<T> {
private static final long serialVersionUID = 1L;
@@ -118,9 +120,11 @@ public class StreamScope<T> implements Consumer<T> {
* <li>a maximum retention count is exceeded</li>
* <li>TODO a maximum retention time is exceeded</li>
* </ul>
- * </P><P>
+ * <P>
* The default configuration is a maxCount of 10.
* </P>
+ *
+ * @param <T> Tuple type
*/
public static class BufferManager<T> {
private List<Sample<T>> buffer = Collections.emptyList();
@@ -208,7 +212,7 @@ public class StreamScope<T> implements Consumer<T> {
* <li>by-time - capture based on time elapsed since the last capture</li>
* <li>by-Predicate - capture based on evaluating a predicate</li>
* </ul>
- * </P><P>
+ * <P>
* Tuple capture can be temporarily paused via {@link TriggerManager#setPaused(boolean) setPaused}.
* Pausing capture does not clear the capture buffer.
* </P><P>
@@ -220,6 +224,8 @@ public class StreamScope<T> implements Consumer<T> {
* </P><P>
* The default configuration is continuous (by-count==1) and not paused.
* </P>
+ *
+ * @param <T> Tuple type
*/
public static class TriggerManager<T> {
private Predicate<T> predicate = Functions.alwaysTrue();
@@ -268,7 +274,7 @@ public class StreamScope<T> implements Consumer<T> {
/**
* Capture the first and every nth tuple
- * @param count
+ * @param count the nth value interval
*/
public void setCaptureByCount(int count) {
if (count == 1)
@@ -290,7 +296,7 @@ public class StreamScope<T> implements Consumer<T> {
/**
* Capture a tuple if the {@code predicate} test of the tuple returns true.
- * @param predicate
+ * @param predicate the predicate
*/
public void setCaptureByPredicate(Predicate<T> predicate) {
Objects.requireNonNull(predicate, "predicate");
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/utils/streamscope/src/main/java/quarks/streamscope/StreamScopeRegistry.java
----------------------------------------------------------------------
diff --git a/utils/streamscope/src/main/java/quarks/streamscope/StreamScopeRegistry.java b/utils/streamscope/src/main/java/quarks/streamscope/StreamScopeRegistry.java
index a02057e..c45a528 100644
--- a/utils/streamscope/src/main/java/quarks/streamscope/StreamScopeRegistry.java
+++ b/utils/streamscope/src/main/java/quarks/streamscope/StreamScopeRegistry.java
@@ -66,18 +66,27 @@ public class StreamScopeRegistry {
return String.format(STREAMID_FMT, jobId, opletId, oport);
}
- /** create a prefix of a streamId based name */
+ /** create a prefix of a streamId based name
+ * @param jobId the job id (e.g., "JOB_0")
+ * @param opletId the oplet id (e.g., "OP_2")
+ * @return the value
+ */
static String mkStreamIdNamePrefix(String jobId, String opletId) {
return String.format(ID_PREFIX+JOB_OPLET_FMT, jobId, opletId);
}
- /** create a registration name for a stream alias */
+ /** create a registration name for a stream alias
+ * @param alias the alias
+ * @return the value
+ */
public static String nameForStreamAlias(String alias) {
Objects.requireNonNull(alias, "alias");
return ALIAS_PREFIX+alias;
}
/** Create a registration name for a stream id.
+ * @param streamId the stream id
+ * @return the value
* @see #mkStreamId(String, String, int)
*/
public static String nameForStreamId(String streamId) {
@@ -85,7 +94,10 @@ public class StreamScopeRegistry {
return ID_PREFIX+streamId;
}
- /** returns null if {@code name} is not a from nameByStreamAlias() */
+ /** Extract the stream alias from a name
+ * @param name the name
+ * @return null if {@code name} is not a from nameByStreamAlias()
+ */
public static String streamAliasFromName(String name) {
Objects.requireNonNull(name, "name");
if (!name.startsWith(ALIAS_PREFIX))
@@ -93,7 +105,10 @@ public class StreamScopeRegistry {
return name.substring(ALIAS_PREFIX.length());
}
- /** returns null if {@code name} is not a from nameByStreamId() */
+ /** Extract the streamId from the name.
+ * @param name the name
+ * @return null if {@code name} is not a from nameByStreamId()
+ */
public static String streamIdFromName(String name) {
Objects.requireNonNull(name, "name");
if (!name.startsWith(ID_PREFIX))
@@ -145,6 +160,7 @@ public class StreamScopeRegistry {
/** Get registered StreamScopes and the name(s) each is registered with.
* The map is backed by the registry so its contents may change.
+ * @return the map
*/
public synchronized Map<StreamScope<?>, List<String>> getStreamScopes() {
return Collections.unmodifiableMap(byStreamScopeMap);
@@ -152,6 +168,7 @@ public class StreamScopeRegistry {
/** remove the specific name registration. Other registration of the same StreamScope may still exist.
* no-op if name is not registered.
+ * @param name the name to unregister
* @see #unregister(StreamScope)
*/
public synchronized void unregister(String name) {
@@ -166,6 +183,7 @@ public class StreamScopeRegistry {
/** remove all name registrations of the StreamScope.
* no-op if no registrations for the StreamScope
+ * @param streamScope the StreamScope to unregister
*/
public synchronized void unregister(StreamScope<?> streamScope) {
List<String> names = byStreamScopeMap.get(streamScope);
@@ -178,6 +196,8 @@ public class StreamScopeRegistry {
/** remove all name registrations of the StreamScopes for the specified oplet.
* no-op if no registrations for the oplet
+ * @param jobId the job id (e.g., "JOB_0")
+ * @param opletId the oplet id (e.g., "OP_2")
*/
synchronized void unregister(String jobId, String opletId) {
String prefix = mkStreamIdNamePrefix(jobId, opletId);
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/utils/streamscope/src/main/java/quarks/streamscope/StreamScopeSetup.java
----------------------------------------------------------------------
diff --git a/utils/streamscope/src/main/java/quarks/streamscope/StreamScopeSetup.java b/utils/streamscope/src/main/java/quarks/streamscope/StreamScopeSetup.java
index 69c669f..8286c94 100644
--- a/utils/streamscope/src/main/java/quarks/streamscope/StreamScopeSetup.java
+++ b/utils/streamscope/src/main/java/quarks/streamscope/StreamScopeSetup.java
@@ -80,13 +80,12 @@ public class StreamScopeSetup {
* Perform the registrations needed to use the streamscope package.
* <P>
* Typically called during {@link TopologyProvider} construction.
- * </P><P>
+ * </P>
* <UL>
* <LI>register the StreamScopeRegistry service</LI>
* <LI>register a cleaner to remove job oplet StreamScope registrations</LI>
* <LI>register a StreamScopeRegistryMXBean with the registered ControlService</LI>
* </UL>
- * </P>
* @param services ServiceContainer to register with.
*/
public static void register(ServiceContainer services) {
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/utils/streamscope/src/main/java/quarks/streamscope/mbeans/StreamScopeMXBean.java
----------------------------------------------------------------------
diff --git a/utils/streamscope/src/main/java/quarks/streamscope/mbeans/StreamScopeMXBean.java b/utils/streamscope/src/main/java/quarks/streamscope/mbeans/StreamScopeMXBean.java
index 00c84da..aee322c 100644
--- a/utils/streamscope/src/main/java/quarks/streamscope/mbeans/StreamScopeMXBean.java
+++ b/utils/streamscope/src/main/java/quarks/streamscope/mbeans/StreamScopeMXBean.java
@@ -92,7 +92,7 @@ public interface StreamScopeMXBean {
* <LI>For other types it's a JSON object with the type's
* members and JSON encoding of their values.</LI>
* </UL>
- * </P><P>
+ * <P>
* The returned samples are removed from the capture buffer.
* </P>
* @return JSON of the captured samples
@@ -128,7 +128,7 @@ public interface StreamScopeMXBean {
/**
* Capture the first and every nth tuple
- * @param count
+ * @param count the nth value interval
*/
void setCaptureByCount(int count);
[2/6] incubator-quarks git commit: fix javadoc warnings and errors
when Xdoclint:none is disabled
Posted by dl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/connectors/file/src/main/java/quarks/connectors/file/FileWriterFlushConfig.java
----------------------------------------------------------------------
diff --git a/connectors/file/src/main/java/quarks/connectors/file/FileWriterFlushConfig.java b/connectors/file/src/main/java/quarks/connectors/file/FileWriterFlushConfig.java
index 9b8128e..4fd7384 100644
--- a/connectors/file/src/main/java/quarks/connectors/file/FileWriterFlushConfig.java
+++ b/connectors/file/src/main/java/quarks/connectors/file/FileWriterFlushConfig.java
@@ -45,23 +45,41 @@ public class FileWriterFlushConfig<T> {
* The underlying buffered writer's automatic flushing is used.
* <p>
* Same as {@code newConfig(0, 0, null)}
+ *
+ * @param <T> Tuple type
+ * @return the flush configuration
*/
public static <T> FileWriterFlushConfig<T> newImplicitConfig() {
return newConfig(0,0,null);
}
- /** same as {@code newConfig(cntTuples, 0, null)} */
+ /** same as {@code newConfig(cntTuples, 0, null)}
+ *
+ * @param <T> Tuple type
+ * @param cntTuples flush every {@code cntTuple} tuples written. 0 to disable.
+ * @return the flush configuration
+ */
public static <T> FileWriterFlushConfig<T> newCountBasedConfig(int cntTuples) {
if (cntTuples < 1)
throw new IllegalArgumentException("cntTuples");
return newConfig(cntTuples, 0, null);
}
- /** same as {@code newConfig(0, periodMsec, null)} */
+ /** same as {@code newConfig(0, periodMsec, null)}
+ *
+ * @param <T> Tuple type
+ * @param periodMsec flush every {@code periodMsec} milliseconds. 0 to disable.
+ * @return the flush configuration
+ */
public static <T> FileWriterFlushConfig<T> newTimeBasedConfig(long periodMsec) {
if (periodMsec < 1)
throw new IllegalArgumentException("periodMsec");
return newConfig(0, periodMsec, null);
}
- /** same as {@code newConfig(0, 0, tuplePredicate)} */
+ /** same as {@code newConfig(0, 0, tuplePredicate)}
+ *
+ * @param <T> Tuple type
+ * @param tuplePredicate flush if {@code tuplePredicate} is true. null to disable.
+ * @return the flush configuration
+ */
public static <T> FileWriterFlushConfig<T> newPredicateBasedConfig(Predicate<T> tuplePredicate) {
if (tuplePredicate == null)
throw new IllegalArgumentException("tuplePredicate");
@@ -73,9 +91,11 @@ public class FileWriterFlushConfig<T> {
* If nothing specific is specified, the underlying buffered
* writer's automatic flushing is utilized.
*
+ * @param <T> Tuple type
* @param cntTuples flush every {@code cntTuple} tuples written. 0 to disable.
* @param periodMsec flush every {@code periodMsec} milliseconds. 0 to disable.
* @param tuplePredicate flush if {@code tuplePredicate} is true. null to disable.
+ * @return the flush configuration
*/
public static <T> FileWriterFlushConfig<T> newConfig(int cntTuples, long periodMsec, Predicate<T> tuplePredicate) {
return new FileWriterFlushConfig<>(cntTuples, periodMsec, tuplePredicate);
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/connectors/file/src/main/java/quarks/connectors/file/FileWriterPolicy.java
----------------------------------------------------------------------
diff --git a/connectors/file/src/main/java/quarks/connectors/file/FileWriterPolicy.java b/connectors/file/src/main/java/quarks/connectors/file/FileWriterPolicy.java
index 2ff2a7d..3642c0f 100644
--- a/connectors/file/src/main/java/quarks/connectors/file/FileWriterPolicy.java
+++ b/connectors/file/src/main/java/quarks/connectors/file/FileWriterPolicy.java
@@ -368,7 +368,7 @@ public class FileWriterPolicy<T> implements IFileWriterPolicy<T> {
*
* @param activePath path of the active file
* @param finalPath path to the final destination
- * @throws IOException
+ * @throws IOException on failure
*/
protected void hookRenameFile(Path activePath, Path finalPath) throws IOException {
trace.info("finalizing to {}", finalPath);
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/connectors/file/src/main/java/quarks/connectors/file/FileWriterRetentionConfig.java
----------------------------------------------------------------------
diff --git a/connectors/file/src/main/java/quarks/connectors/file/FileWriterRetentionConfig.java b/connectors/file/src/main/java/quarks/connectors/file/FileWriterRetentionConfig.java
index 58f126e..b40fa39 100644
--- a/connectors/file/src/main/java/quarks/connectors/file/FileWriterRetentionConfig.java
+++ b/connectors/file/src/main/java/quarks/connectors/file/FileWriterRetentionConfig.java
@@ -34,19 +34,32 @@ public class FileWriterRetentionConfig {
private long ageSec;
private long periodMsec;
- /** same as {@code newConfig(fileCount, 0, 0, 0)} */
+ /** same as {@code newConfig(fileCount, 0, 0, 0)}
+ *
+ * @param fileCount remove a file when {@code fileCount} would be exceeded. 0 to disable.
+ * @return the retention config
+ */
public static FileWriterRetentionConfig newFileCountBasedConfig(int fileCount) {
if (fileCount < 1)
throw new IllegalArgumentException("fileCount");
return newConfig(fileCount, 0, 0, 0);
}
- /** same as {@code newConfig(0, aggregateFileSize, 0, 0)} */
+ /** same as {@code newConfig(0, aggregateFileSize, 0, 0)}
+ *
+ * @param aggregateFileSize remove a file when {@code aggregateFileSize} would be exceeded. 0 to disable.
+ * @return the retention config
+ */
public static FileWriterRetentionConfig newAggregateFileSizeBasedConfig(long aggregateFileSize) {
if (aggregateFileSize < 1)
throw new IllegalArgumentException("aggregateFileSize");
return newConfig(0, aggregateFileSize, 0, 0);
}
- /** same as {@code newConfig(0, 0, ageSe, periodMsecc)} */
+ /** same as {@code newConfig(0, 0, ageSe, periodMsecc)}
+ *
+ * @param ageSec remove a file that's older than {@code ageSec} seconds. 0 to disable.
+ * @param periodMsec frequency for checking for ageSec based removal. 0 to disable.]
+ * @return the retention config
+ */
public static FileWriterRetentionConfig newAgeBasedConfig(long ageSec, long periodMsec) {
if (ageSec < 1)
throw new IllegalArgumentException("ageSec");
@@ -62,6 +75,7 @@ public class FileWriterRetentionConfig {
* @param aggregateFileSize remove a file when {@code aggregateFileSize} would be exceeded. 0 to disable.
* @param ageSec remove a file that's older than {@code ageSec} seconds. 0 to disable.
* @param periodMsec frequency for checking for ageSec based removal. 0 to disable.]
+ * @return the retention config
*/
public static FileWriterRetentionConfig newConfig(int fileCount, long aggregateFileSize, long ageSec, long periodMsec) {
return new FileWriterRetentionConfig(fileCount, aggregateFileSize, ageSec, periodMsec);
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/connectors/file/src/main/java/quarks/connectors/file/runtime/AbstractWriterFile.java
----------------------------------------------------------------------
diff --git a/connectors/file/src/main/java/quarks/connectors/file/runtime/AbstractWriterFile.java b/connectors/file/src/main/java/quarks/connectors/file/runtime/AbstractWriterFile.java
index 173b406..c2d1b4d 100644
--- a/connectors/file/src/main/java/quarks/connectors/file/runtime/AbstractWriterFile.java
+++ b/connectors/file/src/main/java/quarks/connectors/file/runtime/AbstractWriterFile.java
@@ -41,7 +41,11 @@ abstract class AbstractWriterFile<T> {
public abstract void close() throws IOException;
/** do what's needed to write the tuple */
protected abstract int writeTuple(T tuple) throws IOException;
- /** returns the number of bytes written */
+ /**
+ * @param tuple the tuple to write
+ * @return the number of bytes written
+ * @throws IOException on failure
+ */
public int write(T tuple) throws IOException {
tupleCnt++;
int nbytes = writeTuple(tuple);
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/connectors/file/src/main/java/quarks/connectors/file/runtime/IFileWriterPolicy.java
----------------------------------------------------------------------
diff --git a/connectors/file/src/main/java/quarks/connectors/file/runtime/IFileWriterPolicy.java b/connectors/file/src/main/java/quarks/connectors/file/runtime/IFileWriterPolicy.java
index 1dbcda0..51b7484 100644
--- a/connectors/file/src/main/java/quarks/connectors/file/runtime/IFileWriterPolicy.java
+++ b/connectors/file/src/main/java/quarks/connectors/file/runtime/IFileWriterPolicy.java
@@ -95,8 +95,8 @@ public interface IFileWriterPolicy<T> {
* {@link #shouldFlush()}.
*
* @param basePathname the directory and base leafname for final files
- * @param flushable
- * @param closeable
+ * @param flushable function to perform the flush
+ * @param closeable function to perform the close
*/
void initialize(String basePathname, Flushable flushable, Closeable closeable);
@@ -157,7 +157,7 @@ public interface IFileWriterPolicy<T> {
*
* @param path the active file (from {@link #getNextActiveFilePath()}).
* @return the final path
- * @throws IOException
+ * @throws IOException on failure
*/
Path closeActiveFile(Path path) throws IOException;
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/connectors/file/src/test/java/quarks/test/connectors/file/FileStreamsTest.java
----------------------------------------------------------------------
diff --git a/connectors/file/src/test/java/quarks/test/connectors/file/FileStreamsTest.java b/connectors/file/src/test/java/quarks/test/connectors/file/FileStreamsTest.java
index 1d52e5e..5a408ae 100644
--- a/connectors/file/src/test/java/quarks/test/connectors/file/FileStreamsTest.java
+++ b/connectors/file/src/test/java/quarks/test/connectors/file/FileStreamsTest.java
@@ -64,6 +64,7 @@ public class FileStreamsTest extends TopologyAbstractTest implements DirectTestS
/**
* Test that directory watcher creates the correct output.
+ * @throws Exception on failure
*/
@Test
public void testDirectoryWatcherOrder() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/connectors/http/src/main/java/quarks/connectors/http/HttpStreams.java
----------------------------------------------------------------------
diff --git a/connectors/http/src/main/java/quarks/connectors/http/HttpStreams.java b/connectors/http/src/main/java/quarks/connectors/http/HttpStreams.java
index fff7f46..8a4faf6 100644
--- a/connectors/http/src/main/java/quarks/connectors/http/HttpStreams.java
+++ b/connectors/http/src/main/java/quarks/connectors/http/HttpStreams.java
@@ -258,6 +258,8 @@ public class HttpStreams {
* </LI>
* </UL>
*
+ * @param <T> Tuple type for input stream
+ * @param <R> Tuple type for output stream
* @param stream Stream to invoke HTTP requests.
* @param clientCreator Function to create a HTTP client.
* @param method Function to define the HTTP method.
@@ -280,6 +282,8 @@ public class HttpStreams {
/**
* Make an HTTP request with body for each tuple.<br>
*
+ * @param <T> Tuple type for input stream
+ * @param <R> Tuple type for output stream
* @param stream Stream to invoke HTTP requests.
* @param clientCreator Function to create a HTTP client.
* @param method Function to define the HTTP method.
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/connectors/http/src/main/java/quarks/connectors/http/runtime/HttpRequester.java
----------------------------------------------------------------------
diff --git a/connectors/http/src/main/java/quarks/connectors/http/runtime/HttpRequester.java b/connectors/http/src/main/java/quarks/connectors/http/runtime/HttpRequester.java
index 88b560a..3adcbbb 100644
--- a/connectors/http/src/main/java/quarks/connectors/http/runtime/HttpRequester.java
+++ b/connectors/http/src/main/java/quarks/connectors/http/runtime/HttpRequester.java
@@ -37,6 +37,9 @@ import quarks.function.Supplier;
/**
* Function that processes HTTP requests at runtime.
+ *
+ * @param <T> Tuple type of request stream
+ * @param <R> Tuple type of result stream
*/
public class HttpRequester<T,R> implements Function<T,R>{
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/connectors/iot/src/main/java/quarks/connectors/iot/package-info.java
----------------------------------------------------------------------
diff --git a/connectors/iot/src/main/java/quarks/connectors/iot/package-info.java b/connectors/iot/src/main/java/quarks/connectors/iot/package-info.java
index bb9f982..1a1faa4 100644
--- a/connectors/iot/src/main/java/quarks/connectors/iot/package-info.java
+++ b/connectors/iot/src/main/java/quarks/connectors/iot/package-info.java
@@ -19,7 +19,7 @@ under the License.
/**
* Quarks device connector API to a message hub.
- *
+ * <P>
* Generic device model that supports a device model consisting of:
* <UL>
* <LI>
@@ -37,7 +37,6 @@ under the License.
* The format for the payload is JSON, support for other payload formats may be added
* in the future.
* </LI>
- * <P>
* <LI>
* <B>Device Commands</B> - A device {@link quarks.connectors.iot.IotDevice#commands(String...) subscribes} to <em>commands</em> from back-end systems
* through the message hub. A device command consists of:
@@ -52,7 +51,6 @@ under the License.
* The format for the payload is typically JSON, though other formats may be used.
* </LI>
* </UL>
- * </P>
* <P>
* Device event and command identifiers starting with "{@link quarks.connectors.iot.IotDevice#RESERVED_ID_PREFIX quarks}"
* are reserved for use by Quarks.
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/connectors/iotf/src/main/java/quarks/connectors/iotf/IotfDevice.java
----------------------------------------------------------------------
diff --git a/connectors/iotf/src/main/java/quarks/connectors/iotf/IotfDevice.java b/connectors/iotf/src/main/java/quarks/connectors/iotf/IotfDevice.java
index a47173d..da75c3b 100644
--- a/connectors/iotf/src/main/java/quarks/connectors/iotf/IotfDevice.java
+++ b/connectors/iotf/src/main/java/quarks/connectors/iotf/IotfDevice.java
@@ -100,7 +100,8 @@ public class IotfDevice implements IotDevice {
* Connecting to the server occurs when the topology is submitted for
* execution.
* </p>
- *
+ *
+ * @param options control options
* @param topology
* the connector's associated {@code Topology}.
*/
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/connectors/jdbc/src/main/java/quarks/connectors/jdbc/JdbcStreams.java
----------------------------------------------------------------------
diff --git a/connectors/jdbc/src/main/java/quarks/connectors/jdbc/JdbcStreams.java b/connectors/jdbc/src/main/java/quarks/connectors/jdbc/JdbcStreams.java
index 2986f45..33aee18 100644
--- a/connectors/jdbc/src/main/java/quarks/connectors/jdbc/JdbcStreams.java
+++ b/connectors/jdbc/src/main/java/quarks/connectors/jdbc/JdbcStreams.java
@@ -182,6 +182,8 @@ public class JdbcStreams {
* specifying {@code dataSource -> dataSource.prepareStatement(stmtSupplier.get()}}
* for the {@code StatementSupplier}.
*
+ * @param <T> Tuple type for input stream
+ * @param <R> Tuple type of result stream
* @param stream tuples to execute a SQL statement on behalf of
* @param stmtSupplier an SQL statement
* @param paramSetter function to set SQL statement parameters
@@ -221,6 +223,8 @@ public class JdbcStreams {
* If {@code resultsHandler} throws an Exception, it is called a
* second time for the tuple with a non-null exception argument.
*
+ * @param <T> Tuple type for input stream
+ * @param <R> Tuple type of result stream
* @param stream tuples to execute a SQL statement on behalf of
* @param stmtSupplier an SQL statement
* @param paramSetter function to set SQL statement parameters
@@ -244,6 +248,7 @@ public class JdbcStreams {
* specifying {@code dataSource -> dataSource.prepareStatement(stmtSupplier.get()}}
* for the {@code StatementSupplier}.
*
+ * @param <T> Tuple type
* @param stream tuples to execute a SQL statement on behalf of
* @param stmtSupplier an SQL statement
* @param paramSetter function to set SQL statement parameters
@@ -272,6 +277,7 @@ public class JdbcStreams {
* <li>generate tuple(s) after the statement has run.</li>
* </ul>
*
+ * @param <T> Tuple type
* @param stream tuples to execute a SQL statement on behalf of
* @param stmtSupplier an SQL statement
* @param paramSetter function to set SQL statement parameters
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/connectors/jdbc/src/main/java/quarks/connectors/jdbc/ParameterSetter.java
----------------------------------------------------------------------
diff --git a/connectors/jdbc/src/main/java/quarks/connectors/jdbc/ParameterSetter.java b/connectors/jdbc/src/main/java/quarks/connectors/jdbc/ParameterSetter.java
index 6020418..42e9e6f 100644
--- a/connectors/jdbc/src/main/java/quarks/connectors/jdbc/ParameterSetter.java
+++ b/connectors/jdbc/src/main/java/quarks/connectors/jdbc/ParameterSetter.java
@@ -40,7 +40,7 @@ public interface ParameterSetter<T> {
*
* @param t stream tuple of type T
* @param stmt PreparedStatement
- * @throws SQLException
+ * @throws SQLException on failure
*/
void setParameters(T t, PreparedStatement stmt) throws SQLException;
}
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/connectors/jdbc/src/main/java/quarks/connectors/jdbc/StatementSupplier.java
----------------------------------------------------------------------
diff --git a/connectors/jdbc/src/main/java/quarks/connectors/jdbc/StatementSupplier.java b/connectors/jdbc/src/main/java/quarks/connectors/jdbc/StatementSupplier.java
index 35bde26..33c1333 100644
--- a/connectors/jdbc/src/main/java/quarks/connectors/jdbc/StatementSupplier.java
+++ b/connectors/jdbc/src/main/java/quarks/connectors/jdbc/StatementSupplier.java
@@ -37,6 +37,8 @@ public interface StatementSupplier {
* + " FROM persons WHERE id = ?");
* }</pre>
* @param cn JDBC connection
+ * @return the PreparedStatement
+ * @throws SQLException on failure
*/
PreparedStatement get(Connection cn) throws SQLException;
}
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/connectors/kafka/src/main/java/quarks/connectors/kafka/KafkaConsumer.java
----------------------------------------------------------------------
diff --git a/connectors/kafka/src/main/java/quarks/connectors/kafka/KafkaConsumer.java b/connectors/kafka/src/main/java/quarks/connectors/kafka/KafkaConsumer.java
index 38724e7..89d51cd 100644
--- a/connectors/kafka/src/main/java/quarks/connectors/kafka/KafkaConsumer.java
+++ b/connectors/kafka/src/main/java/quarks/connectors/kafka/KafkaConsumer.java
@@ -71,9 +71,9 @@ public class KafkaConsumer {
public interface ConsumerRecord<K,V> {
String topic();
int partition();
- /** message id in the partition. */
+ /** @return message id in the partition. */
long offset();
- /** null if no key was published. */
+ /** @return null if no key was published. */
K key();
V value();
}
@@ -109,12 +109,12 @@ public class KafkaConsumer {
* <p>
* The Kafka "Old Consumer" configs are used. Minimal configuration
* typically includes:
- * <p>
* <ul>
* <li><code>zookeeper.connect</code></li>
* <li><code>group.id</code></li>
* </ul>
- *
+ *
+ * @param t Topology to add to
* @param config KafkaConsumer configuration information.
*/
public KafkaConsumer(Topology t, Supplier<Map<String,Object>> config) {
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/connectors/kafka/src/main/java/quarks/connectors/kafka/KafkaProducer.java
----------------------------------------------------------------------
diff --git a/connectors/kafka/src/main/java/quarks/connectors/kafka/KafkaProducer.java b/connectors/kafka/src/main/java/quarks/connectors/kafka/KafkaProducer.java
index 72376db..a9edfcf 100644
--- a/connectors/kafka/src/main/java/quarks/connectors/kafka/KafkaProducer.java
+++ b/connectors/kafka/src/main/java/quarks/connectors/kafka/KafkaProducer.java
@@ -70,7 +70,6 @@ public class KafkaProducer {
* <p>
* The Kafka "New Producer configs" are used. Minimal configuration
* typically includes:
- * <p>
* <ul>
* <li><code>bootstrap.servers</code></li>
* </ul>
@@ -78,6 +77,7 @@ public class KafkaProducer {
* The full set of producer configuration items are specified in
* {@code org.apache.kafka.clients.producer.ProducerConfig}
*
+ * @param t Topology to add to
* @param config KafkaProducer configuration information.
*/
public KafkaProducer(Topology t, Supplier<Map<String,Object>> config) {
@@ -95,6 +95,7 @@ public class KafkaProducer {
* If neither key nor partition is present a partition will be assigned
* in a round-robin fashion.
*
+ * @param <T> Tuple type
* @param stream the stream to publish
* @param keyFn A function that yields an optional byte[]
* Kafka record's key from the tuple.
@@ -118,6 +119,7 @@ public class KafkaProducer {
* This is a convenience method for {@code String} typed key/value
* conversion functions.
* <p>
+ * @param <T> Tuple type
* @param stream the stream to publish
* @param keyFn A function that yields an optional String
* Kafka record's key from the tuple.
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/connectors/mqtt/src/main/java/quarks/connectors/mqtt/MqttConfig.java
----------------------------------------------------------------------
diff --git a/connectors/mqtt/src/main/java/quarks/connectors/mqtt/MqttConfig.java b/connectors/mqtt/src/main/java/quarks/connectors/mqtt/MqttConfig.java
index 4eb7ebc..9806707 100644
--- a/connectors/mqtt/src/main/java/quarks/connectors/mqtt/MqttConfig.java
+++ b/connectors/mqtt/src/main/java/quarks/connectors/mqtt/MqttConfig.java
@@ -224,6 +224,7 @@ public class MqttConfig {
/**
* Get the subscriber idle reconnect interval.
+ * @return the value
*/
public int getSubscriberIdleReconnectInterval() {
return subscriberIdleReconnectIntervalSec;
@@ -290,6 +291,7 @@ public class MqttConfig {
/**
* Get the the password to use for authentication with the server.
+ * @return the value
*/
public char[] getPassword() {
return options.getPassword();
@@ -297,6 +299,7 @@ public class MqttConfig {
/**
* Get the username to use for authentication with the server.
+ * @return the value
*/
public String getUserName() {
return options.getUserName();
@@ -306,7 +309,7 @@ public class MqttConfig {
* Connection Client Id.
* <p>
* Optional. default null: a clientId is auto-generated.
- * @param clientId
+ * @param clientId the client id
*/
public void setClientId(String clientId) {
this.clientId = clientId;
@@ -316,7 +319,7 @@ public class MqttConfig {
* Maximum time to wait for an action (e.g., publish message) to complete.
* <p>
* Optional. default: -1 no timeout. 0 also means no timeout.
- * @param actionTimeToWaitMillis
+ * @param actionTimeToWaitMillis the time to wait in milliseconds
*/
public void setActionTimeToWaitMillis(long actionTimeToWaitMillis) {
this.actionTimeToWaitMillis = actionTimeToWaitMillis;
@@ -326,7 +329,7 @@ public class MqttConfig {
* QoS 1 and 2 in-flight message persistence.
* <p>
* optional. default: use memory persistence.
- * @param persistence
+ * @param persistence the persistence implementation
*/
public void setPersistence(MqttClientPersistence persistence) {
this.persistence = persistence;
@@ -336,7 +339,7 @@ public class MqttConfig {
* Clean Session.
* <p>
* Qptional. default: true.
- * @param cleanSession
+ * @param cleanSession the clean session value
*/
public void setCleanSession(boolean cleanSession) {
options.setCleanSession(cleanSession);
@@ -345,7 +348,7 @@ public class MqttConfig {
/**
* Connection timeout.
* Optional. 0 disables the timeout / blocks until connected. default: 30 seconds.
- * @param connectionTimeoutSec
+ * @param connectionTimeoutSec the timeout in seconds
*/
public void setConnectionTimeout(int connectionTimeoutSec) {
options.setConnectionTimeout(connectionTimeoutSec);
@@ -360,7 +363,7 @@ public class MqttConfig {
* If the connector is subscribing to topics, it will also reconnect
* as per {@link #setSubscriberIdleReconnectInterval(int)}.
* <p>
- * @param idleTimeoutSec
+ * @param idleTimeoutSec the timeout in seconds
* @see #setSubscriberIdleReconnectInterval(int)
*/
public void setIdleTimeout(int idleTimeoutSec) {
@@ -375,7 +378,7 @@ public class MqttConfig {
* Following an idle disconnect, if the connector is subscribing to topics,
* it will reconnect after the specified interval.
* Optional. default: 60 seconds.
- * @param seconds
+ * @param seconds the interval in seconds
*/
public void setSubscriberIdleReconnectInterval(int seconds) {
if (seconds < 0)
@@ -387,10 +390,9 @@ public class MqttConfig {
* Connection Keep alive.
* <p>
* Optional. 0 disables keepalive processing. default: 60 seconds.
- * @param keepAliveSec
+ * @param keepAliveSec the interval in seconds
*/
- public void setKeepAliveInterval(int keepAliveSec)
- throws IllegalArgumentException {
+ public void setKeepAliveInterval(int keepAliveSec) {
options.setKeepAliveInterval(keepAliveSec);
}
@@ -399,7 +401,7 @@ public class MqttConfig {
* <p>
* Required. Must be an array of one or more MQTT server URLs.
* When connecting, the first URL that successfully connects is used.
- * @param serverUrls
+ * @param serverUrls the URLs
*/
public void setServerURLs(String[] serverUrls) {
options.setServerURIs(serverUrls);
@@ -421,7 +423,7 @@ public class MqttConfig {
/**
* Set the password to use for authentication with the server.
* Optional. default: null.
- * @param password
+ * @param password the password
*/
public void setPassword(char[] password) {
options.setPassword(password);
@@ -430,7 +432,7 @@ public class MqttConfig {
/**
* Set the username to use for authentication with the server.
* Optional. default: null.
- * @param userName
+ * @param userName the user name
*/
public void setUserName(String userName) {
options.setUserName(userName);
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/connectors/mqtt/src/main/java/quarks/connectors/mqtt/MqttStreams.java
----------------------------------------------------------------------
diff --git a/connectors/mqtt/src/main/java/quarks/connectors/mqtt/MqttStreams.java b/connectors/mqtt/src/main/java/quarks/connectors/mqtt/MqttStreams.java
index 9184b4a..bb35457 100644
--- a/connectors/mqtt/src/main/java/quarks/connectors/mqtt/MqttStreams.java
+++ b/connectors/mqtt/src/main/java/quarks/connectors/mqtt/MqttStreams.java
@@ -124,7 +124,7 @@ public class MqttStreams {
* Connecting to the server occurs after the
* topology is submitted for execution.
*
- * @param topology
+ * @param topology the Topology to add to
* @param config {@link MqttConfig} supplier.
*/
public MqttStreams(Topology topology, Supplier<MqttConfig> config) {
@@ -139,6 +139,7 @@ public class MqttStreams {
* the supplied functions providing the message topic, payload
* and QoS. The topic and QoS can be generated based upon the tuple.
*
+ * @param <T> Tuple type
* @param stream Stream to be published.
* @param topic function to supply the message's topic.
* @param payload function to supply the message's payload.
@@ -169,6 +170,7 @@ public class MqttStreams {
/**
* Subscribe to the MQTT topic(s) and create a stream of tuples of type {@code T}.
+ * @param <T> Tuple type
* @param topicFilter the topic(s) to subscribe to.
* @param qos the maximum Quality of Service to use.
* @param message2Tuple function to convert {@code (topic, payload)} to
@@ -186,7 +188,8 @@ public class MqttStreams {
* A convenience function.
* Each message's payload is expected/required to be a UTF-8 encoded string.
* Only the converted payload is present the generated tuple.
- *
+ *
+ * @param <T> Tuple type
* @param topicFilter the topic(s) to subscribe to.
* @param qos the maximum Quality of Service to use.
* @return {@code TStream<String>}
@@ -210,6 +213,7 @@ public class MqttStreams {
/**
* Get the {@link quarks.topology.Topology} the connector is associated with.
+ * @return the value
*/
public Topology topology() {
return topology;
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/connectors/pubsub/src/main/java/quarks/connectors/pubsub/PublishSubscribe.java
----------------------------------------------------------------------
diff --git a/connectors/pubsub/src/main/java/quarks/connectors/pubsub/PublishSubscribe.java b/connectors/pubsub/src/main/java/quarks/connectors/pubsub/PublishSubscribe.java
index 1344ae3..95fb50a 100644
--- a/connectors/pubsub/src/main/java/quarks/connectors/pubsub/PublishSubscribe.java
+++ b/connectors/pubsub/src/main/java/quarks/connectors/pubsub/PublishSubscribe.java
@@ -73,6 +73,8 @@ public class PublishSubscribe {
* This is a model that allows jobs to subscribe to
* streams published by other jobs.
*
+ * @param <T> Tuple type
+ * @param stream stream to publish
* @param topic Topic to publish to.
* @param streamType Type of objects on the stream.
* @return sink element representing termination of this stream.
@@ -87,6 +89,8 @@ public class PublishSubscribe {
* Subscribe to a published topic.
* This is a model that allows jobs to subscribe to
* streams published by other jobs.
+ * @param <T> Tuple type
+ * @param te TopologyElement whose Topology to add to
* @param topic Topic to subscribe to.
* @param streamType Type of the stream.
* @return Stream containing published tuples.
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/connectors/pubsub/src/main/java/quarks/connectors/pubsub/service/PublishSubscribeService.java
----------------------------------------------------------------------
diff --git a/connectors/pubsub/src/main/java/quarks/connectors/pubsub/service/PublishSubscribeService.java b/connectors/pubsub/src/main/java/quarks/connectors/pubsub/service/PublishSubscribeService.java
index 45dc671..31e8f6b 100644
--- a/connectors/pubsub/src/main/java/quarks/connectors/pubsub/service/PublishSubscribeService.java
+++ b/connectors/pubsub/src/main/java/quarks/connectors/pubsub/service/PublishSubscribeService.java
@@ -45,6 +45,7 @@ public interface PublishSubscribeService {
/**
* Add a subscriber to a published topic.
*
+ * @param <T> Tuple type
* @param topic Topic to subscribe to.
* @param streamType Type of the stream.
* @param subscriber How to deliver published tuples to the subscriber.
@@ -58,6 +59,7 @@ public interface PublishSubscribeService {
* A publisher calls {@code destination.accept(tuple)} to publish
* {@code tuple} to the topic.
*
+ * @param <T> Tuple type
* @param topic Topic tuples will be published to.
* @param streamType Type of the stream
* @return Consumer that is used to publish tuples.
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/connectors/quarks.javax.websocket/src/main/java/quarks/javax/websocket/QuarksSslContainerProvider.java
----------------------------------------------------------------------
diff --git a/connectors/quarks.javax.websocket/src/main/java/quarks/javax/websocket/QuarksSslContainerProvider.java b/connectors/quarks.javax.websocket/src/main/java/quarks/javax/websocket/QuarksSslContainerProvider.java
index ddf26db..0e1d775 100644
--- a/connectors/quarks.javax.websocket/src/main/java/quarks/javax/websocket/QuarksSslContainerProvider.java
+++ b/connectors/quarks.javax.websocket/src/main/java/quarks/javax/websocket/QuarksSslContainerProvider.java
@@ -26,7 +26,6 @@ import javax.websocket.WebSocketContainer;
/**
* A {@link WebSocketContainer} provider for dealing with javax.websocket
* SSL issues.
- * <p>
* <ul>
* <li>JSR356 lacks API for Client-side SSL configuration</li>
* <li>Jetty's {@code javax.websocket.ContainerProvider} ignores the
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/connectors/serial/src/main/java/quarks/connectors/serial/SerialDevice.java
----------------------------------------------------------------------
diff --git a/connectors/serial/src/main/java/quarks/connectors/serial/SerialDevice.java b/connectors/serial/src/main/java/quarks/connectors/serial/SerialDevice.java
index 31bc226..2e1d9d8 100644
--- a/connectors/serial/src/main/java/quarks/connectors/serial/SerialDevice.java
+++ b/connectors/serial/src/main/java/quarks/connectors/serial/SerialDevice.java
@@ -73,6 +73,7 @@ public interface SerialDevice extends TopologyElement {
* device connected to the serial port. While each function
* is being called it has exclusive use of the serial port.
* </P>
+ * @param <T> Tuple type
* @param driver Function that interacts with the serial port to produce a value.
* @return Function that for each call will interact with the serial port to produce a value.
*
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/connectors/wsclient-javax.websocket/src/test/java/quarks/tests/connectors/wsclient/javax/websocket/WebSocketServerEcho.java
----------------------------------------------------------------------
diff --git a/connectors/wsclient-javax.websocket/src/test/java/quarks/tests/connectors/wsclient/javax/websocket/WebSocketServerEcho.java b/connectors/wsclient-javax.websocket/src/test/java/quarks/tests/connectors/wsclient/javax/websocket/WebSocketServerEcho.java
index a63a471..3616572 100644
--- a/connectors/wsclient-javax.websocket/src/test/java/quarks/tests/connectors/wsclient/javax/websocket/WebSocketServerEcho.java
+++ b/connectors/wsclient-javax.websocket/src/test/java/quarks/tests/connectors/wsclient/javax/websocket/WebSocketServerEcho.java
@@ -153,7 +153,9 @@ public class WebSocketServerEcho {
return connector.getLocalPort();
}
- /** restart a running server on the same port, etc: stop, delay, start */
+ /** restart a running server on the same port, etc: stop, delay, start
+ * @param secDelay the amount to delay in seconds before initiating the restart
+ */
public void restart(int secDelay) {
// stop, schedule delay&start and return
URI endpointURI = setPort(curEndpointURI, getPort());
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/console/server/src/main/java/quarks/console/server/HttpServer.java
----------------------------------------------------------------------
diff --git a/console/server/src/main/java/quarks/console/server/HttpServer.java b/console/server/src/main/java/quarks/console/server/HttpServer.java
index 4a92cc8..537fbba 100644
--- a/console/server/src/main/java/quarks/console/server/HttpServer.java
+++ b/console/server/src/main/java/quarks/console/server/HttpServer.java
@@ -19,7 +19,6 @@ under the License.
package quarks.console.server;
-import java.io.IOException;
import java.security.ProtectionDomain;
import org.eclipse.jetty.server.Handler;
@@ -62,7 +61,7 @@ public class HttpServer {
* Initialization of the context path for the web application "/console" occurs in this method
* and the handler for the web application is set. This only occurs once.
* @return HttpServer: the singleton instance of this class
- * @throws IOException
+ * @throws Exception on failure
*/
public static HttpServer getInstance() throws Exception {
if (!HttpServerHolder.INITIALIZED) {
@@ -117,6 +116,7 @@ public class HttpServer {
/**
* Starts the jetty web server
+ * @throws Exception on failure
*/
public void startServer() throws Exception {
getJettyServer().start();
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/console/server/src/main/java/quarks/console/server/ServerUtil.java
----------------------------------------------------------------------
diff --git a/console/server/src/main/java/quarks/console/server/ServerUtil.java b/console/server/src/main/java/quarks/console/server/ServerUtil.java
index e201ff5..e53148f 100644
--- a/console/server/src/main/java/quarks/console/server/ServerUtil.java
+++ b/console/server/src/main/java/quarks/console/server/ServerUtil.java
@@ -96,6 +96,7 @@ public class ServerUtil {
/**
* Looks for the absolute file path of the name of the warFileName argument when running from Eclipse
+ * @param pDomain the ProtectionDomain to use to get the source's location
* @param warFileName the name of the war file to find the absolute path to
* @return the absolute path to the warFileName argument as a String
*/
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/providers/iot/src/main/java/quarks/providers/iot/IotProvider.java
----------------------------------------------------------------------
diff --git a/providers/iot/src/main/java/quarks/providers/iot/IotProvider.java b/providers/iot/src/main/java/quarks/providers/iot/IotProvider.java
index e0c2723..ca718c3 100644
--- a/providers/iot/src/main/java/quarks/providers/iot/IotProvider.java
+++ b/providers/iot/src/main/java/quarks/providers/iot/IotProvider.java
@@ -22,7 +22,6 @@ import static quarks.topology.services.ApplicationService.SYSTEM_APP_PREFIX;
import java.util.ArrayList;
import java.util.List;
-import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import com.google.gson.JsonObject;
@@ -71,7 +70,6 @@ import quarks.topology.services.ApplicationService;
* <LI>Access to the control service through device commands from the message hub using command
* identifier {@link Commands#CONTROL_SERVICE quarksControl}.
* </UL>
- * </P>
* <P>
* An {@code IotProvider} is created with a provider and submitter that it delegates
* the creation and submission of topologies to.
@@ -249,7 +247,7 @@ public class IotProvider implements TopologyProvider,
/**
* Start this provider by starting its system applications.
*
- * @throws ExecutionException Exception starting applications.
+ * @throws Exception on failure starting applications.
*/
public void start() throws Exception {
ApplicationServiceMXBean bean = getControlService().getControl(ApplicationServiceMXBean.TYPE,
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/providers/iot/src/main/java/quarks/providers/iot/package-info.java
----------------------------------------------------------------------
diff --git a/providers/iot/src/main/java/quarks/providers/iot/package-info.java b/providers/iot/src/main/java/quarks/providers/iot/package-info.java
index 5892239..a22d22f 100644
--- a/providers/iot/src/main/java/quarks/providers/iot/package-info.java
+++ b/providers/iot/src/main/java/quarks/providers/iot/package-info.java
@@ -58,7 +58,6 @@ under the License.
* <td><em>{@code [applicationName, config]}</em></td>
* <td>{@link quarks.topology.mbeans.ApplicationServiceMXBean ApplicationServiceMXBean}</td>
* </tr>
- * </tr>
* <th>Sample command data</th>
* <td colspan=5>{@code {"type":"appService","alias":"quarks","op":"submit","args":["Heartbeat",{}]}}</td>
* </tr>
@@ -71,7 +70,6 @@ under the License.
* <td>{@code ["CLOSE"]}</td>
* <td>{@link quarks.execution.mbeans.JobMXBean JobMXBean}</td>
* </tr>
- * </tr>
* <th>Sample command data</th>
* <td colspan=5>{@code {"type":"job","alias":"Heartbeat","op":"stateChange","args":["CLOSE"]}}</td>
* </tr>
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/runtime/etiao/src/main/java/quarks/runtime/etiao/AbstractContext.java
----------------------------------------------------------------------
diff --git a/runtime/etiao/src/main/java/quarks/runtime/etiao/AbstractContext.java b/runtime/etiao/src/main/java/quarks/runtime/etiao/AbstractContext.java
index 1f5207d..016f8f1 100644
--- a/runtime/etiao/src/main/java/quarks/runtime/etiao/AbstractContext.java
+++ b/runtime/etiao/src/main/java/quarks/runtime/etiao/AbstractContext.java
@@ -25,6 +25,9 @@ import quarks.oplet.OpletContext;
/**
* Provides a skeletal implementation of the {@link OpletContext}
* interface.
+ *
+ * @param <I> Tuple type of input streams
+ * @param <O> Tuple type of output streams
*/
public abstract class AbstractContext<I, O> implements OpletContext<I, O> {
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/runtime/etiao/src/main/java/quarks/runtime/etiao/Executable.java
----------------------------------------------------------------------
diff --git a/runtime/etiao/src/main/java/quarks/runtime/etiao/Executable.java b/runtime/etiao/src/main/java/quarks/runtime/etiao/Executable.java
index 4f58bb0..74151f2 100644
--- a/runtime/etiao/src/main/java/quarks/runtime/etiao/Executable.java
+++ b/runtime/etiao/src/main/java/quarks/runtime/etiao/Executable.java
@@ -149,7 +149,10 @@ public class Executable implements RuntimeServices {
/**
* Creates a new {@code Invocation} associated with the specified oplet.
- *
+ *
+ * @param <T> Oplet type
+ * @param <I> Tuple type of input streams
+ * @param <O> Tuple type of output streams
* @param oplet the oplet
* @param inputs the invocation's inputs
* @param outputs the invocation's outputs
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/runtime/etiao/src/main/java/quarks/runtime/etiao/Invocation.java
----------------------------------------------------------------------
diff --git a/runtime/etiao/src/main/java/quarks/runtime/etiao/Invocation.java b/runtime/etiao/src/main/java/quarks/runtime/etiao/Invocation.java
index 46c3435..64acefa 100644
--- a/runtime/etiao/src/main/java/quarks/runtime/etiao/Invocation.java
+++ b/runtime/etiao/src/main/java/quarks/runtime/etiao/Invocation.java
@@ -153,6 +153,7 @@ public class Invocation<T extends Oplet<I, O>, I, O> implements AutoCloseable {
/**
* Returns the list of input stream forwarders for this invocation.
+ * @return the list
*/
public List<? extends Consumer<I>> getInputs() {
return inputs;
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/runtime/etiao/src/main/java/quarks/runtime/etiao/SettableForwarder.java
----------------------------------------------------------------------
diff --git a/runtime/etiao/src/main/java/quarks/runtime/etiao/SettableForwarder.java b/runtime/etiao/src/main/java/quarks/runtime/etiao/SettableForwarder.java
index 190fd06..255110d 100644
--- a/runtime/etiao/src/main/java/quarks/runtime/etiao/SettableForwarder.java
+++ b/runtime/etiao/src/main/java/quarks/runtime/etiao/SettableForwarder.java
@@ -64,8 +64,9 @@ public final class SettableForwarder<T> implements Consumer<T> {
}
/**
- * Get the current destination.
+ * Get the destination.
* No synchronization is taken.
+ * @return the destination
*/
public final Consumer<T> getDestination() {
return destination;
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/runtime/etiao/src/main/java/quarks/runtime/etiao/graph/model/GraphType.java
----------------------------------------------------------------------
diff --git a/runtime/etiao/src/main/java/quarks/runtime/etiao/graph/model/GraphType.java b/runtime/etiao/src/main/java/quarks/runtime/etiao/graph/model/GraphType.java
index 1ad5390..8451326 100644
--- a/runtime/etiao/src/main/java/quarks/runtime/etiao/graph/model/GraphType.java
+++ b/runtime/etiao/src/main/java/quarks/runtime/etiao/graph/model/GraphType.java
@@ -50,6 +50,7 @@ public class GraphType {
/**
* Create an instance of {@link GraphType}.
+ * @param graph the associated Graph
*/
public GraphType(Graph graph) {
this(graph, null);
@@ -58,6 +59,8 @@ public class GraphType {
/**
* Create an instance of {@link GraphType} using the specified
* {@link IdMapper} to generate unique object identifiers.
+ * @param g the associated Graph
+ * @param ids the id mapper
*/
public GraphType(Graph g, IdMapper<String> ids) {
if (ids == null) {
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/runtime/etiao/src/main/java/quarks/runtime/etiao/graph/model/IdMapper.java
----------------------------------------------------------------------
diff --git a/runtime/etiao/src/main/java/quarks/runtime/etiao/graph/model/IdMapper.java b/runtime/etiao/src/main/java/quarks/runtime/etiao/graph/model/IdMapper.java
index 5973193..3cd683d 100644
--- a/runtime/etiao/src/main/java/quarks/runtime/etiao/graph/model/IdMapper.java
+++ b/runtime/etiao/src/main/java/quarks/runtime/etiao/graph/model/IdMapper.java
@@ -47,6 +47,7 @@ interface IdMapper<ID> {
* {@code IllegalStateException}.
*
* @param o the object to add
+ * @param id the associated identifier
* @return the identifier associated with the object.
* @throws IllegalStateException if the object has already been added to
* the set with another identifier
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/runtime/jmxcontrol/src/main/java/quarks/runtime/jmxcontrol/JMXControlService.java
----------------------------------------------------------------------
diff --git a/runtime/jmxcontrol/src/main/java/quarks/runtime/jmxcontrol/JMXControlService.java b/runtime/jmxcontrol/src/main/java/quarks/runtime/jmxcontrol/JMXControlService.java
index 04df713..b03a3d9 100644
--- a/runtime/jmxcontrol/src/main/java/quarks/runtime/jmxcontrol/JMXControlService.java
+++ b/runtime/jmxcontrol/src/main/java/quarks/runtime/jmxcontrol/JMXControlService.java
@@ -47,6 +47,7 @@ public class JMXControlService implements ControlService {
/**
* JMX control service using the platform MBean server.
* @param domain Domain the MBeans are registered in.
+ * @param additionalKeys additional name/value keys to add to the generated JMX object names
*/
public JMXControlService(String domain, Hashtable<String,String> additionalKeys) {
mbs = ManagementFactory.getPlatformMBeanServer();
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/runtime/jobregistry/src/main/java/quarks/runtime/jobregistry/JobEvents.java
----------------------------------------------------------------------
diff --git a/runtime/jobregistry/src/main/java/quarks/runtime/jobregistry/JobEvents.java b/runtime/jobregistry/src/main/java/quarks/runtime/jobregistry/JobEvents.java
index 298450f..9f16756 100644
--- a/runtime/jobregistry/src/main/java/quarks/runtime/jobregistry/JobEvents.java
+++ b/runtime/jobregistry/src/main/java/quarks/runtime/jobregistry/JobEvents.java
@@ -20,8 +20,8 @@ package quarks.runtime.jobregistry;
import quarks.execution.Job;
import quarks.execution.services.JobRegistryService;
-import quarks.execution.services.RuntimeServices;
import quarks.execution.services.JobRegistryService.EventType;
+import quarks.execution.services.RuntimeServices;
import quarks.function.BiConsumer;
import quarks.function.BiFunction;
import quarks.function.Consumer;
@@ -52,7 +52,8 @@ public class JobEvents {
* {@code JobRegistryServic#removeListener()} in invoked to unsubscribe
* the tuple source from the job registry.
* </p>
- *
+ *
+ * @param <T> Tuple type
* @param topology the stream topology
* @param wrapper constructs a tuple from a job event
* @return new stream containing the tuples generated by the specified {@code wrapper}.
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/runtime/jsoncontrol/src/main/java/quarks/runtime/jsoncontrol/JsonControlService.java
----------------------------------------------------------------------
diff --git a/runtime/jsoncontrol/src/main/java/quarks/runtime/jsoncontrol/JsonControlService.java b/runtime/jsoncontrol/src/main/java/quarks/runtime/jsoncontrol/JsonControlService.java
index 83eaf79..fb44371 100644
--- a/runtime/jsoncontrol/src/main/java/quarks/runtime/jsoncontrol/JsonControlService.java
+++ b/runtime/jsoncontrol/src/main/java/quarks/runtime/jsoncontrol/JsonControlService.java
@@ -92,7 +92,9 @@ public class JsonControlService implements ControlService {
* The control action is executed directly
* using the calling thread.
*
+ * @param request the request
* @return JSON response, JSON null if the request was not recognized.
+ * @throws Exception on failure
*/
public JsonElement controlRequest(JsonObject request) throws Exception {
if (request.has(OP_KEY))
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/samples/apps/src/main/java/quarks/samples/apps/AbstractApplication.java
----------------------------------------------------------------------
diff --git a/samples/apps/src/main/java/quarks/samples/apps/AbstractApplication.java b/samples/apps/src/main/java/quarks/samples/apps/AbstractApplication.java
index 8f98809..4525f26 100644
--- a/samples/apps/src/main/java/quarks/samples/apps/AbstractApplication.java
+++ b/samples/apps/src/main/java/quarks/samples/apps/AbstractApplication.java
@@ -65,7 +65,7 @@ public abstract class AbstractApplication {
/**
* Construct and run the application's topology.
- * @throws Exception
+ * @throws Exception on failure
*/
protected void run() throws Exception {
// TODO need to setup logging to squelch stderr output from the runtime/connectors,
@@ -120,6 +120,7 @@ public abstract class AbstractApplication {
/**
* Build the application's topology.
+ * @param t Topology to add to
*/
abstract protected void buildTopology(Topology t);
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/samples/apps/src/main/java/quarks/samples/apps/ApplicationUtilities.java
----------------------------------------------------------------------
diff --git a/samples/apps/src/main/java/quarks/samples/apps/ApplicationUtilities.java b/samples/apps/src/main/java/quarks/samples/apps/ApplicationUtilities.java
index 6332649..820c75b 100644
--- a/samples/apps/src/main/java/quarks/samples/apps/ApplicationUtilities.java
+++ b/samples/apps/src/main/java/quarks/samples/apps/ApplicationUtilities.java
@@ -64,8 +64,10 @@ public class ApplicationUtilities {
* <p>
* If tracing has not been enabled in the config, the topology will not
* be augmented to trace the stream.
- *
+ *
+ * @param <T> Tuple type
* @param stream the stream to trace
+ * @param sensorId the sensor id
* @param label some unique label
* @return the input stream
*/
@@ -80,6 +82,7 @@ public class ApplicationUtilities {
* If tracing has not been enabled in the config, the topology will not
* be augmented to trace the stream.
*
+ * @param <T> Tuple type
* @param stream the stream to trace
* @param label some unique label
* @return the input stream
@@ -212,6 +215,7 @@ public class ApplicationUtilities {
* <p>
* See {@link FileStreams#textFileWriter(TStream, quarks.function.Supplier, quarks.function.Supplier)}
*
+ * @param <T> Tuple type
* @param stream the TStream
* @param baseName the base log name
* @param eventTag a tag that gets added to the log entry
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/samples/apps/src/main/java/quarks/samples/apps/JsonTuples.java
----------------------------------------------------------------------
diff --git a/samples/apps/src/main/java/quarks/samples/apps/JsonTuples.java b/samples/apps/src/main/java/quarks/samples/apps/JsonTuples.java
index 8de0ee3..8df6bfe 100644
--- a/samples/apps/src/main/java/quarks/samples/apps/JsonTuples.java
+++ b/samples/apps/src/main/java/quarks/samples/apps/JsonTuples.java
@@ -55,6 +55,7 @@ public class JsonTuples {
/**
* Create a JsonObject wrapping a raw {@code Pair<Long msec,T reading>>} sample.
+ * @param <T> Tuple type
* @param sample the raw sample
* @param id the sensor's Id
* @return the wrapped sample
@@ -86,7 +87,8 @@ public class JsonTuples {
/**
* Create a stream of JsonObject wrapping a stream of
* raw {@code Pair<Long msec,T reading>>} samples.
- *
+ *
+ * @param <T> Tuple type
* @param stream the raw input stream
* @param id the sensor's Id
* @return the wrapped stream
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/samples/apps/src/main/java/quarks/samples/apps/sensorAnalytics/package-info.java
----------------------------------------------------------------------
diff --git a/samples/apps/src/main/java/quarks/samples/apps/sensorAnalytics/package-info.java b/samples/apps/src/main/java/quarks/samples/apps/sensorAnalytics/package-info.java
index 1b466f3..1da3924 100644
--- a/samples/apps/src/main/java/quarks/samples/apps/sensorAnalytics/package-info.java
+++ b/samples/apps/src/main/java/quarks/samples/apps/sensorAnalytics/package-info.java
@@ -68,7 +68,7 @@ under the License.
* <p>
* Edit {@code <quarks-release>/java8/scripts/apps/sensorAnalytics/sensoranalytics.properties}
* to change the broker location or topic prefix.
- * <p>
+ *
* <h2>Application output:</h2>
* <p>
* The application periodically (every 30sec), publishes a list of
@@ -116,9 +116,8 @@ under the License.
* [9] ===== Changing isPublish1hzOutsideRange to true ======
* ...
* }</pre>
- * <p>
+ *
* <h2>Running, observing and controlling the application:</h2>
- * <p>
* <pre>{@code
* $ ./runSensorAnalytics.sh
* }</pre>
@@ -143,7 +142,7 @@ under the License.
* <pre>{@code
* $ ./runDeviceComms.sh send sensor1.setPublish1hzOutsideRange true
* }</pre>
- * <p>
+ *
* <h3>Alternative MQTT clients</h3>
* You can use any MQTT client but you will have to specify the
* MQTT server, the event topics to watch / subscribe to, and the command topics
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/samples/connectors/src/main/java/quarks/samples/connectors/Util.java
----------------------------------------------------------------------
diff --git a/samples/connectors/src/main/java/quarks/samples/connectors/Util.java b/samples/connectors/src/main/java/quarks/samples/connectors/Util.java
index 8100996..6498ee4 100644
--- a/samples/connectors/src/main/java/quarks/samples/connectors/Util.java
+++ b/samples/connectors/src/main/java/quarks/samples/connectors/Util.java
@@ -42,8 +42,8 @@ public class Util {
* Wait for the job to reach the specified state.
* <p>
* A placeholder till GraphJob directly supports awaitState()?
- * @param job
- * @param state
+ * @param job the job
+ * @param state the state to wait for
* @param timeout specify -1 to wait forever (until interrupted)
* @param unit may be null if timeout is -1
* @return true if the state was reached, false otherwise: the time limit
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/samples/connectors/src/main/java/quarks/samples/connectors/iotf/IotfSensors.java
----------------------------------------------------------------------
diff --git a/samples/connectors/src/main/java/quarks/samples/connectors/iotf/IotfSensors.java b/samples/connectors/src/main/java/quarks/samples/connectors/iotf/IotfSensors.java
index 7feb291..74a2033 100644
--- a/samples/connectors/src/main/java/quarks/samples/connectors/iotf/IotfSensors.java
+++ b/samples/connectors/src/main/java/quarks/samples/connectors/iotf/IotfSensors.java
@@ -116,6 +116,7 @@ public class IotfSensors {
* ensure there is some immediate output and
* the connection to IoTF happens as soon as possible.
* @param device IoT device
+ * @param print true to print generated heartbeat tuples to System.out.
*/
public static void heartBeat(IotDevice device, boolean print) {
// In addition create a heart beat event to
@@ -149,11 +150,14 @@ public class IotfSensors {
* Note to receive commands a analytic application must exist that generates
* them through IBM Watson IoT Platform.
* </P>
- *
+ *
+ * @param device the device
+ * @param print true to print the received command's payload to System.out.
+ * @return the stream
* @see IotDevice#commands(String...)
*/
public static TStream<String> displayMessages(IotDevice device, boolean print) {
- // Subscribe to commands of id "status" for this device
+ // Subscribe to commands of id "display" for this device
TStream<JsonObject> statusMsgs = device.commands("display");
// The returned JSON object includes several fields
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/samples/connectors/src/main/java/quarks/samples/connectors/jdbc/DbUtils.java
----------------------------------------------------------------------
diff --git a/samples/connectors/src/main/java/quarks/samples/connectors/jdbc/DbUtils.java b/samples/connectors/src/main/java/quarks/samples/connectors/jdbc/DbUtils.java
index 925df50..d00be7d 100644
--- a/samples/connectors/src/main/java/quarks/samples/connectors/jdbc/DbUtils.java
+++ b/samples/connectors/src/main/java/quarks/samples/connectors/jdbc/DbUtils.java
@@ -39,7 +39,7 @@ public class DbUtils {
*
* @param props configuration properties
* @return the DataSource
- * @throws Exception
+ * @throws Exception on failure
*/
public static DataSource getDataSource(Properties props) throws Exception {
return createDerbyEmbeddedDataSource(props);
@@ -50,7 +50,7 @@ public class DbUtils {
* <p>
* Tables are created as needed and purged.
* @param ds the DataSource
- * @throws Exception
+ * @throws Exception on failure
*/
public static void initDb(DataSource ds) throws Exception {
createTables(ds);
@@ -60,7 +60,7 @@ public class DbUtils {
/**
* Purge the sample's tables
* @param ds the DataSource
- * @throws Exception
+ * @throws Exception on failure
*/
public static void purgeTables(DataSource ds) throws Exception {
try (Connection cn = ds.getConnection()) {
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/samples/connectors/src/main/java/quarks/samples/connectors/jdbc/PersonData.java
----------------------------------------------------------------------
diff --git a/samples/connectors/src/main/java/quarks/samples/connectors/jdbc/PersonData.java b/samples/connectors/src/main/java/quarks/samples/connectors/jdbc/PersonData.java
index 2621516..3dfc762 100644
--- a/samples/connectors/src/main/java/quarks/samples/connectors/jdbc/PersonData.java
+++ b/samples/connectors/src/main/java/quarks/samples/connectors/jdbc/PersonData.java
@@ -37,7 +37,7 @@ public class PersonData {
* property.
* @param props configuration properties
* @return the loaded person data
- * @throws Exception
+ * @throws Exception on failure
*/
public static List<Person> loadPersonData(Properties props) throws Exception {
String pathname = props.getProperty("persondata.path");
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/samples/connectors/src/main/java/quarks/samples/connectors/kafka/PublisherApp.java
----------------------------------------------------------------------
diff --git a/samples/connectors/src/main/java/quarks/samples/connectors/kafka/PublisherApp.java b/samples/connectors/src/main/java/quarks/samples/connectors/kafka/PublisherApp.java
index 4e0afdb..db1b2ad 100644
--- a/samples/connectors/src/main/java/quarks/samples/connectors/kafka/PublisherApp.java
+++ b/samples/connectors/src/main/java/quarks/samples/connectors/kafka/PublisherApp.java
@@ -51,6 +51,7 @@ public class PublisherApp {
/**
* Create a topology for the publisher application.
+ * @return the Topology
*/
public Topology buildAppTopology() {
Topology t = tp.newTopology("kafkaClientPublisher");
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/samples/connectors/src/main/java/quarks/samples/connectors/kafka/Runner.java
----------------------------------------------------------------------
diff --git a/samples/connectors/src/main/java/quarks/samples/connectors/kafka/Runner.java b/samples/connectors/src/main/java/quarks/samples/connectors/kafka/Runner.java
index 207e920..9f41b8f 100644
--- a/samples/connectors/src/main/java/quarks/samples/connectors/kafka/Runner.java
+++ b/samples/connectors/src/main/java/quarks/samples/connectors/kafka/Runner.java
@@ -34,7 +34,8 @@ import quarks.topology.Topology;
public class Runner {
/**
* Build and run the publisher or subscriber application.
- * @throws Exception
+ * @param options command line options
+ * @throws Exception on failure
*/
public static void run(Options options) throws Exception {
boolean isPub = options.get(OPT_PUB);
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/samples/connectors/src/main/java/quarks/samples/connectors/kafka/SubscriberApp.java
----------------------------------------------------------------------
diff --git a/samples/connectors/src/main/java/quarks/samples/connectors/kafka/SubscriberApp.java b/samples/connectors/src/main/java/quarks/samples/connectors/kafka/SubscriberApp.java
index 38e6a9b..83147ad 100644
--- a/samples/connectors/src/main/java/quarks/samples/connectors/kafka/SubscriberApp.java
+++ b/samples/connectors/src/main/java/quarks/samples/connectors/kafka/SubscriberApp.java
@@ -51,6 +51,7 @@ public class SubscriberApp {
/**
* Create a topology for the subscriber application.
+ * @return the Topology
*/
public Topology buildAppTopology() {
Topology t = tp.newTopology("kafkaClientSubscriber");
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/samples/connectors/src/main/java/quarks/samples/connectors/mqtt/PublisherApp.java
----------------------------------------------------------------------
diff --git a/samples/connectors/src/main/java/quarks/samples/connectors/mqtt/PublisherApp.java b/samples/connectors/src/main/java/quarks/samples/connectors/mqtt/PublisherApp.java
index 2061def..ea73aac 100644
--- a/samples/connectors/src/main/java/quarks/samples/connectors/mqtt/PublisherApp.java
+++ b/samples/connectors/src/main/java/quarks/samples/connectors/mqtt/PublisherApp.java
@@ -51,6 +51,7 @@ public class PublisherApp {
/**
* Create a topology for the publisher application.
+ * @return the Topology
*/
public Topology buildAppTopology() {
Topology t = tp.newTopology("mqttClientPublisher");
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/samples/connectors/src/main/java/quarks/samples/connectors/mqtt/Runner.java
----------------------------------------------------------------------
diff --git a/samples/connectors/src/main/java/quarks/samples/connectors/mqtt/Runner.java b/samples/connectors/src/main/java/quarks/samples/connectors/mqtt/Runner.java
index 725cf40..6cf4d82 100644
--- a/samples/connectors/src/main/java/quarks/samples/connectors/mqtt/Runner.java
+++ b/samples/connectors/src/main/java/quarks/samples/connectors/mqtt/Runner.java
@@ -48,7 +48,7 @@ public class Runner {
/**
* Build and run the publisher or subscriber application.
* @param options command line options
- * @throws Exception
+ * @throws Exception on failure
*/
public static void run(Options options) throws Exception {
boolean isPub = options.get(OPT_PUB);
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/samples/connectors/src/main/java/quarks/samples/connectors/mqtt/SubscriberApp.java
----------------------------------------------------------------------
diff --git a/samples/connectors/src/main/java/quarks/samples/connectors/mqtt/SubscriberApp.java b/samples/connectors/src/main/java/quarks/samples/connectors/mqtt/SubscriberApp.java
index 09f72cf..cecbbbd 100644
--- a/samples/connectors/src/main/java/quarks/samples/connectors/mqtt/SubscriberApp.java
+++ b/samples/connectors/src/main/java/quarks/samples/connectors/mqtt/SubscriberApp.java
@@ -47,6 +47,7 @@ public class SubscriberApp {
/**
* Create a topology for the subscriber application.
+ * @return the Topology
*/
public Topology buildAppTopology() {
Topology t = tp.newTopology("mqttClientSubscriber");
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/samples/console/src/main/java/quarks/samples/console/ConsoleWaterDetector.java
----------------------------------------------------------------------
diff --git a/samples/console/src/main/java/quarks/samples/console/ConsoleWaterDetector.java b/samples/console/src/main/java/quarks/samples/console/ConsoleWaterDetector.java
index bf1a9f5..1ed4007 100644
--- a/samples/console/src/main/java/quarks/samples/console/ConsoleWaterDetector.java
+++ b/samples/console/src/main/java/quarks/samples/console/ConsoleWaterDetector.java
@@ -39,7 +39,6 @@ import quarks.console.server.HttpServer;
import quarks.metrics.Metrics;
import quarks.providers.development.DevelopmentProvider;
import quarks.providers.direct.DirectProvider;
-
import quarks.topology.TStream;
import quarks.topology.Topology;
@@ -53,7 +52,6 @@ import quarks.topology.Topology;
* <li>Tuple count</li>
* <li>Oplet kind</li>
* </ul>
- * </P>
* <P>
* Selecting any of these, with the exception of "Static flow", adds a legend to the topology which
* allows the user to identify elements of the view.
@@ -105,7 +103,6 @@ import quarks.topology.Topology;
* <li>Ecoli</li>
* <li>Lead</li>
* </ul>
- * </P>
* <P>
* This application topology monitors 3 wells:
* <ul>
@@ -131,7 +128,6 @@ import quarks.topology.Topology;
* Each stream that is produced from the split prints out the value for the sensor reading that it is monitoring along with the wellId.
* </li>
* </ul>
- * </P>
*
*/
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/samples/scenarios/src/main/java/quarks/samples/scenarios/iotf/IotfFullScenario.java
----------------------------------------------------------------------
diff --git a/samples/scenarios/src/main/java/quarks/samples/scenarios/iotf/IotfFullScenario.java b/samples/scenarios/src/main/java/quarks/samples/scenarios/iotf/IotfFullScenario.java
index 3e0b6ac..c7b17e6 100644
--- a/samples/scenarios/src/main/java/quarks/samples/scenarios/iotf/IotfFullScenario.java
+++ b/samples/scenarios/src/main/java/quarks/samples/scenarios/iotf/IotfFullScenario.java
@@ -53,7 +53,7 @@ public class IotfFullScenario {
* authentication information.
*
* @param args Must contain the path to the device configuration file.
- *
+ * @throws Exception on failure
* @see IotfDevice#IotfDevice(quarks.topology.Topology, File)
*/
public static void main(String[] args) throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/samples/topology/src/main/java/quarks/samples/topology/CombiningStreamsProcessingResults.java
----------------------------------------------------------------------
diff --git a/samples/topology/src/main/java/quarks/samples/topology/CombiningStreamsProcessingResults.java b/samples/topology/src/main/java/quarks/samples/topology/CombiningStreamsProcessingResults.java
index 6005c5b..e82a182 100644
--- a/samples/topology/src/main/java/quarks/samples/topology/CombiningStreamsProcessingResults.java
+++ b/samples/topology/src/main/java/quarks/samples/topology/CombiningStreamsProcessingResults.java
@@ -44,6 +44,8 @@ public class CombiningStreamsProcessingResults {
* Applies different processing on each stream to generate alert streams.
* Combines the alert streams into a single stream and prints the alerts.
*
+ * @param args command arguments
+ * @throws Exception on failure
*/
public static void main(String[] args) throws Exception {
HeartMonitorSensor monitor = new HeartMonitorSensor();
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/samples/topology/src/main/java/quarks/samples/topology/HelloQuarks.java
----------------------------------------------------------------------
diff --git a/samples/topology/src/main/java/quarks/samples/topology/HelloQuarks.java b/samples/topology/src/main/java/quarks/samples/topology/HelloQuarks.java
index 7279dd1..ad75d28 100644
--- a/samples/topology/src/main/java/quarks/samples/topology/HelloQuarks.java
+++ b/samples/topology/src/main/java/quarks/samples/topology/HelloQuarks.java
@@ -30,6 +30,8 @@ public class HelloQuarks {
/**
* Print "Hello Quarks!" as two tuples.
+ * @param args command arguments
+ * @throws Exception on failure
*/
public static void main(String[] args) throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/samples/topology/src/main/java/quarks/samples/topology/PeriodicSource.java
----------------------------------------------------------------------
diff --git a/samples/topology/src/main/java/quarks/samples/topology/PeriodicSource.java b/samples/topology/src/main/java/quarks/samples/topology/PeriodicSource.java
index 98205f3..f182514 100644
--- a/samples/topology/src/main/java/quarks/samples/topology/PeriodicSource.java
+++ b/samples/topology/src/main/java/quarks/samples/topology/PeriodicSource.java
@@ -35,6 +35,8 @@ public class PeriodicSource {
* Shows polling a data source to periodically obtain a value.
* Polls a random number generator for a new value every second
* and then prints out the raw value and a filtered and transformed stream.
+ * @param args command arguments
+ * @throws Exception on failure
*/
public static void main(String[] args) throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/samples/topology/src/main/java/quarks/samples/topology/SensorsAggregates.java
----------------------------------------------------------------------
diff --git a/samples/topology/src/main/java/quarks/samples/topology/SensorsAggregates.java b/samples/topology/src/main/java/quarks/samples/topology/SensorsAggregates.java
index 055ed4c..1fc6ad0 100644
--- a/samples/topology/src/main/java/quarks/samples/topology/SensorsAggregates.java
+++ b/samples/topology/src/main/java/quarks/samples/topology/SensorsAggregates.java
@@ -62,6 +62,8 @@ public class SensorsAggregates {
/**
* Run a topology with two bursty sensors printing them to standard out.
+ * @param args command arguments
+ * @throws Exception on failure
*/
public static void main(String[] args) throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/samples/utils/src/main/java/quarks/samples/utils/sensor/PeriodicRandomSensor.java
----------------------------------------------------------------------
diff --git a/samples/utils/src/main/java/quarks/samples/utils/sensor/PeriodicRandomSensor.java b/samples/utils/src/main/java/quarks/samples/utils/sensor/PeriodicRandomSensor.java
index eb69d4a..2719d62 100644
--- a/samples/utils/src/main/java/quarks/samples/utils/sensor/PeriodicRandomSensor.java
+++ b/samples/utils/src/main/java/quarks/samples/utils/sensor/PeriodicRandomSensor.java
@@ -168,6 +168,7 @@ public class PeriodicRandomSensor {
* Create a periodic sensor stream with readings from {@link Random#nextBytes(byte[])}.
* @param t the topology to add the sensor stream to
* @param periodMsec how frequently to generate a reading
+ * @param nBytes the number of bytes in each reading tuple
* @return the sensor value stream
*/
public TStream<Pair<Long,byte[]>> newBytes(Topology t, long periodMsec, int nBytes) {
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/samples/utils/src/main/java/quarks/samples/utils/sensor/SimpleSimulatedSensor.java
----------------------------------------------------------------------
diff --git a/samples/utils/src/main/java/quarks/samples/utils/sensor/SimpleSimulatedSensor.java b/samples/utils/src/main/java/quarks/samples/utils/sensor/SimpleSimulatedSensor.java
index 2ff3479..92a6f43 100644
--- a/samples/utils/src/main/java/quarks/samples/utils/sensor/SimpleSimulatedSensor.java
+++ b/samples/utils/src/main/java/quarks/samples/utils/sensor/SimpleSimulatedSensor.java
@@ -48,7 +48,6 @@ import quarks.function.Supplier;
* TStream<Integer> intSensor = t.poll(() -> doubleSensor.get().intValue(),
* 1, TimeUnit.SECONDS);
* }</pre>
- * </p>
*/
public class SimpleSimulatedSensor implements Supplier<Double> {
private static final long serialVersionUID = 1L;
@@ -89,7 +88,7 @@ public class SimpleSimulatedSensor implements Supplier<Double> {
* @param initialValue the initial value.
* @param deltaFactor maximum plus/minus change on each {@code get()}.
* e.g., 1.0 to limit change to +/- 1.0.
- * Must be > 0.0
+ * Must be > 0.0
*/
public SimpleSimulatedSensor(double initialValue, double deltaFactor) {
this(initialValue, deltaFactor, null);
@@ -101,7 +100,7 @@ public class SimpleSimulatedSensor implements Supplier<Double> {
* @param initialValue the initial value. Must be within range.
* @param deltaFactor maximum plus/minus change on each {@link #get()}.
* e.g., 1.0 to limit change to +/- 1.0.
- * Must be > 0.0
+ * Must be > 0.0
* @param range maximum sensor value range. Unlimited if null.
*/
public SimpleSimulatedSensor(double initialValue,
@@ -121,8 +120,8 @@ public class SimpleSimulatedSensor implements Supplier<Double> {
* <p>
* This class offers rounding as a convenience and because
* ancestors of this implementation had such a scheme.
- * </p><p>
- * @param numFracDigits if <= 0, no rounding will be performed
+ * </p>
+ * @param numFracDigits if <= 0, no rounding will be performed
*/
public void setNumberFractionalDigits(int numFracDigits) {
this.numFracDigits = numFracDigits;
@@ -137,17 +136,23 @@ public class SimpleSimulatedSensor implements Supplier<Double> {
}
}
- /** Get the number of fractional digits setting */
+ /** Get the number of fractional digits setting
+ * @return the value
+ */
public int getNumberFractionalDigits() {
return numFracDigits;
}
- /** Get the range setting */
+ /** Get the range setting
+ * @return the value
+ */
public Range<Double> getRange() {
return range;
}
- /** Get the deltaFactor setting */
+ /** Get the deltaFactor setting
+ * @return the value
+ */
public double getDeltaFactor() {
return deltaFactor;
}
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/samples/utils/src/main/java/quarks/samples/utils/sensor/SimulatedTemperatureSensor.java
----------------------------------------------------------------------
diff --git a/samples/utils/src/main/java/quarks/samples/utils/sensor/SimulatedTemperatureSensor.java b/samples/utils/src/main/java/quarks/samples/utils/sensor/SimulatedTemperatureSensor.java
index f398f87..bc00798 100644
--- a/samples/utils/src/main/java/quarks/samples/utils/sensor/SimulatedTemperatureSensor.java
+++ b/samples/utils/src/main/java/quarks/samples/utils/sensor/SimulatedTemperatureSensor.java
@@ -44,7 +44,6 @@ import quarks.function.Supplier;
* SimulatedTemperatureSensor tempSensor = new SimulatedTemperatureSensor();
* TStream<Double> temp = t.poll(tempSensor, 1, TimeUnit.SECONDS);
* }</pre>
- * </p>
* @see SimpleSimulatedSensor
*/
public class SimulatedTemperatureSensor implements Supplier<Double> {
@@ -74,7 +73,7 @@ public class SimulatedTemperatureSensor implements Supplier<Double> {
* @param tempRange maximum sensor value range
* @param deltaFactor maximum plus/minus change on each {@code get()}.
* e.g., 1.0 to limit change to +/- 1.0.
- * Must be > 0.0
+ * Must be > 0.0
*/
public SimulatedTemperatureSensor(double initialTemp,
Range<Double> tempRange, double deltaFactor) {
@@ -86,12 +85,16 @@ public class SimulatedTemperatureSensor implements Supplier<Double> {
sensor = new SimpleSimulatedSensor(initialTemp, deltaFactor, tempRange);
}
- /** Get the tempRange setting */
+ /** Get the tempRange setting
+ * @return the value
+ */
public Range<Double> getTempRange() {
return sensor.getRange();
}
- /** Get the deltaFactor setting */
+ /** Get the deltaFactor setting
+ * @return the value
+ */
public double getDeltaFactor() {
return sensor.getDeltaFactor();
}
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/spi/graph/src/main/java/quarks/graph/spi/AbstractGraph.java
----------------------------------------------------------------------
diff --git a/spi/graph/src/main/java/quarks/graph/spi/AbstractGraph.java b/spi/graph/src/main/java/quarks/graph/spi/AbstractGraph.java
index 9d6a2cf..19c87d8 100644
--- a/spi/graph/src/main/java/quarks/graph/spi/AbstractGraph.java
+++ b/spi/graph/src/main/java/quarks/graph/spi/AbstractGraph.java
@@ -33,6 +33,8 @@ import quarks.oplet.core.Source;
/**
* A skeletal implementation of the {@link Graph} interface,
* to minimize the effort required to implement the interface.
+ *
+ * @param <G> unnecessary?
*/
public abstract class AbstractGraph<G> implements Graph {
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/spi/topology/src/main/java/quarks/topology/spi/AbstractTopology.java
----------------------------------------------------------------------
diff --git a/spi/topology/src/main/java/quarks/topology/spi/AbstractTopology.java b/spi/topology/src/main/java/quarks/topology/spi/AbstractTopology.java
index 67b9d4d..d335130 100644
--- a/spi/topology/src/main/java/quarks/topology/spi/AbstractTopology.java
+++ b/spi/topology/src/main/java/quarks/topology/spi/AbstractTopology.java
@@ -31,6 +31,7 @@ import quarks.topology.tester.Tester;
* Topology implementation that uses the basic functions to implement most
* sources streams.
*
+ * @param <X> Tester type
*/
public abstract class AbstractTopology<X extends Tester> implements Topology {
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/spi/topology/src/main/java/quarks/topology/spi/graph/GraphTopology.java
----------------------------------------------------------------------
diff --git a/spi/topology/src/main/java/quarks/topology/spi/graph/GraphTopology.java b/spi/topology/src/main/java/quarks/topology/spi/graph/GraphTopology.java
index 436cc4e..073b82c 100644
--- a/spi/topology/src/main/java/quarks/topology/spi/graph/GraphTopology.java
+++ b/spi/topology/src/main/java/quarks/topology/spi/graph/GraphTopology.java
@@ -36,6 +36,8 @@ import quarks.topology.tester.Tester;
/**
* Topology implementation that provides basic functions for implementing
* source streams backed by a {@link Graph}.
+ *
+ * @param <X> Tester type
*/
public abstract class GraphTopology<X extends Tester> extends AbstractTopology<X> {
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/test/fvtiot/src/test/java/quarks/test/fvt/iot/IotProviderTest.java
----------------------------------------------------------------------
diff --git a/test/fvtiot/src/test/java/quarks/test/fvt/iot/IotProviderTest.java b/test/fvtiot/src/test/java/quarks/test/fvt/iot/IotProviderTest.java
index 92526c5..60d3857 100644
--- a/test/fvtiot/src/test/java/quarks/test/fvt/iot/IotProviderTest.java
+++ b/test/fvtiot/src/test/java/quarks/test/fvt/iot/IotProviderTest.java
@@ -19,7 +19,6 @@ under the License.
package quarks.test.fvt.iot;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
@@ -48,7 +47,6 @@ import quarks.runtime.jsoncontrol.JsonControlService;
import quarks.test.apps.iot.EchoIotDevice;
import quarks.topology.TStream;
import quarks.topology.Topology;
-import quarks.topology.mbeans.ApplicationServiceMXBean;
import quarks.topology.services.ApplicationService;
import quarks.topology.tester.Condition;
@@ -60,6 +58,7 @@ public class IotProviderTest {
/**
* Basic test we can start applications
+ * @throws Exception on failure
*/
@Test
public void testIotProviderStartApplications() throws Exception {
@@ -107,6 +106,7 @@ public class IotProviderTest {
/**
* Basic test we can stop applications
+ * @throws Exception on failure
*/
@Test
public void testIotProviderCloseApplicationDirect() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/test/svt/src/main/java/quarks/test/svt/apps/GpsAnalyticsApplication.java
----------------------------------------------------------------------
diff --git a/test/svt/src/main/java/quarks/test/svt/apps/GpsAnalyticsApplication.java b/test/svt/src/main/java/quarks/test/svt/apps/GpsAnalyticsApplication.java
index 3eab84c..b40cb7f 100644
--- a/test/svt/src/main/java/quarks/test/svt/apps/GpsAnalyticsApplication.java
+++ b/test/svt/src/main/java/quarks/test/svt/apps/GpsAnalyticsApplication.java
@@ -19,7 +19,9 @@ under the License.
package quarks.test.svt.apps;
import java.util.concurrent.TimeUnit;
+
import com.google.gson.JsonObject;
+
import quarks.connectors.iot.QoS;
import quarks.test.svt.utils.sensor.gps.GpsSensor;
import quarks.test.svt.utils.sensor.gps.SimulatedGeofence;
@@ -43,7 +45,6 @@ import quarks.topology.Topology;
* <li>Windowing to detect hard driving: hard braking or hard acceleration and
* publish alert to IotF</li>
* </ul>
- * <p>
*/
public class GpsAnalyticsApplication {
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/utils/metrics/src/main/java/quarks/metrics/Metrics.java
----------------------------------------------------------------------
diff --git a/utils/metrics/src/main/java/quarks/metrics/Metrics.java b/utils/metrics/src/main/java/quarks/metrics/Metrics.java
index 98983bf..920a465 100644
--- a/utils/metrics/src/main/java/quarks/metrics/Metrics.java
+++ b/utils/metrics/src/main/java/quarks/metrics/Metrics.java
@@ -33,6 +33,7 @@ public class Metrics {
*
* @param <T>
* TStream tuple type
+ * @param stream to stream to instrument
* @return a {@link TStream} containing the input tuples
*/
public static <T> TStream<T> counter(TStream<T> stream) {
@@ -45,6 +46,7 @@ public class Metrics {
*
* @param <T>
* TStream tuple type
+ * @param stream to stream to instrument
* @return a {@link TStream} containing the input tuples
*/
public static <T> TStream<T> rateMeter(TStream<T> stream) {
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/utils/metrics/src/main/java/quarks/metrics/MetricsSetup.java
----------------------------------------------------------------------
diff --git a/utils/metrics/src/main/java/quarks/metrics/MetricsSetup.java b/utils/metrics/src/main/java/quarks/metrics/MetricsSetup.java
index c0bd6d7..b538332 100644
--- a/utils/metrics/src/main/java/quarks/metrics/MetricsSetup.java
+++ b/utils/metrics/src/main/java/quarks/metrics/MetricsSetup.java
@@ -48,6 +48,7 @@ public class MetricsSetup {
/**
* Returns a new {@link MetricsSetup} for configuring metrics.
*
+ * @param services ServiceContainer to use to add services to
* @param registry the registry to use for the application
* @return a {@link MetricsSetup} instance
*/
@@ -62,6 +63,7 @@ public class MetricsSetup {
* Use the specified {@code MBeanServer} with this metric setup.
*
* @param mBeanServer the MBean server used by the metric JMX reporter
+ * @return this
*/
public MetricsSetup registerWith(MBeanServer mBeanServer) {
this.mBeanServer = mBeanServer;
@@ -71,6 +73,8 @@ public class MetricsSetup {
/**
* Starts the metric {@code JMXReporter}. If no MBeanServer was set, use
* the virtual machine's platform MBeanServer.
+ * @param jmxDomainName JMX domain name to use when creating JMX MXBean object names.
+ * @return this
*/
public MetricsSetup startJMXReporter(String jmxDomainName) {
final JmxReporter reporter = JmxReporter.forRegistry(registry()).
@@ -84,6 +88,7 @@ public class MetricsSetup {
/**
* Starts the metric {@code ConsoleReporter} polling every second.
+ * @return this
*/
public MetricsSetup startConsoleReporter() {
ConsoleReporter reporter = ConsoleReporter.forRegistry(registry()).convertRatesTo(ratesUnit)
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/utils/metrics/src/main/java/quarks/metrics/oplets/CounterOp.java
----------------------------------------------------------------------
diff --git a/utils/metrics/src/main/java/quarks/metrics/oplets/CounterOp.java b/utils/metrics/src/main/java/quarks/metrics/oplets/CounterOp.java
index 5d6429b..c0c2a24 100644
--- a/utils/metrics/src/main/java/quarks/metrics/oplets/CounterOp.java
+++ b/utils/metrics/src/main/java/quarks/metrics/oplets/CounterOp.java
@@ -23,6 +23,8 @@ import com.codahale.metrics.Metric;
/**
* A metrics oplet which counts the number of tuples peeked at.
+ *
+ * @param <T> Tuple type
*/
public final class CounterOp<T> extends SingleMetricAbstractOplet<T> {
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/utils/metrics/src/main/java/quarks/metrics/oplets/RateMeter.java
----------------------------------------------------------------------
diff --git a/utils/metrics/src/main/java/quarks/metrics/oplets/RateMeter.java b/utils/metrics/src/main/java/quarks/metrics/oplets/RateMeter.java
index e81a59c..21f765f 100644
--- a/utils/metrics/src/main/java/quarks/metrics/oplets/RateMeter.java
+++ b/utils/metrics/src/main/java/quarks/metrics/oplets/RateMeter.java
@@ -24,6 +24,8 @@ import com.codahale.metrics.Metric;
/**
* A metrics oplet which measures current tuple throughput and one-, five-,
* and fifteen-minute exponentially-weighted moving averages.
+ *
+ * @param <T> Tuple type
*/
public final class RateMeter<T> extends SingleMetricAbstractOplet<T> {
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/utils/metrics/src/main/java/quarks/metrics/oplets/SingleMetricAbstractOplet.java
----------------------------------------------------------------------
diff --git a/utils/metrics/src/main/java/quarks/metrics/oplets/SingleMetricAbstractOplet.java b/utils/metrics/src/main/java/quarks/metrics/oplets/SingleMetricAbstractOplet.java
index 55add6d..384afcb 100644
--- a/utils/metrics/src/main/java/quarks/metrics/oplets/SingleMetricAbstractOplet.java
+++ b/utils/metrics/src/main/java/quarks/metrics/oplets/SingleMetricAbstractOplet.java
@@ -26,6 +26,8 @@ import quarks.oplet.core.Peek;
/**
* Base for metrics oplets which use a single metric object.
+ *
+ * @param <T> Tuple type
*/
public abstract class SingleMetricAbstractOplet<T> extends Peek<T> {
[4/6] incubator-quarks git commit: more cleanup
Posted by dl...@apache.org.
more cleanup
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/e093cd7b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/e093cd7b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/e093cd7b
Branch: refs/heads/master
Commit: e093cd7b6015f5168df1c6d12ba84f8d238782c1
Parents: d784001
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Fri Jun 10 11:09:42 2016 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Fri Jun 10 11:09:42 2016 -0400
----------------------------------------------------------------------
api/topology/src/main/java/quarks/topology/Topology.java | 1 +
.../main/java/quarks/topology/plumbing/PlumbingStreams.java | 7 ++++---
.../iot/src/main/java/quarks/providers/iot/package-info.java | 4 +++-
3 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/e093cd7b/api/topology/src/main/java/quarks/topology/Topology.java
----------------------------------------------------------------------
diff --git a/api/topology/src/main/java/quarks/topology/Topology.java b/api/topology/src/main/java/quarks/topology/Topology.java
index f7d8234..5bf68a7 100644
--- a/api/topology/src/main/java/quarks/topology/Topology.java
+++ b/api/topology/src/main/java/quarks/topology/Topology.java
@@ -37,6 +37,7 @@ import quarks.topology.tester.Tester;
* {@link #poll(Supplier, long, TimeUnit) poll},
* {@link #strings(String...) strings}.
*
+ * See <a href="doc-files/sources.html">Quarks Source Streams</a>.
*/
public interface Topology extends TopologyElement {
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/e093cd7b/api/topology/src/main/java/quarks/topology/plumbing/PlumbingStreams.java
----------------------------------------------------------------------
diff --git a/api/topology/src/main/java/quarks/topology/plumbing/PlumbingStreams.java b/api/topology/src/main/java/quarks/topology/plumbing/PlumbingStreams.java
index 01ca30a..b0a8768 100644
--- a/api/topology/src/main/java/quarks/topology/plumbing/PlumbingStreams.java
+++ b/api/topology/src/main/java/quarks/topology/plumbing/PlumbingStreams.java
@@ -652,14 +652,15 @@ public class PlumbingStreams {
* TStream<Integer> readings = ...;
* Semaphore gateControl = new Semaphore(1); // allow the first to pass through
* TStream<Integer> gated = gate(readings, gateControl);
+ *
* // Create the concurrent pipeline combiner and have it
* // signal that concurrent processing of the tuple has completed.
* // In this sample the combiner just returns the received list of
* // each pipeline result.
+ *
* Function<TStream<List<Integer>>,TStream<List<Integer>>> combiner =
- * stream -> stream.map(
- * list -> { * gateControl.release(); * return list; * }
- * );
+ * stream -> stream.map(list -> { * gateControl.release(); * return list; * });
+ *
* TStream<List<Integer>> results = PlumbingStreams.concurrent(gated, pipelines, combiner);
* }</pre>
* @param <T> Tuple type
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/e093cd7b/providers/iot/src/main/java/quarks/providers/iot/package-info.java
----------------------------------------------------------------------
diff --git a/providers/iot/src/main/java/quarks/providers/iot/package-info.java b/providers/iot/src/main/java/quarks/providers/iot/package-info.java
index a22d22f..4353b0b 100644
--- a/providers/iot/src/main/java/quarks/providers/iot/package-info.java
+++ b/providers/iot/src/main/java/quarks/providers/iot/package-info.java
@@ -45,7 +45,7 @@ under the License.
* including arbitrary control mbeans registered by applications.
*
* <H4>Provider operations</H4>
- * <TABLE border="1">
+ * <TABLE border="1" summary="">
* <tr>
* <th>Operation</th><th>Command identifier</th>
* <th>Type</th><th>Alias</th><th>Method</th><th>Arguments</th>
@@ -58,6 +58,7 @@ under the License.
* <td><em>{@code [applicationName, config]}</em></td>
* <td>{@link quarks.topology.mbeans.ApplicationServiceMXBean ApplicationServiceMXBean}</td>
* </tr>
+ * <tr>
* <th>Sample command data</th>
* <td colspan=5>{@code {"type":"appService","alias":"quarks","op":"submit","args":["Heartbeat",{}]}}</td>
* </tr>
@@ -70,6 +71,7 @@ under the License.
* <td>{@code ["CLOSE"]}</td>
* <td>{@link quarks.execution.mbeans.JobMXBean JobMXBean}</td>
* </tr>
+ * <tr>
* <th>Sample command data</th>
* <td colspan=5>{@code {"type":"job","alias":"Heartbeat","op":"stateChange","args":["CLOSE"]}}</td>
* </tr>
[5/6] incubator-quarks git commit: final cleanup
Posted by dl...@apache.org.
final cleanup
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/4039ce70
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/4039ce70
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/4039ce70
Branch: refs/heads/master
Commit: 4039ce70c5ac21c64ed0e2deb88d0cb4554da12a
Parents: e093cd7
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Fri Jun 10 11:52:42 2016 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Fri Jun 10 11:52:42 2016 -0400
----------------------------------------------------------------------
.../src/main/java/quarks/function/Functions.java | 4 ++--
.../src/main/java/quarks/topology/Topology.java | 5 +++--
api/window/src/main/java/quarks/window/Window.java | 2 +-
.../main/java/quarks/providers/iot/package-info.java | 3 ++-
.../java/quarks/samples/topology/HelloQuarks.java | 10 +++++-----
.../java/quarks/samples/topology/PeriodicSource.java | 14 +++++++-------
.../quarks/samples/topology/SensorsAggregates.java | 10 +++++-----
.../java/quarks/streamscope/StreamScopeRegistry.java | 4 ++--
8 files changed, 27 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/4039ce70/api/function/src/main/java/quarks/function/Functions.java
----------------------------------------------------------------------
diff --git a/api/function/src/main/java/quarks/function/Functions.java b/api/function/src/main/java/quarks/function/Functions.java
index acb271d..14ce713 100644
--- a/api/function/src/main/java/quarks/function/Functions.java
+++ b/api/function/src/main/java/quarks/function/Functions.java
@@ -69,8 +69,8 @@ public class Functions {
* Returns a constant function that returns zero (0).
* This is identical to {@link #zero()} but is more
* readable when applied as a key function.
- * @param <T> tuple type
- * @return Constant function that returns zero (0).
+ * @param <T> tuple type
+ * @return Constant function that returns zero (0).
*/
public static <T> Function<T,Integer> unpartitioned() {
return zero();
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/4039ce70/api/topology/src/main/java/quarks/topology/Topology.java
----------------------------------------------------------------------
diff --git a/api/topology/src/main/java/quarks/topology/Topology.java b/api/topology/src/main/java/quarks/topology/Topology.java
index 5bf68a7..74f6881 100644
--- a/api/topology/src/main/java/quarks/topology/Topology.java
+++ b/api/topology/src/main/java/quarks/topology/Topology.java
@@ -36,8 +36,9 @@ import quarks.topology.tester.Tester;
* streams, such as {@link #source(Supplier) source},
* {@link #poll(Supplier, long, TimeUnit) poll},
* {@link #strings(String...) strings}.
- *
+ * <P>
* See <a href="doc-files/sources.html">Quarks Source Streams</a>.
+ * </P>
*/
public interface Topology extends TopologyElement {
@@ -113,7 +114,7 @@ public interface Topology extends TopologyElement {
* String alias = pollStream.getAlias();
* PeriodMXBean control = cs.getControl(TStream.TYPE, alias, PeriodMXBean.class);
* control.setPoll(period, unit);
- * }
+ * }
* }</pre>
*
* @param <T> Tuple type
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/4039ce70/api/window/src/main/java/quarks/window/Window.java
----------------------------------------------------------------------
diff --git a/api/window/src/main/java/quarks/window/Window.java b/api/window/src/main/java/quarks/window/Window.java
index 8bf6706..56060c0 100644
--- a/api/window/src/main/java/quarks/window/Window.java
+++ b/api/window/src/main/java/quarks/window/Window.java
@@ -164,7 +164,7 @@ public interface Window<T, K, L extends List<T>>{
* for example:
* <br>
* <pre>{@code
- * Map<K, Partitions<U, K, ?>> partitions = window.getPartitions();
+ * Map<K, Partitions<U, K, ?>> partitions = window.getPartitions();
* synchronized(partitions){
* // operations with partition
* }
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/4039ce70/providers/iot/src/main/java/quarks/providers/iot/package-info.java
----------------------------------------------------------------------
diff --git a/providers/iot/src/main/java/quarks/providers/iot/package-info.java b/providers/iot/src/main/java/quarks/providers/iot/package-info.java
index 4353b0b..49ce3cb 100644
--- a/providers/iot/src/main/java/quarks/providers/iot/package-info.java
+++ b/providers/iot/src/main/java/quarks/providers/iot/package-info.java
@@ -45,7 +45,8 @@ under the License.
* including arbitrary control mbeans registered by applications.
*
* <H4>Provider operations</H4>
- * <TABLE border="1" summary="">
+ * <TABLE border="1">
+ * <caption>Device Commands</caption>
* <tr>
* <th>Operation</th><th>Command identifier</th>
* <th>Type</th><th>Alias</th><th>Method</th><th>Arguments</th>
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/4039ce70/samples/topology/src/main/java/quarks/samples/topology/HelloQuarks.java
----------------------------------------------------------------------
diff --git a/samples/topology/src/main/java/quarks/samples/topology/HelloQuarks.java b/samples/topology/src/main/java/quarks/samples/topology/HelloQuarks.java
index ad75d28..776e887 100644
--- a/samples/topology/src/main/java/quarks/samples/topology/HelloQuarks.java
+++ b/samples/topology/src/main/java/quarks/samples/topology/HelloQuarks.java
@@ -28,11 +28,11 @@ import quarks.topology.Topology;
*/
public class HelloQuarks {
- /**
- * Print "Hello Quarks!" as two tuples.
- * @param args command arguments
- * @throws Exception on failure
- */
+ /**
+ * Print "Hello Quarks!" as two tuples.
+ * @param args command arguments
+ * @throws Exception on failure
+ */
public static void main(String[] args) throws Exception {
DirectProvider dp = new DirectProvider();
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/4039ce70/samples/topology/src/main/java/quarks/samples/topology/PeriodicSource.java
----------------------------------------------------------------------
diff --git a/samples/topology/src/main/java/quarks/samples/topology/PeriodicSource.java b/samples/topology/src/main/java/quarks/samples/topology/PeriodicSource.java
index f182514..2d7fd3f 100644
--- a/samples/topology/src/main/java/quarks/samples/topology/PeriodicSource.java
+++ b/samples/topology/src/main/java/quarks/samples/topology/PeriodicSource.java
@@ -31,13 +31,13 @@ import quarks.topology.Topology;
*
*/
public class PeriodicSource {
- /**
- * Shows polling a data source to periodically obtain a value.
- * Polls a random number generator for a new value every second
- * and then prints out the raw value and a filtered and transformed stream.
- * @param args command arguments
- * @throws Exception on failure
- */
+ /**
+ * Shows polling a data source to periodically obtain a value.
+ * Polls a random number generator for a new value every second
+ * and then prints out the raw value and a filtered and transformed stream.
+ * @param args command arguments
+ * @throws Exception on failure
+ */
public static void main(String[] args) throws Exception {
DirectProvider tp = new DirectProvider();
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/4039ce70/samples/topology/src/main/java/quarks/samples/topology/SensorsAggregates.java
----------------------------------------------------------------------
diff --git a/samples/topology/src/main/java/quarks/samples/topology/SensorsAggregates.java b/samples/topology/src/main/java/quarks/samples/topology/SensorsAggregates.java
index 1fc6ad0..2b068c3 100644
--- a/samples/topology/src/main/java/quarks/samples/topology/SensorsAggregates.java
+++ b/samples/topology/src/main/java/quarks/samples/topology/SensorsAggregates.java
@@ -60,11 +60,11 @@ import quarks.topology.Topology;
*/
public class SensorsAggregates {
- /**
- * Run a topology with two bursty sensors printing them to standard out.
- * @param args command arguments
- * @throws Exception on failure
- */
+ /**
+ * Run a topology with two bursty sensors printing them to standard out.
+ * @param args command arguments
+ * @throws Exception on failure
+ */
public static void main(String[] args) throws Exception {
System.out.println("SensorsAggregates: Output will be randomly intermittent, be patient!");
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/4039ce70/utils/streamscope/src/main/java/quarks/streamscope/StreamScopeRegistry.java
----------------------------------------------------------------------
diff --git a/utils/streamscope/src/main/java/quarks/streamscope/StreamScopeRegistry.java b/utils/streamscope/src/main/java/quarks/streamscope/StreamScopeRegistry.java
index c45a528..a51c807 100644
--- a/utils/streamscope/src/main/java/quarks/streamscope/StreamScopeRegistry.java
+++ b/utils/streamscope/src/main/java/quarks/streamscope/StreamScopeRegistry.java
@@ -96,7 +96,7 @@ public class StreamScopeRegistry {
/** Extract the stream alias from a name
* @param name the name
- * @return null if {@code name} is not a from nameByStreamAlias()
+ * @return null if {@code name} is not from nameByStreamAlias()
*/
public static String streamAliasFromName(String name) {
Objects.requireNonNull(name, "name");
@@ -107,7 +107,7 @@ public class StreamScopeRegistry {
/** Extract the streamId from the name.
* @param name the name
- * @return null if {@code name} is not a from nameByStreamId()
+ * @return null if {@code name} is not from nameByStreamId()
*/
public static String streamIdFromName(String name) {
Objects.requireNonNull(name, "name");
[6/6] incubator-quarks git commit: Merge pull request #135
Posted by dl...@apache.org.
Merge pull request #135
This closes #135
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/725c1076
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/725c1076
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/725c1076
Branch: refs/heads/master
Commit: 725c107650ed733dca2d2dddf3a622b52c436694
Parents: d982184 4039ce7
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Mon Jun 13 10:22:10 2016 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Mon Jun 13 10:22:10 2016 -0400
----------------------------------------------------------------------
.../java/quarks/analytics/sensors/Deadtime.java | 2 +-
.../java/quarks/analytics/sensors/Filters.java | 2 +-
.../java/quarks/analytics/sensors/Range.java | 6 ++-
.../java/quarks/analytics/sensors/Ranges.java | 40 ++++++++++++++++++
.../src/main/java/quarks/execution/Configs.java | 3 +-
.../quarks/execution/mbeans/PeriodMXBean.java | 3 ++
.../execution/services/ControlService.java | 8 +++-
.../quarks/execution/services/Controls.java | 2 +-
.../execution/services/JobRegistryService.java | 3 +-
.../execution/services/RuntimeServices.java | 4 +-
.../execution/services/ServiceContainer.java | 3 ++
.../main/java/quarks/function/BiConsumer.java | 2 +
.../main/java/quarks/function/Functions.java | 16 ++++++-
.../java/quarks/function/WrappedFunction.java | 2 +
.../src/main/java/quarks/graph/Connector.java | 5 ++-
api/graph/src/main/java/quarks/graph/Graph.java | 11 ++++-
api/oplet/src/main/java/quarks/oplet/Oplet.java | 4 +-
.../main/java/quarks/oplet/OpletContext.java | 4 +-
.../src/main/java/quarks/oplet/core/FanIn.java | 7 +++-
.../src/main/java/quarks/oplet/core/Union.java | 2 +
.../quarks/oplet/plumbing/PressureReliever.java | 4 +-
.../src/main/java/quarks/topology/TSink.java | 1 +
.../src/main/java/quarks/topology/TStream.java | 32 ++++++++------
.../src/main/java/quarks/topology/TWindow.java | 5 ++-
.../src/main/java/quarks/topology/Topology.java | 14 +++++--
.../java/quarks/topology/TopologyProvider.java | 3 +-
.../quarks/topology/mbeans/package-info.java | 2 -
.../topology/plumbing/LoadBalancedSplitter.java | 2 +-
.../topology/plumbing/PlumbingStreams.java | 44 +++++++++++++-------
.../java/quarks/topology/plumbing/Valve.java | 2 +-
.../java/quarks/topology/tester/Condition.java | 1 +
.../java/quarks/topology/tester/Tester.java | 4 +-
.../java/quarks/test/topology/TStreamTest.java | 9 ++++
.../src/main/java/quarks/window/Partition.java | 3 +-
.../src/main/java/quarks/window/Policies.java | 30 +++++++++++++
.../src/main/java/quarks/window/Window.java | 12 +++---
.../src/main/java/quarks/window/Windows.java | 6 ++-
.../java/quarks/apps/iot/IotDevicePubSub.java | 4 +-
.../java/quarks/apps/runtime/JobMonitorApp.java | 6 +--
.../quarks/connectors/runtime/Connector.java | 3 +-
.../quarks/connectors/file/FileStreams.java | 6 ++-
.../connectors/file/FileWriterCycleConfig.java | 30 +++++++++++--
.../connectors/file/FileWriterFlushConfig.java | 26 ++++++++++--
.../connectors/file/FileWriterPolicy.java | 2 +-
.../file/FileWriterRetentionConfig.java | 20 +++++++--
.../file/runtime/AbstractWriterFile.java | 6 ++-
.../file/runtime/IFileWriterPolicy.java | 6 +--
.../test/connectors/file/FileStreamsTest.java | 1 +
.../quarks/connectors/http/HttpStreams.java | 4 ++
.../connectors/http/runtime/HttpRequester.java | 3 ++
.../quarks/connectors/iot/package-info.java | 4 +-
.../java/quarks/connectors/iotf/IotfDevice.java | 3 +-
.../quarks/connectors/jdbc/JdbcStreams.java | 6 +++
.../quarks/connectors/jdbc/ParameterSetter.java | 2 +-
.../connectors/jdbc/StatementSupplier.java | 2 +
.../quarks/connectors/kafka/KafkaConsumer.java | 8 ++--
.../quarks/connectors/kafka/KafkaProducer.java | 4 +-
.../java/quarks/connectors/mqtt/MqttConfig.java | 28 +++++++------
.../quarks/connectors/mqtt/MqttStreams.java | 8 +++-
.../connectors/pubsub/PublishSubscribe.java | 4 ++
.../pubsub/service/PublishSubscribeService.java | 2 +
.../websocket/QuarksSslContainerProvider.java | 1 -
.../quarks/connectors/serial/SerialDevice.java | 1 +
.../javax/websocket/WebSocketServerEcho.java | 4 +-
.../java/quarks/console/server/HttpServer.java | 4 +-
.../java/quarks/console/server/ServerUtil.java | 1 +
.../java/quarks/providers/iot/IotProvider.java | 4 +-
.../java/quarks/providers/iot/package-info.java | 5 ++-
.../quarks/runtime/etiao/AbstractContext.java | 3 ++
.../java/quarks/runtime/etiao/Executable.java | 5 ++-
.../java/quarks/runtime/etiao/Invocation.java | 1 +
.../quarks/runtime/etiao/SettableForwarder.java | 3 +-
.../runtime/etiao/graph/model/GraphType.java | 3 ++
.../runtime/etiao/graph/model/IdMapper.java | 1 +
.../runtime/jmxcontrol/JMXControlService.java | 1 +
.../quarks/runtime/jobregistry/JobEvents.java | 5 ++-
.../runtime/jsoncontrol/JsonControlService.java | 2 +
.../samples/apps/AbstractApplication.java | 3 +-
.../samples/apps/ApplicationUtilities.java | 6 ++-
.../java/quarks/samples/apps/JsonTuples.java | 4 +-
.../apps/sensorAnalytics/package-info.java | 7 ++--
.../java/quarks/samples/connectors/Util.java | 4 +-
.../samples/connectors/iotf/IotfSensors.java | 8 +++-
.../quarks/samples/connectors/jdbc/DbUtils.java | 6 +--
.../samples/connectors/jdbc/PersonData.java | 2 +-
.../samples/connectors/kafka/PublisherApp.java | 1 +
.../quarks/samples/connectors/kafka/Runner.java | 3 +-
.../samples/connectors/kafka/SubscriberApp.java | 1 +
.../samples/connectors/mqtt/PublisherApp.java | 1 +
.../quarks/samples/connectors/mqtt/Runner.java | 2 +-
.../samples/connectors/mqtt/SubscriberApp.java | 1 +
.../samples/console/ConsoleWaterDetector.java | 4 --
.../scenarios/iotf/IotfFullScenario.java | 2 +-
.../CombiningStreamsProcessingResults.java | 2 +
.../quarks/samples/topology/HelloQuarks.java | 8 ++--
.../quarks/samples/topology/PeriodicSource.java | 12 +++---
.../samples/topology/SensorsAggregates.java | 8 ++--
.../utils/sensor/PeriodicRandomSensor.java | 1 +
.../utils/sensor/SimpleSimulatedSensor.java | 21 ++++++----
.../sensor/SimulatedTemperatureSensor.java | 11 +++--
.../java/quarks/graph/spi/AbstractGraph.java | 2 +
.../quarks/topology/spi/AbstractTopology.java | 1 +
.../topology/spi/graph/GraphTopology.java | 2 +
.../quarks/test/fvt/iot/IotProviderTest.java | 4 +-
.../test/svt/apps/GpsAnalyticsApplication.java | 3 +-
.../src/main/java/quarks/metrics/Metrics.java | 2 +
.../main/java/quarks/metrics/MetricsSetup.java | 5 +++
.../java/quarks/metrics/oplets/CounterOp.java | 2 +
.../java/quarks/metrics/oplets/RateMeter.java | 2 +
.../oplets/SingleMetricAbstractOplet.java | 2 +
.../java/quarks/streamscope/StreamScope.java | 14 +++++--
.../quarks/streamscope/StreamScopeRegistry.java | 28 +++++++++++--
.../quarks/streamscope/StreamScopeSetup.java | 3 +-
.../streamscope/mbeans/StreamScopeMXBean.java | 4 +-
114 files changed, 539 insertions(+), 188 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/725c1076/console/server/src/main/java/quarks/console/server/ServerUtil.java
----------------------------------------------------------------------
[3/6] incubator-quarks git commit: fix javadoc warnings and errors
when Xdoclint:none is disabled
Posted by dl...@apache.org.
fix javadoc warnings and errors when Xdoclint:none is disabled
- lots of "unexpected end tag </P>" errors often due to it following a
table or list (which automatically ends a preceeding <P>)
- lots of missing generic type param doc, @return and @param
- also with enabling Eclipse > Java > Compiler > Javadoc > Missing
Javadoc Tags
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/d7840011
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/d7840011
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/d7840011
Branch: refs/heads/master
Commit: d78400110fa0cc0f8904c3f12205ce778eb4b9c4
Parents: 7924cc6
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Fri Jun 10 10:31:15 2016 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Fri Jun 10 10:31:15 2016 -0400
----------------------------------------------------------------------
.../java/quarks/analytics/sensors/Deadtime.java | 2 +-
.../java/quarks/analytics/sensors/Filters.java | 2 +-
.../java/quarks/analytics/sensors/Range.java | 6 ++-
.../java/quarks/analytics/sensors/Ranges.java | 40 ++++++++++++++++++++
.../src/main/java/quarks/execution/Configs.java | 3 +-
.../quarks/execution/mbeans/PeriodMXBean.java | 3 ++
.../execution/services/ControlService.java | 8 +++-
.../quarks/execution/services/Controls.java | 2 +-
.../execution/services/JobRegistryService.java | 3 +-
.../execution/services/RuntimeServices.java | 4 +-
.../execution/services/ServiceContainer.java | 3 ++
.../main/java/quarks/function/BiConsumer.java | 2 +
.../main/java/quarks/function/Functions.java | 18 ++++++++-
.../java/quarks/function/WrappedFunction.java | 2 +
.../src/main/java/quarks/graph/Connector.java | 5 ++-
api/graph/src/main/java/quarks/graph/Graph.java | 11 +++++-
api/oplet/src/main/java/quarks/oplet/Oplet.java | 4 +-
.../main/java/quarks/oplet/OpletContext.java | 4 +-
.../src/main/java/quarks/oplet/core/FanIn.java | 7 +++-
.../src/main/java/quarks/oplet/core/Union.java | 2 +
.../quarks/oplet/plumbing/PressureReliever.java | 4 +-
.../src/main/java/quarks/topology/TSink.java | 1 +
.../src/main/java/quarks/topology/TStream.java | 32 +++++++++-------
.../src/main/java/quarks/topology/TWindow.java | 5 ++-
.../src/main/java/quarks/topology/Topology.java | 12 ++++--
.../java/quarks/topology/TopologyProvider.java | 3 +-
.../quarks/topology/mbeans/package-info.java | 2 -
.../topology/plumbing/LoadBalancedSplitter.java | 2 +-
.../topology/plumbing/PlumbingStreams.java | 37 ++++++++++++------
.../java/quarks/topology/plumbing/Valve.java | 2 +-
.../java/quarks/topology/tester/Condition.java | 1 +
.../java/quarks/topology/tester/Tester.java | 4 +-
.../java/quarks/test/topology/TStreamTest.java | 9 +++++
.../src/main/java/quarks/window/Partition.java | 3 +-
.../src/main/java/quarks/window/Policies.java | 30 +++++++++++++++
.../src/main/java/quarks/window/Window.java | 10 ++---
.../src/main/java/quarks/window/Windows.java | 6 ++-
.../java/quarks/apps/iot/IotDevicePubSub.java | 4 +-
.../java/quarks/apps/runtime/JobMonitorApp.java | 6 +--
.../quarks/connectors/runtime/Connector.java | 3 +-
.../quarks/connectors/file/FileStreams.java | 6 ++-
.../connectors/file/FileWriterCycleConfig.java | 30 +++++++++++++--
.../connectors/file/FileWriterFlushConfig.java | 26 +++++++++++--
.../connectors/file/FileWriterPolicy.java | 2 +-
.../file/FileWriterRetentionConfig.java | 20 ++++++++--
.../file/runtime/AbstractWriterFile.java | 6 ++-
.../file/runtime/IFileWriterPolicy.java | 6 +--
.../test/connectors/file/FileStreamsTest.java | 1 +
.../quarks/connectors/http/HttpStreams.java | 4 ++
.../connectors/http/runtime/HttpRequester.java | 3 ++
.../quarks/connectors/iot/package-info.java | 4 +-
.../java/quarks/connectors/iotf/IotfDevice.java | 3 +-
.../quarks/connectors/jdbc/JdbcStreams.java | 6 +++
.../quarks/connectors/jdbc/ParameterSetter.java | 2 +-
.../connectors/jdbc/StatementSupplier.java | 2 +
.../quarks/connectors/kafka/KafkaConsumer.java | 8 ++--
.../quarks/connectors/kafka/KafkaProducer.java | 4 +-
.../java/quarks/connectors/mqtt/MqttConfig.java | 28 +++++++-------
.../quarks/connectors/mqtt/MqttStreams.java | 8 +++-
.../connectors/pubsub/PublishSubscribe.java | 4 ++
.../pubsub/service/PublishSubscribeService.java | 2 +
.../websocket/QuarksSslContainerProvider.java | 1 -
.../quarks/connectors/serial/SerialDevice.java | 1 +
.../javax/websocket/WebSocketServerEcho.java | 4 +-
.../java/quarks/console/server/HttpServer.java | 4 +-
.../java/quarks/console/server/ServerUtil.java | 1 +
.../java/quarks/providers/iot/IotProvider.java | 4 +-
.../java/quarks/providers/iot/package-info.java | 2 -
.../quarks/runtime/etiao/AbstractContext.java | 3 ++
.../java/quarks/runtime/etiao/Executable.java | 5 ++-
.../java/quarks/runtime/etiao/Invocation.java | 1 +
.../quarks/runtime/etiao/SettableForwarder.java | 3 +-
.../runtime/etiao/graph/model/GraphType.java | 3 ++
.../runtime/etiao/graph/model/IdMapper.java | 1 +
.../runtime/jmxcontrol/JMXControlService.java | 1 +
.../quarks/runtime/jobregistry/JobEvents.java | 5 ++-
.../runtime/jsoncontrol/JsonControlService.java | 2 +
.../samples/apps/AbstractApplication.java | 3 +-
.../samples/apps/ApplicationUtilities.java | 6 ++-
.../java/quarks/samples/apps/JsonTuples.java | 4 +-
.../apps/sensorAnalytics/package-info.java | 7 ++--
.../java/quarks/samples/connectors/Util.java | 4 +-
.../samples/connectors/iotf/IotfSensors.java | 8 +++-
.../quarks/samples/connectors/jdbc/DbUtils.java | 6 +--
.../samples/connectors/jdbc/PersonData.java | 2 +-
.../samples/connectors/kafka/PublisherApp.java | 1 +
.../quarks/samples/connectors/kafka/Runner.java | 3 +-
.../samples/connectors/kafka/SubscriberApp.java | 1 +
.../samples/connectors/mqtt/PublisherApp.java | 1 +
.../quarks/samples/connectors/mqtt/Runner.java | 2 +-
.../samples/connectors/mqtt/SubscriberApp.java | 1 +
.../samples/console/ConsoleWaterDetector.java | 4 --
.../scenarios/iotf/IotfFullScenario.java | 2 +-
.../CombiningStreamsProcessingResults.java | 2 +
.../quarks/samples/topology/HelloQuarks.java | 2 +
.../quarks/samples/topology/PeriodicSource.java | 2 +
.../samples/topology/SensorsAggregates.java | 2 +
.../utils/sensor/PeriodicRandomSensor.java | 1 +
.../utils/sensor/SimpleSimulatedSensor.java | 21 ++++++----
.../sensor/SimulatedTemperatureSensor.java | 11 ++++--
.../java/quarks/graph/spi/AbstractGraph.java | 2 +
.../quarks/topology/spi/AbstractTopology.java | 1 +
.../topology/spi/graph/GraphTopology.java | 2 +
.../quarks/test/fvt/iot/IotProviderTest.java | 4 +-
.../test/svt/apps/GpsAnalyticsApplication.java | 3 +-
.../src/main/java/quarks/metrics/Metrics.java | 2 +
.../main/java/quarks/metrics/MetricsSetup.java | 5 +++
.../java/quarks/metrics/oplets/CounterOp.java | 2 +
.../java/quarks/metrics/oplets/RateMeter.java | 2 +
.../oplets/SingleMetricAbstractOplet.java | 2 +
.../java/quarks/streamscope/StreamScope.java | 14 +++++--
.../quarks/streamscope/StreamScopeRegistry.java | 28 ++++++++++++--
.../quarks/streamscope/StreamScopeSetup.java | 3 +-
.../streamscope/mbeans/StreamScopeMXBean.java | 4 +-
114 files changed, 519 insertions(+), 174 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/analytics/sensors/src/main/java/quarks/analytics/sensors/Deadtime.java
----------------------------------------------------------------------
diff --git a/analytics/sensors/src/main/java/quarks/analytics/sensors/Deadtime.java b/analytics/sensors/src/main/java/quarks/analytics/sensors/Deadtime.java
index debfe1b..f7abe56 100644
--- a/analytics/sensors/src/main/java/quarks/analytics/sensors/Deadtime.java
+++ b/analytics/sensors/src/main/java/quarks/analytics/sensors/Deadtime.java
@@ -60,7 +60,7 @@ public class Deadtime<T> implements Predicate<T> {
* @param deadtimePeriod the amount of time for {@code test()}
* to return false after returning true.
* Specify a value of 0 for no deadtime period.
- * Must be >= 0.
+ * Must be >= 0.
* @param unit {@link TimeUnit} of {@code deadtimePeriod}
*/
public synchronized void setPeriod(long deadtimePeriod, TimeUnit unit) {
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/analytics/sensors/src/main/java/quarks/analytics/sensors/Filters.java
----------------------------------------------------------------------
diff --git a/analytics/sensors/src/main/java/quarks/analytics/sensors/Filters.java b/analytics/sensors/src/main/java/quarks/analytics/sensors/Filters.java
index dedf829..0a71713 100644
--- a/analytics/sensors/src/main/java/quarks/analytics/sensors/Filters.java
+++ b/analytics/sensors/src/main/java/quarks/analytics/sensors/Filters.java
@@ -100,7 +100,6 @@ public class Filters {
* </UL>
* <BR>
* <img src="doc-files/deadband.png" alt="Deadband example">
- * </P>
*
* @param <T> Tuple type.
* @param <V> Value type for the deadband function.
@@ -129,6 +128,7 @@ public class Filters {
* Use {@link Deadtime} directly if you need to change the deadtime period
* while the topology is running.
* </p>
+ * @param <T> tuple type
* @param stream TStream to add deadtime filter to
* @param deadtimePeriod the deadtime period in {@code unit}
* @param unit the {@link TimeUnit} to apply to {@code deadtimePeriod}
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/analytics/sensors/src/main/java/quarks/analytics/sensors/Range.java
----------------------------------------------------------------------
diff --git a/analytics/sensors/src/main/java/quarks/analytics/sensors/Range.java b/analytics/sensors/src/main/java/quarks/analytics/sensors/Range.java
index 262940a..e05e70c 100644
--- a/analytics/sensors/src/main/java/quarks/analytics/sensors/Range.java
+++ b/analytics/sensors/src/main/java/quarks/analytics/sensors/Range.java
@@ -163,10 +163,12 @@ public final class Range<T extends Comparable<?>> implements Predicate<T>, Seria
* <p>
* See {@link Ranges} for a collection of convenience constructors.
*
+ * @param <T> a Comparable type
* @param lowerEndpoint null for an infinite value (and lbt must be OPEN)
* @param lbt {@link BoundType} for the lowerEndpoint
* @param upperEndpoint null for an infinite value (and ubt must be OPEN)
* @param ubt {@link BoundType} for the upperEndpoint
+ * @return the Range
*/
public static <T extends Comparable<?>> Range<T> range(T lowerEndpoint, BoundType lbt, T upperEndpoint, BoundType ubt) {
// matchs Guava Range.range param order
@@ -372,11 +374,13 @@ public final class Range<T extends Comparable<?>> implements Predicate<T>, Seria
* <p>
* See {@link Ranges} for a collection of valueOf methods
* for several types of {@code T}.
- *
+ *
+ * @param <T> a Comparable type
* @param toStringValue value from toString() or has the same syntax.
* @param fromString function to create a T from its String value from
* the parsed toStringValue. Should throw an IllegalArgumentException
* if unable to perform the conversion.
+ * @return the Range
* @throws IllegalArgumentException if unable to parse or convert to
* endpoint in toStringValue to a T.
*/
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/analytics/sensors/src/main/java/quarks/analytics/sensors/Ranges.java
----------------------------------------------------------------------
diff --git a/analytics/sensors/src/main/java/quarks/analytics/sensors/Ranges.java b/analytics/sensors/src/main/java/quarks/analytics/sensors/Ranges.java
index 529b9b3..fddc45a 100644
--- a/analytics/sensors/src/main/java/quarks/analytics/sensors/Ranges.java
+++ b/analytics/sensors/src/main/java/quarks/analytics/sensors/Ranges.java
@@ -32,6 +32,11 @@ public final class Ranges {
* Create a Range (lowerEndpoint..upperEndpoint) (both exclusive/OPEN)
* <p>
* Same as {@code Range.range(BoundType.OPEN, lowerEndpoint, upperEndpoint, BoundType.OPEN)}
+ *
+ * @param <T> Endpoint type
+ * @param lowerEndpoint the endpoint
+ * @param upperEndpoint the endpoint
+ * @return the Range
*/
public static <T extends Comparable<?>> Range<T> open(T lowerEndpoint, T upperEndpoint) {
return Range.range(lowerEndpoint, BoundType.OPEN, upperEndpoint, BoundType.OPEN);
@@ -41,6 +46,11 @@ public final class Ranges {
* Create a Range [lowerEndpoint..upperEndpoint] (both inclusive/CLOSED)
* <p>
* Same as {@code Range.range(BoundType.CLOSED, lowerEndpoint, upperEndpoint, BoundType.CLOSED)}
+ *
+ * @param <T> Endpoint type
+ * @param lowerEndpoint the endpoint
+ * @param upperEndpoint the endpoint
+ * @return the Range
*/
public static <T extends Comparable<?>> Range<T> closed(T lowerEndpoint, T upperEndpoint) {
return Range.range(lowerEndpoint, BoundType.CLOSED, upperEndpoint, BoundType.CLOSED);
@@ -48,6 +58,11 @@ public final class Ranges {
/**
* Create a Range (lowerEndpoint..upperEndpoint] (exclusive/OPEN,inclusive/CLOSED)
+ *
+ * @param <T> Endpoint type
+ * @param lowerEndpoint the endpoint
+ * @param upperEndpoint the endpoint
+ * @return the Range
*/
public static <T extends Comparable<?>> Range<T> openClosed(T lowerEndpoint, T upperEndpoint) {
return Range.range(lowerEndpoint, BoundType.OPEN, upperEndpoint, BoundType.CLOSED);
@@ -55,6 +70,11 @@ public final class Ranges {
/**
* Create a Range [lowerEndpoint..upperEndpoint) (inclusive/CLOSED,exclusive/OPEN)
+ *
+ * @param <T> Endpoint type
+ * @param lowerEndpoint the endpoint
+ * @param upperEndpoint the endpoint
+ * @return the Range
*/
public static <T extends Comparable<?>> Range<T> closedOpen(T lowerEndpoint, T upperEndpoint) {
return Range.range(lowerEndpoint, BoundType.CLOSED, upperEndpoint, BoundType.OPEN);
@@ -62,6 +82,10 @@ public final class Ranges {
/**
* Create a Range (lowerEndpoint..*) (exclusive/OPEN)
+ *
+ * @param <T> Endpoint type
+ * @param lowerEndpoint the endpoint
+ * @return the Range
*/
public static <T extends Comparable<?>> Range<T> greaterThan(T lowerEndpoint) {
return Range.range(lowerEndpoint, BoundType.OPEN, null, BoundType.OPEN);
@@ -69,6 +93,10 @@ public final class Ranges {
/**
* Create a Range [lowerEndpoint..*) (inclusive/CLOSED)
+ *
+ * @param <T> Endpoint type
+ * @param lowerEndpoint the endpoint
+ * @return the Range
*/
public static <T extends Comparable<?>> Range<T> atLeast(T lowerEndpoint) {
return Range.range(lowerEndpoint, BoundType.CLOSED, null, BoundType.OPEN);
@@ -76,6 +104,10 @@ public final class Ranges {
/**
* Create a Range (*..upperEndpoint) (exclusive/OPEN)
+ *
+ * @param <T> Endpoint type
+ * @param upperEndpoint the endpoint
+ * @return the Range
*/
public static <T extends Comparable<?>> Range<T> lessThan(T upperEndpoint) {
return Range.range(null, BoundType.OPEN, upperEndpoint, BoundType.OPEN);
@@ -83,6 +115,10 @@ public final class Ranges {
/**
* Create a Range (*..upperEndpoint] (inclusive/CLOSED)
+ *
+ * @param <T> Endpoint type
+ * @param upperEndpoint the endpoint
+ * @return the Range
*/
public static <T extends Comparable<?>> Range<T> atMost(T upperEndpoint) {
return Range.range(null, BoundType.OPEN, upperEndpoint, BoundType.CLOSED);
@@ -90,6 +126,10 @@ public final class Ranges {
/**
* Create a Range [endpoint..endpoint] (both inclusive/CLOSED)
+ *
+ * @param <T> Endpoint type
+ * @param endpoint the endpoint
+ * @return the Range
*/
public static <T extends Comparable<?>> Range<T> singleton(T endpoint) {
return Range.range(endpoint, BoundType.CLOSED, endpoint, BoundType.CLOSED);
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/api/execution/src/main/java/quarks/execution/Configs.java
----------------------------------------------------------------------
diff --git a/api/execution/src/main/java/quarks/execution/Configs.java b/api/execution/src/main/java/quarks/execution/Configs.java
index 7e1e988..4d80d32 100644
--- a/api/execution/src/main/java/quarks/execution/Configs.java
+++ b/api/execution/src/main/java/quarks/execution/Configs.java
@@ -26,7 +26,7 @@ package quarks.execution;
* {@linkplain quarks.execution.Submitter#submit(Object, com.google.gson.JsonObject) submitted}.
* <p>
* The configuration JSON representation is summarized in the following table:
- *
+ * </p>
* <table border=1 cellpadding=3 cellspacing=1>
* <caption>Summary of configuration properties</caption>
* <tr>
@@ -40,7 +40,6 @@ package quarks.execution;
* <td>The name of the job.</td>
* </tr>
* </table>
- * </p>
*/
public interface Configs {
/**
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/api/execution/src/main/java/quarks/execution/mbeans/PeriodMXBean.java
----------------------------------------------------------------------
diff --git a/api/execution/src/main/java/quarks/execution/mbeans/PeriodMXBean.java b/api/execution/src/main/java/quarks/execution/mbeans/PeriodMXBean.java
index cf030a1..847b77b 100644
--- a/api/execution/src/main/java/quarks/execution/mbeans/PeriodMXBean.java
+++ b/api/execution/src/main/java/quarks/execution/mbeans/PeriodMXBean.java
@@ -49,11 +49,14 @@ public interface PeriodMXBean {
/**
* Set the period.
+ * @param period the period
*/
public void setPeriod(long period);
/**
* Set the period and unit
+ * @param period the period
+ * @param unit the {@link TimeUnit} of {@code period}
*/
public void setPeriod(long period, TimeUnit unit);
}
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/api/execution/src/main/java/quarks/execution/services/ControlService.java
----------------------------------------------------------------------
diff --git a/api/execution/src/main/java/quarks/execution/services/ControlService.java b/api/execution/src/main/java/quarks/execution/services/ControlService.java
index c7888f6..64d6bd7 100644
--- a/api/execution/src/main/java/quarks/execution/services/ControlService.java
+++ b/api/execution/src/main/java/quarks/execution/services/ControlService.java
@@ -39,7 +39,7 @@ package quarks.execution.services;
* </P>
* <P>
* An instance of a control service MBean is defined by its:
- *
+ * </P>
* <UL>
* <LI> A type </LI>
* <LI> A identifier - Unique within the current execution context.</LI>
@@ -48,6 +48,7 @@ package quarks.execution.services;
* <LI> A Java interface - This defines what operations can be executed
* against the control MBean.</LI>
* </UL>
+ * <P>
* A remote system should be able to specify an operation on an
* control server MBean though its alias and type. For example
* an application might be submitted with a fixed name
@@ -72,7 +73,8 @@ public interface ControlService {
/**
* Register a control MBean.
- *
+ *
+ * @param <T> Control MBean type
* @param type Type of the control MBean.
* @param id
* Unique identifier for the control MBean.
@@ -89,12 +91,14 @@ public interface ControlService {
/**
* Unregister a control bean registered by {@link #registerControl(String, String, String, Class, Object)}
+ * @param controlId control's registration identifier returned by {@code registerControl}
*/
void unregister(String controlId);
/**
* Return a control Mbean registered with this service.
*
+ * @param <T> Control MBean type
* @param type Type of the control MBean.
* @param alias Alias for the control MBean.
* @param controlInterface
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/api/execution/src/main/java/quarks/execution/services/Controls.java
----------------------------------------------------------------------
diff --git a/api/execution/src/main/java/quarks/execution/services/Controls.java b/api/execution/src/main/java/quarks/execution/services/Controls.java
index a41b196..7629b8b 100644
--- a/api/execution/src/main/java/quarks/execution/services/Controls.java
+++ b/api/execution/src/main/java/quarks/execution/services/Controls.java
@@ -45,7 +45,7 @@ public class Controls {
* <LI>Any enumeration</LI>
* </UL>
* </UL>
- * @param controlInterface
+ * @param controlInterface class of the control interface
* @return True
*/
public static boolean isControlServiceMBean(Class<?> controlInterface) {
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/api/execution/src/main/java/quarks/execution/services/JobRegistryService.java
----------------------------------------------------------------------
diff --git a/api/execution/src/main/java/quarks/execution/services/JobRegistryService.java b/api/execution/src/main/java/quarks/execution/services/JobRegistryService.java
index d379f17..684a427 100644
--- a/api/execution/src/main/java/quarks/execution/services/JobRegistryService.java
+++ b/api/execution/src/main/java/quarks/execution/services/JobRegistryService.java
@@ -31,12 +31,12 @@ import quarks.function.BiConsumer;
* registered jobs, as well as register listeners which are notified on job
* registrations, removals, and updates.
* The following event types are sent to registered listeners:
+ * </p>
* <ul>
* <li>An {@link EventType#ADD} event is sent when a job is added.</li>
* <li>An {@link EventType#REMOVE} event is sent when a job is removed.</li>
* <li>An {@link EventType#UPDATE} event is sent when a job is updated.</li>
* </ul>
- * <p>
* <h3>Event dispatch</h3>
* If a listener invocation throws an Exception, then the exception
* will not prevent the remaining listeners from being invoked. However,
@@ -89,6 +89,7 @@ public interface JobRegistryService {
/**
* Returns a job given its identifier.
*
+ * @param id job identifier
* @return the job or {@code null} if no job is registered with that
* identifier.
*/
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/api/execution/src/main/java/quarks/execution/services/RuntimeServices.java
----------------------------------------------------------------------
diff --git a/api/execution/src/main/java/quarks/execution/services/RuntimeServices.java b/api/execution/src/main/java/quarks/execution/services/RuntimeServices.java
index be8d950..ecadfa7 100644
--- a/api/execution/src/main/java/quarks/execution/services/RuntimeServices.java
+++ b/api/execution/src/main/java/quarks/execution/services/RuntimeServices.java
@@ -29,6 +29,7 @@ public interface RuntimeServices {
* Get a service for this invocation.
* <P>
* These services must be provided by all implementations:
+ * </P>
* <UL>
* <LI>
* {@code java.util.concurrent.ThreadFactory} - Thread factory, runtime code should
@@ -39,9 +40,8 @@ public interface RuntimeServices {
* execute asynchronous and repeating tasks using this scheduler.
* </LI>
* </UL>
- * </P>
- *
*
+ * @param <T> service class type
* @param serviceClass Type of the service required.
* @return Service of type implementing {@code serviceClass} if the
* container this invocation runs in supports that service,
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/api/execution/src/main/java/quarks/execution/services/ServiceContainer.java
----------------------------------------------------------------------
diff --git a/api/execution/src/main/java/quarks/execution/services/ServiceContainer.java b/api/execution/src/main/java/quarks/execution/services/ServiceContainer.java
index 88add9b..92c58a9 100644
--- a/api/execution/src/main/java/quarks/execution/services/ServiceContainer.java
+++ b/api/execution/src/main/java/quarks/execution/services/ServiceContainer.java
@@ -57,6 +57,7 @@ public class ServiceContainer {
* container has previously contained a service for the class,
* the old value is replaced by the specified value.
*
+ * @param <T> service class type
* @param serviceClass the class of service to add.
* @param service service to add to this container.
* @return the previous value associated with {@code serviceClass}, or
@@ -71,6 +72,7 @@ public class ServiceContainer {
/**
* Removes the specified service from this {@code ServiceContainer}.
*
+ * @param <T> service class type
* @param serviceClass the class of service to remove.
* @return the service previously associated with the service class, or
* {@code null} if there was no registered service.
@@ -85,6 +87,7 @@ public class ServiceContainer {
* mapped, or {@code null} if this {@code ServiceContainer} contains no
* service for that key.
*
+ * @param <T> service class type
* @param serviceClass the class whose associated service is to be returned
* @return the service instance mapped to the specified service class, or
* {@code null} if no service is registered for the class.
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/api/function/src/main/java/quarks/function/BiConsumer.java
----------------------------------------------------------------------
diff --git a/api/function/src/main/java/quarks/function/BiConsumer.java b/api/function/src/main/java/quarks/function/BiConsumer.java
index 5004a07..1482353 100644
--- a/api/function/src/main/java/quarks/function/BiConsumer.java
+++ b/api/function/src/main/java/quarks/function/BiConsumer.java
@@ -22,6 +22,8 @@ import java.io.Serializable;
/**
* Consumer function that takes two arguments.
+ * @param <T> Type of the first function argument
+ * @param <U> Type of the second function argument
*/
public interface BiConsumer<T,U> extends Serializable {
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/api/function/src/main/java/quarks/function/Functions.java
----------------------------------------------------------------------
diff --git a/api/function/src/main/java/quarks/function/Functions.java b/api/function/src/main/java/quarks/function/Functions.java
index 893be1b..acb271d 100644
--- a/api/function/src/main/java/quarks/function/Functions.java
+++ b/api/function/src/main/java/quarks/function/Functions.java
@@ -47,6 +47,7 @@ public class Functions {
/**
* Returns the identity function that returns its single argument.
+ * @param <T> tuple type
* @return Identity function that returns its single argument.
*/
@SuppressWarnings("unchecked")
@@ -56,6 +57,7 @@ public class Functions {
/**
* Returns a constant function that returns zero (0).
+ * @param <T> tuple type
* @return Constant function that returns zero (0).
*/
@SuppressWarnings("unchecked")
@@ -67,7 +69,8 @@ public class Functions {
* Returns a constant function that returns zero (0).
* This is identical to {@link #zero()} but is more
* readable when applied as a key function.
- * @return Constant function that returns zero (0).
+ * @param <T> tuple type
+ * @return Constant function that returns zero (0).
*/
public static <T> Function<T,Integer> unpartitioned() {
return zero();
@@ -97,6 +100,8 @@ public class Functions {
* If {@code function} implements {@code AutoCloseable} then
* the function is assumed to be stateful and a thread-safe
* version is returned.
+ * @param <T> source tuple type
+ * @param <R> result tuple type
* @param function Function to return a thread-safe version of.
* @return A thread-safe function
*/
@@ -134,6 +139,7 @@ public class Functions {
* If {@code function} implements {@code AutoCloseable} then
* the function is assumed to be stateful and a thread-safe
* version is returned.
+ * @param <T> tuple type
* @param function Function to return a thread-safe version of.
* @return A thread-safe function
*/
@@ -171,6 +177,7 @@ public class Functions {
* If {@code function} implements {@code AutoCloseable} then
* the function is assumed to be stateful and a thread-safe
* version is returned.
+ * @param <T> tuple type
* @param function Function to return a thread-safe version of.
* @return A thread-safe function
*/
@@ -209,6 +216,9 @@ public class Functions {
* If {@code function} implements {@code AutoCloseable} then
* the function is assumed to be stateful and a thread-safe
* version is returned.
+ * @param <T> Type of function's first argument
+ * @param <U> Type of function's second argument
+ * @param <R> Type of function's third argument
* @param function Function to return a thread-safe version of.
* @return A thread-safe function
*/
@@ -330,6 +340,7 @@ public class Functions {
* This can be used to delay the execution of the consumer
* until some time in the future using an executor service.
*
+ * @param <T> tuple type
* @param consumer Function to be applied to {@code value}.
* @param value Value to be consumed.
*
@@ -346,7 +357,7 @@ public class Functions {
* @param finalAction Action to be invoked after {@code action.run()} is called.
* @return {@code Runnable} that invokes {@code action.run()} and then {@code finalAction.run()}
*/
- public static <T> Runnable runWithFinal(Runnable action, Runnable finalAction) {
+ public static Runnable runWithFinal(Runnable action, Runnable finalAction) {
return () -> { try {action.run(); } finally {finalAction.run();}};
}
@@ -358,6 +369,7 @@ public class Functions {
/**
* A Consumer that discards all items passed to it.
+ * @param <T> tuple type
* @return A Consumer that discards all items passed to it.
*/
@SuppressWarnings("unchecked")
@@ -377,6 +389,7 @@ public class Functions {
/**
* A Predicate that is always true
+ * @param <T> tuple type
* @return A Predicate that is always true.
*/
@SuppressWarnings("unchecked")
@@ -386,6 +399,7 @@ public class Functions {
/**
* A Predicate that is always false
+ * @param <T> tuple type
* @return A Predicate that is always false.
*/
@SuppressWarnings("unchecked")
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/api/function/src/main/java/quarks/function/WrappedFunction.java
----------------------------------------------------------------------
diff --git a/api/function/src/main/java/quarks/function/WrappedFunction.java b/api/function/src/main/java/quarks/function/WrappedFunction.java
index 5132fe2..4519052 100644
--- a/api/function/src/main/java/quarks/function/WrappedFunction.java
+++ b/api/function/src/main/java/quarks/function/WrappedFunction.java
@@ -42,6 +42,7 @@ public abstract class WrappedFunction<F> implements Serializable {
/**
* Unwrap to find the outermost function that is an instance of {@code clazz}.
+ * @param <C> Type of class.
* @param clazz Implementation class to search for.
* @return outermost function that is an instance of {@code clazz},
* {@code null} if {@code clazz} is not implemented by {@code this}
@@ -58,6 +59,7 @@ public abstract class WrappedFunction<F> implements Serializable {
* If a function object is not an instance of {@code clazz} but is an instance of
* {@code WrappedFunction} then the test is repeated on the value of {@link #f()}.
*
+ * @param <C> Type of class.
* @param clazz Implementation class to search for.
* @param wf Function to unwrap
* @return outermost function that implements {@code clazz}, {@code null} if
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/api/graph/src/main/java/quarks/graph/Connector.java
----------------------------------------------------------------------
diff --git a/api/graph/src/main/java/quarks/graph/Connector.java b/api/graph/src/main/java/quarks/graph/Connector.java
index 59002a6..2cf9ca1 100644
--- a/api/graph/src/main/java/quarks/graph/Connector.java
+++ b/api/graph/src/main/java/quarks/graph/Connector.java
@@ -93,7 +93,8 @@ public interface Connector<T> {
* connections. This method may be called multiple times to insert multiple
* peeks. Each tuple submitted to this output port will be seen by all peeks
* in order of their insertion, starting with the first peek inserted.
- *
+ *
+ * @param <N> Peek oplet type
* @param oplet
* Oplet to insert.
* @return {@code output}
@@ -122,11 +123,11 @@ public interface Connector<T> {
* <p>
* The alias must be unique within the topology.
* The alias may be used in various contexts:
+ * </p>
* <ul>
* <li>Runtime control services for the Connector (stream/outputport)
* are registered with this alias.</li>
* </ul>
- * </p>
*
* @param alias the alias
* @throws IllegalStateException if the an alias has already been set
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/api/graph/src/main/java/quarks/graph/Graph.java
----------------------------------------------------------------------
diff --git a/api/graph/src/main/java/quarks/graph/Graph.java b/api/graph/src/main/java/quarks/graph/Graph.java
index 7a0dc0a..7e01890 100644
--- a/api/graph/src/main/java/quarks/graph/Graph.java
+++ b/api/graph/src/main/java/quarks/graph/Graph.java
@@ -43,6 +43,9 @@ public interface Graph {
* Add a new unconnected {@code Vertex} into the graph.
* <p>
*
+ * @param <N> an Oplet type
+ * @param <C> tuple type of input streams
+ * @param <P> tuple type of output streams
* @param oplet the oplet to associate with the new vertex
* @param inputs the number of input connectors for the new vertex
* @param outputs the number of output connectors for the new vertex
@@ -55,6 +58,8 @@ public interface Graph {
* specified source {@link Oplet}.
* <p>
* The {@code Vertex} for the oplet has 0 input connectors and one output connector.
+ * @param <N> a Source type
+ * @param <P> tuple type
* @param oplet the source oplet
* @return the output connector for the newly created vertex.
*/
@@ -68,7 +73,10 @@ public interface Graph {
* An {@link Edge} is created connecting the specified output connector to
* the new vertice's input connector.
*
- * @param output
+ * @param <N> an Oplet type
+ * @param <C> tuple type of input streams
+ * @param <P> tuple type of output streams
+ * @param output the output connector to connect to the vertice's input connector
* @param oplet the oplet to associate with the new {@code Vertex}
* @return the output connector for the new {@code Vertex}
*/
@@ -96,6 +104,7 @@ public interface Graph {
/**
* Return an unmodifiable view of all edges in this graph.
+ * @return the collection
*/
Collection<Edge> getEdges();
}
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/api/oplet/src/main/java/quarks/oplet/Oplet.java
----------------------------------------------------------------------
diff --git a/api/oplet/src/main/java/quarks/oplet/Oplet.java b/api/oplet/src/main/java/quarks/oplet/Oplet.java
index fac6d00..5f5af81 100644
--- a/api/oplet/src/main/java/quarks/oplet/Oplet.java
+++ b/api/oplet/src/main/java/quarks/oplet/Oplet.java
@@ -38,8 +38,8 @@ public interface Oplet<I, O> extends AutoCloseable {
/**
* Initialize the oplet.
*
- * @param context
- * @throws Exception
+ * @param context the OpletContext
+ * @throws Exception on failure
*/
void initialize(OpletContext<I, O> context) throws Exception;
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/api/oplet/src/main/java/quarks/oplet/OpletContext.java
----------------------------------------------------------------------
diff --git a/api/oplet/src/main/java/quarks/oplet/OpletContext.java b/api/oplet/src/main/java/quarks/oplet/OpletContext.java
index 3c19651..930539e 100644
--- a/api/oplet/src/main/java/quarks/oplet/OpletContext.java
+++ b/api/oplet/src/main/java/quarks/oplet/OpletContext.java
@@ -31,8 +31,8 @@ import quarks.function.Consumer;
* {@link #getOutputs() output ports} for tuple submission
* and {@link #getJobContext() job} information.
*
- * @param <I>
- * @param <O>
+ * @param <I> tuple type of input streams
+ * @param <O> tuple type of output streams
*/
public interface OpletContext<I, O> extends RuntimeServices {
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/api/oplet/src/main/java/quarks/oplet/core/FanIn.java
----------------------------------------------------------------------
diff --git a/api/oplet/src/main/java/quarks/oplet/core/FanIn.java b/api/oplet/src/main/java/quarks/oplet/core/FanIn.java
index b1c5f48..80c1ab0 100644
--- a/api/oplet/src/main/java/quarks/oplet/core/FanIn.java
+++ b/api/oplet/src/main/java/quarks/oplet/core/FanIn.java
@@ -35,6 +35,9 @@ import quarks.oplet.OpletContext;
* {@code receiver} either returns a tuple to emit on the output
* stream or null.
* </P>
+ *
+ * @param <T> Tuple type of input streams
+ * @param <U> Tuple type of output stream
*/
public class FanIn<T,U> extends AbstractOplet<T, U> {
private BiFunction<T, Integer, U> receiver;
@@ -67,7 +70,7 @@ public class FanIn<T,U> extends AbstractOplet<T, U> {
/**
* Set the receiver function. Must be called no later than as part
* of {@link #initialize(OpletContext)}.
- * @param receiver
+ * @param receiver function to receive tuples
*/
protected void setReceiver(BiFunction<T, Integer, U> receiver) {
this.receiver = receiver;
@@ -85,7 +88,7 @@ public class FanIn<T,U> extends AbstractOplet<T, U> {
/**
* Create a Consumer for the input port that invokes the
* receiver and submits a generated tuple, if any, to the output.
- * @param iportIndex
+ * @param iportIndex index of the input port
* @return the Consumer
*/
protected Consumer<T> consumer(int iportIndex) {
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/api/oplet/src/main/java/quarks/oplet/core/Union.java
----------------------------------------------------------------------
diff --git a/api/oplet/src/main/java/quarks/oplet/core/Union.java b/api/oplet/src/main/java/quarks/oplet/core/Union.java
index e33257a..9f0c711 100644
--- a/api/oplet/src/main/java/quarks/oplet/core/Union.java
+++ b/api/oplet/src/main/java/quarks/oplet/core/Union.java
@@ -26,6 +26,8 @@ import quarks.oplet.OpletContext;
*
* Processing for each input is identical
* and just submits the tuple to the single output.
+ *
+ * @param <T> Tuple type
*/
public final class Union<T> extends FanIn<T, T> {
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/api/oplet/src/main/java/quarks/oplet/plumbing/PressureReliever.java
----------------------------------------------------------------------
diff --git a/api/oplet/src/main/java/quarks/oplet/plumbing/PressureReliever.java b/api/oplet/src/main/java/quarks/oplet/plumbing/PressureReliever.java
index aa6efee..0f240d8 100644
--- a/api/oplet/src/main/java/quarks/oplet/plumbing/PressureReliever.java
+++ b/api/oplet/src/main/java/quarks/oplet/plumbing/PressureReliever.java
@@ -54,6 +54,7 @@ import quarks.window.Windows;
* Tuples are <B>discarded and not</B> submitted to the
* output port if the downstream processing cannot keep up
* the incoming tuple rate.
+ * </P>
* <UL>
* <LI>For a {@link #PressureReliever(int, Function) count}
* {@code PressureReliever} up to last (most recent) {@code N} tuples
@@ -63,9 +64,7 @@ import quarks.window.Windows;
* <BR> If when an input tuple is processed the window partition contains N tuples, then
* the first (oldest) tuple in the partition is discarded before the input tuple is inserted into the window.
* </UL>
- * </P>
* <P>
- * <BR>
* Insertion of the oplet into a stream disconnects the
* upstream processing from the downstream processing,
* so that downstream processing is executed on a different
@@ -133,7 +132,6 @@ public class PressureReliever<T, K> extends Pipe<T, T> {
*
* @param t
* @param v
- * @return
*/
@Override
public void accept(Partition<T, K, LinkedList<T>> partition, T tuple) {
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/api/topology/src/main/java/quarks/topology/TSink.java
----------------------------------------------------------------------
diff --git a/api/topology/src/main/java/quarks/topology/TSink.java b/api/topology/src/main/java/quarks/topology/TSink.java
index 9a5c92e..db59ca5 100644
--- a/api/topology/src/main/java/quarks/topology/TSink.java
+++ b/api/topology/src/main/java/quarks/topology/TSink.java
@@ -21,6 +21,7 @@ package quarks.topology;
/**
* Termination point (sink) for a stream.
*
+ * @param <T> Tuple type
*/
public interface TSink<T> extends TopologyElement {
/**
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/api/topology/src/main/java/quarks/topology/TStream.java
----------------------------------------------------------------------
diff --git a/api/topology/src/main/java/quarks/topology/TStream.java b/api/topology/src/main/java/quarks/topology/TStream.java
index f4d1a44..57888a6 100644
--- a/api/topology/src/main/java/quarks/topology/TStream.java
+++ b/api/topology/src/main/java/quarks/topology/TStream.java
@@ -73,6 +73,7 @@ public interface TStream<T> extends TopologyElement {
* <P>
* Examples of filtering out all empty strings from stream {@code s} of type
* {@code String}
+ * </P>
*
* <pre>
* <code>
@@ -82,8 +83,6 @@ public interface TStream<T> extends TopologyElement {
* </code>
* </pre>
*
- * </P>
- *
* @param predicate
* Filtering logic to be executed against each tuple.
* @return Filtered stream
@@ -101,6 +100,7 @@ public interface TStream<T> extends TopologyElement {
* <P>
* Examples of transforming a stream containing numeric values as
* {@code String} objects into a stream of {@code Double} values.
+ * </P>
*
* <pre>
* <code>
@@ -115,7 +115,7 @@ public interface TStream<T> extends TopologyElement {
* </code>
* </pre>
*
- * </P>
+ * @param <U> Tuple type of output stream
* @param mapper
* Mapping logic to be executed against each tuple.
* @return Stream that will contain tuples of type {@code U} mapped from this
@@ -138,6 +138,7 @@ public interface TStream<T> extends TopologyElement {
* Examples of mapping a stream containing lines of text into a stream
* of words split out from each line. The order of the words in the stream
* will match the order of the words in the lines.
+ * </P>
*
* <pre>
* <code>
@@ -148,7 +149,6 @@ public interface TStream<T> extends TopologyElement {
* </code>
* </pre>
*
- * </P>
* @param <U> Type of mapped input tuples.
* @param mapper
* Mapper logic to be executed against each tuple.
@@ -164,12 +164,12 @@ public interface TStream<T> extends TopologyElement {
* <P>
* For each tuple on the stream, {@code splitter.applyAsInt(tuple)} is
* called. The return value {@code r} determines the destination stream:
+ * </P>
*
* <pre>
* if r < 0 the tuple is discarded
* else it is sent to the stream at position (r % n) in the returned array.
* </pre>
- * </P>
*
* <P>
* Each split {@code TStream} is exposed by the API. The user has full
@@ -183,16 +183,16 @@ public interface TStream<T> extends TopologyElement {
* for its stream. {@code split()} is more efficient. Each tuple is analyzed
* only once by a single {@code splitter} instance to identify the
* destination stream. For example, these are logically equivalent:
- *
+ * </P>
* <pre>
* List<TStream<String>> streams = stream.split(2, tuple -> tuple.length());
*
* TStream<String> stream0 = stream.filter(tuple -> (tuple.length() % 2) == 0);
* TStream<String> stream1 = stream.filter(tuple -> (tuple.length() % 2) == 1);
* </pre>
- * </P>
* <P>
* Example of splitting a stream of log records by their level attribute:
+ * </P>
*
* <pre>
* <code>
@@ -210,7 +210,6 @@ public interface TStream<T> extends TopologyElement {
* splits.get(2). ... // "other" log record processing pipeline
* </code>
* </pre>
- * </P>
*
* @param n
* the number of output streams
@@ -227,6 +226,7 @@ public interface TStream<T> extends TopologyElement {
* Split a stream's tuples among {@code enumClass.size} streams as specified by
* {@code splitter}.
*
+ * @param <E> Enum type
* @param enumClass
* enum data to split
* @param splitter
@@ -257,9 +257,11 @@ public interface TStream<T> extends TopologyElement {
* <p>
* If {@code sinker} implements {@link AutoCloseable}, its {@code close()}
* method will be called when the topology's execution is terminated.
+ * </P>
* <P>
* Example of terminating a stream of {@code String} tuples by printing them
* to {@code System.out}.
+ * </P>
*
* <pre>
* <code>
@@ -268,8 +270,6 @@ public interface TStream<T> extends TopologyElement {
* </code>
* </pre>
*
- * </P>
- *
* @param sinker
* Logic to be executed against each tuple on this stream.
* @return sink element representing termination of this stream.
@@ -328,6 +328,7 @@ public interface TStream<T> extends TopologyElement {
*
* <P>
* Example of modifying a stream {@code String} values by adding the suffix '{@code extra}'.
+ * </P>
*
* <pre>
* <code>
@@ -336,7 +337,6 @@ public interface TStream<T> extends TopologyElement {
* </code>
* </pre>
*
- * </P>
* <P>
* This method is equivalent to
* {@code map(Function<T,T> modifier}).
@@ -432,7 +432,7 @@ public interface TStream<T> extends TopologyElement {
* {@code other}. A stream cannot be unioned with itself, in this case
* {@code this} will be returned.
*
- * @param other
+ * @param other the other stream
* @return A stream that is the union of {@code this} and {@code other}.
*/
TStream<T> union(TStream<T> other);
@@ -473,10 +473,10 @@ public interface TStream<T> extends TopologyElement {
* <p>
* The alias must be unique within the topology.
* The alias may be used in various contexts:
+ * </p>
* <ul>
* <li>Runtime control services for the stream are registered with this alias.</li>
* </ul>
- * </p>
*
* @param alias an alias for the stream.
* @return this
@@ -498,6 +498,9 @@ public interface TStream<T> extends TopologyElement {
* passed into {@code joiner} and the return value is submitted to the
* returned stream. If call returns null then no tuple is submitted.
*
+ * @param <J> Tuple type of result stream
+ * @param <U> Tuple type of window to join with
+ * @param <K> Key type
* @param keyer Key function for this stream to match the window's key.
* @param window Keyed window to join this stream with.
* @param joiner Join function.
@@ -525,6 +528,9 @@ public interface TStream<T> extends TopologyElement {
* passed into {@code joiner} and the return value is submitted to the
* returned stream. If call returns null then no tuple is submitted.
* </P>
+ * @param <J> Tuple type of result stream
+ * @param <U> Tuple type of stream to join with
+ * @param <K> Key type
* @param keyer Key function for this stream
* @param lastStream Stream to join with.
* @param lastStreamKeyer Key function for {@code lastStream}
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/api/topology/src/main/java/quarks/topology/TWindow.java
----------------------------------------------------------------------
diff --git a/api/topology/src/main/java/quarks/topology/TWindow.java b/api/topology/src/main/java/quarks/topology/TWindow.java
index 27af37c..82b34da 100644
--- a/api/topology/src/main/java/quarks/topology/TWindow.java
+++ b/api/topology/src/main/java/quarks/topology/TWindow.java
@@ -55,7 +55,8 @@ public interface TWindow<T, K> extends TopologyElement {
* Thus the returned stream will contain a sequence of tuples that where the
* most recent tuple represents the most up to date aggregation of a
* partition.
- *
+ *
+ * @param <U> Tuple type
* @param aggregator
* Logic to aggregation a partition.
* @return A stream that contains the latest aggregations of partitions in this window.
@@ -76,11 +77,13 @@ public interface TWindow<T, K> extends TopologyElement {
* the tuples in any subsequent batch. After a partition is batched, its
* contents are cleared.
*
+ * @param <U> Tuple type
* @param batcher
* Logic to aggregation a partition.
* @return A stream that contains the latest aggregations of partitions in this window.
*/
<U> TStream<U> batch(BiFunction<List<T>, K, U> batcher);
+
/**
* Returns the key function used to map tuples to partitions.
* @return Key function used to map tuples to partitions.
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/api/topology/src/main/java/quarks/topology/Topology.java
----------------------------------------------------------------------
diff --git a/api/topology/src/main/java/quarks/topology/Topology.java b/api/topology/src/main/java/quarks/topology/Topology.java
index b5115ec..f7d8234 100644
--- a/api/topology/src/main/java/quarks/topology/Topology.java
+++ b/api/topology/src/main/java/quarks/topology/Topology.java
@@ -58,6 +58,7 @@ public interface Topology extends TopologyElement {
* If {@code data} implements {@link AutoCloseable}, its {@code close()}
* method will be called when the topology's execution is terminated.
*
+ * @param <T> Tuple type
* @param data
* Function that produces that data for the stream.
* @return New stream containing the tuples from the iterator returned by
@@ -74,6 +75,7 @@ public interface Topology extends TopologyElement {
* If {@code data} implements {@link AutoCloseable}, its {@code close()}
* method will be called when the topology's execution is terminated.
*
+ * @param <T> Tuple type
* @param data
* Supplier of the tuples.
* @return New stream containing the tuples from calls to {@code data.get()}
@@ -99,6 +101,7 @@ public interface Topology extends TopologyElement {
* The {@code PeriodMXBean} is registered with the {@link ControlService}
* with type {@link TStream#TYPE} and the stream's alias.
* e.g.,
+ * </p>
* <pre>{@code
* Topology t = ...
* TStream<Integer> stream = t.poll(...).alias("myStreamControlAlias");
@@ -109,10 +112,10 @@ public interface Topology extends TopologyElement {
* String alias = pollStream.getAlias();
* PeriodMXBean control = cs.getControl(TStream.TYPE, alias, PeriodMXBean.class);
* control.setPoll(period, unit);
- * }
+ * }
* }</pre>
- * </p>
- *
+ *
+ * @param <T> Tuple type
* @param data
* Function that produces that data for the stream.
* @param period
@@ -144,6 +147,7 @@ public interface Topology extends TopologyElement {
* method will be called when the topology's execution is terminated.
* </P>
*
+ * @param <T> Tuple type
* @param eventSetup handler to receive the {@code eventSubmitter}
* @return New stream containing the tuples added by {@code eventSubmitter.accept(t)}.
*
@@ -162,6 +166,7 @@ public interface Topology extends TopologyElement {
/**
* Declare a stream of objects.
+ * @param <T> Tuple type
* @param values Values that will be present on the stream.
* @return Stream containing all values in {@code values}.
*/
@@ -171,6 +176,7 @@ public interface Topology extends TopologyElement {
/**
* Declare a stream of constants from a collection.
* The returned stream will contain all the tuples in {@code tuples}.
+ * @param <T> Tuple type
* @param tuples Tuples that will be present on the stream.
* @return Stream containing all values in {@code tuples}.
*/
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/api/topology/src/main/java/quarks/topology/TopologyProvider.java
----------------------------------------------------------------------
diff --git a/api/topology/src/main/java/quarks/topology/TopologyProvider.java b/api/topology/src/main/java/quarks/topology/TopologyProvider.java
index 3b81dbb..be27aa5 100644
--- a/api/topology/src/main/java/quarks/topology/TopologyProvider.java
+++ b/api/topology/src/main/java/quarks/topology/TopologyProvider.java
@@ -26,7 +26,8 @@ public interface TopologyProvider {
/**
* Create a new topology with a given name.
- *
+ *
+ * @param name name for topology
* @return A new topology.
*/
Topology newTopology(String name);
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/api/topology/src/main/java/quarks/topology/mbeans/package-info.java
----------------------------------------------------------------------
diff --git a/api/topology/src/main/java/quarks/topology/mbeans/package-info.java b/api/topology/src/main/java/quarks/topology/mbeans/package-info.java
index 8ee5105..5db7ad1 100644
--- a/api/topology/src/main/java/quarks/topology/mbeans/package-info.java
+++ b/api/topology/src/main/java/quarks/topology/mbeans/package-info.java
@@ -30,7 +30,6 @@ under the License.
*
* <h4>Submit an Application</h4>
* Method: {@link quarks.topology.mbeans.ApplicationServiceMXBean#submit(String, String)}
- * <P>
* <table border=1 cellpadding=3 cellspacing=1>
* <caption>JSON Submit Application</caption>
* <tr>
@@ -77,6 +76,5 @@ under the License.
* job named {@code EngineTemp}.
* <BR>
* {@code {"type":"appService","alias":"quarks","op":"submit","args":["EngineTemp",{}]}}
- * </P>
*/
package quarks.topology.mbeans;
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/api/topology/src/main/java/quarks/topology/plumbing/LoadBalancedSplitter.java
----------------------------------------------------------------------
diff --git a/api/topology/src/main/java/quarks/topology/plumbing/LoadBalancedSplitter.java b/api/topology/src/main/java/quarks/topology/plumbing/LoadBalancedSplitter.java
index 746bdb8..6eaf965 100644
--- a/api/topology/src/main/java/quarks/topology/plumbing/LoadBalancedSplitter.java
+++ b/api/topology/src/main/java/quarks/topology/plumbing/LoadBalancedSplitter.java
@@ -30,7 +30,7 @@ import quarks.topology.TStream;
* This is intended to be used as an argument to {@link TStream#split(int, ToIntFunction)}.
* The splitter maintains state for {@code numChannels} splitter channels,
* tracking whether a channel is busy or free.
- * <P></P>
+ * </P><P>
* {@link #applyAsInt(Object) applyAsInt} awaits a free channel, marks
* the channel as busy, and forwards the tuple to the channel. The end
* of the channel's pipeline must call {@link #channelDone(int)} to
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/api/topology/src/main/java/quarks/topology/plumbing/PlumbingStreams.java
----------------------------------------------------------------------
diff --git a/api/topology/src/main/java/quarks/topology/plumbing/PlumbingStreams.java b/api/topology/src/main/java/quarks/topology/plumbing/PlumbingStreams.java
index f2e3eb8..01ca30a 100644
--- a/api/topology/src/main/java/quarks/topology/plumbing/PlumbingStreams.java
+++ b/api/topology/src/main/java/quarks/topology/plumbing/PlumbingStreams.java
@@ -62,7 +62,8 @@ public class PlumbingStreams {
* 100ms before forwarding t2. Hence the overall delay between forwarding
* t1 and t2 is 180ms.
* See {@link #blockingThrottle(long, TimeUnit) blockingThrottle}.
- *
+ *
+ * @param <T> Tuple type
* @param stream Stream t
* @param delay Amount of time to delay a tuple.
* @param unit Time unit for {@code delay}.
@@ -216,7 +217,8 @@ public class PlumbingStreams {
* Implementations may throw {@code OutOfMemoryExceptions}
* if the processing against returned stream cannot keep up
* with the arrival rate of tuples on {@code stream}.
- *
+ *
+ * @param <T> Tuple type
* @param stream Stream to be isolated from downstream processing.
* @param ordered {@code true} to maintain arrival order on the returned stream,
* {@code false} to not guaranteed arrival order.
@@ -237,7 +239,8 @@ public class PlumbingStreams {
* </P><P>
* Processing of tuples occurs in the order they were received.
* </P>
- *
+ *
+ * @param <T> Tuple type
* @param stream Stream to be isolated from downstream processing.
* @param queueCapacity size of the queue between {@code stream} and
* the returned stream.
@@ -257,13 +260,13 @@ public class PlumbingStreams {
* from the supplied {@code mappers} and {@code combiner} arguments.
* </P><P>
* That is, it is logically, if not exactly, the same as:
+ * </P>
* <pre>{@code
* List<Function<TStream<T>,TStream<U>>> pipelines = new ArrayList<>();
* for (Function<T,U> mapper : mappers)
* pipelines.add(s -> s.map(mapper));
* concurrent(stream, pipelines, combiner);
* }</pre>
- * </P>
*
* @param <T> Tuple type on input stream.
* @param <U> Tuple type generated by mappers.
@@ -302,6 +305,7 @@ public class PlumbingStreams {
* and then process the next input tuple in the same manner.
* </P><P>
* Logically, instead of doing this:
+ * </P>
* <pre>{@code
* sensorReadings<T> -> A1 -> A2 -> A3 -> results<R>
* }</pre>
@@ -321,7 +325,7 @@ public class PlumbingStreams {
* |-> isolate(1) -> pipeline3 -> |
* . . .
* }</pre>
- * </P><P>
+ * <P>
* The typical use case for this is when an application has a collection
* of independent analytics to perform on each tuple and the analytics
* are sufficiently long running such that performing them concurrently
@@ -332,13 +336,14 @@ public class PlumbingStreams {
* tuples in parallel, each on a replicated processing pipeline.
* </P><P>
* Threadsafety - one of the following must be true:
+ * </P>
* <ul>
* <li>the tuples from {@code stream} are threadsafe</li>
* <li>the {@code pipelines} do not modify the input tuples</li>
* <li>the {@code pipelines} provide their own synchronization controls
* to protect concurrent modifications of the input tuples</li>
* </ul>
- * </P><P>
+ * <P>
* Logically, a thread is allocated for each of the {@code pipelines}.
* The actual degree of concurrency may be {@link TopologyProvider} dependent.
* </P>
@@ -394,6 +399,9 @@ public class PlumbingStreams {
* <P>
* Same as {@code barrier(others, 1)}
* </P>
+ * @param <T> Tuple type
+ * @param streams input streams
+ * @return the output stream
* @see #barrier(List, int)
*/
public static <T> TStream<List<T>> barrier(List<TStream<T>> streams) {
@@ -437,6 +445,8 @@ public class PlumbingStreams {
* <P>
* Same as {@code parallel(stream, width, splitter, (s,ch) -> s.map(t -> mapper.apply(t, ch))}
* </P>
+ * @param <T> Input stream tuple type
+ * @param <U> Result stream tuple type
* @param stream input stream
* @param splitter the tuple channel allocation function
* @param mapper analytic function
@@ -457,7 +467,7 @@ public class PlumbingStreams {
* partitioning tuples among the channels using {@code splitter}.
* Each channel runs a copy of {@code pipeline}.
* The resulting stream is isolated from the upstream parallel channels.
- * <P></P>
+ * </P><P>
* The ordering of tuples in {@code stream} is not maintained in the
* results from {@code parallel}.
* </P><P>
@@ -467,6 +477,7 @@ public class PlumbingStreams {
* A common splitter function is a {@link #roundRobinSplitter(int) roundRobinSplitter}.
* </P><P>
* The generated graph looks like this:
+ * </P>
* <pre>{@code
* -
* |-> isolate(10) -> pipeline-ch1 -> |
@@ -474,7 +485,6 @@ public class PlumbingStreams {
* |-> isolate(10) -> pipeline-ch3 -> |
* . . .
* }</pre>
- * </P>
*
* @param <T> Input stream tuple type
* @param <R> Result stream tuple type
@@ -526,7 +536,7 @@ public class PlumbingStreams {
* partitioning tuples among the channels in a load balanced fashion.
* Each channel runs a copy of {@code pipeline}.
* The resulting stream is isolated from the upstream parallel channels.
- * <P></P>
+ * </P><P>
* The ordering of tuples in {@code stream} is not maintained in the
* results from {@code parallel}.
* </P><P>
@@ -537,6 +547,7 @@ public class PlumbingStreams {
* A {@link LoadBalancedSplitter} is used to distribute tuples.
* </P><P>
* The generated graph looks like this:
+ * </P>
* <pre>{@code
* -
* |-> isolate(1) -> pipeline-ch1 -> peek(splitter.channelDone()) -> |
@@ -544,7 +555,7 @@ public class PlumbingStreams {
* |-> isolate(1) -> pipeline-ch3 -> peek(splitter.channelDone()) -> |
* . . .
* }</pre>
- * </P><P>
+ * <P>
* Note, this implementation requires that the splitter is used from
* only a single JVM. The {@link quarks.providers.direct.DirectProvider DirectProvider}
* provider meets this requirement.
@@ -603,6 +614,9 @@ public class PlumbingStreams {
* on successive calls to {@code roundRobinSplitter.applyAsInt()},
* returning {@code 0, 1, ..., width-1, 0, 1, ..., width-1}.
* </P>
+ * @param <T> Tuple type
+ * @param width number of splitter channels
+ * @return the splitter
* @see TStream#split(int, ToIntFunction) TStream.split
* @see PlumbingStreams#parallel(TStream, int, ToIntFunction, BiFunction) parallel
*/
@@ -633,6 +647,7 @@ public class PlumbingStreams {
* I.e., You want all of the pipelines to start processing a tuple
* at the same time and not start a new tuple until the current
* tuple had been fully processed by each of them:
+ * </P>
* <pre>{@code
* TStream<Integer> readings = ...;
* Semaphore gateControl = new Semaphore(1); // allow the first to pass through
@@ -647,7 +662,7 @@ public class PlumbingStreams {
* );
* TStream<List<Integer>> results = PlumbingStreams.concurrent(gated, pipelines, combiner);
* }</pre>
- * </P>
+ * @param <T> Tuple type
* @param stream the input stream
* @param semaphore gate control
* @return gated stream
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/api/topology/src/main/java/quarks/topology/plumbing/Valve.java
----------------------------------------------------------------------
diff --git a/api/topology/src/main/java/quarks/topology/plumbing/Valve.java b/api/topology/src/main/java/quarks/topology/plumbing/Valve.java
index 1200858..51d961e 100644
--- a/api/topology/src/main/java/quarks/topology/plumbing/Valve.java
+++ b/api/topology/src/main/java/quarks/topology/plumbing/Valve.java
@@ -34,6 +34,7 @@ import quarks.function.Predicate;
* <br>
* E.g., in a simple case, a Valve might be used to control
* whether or not logging or publishing of tuples is enabled.
+ * </p>
* <pre>{@code
* TStream<JsonObject> stream = ...;
*
@@ -43,7 +44,6 @@ import quarks.function.Predicate;
* // from some analytic or device command handler...
* valve.setOpen(true);
* }</pre>
- * </p>
*
* @param <T> tuple type
*/
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/api/topology/src/main/java/quarks/topology/tester/Condition.java
----------------------------------------------------------------------
diff --git a/api/topology/src/main/java/quarks/topology/tester/Condition.java b/api/topology/src/main/java/quarks/topology/tester/Condition.java
index 00c518d..5d5e2c4 100644
--- a/api/topology/src/main/java/quarks/topology/tester/Condition.java
+++ b/api/topology/src/main/java/quarks/topology/tester/Condition.java
@@ -21,6 +21,7 @@ package quarks.topology.tester;
/**
* Function representing if a condition is valid or not.
*
+ * @param <T> Condition's result type
*/
public interface Condition<T> {
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/api/topology/src/main/java/quarks/topology/tester/Tester.java
----------------------------------------------------------------------
diff --git a/api/topology/src/main/java/quarks/topology/tester/Tester.java b/api/topology/src/main/java/quarks/topology/tester/Tester.java
index df17a4d..7b4c9b2 100644
--- a/api/topology/src/main/java/quarks/topology/tester/Tester.java
+++ b/api/topology/src/main/java/quarks/topology/tester/Tester.java
@@ -99,6 +99,7 @@ public interface Tester extends TopologyElement {
* {@link Condition#valid()} and {@link Condition#getResult()} may change as
* more tuples are seen on {@code stream}. <BR>
*
+ * @param <T> Tuple type
* @param stream
* Stream to be tested.
* @param values
@@ -117,7 +118,8 @@ public interface Tester extends TopologyElement {
* If the topology is still executing then the returned values from
* {@link Condition#valid()} and {@link Condition#getResult()} may change as
* more tuples are seen on {@code stream}. <BR>
- *
+ *
+ * @param <T> Tuple type
* @param stream
* Stream to be tested.
* @param values
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/api/topology/src/test/java/quarks/test/topology/TStreamTest.java
----------------------------------------------------------------------
diff --git a/api/topology/src/test/java/quarks/test/topology/TStreamTest.java b/api/topology/src/test/java/quarks/test/topology/TStreamTest.java
index b22b2c7..d56f258 100644
--- a/api/topology/src/test/java/quarks/test/topology/TStreamTest.java
+++ b/api/topology/src/test/java/quarks/test/topology/TStreamTest.java
@@ -286,6 +286,7 @@ public abstract class TStreamTest extends TopologyAbstractTest {
/**
* Test split() with no drops.
+ * @throws Exception on failure
*/
@Test
public void testSplit() throws Exception {
@@ -311,6 +312,7 @@ public abstract class TStreamTest extends TopologyAbstractTest {
/**
* Test split() with drops.
+ * @throws Exception on failure
*/
@Test
public void testSplitWithDrops() throws Exception {
@@ -352,6 +354,7 @@ public abstract class TStreamTest extends TopologyAbstractTest {
/**
* Test split() zero outputs
+ * @throws Exception on failure
*/
@Test(expected = IllegalArgumentException.class)
public void testSplitWithZeroOutputs() throws Exception {
@@ -360,6 +363,7 @@ public abstract class TStreamTest extends TopologyAbstractTest {
/**
* Test split() negative outputs
+ * @throws Exception on failure
*/
@Test(expected = IllegalArgumentException.class)
public void testSplitWithNegativeOutputs() throws Exception {
@@ -382,6 +386,7 @@ public abstract class TStreamTest extends TopologyAbstractTest {
/**
* Test split(enum) with integer type enum.
+ * @throws Exception on failure
*/
@Test
public void testSplitWithEnum() throws Exception {
@@ -424,6 +429,7 @@ public abstract class TStreamTest extends TopologyAbstractTest {
/**
* Test split(enum) with integer type enum.
+ * @throws Exception on failure
*/
@Test(expected = IllegalArgumentException.class)
public void testSplitWithEnumForZeroSizeClass() throws Exception {
@@ -704,6 +710,7 @@ public abstract class TStreamTest extends TopologyAbstractTest {
/**
* Submit multiple jobs concurrently using ProcessSource.
+ * @throws Exception on failure
*/
@Test
public void testMultiTopology() throws Exception {
@@ -726,6 +733,7 @@ public abstract class TStreamTest extends TopologyAbstractTest {
/**
* Submit multiple jobs concurrently using ProcessSource.
+ * @throws Exception on failure
*/
@Test
public void testMultiTopologyWithError() throws Exception {
@@ -750,6 +758,7 @@ public abstract class TStreamTest extends TopologyAbstractTest {
/**
* Submit multiple jobs concurrently using PeriodicSource.
+ * @throws Exception on failure
*/
@Test
public void testMultiTopologyPollWithError() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/api/window/src/main/java/quarks/window/Partition.java
----------------------------------------------------------------------
diff --git a/api/window/src/main/java/quarks/window/Partition.java b/api/window/src/main/java/quarks/window/Partition.java
index 4b80c46..c6ad2c3 100644
--- a/api/window/src/main/java/quarks/window/Partition.java
+++ b/api/window/src/main/java/quarks/window/Partition.java
@@ -26,12 +26,13 @@ import java.util.List;
* returned by {@code getContents} is stable when synchronizing
* on the partition object. For example:
*
- * <pre><code>
+ * <pre>{@code
* Partition<Integer, Integer, ArrayList<Integer>> part = ...;
* synchronized(part){
* List<Integer> = part.getContents();
* // stable operation on contents of partition
* }
+ * }</pre>
*
* @param <T> Type of tuples in the partition.
* @param <K> Type of the partition's key.
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/api/window/src/main/java/quarks/window/Policies.java
----------------------------------------------------------------------
diff --git a/api/window/src/main/java/quarks/window/Policies.java b/api/window/src/main/java/quarks/window/Policies.java
index 6c2241a..2d3cbbc 100644
--- a/api/window/src/main/java/quarks/window/Policies.java
+++ b/api/window/src/main/java/quarks/window/Policies.java
@@ -37,6 +37,9 @@ public class Policies {
* A policy which schedules a future partition eviction if the partition is empty.
* This can be used as a contents policy that is scheduling the eviction of
* the tuple just about to be inserted.
+ * @param <T> Tuple Type
+ * @param <K> Key type
+ * @param <L> List type for the partition contents.
* @param time The time span in which tuple are permitted in the partition.
* @param unit The units of time.
* @return The time-based contents policy.
@@ -54,6 +57,9 @@ public class Policies {
* A policy which schedules a future partition eviction on the first insert.
* This can be used as a contents policy that schedules the eviction of tuples
* as a batch.
+ * @param <T> Tuple Type
+ * @param <K> Key type
+ * @param <L> List type for the partition contents.
* @param time The time span in which tuple are permitted in the partition.
* @param unit The units of time.
* @return The time-based contents policy.
@@ -79,6 +85,8 @@ public class Policies {
* An eviction policy which evicts all tuples that are older than a specified time.
* If any tuples remain in the partition, it schedules their eviction after
* an appropriate interval.
+ * @param <T> Tuple Type
+ * @param <K> Key type
* @param time The timespan in which tuple are permitted in the partition.
* @param unit The units of time.
* @return The time-based eviction policy.
@@ -105,6 +113,8 @@ public class Policies {
/**
* An eviction policy which processes the window, evicts all tuples, and
* schedules the next eviction after the appropriate interval.
+ * @param <T> Tuple Type
+ * @param <K> Key type
* @param time The timespan in which tuple are permitted in the partition.
* @param unit The units of time.
* @return The time-based eviction policy.
@@ -143,6 +153,10 @@ public class Policies {
* If, when called, the number of tuples in the partition is
* greater than equal to {@code count} then {@code partition.evict()}
* is called.
+ * @param <T> Tuple type
+ * @param <K> Key type
+ * @param <L> List type for the partition contents.
+ * @param count the count
* @return A count-based contents policy.
*/
public static <T, K, L extends List<T>> BiConsumer<Partition<T, K, L>, T> countContentsPolicy(final int count){
@@ -155,6 +169,9 @@ public class Policies {
/**
* Returns a Consumer representing an evict determiner that evict all tuples
* from the window.
+ * @param <T> Tuple type
+ * @param <K> Key type
+ * @param <L> List type for the partition contents.
* @return An evict determiner that evicts all tuples.
*/
public static <T, K, L extends List<T>> Consumer<Partition<T, K, L> > evictAll(){
@@ -163,6 +180,9 @@ public class Policies {
/**
* Returns an evict determiner that evicts the oldest tuple.
+ * @param <T> Tuple type
+ * @param <K> Key type
+ * @param <L> List type for the partition contents.
* @return A evict determiner that evicts the oldest tuple.
*/
public static <T, K, L extends List<T>> Consumer<Partition<T, K, L> > evictOldest(){
@@ -172,6 +192,9 @@ public class Policies {
/**
* Returns a trigger policy that triggers
* processing on every insert.
+ * @param <T> Tuple type
+ * @param <K> Key type
+ * @param <L> List type for the partition contents.
* @return A trigger policy that triggers processing on every insert.
*/
public static <T, K, L extends List<T>> BiConsumer<Partition<T, K, L>, T> processOnInsert(){
@@ -181,6 +204,10 @@ public class Policies {
/**
* Returns a trigger policy that triggers when the size of a partition
* equals or exceeds a value, and then evicts its contents.
+ * @param <T> Tuple type
+ * @param <K> Key type
+ * @param <L> List type for the partition contents.
+ * @param size partition size
* @return A trigger policy that triggers processing when the size of
* the partition equals or exceets a value.
*/
@@ -195,6 +222,9 @@ public class Policies {
/**
* A {@link BiConsumer} policy which does nothing.
+ * @param <T> Tuple type
+ * @param <K> Key type
+ * @param <L> List type for the partition contents.
* @return A policy which does nothing.
*/
public static <T, K, L extends List<T>> BiConsumer<Partition<T, K, L>, T> doNothing(){
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/api/window/src/main/java/quarks/window/Window.java
----------------------------------------------------------------------
diff --git a/api/window/src/main/java/quarks/window/Window.java b/api/window/src/main/java/quarks/window/Window.java
index a9ac191..8bf6706 100644
--- a/api/window/src/main/java/quarks/window/Window.java
+++ b/api/window/src/main/java/quarks/window/Window.java
@@ -77,20 +77,20 @@ public interface Window<T, K, L extends List<T>>{
*
*
*
- * @param tuple
+ * @param tuple the tuple to insert
* @return true, if the tuple was successfully inserted. Otherwise, false.
*/
boolean insert(T tuple);
/**
* Register a WindowProcessor.
- * @param windowProcessor
+ * @param windowProcessor function to process the window
*/
void registerPartitionProcessor(BiConsumer<List<T>, K> windowProcessor);
/**
* Register a ScheduledExecutorService.
- * @param ses
+ * @param ses the service
*/
void registerScheduledExecutorService(ScheduledExecutorService ses);
@@ -163,12 +163,12 @@ public interface Window<T, K, L extends List<T>>{
* is stable when synchronizing on the intrinsic lock of the map,
* for example:
* <br>
- * <pre><code>
+ * <pre>{@code
* Map<K, Partitions<U, K, ?>> partitions = window.getPartitions();
* synchronized(partitions){
* // operations with partition
* }
- * </code></pre>
+ * }</pre>
*
* @return A map of the window's keys and partitions.
*/
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/api/window/src/main/java/quarks/window/Windows.java
----------------------------------------------------------------------
diff --git a/api/window/src/main/java/quarks/window/Windows.java b/api/window/src/main/java/quarks/window/Windows.java
index d55af0e..8313e40 100644
--- a/api/window/src/main/java/quarks/window/Windows.java
+++ b/api/window/src/main/java/quarks/window/Windows.java
@@ -40,7 +40,11 @@ public class Windows {
/**
* Create a window using the passed in policies.
- *
+ *
+ * @param <T> Tuple type.
+ * @param <K> Key type.
+ * @param <L> List type.
+ *
* @param insertionPolicy Policy indicating if a tuple should be inserted
* into the window.
* @param contentsPolicy Contents policy called prior to insertion of a tuple.
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/apps/iot/src/main/java/quarks/apps/iot/IotDevicePubSub.java
----------------------------------------------------------------------
diff --git a/apps/iot/src/main/java/quarks/apps/iot/IotDevicePubSub.java b/apps/iot/src/main/java/quarks/apps/iot/IotDevicePubSub.java
index 14b282d..c8d1341 100644
--- a/apps/iot/src/main/java/quarks/apps/iot/IotDevicePubSub.java
+++ b/apps/iot/src/main/java/quarks/apps/iot/IotDevicePubSub.java
@@ -55,12 +55,12 @@ import quarks.topology.TopologyElement;
* <P>
* At startup this application sends a single device event with
* identifier {@link Events#IOT_START}. This performs two functions:
+ * </P>
* <UL>
* <LI>Initiates a connection to the message hub.</LI>
* <LI>Allows external applications to be notified (by subscribing to device events)
* when a Quarks provider starts.</LI>
* </UL>
- * </P>
*
* @see PublishSubscribe
*/
@@ -92,6 +92,8 @@ public class IotDevicePubSub {
/**
* Create an instance of this application using {@code device} as the device
* connection to a message hub.
+ *
+ * @param device the IotDevice
*/
public static void createApplication(IotDevice device) {
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/apps/runtime/src/main/java/quarks/apps/runtime/JobMonitorApp.java
----------------------------------------------------------------------
diff --git a/apps/runtime/src/main/java/quarks/apps/runtime/JobMonitorApp.java b/apps/runtime/src/main/java/quarks/apps/runtime/JobMonitorApp.java
index 7e9dfaf..03d060b 100644
--- a/apps/runtime/src/main/java/quarks/apps/runtime/JobMonitorApp.java
+++ b/apps/runtime/src/main/java/quarks/apps/runtime/JobMonitorApp.java
@@ -54,6 +54,7 @@ import quarks.topology.services.ApplicationService;
* <P>
* The monitoring application must be submitted within a context which
* provides the following services:
+ * </P>
* <ul>
* <li>ApplicationService - an {@code ApplicationServiceMXBean} control
* registered by this service is used to resubmit failed applications.</li>
@@ -62,7 +63,6 @@ import quarks.topology.services.ApplicationService;
* restarting failed applications.</li>
* <li>JobRegistryService - generates job monitoring events. </li>
* </ul>
- * </P>
*/
public class JobMonitorApp {
/**
@@ -101,8 +101,8 @@ public class JobMonitorApp {
* Submits the application topology.
*
* @return the job.
- * @throws InterruptedException
- * @throws ExecutionException
+ * @throws InterruptedException if the operation was interrupted
+ * @throws ExecutionException on task execution exception
*/
public Job submit() throws InterruptedException, ExecutionException {
Future<Job> f = submitter.submit(topology);
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/connectors/common/src/main/java/quarks/connectors/runtime/Connector.java
----------------------------------------------------------------------
diff --git a/connectors/common/src/main/java/quarks/connectors/runtime/Connector.java b/connectors/common/src/main/java/quarks/connectors/runtime/Connector.java
index e122d07..8709673 100644
--- a/connectors/common/src/main/java/quarks/connectors/runtime/Connector.java
+++ b/connectors/common/src/main/java/quarks/connectors/runtime/Connector.java
@@ -440,7 +440,8 @@ public abstract class Connector<T> implements AutoCloseable, Serializable {
protected abstract void doClose(T client) throws Exception;
/**
- * Get a connector id to use in log and exception msgs
+ * Get a connector id to use in log and exception msgs
+ * @return the id
*/
protected abstract String id();
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/connectors/file/src/main/java/quarks/connectors/file/FileStreams.java
----------------------------------------------------------------------
diff --git a/connectors/file/src/main/java/quarks/connectors/file/FileStreams.java b/connectors/file/src/main/java/quarks/connectors/file/FileStreams.java
index 119204a..cd80684 100644
--- a/connectors/file/src/main/java/quarks/connectors/file/FileStreams.java
+++ b/connectors/file/src/main/java/quarks/connectors/file/FileStreams.java
@@ -54,6 +54,7 @@ public class FileStreams {
* <p>
* This is the same as {@code directoryWatcher(t, () -> dir, null)}.
*
+ * @param te topology element whose topology the watcher will be added to
* @param directory
* Name of the directory to watch.
* @return Stream containing absolute pathnames of newly created files in
@@ -94,7 +95,8 @@ public class FileStreams {
* MacOs Java lacks a native implementation of {@link WatchService}.
* The result can be a delay in detecting newly created files (e.g., 10sec)
* as well not detecting rapid deletion and recreation of a file.
- *
+ *
+ * @param te topology element whose topology the watcher will be added to
* @param directory
* Name of the directory to watch.
* @param comparator
@@ -209,6 +211,7 @@ public class FileStreams {
* }</pre>
* @param contents the lines to write
* @param basePathname the base pathname of the created files
+ * @return a TSink
*/
public static TSink<String> textFileWriter(TStream<String> contents,
Supplier<String> basePathname) {
@@ -239,6 +242,7 @@ public class FileStreams {
* @param contents the lines to write
* @param basePathname the base pathname of the created files
* @param policy the policy to use. may be null.
+ * @return a TSink
* @see FileWriterPolicy
*/
public static TSink<String> textFileWriter(TStream<String> contents,
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/d7840011/connectors/file/src/main/java/quarks/connectors/file/FileWriterCycleConfig.java
----------------------------------------------------------------------
diff --git a/connectors/file/src/main/java/quarks/connectors/file/FileWriterCycleConfig.java b/connectors/file/src/main/java/quarks/connectors/file/FileWriterCycleConfig.java
index 0c927f9..6958f84 100644
--- a/connectors/file/src/main/java/quarks/connectors/file/FileWriterCycleConfig.java
+++ b/connectors/file/src/main/java/quarks/connectors/file/FileWriterCycleConfig.java
@@ -43,25 +43,45 @@ public class FileWriterCycleConfig<T> {
private long periodMsec;
private Predicate<T> tuplePredicate;
- /** same as {@code newConfig(fileSize, 0, 0, null)} */
+ /** same as {@code newConfig(fileSize, 0, 0, null)}
+ *
+ * @param <T> Tuple type
+ * @param fileSize cycle after {@code fileSize} bytes have been written. 0 to disable.
+ * @return the cycle configuration
+ */
public static <T> FileWriterCycleConfig<T> newFileSizeBasedConfig(long fileSize) {
if (fileSize < 1)
throw new IllegalArgumentException("fileSize");
return newConfig(fileSize, 0, 0, null);
}
- /** same as {@code newConfig0, cntTuples, 0, null)} */
+ /** same as {@code newConfig(0, cntTuples, 0, null)}
+ *
+ * @param <T> Tuple type
+ * @param cntTuples cycle after every {@code cntTuple} tuples have been written. 0 to disable.
+ * @return the cycle configuration
+ */
public static <T> FileWriterCycleConfig<T> newCountBasedConfig(int cntTuples) {
if (cntTuples < 1)
throw new IllegalArgumentException("cntTuples");
return newConfig(0, cntTuples, 0, null);
}
- /** same as {@code newConfig(0, 0, periodMsec, null)} */
+ /** same as {@code newConfig(0, 0, periodMsec, null)}
+ *
+ * @param <T> Tuple type
+ * @param periodMsec cycle after {@code periodMsec} has elapsed since the last time based cycle. 0 to disable.
+ * @return the cycle configuration
+ */
public static <T> FileWriterCycleConfig<T> newTimeBasedConfig(long periodMsec) {
if (periodMsec < 1)
throw new IllegalArgumentException("periodMsec");
return newConfig(0, 0, periodMsec, null);
}
- /** same as {@code newConfig(0, 0, 0, tuplePredicate)} */
+ /** same as {@code newConfig(0, 0, 0, tuplePredicate)}
+ *
+ * @param <T> Tuple type
+ * @param tuplePredicate cycle if {@code tuplePredicate} returns true. null to disable.
+ * @return the cycle configuration
+ */
public static <T> FileWriterCycleConfig<T> newPredicateBasedConfig(Predicate<T> tuplePredicate) {
return newConfig(0, 0, 0, tuplePredicate);
}
@@ -70,10 +90,12 @@ public class FileWriterCycleConfig<T> {
* Create a new configuration.
* <p>
* At least one configuration mode must be enabled.
+ * @param <T> Tuple type
* @param fileSize cycle after {@code fileSize} bytes have been written. 0 to disable.
* @param cntTuples cycle after every {@code cntTuple} tuples have been written. 0 to disable.
* @param periodMsec cycle after {@code periodMsec} has elapsed since the last time based cycle. 0 to disable.
* @param tuplePredicate cycle if {@code tuplePredicate} returns true. null to disable.
+ * @return the cycle configuration
*/
public static <T> FileWriterCycleConfig<T> newConfig(long fileSize, int cntTuples, long periodMsec, Predicate<T> tuplePredicate) {
return new FileWriterCycleConfig<>(fileSize, cntTuples, periodMsec, tuplePredicate);